From webhook-mailer at python.org  Sun Aug  1 17:36:15 2021
From: webhook-mailer at python.org (ned-deily)
Date: Sun, 01 Aug 2021 21:36:15 -0000
Subject: [Python-checkins] Remove beta release note from macOS installer
 displays (GH-27531)
Message-ID: <mailman.830.1627853776.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/b192fb3f6a99c33f664e27395ffc0cef4dbc8d29
commit: b192fb3f6a99c33f664e27395ffc0cef4dbc8d29
branch: 3.10
author: Ned Deily <nad at python.org>
committer: ned-deily <nad at python.org>
date: 2021-08-01T17:35:53-04:00
summary:

Remove beta release note from macOS installer displays (GH-27531)

files:
M Mac/BuildScript/resources/ReadMe.rtf
M Mac/BuildScript/resources/Welcome.rtf

diff --git a/Mac/BuildScript/resources/ReadMe.rtf b/Mac/BuildScript/resources/ReadMe.rtf
index a6bfeb9f164ea..7934dd1a4bea5 100644
--- a/Mac/BuildScript/resources/ReadMe.rtf
+++ b/Mac/BuildScript/resources/ReadMe.rtf
@@ -8,12 +8,6 @@
 
 \f0\fs24 \cf0 This package will install Python $FULL_VERSION for macOS $MACOSX_DEPLOYMENT_TARGET for the following architecture(s): $ARCHITECTURES.\
 \
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
-
-\f1\b \cf0 NOTE: 
-\f0\b0 This is a beta test preview of Python 3.10.0, the next feature release of Python 3.  It is not intended for production use.\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
-\cf0 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
 
 \f1\b \cf0 \ul \ulc0 Certificate verification and OpenSSL\
diff --git a/Mac/BuildScript/resources/Welcome.rtf b/Mac/BuildScript/resources/Welcome.rtf
index c65119b7fa2e2..57ffdb53d6f24 100644
--- a/Mac/BuildScript/resources/Welcome.rtf
+++ b/Mac/BuildScript/resources/Welcome.rtf
@@ -3,7 +3,7 @@
 }
 {\colortbl;\red255\green255\blue255;}
 {\*\expandedcolortbl;;}
-\paperw11905\paperh16837\margl1440\margr1440\vieww12200\viewh10880\viewkind0
+\paperw11900\paperh16840\margl1440\margr1440\vieww12200\viewh10880\viewkind0
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
 
 \f0\fs24 \cf0 This package will install 
@@ -23,8 +23,4 @@
 At the end of this install, click on 
 \f2 Install Certificates
 \f0  to install a set of current SSL root certificates.\
-\
-
-\f1\b NOTE: 
-\f0\b0 This is a beta test preview of Python 3.10.0, the next feature release of Python 3.  It is not intended for production use.\
 }
\ No newline at end of file


From webhook-mailer at python.org  Mon Aug  2 02:18:18 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Mon, 02 Aug 2021 06:18:18 -0000
Subject: [Python-checkins] bpo-44793: Fix checking the number of arguments
 when subscribe a generic type with ParamSpec parameter. (GH-27515)
Message-ID: <mailman.831.1627885099.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/f92b9133ef67e77605cbd315b6b6c81036ce110e
commit: f92b9133ef67e77605cbd315b6b6c81036ce110e
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-02T09:17:46+03:00
summary:

bpo-44793: Fix checking the number of arguments when subscribe a generic type with ParamSpec parameter. (GH-27515)

For example Callable[P, T][[int], str, float] will now raise an error.

Use also term "arguments" instead of "parameters" in error
message for too few/many arguments.

files:
A Misc/NEWS.d/next/Library/2021-07-31-20-28-20.bpo-44793.woaQSg.rst
M Lib/test/test_typing.py
M Lib/typing.py

diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index fbdf634c5c3be..6cd83a1586a13 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -626,8 +626,6 @@ def test_consistency(self):
         self.assertEqual(c1.__args__, c2.__args__)
         self.assertEqual(hash(c1.__args__), hash(c2.__args__))
 
-    test_errors = skip("known bug #44793")(BaseCallableTests.test_errors)
-
 
 class CollectionsCallableTests(BaseCallableTests, BaseTestCase):
     Callable = collections.abc.Callable
@@ -4588,6 +4586,10 @@ class X(Generic[T, P]):
         G1 = X[int, P_2]
         self.assertEqual(G1.__args__, (int, P_2))
         self.assertEqual(G1.__parameters__, (P_2,))
+        with self.assertRaisesRegex(TypeError, "few arguments for"):
+            X[int]
+        with self.assertRaisesRegex(TypeError, "many arguments for"):
+            X[int, P_2, str]
 
         G2 = X[int, Concatenate[int, P_2]]
         self.assertEqual(G2.__args__, (int, Concatenate[int, P_2]))
diff --git a/Lib/typing.py b/Lib/typing.py
index 702bb647269d0..16ad5ce7c2d04 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -228,7 +228,7 @@ def _check_generic(cls, parameters, elen):
         raise TypeError(f"{cls} is not a generic class")
     alen = len(parameters)
     if alen != elen:
-        raise TypeError(f"Too {'many' if alen > elen else 'few'} parameters for {cls};"
+        raise TypeError(f"Too {'many' if alen > elen else 'few'} arguments for {cls};"
                         f" actual {alen}, expected {elen}")
 
 def _prepare_paramspec_params(cls, params):
@@ -239,6 +239,7 @@ def _prepare_paramspec_params(cls, params):
     if len(cls.__parameters__) == 1 and len(params) > 1:
         return (params,)
     else:
+        _check_generic(cls, params, len(cls.__parameters__))
         _params = []
         # Convert lists to tuples to help other libraries cache the results.
         for p, tvar in zip(params, cls.__parameters__):
@@ -1022,10 +1023,11 @@ def __getitem__(self, params):
         if not isinstance(params, tuple):
             params = (params,)
         params = tuple(_type_convert(p) for p in params)
-        if self._paramspec_tvars:
-            if any(isinstance(t, ParamSpec) for t in self.__parameters__):
-                params = _prepare_paramspec_params(self, params)
-        _check_generic(self, params, len(self.__parameters__))
+        if (self._paramspec_tvars
+                and any(isinstance(t, ParamSpec) for t in self.__parameters__)):
+            params = _prepare_paramspec_params(self, params)
+        else:
+            _check_generic(self, params, len(self.__parameters__))
 
         subst = dict(zip(self.__parameters__, params))
         new_args = []
@@ -1292,7 +1294,8 @@ def __class_getitem__(cls, params):
             # Subscripting a regular Generic subclass.
             if any(isinstance(t, ParamSpec) for t in cls.__parameters__):
                 params = _prepare_paramspec_params(cls, params)
-            _check_generic(cls, params, len(cls.__parameters__))
+            else:
+                _check_generic(cls, params, len(cls.__parameters__))
         return _GenericAlias(cls, params,
                              _typevar_types=(TypeVar, ParamSpec),
                              _paramspec_tvars=True)
diff --git a/Misc/NEWS.d/next/Library/2021-07-31-20-28-20.bpo-44793.woaQSg.rst b/Misc/NEWS.d/next/Library/2021-07-31-20-28-20.bpo-44793.woaQSg.rst
new file mode 100644
index 0000000000000..1d94d67615a47
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-07-31-20-28-20.bpo-44793.woaQSg.rst
@@ -0,0 +1,2 @@
+Fix checking the number of arguments when subscribe a generic type with
+``ParamSpec`` parameter.


From webhook-mailer at python.org  Mon Aug  2 03:08:34 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 02 Aug 2021 07:08:34 -0000
Subject: [Python-checkins] bpo-44793: Fix checking the number of arguments
 when subscribe a generic type with ParamSpec parameter. (GH-27515)
Message-ID: <mailman.832.1627888115.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/c8db292012dd84aab81eb3ed9146709696a3d290
commit: c8db292012dd84aab81eb3ed9146709696a3d290
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-02T00:08:24-07:00
summary:

bpo-44793: Fix checking the number of arguments when subscribe a generic type with ParamSpec parameter. (GH-27515)


For example Callable[P, T][[int], str, float] will now raise an error.

Use also term "arguments" instead of "parameters" in error
message for too few/many arguments.
(cherry picked from commit f92b9133ef67e77605cbd315b6b6c81036ce110e)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
A Misc/NEWS.d/next/Library/2021-07-31-20-28-20.bpo-44793.woaQSg.rst
M Lib/test/test_typing.py
M Lib/typing.py

diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index 029a1586a02a1..3d9a347dcb707 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -620,8 +620,6 @@ def test_consistency(self):
         self.assertEqual(c1.__args__, c2.__args__)
         self.assertEqual(hash(c1.__args__), hash(c2.__args__))
 
-    test_errors = skip("known bug #44793")(BaseCallableTests.test_errors)
-
 
 class CollectionsCallableTests(BaseCallableTests, BaseTestCase):
     Callable = collections.abc.Callable
@@ -4548,6 +4546,10 @@ class X(Generic[T, P]):
         G1 = X[int, P_2]
         self.assertEqual(G1.__args__, (int, P_2))
         self.assertEqual(G1.__parameters__, (P_2,))
+        with self.assertRaisesRegex(TypeError, "few arguments for"):
+            X[int]
+        with self.assertRaisesRegex(TypeError, "many arguments for"):
+            X[int, P_2, str]
 
         G2 = X[int, Concatenate[int, P_2]]
         self.assertEqual(G2.__args__, (int, Concatenate[int, P_2]))
diff --git a/Lib/typing.py b/Lib/typing.py
index bcb22b2d178c3..e492bd2ee916b 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -220,7 +220,7 @@ def _check_generic(cls, parameters, elen):
         raise TypeError(f"{cls} is not a generic class")
     alen = len(parameters)
     if alen != elen:
-        raise TypeError(f"Too {'many' if alen > elen else 'few'} parameters for {cls};"
+        raise TypeError(f"Too {'many' if alen > elen else 'few'} arguments for {cls};"
                         f" actual {alen}, expected {elen}")
 
 def _prepare_paramspec_params(cls, params):
@@ -231,6 +231,7 @@ def _prepare_paramspec_params(cls, params):
     if len(cls.__parameters__) == 1 and len(params) > 1:
         return (params,)
     else:
+        _check_generic(cls, params, len(cls.__parameters__))
         _params = []
         # Convert lists to tuples to help other libraries cache the results.
         for p, tvar in zip(params, cls.__parameters__):
@@ -1020,10 +1021,11 @@ def __getitem__(self, params):
         if not isinstance(params, tuple):
             params = (params,)
         params = tuple(_type_convert(p) for p in params)
-        if self._paramspec_tvars:
-            if any(isinstance(t, ParamSpec) for t in self.__parameters__):
-                params = _prepare_paramspec_params(self, params)
-        _check_generic(self, params, len(self.__parameters__))
+        if (self._paramspec_tvars
+                and any(isinstance(t, ParamSpec) for t in self.__parameters__)):
+            params = _prepare_paramspec_params(self, params)
+        else:
+            _check_generic(self, params, len(self.__parameters__))
 
         subst = dict(zip(self.__parameters__, params))
         new_args = []
@@ -1290,7 +1292,8 @@ def __class_getitem__(cls, params):
             # Subscripting a regular Generic subclass.
             if any(isinstance(t, ParamSpec) for t in cls.__parameters__):
                 params = _prepare_paramspec_params(cls, params)
-            _check_generic(cls, params, len(cls.__parameters__))
+            else:
+                _check_generic(cls, params, len(cls.__parameters__))
         return _GenericAlias(cls, params,
                              _typevar_types=(TypeVar, ParamSpec),
                              _paramspec_tvars=True)
diff --git a/Misc/NEWS.d/next/Library/2021-07-31-20-28-20.bpo-44793.woaQSg.rst b/Misc/NEWS.d/next/Library/2021-07-31-20-28-20.bpo-44793.woaQSg.rst
new file mode 100644
index 0000000000000..1d94d67615a47
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-07-31-20-28-20.bpo-44793.woaQSg.rst
@@ -0,0 +1,2 @@
+Fix checking the number of arguments when subscribe a generic type with
+``ParamSpec`` parameter.


From webhook-mailer at python.org  Mon Aug  2 05:34:59 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 02 Aug 2021 09:34:59 -0000
Subject: [Python-checkins] bpo-44781: make distutils test suppress
 deprecation warning from import distutils (GH-27485)
Message-ID: <mailman.833.1627896900.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/a9134fa2ffb7e4684c980325dd5444afca596586
commit: a9134fa2ffb7e4684c980325dd5444afca596586
branch: main
author: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-02T11:34:55+02:00
summary:

bpo-44781: make distutils test suppress deprecation warning from import distutils (GH-27485)

files:
M Lib/distutils/tests/test_bdist.py

diff --git a/Lib/distutils/tests/test_bdist.py b/Lib/distutils/tests/test_bdist.py
index 09ad076799b420..55fa3930dd92f2 100644
--- a/Lib/distutils/tests/test_bdist.py
+++ b/Lib/distutils/tests/test_bdist.py
@@ -3,8 +3,11 @@
 import unittest
 from test.support import run_unittest
 
-from distutils.command.bdist import bdist
-from distutils.tests import support
+import warnings
+with warnings.catch_warnings():
+    warnings.simplefilter('ignore', DeprecationWarning)
+    from distutils.command.bdist import bdist
+    from distutils.tests import support
 
 
 class BuildTestCase(support.TempdirManager,


From webhook-mailer at python.org  Mon Aug  2 05:40:00 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 02 Aug 2021 09:40:00 -0000
Subject: [Python-checkins] doc: "Mac OS " -> "macOS" (GH-27534)
Message-ID: <mailman.834.1627897201.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/1342248f3a2b321b7b00867f47c92ba6549f9497
commit: 1342248f3a2b321b7b00867f47c92ba6549f9497
branch: main
author: partev <petrosyan at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-02T11:39:56+02:00
summary:

doc: "Mac OS " -> "macOS" (GH-27534)

files:
M Doc/library/platform.rst

diff --git a/Doc/library/platform.rst b/Doc/library/platform.rst
index be86e568c180b..bb9fc45df233b 100644
--- a/Doc/library/platform.rst
+++ b/Doc/library/platform.rst
@@ -42,7 +42,7 @@ Cross Platform
 
    .. note::
 
-      On Mac OS X (and perhaps other platforms), executable files may be
+      On macOS (and perhaps other platforms), executable files may be
       universal files containing multiple architectures.
 
       To get at the "64-bitness" of the current interpreter, it is more


From webhook-mailer at python.org  Mon Aug  2 05:40:45 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 02 Aug 2021 09:40:45 -0000
Subject: [Python-checkins] doc: "Mac OS X" -> "macOS" (GH-27535)
Message-ID: <mailman.835.1627897246.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/414dcb13aaa4fd42f264fdee47782dede5c83d6c
commit: 414dcb13aaa4fd42f264fdee47782dede5c83d6c
branch: main
author: partev <petrosyan at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-02T11:40:40+02:00
summary:

doc: "Mac OS X" -> "macOS" (GH-27535)

files:
M Doc/library/othergui.rst

diff --git a/Doc/library/othergui.rst b/Doc/library/othergui.rst
index 48c1f2754111a..db11933b325f3 100644
--- a/Doc/library/othergui.rst
+++ b/Doc/library/othergui.rst
@@ -3,7 +3,7 @@
 Other Graphical User Interface Packages
 =======================================
 
-Major cross-platform (Windows, Mac OS X, Unix-like) GUI toolkits are
+Major cross-platform (Windows, macOS, Unix-like) GUI toolkits are
 available for Python:
 
 .. seealso::
@@ -26,7 +26,7 @@ available for Python:
    `PyQt <https://riverbankcomputing.com/software/pyqt/intro>`_
       PyQt is a :program:`sip`\ -wrapped binding to the Qt toolkit.  Qt is an
       extensive C++ GUI application development framework that is
-      available for Unix, Windows and Mac OS X. :program:`sip` is a tool
+      available for Unix, Windows and macOS. :program:`sip` is a tool
       for generating bindings for C++ libraries as Python classes, and
       is specifically designed for Python.
 
@@ -40,7 +40,7 @@ available for Python:
       wxPython is a cross-platform GUI toolkit for Python that is built around
       the popular `wxWidgets <https://www.wxwidgets.org/>`_ (formerly wxWindows)
       C++ toolkit.  It provides a native look and feel for applications on
-      Windows, Mac OS X, and Unix systems by using each platform's native
+      Windows, macOS, and Unix systems by using each platform's native
       widgets where ever possible, (GTK+ on Unix-like systems).  In addition to
       an extensive set of widgets, wxPython provides classes for online
       documentation and context sensitive help, printing, HTML viewing,


From webhook-mailer at python.org  Mon Aug  2 05:43:49 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 02 Aug 2021 09:43:49 -0000
Subject: [Python-checkins] bpo-44667: Treat correctly lines ending with
 comments and no newlines in the Python tokenizer (GH-27499) (GH-27500)
Message-ID: <mailman.836.1627897430.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/33a4010198aad31346e46dafdda17e02f8349017
commit: 33a4010198aad31346e46dafdda17e02f8349017
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-02T11:43:45+02:00
summary:

bpo-44667: Treat correctly lines ending with comments and no newlines in the Python tokenizer (GH-27499) (GH-27500)

(cherry picked from commit b6bde9fc42aecad5be0457198d17cfe7b481ad79)

Co-authored-by: Pablo Galindo Salgado <Pablogsal at gmail.com>

files:
A Misc/NEWS.d/next/Library/2021-07-30-23-27-30.bpo-44667.tu0Xrv.rst
M Lib/test/test_tokenize.py
M Lib/tokenize.py

diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
index 681f2c72f9c37..4bce1ca9c76f7 100644
--- a/Lib/test/test_tokenize.py
+++ b/Lib/test/test_tokenize.py
@@ -1458,6 +1458,16 @@ def test_pathological_trailing_whitespace(self):
         # See http://bugs.python.org/issue16152
         self.assertExactTypeEqual('@          ', token.AT)
 
+    def test_comment_at_the_end_of_the_source_without_newline(self):
+        # See http://bugs.python.org/issue44667
+        source = 'b = 1\n\n#test'
+        expected_tokens = [token.NAME, token.EQUAL, token.NUMBER, token.NEWLINE, token.NL, token.COMMENT]
+
+        tokens = list(tokenize(BytesIO(source.encode('utf-8')).readline))
+        self.assertEqual(tok_name[tokens[0].exact_type], tok_name[ENCODING])
+        for i in range(6):
+            self.assertEqual(tok_name[tokens[i + 1].exact_type], tok_name[expected_tokens[i]])
+        self.assertEqual(tok_name[tokens[-1].exact_type], tok_name[token.ENDMARKER])
 
 class UntokenizeTest(TestCase):
 
diff --git a/Lib/tokenize.py b/Lib/tokenize.py
index 42c1f10373de9..7d7736fe98598 100644
--- a/Lib/tokenize.py
+++ b/Lib/tokenize.py
@@ -604,7 +604,7 @@ def _tokenize(readline, encoding):
                 pos += 1
 
     # Add an implicit NEWLINE if the input doesn't end in one
-    if last_line and last_line[-1] not in '\r\n':
+    if last_line and last_line[-1] not in '\r\n' and not last_line.strip().startswith("#"):
         yield TokenInfo(NEWLINE, '', (lnum - 1, len(last_line)), (lnum - 1, len(last_line) + 1), '')
     for indent in indents[1:]:                 # pop remaining indent levels
         yield TokenInfo(DEDENT, '', (lnum, 0), (lnum, 0), '')
diff --git a/Misc/NEWS.d/next/Library/2021-07-30-23-27-30.bpo-44667.tu0Xrv.rst b/Misc/NEWS.d/next/Library/2021-07-30-23-27-30.bpo-44667.tu0Xrv.rst
new file mode 100644
index 0000000000000..5b7e20e0afdf5
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-07-30-23-27-30.bpo-44667.tu0Xrv.rst
@@ -0,0 +1,4 @@
+The :func:`tokenize.tokenize` doesn't incorrectly generate a ``NEWLINE``
+token if the source doesn't end with a new line character but the last line
+is a comment, as the function is already generating a ``NL`` token. Patch by
+Pablo Galindo


From webhook-mailer at python.org  Mon Aug  2 05:44:06 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 02 Aug 2021 09:44:06 -0000
Subject: [Python-checkins] bpo-44667: Treat correctly lines ending with
 comments and no newlines in the Python tokenizer (GH-27499) (GH-27501)
Message-ID: <mailman.837.1627897448.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/2d11797c81be3ae776e418a5ba507098356d357c
commit: 2d11797c81be3ae776e418a5ba507098356d357c
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-02T11:44:01+02:00
summary:

bpo-44667: Treat correctly lines ending with comments and no newlines in the Python tokenizer (GH-27499) (GH-27501)

(cherry picked from commit b6bde9fc42aecad5be0457198d17cfe7b481ad79)

Co-authored-by: Pablo Galindo Salgado <Pablogsal at gmail.com>

files:
A Misc/NEWS.d/next/Library/2021-07-30-23-27-30.bpo-44667.tu0Xrv.rst
M Lib/test/test_tokenize.py
M Lib/tokenize.py

diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
index 6de7aa87bb2f9..e05a07fab9fe7 100644
--- a/Lib/test/test_tokenize.py
+++ b/Lib/test/test_tokenize.py
@@ -1457,6 +1457,16 @@ def test_pathological_trailing_whitespace(self):
         # See http://bugs.python.org/issue16152
         self.assertExactTypeEqual('@          ', token.AT)
 
+    def test_comment_at_the_end_of_the_source_without_newline(self):
+        # See http://bugs.python.org/issue44667
+        source = 'b = 1\n\n#test'
+        expected_tokens = [token.NAME, token.EQUAL, token.NUMBER, token.NEWLINE, token.NL, token.COMMENT]
+
+        tokens = list(tokenize(BytesIO(source.encode('utf-8')).readline))
+        self.assertEqual(tok_name[tokens[0].exact_type], tok_name[ENCODING])
+        for i in range(6):
+            self.assertEqual(tok_name[tokens[i + 1].exact_type], tok_name[expected_tokens[i]])
+        self.assertEqual(tok_name[tokens[-1].exact_type], tok_name[token.ENDMARKER])
 
 class UntokenizeTest(TestCase):
 
diff --git a/Lib/tokenize.py b/Lib/tokenize.py
index 1aee21b5e18fa..a782f6250dd24 100644
--- a/Lib/tokenize.py
+++ b/Lib/tokenize.py
@@ -602,7 +602,7 @@ def _tokenize(readline, encoding):
                 pos += 1
 
     # Add an implicit NEWLINE if the input doesn't end in one
-    if last_line and last_line[-1] not in '\r\n':
+    if last_line and last_line[-1] not in '\r\n' and not last_line.strip().startswith("#"):
         yield TokenInfo(NEWLINE, '', (lnum - 1, len(last_line)), (lnum - 1, len(last_line) + 1), '')
     for indent in indents[1:]:                 # pop remaining indent levels
         yield TokenInfo(DEDENT, '', (lnum, 0), (lnum, 0), '')
diff --git a/Misc/NEWS.d/next/Library/2021-07-30-23-27-30.bpo-44667.tu0Xrv.rst b/Misc/NEWS.d/next/Library/2021-07-30-23-27-30.bpo-44667.tu0Xrv.rst
new file mode 100644
index 0000000000000..5b7e20e0afdf5
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-07-30-23-27-30.bpo-44667.tu0Xrv.rst
@@ -0,0 +1,4 @@
+The :func:`tokenize.tokenize` doesn't incorrectly generate a ``NEWLINE``
+token if the source doesn't end with a new line character but the last line
+is a comment, as the function is already generating a ``NL`` token. Patch by
+Pablo Galindo


From webhook-mailer at python.org  Mon Aug  2 05:54:56 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 02 Aug 2021 09:54:56 -0000
Subject: [Python-checkins] bpo-44781: make distutils test suppress
 deprecation warning from import distutils (GH-27485) (GH-27540)
Message-ID: <mailman.838.1627898098.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/1bc83eb5c8040855de425c68fc9c5d3c5b48d38e
commit: 1bc83eb5c8040855de425c68fc9c5d3c5b48d38e
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-02T11:54:52+02:00
summary:

bpo-44781: make distutils test suppress deprecation warning from import distutils (GH-27485) (GH-27540)

(cherry picked from commit a9134fa2ffb7e4684c980325dd5444afca596586)

Co-authored-by: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>

files:
M Lib/distutils/tests/test_bdist.py

diff --git a/Lib/distutils/tests/test_bdist.py b/Lib/distutils/tests/test_bdist.py
index 09ad076799b420..55fa3930dd92f2 100644
--- a/Lib/distutils/tests/test_bdist.py
+++ b/Lib/distutils/tests/test_bdist.py
@@ -3,8 +3,11 @@
 import unittest
 from test.support import run_unittest
 
-from distutils.command.bdist import bdist
-from distutils.tests import support
+import warnings
+with warnings.catch_warnings():
+    warnings.simplefilter('ignore', DeprecationWarning)
+    from distutils.command.bdist import bdist
+    from distutils.tests import support
 
 
 class BuildTestCase(support.TempdirManager,


From webhook-mailer at python.org  Mon Aug  2 07:54:35 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 02 Aug 2021 11:54:35 -0000
Subject: [Python-checkins] bpo-44808: Fix test_inspect in refleak mode
 (GH-27544)
Message-ID: <mailman.839.1627905276.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/626d397cc1612ea5eef153dd910834c2ee00ddbd
commit: 626d397cc1612ea5eef153dd910834c2ee00ddbd
branch: main
author: Pablo Galindo Salgado <Pablogsal at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-02T13:54:20+02:00
summary:

bpo-44808: Fix test_inspect in refleak mode (GH-27544)

files:
M Lib/test/test_inspect.py

diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
index a46dc9ba594dc..b0c42a2dcf6ce 100644
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -587,11 +587,12 @@ def test_getsource_on_code_object(self):
 
 class TestGetsourceInteractive(unittest.TestCase):
     def tearDown(self):
-        mod.ParrotDroppings.__module__ = mod
+        mod.ParrotDroppings.__module__ = self.mod
         sys.modules['__main__'] = self.main
 
     def test_getclasses_interactive(self):
         self.main = sys.modules['__main__']
+        self.mod = mod.ParrotDroppings.__module__
         class MockModule:
             __file__ = None
         sys.modules['__main__'] = MockModule


From webhook-mailer at python.org  Mon Aug  2 09:13:41 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 02 Aug 2021 13:13:41 -0000
Subject: [Python-checkins] doc: "Mac OS X" -> "macOS" (GH-27535) (GH-27547)
Message-ID: <mailman.840.1627910022.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/4f2405a749fff64bd486318ce327acfacfe1c3f7
commit: 4f2405a749fff64bd486318ce327acfacfe1c3f7
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-02T15:13:34+02:00
summary:

doc: "Mac OS X" -> "macOS" (GH-27535) (GH-27547)

(cherry picked from commit 414dcb13aaa4fd42f264fdee47782dede5c83d6c)

Co-authored-by: partev <petrosyan at gmail.com>

files:
M Doc/library/othergui.rst

diff --git a/Doc/library/othergui.rst b/Doc/library/othergui.rst
index 48c1f2754111a..db11933b325f3 100644
--- a/Doc/library/othergui.rst
+++ b/Doc/library/othergui.rst
@@ -3,7 +3,7 @@
 Other Graphical User Interface Packages
 =======================================
 
-Major cross-platform (Windows, Mac OS X, Unix-like) GUI toolkits are
+Major cross-platform (Windows, macOS, Unix-like) GUI toolkits are
 available for Python:
 
 .. seealso::
@@ -26,7 +26,7 @@ available for Python:
    `PyQt <https://riverbankcomputing.com/software/pyqt/intro>`_
       PyQt is a :program:`sip`\ -wrapped binding to the Qt toolkit.  Qt is an
       extensive C++ GUI application development framework that is
-      available for Unix, Windows and Mac OS X. :program:`sip` is a tool
+      available for Unix, Windows and macOS. :program:`sip` is a tool
       for generating bindings for C++ libraries as Python classes, and
       is specifically designed for Python.
 
@@ -40,7 +40,7 @@ available for Python:
       wxPython is a cross-platform GUI toolkit for Python that is built around
       the popular `wxWidgets <https://www.wxwidgets.org/>`_ (formerly wxWindows)
       C++ toolkit.  It provides a native look and feel for applications on
-      Windows, Mac OS X, and Unix systems by using each platform's native
+      Windows, macOS, and Unix systems by using each platform's native
       widgets where ever possible, (GTK+ on Unix-like systems).  In addition to
       an extensive set of widgets, wxPython provides classes for online
       documentation and context sensitive help, printing, HTML viewing,


From webhook-mailer at python.org  Mon Aug  2 09:13:53 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 02 Aug 2021 13:13:53 -0000
Subject: [Python-checkins] doc: "Mac OS X" -> "macOS" (GH-27535)
Message-ID: <mailman.841.1627910033.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/5888107f330fe0153075924b48b780372e08fe10
commit: 5888107f330fe0153075924b48b780372e08fe10
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-02T06:13:48-07:00
summary:

doc: "Mac OS X" -> "macOS" (GH-27535)

(cherry picked from commit 414dcb13aaa4fd42f264fdee47782dede5c83d6c)

Co-authored-by: partev <petrosyan at gmail.com>

files:
M Doc/library/othergui.rst

diff --git a/Doc/library/othergui.rst b/Doc/library/othergui.rst
index 48c1f2754111a..db11933b325f3 100644
--- a/Doc/library/othergui.rst
+++ b/Doc/library/othergui.rst
@@ -3,7 +3,7 @@
 Other Graphical User Interface Packages
 =======================================
 
-Major cross-platform (Windows, Mac OS X, Unix-like) GUI toolkits are
+Major cross-platform (Windows, macOS, Unix-like) GUI toolkits are
 available for Python:
 
 .. seealso::
@@ -26,7 +26,7 @@ available for Python:
    `PyQt <https://riverbankcomputing.com/software/pyqt/intro>`_
       PyQt is a :program:`sip`\ -wrapped binding to the Qt toolkit.  Qt is an
       extensive C++ GUI application development framework that is
-      available for Unix, Windows and Mac OS X. :program:`sip` is a tool
+      available for Unix, Windows and macOS. :program:`sip` is a tool
       for generating bindings for C++ libraries as Python classes, and
       is specifically designed for Python.
 
@@ -40,7 +40,7 @@ available for Python:
       wxPython is a cross-platform GUI toolkit for Python that is built around
       the popular `wxWidgets <https://www.wxwidgets.org/>`_ (formerly wxWindows)
       C++ toolkit.  It provides a native look and feel for applications on
-      Windows, Mac OS X, and Unix systems by using each platform's native
+      Windows, macOS, and Unix systems by using each platform's native
       widgets where ever possible, (GTK+ on Unix-like systems).  In addition to
       an extensive set of widgets, wxPython provides classes for online
       documentation and context sensitive help, printing, HTML viewing,


From webhook-mailer at python.org  Mon Aug  2 09:13:57 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 02 Aug 2021 13:13:57 -0000
Subject: [Python-checkins] doc: "Mac OS " -> "macOS" (GH-27534) (GH-27549)
Message-ID: <mailman.842.1627910037.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/2ee09597f2418f5c038ad4f536ca87a324133d5c
commit: 2ee09597f2418f5c038ad4f536ca87a324133d5c
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-02T15:13:52+02:00
summary:

doc: "Mac OS " -> "macOS" (GH-27534) (GH-27549)

(cherry picked from commit 1342248f3a2b321b7b00867f47c92ba6549f9497)

Co-authored-by: partev <petrosyan at gmail.com>

files:
M Doc/library/platform.rst

diff --git a/Doc/library/platform.rst b/Doc/library/platform.rst
index b293adf48e6e3..49186ce371631 100644
--- a/Doc/library/platform.rst
+++ b/Doc/library/platform.rst
@@ -42,7 +42,7 @@ Cross Platform
 
    .. note::
 
-      On Mac OS X (and perhaps other platforms), executable files may be
+      On macOS (and perhaps other platforms), executable files may be
       universal files containing multiple architectures.
 
       To get at the "64-bitness" of the current interpreter, it is more


From webhook-mailer at python.org  Mon Aug  2 09:41:39 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 02 Aug 2021 13:41:39 -0000
Subject: [Python-checkins] bpo-44808: Fix test_inspect in refleak mode
 (GH-27544)
Message-ID: <mailman.843.1627911701.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/a1eaa74d9dcd973ec278cefc22aac7f514faee4b
commit: a1eaa74d9dcd973ec278cefc22aac7f514faee4b
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-02T06:41:08-07:00
summary:

bpo-44808: Fix test_inspect in refleak mode (GH-27544)

(cherry picked from commit 626d397cc1612ea5eef153dd910834c2ee00ddbd)

Co-authored-by: Pablo Galindo Salgado <Pablogsal at gmail.com>

files:
M Lib/test/test_inspect.py

diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
index b664c14020f35..157f315999c42 100644
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -587,11 +587,12 @@ def test_getsource_on_code_object(self):
 
 class TestGetsourceInteractive(unittest.TestCase):
     def tearDown(self):
-        mod.ParrotDroppings.__module__ = mod
+        mod.ParrotDroppings.__module__ = self.mod
         sys.modules['__main__'] = self.main
 
     def test_getclasses_interactive(self):
         self.main = sys.modules['__main__']
+        self.mod = mod.ParrotDroppings.__module__
         class MockModule:
             __file__ = None
         sys.modules['__main__'] = MockModule


From webhook-mailer at python.org  Mon Aug  2 09:54:41 2021
From: webhook-mailer at python.org (pablogsal)
Date: Mon, 02 Aug 2021 13:54:41 -0000
Subject: [Python-checkins] bpo-44206: Make sure that dict-keys's version is
 set to zero when value is popped (GH-27542)
Message-ID: <mailman.844.1627912481.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/e06ae75e16dbf46b6626b6a41b62391ea1fdb319
commit: e06ae75e16dbf46b6626b6a41b62391ea1fdb319
branch: main
author: Mark Shannon <mark at hotpy.org>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-08-02T14:54:23+01:00
summary:

bpo-44206: Make sure that dict-keys's version is set to zero when value is popped (GH-27542)

files:
M Lib/test/test_module.py
M Objects/dictobject.c

diff --git a/Lib/test/test_module.py b/Lib/test/test_module.py
index 6608dbc8a5a70..619348e0e40c0 100644
--- a/Lib/test/test_module.py
+++ b/Lib/test/test_module.py
@@ -332,6 +332,18 @@ def test_annotations_are_created_correctly(self):
         self.assertFalse("__annotations__" in ann_module4.__dict__)
 
 
+    def test_repeated_attribute_pops(self):
+        # Repeated accesses to module attribute will be specialized
+        # Check that popping the attribute doesn't break it
+        m = ModuleType("test")
+        d = m.__dict__
+        count = 0
+        for _ in range(100):
+            m.attr = 1
+            count += m.attr # Might be specialized
+            d.pop("attr")
+        self.assertEqual(count, 100)
+
     # frozen and namespace module reprs are tested in importlib.
 
 
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 7f1d38dd5f43f..5fb9d01561236 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -1798,6 +1798,7 @@ _PyDict_Pop_KnownHash(PyObject *dict, PyObject *key, Py_hash_t hash, PyObject *d
     assert(old_value != NULL);
     mp->ma_used--;
     mp->ma_version_tag = DICT_NEXT_VERSION();
+    mp->ma_keys->dk_version = 0;
     dictkeys_set_index(mp->ma_keys, hashpos, DKIX_DUMMY);
     ep = &DK_ENTRIES(mp->ma_keys)[ix];
     mp->ma_keys->dk_version = 0;


From webhook-mailer at python.org  Mon Aug  2 12:04:27 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 02 Aug 2021 16:04:27 -0000
Subject: [Python-checkins] build(deps): bump actions/stale from 3 to 4
 (#27526)
Message-ID: <mailman.845.1627920269.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/db3774d063bea27b80529efe781ae942986f0d17
commit: db3774d063bea27b80529efe781ae942986f0d17
branch: main
author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-02T18:04:18+02:00
summary:

build(deps): bump actions/stale from 3 to 4 (#27526)

Bumps [actions/stale](https://github.com/actions/stale) from 3 to 4.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v3...v4)

Signed-off-by: dependabot[bot] <support at github.com>

files:
M .github/workflows/stale.yml

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 26806fad814f1..e3b8b9f942d18 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/stale at v3
+    - uses: actions/stale at v4
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-pr-message: 'This PR is stale because it has been open for 30 days with no activity.'


From webhook-mailer at python.org  Mon Aug  2 12:11:21 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 02 Aug 2021 16:11:21 -0000
Subject: [Python-checkins] bpo-44785: Silence deprecation warnings in
 test_pickle (#27538)
Message-ID: <mailman.846.1627920682.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/36d952d228582b0ffc7a86c520d4ddbe8943d803
commit: 36d952d228582b0ffc7a86c520d4ddbe8943d803
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-02T18:11:12+02:00
summary:

bpo-44785: Silence deprecation warnings in test_pickle (#27538)

files:
M Lib/test/test_pickle.py

diff --git a/Lib/test/test_pickle.py b/Lib/test/test_pickle.py
index 23c7bd261e85c..f8b43a1eb666f 100644
--- a/Lib/test/test_pickle.py
+++ b/Lib/test/test_pickle.py
@@ -6,6 +6,7 @@
 import collections
 import struct
 import sys
+import warnings
 import weakref
 
 import unittest
@@ -367,7 +368,10 @@ def getmodule(module):
         return sys.modules[module]
     except KeyError:
         try:
-            __import__(module)
+            with warnings.catch_warnings():
+                action = 'always' if support.verbose else 'ignore'
+                warnings.simplefilter(action, DeprecationWarning)
+                __import__(module)
         except AttributeError as exc:
             if support.verbose:
                 print("Can't import module %r: %s" % (module, exc))


From webhook-mailer at python.org  Mon Aug  2 12:23:34 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 02 Aug 2021 16:23:34 -0000
Subject: [Python-checkins] bpo-44806: Fix __init__ in subclasses of
 protocols (GH-27545)
Message-ID: <mailman.847.1627921415.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/043cd60abed09edddc7185bcf7d039771acc734d
commit: 043cd60abed09edddc7185bcf7d039771acc734d
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-02T18:23:22+02:00
summary:

bpo-44806: Fix __init__ in subclasses of protocols (GH-27545)

Non-protocol subclasses of protocol ignore now the __init__ method
inherited from protocol base classes.

files:
A Misc/NEWS.d/next/Library/2021-08-02-14-37-32.bpo-44806.wOW_Qn.rst
M Lib/test/test_typing.py
M Lib/typing.py

diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index 6cd83a1586a13..1a172a06705de 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -881,6 +881,9 @@ class P(Protocol): pass
         class C(P): pass
 
         self.assertIsInstance(C(), C)
+        with self.assertRaises(TypeError):
+            C(42)
+
         T = TypeVar('T')
 
         class PG(Protocol[T]): pass
@@ -895,6 +898,8 @@ class PG(Protocol[T]): pass
         class CG(PG[T]): pass
 
         self.assertIsInstance(CG[int](), CG)
+        with self.assertRaises(TypeError):
+            CG[int](42)
 
     def test_cannot_instantiate_abstract(self):
         @runtime_checkable
@@ -1322,6 +1327,37 @@ def __init__(self):
 
         self.assertEqual(C[int]().test, 'OK')
 
+        class B:
+            def __init__(self):
+                self.test = 'OK'
+
+        class D1(B, P[T]):
+            pass
+
+        self.assertEqual(D1[int]().test, 'OK')
+
+        class D2(P[T], B):
+            pass
+
+        self.assertEqual(D2[int]().test, 'OK')
+
+    def test_new_called(self):
+        T = TypeVar('T')
+
+        class P(Protocol[T]): pass
+
+        class C(P[T]):
+            def __new__(cls, *args):
+                self = super().__new__(cls, *args)
+                self.test = 'OK'
+                return self
+
+        self.assertEqual(C[int]().test, 'OK')
+        with self.assertRaises(TypeError):
+            C[int](42)
+        with self.assertRaises(TypeError):
+            C[int](a=42)
+
     def test_protocols_bad_subscripts(self):
         T = TypeVar('T')
         S = TypeVar('S')
diff --git a/Lib/typing.py b/Lib/typing.py
index 16ad5ce7c2d04..7a12d31f2b35e 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -1381,8 +1381,7 @@ def _is_callable_members_only(cls):
 
 
 def _no_init(self, *args, **kwargs):
-    if type(self)._is_protocol:
-        raise TypeError('Protocols cannot be instantiated')
+    raise TypeError('Protocols cannot be instantiated')
 
 def _caller(depth=1, default='__main__'):
     try:
@@ -1522,6 +1521,15 @@ def _proto_hook(other):
 
         # We have nothing more to do for non-protocols...
         if not cls._is_protocol:
+            if cls.__init__ == _no_init:
+                for base in cls.__mro__:
+                    init = base.__dict__.get('__init__', _no_init)
+                    if init != _no_init:
+                        cls.__init__ = init
+                        break
+                else:
+                    # should not happen
+                    cls.__init__ = object.__init__
             return
 
         # ... otherwise check consistency of bases, and prohibit instantiation.
diff --git a/Misc/NEWS.d/next/Library/2021-08-02-14-37-32.bpo-44806.wOW_Qn.rst b/Misc/NEWS.d/next/Library/2021-08-02-14-37-32.bpo-44806.wOW_Qn.rst
new file mode 100644
index 0000000000000..6d818c3fc5798
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-02-14-37-32.bpo-44806.wOW_Qn.rst
@@ -0,0 +1,2 @@
+Non-protocol subclasses of :class:`typing.Protocol` ignore now the
+``__init__`` method inherited from protocol base classes.


From webhook-mailer at python.org  Mon Aug  2 12:27:07 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 02 Aug 2021 16:27:07 -0000
Subject: [Python-checkins] Document PyMember_GetOne and PyMember_SetOne
 (GH-27555)
Message-ID: <mailman.848.1627921628.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/d382bde220b4c07cce2b924ffeb7525ea1a969f4
commit: d382bde220b4c07cce2b924ffeb7525ea1a969f4
branch: main
author: Ken Jin <28750310+Fidget-Spinner at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-02T18:26:57+02:00
summary:

Document PyMember_GetOne and PyMember_SetOne (GH-27555)

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

diff --git a/Doc/c-api/structures.rst b/Doc/c-api/structures.rst
index 20d5485d5544c..05c54ccc8dab5 100644
--- a/Doc/c-api/structures.rst
+++ b/Doc/c-api/structures.rst
@@ -469,6 +469,21 @@ Accessing attributes of extension types
           {NULL}  /* Sentinel */
       };
 
+
+.. c:function:: PyObject* PyMember_GetOne(const char *obj_addr, struct PyMemberDef *m)
+
+   Get an attribute belonging to the object at address *obj_addr*.  The
+   attribute is described by ``PyMemberDef`` *m*.  Returns ``NULL``
+   on error.
+
+
+.. c:function:: int PyMember_SetOne(char *obj_addr, struct PyMemberDef *m, PyObject *o)
+
+   Set an attribute belonging to the object at address *obj_addr* to object *o*.
+   The attribute to set is described by ``PyMemberDef`` *m*.  Returns ``0``
+   if successful and a negative value on failure.
+
+
 .. c:type:: PyGetSetDef
 
    Structure to define property-like access for a type. See also description of


From webhook-mailer at python.org  Mon Aug  2 12:30:15 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 02 Aug 2021 16:30:15 -0000
Subject: [Python-checkins] doc: "Mac OS " -> "macOS" (GH-27534)
Message-ID: <mailman.849.1627921816.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/7c89bddd2f7d2fa8ff82782caccdc9706f804313
commit: 7c89bddd2f7d2fa8ff82782caccdc9706f804313
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-02T09:30:05-07:00
summary:

doc: "Mac OS " -> "macOS" (GH-27534)

(cherry picked from commit 1342248f3a2b321b7b00867f47c92ba6549f9497)

Co-authored-by: partev <petrosyan at gmail.com>

files:
M Doc/library/platform.rst

diff --git a/Doc/library/platform.rst b/Doc/library/platform.rst
index be86e568c180b..bb9fc45df233b 100644
--- a/Doc/library/platform.rst
+++ b/Doc/library/platform.rst
@@ -42,7 +42,7 @@ Cross Platform
 
    .. note::
 
-      On Mac OS X (and perhaps other platforms), executable files may be
+      On macOS (and perhaps other platforms), executable files may be
       universal files containing multiple architectures.
 
       To get at the "64-bitness" of the current interpreter, it is more


From webhook-mailer at python.org  Mon Aug  2 12:39:33 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 02 Aug 2021 16:39:33 -0000
Subject: [Python-checkins] bpo-44785: Silence deprecation warnings in
 test_pickle (GH-27538) (#27557)
Message-ID: <mailman.850.1627922374.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/4817c1439519081d7bd9b396bb18b0f4124613be
commit: 4817c1439519081d7bd9b396bb18b0f4124613be
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-02T18:39:25+02:00
summary:

bpo-44785: Silence deprecation warnings in test_pickle (GH-27538) (#27557)

(cherry picked from commit 36d952d228582b0ffc7a86c520d4ddbe8943d803)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
M Lib/test/test_pickle.py

diff --git a/Lib/test/test_pickle.py b/Lib/test/test_pickle.py
index 2307b133dbd0d..70672dc19cf4a 100644
--- a/Lib/test/test_pickle.py
+++ b/Lib/test/test_pickle.py
@@ -6,6 +6,7 @@
 import collections
 import struct
 import sys
+import warnings
 import weakref
 
 import unittest
@@ -366,7 +367,10 @@ def getmodule(module):
         return sys.modules[module]
     except KeyError:
         try:
-            __import__(module)
+            with warnings.catch_warnings():
+                action = 'always' if support.verbose else 'ignore'
+                warnings.simplefilter(action, DeprecationWarning)
+                __import__(module)
         except AttributeError as exc:
             if support.verbose:
                 print("Can't import module %r: %s" % (module, exc))


From webhook-mailer at python.org  Mon Aug  2 12:52:33 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 02 Aug 2021 16:52:33 -0000
Subject: [Python-checkins] bpo-44806: Fix __init__ in subclasses of
 protocols (GH-27545) (GH-27559)
Message-ID: <mailman.851.1627923154.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/0f6a7739df0055b5c6abe2180f1be97ea4da87b7
commit: 0f6a7739df0055b5c6abe2180f1be97ea4da87b7
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-02T18:52:16+02:00
summary:

bpo-44806: Fix __init__ in subclasses of protocols (GH-27545) (GH-27559)

Non-protocol subclasses of protocol ignore now the __init__ method
inherited from protocol base classes.
(cherry picked from commit 043cd60abed09edddc7185bcf7d039771acc734d)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
A Misc/NEWS.d/next/Library/2021-08-02-14-37-32.bpo-44806.wOW_Qn.rst
M Lib/test/test_typing.py
M Lib/typing.py

diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index 6abd07ec3f540..e05ac4539fb50 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -745,6 +745,9 @@ class P(Protocol): pass
         class C(P): pass
 
         self.assertIsInstance(C(), C)
+        with self.assertRaises(TypeError):
+            C(42)
+
         T = TypeVar('T')
 
         class PG(Protocol[T]): pass
@@ -759,6 +762,8 @@ class PG(Protocol[T]): pass
         class CG(PG[T]): pass
 
         self.assertIsInstance(CG[int](), CG)
+        with self.assertRaises(TypeError):
+            CG[int](42)
 
     def test_cannot_instantiate_abstract(self):
         @runtime_checkable
@@ -1194,6 +1199,37 @@ def __init__(self):
 
         self.assertEqual(C[int]().test, 'OK')
 
+        class B:
+            def __init__(self):
+                self.test = 'OK'
+
+        class D1(B, P[T]):
+            pass
+
+        self.assertEqual(D1[int]().test, 'OK')
+
+        class D2(P[T], B):
+            pass
+
+        self.assertEqual(D2[int]().test, 'OK')
+
+    def test_new_called(self):
+        T = TypeVar('T')
+
+        class P(Protocol[T]): pass
+
+        class C(P[T]):
+            def __new__(cls, *args):
+                self = super().__new__(cls, *args)
+                self.test = 'OK'
+                return self
+
+        self.assertEqual(C[int]().test, 'OK')
+        with self.assertRaises(TypeError):
+            C[int](42)
+        with self.assertRaises(TypeError):
+            C[int](a=42)
+
     def test_protocols_bad_subscripts(self):
         T = TypeVar('T')
         S = TypeVar('S')
diff --git a/Lib/typing.py b/Lib/typing.py
index 5f75a2728055a..894b2d905114c 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -1080,8 +1080,7 @@ def _is_callable_members_only(cls):
 
 
 def _no_init(self, *args, **kwargs):
-    if type(self)._is_protocol:
-        raise TypeError('Protocols cannot be instantiated')
+    raise TypeError('Protocols cannot be instantiated')
 
 
 def _allow_reckless_class_cheks():
@@ -1210,6 +1209,15 @@ def _proto_hook(other):
 
         # We have nothing more to do for non-protocols...
         if not cls._is_protocol:
+            if cls.__init__ == _no_init:
+                for base in cls.__mro__:
+                    init = base.__dict__.get('__init__', _no_init)
+                    if init != _no_init:
+                        cls.__init__ = init
+                        break
+                else:
+                    # should not happen
+                    cls.__init__ = object.__init__
             return
 
         # ... otherwise check consistency of bases, and prohibit instantiation.
diff --git a/Misc/NEWS.d/next/Library/2021-08-02-14-37-32.bpo-44806.wOW_Qn.rst b/Misc/NEWS.d/next/Library/2021-08-02-14-37-32.bpo-44806.wOW_Qn.rst
new file mode 100644
index 0000000000000..6d818c3fc5798
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-02-14-37-32.bpo-44806.wOW_Qn.rst
@@ -0,0 +1,2 @@
+Non-protocol subclasses of :class:`typing.Protocol` ignore now the
+``__init__`` method inherited from protocol base classes.


From webhook-mailer at python.org  Mon Aug  2 12:54:05 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 02 Aug 2021 16:54:05 -0000
Subject: [Python-checkins] Document PyMember_GetOne and PyMember_SetOne
 (GH-27555) (GH-27561)
Message-ID: <mailman.852.1627923246.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/77a96da55616950f5e391c78baaf4b2b8ee3811c
commit: 77a96da55616950f5e391c78baaf4b2b8ee3811c
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-02T18:53:55+02:00
summary:

Document PyMember_GetOne and PyMember_SetOne (GH-27555) (GH-27561)

(cherry picked from commit d382bde220b4c07cce2b924ffeb7525ea1a969f4)

Co-authored-by: Ken Jin <28750310+Fidget-Spinner at users.noreply.github.com>

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

diff --git a/Doc/c-api/structures.rst b/Doc/c-api/structures.rst
index 0a0e03ff77ce6..1e30d408ab6d1 100644
--- a/Doc/c-api/structures.rst
+++ b/Doc/c-api/structures.rst
@@ -436,6 +436,21 @@ Accessing attributes of extension types
           {NULL}  /* Sentinel */
       };
 
+
+.. c:function:: PyObject* PyMember_GetOne(const char *obj_addr, struct PyMemberDef *m)
+
+   Get an attribute belonging to the object at address *obj_addr*.  The
+   attribute is described by ``PyMemberDef`` *m*.  Returns ``NULL``
+   on error.
+
+
+.. c:function:: int PyMember_SetOne(char *obj_addr, struct PyMemberDef *m, PyObject *o)
+
+   Set an attribute belonging to the object at address *obj_addr* to object *o*.
+   The attribute to set is described by ``PyMemberDef`` *m*.  Returns ``0``
+   if successful and a negative value on failure.
+
+
 .. c:type:: PyGetSetDef
 
    Structure to define property-like access for a type. See also description of


From webhook-mailer at python.org  Mon Aug  2 13:02:03 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 02 Aug 2021 17:02:03 -0000
Subject: [Python-checkins] bpo-35183: Add typical examples to
 os.path.splitext docs (GH-27286)
Message-ID: <mailman.853.1627923724.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/aa0894b3792901adb91e5f6d049154b7bcb980ec
commit: aa0894b3792901adb91e5f6d049154b7bcb980ec
branch: main
author: Jake Stockwin <jake.stockwin at optimorlabs.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-02T19:01:53+02:00
summary:

bpo-35183: Add typical examples to os.path.splitext docs (GH-27286)

files:
A Misc/NEWS.d/next/Documentation/2021-07-22-08-28-03.bpo-35183.p9BWTB.rst
M Doc/library/os.path.rst

diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst
index e2f43424df15e1..a66b3c5a3a9902 100644
--- a/Doc/library/os.path.rst
+++ b/Doc/library/os.path.rst
@@ -470,12 +470,16 @@ the :mod:`glob` module.)
    On Windows, splits a pathname into drive/UNC sharepoint and relative path.
 
    If the path contains a drive letter, drive will contain everything
-   up to and including the colon.
-   e.g. ``splitdrive("c:/dir")`` returns ``("c:", "/dir")``
+   up to and including the colon::
+
+      >>> splitdrive("c:/dir")
+      ("c:", "/dir")
 
    If the path contains a UNC path, drive will contain the host name
-   and share, up to but not including the fourth separator.
-   e.g. ``splitdrive("//host/computer/dir")`` returns ``("//host/computer", "/dir")``
+   and share, up to but not including the fourth separator::
+
+      >>> splitdrive("//host/computer/dir")
+      ("//host/computer", "/dir")
 
    .. versionchanged:: 3.6
       Accepts a :term:`path-like object`.
@@ -484,9 +488,24 @@ the :mod:`glob` module.)
 .. function:: splitext(path)
 
    Split the pathname *path* into a pair ``(root, ext)``  such that ``root + ext ==
-   path``, and *ext* is empty or begins with a period and contains at most one
-   period. Leading periods on the basename are  ignored; ``splitext('.cshrc')``
-   returns  ``('.cshrc', '')``.
+   path``, and the extension, *ext*, is empty or begins with a period and contains at
+   most one period.
+
+   If the path contains no extension, *ext* will be ``''``::
+
+      >>> splitext('bar')
+      ('bar', '')
+
+   If the path contains an extension, then *ext* will be set to this extension,
+   including the leading period. Note that previous periods will be ignored::
+
+      >>> splitext('foo.bar.exe')
+      ('foo.bar', '.exe')
+
+   Leading periods on the basename are ignored::
+
+      >>> splitext('.cshrc')
+      ('.cshrc', '')
 
    .. versionchanged:: 3.6
       Accepts a :term:`path-like object`.
diff --git a/Misc/NEWS.d/next/Documentation/2021-07-22-08-28-03.bpo-35183.p9BWTB.rst b/Misc/NEWS.d/next/Documentation/2021-07-22-08-28-03.bpo-35183.p9BWTB.rst
new file mode 100644
index 00000000000000..02c5fe82611fbf
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2021-07-22-08-28-03.bpo-35183.p9BWTB.rst
@@ -0,0 +1 @@
+Add typical examples to os.path.splitext docs
\ No newline at end of file


From webhook-mailer at python.org  Mon Aug  2 13:08:58 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 02 Aug 2021 17:08:58 -0000
Subject: [Python-checkins] Document PyMember_GetOne and PyMember_SetOne
 (GH-27555)
Message-ID: <mailman.854.1627924139.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/9de590151d49f2988d3a5c4d30b9daf86616f6f3
commit: 9de590151d49f2988d3a5c4d30b9daf86616f6f3
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-02T10:08:49-07:00
summary:

Document PyMember_GetOne and PyMember_SetOne (GH-27555)

(cherry picked from commit d382bde220b4c07cce2b924ffeb7525ea1a969f4)

Co-authored-by: Ken Jin <28750310+Fidget-Spinner at users.noreply.github.com>

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

diff --git a/Doc/c-api/structures.rst b/Doc/c-api/structures.rst
index 20d5485d5544c..05c54ccc8dab5 100644
--- a/Doc/c-api/structures.rst
+++ b/Doc/c-api/structures.rst
@@ -469,6 +469,21 @@ Accessing attributes of extension types
           {NULL}  /* Sentinel */
       };
 
+
+.. c:function:: PyObject* PyMember_GetOne(const char *obj_addr, struct PyMemberDef *m)
+
+   Get an attribute belonging to the object at address *obj_addr*.  The
+   attribute is described by ``PyMemberDef`` *m*.  Returns ``NULL``
+   on error.
+
+
+.. c:function:: int PyMember_SetOne(char *obj_addr, struct PyMemberDef *m, PyObject *o)
+
+   Set an attribute belonging to the object at address *obj_addr* to object *o*.
+   The attribute to set is described by ``PyMemberDef`` *m*.  Returns ``0``
+   if successful and a negative value on failure.
+
+
 .. c:type:: PyGetSetDef
 
    Structure to define property-like access for a type. See also description of


From webhook-mailer at python.org  Mon Aug  2 13:09:08 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 02 Aug 2021 17:09:08 -0000
Subject: [Python-checkins] bpo-44806: Fix __init__ in subclasses of
 protocols (GH-27545)
Message-ID: <mailman.855.1627924149.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/2cc19a5463c804b2f39b94de896d55dcb57a364c
commit: 2cc19a5463c804b2f39b94de896d55dcb57a364c
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-02T10:08:59-07:00
summary:

bpo-44806: Fix __init__ in subclasses of protocols (GH-27545)


Non-protocol subclasses of protocol ignore now the __init__ method
inherited from protocol base classes.
(cherry picked from commit 043cd60abed09edddc7185bcf7d039771acc734d)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
A Misc/NEWS.d/next/Library/2021-08-02-14-37-32.bpo-44806.wOW_Qn.rst
M Lib/test/test_typing.py
M Lib/typing.py

diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index 3d9a347dcb707..6e557c4783338 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -875,6 +875,9 @@ class P(Protocol): pass
         class C(P): pass
 
         self.assertIsInstance(C(), C)
+        with self.assertRaises(TypeError):
+            C(42)
+
         T = TypeVar('T')
 
         class PG(Protocol[T]): pass
@@ -889,6 +892,8 @@ class PG(Protocol[T]): pass
         class CG(PG[T]): pass
 
         self.assertIsInstance(CG[int](), CG)
+        with self.assertRaises(TypeError):
+            CG[int](42)
 
     def test_cannot_instantiate_abstract(self):
         @runtime_checkable
@@ -1316,6 +1321,37 @@ def __init__(self):
 
         self.assertEqual(C[int]().test, 'OK')
 
+        class B:
+            def __init__(self):
+                self.test = 'OK'
+
+        class D1(B, P[T]):
+            pass
+
+        self.assertEqual(D1[int]().test, 'OK')
+
+        class D2(P[T], B):
+            pass
+
+        self.assertEqual(D2[int]().test, 'OK')
+
+    def test_new_called(self):
+        T = TypeVar('T')
+
+        class P(Protocol[T]): pass
+
+        class C(P[T]):
+            def __new__(cls, *args):
+                self = super().__new__(cls, *args)
+                self.test = 'OK'
+                return self
+
+        self.assertEqual(C[int]().test, 'OK')
+        with self.assertRaises(TypeError):
+            C[int](42)
+        with self.assertRaises(TypeError):
+            C[int](a=42)
+
     def test_protocols_bad_subscripts(self):
         T = TypeVar('T')
         S = TypeVar('S')
diff --git a/Lib/typing.py b/Lib/typing.py
index e492bd2ee916b..6f884e1fe9860 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -1379,8 +1379,7 @@ def _is_callable_members_only(cls):
 
 
 def _no_init(self, *args, **kwargs):
-    if type(self)._is_protocol:
-        raise TypeError('Protocols cannot be instantiated')
+    raise TypeError('Protocols cannot be instantiated')
 
 def _caller(depth=1, default='__main__'):
     try:
@@ -1523,6 +1522,15 @@ def _proto_hook(other):
 
         # We have nothing more to do for non-protocols...
         if not cls._is_protocol:
+            if cls.__init__ == _no_init:
+                for base in cls.__mro__:
+                    init = base.__dict__.get('__init__', _no_init)
+                    if init != _no_init:
+                        cls.__init__ = init
+                        break
+                else:
+                    # should not happen
+                    cls.__init__ = object.__init__
             return
 
         # ... otherwise check consistency of bases, and prohibit instantiation.
diff --git a/Misc/NEWS.d/next/Library/2021-08-02-14-37-32.bpo-44806.wOW_Qn.rst b/Misc/NEWS.d/next/Library/2021-08-02-14-37-32.bpo-44806.wOW_Qn.rst
new file mode 100644
index 0000000000000..6d818c3fc5798
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-02-14-37-32.bpo-44806.wOW_Qn.rst
@@ -0,0 +1,2 @@
+Non-protocol subclasses of :class:`typing.Protocol` ignore now the
+``__init__`` method inherited from protocol base classes.


From webhook-mailer at python.org  Mon Aug  2 13:09:09 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 02 Aug 2021 17:09:09 -0000
Subject: [Python-checkins] bpo-44785: Silence deprecation warnings in
 test_pickle (GH-27538)
Message-ID: <mailman.856.1627924150.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/aa7266854abc63524b4be40a3a83977b8ad166c6
commit: aa7266854abc63524b4be40a3a83977b8ad166c6
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-02T10:09:05-07:00
summary:

bpo-44785: Silence deprecation warnings in test_pickle (GH-27538)

(cherry picked from commit 36d952d228582b0ffc7a86c520d4ddbe8943d803)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
M Lib/test/test_pickle.py

diff --git a/Lib/test/test_pickle.py b/Lib/test/test_pickle.py
index 23c7bd261e85c..f8b43a1eb666f 100644
--- a/Lib/test/test_pickle.py
+++ b/Lib/test/test_pickle.py
@@ -6,6 +6,7 @@
 import collections
 import struct
 import sys
+import warnings
 import weakref
 
 import unittest
@@ -367,7 +368,10 @@ def getmodule(module):
         return sys.modules[module]
     except KeyError:
         try:
-            __import__(module)
+            with warnings.catch_warnings():
+                action = 'always' if support.verbose else 'ignore'
+                warnings.simplefilter(action, DeprecationWarning)
+                __import__(module)
         except AttributeError as exc:
             if support.verbose:
                 print("Can't import module %r: %s" % (module, exc))


From webhook-mailer at python.org  Mon Aug  2 13:11:45 2021
From: webhook-mailer at python.org (pablogsal)
Date: Mon, 02 Aug 2021 17:11:45 -0000
Subject: [Python-checkins] bpo-44792: Improve syntax errors for if
 expressions (GH-27506)
Message-ID: <mailman.857.1627924306.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/28b6dc9dd5d1ce6f8aff7e06d4ef9afdc2bc8332
commit: 28b6dc9dd5d1ce6f8aff7e06d4ef9afdc2bc8332
branch: main
author: Miguel Brito <5544985+miguendes at users.noreply.github.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-08-02T18:11:37+01:00
summary:

bpo-44792: Improve syntax errors for if expressions (GH-27506)

files:
A Misc/NEWS.d/next/Core and Builtins/2021-07-31-12-12-57.bpo-44792.mOReTW.rst
M Grammar/python.gram
M Lib/test/test_syntax.py
M Misc/ACKS
M Parser/parser.c

diff --git a/Grammar/python.gram b/Grammar/python.gram
index 8a21056d2a82b..91d8a694d1e8b 100644
--- a/Grammar/python.gram
+++ b/Grammar/python.gram
@@ -1083,6 +1083,7 @@ invalid_expression:
     # Soft keywords need to also be ignored because they can be parsed as NAME NAME
    | !(NAME STRING | SOFT_KEYWORD) a=disjunction b=expression_without_invalid {
         RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "invalid syntax. Perhaps you forgot a comma?") }
+   | a=disjunction 'if' b=disjunction !'else' { RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "expected 'else' after 'if' expression") }
 
 invalid_named_expression:
     | a=expression ':=' expression {
diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
index 6e1531e8b25fc..d5a52ba628a81 100644
--- a/Lib/test/test_syntax.py
+++ b/Lib/test/test_syntax.py
@@ -140,6 +140,18 @@
 Traceback (most recent call last):
 SyntaxError: cannot assign to conditional expression
 
+>>> a = 42 if True
+Traceback (most recent call last):
+SyntaxError: expected 'else' after 'if' expression
+
+>>> a = (42 if True)
+Traceback (most recent call last):
+SyntaxError: expected 'else' after 'if' expression
+
+>>> a = [1, 42 if True, 4]
+Traceback (most recent call last):
+SyntaxError: expected 'else' after 'if' expression
+
 >>> True = True = 3
 Traceback (most recent call last):
 SyntaxError: cannot assign to True
diff --git a/Misc/ACKS b/Misc/ACKS
index ac10be97ae3d9..97a360c8ecfc3 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -227,6 +227,7 @@ Tom Bridgman
 Anthony Briggs
 Keith Briggs
 Tobias Brink
+Miguel Brito
 Dillon Brock
 Richard Brodie
 Michael Broghton
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-07-31-12-12-57.bpo-44792.mOReTW.rst b/Misc/NEWS.d/next/Core and Builtins/2021-07-31-12-12-57.bpo-44792.mOReTW.rst
new file mode 100644
index 0000000000000..2e9000d09ee44
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-07-31-12-12-57.bpo-44792.mOReTW.rst	
@@ -0,0 +1 @@
+Improve syntax errors for if expressions. Patch by Miguel Brito
diff --git a/Parser/parser.c b/Parser/parser.c
index 7a106a437bc31..5db7c3a4a2f1c 100644
--- a/Parser/parser.c
+++ b/Parser/parser.c
@@ -18207,6 +18207,7 @@ invalid_legacy_expression_rule(Parser *p)
 // invalid_expression:
 //     | invalid_legacy_expression
 //     | !(NAME STRING | SOFT_KEYWORD) disjunction expression_without_invalid
+//     | disjunction 'if' disjunction !'else'
 static void *
 invalid_expression_rule(Parser *p)
 {
@@ -18265,6 +18266,38 @@ invalid_expression_rule(Parser *p)
         D(fprintf(stderr, "%*c%s invalid_expression[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "!(NAME STRING | SOFT_KEYWORD) disjunction expression_without_invalid"));
     }
+    { // disjunction 'if' disjunction !'else'
+        if (p->error_indicator) {
+            D(p->level--);
+            return NULL;
+        }
+        D(fprintf(stderr, "%*c> invalid_expression[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "disjunction 'if' disjunction !'else'"));
+        Token * _keyword;
+        expr_ty a;
+        expr_ty b;
+        if (
+            (a = disjunction_rule(p))  // disjunction
+            &&
+            (_keyword = _PyPegen_expect_token(p, 510))  // token='if'
+            &&
+            (b = disjunction_rule(p))  // disjunction
+            &&
+            _PyPegen_lookahead_with_int(0, _PyPegen_expect_token, p, 518)  // token='else'
+        )
+        {
+            D(fprintf(stderr, "%*c+ invalid_expression[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "disjunction 'if' disjunction !'else'"));
+            _res = RAISE_SYNTAX_ERROR_KNOWN_RANGE ( a , b , "expected 'else' after 'if' expression" );
+            if (_res == NULL && PyErr_Occurred()) {
+                p->error_indicator = 1;
+                D(p->level--);
+                return NULL;
+            }
+            goto done;
+        }
+        p->mark = _mark;
+        D(fprintf(stderr, "%*c%s invalid_expression[%d-%d]: %s failed!\n", p->level, ' ',
+                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "disjunction 'if' disjunction !'else'"));
+    }
     _res = NULL;
   done:
     D(p->level--);


From webhook-mailer at python.org  Mon Aug  2 14:08:36 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 02 Aug 2021 18:08:36 -0000
Subject: [Python-checkins] bpo-35183: Add typical examples to
 os.path.splitext docs (GH-27286) (GH-27564)
Message-ID: <mailman.858.1627927716.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/e0d599fa48032eb7b8d837f8412bbca72b6ad820
commit: e0d599fa48032eb7b8d837f8412bbca72b6ad820
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-02T20:08:10+02:00
summary:

bpo-35183: Add typical examples to os.path.splitext docs (GH-27286) (GH-27564)

(cherry picked from commit aa0894b3792901adb91e5f6d049154b7bcb980ec)

Co-authored-by: Jake Stockwin <jake.stockwin at optimorlabs.com>

files:
A Misc/NEWS.d/next/Documentation/2021-07-22-08-28-03.bpo-35183.p9BWTB.rst
M Doc/library/os.path.rst

diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst
index 3be513e9099c78..729649200209b3 100644
--- a/Doc/library/os.path.rst
+++ b/Doc/library/os.path.rst
@@ -458,12 +458,16 @@ the :mod:`glob` module.)
    On Windows, splits a pathname into drive/UNC sharepoint and relative path.
 
    If the path contains a drive letter, drive will contain everything
-   up to and including the colon.
-   e.g. ``splitdrive("c:/dir")`` returns ``("c:", "/dir")``
+   up to and including the colon::
+
+      >>> splitdrive("c:/dir")
+      ("c:", "/dir")
 
    If the path contains a UNC path, drive will contain the host name
-   and share, up to but not including the fourth separator.
-   e.g. ``splitdrive("//host/computer/dir")`` returns ``("//host/computer", "/dir")``
+   and share, up to but not including the fourth separator::
+
+      >>> splitdrive("//host/computer/dir")
+      ("//host/computer", "/dir")
 
    .. versionchanged:: 3.6
       Accepts a :term:`path-like object`.
@@ -472,9 +476,24 @@ the :mod:`glob` module.)
 .. function:: splitext(path)
 
    Split the pathname *path* into a pair ``(root, ext)``  such that ``root + ext ==
-   path``, and *ext* is empty or begins with a period and contains at most one
-   period. Leading periods on the basename are  ignored; ``splitext('.cshrc')``
-   returns  ``('.cshrc', '')``.
+   path``, and the extension, *ext*, is empty or begins with a period and contains at
+   most one period.
+
+   If the path contains no extension, *ext* will be ``''``::
+
+      >>> splitext('bar')
+      ('bar', '')
+
+   If the path contains an extension, then *ext* will be set to this extension,
+   including the leading period. Note that previous periods will be ignored::
+
+      >>> splitext('foo.bar.exe')
+      ('foo.bar', '.exe')
+
+   Leading periods on the basename are ignored::
+
+      >>> splitext('.cshrc')
+      ('.cshrc', '')
 
    .. versionchanged:: 3.6
       Accepts a :term:`path-like object`.
diff --git a/Misc/NEWS.d/next/Documentation/2021-07-22-08-28-03.bpo-35183.p9BWTB.rst b/Misc/NEWS.d/next/Documentation/2021-07-22-08-28-03.bpo-35183.p9BWTB.rst
new file mode 100644
index 00000000000000..02c5fe82611fbf
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2021-07-22-08-28-03.bpo-35183.p9BWTB.rst
@@ -0,0 +1 @@
+Add typical examples to os.path.splitext docs
\ No newline at end of file


From webhook-mailer at python.org  Mon Aug  2 14:10:54 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 02 Aug 2021 18:10:54 -0000
Subject: [Python-checkins] bpo-35183: Add typical examples to
 os.path.splitext docs (GH-27286) (GH-27563)
Message-ID: <mailman.859.1627927856.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/14cb669357bc30bdc235d1c32ee1b99be05ac9d8
commit: 14cb669357bc30bdc235d1c32ee1b99be05ac9d8
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-02T20:10:47+02:00
summary:

bpo-35183: Add typical examples to os.path.splitext docs (GH-27286) (GH-27563)

(cherry picked from commit aa0894b3792901adb91e5f6d049154b7bcb980ec)

Co-authored-by: Jake Stockwin <jake.stockwin at optimorlabs.com>

files:
A Misc/NEWS.d/next/Documentation/2021-07-22-08-28-03.bpo-35183.p9BWTB.rst
M Doc/library/os.path.rst

diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst
index e2f43424df15e1..a66b3c5a3a9902 100644
--- a/Doc/library/os.path.rst
+++ b/Doc/library/os.path.rst
@@ -470,12 +470,16 @@ the :mod:`glob` module.)
    On Windows, splits a pathname into drive/UNC sharepoint and relative path.
 
    If the path contains a drive letter, drive will contain everything
-   up to and including the colon.
-   e.g. ``splitdrive("c:/dir")`` returns ``("c:", "/dir")``
+   up to and including the colon::
+
+      >>> splitdrive("c:/dir")
+      ("c:", "/dir")
 
    If the path contains a UNC path, drive will contain the host name
-   and share, up to but not including the fourth separator.
-   e.g. ``splitdrive("//host/computer/dir")`` returns ``("//host/computer", "/dir")``
+   and share, up to but not including the fourth separator::
+
+      >>> splitdrive("//host/computer/dir")
+      ("//host/computer", "/dir")
 
    .. versionchanged:: 3.6
       Accepts a :term:`path-like object`.
@@ -484,9 +488,24 @@ the :mod:`glob` module.)
 .. function:: splitext(path)
 
    Split the pathname *path* into a pair ``(root, ext)``  such that ``root + ext ==
-   path``, and *ext* is empty or begins with a period and contains at most one
-   period. Leading periods on the basename are  ignored; ``splitext('.cshrc')``
-   returns  ``('.cshrc', '')``.
+   path``, and the extension, *ext*, is empty or begins with a period and contains at
+   most one period.
+
+   If the path contains no extension, *ext* will be ``''``::
+
+      >>> splitext('bar')
+      ('bar', '')
+
+   If the path contains an extension, then *ext* will be set to this extension,
+   including the leading period. Note that previous periods will be ignored::
+
+      >>> splitext('foo.bar.exe')
+      ('foo.bar', '.exe')
+
+   Leading periods on the basename are ignored::
+
+      >>> splitext('.cshrc')
+      ('.cshrc', '')
 
    .. versionchanged:: 3.6
       Accepts a :term:`path-like object`.
diff --git a/Misc/NEWS.d/next/Documentation/2021-07-22-08-28-03.bpo-35183.p9BWTB.rst b/Misc/NEWS.d/next/Documentation/2021-07-22-08-28-03.bpo-35183.p9BWTB.rst
new file mode 100644
index 00000000000000..02c5fe82611fbf
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2021-07-22-08-28-03.bpo-35183.p9BWTB.rst
@@ -0,0 +1 @@
+Add typical examples to os.path.splitext docs
\ No newline at end of file


From webhook-mailer at python.org  Mon Aug  2 14:15:54 2021
From: webhook-mailer at python.org (rhettinger)
Date: Mon, 02 Aug 2021 18:15:54 -0000
Subject: [Python-checkins] bpo-44782: Improve OrderedDict recipe for LRU
 cache variants (GH-27536)
Message-ID: <mailman.860.1627928155.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/54f185b6d321a6354aef2b2886c766677f487ecb
commit: 54f185b6d321a6354aef2b2886c766677f487ecb
branch: main
author: Raymond Hettinger <rhettinger at users.noreply.github.com>
committer: rhettinger <rhettinger at users.noreply.github.com>
date: 2021-08-02T13:15:45-05:00
summary:

bpo-44782: Improve OrderedDict recipe for LRU cache variants (GH-27536)

files:
M Doc/library/collections.rst

diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
index 2a0bc049f88dd..b1779a5b2382e 100644
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -1171,27 +1171,43 @@ original insertion position is changed and moved to the end::
             self.move_to_end(key)
 
 An :class:`OrderedDict` would also be useful for implementing
-variants of :func:`functools.lru_cache`::
+variants of :func:`functools.lru_cache`:
 
-    class LRU(OrderedDict):
-        'Limit size, evicting the least recently looked-up key when full'
+.. testcode::
 
-        def __init__(self, maxsize=128, /, *args, **kwds):
-            self.maxsize = maxsize
-            super().__init__(*args, **kwds)
+    class LRU:
 
-        def __getitem__(self, key):
-            value = super().__getitem__(key)
-            self.move_to_end(key)
+        def __init__(self, func, maxsize=128):
+            self.func = func
+            self.maxsize = maxsize
+            self.cache = OrderedDict()
+
+        def __call__(self, *args):
+            if args in self.cache:
+                value = self.cache[args]
+                self.cache.move_to_end(args)
+                return value
+            value = self.func(*args)
+            if len(self.cache) >= self.maxsize:
+                self.cache.popitem(False)
+            self.cache[args] = value
             return value
 
-        def __setitem__(self, key, value):
-            if key in self:
-                self.move_to_end(key)
-            super().__setitem__(key, value)
-            if len(self) > self.maxsize:
-                oldest = next(iter(self))
-                del self[oldest]
+.. doctest::
+    :hide:
+
+    >>> def square(x):
+    ...     return x ** 2
+    ...
+    >>> s = LRU(square, maxsize=5)
+    >>> actual = [(s(x), s(x)) for x in range(20)]
+    >>> expected = [(x**2, x**2) for x in range(20)]
+    >>> actual == expected
+    True
+    >>> actual = list(s.cache.items())
+    >>> expected = [((x,), x**2) for x in range(15, 20)]
+    >>> actual == expected
+    True
 
 
 :class:`UserDict` objects


From webhook-mailer at python.org  Mon Aug  2 14:37:46 2021
From: webhook-mailer at python.org (rhettinger)
Date: Mon, 02 Aug 2021 18:37:46 -0000
Subject: [Python-checkins] bpo-44782: Improve OrderedDict recipe for LRU
 cache variants (GH-27536) (GH-27567)
Message-ID: <mailman.861.1627929467.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/c50a672eebb16cf778d9a3b22b72d506c3f54ced
commit: c50a672eebb16cf778d9a3b22b72d506c3f54ced
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: rhettinger <rhettinger at users.noreply.github.com>
date: 2021-08-02T13:37:42-05:00
summary:

bpo-44782: Improve OrderedDict recipe for LRU cache variants (GH-27536) (GH-27567)

files:
M Doc/library/collections.rst

diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
index 000015becb11b..e00b75fa9be19 100644
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -1149,27 +1149,43 @@ original insertion position is changed and moved to the end::
             self.move_to_end(key)
 
 An :class:`OrderedDict` would also be useful for implementing
-variants of :func:`functools.lru_cache`::
+variants of :func:`functools.lru_cache`:
 
-    class LRU(OrderedDict):
-        'Limit size, evicting the least recently looked-up key when full'
+.. testcode::
 
-        def __init__(self, maxsize=128, /, *args, **kwds):
-            self.maxsize = maxsize
-            super().__init__(*args, **kwds)
+    class LRU:
 
-        def __getitem__(self, key):
-            value = super().__getitem__(key)
-            self.move_to_end(key)
+        def __init__(self, func, maxsize=128):
+            self.func = func
+            self.maxsize = maxsize
+            self.cache = OrderedDict()
+
+        def __call__(self, *args):
+            if args in self.cache:
+                value = self.cache[args]
+                self.cache.move_to_end(args)
+                return value
+            value = self.func(*args)
+            if len(self.cache) >= self.maxsize:
+                self.cache.popitem(False)
+            self.cache[args] = value
             return value
 
-        def __setitem__(self, key, value):
-            if key in self:
-                self.move_to_end(key)
-            super().__setitem__(key, value)
-            if len(self) > self.maxsize:
-                oldest = next(iter(self))
-                del self[oldest]
+.. doctest::
+    :hide:
+
+    >>> def square(x):
+    ...     return x ** 2
+    ...
+    >>> s = LRU(square, maxsize=5)
+    >>> actual = [(s(x), s(x)) for x in range(20)]
+    >>> expected = [(x**2, x**2) for x in range(20)]
+    >>> actual == expected
+    True
+    >>> actual = list(s.cache.items())
+    >>> expected = [((x,), x**2) for x in range(15, 20)]
+    >>> actual == expected
+    True
 
 
 :class:`UserDict` objects


From webhook-mailer at python.org  Mon Aug  2 14:38:19 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 02 Aug 2021 18:38:19 -0000
Subject: [Python-checkins] bpo-44782: Improve OrderedDict recipe for LRU
 cache variants (GH-27536)
Message-ID: <mailman.862.1627929500.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/c6e7c9860d5ac968c7a1073fdbfbd44e0e87f582
commit: c6e7c9860d5ac968c7a1073fdbfbd44e0e87f582
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-02T11:38:14-07:00
summary:

bpo-44782: Improve OrderedDict recipe for LRU cache variants (GH-27536)

(cherry picked from commit 54f185b6d321a6354aef2b2886c766677f487ecb)

Co-authored-by: Raymond Hettinger <rhettinger at users.noreply.github.com>

files:
M Doc/library/collections.rst

diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
index 2a0bc049f88dd..b1779a5b2382e 100644
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -1171,27 +1171,43 @@ original insertion position is changed and moved to the end::
             self.move_to_end(key)
 
 An :class:`OrderedDict` would also be useful for implementing
-variants of :func:`functools.lru_cache`::
+variants of :func:`functools.lru_cache`:
 
-    class LRU(OrderedDict):
-        'Limit size, evicting the least recently looked-up key when full'
+.. testcode::
 
-        def __init__(self, maxsize=128, /, *args, **kwds):
-            self.maxsize = maxsize
-            super().__init__(*args, **kwds)
+    class LRU:
 
-        def __getitem__(self, key):
-            value = super().__getitem__(key)
-            self.move_to_end(key)
+        def __init__(self, func, maxsize=128):
+            self.func = func
+            self.maxsize = maxsize
+            self.cache = OrderedDict()
+
+        def __call__(self, *args):
+            if args in self.cache:
+                value = self.cache[args]
+                self.cache.move_to_end(args)
+                return value
+            value = self.func(*args)
+            if len(self.cache) >= self.maxsize:
+                self.cache.popitem(False)
+            self.cache[args] = value
             return value
 
-        def __setitem__(self, key, value):
-            if key in self:
-                self.move_to_end(key)
-            super().__setitem__(key, value)
-            if len(self) > self.maxsize:
-                oldest = next(iter(self))
-                del self[oldest]
+.. doctest::
+    :hide:
+
+    >>> def square(x):
+    ...     return x ** 2
+    ...
+    >>> s = LRU(square, maxsize=5)
+    >>> actual = [(s(x), s(x)) for x in range(20)]
+    >>> expected = [(x**2, x**2) for x in range(20)]
+    >>> actual == expected
+    True
+    >>> actual = list(s.cache.items())
+    >>> expected = [((x,), x**2) for x in range(15, 20)]
+    >>> actual == expected
+    True
 
 
 :class:`UserDict` objects


From webhook-mailer at python.org  Mon Aug  2 15:05:43 2021
From: webhook-mailer at python.org (pablogsal)
Date: Mon, 02 Aug 2021 19:05:43 -0000
Subject: [Python-checkins] bpo-44792: Improve syntax errors for if
 expressions (GH-27506) (GH-27565)
Message-ID: <mailman.863.1627931144.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/567176249ea95c074eb80199aaf19f3a55aa3954
commit: 567176249ea95c074eb80199aaf19f3a55aa3954
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-08-02T20:05:33+01:00
summary:

bpo-44792: Improve syntax errors for if expressions (GH-27506) (GH-27565)

(cherry picked from commit 28b6dc9dd5d1ce6f8aff7e06d4ef9afdc2bc8332)

Co-authored-by: Miguel Brito <5544985+miguendes at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2021-07-31-12-12-57.bpo-44792.mOReTW.rst
M Grammar/python.gram
M Lib/test/test_syntax.py
M Misc/ACKS
M Parser/parser.c

diff --git a/Grammar/python.gram b/Grammar/python.gram
index 057bcb641a666..3e7475a3fa6f4 100644
--- a/Grammar/python.gram
+++ b/Grammar/python.gram
@@ -859,6 +859,7 @@ invalid_expression:
     # Soft keywords need to also be ignored because they can be parsed as NAME NAME
    | !(NAME STRING | SOFT_KEYWORD) a=disjunction b=expression_without_invalid {
         RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "invalid syntax. Perhaps you forgot a comma?") }
+   | a=disjunction 'if' b=disjunction !'else' { RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "expected 'else' after 'if' expression") }
 
 invalid_named_expression:
     | a=expression ':=' expression {
diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
index 6e1531e8b25fc..d5a52ba628a81 100644
--- a/Lib/test/test_syntax.py
+++ b/Lib/test/test_syntax.py
@@ -140,6 +140,18 @@
 Traceback (most recent call last):
 SyntaxError: cannot assign to conditional expression
 
+>>> a = 42 if True
+Traceback (most recent call last):
+SyntaxError: expected 'else' after 'if' expression
+
+>>> a = (42 if True)
+Traceback (most recent call last):
+SyntaxError: expected 'else' after 'if' expression
+
+>>> a = [1, 42 if True, 4]
+Traceback (most recent call last):
+SyntaxError: expected 'else' after 'if' expression
+
 >>> True = True = 3
 Traceback (most recent call last):
 SyntaxError: cannot assign to True
diff --git a/Misc/ACKS b/Misc/ACKS
index 385d7caf1775b..3f0506ecf758e 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -227,6 +227,7 @@ Tom Bridgman
 Anthony Briggs
 Keith Briggs
 Tobias Brink
+Miguel Brito
 Dillon Brock
 Richard Brodie
 Michael Broghton
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-07-31-12-12-57.bpo-44792.mOReTW.rst b/Misc/NEWS.d/next/Core and Builtins/2021-07-31-12-12-57.bpo-44792.mOReTW.rst
new file mode 100644
index 0000000000000..2e9000d09ee44
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-07-31-12-12-57.bpo-44792.mOReTW.rst	
@@ -0,0 +1 @@
+Improve syntax errors for if expressions. Patch by Miguel Brito
diff --git a/Parser/parser.c b/Parser/parser.c
index c4a4eb651b3e7..b37e3d6855ce9 100644
--- a/Parser/parser.c
+++ b/Parser/parser.c
@@ -18229,6 +18229,7 @@ invalid_legacy_expression_rule(Parser *p)
 // invalid_expression:
 //     | invalid_legacy_expression
 //     | !(NAME STRING | SOFT_KEYWORD) disjunction expression_without_invalid
+//     | disjunction 'if' disjunction !'else'
 static void *
 invalid_expression_rule(Parser *p)
 {
@@ -18287,6 +18288,38 @@ invalid_expression_rule(Parser *p)
         D(fprintf(stderr, "%*c%s invalid_expression[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "!(NAME STRING | SOFT_KEYWORD) disjunction expression_without_invalid"));
     }
+    { // disjunction 'if' disjunction !'else'
+        if (p->error_indicator) {
+            D(p->level--);
+            return NULL;
+        }
+        D(fprintf(stderr, "%*c> invalid_expression[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "disjunction 'if' disjunction !'else'"));
+        Token * _keyword;
+        expr_ty a;
+        expr_ty b;
+        if (
+            (a = disjunction_rule(p))  // disjunction
+            &&
+            (_keyword = _PyPegen_expect_token(p, 510))  // token='if'
+            &&
+            (b = disjunction_rule(p))  // disjunction
+            &&
+            _PyPegen_lookahead_with_int(0, _PyPegen_expect_token, p, 516)  // token='else'
+        )
+        {
+            D(fprintf(stderr, "%*c+ invalid_expression[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "disjunction 'if' disjunction !'else'"));
+            _res = RAISE_SYNTAX_ERROR_KNOWN_RANGE ( a , b , "expected 'else' after 'if' expression" );
+            if (_res == NULL && PyErr_Occurred()) {
+                p->error_indicator = 1;
+                D(p->level--);
+                return NULL;
+            }
+            goto done;
+        }
+        p->mark = _mark;
+        D(fprintf(stderr, "%*c%s invalid_expression[%d-%d]: %s failed!\n", p->level, ' ',
+                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "disjunction 'if' disjunction !'else'"));
+    }
     _res = NULL;
   done:
     D(p->level--);


From webhook-mailer at python.org  Mon Aug  2 17:38:32 2021
From: webhook-mailer at python.org (pablogsal)
Date: Mon, 02 Aug 2021 21:38:32 -0000
Subject: [Python-checkins] Python 3.10.0rc1
Message-ID: <mailman.864.1627940312.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/cc115e5bf66abe909964be5880c96194d9424df9
commit: cc115e5bf66abe909964be5880c96194d9424df9
branch: 3.10
author: Pablo Galindo <pablogsal at gmail.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-08-02T20:53:59+01:00
summary:

Python 3.10.0rc1

files:
A Misc/NEWS.d/3.10.0rc1.rst
D Misc/NEWS.d/next/C API/2021-07-20-16-21-06.bpo-42747.rRxjUY.rst
D Misc/NEWS.d/next/C API/2021-07-29-16-04-28.bpo-41103.hiKKcF.rst
D Misc/NEWS.d/next/Core and Builtins/2021-06-21-11-19-54.bpo-44472.Vvm1yn.rst
D Misc/NEWS.d/next/Core and Builtins/2021-07-01-11-59-34.bpo-44490.xY80VR.rst
D Misc/NEWS.d/next/Core and Builtins/2021-07-06-22-22-15.bpo-44490.BJxPbZ.rst
D Misc/NEWS.d/next/Core and Builtins/2021-07-13-17-47-32.bpo-42073.9wopiC.rst
D Misc/NEWS.d/next/Core and Builtins/2021-07-13-20-22-12.bpo-44606.S3Bv2w.rst
D Misc/NEWS.d/next/Core and Builtins/2021-07-13-23-19-41.bpo-44589.59OH8T.rst
D Misc/NEWS.d/next/Core and Builtins/2021-07-14-13-54-07.bpo-44635.7ZMAdB.rst
D Misc/NEWS.d/next/Core and Builtins/2021-07-16-09-36-12.bpo-44636.ZWebi8.rst
D Misc/NEWS.d/next/Core and Builtins/2021-07-16-09-59-13.bpo-44646.Yb6s05.rst
D Misc/NEWS.d/next/Core and Builtins/2021-07-16-20-25-37.bpo-44655.I3wRjL.rst
D Misc/NEWS.d/next/Core and Builtins/2021-07-16-21-35-14.bpo-44655.95I7M6.rst
D Misc/NEWS.d/next/Core and Builtins/2021-07-17-13-41-58.bpo-44662.q22kWR.rst
D Misc/NEWS.d/next/Core and Builtins/2021-07-17-21-04-04.bpo-44633.5-zKeI.rst
D Misc/NEWS.d/next/Core and Builtins/2021-07-19-19-53-46.bpo-44676.WgIMvh.rst
D Misc/NEWS.d/next/Core and Builtins/2021-07-19-20-49-06.bpo-44653.WcqGyI.rst
D Misc/NEWS.d/next/Core and Builtins/2021-07-21-15-26-56.bpo-44698.DA4_0o.rst
D Misc/NEWS.d/next/Core and Builtins/2021-07-26-15-27-03.bpo-44732.IxObt3.rst
D Misc/NEWS.d/next/Core and Builtins/2021-07-27-11-14-22.bpo-34013.SjLFe-.rst
D Misc/NEWS.d/next/Core and Builtins/2021-07-31-12-12-57.bpo-44792.mOReTW.rst
D Misc/NEWS.d/next/Documentation/2021-06-18-06-44-45.bpo-44453.3PIkj2.rst
D Misc/NEWS.d/next/Documentation/2021-07-02-14-02-29.bpo-44544._5_aCz.rst
D Misc/NEWS.d/next/Documentation/2021-07-12-11-39-20.bpo-44613.DIXNzc.rst
D Misc/NEWS.d/next/Documentation/2021-07-18-22-43-14.bpo-44561.T7HpWm.rst
D Misc/NEWS.d/next/Documentation/2021-07-20-21-03-18.bpo-30511.eMFkRi.rst
D Misc/NEWS.d/next/Documentation/2021-07-22-08-28-03.bpo-35183.p9BWTB.rst
D Misc/NEWS.d/next/Documentation/2021-07-25-23-04-15.bpo-44693.JuCbNq.rst
D Misc/NEWS.d/next/Documentation/2021-07-26-23-48-31.bpo-44740.zMFGMV.rst
D Misc/NEWS.d/next/Library/2017-09-20-14-43-03.bpo-29298._78CSN.rst
D Misc/NEWS.d/next/Library/2019-06-03-23-53-25.bpo-27513.qITN7d.rst
D Misc/NEWS.d/next/Library/2019-11-12-18-59-33.bpo-38741.W7IYkq.rst
D Misc/NEWS.d/next/Library/2021-06-12-21-25-35.bpo-27827.TMWh1i.rst
D Misc/NEWS.d/next/Library/2021-06-24-19-16-20.bpo-42892.qvRNhI.rst
D Misc/NEWS.d/next/Library/2021-06-29-07-27-08.bpo-43625.ZlAxhp.rst
D Misc/NEWS.d/next/Library/2021-06-29-21-17-17.bpo-44461.acqRnV.rst
D Misc/NEWS.d/next/Library/2021-07-04-11-33-34.bpo-41249.sHdwBE.rst
D Misc/NEWS.d/next/Library/2021-07-05-18-13-25.bpo-44566.o51Bd1.rst
D Misc/NEWS.d/next/Library/2021-07-09-07-14-37.bpo-41928.Q1jMrr.rst
D Misc/NEWS.d/next/Library/2021-07-12-10-43-31.bpo-44559.YunVKY.rst
D Misc/NEWS.d/next/Library/2021-07-13-09-01-33.bpo-44608.R3IcM1.rst
D Misc/NEWS.d/next/Library/2021-07-15-16-51-32.bpo-44648.2o49TB.rst
D Misc/NEWS.d/next/Library/2021-07-16-13-40-31.bpo-40897.aveAre.rst
D Misc/NEWS.d/next/Library/2021-07-19-14-04-42.bpo-44524.Nbf2JC.rst
D Misc/NEWS.d/next/Library/2021-07-19-22-43-15.bpo-44353.HF81_Q.rst
D Misc/NEWS.d/next/Library/2021-07-20-21-51-35.bpo-42854.ThuDMI.rst
D Misc/NEWS.d/next/Library/2021-07-21-10-43-22.bpo-44666.CEThkv.rst
D Misc/NEWS.d/next/Library/2021-07-21-23-16-30.bpo-44704.iqHLxQ.rst
D Misc/NEWS.d/next/Library/2021-07-24-02-17-59.bpo-44720.shU5Qm.rst
D Misc/NEWS.d/next/Library/2021-07-27-22-11-29.bpo-44752._bvbrZ.rst
D Misc/NEWS.d/next/Library/2021-07-30-23-27-30.bpo-44667.tu0Xrv.rst
D Misc/NEWS.d/next/Library/2021-07-31-08-45-31.bpo-44784.fIMIDS.rst
D Misc/NEWS.d/next/Library/2021-07-31-20-28-20.bpo-44793.woaQSg.rst
D Misc/NEWS.d/next/Library/2021-08-02-14-37-32.bpo-44806.wOW_Qn.rst
D Misc/NEWS.d/next/Security/2021-07-25-20-04-54.bpo-44600.0WMldg.rst
D Misc/NEWS.d/next/Tests/2021-06-26-18-37-36.bpo-44515.e9fO6f.rst
D Misc/NEWS.d/next/Tests/2021-07-16-14-02-33.bpo-44647.5LzqIy.rst
D Misc/NEWS.d/next/Tests/2021-07-22-16-38-39.bpo-44708.SYNaac.rst
D Misc/NEWS.d/next/Tests/2021-07-24-20-09-15.bpo-44734.KKsNOV.rst
D Misc/NEWS.d/next/Tools-Demos/2021-07-28-00-51-55.bpo-44756.pvAajB.rst
D Misc/NEWS.d/next/Windows/2020-04-13-15-20-28.bpo-40263.1KKEbu.rst
D Misc/NEWS.d/next/Windows/2021-07-13-15-32-49.bpo-44572.gXvhDc.rst
D Misc/NEWS.d/next/macOS/2021-03-29-21-11-23.bpo-34932.f3Hdyd.rst
D Misc/NEWS.d/next/macOS/2021-07-12-15-42-02.bpo-41972.yUjE8j.rst
M Include/patchlevel.h
M Lib/pydoc_data/topics.py
M Lib/test/test_importlib/test_util.py
M README.rst
M configure

diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 93f78fced6295e..cc7750b8f07324 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -19,11 +19,11 @@
 #define PY_MAJOR_VERSION        3
 #define PY_MINOR_VERSION        10
 #define PY_MICRO_VERSION        0
-#define PY_RELEASE_LEVEL        PY_RELEASE_LEVEL_BETA
-#define PY_RELEASE_SERIAL       4
+#define PY_RELEASE_LEVEL        PY_RELEASE_LEVEL_GAMMA
+#define PY_RELEASE_SERIAL       1
 
 /* Version as a string */
-#define PY_VERSION              "3.10.0b4+"
+#define PY_VERSION              "3.10.0rc1"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
diff --git a/Lib/pydoc_data/topics.py b/Lib/pydoc_data/topics.py
index 0d2ccc5c278ecb..35668514f60d8d 100644
--- a/Lib/pydoc_data/topics.py
+++ b/Lib/pydoc_data/topics.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Autogenerated by Sphinx on Sat Jul 10 01:50:39 2021
+# Autogenerated by Sphinx on Mon Aug  2 20:07:41 2021
 topics = {'assert': 'The "assert" statement\n'
            '**********************\n'
            '\n'
@@ -1313,6 +1313,10 @@
            'In the latter case, sequence repetition is performed; a negative\n'
            'repetition factor yields an empty sequence.\n'
            '\n'
+           'This operation can be customized using the special "__mul__()" '
+           'and\n'
+           '"__rmul__()" methods.\n'
+           '\n'
            'The "@" (at) operator is intended to be used for matrix\n'
            'multiplication.  No builtin Python types implement this operator.\n'
            '\n'
@@ -1328,6 +1332,10 @@
            'result.  Division by zero raises the "ZeroDivisionError" '
            'exception.\n'
            '\n'
+           'This operation can be customized using the special "__div__()" '
+           'and\n'
+           '"__floordiv__()" methods.\n'
+           '\n'
            'The "%" (modulo) operator yields the remainder from the division '
            'of\n'
            'the first argument by the second.  The numeric arguments are '
@@ -1359,6 +1367,10 @@
            'string formatting is described in the Python Library Reference,\n'
            'section printf-style String Formatting.\n'
            '\n'
+           'The *modulo* operation can be customized using the special '
+           '"__mod__()"\n'
+           'method.\n'
+           '\n'
            'The floor division operator, the modulo operator, and the '
            '"divmod()"\n'
            'function are not defined for complex numbers.  Instead, convert to '
@@ -1373,9 +1385,16 @@
            'and then added together. In the latter case, the sequences are\n'
            'concatenated.\n'
            '\n'
+           'This operation can be customized using the special "__add__()" '
+           'and\n'
+           '"__radd__()" methods.\n'
+           '\n'
            'The "-" (subtraction) operator yields the difference of its '
            'arguments.\n'
-           'The numeric arguments are first converted to a common type.\n',
+           'The numeric arguments are first converted to a common type.\n'
+           '\n'
+           'This operation can be customized using the special "__sub__()" '
+           'method.\n',
  'bitwise': 'Binary bitwise operations\n'
             '*************************\n'
             '\n'
@@ -1388,14 +1407,18 @@
             '\n'
             'The "&" operator yields the bitwise AND of its arguments, which '
             'must\n'
-            'be integers.\n'
+            'be integers or one of them must be a custom object overriding\n'
+            '"__and__()" or "__rand__()" special methods.\n'
             '\n'
             'The "^" operator yields the bitwise XOR (exclusive OR) of its\n'
-            'arguments, which must be integers.\n'
+            'arguments, which must be integers or one of them must be a '
+            'custom\n'
+            'object overriding "__xor__()" or "__rxor__()" special methods.\n'
             '\n'
             'The "|" operator yields the bitwise (inclusive) OR of its '
             'arguments,\n'
-            'which must be integers.\n',
+            'which must be integers or one of them must be a custom object\n'
+            'overriding "__or__()" or "__ror__()" special methods.\n',
  'bltin-code-objects': 'Code Objects\n'
                        '************\n'
                        '\n'
@@ -1841,7 +1864,11 @@
                 '   comp_operator ::= "<" | ">" | "==" | ">=" | "<=" | "!="\n'
                 '                     | "is" ["not"] | ["not"] "in"\n'
                 '\n'
-                'Comparisons yield boolean values: "True" or "False".\n'
+                'Comparisons yield boolean values: "True" or "False". Custom '
+                '*rich\n'
+                'comparison methods* may return non-boolean values. In this '
+                'case Python\n'
+                'will call "bool()" on such value in boolean contexts.\n'
                 '\n'
                 'Comparisons can be chained arbitrarily, e.g., "x < y <= z" '
                 'is\n'
@@ -3270,11 +3297,11 @@
              'double star pattern must be the last subpattern in the mapping\n'
              'pattern.\n'
              '\n'
-             'Duplicate key values in mapping patterns are disallowed. (If all '
-             'key\n'
-             'patterns are literal patterns this is considered a syntax '
-             'error;\n'
-             'otherwise this is a runtime error and will raise "ValueError".)\n'
+             'Duplicate keys in mapping patterns are disallowed. Duplicate '
+             'literal\n'
+             'keys will raise a "SyntaxError". Two keys that otherwise have '
+             'the same\n'
+             'value will raise a "ValueError" at runtime.\n'
              '\n'
              'The following is the logical flow for matching a mapping '
              'pattern\n'
@@ -3292,7 +3319,10 @@
              '\n'
              '3. If duplicate keys are detected in the mapping pattern, the '
              'pattern\n'
-             '   is considered invalid and "ValueError" is raised.\n'
+             '   is considered invalid. A "SyntaxError" is raised for '
+             'duplicate\n'
+             '   literal values; or a "ValueError" for named keys of the same '
+             'value.\n'
              '\n'
              'Note:\n'
              '\n'
@@ -8373,7 +8403,10 @@
           '"ZeroDivisionError".\n'
           'Raising a negative number to a fractional power results in a '
           '"complex"\n'
-          'number. (In earlier versions it raised a "ValueError".)\n',
+          'number. (In earlier versions it raised a "ValueError".)\n'
+          '\n'
+          'This operation can be customized using the special "__pow__()" '
+          'method.\n',
  'raise': 'The "raise" statement\n'
           '*********************\n'
           '\n'
@@ -8773,6 +8806,10 @@
              'the\n'
              'second argument.\n'
              '\n'
+             'This operation can be customized using the special '
+             '"__lshift__()" and\n'
+             '"__rshift__()" methods.\n'
+             '\n'
              'A right shift by *n* bits is defined as floor division by '
              '"pow(2,n)".\n'
              'A left shift by *n* bits is defined as multiplication with '
@@ -14423,7 +14460,7 @@
              '|                                | "s[i:i] = '
              '[x]")                  |                       |\n'
              '+--------------------------------+----------------------------------+-----------------------+\n'
-             '| "s.pop([i])"                   | retrieves the item at *i* '
+             '| "s.pop()" or "s.pop(i)"        | retrieves the item at *i* '
              'and    | (2)                   |\n'
              '|                                | also removes it from '
              '*s*         |                       |\n'
@@ -14886,7 +14923,7 @@
                      '|                                | "s[i:i] = '
                      '[x]")                  |                       |\n'
                      '+--------------------------------+----------------------------------+-----------------------+\n'
-                     '| "s.pop([i])"                   | retrieves the item at '
+                     '| "s.pop()" or "s.pop(i)"        | retrieves the item at '
                      '*i* and    | (2)                   |\n'
                      '|                                | also removes it from '
                      '*s*         |                       |\n'
@@ -14951,15 +14988,21 @@
           '   u_expr ::= power | "-" u_expr | "+" u_expr | "~" u_expr\n'
           '\n'
           'The unary "-" (minus) operator yields the negation of its numeric\n'
-          'argument.\n'
+          'argument; the operation can be overridden with the "__neg__()" '
+          'special\n'
+          'method.\n'
           '\n'
           'The unary "+" (plus) operator yields its numeric argument '
-          'unchanged.\n'
+          'unchanged;\n'
+          'the operation can be overridden with the "__pos__()" special '
+          'method.\n'
           '\n'
           'The unary "~" (invert) operator yields the bitwise inversion of '
           'its\n'
           'integer argument.  The bitwise inversion of "x" is defined as\n'
-          '"-(x+1)".  It only applies to integral numbers.\n'
+          '"-(x+1)".  It only applies to integral numbers or to custom '
+          'objects\n'
+          'that override the "__invert__()" special method.\n'
           '\n'
           'In all three cases, if the argument does not have the proper type, '
           'a\n'
diff --git a/Lib/test/test_importlib/test_util.py b/Lib/test/test_importlib/test_util.py
index 104452267c0673..f9ff26fc7e3a00 100644
--- a/Lib/test/test_importlib/test_util.py
+++ b/Lib/test/test_importlib/test_util.py
@@ -859,7 +859,7 @@ def test_magic_number(self):
         # stakeholders such as OS package maintainers must be notified
         # in advance. Such exceptional releases will then require an
         # adjustment to this test case.
-        EXPECTED_MAGIC_NUMBER = 3413
+        EXPECTED_MAGIC_NUMBER = 3439
         actual = int.from_bytes(importlib.util.MAGIC_NUMBER[:2], 'little')
 
         msg = (
diff --git a/Misc/NEWS.d/3.10.0rc1.rst b/Misc/NEWS.d/3.10.0rc1.rst
new file mode 100644
index 00000000000000..67f31b81622ace
--- /dev/null
+++ b/Misc/NEWS.d/3.10.0rc1.rst
@@ -0,0 +1,645 @@
+.. bpo: 44600
+.. date: 2021-07-25-20-04-54
+.. nonce: 0WMldg
+.. release date: 2021-08-02
+.. section: Security
+
+Fix incorrect line numbers while tracing some failed patterns in :ref:`match
+<match>` statements. Patch by Charles Burkland.
+
+..
+
+.. bpo: 44792
+.. date: 2021-07-31-12-12-57
+.. nonce: mOReTW
+.. section: Core and Builtins
+
+Improve syntax errors for if expressions. Patch by Miguel Brito
+
+..
+
+.. bpo: 34013
+.. date: 2021-07-27-11-14-22
+.. nonce: SjLFe-
+.. section: Core and Builtins
+
+Generalize the invalid legacy statement custom error message (like the one
+generated when "print" is called without parentheses) to include more
+generic expressions. Patch by Pablo Galindo
+
+..
+
+.. bpo: 44732
+.. date: 2021-07-26-15-27-03
+.. nonce: IxObt3
+.. section: Core and Builtins
+
+Rename ``types.Union`` to ``types.UnionType``.
+
+..
+
+.. bpo: 44698
+.. date: 2021-07-21-15-26-56
+.. nonce: DA4_0o
+.. section: Core and Builtins
+
+Fix undefined behaviour in complex object exponentiation.
+
+..
+
+.. bpo: 44653
+.. date: 2021-07-19-20-49-06
+.. nonce: WcqGyI
+.. section: Core and Builtins
+
+Support :mod:`typing` types in parameter substitution in the union type.
+
+..
+
+.. bpo: 44676
+.. date: 2021-07-19-19-53-46
+.. nonce: WgIMvh
+.. section: Core and Builtins
+
+Add ability to serialise ``types.Union`` objects. Patch provided by Yurii
+Karabas.
+
+..
+
+.. bpo: 44633
+.. date: 2021-07-17-21-04-04
+.. nonce: 5-zKeI
+.. section: Core and Builtins
+
+Parameter substitution of the union type with wrong types now raises
+``TypeError`` instead of returning ``NotImplemented``.
+
+..
+
+.. bpo: 44662
+.. date: 2021-07-17-13-41-58
+.. nonce: q22kWR
+.. section: Core and Builtins
+
+Add ``__module__`` to ``types.Union``. This also fixes ``types.Union``
+issues with ``typing.Annotated``. Patch provided by Yurii Karabas.
+
+..
+
+.. bpo: 44655
+.. date: 2021-07-16-21-35-14
+.. nonce: 95I7M6
+.. section: Core and Builtins
+
+Include the name of the type in unset __slots__ attribute errors. Patch by
+Pablo Galindo
+
+..
+
+.. bpo: 44655
+.. date: 2021-07-16-20-25-37
+.. nonce: I3wRjL
+.. section: Core and Builtins
+
+Don't include a missing attribute with the same name as the failing one when
+offering suggestions for missing attributes. Patch by Pablo Galindo
+
+..
+
+.. bpo: 44646
+.. date: 2021-07-16-09-59-13
+.. nonce: Yb6s05
+.. section: Core and Builtins
+
+Fix the hash of the union type: it no longer depends on the order of
+arguments.
+
+..
+
+.. bpo: 44636
+.. date: 2021-07-16-09-36-12
+.. nonce: ZWebi8
+.. section: Core and Builtins
+
+Collapse union of equal types. E.g. the result of ``int | int`` is now
+``int``. Fix comparison of the union type with non-hashable objects. E.g.
+``int | str == {}`` no longer raises a TypeError.
+
+..
+
+.. bpo: 44635
+.. date: 2021-07-14-13-54-07
+.. nonce: 7ZMAdB
+.. section: Core and Builtins
+
+Convert ``None`` to ``type(None)`` in the union type constructor.
+
+..
+
+.. bpo: 44589
+.. date: 2021-07-13-23-19-41
+.. nonce: 59OH8T
+.. section: Core and Builtins
+
+Mapping patterns in ``match`` statements with two or more equal literal keys
+will now raise a :exc:`SyntaxError` at compile-time.
+
+..
+
+.. bpo: 44606
+.. date: 2021-07-13-20-22-12
+.. nonce: S3Bv2w
+.. section: Core and Builtins
+
+Fix ``__instancecheck__`` and ``__subclasscheck__`` for the union type.
+
+..
+
+.. bpo: 42073
+.. date: 2021-07-13-17-47-32
+.. nonce: 9wopiC
+.. section: Core and Builtins
+
+The ``@classmethod`` decorator can now wrap other classmethod-like
+descriptors.
+
+..
+
+.. bpo: 44490
+.. date: 2021-07-06-22-22-15
+.. nonce: BJxPbZ
+.. section: Core and Builtins
+
+:mod:`typing` now searches for type parameters in ``types.Union`` objects.
+``get_type_hints`` will also properly resolve annotations with nested
+``types.Union`` objects. Patch provided by Yurii Karabas.
+
+..
+
+.. bpo: 44490
+.. date: 2021-07-01-11-59-34
+.. nonce: xY80VR
+.. section: Core and Builtins
+
+Add ``__parameters__`` attribute and ``__getitem__`` operator to
+``types.Union``. Patch provided by Yurii Karabas.
+
+..
+
+.. bpo: 44472
+.. date: 2021-06-21-11-19-54
+.. nonce: Vvm1yn
+.. section: Core and Builtins
+
+Fix ltrace functionality when exceptions are raised. Patch by Pablo Galindo
+
+..
+
+.. bpo: 44806
+.. date: 2021-08-02-14-37-32
+.. nonce: wOW_Qn
+.. section: Library
+
+Non-protocol subclasses of :class:`typing.Protocol` ignore now the
+``__init__`` method inherited from protocol base classes.
+
+..
+
+.. bpo: 44793
+.. date: 2021-07-31-20-28-20
+.. nonce: woaQSg
+.. section: Library
+
+Fix checking the number of arguments when subscribe a generic type with
+``ParamSpec`` parameter.
+
+..
+
+.. bpo: 44784
+.. date: 2021-07-31-08-45-31
+.. nonce: fIMIDS
+.. section: Library
+
+In importlib.metadata tests, override warnings behavior under expected
+DeprecationWarnings (importlib_metadata 4.6.3).
+
+..
+
+.. bpo: 44667
+.. date: 2021-07-30-23-27-30
+.. nonce: tu0Xrv
+.. section: Library
+
+The :func:`tokenize.tokenize` doesn't incorrectly generate a ``NEWLINE``
+token if the source doesn't end with a new line character but the last line
+is a comment, as the function is already generating a ``NL`` token. Patch by
+Pablo Galindo
+
+..
+
+.. bpo: 44752
+.. date: 2021-07-27-22-11-29
+.. nonce: _bvbrZ
+.. section: Library
+
+:mod:`rcompleter` does not call :func:`getattr` on :class:`property` objects
+to avoid the side-effect of  evaluating the corresponding method.
+
+..
+
+.. bpo: 44720
+.. date: 2021-07-24-02-17-59
+.. nonce: shU5Qm
+.. section: Library
+
+``weakref.proxy`` objects referencing non-iterators now raise ``TypeError``
+rather than dereferencing the null ``tp_iternext`` slot and crashing.
+
+..
+
+.. bpo: 44704
+.. date: 2021-07-21-23-16-30
+.. nonce: iqHLxQ
+.. section: Library
+
+The implementation of ``collections.abc.Set._hash()`` now matches that of
+``frozenset.__hash__()``.
+
+..
+
+.. bpo: 44666
+.. date: 2021-07-21-10-43-22
+.. nonce: CEThkv
+.. section: Library
+
+Fixed issue in :func:`compileall.compile_file` when ``sys.stdout`` is
+redirected. Patch by Stefan H?lzl.
+
+..
+
+.. bpo: 42854
+.. date: 2021-07-20-21-51-35
+.. nonce: ThuDMI
+.. section: Library
+
+Fixed a bug in the :mod:`_ssl` module that was throwing :exc:`OverflowError`
+when using :meth:`_ssl._SSLSocket.write` and :meth:`_ssl._SSLSocket.read`
+for a big value of the ``len`` parameter. Patch by Pablo Galindo
+
+..
+
+.. bpo: 44353
+.. date: 2021-07-19-22-43-15
+.. nonce: HF81_Q
+.. section: Library
+
+Refactor ``typing.NewType`` from function into callable class. Patch
+provided by Yurii Karabas.
+
+..
+
+.. bpo: 44524
+.. date: 2021-07-19-14-04-42
+.. nonce: Nbf2JC
+.. section: Library
+
+Add missing ``__name__`` and ``__qualname__`` attributes to ``typing``
+module classes. Patch provided by Yurii Karabas.
+
+..
+
+.. bpo: 40897
+.. date: 2021-07-16-13-40-31
+.. nonce: aveAre
+.. section: Library
+
+Give priority to using the current class constructor in
+:func:`inspect.signature`. Patch by Weipeng Hong.
+
+..
+
+.. bpo: 44648
+.. date: 2021-07-15-16-51-32
+.. nonce: 2o49TB
+.. section: Library
+
+Fixed wrong error being thrown by :func:`inspect.getsource` when examining a
+class in the interactive session. Instead of :exc:`TypeError`, it should be
+:exc:`OSError` with appropriate error message.
+
+..
+
+.. bpo: 44608
+.. date: 2021-07-13-09-01-33
+.. nonce: R3IcM1
+.. section: Library
+
+Fix memory leak in :func:`_tkinter._flatten` if it is called with a sequence
+or set, but not list or tuple.
+
+..
+
+.. bpo: 44559
+.. date: 2021-07-12-10-43-31
+.. nonce: YunVKY
+.. section: Library
+
+[Enum] module reverted to 3.9; 3.10 changes pushed until 3.11
+
+..
+
+.. bpo: 41928
+.. date: 2021-07-09-07-14-37
+.. nonce: Q1jMrr
+.. section: Library
+
+Update :func:`shutil.copyfile` to raise :exc:`FileNotFoundError` instead of
+confusing :exc:`IsADirectoryError` when a path ending with a
+:const:`os.path.sep` does not exist; :func:`shutil.copy` and
+:func:`shutil.copy2` are also affected.
+
+..
+
+.. bpo: 44566
+.. date: 2021-07-05-18-13-25
+.. nonce: o51Bd1
+.. section: Library
+
+handle StopIteration subclass raised from @contextlib.contextmanager
+generator
+
+..
+
+.. bpo: 41249
+.. date: 2021-07-04-11-33-34
+.. nonce: sHdwBE
+.. section: Library
+
+Fixes ``TypedDict`` to work with ``typing.get_type_hints()`` and postponed
+evaluation of annotations across modules.
+
+..
+
+.. bpo: 44461
+.. date: 2021-06-29-21-17-17
+.. nonce: acqRnV
+.. section: Library
+
+Fix bug with :mod:`pdb`'s handling of import error due to a package which
+does not have a ``__main__`` module
+
+..
+
+.. bpo: 43625
+.. date: 2021-06-29-07-27-08
+.. nonce: ZlAxhp
+.. section: Library
+
+Fix a bug in the detection of CSV file headers by
+:meth:`csv.Sniffer.has_header` and improve documentation of same.
+
+..
+
+.. bpo: 42892
+.. date: 2021-06-24-19-16-20
+.. nonce: qvRNhI
+.. section: Library
+
+Fixed an exception thrown while parsing a malformed multipart email by
+:class:`email.message.EmailMessage`.
+
+..
+
+.. bpo: 27827
+.. date: 2021-06-12-21-25-35
+.. nonce: TMWh1i
+.. section: Library
+
+:meth:`pathlib.PureWindowsPath.is_reserved` now identifies a greater range
+of reserved filenames, including those with trailing spaces or colons.
+
+..
+
+.. bpo: 38741
+.. date: 2019-11-12-18-59-33
+.. nonce: W7IYkq
+.. section: Library
+
+:mod:`configparser`: using ']' inside a section header will no longer cut
+the section name short at the ']'
+
+..
+
+.. bpo: 27513
+.. date: 2019-06-03-23-53-25
+.. nonce: qITN7d
+.. section: Library
+
+:func:`email.utils.getaddresses` now accepts :class:`email.header.Header`
+objects along with string values. Patch by Zackery Spytz.
+
+..
+
+.. bpo: 29298
+.. date: 2017-09-20-14-43-03
+.. nonce: _78CSN
+.. section: Library
+
+Fix ``TypeError`` when required subparsers without ``dest`` do not receive
+arguments. Patch by Anthony Sottile.
+
+..
+
+.. bpo: 44740
+.. date: 2021-07-26-23-48-31
+.. nonce: zMFGMV
+.. section: Documentation
+
+Replaced occurences of uppercase "Web" and "Internet" with lowercase
+versions per the 2016 revised Associated Press Style Book.
+
+..
+
+.. bpo: 44693
+.. date: 2021-07-25-23-04-15
+.. nonce: JuCbNq
+.. section: Documentation
+
+Update the definition of __future__ in the glossary by replacing the
+confusing word "pseudo-module" with a more accurate description.
+
+..
+
+.. bpo: 35183
+.. date: 2021-07-22-08-28-03
+.. nonce: p9BWTB
+.. section: Documentation
+
+Add typical examples to os.path.splitext docs
+
+..
+
+.. bpo: 30511
+.. date: 2021-07-20-21-03-18
+.. nonce: eMFkRi
+.. section: Documentation
+
+Clarify that :func:`shutil.make_archive` is not thread-safe due to reliance
+on changing the current working directory.
+
+..
+
+.. bpo: 44561
+.. date: 2021-07-18-22-43-14
+.. nonce: T7HpWm
+.. section: Documentation
+
+Update of three expired hyperlinks in Doc/distributing/index.rst: "Project
+structure", "Building and packaging the project", and "Uploading the project
+to the Python Packaging Index".
+
+..
+
+.. bpo: 44613
+.. date: 2021-07-12-11-39-20
+.. nonce: DIXNzc
+.. section: Documentation
+
+importlib.metadata is no longer provisional.
+
+..
+
+.. bpo: 44544
+.. date: 2021-07-02-14-02-29
+.. nonce: _5_aCz
+.. section: Documentation
+
+List all kwargs for :func:`textwrap.wrap`, :func:`textwrap.fill`, and
+:func:`textwrap.shorten`. Now, there are nav links to attributes of
+:class:`TextWrap`, which makes navigation much easier while minimizing
+duplication in the documentation.
+
+..
+
+.. bpo: 44453
+.. date: 2021-06-18-06-44-45
+.. nonce: 3PIkj2
+.. section: Documentation
+
+Fix documentation for the return type of :func:`sysconfig.get_path`.
+
+..
+
+.. bpo: 44734
+.. date: 2021-07-24-20-09-15
+.. nonce: KKsNOV
+.. section: Tests
+
+Fixed floating point precision issue in turtle tests.
+
+..
+
+.. bpo: 44708
+.. date: 2021-07-22-16-38-39
+.. nonce: SYNaac
+.. section: Tests
+
+Regression tests, when run with -w, are now re-running only the affected
+test methods instead of re-running the entire test file.
+
+..
+
+.. bpo: 44647
+.. date: 2021-07-16-14-02-33
+.. nonce: 5LzqIy
+.. section: Tests
+
+Added a permanent Unicode-valued environment variable to regression tests to
+ensure they handle this use case in the future. If your test environment
+breaks because of that, report a bug to us, and temporarily set
+PYTHONREGRTEST_UNICODE_GUARD=0 in your test environment.
+
+..
+
+.. bpo: 44515
+.. date: 2021-06-26-18-37-36
+.. nonce: e9fO6f
+.. section: Tests
+
+Adjust recently added contextlib tests to avoid assuming the use of a
+refcounted GC
+
+..
+
+.. bpo: 44572
+.. date: 2021-07-13-15-32-49
+.. nonce: gXvhDc
+.. section: Windows
+
+Avoid consuming standard input in the :mod:`platform` module
+
+..
+
+.. bpo: 40263
+.. date: 2020-04-13-15-20-28
+.. nonce: 1KKEbu
+.. section: Windows
+
+This is a follow-on bug from https://bugs.python.org/issue26903. Once that
+is applied we run into an off-by-one assertion problem. The assert was not
+correct.
+
+..
+
+.. bpo: 41972
+.. date: 2021-07-12-15-42-02
+.. nonce: yUjE8j
+.. section: macOS
+
+The framework build's user header path in sysconfig is changed to add a
+'pythonX.Y' component to match distutils's behavior.
+
+..
+
+.. bpo: 34932
+.. date: 2021-03-29-21-11-23
+.. nonce: f3Hdyd
+.. section: macOS
+
+Add socket.TCP_KEEPALIVE support for macOS. Patch by Shane Harvey.
+
+..
+
+.. bpo: 44756
+.. date: 2021-07-28-00-51-55
+.. nonce: pvAajB
+.. section: Tools/Demos
+
+In the Makefile for documentation (:file:`Doc/Makefile`), the ``build`` rule
+is dependent on the ``venv`` rule. Therefore, ``html``, ``latex``, and other
+build-dependent rules are also now dependent on ``venv``. The ``venv`` rule
+only performs an action if ``$(VENVDIR)`` does not exist.
+:file:`Doc/README.rst` was updated; most users now only need to type ``make
+html``.
+
+..
+
+.. bpo: 41103
+.. date: 2021-07-29-16-04-28
+.. nonce: hiKKcF
+.. section: C API
+
+Reverts removal of the old buffer protocol because they are part of stable
+ABI.
+
+..
+
+.. bpo: 42747
+.. date: 2021-07-20-16-21-06
+.. nonce: rRxjUY
+.. section: C API
+
+The ``Py_TPFLAGS_HAVE_VERSION_TAG`` type flag now does nothing. The
+``Py_TPFLAGS_HAVE_AM_SEND`` flag (which was added in 3.10) is removed. Both
+were unnecessary because it is not possible to have type objects with the
+relevant fields missing.
diff --git a/Misc/NEWS.d/next/C API/2021-07-20-16-21-06.bpo-42747.rRxjUY.rst b/Misc/NEWS.d/next/C API/2021-07-20-16-21-06.bpo-42747.rRxjUY.rst
deleted file mode 100644
index c7ac5a776e2ed9..00000000000000
--- a/Misc/NEWS.d/next/C API/2021-07-20-16-21-06.bpo-42747.rRxjUY.rst	
+++ /dev/null
@@ -1,4 +0,0 @@
-The ``Py_TPFLAGS_HAVE_VERSION_TAG`` type flag now does nothing. The
-``Py_TPFLAGS_HAVE_AM_SEND`` flag (which was added in 3.10) is removed. Both
-were unnecessary because it is not possible to have type objects with the
-relevant fields missing.
diff --git a/Misc/NEWS.d/next/C API/2021-07-29-16-04-28.bpo-41103.hiKKcF.rst b/Misc/NEWS.d/next/C API/2021-07-29-16-04-28.bpo-41103.hiKKcF.rst
deleted file mode 100644
index af06654ba20409..00000000000000
--- a/Misc/NEWS.d/next/C API/2021-07-29-16-04-28.bpo-41103.hiKKcF.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Reverts removal of the old buffer protocol because they are part of stable
-ABI.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-06-21-11-19-54.bpo-44472.Vvm1yn.rst b/Misc/NEWS.d/next/Core and Builtins/2021-06-21-11-19-54.bpo-44472.Vvm1yn.rst
deleted file mode 100644
index 34fa2a9e8615fa..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-06-21-11-19-54.bpo-44472.Vvm1yn.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Fix ltrace functionality when exceptions are raised. Patch by Pablo Galindo
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-07-01-11-59-34.bpo-44490.xY80VR.rst b/Misc/NEWS.d/next/Core and Builtins/2021-07-01-11-59-34.bpo-44490.xY80VR.rst
deleted file mode 100644
index 4912bca837bb10..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-07-01-11-59-34.bpo-44490.xY80VR.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Add ``__parameters__`` attribute and ``__getitem__``
-operator to ``types.Union``. Patch provided by Yurii Karabas.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-07-06-22-22-15.bpo-44490.BJxPbZ.rst b/Misc/NEWS.d/next/Core and Builtins/2021-07-06-22-22-15.bpo-44490.BJxPbZ.rst
deleted file mode 100644
index d49181cd82c818..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-07-06-22-22-15.bpo-44490.BJxPbZ.rst	
+++ /dev/null
@@ -1,3 +0,0 @@
-:mod:`typing` now searches for type parameters in ``types.Union`` objects.
-``get_type_hints`` will also properly resolve annotations with nested
-``types.Union`` objects. Patch provided by Yurii Karabas.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-07-13-17-47-32.bpo-42073.9wopiC.rst b/Misc/NEWS.d/next/Core and Builtins/2021-07-13-17-47-32.bpo-42073.9wopiC.rst
deleted file mode 100644
index 988fe67b99dc96..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-07-13-17-47-32.bpo-42073.9wopiC.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-The ``@classmethod`` decorator can now wrap other classmethod-like
-descriptors.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-07-13-20-22-12.bpo-44606.S3Bv2w.rst b/Misc/NEWS.d/next/Core and Builtins/2021-07-13-20-22-12.bpo-44606.S3Bv2w.rst
deleted file mode 100644
index 3c7ef3b21fe092..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-07-13-20-22-12.bpo-44606.S3Bv2w.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Fix ``__instancecheck__`` and ``__subclasscheck__`` for the union type.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-07-13-23-19-41.bpo-44589.59OH8T.rst b/Misc/NEWS.d/next/Core and Builtins/2021-07-13-23-19-41.bpo-44589.59OH8T.rst
deleted file mode 100644
index 23b2472b00e40f..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-07-13-23-19-41.bpo-44589.59OH8T.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Mapping patterns in ``match`` statements with two or more equal literal
-keys will now raise a :exc:`SyntaxError` at compile-time.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-07-14-13-54-07.bpo-44635.7ZMAdB.rst b/Misc/NEWS.d/next/Core and Builtins/2021-07-14-13-54-07.bpo-44635.7ZMAdB.rst
deleted file mode 100644
index ea00554aeeda66..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-07-14-13-54-07.bpo-44635.7ZMAdB.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Convert ``None`` to ``type(None)`` in the union type constructor.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-07-16-09-36-12.bpo-44636.ZWebi8.rst b/Misc/NEWS.d/next/Core and Builtins/2021-07-16-09-36-12.bpo-44636.ZWebi8.rst
deleted file mode 100644
index 1a053ae69e97e0..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-07-16-09-36-12.bpo-44636.ZWebi8.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Collapse union of equal types. E.g. the result of ``int | int`` is now ``int``. Fix comparison of the union type with non-hashable objects. E.g. ``int | str == {}`` no longer raises a TypeError.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-07-16-09-59-13.bpo-44646.Yb6s05.rst b/Misc/NEWS.d/next/Core and Builtins/2021-07-16-09-59-13.bpo-44646.Yb6s05.rst
deleted file mode 100644
index 0e28eac54fe987..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-07-16-09-59-13.bpo-44646.Yb6s05.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix the hash of the union type: it no longer depends on the order of
-arguments.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-07-16-20-25-37.bpo-44655.I3wRjL.rst b/Misc/NEWS.d/next/Core and Builtins/2021-07-16-20-25-37.bpo-44655.I3wRjL.rst
deleted file mode 100644
index 4ea4a6d0859799..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-07-16-20-25-37.bpo-44655.I3wRjL.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Don't include a missing attribute with the same name as the failing one when
-offering suggestions for missing attributes. Patch by Pablo Galindo
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-07-16-21-35-14.bpo-44655.95I7M6.rst b/Misc/NEWS.d/next/Core and Builtins/2021-07-16-21-35-14.bpo-44655.95I7M6.rst
deleted file mode 100644
index 17733b3619a8f3..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-07-16-21-35-14.bpo-44655.95I7M6.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Include the name of the type in unset __slots__ attribute errors. Patch by
-Pablo Galindo
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-07-17-13-41-58.bpo-44662.q22kWR.rst b/Misc/NEWS.d/next/Core and Builtins/2021-07-17-13-41-58.bpo-44662.q22kWR.rst
deleted file mode 100644
index c165774a4cacfb..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-07-17-13-41-58.bpo-44662.q22kWR.rst	
+++ /dev/null
@@ -1,3 +0,0 @@
-Add ``__module__`` to ``types.Union``. This also fixes
-``types.Union`` issues with ``typing.Annotated``. Patch provided by
-Yurii Karabas.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-07-17-21-04-04.bpo-44633.5-zKeI.rst b/Misc/NEWS.d/next/Core and Builtins/2021-07-17-21-04-04.bpo-44633.5-zKeI.rst
deleted file mode 100644
index 507a68b65d4c37..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-07-17-21-04-04.bpo-44633.5-zKeI.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Parameter substitution of the union type with wrong types now raises
-``TypeError`` instead of returning ``NotImplemented``.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-07-19-19-53-46.bpo-44676.WgIMvh.rst b/Misc/NEWS.d/next/Core and Builtins/2021-07-19-19-53-46.bpo-44676.WgIMvh.rst
deleted file mode 100644
index 4a1815e041dcc2..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-07-19-19-53-46.bpo-44676.WgIMvh.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Add ability to serialise ``types.Union`` objects. Patch provided by Yurii
-Karabas.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-07-19-20-49-06.bpo-44653.WcqGyI.rst b/Misc/NEWS.d/next/Core and Builtins/2021-07-19-20-49-06.bpo-44653.WcqGyI.rst
deleted file mode 100644
index 8254d9bbad4a6e..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-07-19-20-49-06.bpo-44653.WcqGyI.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Support :mod:`typing` types in parameter substitution in the union type.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-07-21-15-26-56.bpo-44698.DA4_0o.rst b/Misc/NEWS.d/next/Core and Builtins/2021-07-21-15-26-56.bpo-44698.DA4_0o.rst
deleted file mode 100644
index ed389630c8ba11..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-07-21-15-26-56.bpo-44698.DA4_0o.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Fix undefined behaviour in complex object exponentiation.
\ No newline at end of file
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-07-26-15-27-03.bpo-44732.IxObt3.rst b/Misc/NEWS.d/next/Core and Builtins/2021-07-26-15-27-03.bpo-44732.IxObt3.rst
deleted file mode 100644
index 5094688a294314..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-07-26-15-27-03.bpo-44732.IxObt3.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Rename ``types.Union`` to ``types.UnionType``.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-07-27-11-14-22.bpo-34013.SjLFe-.rst b/Misc/NEWS.d/next/Core and Builtins/2021-07-27-11-14-22.bpo-34013.SjLFe-.rst
deleted file mode 100644
index c0d3dd99f98272..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-07-27-11-14-22.bpo-34013.SjLFe-.rst	
+++ /dev/null
@@ -1,3 +0,0 @@
-Generalize the invalid legacy statement custom error message (like the one
-generated when "print" is called without parentheses) to include more
-generic expressions. Patch by Pablo Galindo
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-07-31-12-12-57.bpo-44792.mOReTW.rst b/Misc/NEWS.d/next/Core and Builtins/2021-07-31-12-12-57.bpo-44792.mOReTW.rst
deleted file mode 100644
index 2e9000d09ee44c..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-07-31-12-12-57.bpo-44792.mOReTW.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Improve syntax errors for if expressions. Patch by Miguel Brito
diff --git a/Misc/NEWS.d/next/Documentation/2021-06-18-06-44-45.bpo-44453.3PIkj2.rst b/Misc/NEWS.d/next/Documentation/2021-06-18-06-44-45.bpo-44453.3PIkj2.rst
deleted file mode 100644
index fd72cf525c32fb..00000000000000
--- a/Misc/NEWS.d/next/Documentation/2021-06-18-06-44-45.bpo-44453.3PIkj2.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix documentation for the return type of :func:`sysconfig.get_path`.
diff --git a/Misc/NEWS.d/next/Documentation/2021-07-02-14-02-29.bpo-44544._5_aCz.rst b/Misc/NEWS.d/next/Documentation/2021-07-02-14-02-29.bpo-44544._5_aCz.rst
deleted file mode 100644
index 4bb69977e0c1a4..00000000000000
--- a/Misc/NEWS.d/next/Documentation/2021-07-02-14-02-29.bpo-44544._5_aCz.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-List all kwargs for :func:`textwrap.wrap`, :func:`textwrap.fill`, and
-:func:`textwrap.shorten`. Now, there are nav links to attributes of
-:class:`TextWrap`, which makes navigation much easier while minimizing
-duplication in the documentation.
diff --git a/Misc/NEWS.d/next/Documentation/2021-07-12-11-39-20.bpo-44613.DIXNzc.rst b/Misc/NEWS.d/next/Documentation/2021-07-12-11-39-20.bpo-44613.DIXNzc.rst
deleted file mode 100644
index baf591073620c8..00000000000000
--- a/Misc/NEWS.d/next/Documentation/2021-07-12-11-39-20.bpo-44613.DIXNzc.rst
+++ /dev/null
@@ -1 +0,0 @@
-importlib.metadata is no longer provisional.
diff --git a/Misc/NEWS.d/next/Documentation/2021-07-18-22-43-14.bpo-44561.T7HpWm.rst b/Misc/NEWS.d/next/Documentation/2021-07-18-22-43-14.bpo-44561.T7HpWm.rst
deleted file mode 100644
index 53238533edabbf..00000000000000
--- a/Misc/NEWS.d/next/Documentation/2021-07-18-22-43-14.bpo-44561.T7HpWm.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Update of three expired hyperlinks in Doc/distributing/index.rst:
-"Project structure", "Building and packaging the project", and "Uploading the
-project to the Python Packaging Index".
diff --git a/Misc/NEWS.d/next/Documentation/2021-07-20-21-03-18.bpo-30511.eMFkRi.rst b/Misc/NEWS.d/next/Documentation/2021-07-20-21-03-18.bpo-30511.eMFkRi.rst
deleted file mode 100644
index a358fb9cc2860b..00000000000000
--- a/Misc/NEWS.d/next/Documentation/2021-07-20-21-03-18.bpo-30511.eMFkRi.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Clarify that :func:`shutil.make_archive` is not thread-safe due to
-reliance on changing the current working directory.
diff --git a/Misc/NEWS.d/next/Documentation/2021-07-22-08-28-03.bpo-35183.p9BWTB.rst b/Misc/NEWS.d/next/Documentation/2021-07-22-08-28-03.bpo-35183.p9BWTB.rst
deleted file mode 100644
index 02c5fe82611fbf..00000000000000
--- a/Misc/NEWS.d/next/Documentation/2021-07-22-08-28-03.bpo-35183.p9BWTB.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add typical examples to os.path.splitext docs
\ No newline at end of file
diff --git a/Misc/NEWS.d/next/Documentation/2021-07-25-23-04-15.bpo-44693.JuCbNq.rst b/Misc/NEWS.d/next/Documentation/2021-07-25-23-04-15.bpo-44693.JuCbNq.rst
deleted file mode 100644
index 614abb412df8ea..00000000000000
--- a/Misc/NEWS.d/next/Documentation/2021-07-25-23-04-15.bpo-44693.JuCbNq.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Update the definition of __future__ in the glossary by replacing the confusing
-word "pseudo-module" with a more accurate description.
diff --git a/Misc/NEWS.d/next/Documentation/2021-07-26-23-48-31.bpo-44740.zMFGMV.rst b/Misc/NEWS.d/next/Documentation/2021-07-26-23-48-31.bpo-44740.zMFGMV.rst
deleted file mode 100644
index c01273f5ddc269..00000000000000
--- a/Misc/NEWS.d/next/Documentation/2021-07-26-23-48-31.bpo-44740.zMFGMV.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Replaced occurences of uppercase "Web" and "Internet" with lowercase
-versions per the 2016 revised Associated Press Style Book.
diff --git a/Misc/NEWS.d/next/Library/2017-09-20-14-43-03.bpo-29298._78CSN.rst b/Misc/NEWS.d/next/Library/2017-09-20-14-43-03.bpo-29298._78CSN.rst
deleted file mode 100644
index e84c6de02cd27e..00000000000000
--- a/Misc/NEWS.d/next/Library/2017-09-20-14-43-03.bpo-29298._78CSN.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix ``TypeError`` when required subparsers without ``dest`` do not receive
-arguments. Patch by Anthony Sottile.
diff --git a/Misc/NEWS.d/next/Library/2019-06-03-23-53-25.bpo-27513.qITN7d.rst b/Misc/NEWS.d/next/Library/2019-06-03-23-53-25.bpo-27513.qITN7d.rst
deleted file mode 100644
index 90d49bb2a993f1..00000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-03-23-53-25.bpo-27513.qITN7d.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-:func:`email.utils.getaddresses` now accepts
-:class:`email.header.Header` objects along with string values.
-Patch by Zackery Spytz.
diff --git a/Misc/NEWS.d/next/Library/2019-11-12-18-59-33.bpo-38741.W7IYkq.rst b/Misc/NEWS.d/next/Library/2019-11-12-18-59-33.bpo-38741.W7IYkq.rst
deleted file mode 100644
index 39d84ccea55b8c..00000000000000
--- a/Misc/NEWS.d/next/Library/2019-11-12-18-59-33.bpo-38741.W7IYkq.rst
+++ /dev/null
@@ -1 +0,0 @@
-:mod:`configparser`: using ']' inside a section header will no longer cut the section name short at the ']'
\ No newline at end of file
diff --git a/Misc/NEWS.d/next/Library/2021-06-12-21-25-35.bpo-27827.TMWh1i.rst b/Misc/NEWS.d/next/Library/2021-06-12-21-25-35.bpo-27827.TMWh1i.rst
deleted file mode 100644
index 1b8cc04533ed85..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-06-12-21-25-35.bpo-27827.TMWh1i.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-:meth:`pathlib.PureWindowsPath.is_reserved` now identifies a greater range of
-reserved filenames, including those with trailing spaces or colons.
diff --git a/Misc/NEWS.d/next/Library/2021-06-24-19-16-20.bpo-42892.qvRNhI.rst b/Misc/NEWS.d/next/Library/2021-06-24-19-16-20.bpo-42892.qvRNhI.rst
deleted file mode 100644
index 3c70b0534ecabf..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-06-24-19-16-20.bpo-42892.qvRNhI.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed an exception thrown while parsing a malformed multipart email by :class:`email.message.EmailMessage`.
diff --git a/Misc/NEWS.d/next/Library/2021-06-29-07-27-08.bpo-43625.ZlAxhp.rst b/Misc/NEWS.d/next/Library/2021-06-29-07-27-08.bpo-43625.ZlAxhp.rst
deleted file mode 100644
index a21975b948ef9e..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-06-29-07-27-08.bpo-43625.ZlAxhp.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix a bug in the detection of CSV file headers by
-:meth:`csv.Sniffer.has_header` and improve documentation of same.
diff --git a/Misc/NEWS.d/next/Library/2021-06-29-21-17-17.bpo-44461.acqRnV.rst b/Misc/NEWS.d/next/Library/2021-06-29-21-17-17.bpo-44461.acqRnV.rst
deleted file mode 100644
index 02e25e928b9cff..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-06-29-21-17-17.bpo-44461.acqRnV.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug with :mod:`pdb`'s handling of import error due to a package which does not have a ``__main__`` module
\ No newline at end of file
diff --git a/Misc/NEWS.d/next/Library/2021-07-04-11-33-34.bpo-41249.sHdwBE.rst b/Misc/NEWS.d/next/Library/2021-07-04-11-33-34.bpo-41249.sHdwBE.rst
deleted file mode 100644
index 06dae4a6e93565..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-07-04-11-33-34.bpo-41249.sHdwBE.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixes ``TypedDict`` to work with ``typing.get_type_hints()`` and postponed evaluation of
-annotations across modules.
diff --git a/Misc/NEWS.d/next/Library/2021-07-05-18-13-25.bpo-44566.o51Bd1.rst b/Misc/NEWS.d/next/Library/2021-07-05-18-13-25.bpo-44566.o51Bd1.rst
deleted file mode 100644
index 3b00a1b715feef..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-07-05-18-13-25.bpo-44566.o51Bd1.rst
+++ /dev/null
@@ -1 +0,0 @@
-handle StopIteration subclass raised from @contextlib.contextmanager generator
\ No newline at end of file
diff --git a/Misc/NEWS.d/next/Library/2021-07-09-07-14-37.bpo-41928.Q1jMrr.rst b/Misc/NEWS.d/next/Library/2021-07-09-07-14-37.bpo-41928.Q1jMrr.rst
deleted file mode 100644
index e6bd758980b003..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-07-09-07-14-37.bpo-41928.Q1jMrr.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Update :func:`shutil.copyfile` to raise :exc:`FileNotFoundError` instead of
-confusing :exc:`IsADirectoryError` when a path ending with a
-:const:`os.path.sep` does not exist; :func:`shutil.copy` and
-:func:`shutil.copy2` are also affected.
diff --git a/Misc/NEWS.d/next/Library/2021-07-12-10-43-31.bpo-44559.YunVKY.rst b/Misc/NEWS.d/next/Library/2021-07-12-10-43-31.bpo-44559.YunVKY.rst
deleted file mode 100644
index 0259a929eec3ba..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-07-12-10-43-31.bpo-44559.YunVKY.rst
+++ /dev/null
@@ -1 +0,0 @@
-[Enum] module reverted to 3.9; 3.10 changes pushed until 3.11
diff --git a/Misc/NEWS.d/next/Library/2021-07-13-09-01-33.bpo-44608.R3IcM1.rst b/Misc/NEWS.d/next/Library/2021-07-13-09-01-33.bpo-44608.R3IcM1.rst
deleted file mode 100644
index e0cf948f3cba68..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-07-13-09-01-33.bpo-44608.R3IcM1.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix memory leak in :func:`_tkinter._flatten` if it is called with a sequence
-or set, but not list or tuple.
diff --git a/Misc/NEWS.d/next/Library/2021-07-15-16-51-32.bpo-44648.2o49TB.rst b/Misc/NEWS.d/next/Library/2021-07-15-16-51-32.bpo-44648.2o49TB.rst
deleted file mode 100644
index f7171c3c84c5ea..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-07-15-16-51-32.bpo-44648.2o49TB.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Fixed wrong error being thrown by :func:`inspect.getsource` when examining a
-class in the interactive session. Instead of :exc:`TypeError`, it should be
-:exc:`OSError` with appropriate error message.
diff --git a/Misc/NEWS.d/next/Library/2021-07-16-13-40-31.bpo-40897.aveAre.rst b/Misc/NEWS.d/next/Library/2021-07-16-13-40-31.bpo-40897.aveAre.rst
deleted file mode 100644
index 04f1465f0ac67f..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-07-16-13-40-31.bpo-40897.aveAre.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Give priority to using the current class constructor in
-:func:`inspect.signature`. Patch by Weipeng Hong.
diff --git a/Misc/NEWS.d/next/Library/2021-07-19-14-04-42.bpo-44524.Nbf2JC.rst b/Misc/NEWS.d/next/Library/2021-07-19-14-04-42.bpo-44524.Nbf2JC.rst
deleted file mode 100644
index 0acdc7dff029f0..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-07-19-14-04-42.bpo-44524.Nbf2JC.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Add missing ``__name__`` and ``__qualname__`` attributes to ``typing`` module
-classes. Patch provided by Yurii Karabas.
diff --git a/Misc/NEWS.d/next/Library/2021-07-19-22-43-15.bpo-44353.HF81_Q.rst b/Misc/NEWS.d/next/Library/2021-07-19-22-43-15.bpo-44353.HF81_Q.rst
deleted file mode 100644
index 8a1e0f77b31772..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-07-19-22-43-15.bpo-44353.HF81_Q.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Refactor ``typing.NewType`` from function into callable class. Patch
-provided by Yurii Karabas.
diff --git a/Misc/NEWS.d/next/Library/2021-07-20-21-51-35.bpo-42854.ThuDMI.rst b/Misc/NEWS.d/next/Library/2021-07-20-21-51-35.bpo-42854.ThuDMI.rst
deleted file mode 100644
index 33cbb63a5e14b8..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-07-20-21-51-35.bpo-42854.ThuDMI.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Fixed a bug in the :mod:`_ssl` module that was throwing :exc:`OverflowError`
-when using :meth:`_ssl._SSLSocket.write` and :meth:`_ssl._SSLSocket.read`
-for a big value of the ``len`` parameter. Patch by Pablo Galindo
diff --git a/Misc/NEWS.d/next/Library/2021-07-21-10-43-22.bpo-44666.CEThkv.rst b/Misc/NEWS.d/next/Library/2021-07-21-10-43-22.bpo-44666.CEThkv.rst
deleted file mode 100644
index ab2ef22d0c4558..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-07-21-10-43-22.bpo-44666.CEThkv.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed issue in :func:`compileall.compile_file` when ``sys.stdout`` is redirected.
-Patch by Stefan H?lzl.
diff --git a/Misc/NEWS.d/next/Library/2021-07-21-23-16-30.bpo-44704.iqHLxQ.rst b/Misc/NEWS.d/next/Library/2021-07-21-23-16-30.bpo-44704.iqHLxQ.rst
deleted file mode 100644
index 586661876dedba..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-07-21-23-16-30.bpo-44704.iqHLxQ.rst
+++ /dev/null
@@ -1 +0,0 @@
-The implementation of ``collections.abc.Set._hash()`` now matches that of ``frozenset.__hash__()``.
\ No newline at end of file
diff --git a/Misc/NEWS.d/next/Library/2021-07-24-02-17-59.bpo-44720.shU5Qm.rst b/Misc/NEWS.d/next/Library/2021-07-24-02-17-59.bpo-44720.shU5Qm.rst
deleted file mode 100644
index 83694f3988ae9a..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-07-24-02-17-59.bpo-44720.shU5Qm.rst
+++ /dev/null
@@ -1 +0,0 @@
-``weakref.proxy`` objects referencing non-iterators now raise ``TypeError`` rather than dereferencing the null ``tp_iternext`` slot and crashing.
\ No newline at end of file
diff --git a/Misc/NEWS.d/next/Library/2021-07-27-22-11-29.bpo-44752._bvbrZ.rst b/Misc/NEWS.d/next/Library/2021-07-27-22-11-29.bpo-44752._bvbrZ.rst
deleted file mode 100644
index 0d8a2cd6a5e0db..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-07-27-22-11-29.bpo-44752._bvbrZ.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-:mod:`rcompleter` does not call :func:`getattr` on :class:`property` objects
-to avoid the side-effect of  evaluating the corresponding method.
diff --git a/Misc/NEWS.d/next/Library/2021-07-30-23-27-30.bpo-44667.tu0Xrv.rst b/Misc/NEWS.d/next/Library/2021-07-30-23-27-30.bpo-44667.tu0Xrv.rst
deleted file mode 100644
index 5b7e20e0afdf5e..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-07-30-23-27-30.bpo-44667.tu0Xrv.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-The :func:`tokenize.tokenize` doesn't incorrectly generate a ``NEWLINE``
-token if the source doesn't end with a new line character but the last line
-is a comment, as the function is already generating a ``NL`` token. Patch by
-Pablo Galindo
diff --git a/Misc/NEWS.d/next/Library/2021-07-31-08-45-31.bpo-44784.fIMIDS.rst b/Misc/NEWS.d/next/Library/2021-07-31-08-45-31.bpo-44784.fIMIDS.rst
deleted file mode 100644
index 6ad10ef3f59805..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-07-31-08-45-31.bpo-44784.fIMIDS.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-In importlib.metadata tests, override warnings behavior under expected
-DeprecationWarnings (importlib_metadata 4.6.3).
diff --git a/Misc/NEWS.d/next/Library/2021-07-31-20-28-20.bpo-44793.woaQSg.rst b/Misc/NEWS.d/next/Library/2021-07-31-20-28-20.bpo-44793.woaQSg.rst
deleted file mode 100644
index 1d94d67615a479..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-07-31-20-28-20.bpo-44793.woaQSg.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix checking the number of arguments when subscribe a generic type with
-``ParamSpec`` parameter.
diff --git a/Misc/NEWS.d/next/Library/2021-08-02-14-37-32.bpo-44806.wOW_Qn.rst b/Misc/NEWS.d/next/Library/2021-08-02-14-37-32.bpo-44806.wOW_Qn.rst
deleted file mode 100644
index 6d818c3fc57982..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-08-02-14-37-32.bpo-44806.wOW_Qn.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Non-protocol subclasses of :class:`typing.Protocol` ignore now the
-``__init__`` method inherited from protocol base classes.
diff --git a/Misc/NEWS.d/next/Security/2021-07-25-20-04-54.bpo-44600.0WMldg.rst b/Misc/NEWS.d/next/Security/2021-07-25-20-04-54.bpo-44600.0WMldg.rst
deleted file mode 100644
index ea4e04f6da911c..00000000000000
--- a/Misc/NEWS.d/next/Security/2021-07-25-20-04-54.bpo-44600.0WMldg.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix incorrect line numbers while tracing some failed patterns in :ref:`match <match>` statements. Patch by Charles Burkland.
\ No newline at end of file
diff --git a/Misc/NEWS.d/next/Tests/2021-06-26-18-37-36.bpo-44515.e9fO6f.rst b/Misc/NEWS.d/next/Tests/2021-06-26-18-37-36.bpo-44515.e9fO6f.rst
deleted file mode 100644
index d2867b6e89f872..00000000000000
--- a/Misc/NEWS.d/next/Tests/2021-06-26-18-37-36.bpo-44515.e9fO6f.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Adjust recently added contextlib tests to avoid assuming the use of a
-refcounted GC
diff --git a/Misc/NEWS.d/next/Tests/2021-07-16-14-02-33.bpo-44647.5LzqIy.rst b/Misc/NEWS.d/next/Tests/2021-07-16-14-02-33.bpo-44647.5LzqIy.rst
deleted file mode 100644
index e4b2be2b409997..00000000000000
--- a/Misc/NEWS.d/next/Tests/2021-07-16-14-02-33.bpo-44647.5LzqIy.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Added a permanent Unicode-valued environment variable to regression tests to
-ensure they handle this use case in the future. If your test environment
-breaks because of that, report a bug to us, and temporarily set
-PYTHONREGRTEST_UNICODE_GUARD=0 in your test environment.
diff --git a/Misc/NEWS.d/next/Tests/2021-07-22-16-38-39.bpo-44708.SYNaac.rst b/Misc/NEWS.d/next/Tests/2021-07-22-16-38-39.bpo-44708.SYNaac.rst
deleted file mode 100644
index 8b26c4de64b983..00000000000000
--- a/Misc/NEWS.d/next/Tests/2021-07-22-16-38-39.bpo-44708.SYNaac.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Regression tests, when run with -w, are now re-running only the affected
-test methods instead of re-running the entire test file.
diff --git a/Misc/NEWS.d/next/Tests/2021-07-24-20-09-15.bpo-44734.KKsNOV.rst b/Misc/NEWS.d/next/Tests/2021-07-24-20-09-15.bpo-44734.KKsNOV.rst
deleted file mode 100644
index 94e9ce08f4bf6b..00000000000000
--- a/Misc/NEWS.d/next/Tests/2021-07-24-20-09-15.bpo-44734.KKsNOV.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed floating point precision issue in turtle tests.
diff --git a/Misc/NEWS.d/next/Tools-Demos/2021-07-28-00-51-55.bpo-44756.pvAajB.rst b/Misc/NEWS.d/next/Tools-Demos/2021-07-28-00-51-55.bpo-44756.pvAajB.rst
deleted file mode 100644
index 4734f1f5c41691..00000000000000
--- a/Misc/NEWS.d/next/Tools-Demos/2021-07-28-00-51-55.bpo-44756.pvAajB.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-In the Makefile for documentation (:file:`Doc/Makefile`), the ``build`` rule
-is dependent on the ``venv`` rule. Therefore, ``html``, ``latex``, and other
-build-dependent rules are also now dependent on ``venv``. The ``venv`` rule
-only performs an action if ``$(VENVDIR)`` does not exist.
-:file:`Doc/README.rst` was updated; most users now only need to type ``make
-html``.
diff --git a/Misc/NEWS.d/next/Windows/2020-04-13-15-20-28.bpo-40263.1KKEbu.rst b/Misc/NEWS.d/next/Windows/2020-04-13-15-20-28.bpo-40263.1KKEbu.rst
deleted file mode 100644
index 0c31606d4928c8..00000000000000
--- a/Misc/NEWS.d/next/Windows/2020-04-13-15-20-28.bpo-40263.1KKEbu.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-This is a follow-on bug from https://bugs.python.org/issue26903. Once that
-is applied we run into an off-by-one assertion problem. The assert was not
-correct.
diff --git a/Misc/NEWS.d/next/Windows/2021-07-13-15-32-49.bpo-44572.gXvhDc.rst b/Misc/NEWS.d/next/Windows/2021-07-13-15-32-49.bpo-44572.gXvhDc.rst
deleted file mode 100644
index 6e074c59b8445b..00000000000000
--- a/Misc/NEWS.d/next/Windows/2021-07-13-15-32-49.bpo-44572.gXvhDc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Avoid consuming standard input in the :mod:`platform` module
\ No newline at end of file
diff --git a/Misc/NEWS.d/next/macOS/2021-03-29-21-11-23.bpo-34932.f3Hdyd.rst b/Misc/NEWS.d/next/macOS/2021-03-29-21-11-23.bpo-34932.f3Hdyd.rst
deleted file mode 100644
index d3a52c9fc37b5f..00000000000000
--- a/Misc/NEWS.d/next/macOS/2021-03-29-21-11-23.bpo-34932.f3Hdyd.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add socket.TCP_KEEPALIVE support for macOS. Patch by Shane Harvey.
diff --git a/Misc/NEWS.d/next/macOS/2021-07-12-15-42-02.bpo-41972.yUjE8j.rst b/Misc/NEWS.d/next/macOS/2021-07-12-15-42-02.bpo-41972.yUjE8j.rst
deleted file mode 100644
index 6c70c07669f9c1..00000000000000
--- a/Misc/NEWS.d/next/macOS/2021-07-12-15-42-02.bpo-41972.yUjE8j.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-The framework build's user header path in sysconfig is changed to add a
-'pythonX.Y' component to match distutils's behavior.
diff --git a/README.rst b/README.rst
index 63eaefc358faa9..473fd9405c51f2 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
-This is Python version 3.10.0 beta 4
-====================================
+This is Python version 3.10.0 rc1
+=================================
 
 .. image:: https://travis-ci.com/python/cpython.svg?branch=master
    :alt: CPython build status on Travis CI
diff --git a/configure b/configure
index 1baa145e3ed4d6..6bf76b51b46e7b 100755
--- a/configure
+++ b/configure
@@ -1,11 +1,12 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for python 3.10.
+# Generated by GNU Autoconf 2.71 for python 3.10.
 #
 # Report bugs to <https://bugs.python.org/>.
 #
 #
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
+# Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -16,14 +17,16 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+as_nop=:
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else
+else $as_nop
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
@@ -33,46 +36,46 @@ esac
 fi
 
 
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
 
 # The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if ${PATH_SEPARATOR+false} :; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -81,13 +84,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -96,8 +92,12 @@ case $0 in #((
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
   done
 IFS=$as_save_IFS
 
@@ -109,30 +109,10 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # Use a proper internal environment variable to ensure we don't fall
   # into an infinite loop, continuously re-executing ourselves.
@@ -154,20 +134,22 @@ esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
   fi
   # We don't want this to propagate to other subprocesses.
           { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  as_bourne_compatible="as_nop=:
+if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
-else
+else \$as_nop
   case \`(set -o) 2>/dev/null\` in #(
   *posix*) :
     set -o posix ;; #(
@@ -187,42 +169,53 @@ as_fn_success || { exitcode=1; echo as_fn_success failed.; }
 as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
 as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
 as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+if ( set x; as_fn_ret_success y && test x = \"\$1\" )
+then :
 
-else
+else \$as_nop
   exitcode=1; echo positional parameters were not saved.
 fi
 test x\$exitcode = x0 || exit 1
+blah=\$(echo \$(echo blah))
+test x\"\$blah\" = xblah || exit 1
 test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
 test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
+  if (eval "$as_required") 2>/dev/null
+then :
   as_have_required=yes
-else
+else $as_nop
   as_have_required=no
 fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
+then :
 
-else
+else $as_nop
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
   as_found=:
   case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
 	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
+	     as_shell=$as_dir$as_base
 	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+		    as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
   CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+		   if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null
+then :
   break 2
 fi
 fi
@@ -230,14 +223,21 @@ fi
        esac
   as_found=false
 done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
 IFS=$as_save_IFS
+if $as_found
+then :
+
+else $as_nop
+  if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi
+fi
 
 
-      if test "x$CONFIG_SHELL" != x; then :
+      if test "x$CONFIG_SHELL" != x
+then :
   export CONFIG_SHELL
              # We cannot yet assume a decent shell, so we have to provide a
 # neutralization value for shells without unset; and this also
@@ -255,18 +255,19 @@ esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+    if test x$as_have_required = xno
+then :
+  printf "%s\n" "$0: This script requires a shell more modern than all"
+  printf "%s\n" "$0: the shells that I found on your system."
+  if test ${ZSH_VERSION+y} ; then
+    printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_echo "$0: Please tell bug-autoconf at gnu.org and
+    printf "%s\n" "$0: Please tell bug-autoconf at gnu.org and
 $0: https://bugs.python.org/ about your system, including
 $0: any error possibly output before this message. Then
 $0: install a modern shell, or manually run the script
@@ -294,6 +295,7 @@ as_fn_unset ()
 }
 as_unset=as_fn_unset
 
+
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -311,6 +313,14 @@ as_fn_exit ()
   as_fn_set_status $1
   exit $1
 } # as_fn_exit
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+  return $?
+}
+as_nop=as_fn_nop
 
 # as_fn_mkdir_p
 # -------------
@@ -325,7 +335,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -334,7 +344,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+printf "%s\n" X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -373,12 +383,13 @@ as_fn_executable_p ()
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else
+else $as_nop
   as_fn_append ()
   {
     eval $1=\$$1\$2
@@ -390,18 +401,27 @@ fi # as_fn_append
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else
+else $as_nop
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
   }
 fi # as_fn_arith
 
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+  return $?
+}
+as_nop=as_fn_nop
 
 # as_fn_error STATUS ERROR [LINENO LOG_FD]
 # ----------------------------------------
@@ -413,9 +433,9 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $2" >&2
+  printf "%s\n" "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -442,7 +462,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+printf "%s\n" X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -486,7 +506,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
@@ -500,6 +520,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   exit
 }
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -513,6 +537,13 @@ case `echo -n x` in #(((((
   ECHO_N='-n';;
 esac
 
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n.  New code should use
+# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
+
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -588,40 +619,36 @@ PACKAGE_URL=''
 ac_unique_file="Include/object.h"
 # Factoring default headers for most tests.
 ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
+#include <stddef.h>
+#ifdef HAVE_STDIO_H
+# include <stdio.h>
 #endif
-#ifdef STDC_HEADERS
+#ifdef HAVE_STDLIB_H
 # include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
 #endif
 #ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
+ac_header_c_list=
 ac_subst_vars='LTLIBOBJS
 TEST_MODULES
 LIBRARY_DEPS
@@ -673,6 +700,7 @@ LDSHARED
 SHLIB_SUFFIX
 LIBTOOL_CRUFT
 OTHER_LIBTOOL_OPT
+EGREP
 UNIVERSAL_ARCH_FLAGS
 LDFLAGS_NODIST
 CFLAGS_NODIST
@@ -716,7 +744,6 @@ DLLLIBRARY
 LDLIBRARY
 LIBRARY
 BUILDEXEEXT
-EGREP
 NO_AS_NEEDED
 MULTIARCH_CPPFLAGS
 PLATFORM_TRIPLET
@@ -942,8 +969,6 @@ do
   *)    ac_optarg=yes ;;
   esac
 
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
   case $ac_dashdash$ac_option in
   --)
     ac_dashdash=yes ;;
@@ -984,9 +1009,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1010,9 +1035,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1223,9 +1248,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1239,9 +1264,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1285,9 +1310,9 @@ Try \`$0 --help' for more information"
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
@@ -1303,7 +1328,7 @@ if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -1367,7 +1392,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_myself" : 'X\(//\)[^/]' \| \
 	 X"$as_myself" : 'X\(//\)$' \| \
 	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
+printf "%s\n" X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1657,9 +1682,9 @@ if test "$ac_init_help" = "recursive"; then
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1687,7 +1712,8 @@ esac
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
     cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
+    # Check for configure.gnu first; this name is used for a wrapper for
+    # Metaconfig's "Configure" on case-insensitive file systems.
     if test -f "$ac_srcdir/configure.gnu"; then
       echo &&
       $SHELL "$ac_srcdir/configure.gnu" --help=recursive
@@ -1695,7 +1721,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1705,9 +1731,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 python configure 3.10
-generated by GNU Autoconf 2.69
+generated by GNU Autoconf 2.71
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1724,14 +1750,14 @@ fi
 ac_fn_c_try_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
+  rm -f conftest.$ac_objext conftest.beam
   if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1739,14 +1765,15 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
+       } && test -s conftest.$ac_objext
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -1768,7 +1795,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1776,14 +1803,15 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       }; then :
+       }
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1
@@ -1799,14 +1827,14 @@ fi
 ac_fn_c_try_link ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
+  rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
   if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1814,17 +1842,18 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
 	 test -x conftest$ac_exeext
-       }; then :
+       }
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -1839,101 +1868,43 @@ fi
 
 } # ac_fn_c_try_link
 
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 #include <$2>
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
+if ac_fn_c_try_compile "$LINENO"
+then :
+  eval "$3=yes"
+else $as_nop
+  eval "$3=no"
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## --------------------------------------- ##
-## Report this to https://bugs.python.org/ ##
-## --------------------------------------- ##"
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
-} # ac_fn_c_check_header_mongrel
+} # ac_fn_c_check_header_compile
 
 # ac_fn_c_try_run LINENO
 # ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
+# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that
+# executables *can* be run.
 ac_fn_c_try_run ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
@@ -1943,25 +1914,26 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
   { { case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: program exited with status $ac_status" >&5
+       printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
        ac_retval=$ac_status
@@ -1972,37 +1944,6 @@ fi
 
 } # ac_fn_c_try_run
 
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_compile
-
 # ac_fn_c_check_type LINENO TYPE VAR INCLUDES
 # -------------------------------------------
 # Tests whether TYPE exists after having included INCLUDES, setting cache
@@ -2010,17 +1951,18 @@ $as_echo "$ac_res" >&6; }
 ac_fn_c_check_type ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   eval "$3=no"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 if (sizeof ($2))
 	 return 0;
@@ -2028,12 +1970,13 @@ if (sizeof ($2))
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 if (sizeof (($2)))
 	    return 0;
@@ -2041,18 +1984,19 @@ if (sizeof (($2)))
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-else
+else $as_nop
   eval "$3=yes"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_type
@@ -2071,7 +2015,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 static int test_array [1 - 2 * !(($2) >= 0)];
 test_array [0] = 0;
@@ -2081,14 +2025,15 @@ return test_array [0];
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_lo=0 ac_mid=0
   while :; do
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
 test_array [0] = 0;
@@ -2098,9 +2043,10 @@ return test_array [0];
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_hi=$ac_mid; break
-else
+else $as_nop
   as_fn_arith $ac_mid + 1 && ac_lo=$as_val
 			if test $ac_lo -le $ac_mid; then
 			  ac_lo= ac_hi=
@@ -2108,14 +2054,14 @@ else
 			fi
 			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   done
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 static int test_array [1 - 2 * !(($2) < 0)];
 test_array [0] = 0;
@@ -2125,14 +2071,15 @@ return test_array [0];
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_hi=-1 ac_mid=-1
   while :; do
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 static int test_array [1 - 2 * !(($2) >= $ac_mid)];
 test_array [0] = 0;
@@ -2142,9 +2089,10 @@ return test_array [0];
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_lo=$ac_mid; break
-else
+else $as_nop
   as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
 			if test $ac_mid -le $ac_hi; then
 			  ac_lo= ac_hi=
@@ -2152,14 +2100,14 @@ else
 			fi
 			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   done
-else
+else $as_nop
   ac_lo= ac_hi=
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
@@ -2167,7 +2115,7 @@ while test "x$ac_lo" != "x$ac_hi"; do
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
 test_array [0] = 0;
@@ -2177,12 +2125,13 @@ return test_array [0];
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_hi=$ac_mid
-else
+else $as_nop
   as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 done
 case $ac_lo in #((
 ?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
@@ -2192,12 +2141,12 @@ esac
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
-static long int longval () { return $2; }
-static unsigned long int ulongval () { return $2; }
+static long int longval (void) { return $2; }
+static unsigned long int ulongval (void) { return $2; }
 #include <stdio.h>
 #include <stdlib.h>
 int
-main ()
+main (void)
 {
 
   FILE *f = fopen ("conftest.val", "w");
@@ -2225,9 +2174,10 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   echo >>conftest.val; read $3 <conftest.val; ac_retval=0
-else
+else $as_nop
   ac_retval=1
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -2246,11 +2196,12 @@ rm -f conftest.val
 ac_fn_c_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Define $2 to an innocuous variant, in case <limits.h> declares $2.
@@ -2258,16 +2209,9 @@ else
 #define $2 innocuous_$2
 
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+   which can conflict with char $2 (); below.  */
 
+#include <limits.h>
 #undef $2
 
 /* Override any GCC internal prototype to avoid an error.
@@ -2285,47 +2229,51 @@ choke me
 #endif
 
 int
-main ()
+main (void)
 {
 return $2 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$3=yes"
-else
+else $as_nop
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
 
-# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
-# ---------------------------------------------
+# ac_fn_check_decl LINENO SYMBOL VAR INCLUDES EXTRA-OPTIONS FLAG-VAR
+# ------------------------------------------------------------------
 # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-# accordingly.
-ac_fn_c_check_decl ()
+# accordingly. Pass EXTRA-OPTIONS to the compiler, using FLAG-VAR.
+ac_fn_check_decl ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   as_decl_name=`echo $2|sed 's/ *(.*//'`
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+printf %s "checking whether $as_decl_name is declared... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  eval ac_save_FLAGS=\$$6
+  as_fn_append $6 " $5"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 #ifndef $as_decl_name
 #ifdef __cplusplus
@@ -2339,19 +2287,22 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   eval "$3=yes"
-else
+else $as_nop
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+  eval $6=\$ac_save_FLAGS
+
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
-} # ac_fn_c_check_decl
+} # ac_fn_check_decl
 
 # ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
 # ----------------------------------------------------
@@ -2360,16 +2311,17 @@ $as_echo "$ac_res" >&6; }
 ac_fn_c_check_member ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
-$as_echo_n "checking for $2.$3... " >&6; }
-if eval \${$4+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+printf %s "checking for $2.$3... " >&6; }
+if eval test \${$4+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $5
 int
-main ()
+main (void)
 {
 static $2 ac_aggr;
 if (ac_aggr.$3)
@@ -2378,14 +2330,15 @@ return 0;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   eval "$4=yes"
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $5
 int
-main ()
+main (void)
 {
 static $2 ac_aggr;
 if (sizeof ac_aggr.$3)
@@ -2394,29 +2347,50 @@ return 0;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   eval "$4=yes"
-else
+else $as_nop
   eval "$4=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$4
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_member
+ac_configure_args_raw=
+for ac_arg
+do
+  case $ac_arg in
+  *\'*)
+    ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+  esac
+  as_fn_append ac_configure_args_raw " '$ac_arg'"
+done
+
+case $ac_configure_args_raw in
+  *$as_nl*)
+    ac_safe_unquote= ;;
+  *)
+    ac_unsafe_z='|&;<>()$`\\"*?[ ''	' # This string ends in space, tab.
+    ac_unsafe_a="$ac_unsafe_z#~"
+    ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g"
+    ac_configure_args_raw=`      printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
+esac
+
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by python $as_me 3.10, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+generated by GNU Autoconf 2.71.  Invocation command line was
 
-  $ $0 $@
+  $ $0$ac_configure_args_raw
 
 _ACEOF
 exec 5>>config.log
@@ -2449,8 +2423,12 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    printf "%s\n" "PATH: $as_dir"
   done
 IFS=$as_save_IFS
 
@@ -2485,7 +2463,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -2520,11 +2498,13 @@ done
 # WARNING: Use '\'' to represent an apostrophe within the trap.
 # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
+  # Sanitize IFS.
+  IFS=" ""	$as_nl"
   # Save into config.log some information that might help in debugging.
   {
     echo
 
-    $as_echo "## ---------------- ##
+    printf "%s\n" "## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##"
     echo
@@ -2535,8 +2515,8 @@ trap 'exit_status=$?
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -2560,7 +2540,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 )
     echo
 
-    $as_echo "## ----------------- ##
+    printf "%s\n" "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
     echo
@@ -2568,14 +2548,14 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      $as_echo "$ac_var='\''$ac_val'\''"
+      printf "%s\n" "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
+      printf "%s\n" "## ------------------- ##
 ## File substitutions. ##
 ## ------------------- ##"
       echo
@@ -2583,15 +2563,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
+	printf "%s\n" "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
 
     if test -s confdefs.h; then
-      $as_echo "## ----------- ##
+      printf "%s\n" "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
       echo
@@ -2599,8 +2579,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       echo
     fi
     test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
+      printf "%s\n" "$as_me: caught signal $ac_signal"
+    printf "%s\n" "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -2614,63 +2594,48 @@ ac_signal=0
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-$as_echo "/* confdefs.h */" > confdefs.h
+printf "%s\n" "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
+printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
+printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
+printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
+printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
+printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
+printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
 
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
+  ac_site_files="$CONFIG_SITE"
 elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
+  ac_site_files="$prefix/share/config.site $prefix/etc/config.site"
 else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
+  ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
 fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+
+for ac_site_file in $ac_site_files
 do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+  case $ac_site_file in #(
+  */*) :
+     ;; #(
+  *) :
+    ac_site_file=./$ac_site_file ;;
+esac
+  if test -f "$ac_site_file" && test -r "$ac_site_file"; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
 See \`config.log' for more details" "$LINENO" 5; }
   fi
@@ -2680,94 +2645,513 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special files
   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
+# Test code for whether the C compiler supports C89 (global declarations)
+ac_c_conftest_c89_globals='
+/* Does the compiler advertise C89 conformance?
+   Do not test the value of __STDC__, because some compilers set it to 0
+   while being otherwise adequately conformant. */
+#if !defined __STDC__
+# error "Compiler does not advertise C89 conformance"
+#endif
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+#include <stddef.h>
+#include <stdarg.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7 src/conf.sh.  */
+struct buf { int x; };
+struct buf * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
 
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not \xHH hex character constants.
+   These do not provoke an error unfortunately, instead are silently treated
+   as an "x".  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously \x00 != x always comes out true, for an
+   array size at least.  It is necessary to write \x00 == 0 to get something
+   that is true only with -std.  */
+int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1];
 
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) '\''x'\''
+int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1];
 
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int),
+               int, int);'
 
+# Test code for whether the C compiler supports C89 (body of main).
+ac_c_conftest_c89_main='
+ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]);
+'
 
+# Test code for whether the C compiler supports C99 (global declarations)
+ac_c_conftest_c99_globals='
+// Does the compiler advertise C99 conformance?
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
+# error "Compiler does not advertise C99 conformance"
+#endif
 
-if test "$srcdir" != . -a "$srcdir" != "$(pwd)"; then
-    # If we're building out-of-tree, we need to make sure the following
-    # resources get picked up before their $srcdir counterparts.
+#include <stdbool.h>
+extern int puts (const char *);
+extern int printf (const char *, ...);
+extern int dprintf (int, const char *, ...);
+extern void *malloc (size_t);
+
+// Check varargs macros.  These examples are taken from C99 6.10.3.5.
+// dprintf is used instead of fprintf to avoid needing to declare
+// FILE and stderr.
+#define debug(...) dprintf (2, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+  int x = 1234;
+  int y = 5678;
+  debug ("Flag");
+  debug ("X = %d\n", x);
+  showlist (The first, second, and third items.);
+  report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+  #error "your preprocessor is broken"
+#endif
+#if BIG_OK
+#else
+  #error "your preprocessor is broken"
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+  int datasize;
+  double data[];
+};
+
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy.
+static bool
+test_varargs (const char *format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  va_list args_copy;
+  va_copy (args_copy, args);
+
+  const char *str = "";
+  int number = 0;
+  float fnumber = 0;
+
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case '\''s'\'': // string
+	  str = va_arg (args_copy, const char *);
+	  break;
+	case '\''d'\'': // int
+	  number = va_arg (args_copy, int);
+	  break;
+	case '\''f'\'': // float
+	  fnumber = va_arg (args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end (args_copy);
+  va_end (args);
+
+  return *str && number && fnumber;
+}
+'
+
+# Test code for whether the C compiler supports C99 (body of main).
+ac_c_conftest_c99_main='
+  // Check bool.
+  _Bool success = false;
+  success |= (argc != 0);
+
+  // Check restrict.
+  if (test_restrict ("String literal") == 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
+  test_varargs_macros ();
+
+  // Check flexible array members.
+  struct incomplete_array *ia =
+    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->data[i] = i * 1.234;
+
+  // Check named initializers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_array[ni.number];
+  dynamic_array[0] = argv[0][0];
+  dynamic_array[ni.number - 1] = 543;
+
+  // work around unused variable warnings
+  ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\''
+	 || dynamic_array[ni.number - 1] != 543);
+'
+
+# Test code for whether the C compiler supports C11 (global declarations)
+ac_c_conftest_c11_globals='
+// Does the compiler advertise C11 conformance?
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
+# error "Compiler does not advertise C11 conformance"
+#endif
+
+// Check _Alignas.
+char _Alignas (double) aligned_as_double;
+char _Alignas (0) no_special_alignment;
+extern char aligned_as_int;
+char _Alignas (0) _Alignas (int) aligned_as_int;
+
+// Check _Alignof.
+enum
+{
+  int_alignment = _Alignof (int),
+  int_array_alignment = _Alignof (int[100]),
+  char_alignment = _Alignof (char)
+};
+_Static_assert (0 < -_Alignof (int), "_Alignof is signed");
+
+// Check _Noreturn.
+int _Noreturn does_not_return (void) { for (;;) continue; }
+
+// Check _Static_assert.
+struct test_static_assert
+{
+  int x;
+  _Static_assert (sizeof (int) <= sizeof (long int),
+                  "_Static_assert does not work in struct");
+  long int y;
+};
+
+// Check UTF-8 literals.
+#define u8 syntax error!
+char const utf8_literal[] = u8"happens to be ASCII" "another string";
+
+// Check duplicate typedefs.
+typedef long *long_ptr;
+typedef long int *long_ptr;
+typedef long_ptr long_ptr;
+
+// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1.
+struct anonymous
+{
+  union {
+    struct { int i; int j; };
+    struct { int k; long int l; } w;
+  };
+  int m;
+} v1;
+'
+
+# Test code for whether the C compiler supports C11 (body of main).
+ac_c_conftest_c11_main='
+  _Static_assert ((offsetof (struct anonymous, i)
+		   == offsetof (struct anonymous, w.k)),
+		  "Anonymous union alignment botch");
+  v1.i = 2;
+  v1.w.k = 5;
+  ok |= v1.i != 5;
+'
+
+# Test code for whether the C compiler supports C11 (complete).
+ac_c_conftest_c11_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+${ac_c_conftest_c11_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  ${ac_c_conftest_c99_main}
+  ${ac_c_conftest_c11_main}
+  return ok;
+}
+"
+
+# Test code for whether the C compiler supports C99 (complete).
+ac_c_conftest_c99_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  ${ac_c_conftest_c99_main}
+  return ok;
+}
+"
+
+# Test code for whether the C compiler supports C89 (complete).
+ac_c_conftest_c89_program="${ac_c_conftest_c89_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  return ok;
+}
+"
+
+as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
+as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
+as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
+as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
+as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H"
+as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
+as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
+as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
+as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
+as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H"
+as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H"
+as_fn_append ac_header_c_list " sys/time.h sys_time_h HAVE_SYS_TIME_H"
+
+# Auxiliary files required by this configure script.
+ac_aux_files="install-sh config.guess config.sub"
+
+# Locations in which to look for auxiliary files.
+ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.."
+
+# Search for a directory containing all of the required auxiliary files,
+# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates.
+# If we don't find one directory that contains all the files we need,
+# we report the set of missing files from the *first* directory in
+# $ac_aux_dir_candidates and give up.
+ac_missing_aux_files=""
+ac_first_candidate=:
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in $ac_aux_dir_candidates
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+  as_found=:
+
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
+  ac_aux_dir_found=yes
+  ac_install_sh=
+  for ac_aux in $ac_aux_files
+  do
+    # As a special case, if "install-sh" is required, that requirement
+    # can be satisfied by any of "install-sh", "install.sh", or "shtool",
+    # and $ac_install_sh is set appropriately for whichever one is found.
+    if test x"$ac_aux" = x"install-sh"
+    then
+      if test -f "${as_dir}install-sh"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
+        ac_install_sh="${as_dir}install-sh -c"
+      elif test -f "${as_dir}install.sh"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
+        ac_install_sh="${as_dir}install.sh -c"
+      elif test -f "${as_dir}shtool"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
+        ac_install_sh="${as_dir}shtool install -c"
+      else
+        ac_aux_dir_found=no
+        if $ac_first_candidate; then
+          ac_missing_aux_files="${ac_missing_aux_files} install-sh"
+        else
+          break
+        fi
+      fi
+    else
+      if test -f "${as_dir}${ac_aux}"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
+      else
+        ac_aux_dir_found=no
+        if $ac_first_candidate; then
+          ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}"
+        else
+          break
+        fi
+      fi
+    fi
+  done
+  if test "$ac_aux_dir_found" = yes; then
+    ac_aux_dir="$as_dir"
+    break
+  fi
+  ac_first_candidate=false
+
+  as_found=false
+done
+IFS=$as_save_IFS
+if $as_found
+then :
+
+else $as_nop
+  as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5
+fi
+
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+if test -f "${ac_aux_dir}config.guess"; then
+  ac_config_guess="$SHELL ${ac_aux_dir}config.guess"
+fi
+if test -f "${ac_aux_dir}config.sub"; then
+  ac_config_sub="$SHELL ${ac_aux_dir}config.sub"
+fi
+if test -f "$ac_aux_dir/configure"; then
+  ac_configure="$SHELL ${ac_aux_dir}configure"
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+printf "%s\n" "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+printf "%s\n" "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file'
+	    and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+
+
+if test "$srcdir" != . -a "$srcdir" != "$(pwd)"; then
+    # If we're building out-of-tree, we need to make sure the following
+    # resources get picked up before their $srcdir counterparts.
     #   Objects/ -> typeslots.inc
     #   Include/ -> Python.h
     #   Python/  -> importlib.h
@@ -2788,11 +3172,12 @@ if test -e $srcdir/.git
 then
 # Extract the first word of "git", so it can be a program name with args.
 set dummy git; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_HAS_GIT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_HAS_GIT+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$HAS_GIT"; then
   ac_cv_prog_HAS_GIT="$HAS_GIT" # Let the user override the test.
 else
@@ -2800,11 +3185,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_HAS_GIT="found"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2816,11 +3205,11 @@ fi
 fi
 HAS_GIT=$ac_cv_prog_HAS_GIT
 if test -n "$HAS_GIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAS_GIT" >&5
-$as_echo "$HAS_GIT" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $HAS_GIT" >&5
+printf "%s\n" "$HAS_GIT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -2842,55 +3231,30 @@ fi
 ac_config_headers="$ac_config_headers pyconfig.h"
 
 
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
 
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+  # Make sure we can run config.sub.
+$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+printf %s "checking build system type... " >&6; }
+if test ${ac_cv_build+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+  ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"`
 test "x$ac_build_alias" = x &&
   as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+printf "%s\n" "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
@@ -2909,21 +3273,22 @@ IFS=$ac_save_IFS
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+printf %s "checking host system type... " >&6; }
+if test ${ac_cv_host+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+  ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+printf "%s\n" "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
@@ -2952,11 +3317,12 @@ for ac_prog in python$PACKAGE_VERSION python3 python
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_PYTHON_FOR_REGEN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_PYTHON_FOR_REGEN+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$PYTHON_FOR_REGEN"; then
   ac_cv_prog_PYTHON_FOR_REGEN="$PYTHON_FOR_REGEN" # Let the user override the test.
 else
@@ -2964,11 +3330,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_PYTHON_FOR_REGEN="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2979,11 +3349,11 @@ fi
 fi
 PYTHON_FOR_REGEN=$ac_cv_prog_PYTHON_FOR_REGEN
 if test -n "$PYTHON_FOR_REGEN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_FOR_REGEN" >&5
-$as_echo "$PYTHON_FOR_REGEN" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PYTHON_FOR_REGEN" >&5
+printf "%s\n" "$PYTHON_FOR_REGEN" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -2994,8 +3364,8 @@ test -n "$PYTHON_FOR_REGEN" || PYTHON_FOR_REGEN="python3"
 
 
 if test "$cross_compiling" = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python interpreter for cross build" >&5
-$as_echo_n "checking for python interpreter for cross build... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python interpreter for cross build" >&5
+printf %s "checking for python interpreter for cross build... " >&6; }
     if test -z "$PYTHON_FOR_BUILD"; then
         for interp in python$PACKAGE_VERSION python3 python; do
 	    which $interp >/dev/null 2>&1 || continue
@@ -3007,8 +3377,8 @@ $as_echo_n "checking for python interpreter for cross build... " >&6; }
         if test x$interp = x; then
 	    as_fn_error $? "python$PACKAGE_VERSION interpreter not found" "$LINENO" 5
 	fi
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $interp" >&5
-$as_echo "$interp" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $interp" >&5
+printf "%s\n" "$interp" >&6; }
 	PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$interp
     fi
 elif test "$cross_compiling" = maybe; then
@@ -3042,28 +3412,28 @@ SOVERSION=1.0
 # The later defininition of _XOPEN_SOURCE disables certain features
 # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone).
 
-$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h
 
 
 # The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
 # certain features on NetBSD, so we need _NETBSD_SOURCE to re-enable
 # them.
 
-$as_echo "#define _NETBSD_SOURCE 1" >>confdefs.h
+printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h
 
 
 # The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
 # certain features on FreeBSD, so we need __BSD_VISIBLE to re-enable
 # them.
 
-$as_echo "#define __BSD_VISIBLE 1" >>confdefs.h
+printf "%s\n" "#define __BSD_VISIBLE 1" >>confdefs.h
 
 
 # The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
 # certain features on Mac OS X, so we need _DARWIN_C_SOURCE to re-enable
 # them.
 
-$as_echo "#define _DARWIN_C_SOURCE 1" >>confdefs.h
+printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h
 
 
 
@@ -3073,10 +3443,11 @@ define_xopen_source=yes
 
 CONFIG_ARGS="$ac_configure_args"
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-universalsdk" >&5
-$as_echo_n "checking for --enable-universalsdk... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --enable-universalsdk" >&5
+printf %s "checking for --enable-universalsdk... " >&6; }
 # Check whether --enable-universalsdk was given.
-if test "${enable_universalsdk+set}" = set; then :
+if test ${enable_universalsdk+y}
+then :
   enableval=$enable_universalsdk;
 	case $enableval in
 	yes)
@@ -3108,7 +3479,7 @@ if test "${enable_universalsdk+set}" = set; then :
 	esac
 
 
-else
+else $as_nop
 
    	UNIVERSALSDK=
 	enable_universalsdk=
@@ -3117,11 +3488,11 @@ fi
 
 if test -n "${UNIVERSALSDK}"
 then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNIVERSALSDK}" >&5
-$as_echo "${UNIVERSALSDK}" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${UNIVERSALSDK}" >&5
+printf "%s\n" "${UNIVERSALSDK}" >&6; }
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3144,11 +3515,12 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-universal-archs" >&5
-$as_echo_n "checking for --with-universal-archs... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-universal-archs" >&5
+printf %s "checking for --with-universal-archs... " >&6; }
 
 # Check whether --with-universal-archs was given.
-if test "${with_universal_archs+set}" = set; then :
+if test ${with_universal_archs+y}
+then :
   withval=$with_universal_archs;
 	UNIVERSAL_ARCHS="$withval"
 
@@ -3156,22 +3528,23 @@ fi
 
 if test -n "${UNIVERSALSDK}"
 then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNIVERSAL_ARCHS}" >&5
-$as_echo "${UNIVERSAL_ARCHS}" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${UNIVERSAL_ARCHS}" >&5
+printf "%s\n" "${UNIVERSAL_ARCHS}" >&6; }
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Check whether --with-framework-name was given.
-if test "${with_framework_name+set}" = set; then :
+if test ${with_framework_name+y}
+then :
   withval=$with_framework_name;
     PYTHONFRAMEWORK=${withval}
     PYTHONFRAMEWORKDIR=${withval}.framework
     PYTHONFRAMEWORKIDENTIFIER=org.python.`echo $withval | tr 'A-Z' 'a-z'`
 
-else
+else $as_nop
 
     PYTHONFRAMEWORK=Python
     PYTHONFRAMEWORKDIR=Python.framework
@@ -3180,7 +3553,8 @@ else
 fi
 
 # Check whether --enable-framework was given.
-if test "${enable_framework+set}" = set; then :
+if test ${enable_framework+y}
+then :
   enableval=$enable_framework;
 	case $enableval in
 	yes)
@@ -3269,7 +3643,7 @@ if test "${enable_framework+set}" = set; then :
 
 	esac
 
-else
+else $as_nop
 
 	PYTHONFRAMEWORK=
 	PYTHONFRAMEWORKDIR=no-framework
@@ -3304,9 +3678,7 @@ fi
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define _PYTHONFRAMEWORK "${PYTHONFRAMEWORK}"
-_ACEOF
+printf "%s\n" "#define _PYTHONFRAMEWORK \"${PYTHONFRAMEWORK}\"" >>confdefs.h
 
 
 ##AC_ARG_WITH(dyld,
@@ -3315,8 +3687,8 @@ _ACEOF
 ##
 # Set name for machine-dependent library files
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking MACHDEP" >&5
-$as_echo_n "checking MACHDEP... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking MACHDEP" >&5
+printf %s "checking MACHDEP... " >&6; }
 if test -z "$MACHDEP"
 then
     # avoid using uname for cross builds
@@ -3366,8 +3738,8 @@ then
 	'')	MACHDEP="unknown";;
     esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$MACHDEP\"" >&5
-$as_echo "\"$MACHDEP\"" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$MACHDEP\"" >&5
+printf "%s\n" "\"$MACHDEP\"" >&6; }
 
 
 if test "$cross_compiling" = yes; then
@@ -3416,7 +3788,7 @@ case $ac_sys_system/$ac_sys_release in
     # also defined. This can be overridden by defining _BSD_SOURCE
     # As this has a different meaning on Linux, only define it on OpenBSD
 
-$as_echo "#define _BSD_SOURCE 1" >>confdefs.h
+printf "%s\n" "#define _BSD_SOURCE 1" >>confdefs.h
 
     ;;
   OpenBSD/*)
@@ -3424,7 +3796,7 @@ $as_echo "#define _BSD_SOURCE 1" >>confdefs.h
     # also defined. This can be overridden by defining _BSD_SOURCE
     # As this has a different meaning on Linux, only define it on OpenBSD
 
-$as_echo "#define _BSD_SOURCE 1" >>confdefs.h
+printf "%s\n" "#define _BSD_SOURCE 1" >>confdefs.h
 
     ;;
   # Defining _XOPEN_SOURCE on NetBSD version prior to the introduction of
@@ -3482,7 +3854,7 @@ if test $define_xopen_source = yes
 then
   # X/Open 7, incorporating POSIX.1-2008
 
-$as_echo "#define _XOPEN_SOURCE 700" >>confdefs.h
+printf "%s\n" "#define _XOPEN_SOURCE 700" >>confdefs.h
 
 
   # On Tru64 Unix 4.0F, defining _XOPEN_SOURCE also requires
@@ -3490,11 +3862,11 @@ $as_echo "#define _XOPEN_SOURCE 700" >>confdefs.h
   # several APIs are not declared. Since this is also needed in some
   # cases for HP-UX, we define it globally.
 
-$as_echo "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h
+printf "%s\n" "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h
 
 
 
-$as_echo "#define _POSIX_C_SOURCE 200809L" >>confdefs.h
+printf "%s\n" "#define _POSIX_C_SOURCE 200809L" >>confdefs.h
 
 fi
 
@@ -3509,7 +3881,7 @@ esac
 if test $define_stdc_a1 = yes
 then
 
-$as_echo "#define _INCLUDE__STDC_A1_SOURCE 1" >>confdefs.h
+printf "%s\n" "#define _INCLUDE__STDC_A1_SOURCE 1" >>confdefs.h
 
 fi
 
@@ -3573,8 +3945,8 @@ then
 		then
 			if test -n "`"$found_gcc" --version | grep llvm-gcc`"
 			then
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: Detected llvm-gcc, falling back to clang" >&5
-$as_echo "$as_me: Detected llvm-gcc, falling back to clang" >&6;}
+				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Detected llvm-gcc, falling back to clang" >&5
+printf "%s\n" "$as_me: Detected llvm-gcc, falling back to clang" >&6;}
 				CC="$found_clang"
 				CXX="$found_clang++"
 			fi
@@ -3582,8 +3954,8 @@ $as_echo "$as_me: Detected llvm-gcc, falling back to clang" >&6;}
 
 		elif test -z "$found_gcc" -a -n "$found_clang"
 		then
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: No GCC found, use CLANG" >&5
-$as_echo "$as_me: No GCC found, use CLANG" >&6;}
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: No GCC found, use CLANG" >&5
+printf "%s\n" "$as_me: No GCC found, use CLANG" >&6;}
 			CC="$found_clang"
 			CXX="$found_clang++"
 
@@ -3592,8 +3964,8 @@ $as_echo "$as_me: No GCC found, use CLANG" >&6;}
 			found_clang=`/usr/bin/xcrun -find clang 2>/dev/null`
 			if test -n "${found_clang}"
 			then
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: Using clang from Xcode.app" >&5
-$as_echo "$as_me: Using clang from Xcode.app" >&6;}
+				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using clang from Xcode.app" >&5
+printf "%s\n" "$as_me: Using clang from Xcode.app" >&6;}
 				CC="${found_clang}"
 				CXX="`/usr/bin/xcrun -find clang++`"
 
@@ -3602,6 +3974,15 @@ $as_echo "$as_me: Using clang from Xcode.app" >&6;}
 		fi
 	fi
 fi
+
+
+
+
+
+
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3610,11 +3991,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -3622,11 +4004,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3637,11 +4023,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3650,11 +4036,12 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -3662,11 +4049,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3677,11 +4068,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -3689,8 +4080,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -3703,11 +4094,12 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -3715,11 +4107,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3730,11 +4126,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3743,11 +4139,12 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -3756,15 +4153,19 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3780,18 +4181,18 @@ if test $ac_prog_rejected = yes; then
     # However, it has the same basename, so the bogon will be chosen
     # first if we set CC to just the basename; use the full file name.
     shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+    ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@"
   fi
 fi
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3802,11 +4203,12 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -3814,11 +4216,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3829,11 +4235,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3846,11 +4252,12 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -3858,11 +4265,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3873,11 +4284,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3889,34 +4300,138 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
   fi
 fi
 
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
+set dummy ${ac_tool_prefix}clang; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}clang"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "clang", so it can be a program name with args.
+set dummy clang; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="clang"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
 See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
+for ac_option in --version -v -V -qversion -version; do
   { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -3926,7 +4441,7 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
@@ -3934,7 +4449,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -3946,9 +4461,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+printf %s "checking whether the C compiler works... " >&6; }
+ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
@@ -3969,11 +4484,12 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
@@ -3990,7 +4506,7 @@ do
 	# certainly right.
 	break;;
     *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no;
 	then :; else
 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	fi
@@ -4006,44 +4522,46 @@ do
 done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
-else
+else $as_nop
   ac_file=''
 fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
+if test -z "$ac_file"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
 See \`config.log' for more details" "$LINENO" 5; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+printf %s "checking for C compiler default output file name... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+printf "%s\n" "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+printf %s "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -4057,15 +4575,15 @@ for ac_file in conftest.exe conftest conftest.*; do
     * ) break;;
   esac
 done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+printf "%s\n" "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
@@ -4074,7 +4592,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 FILE *f = fopen ("conftest.out", "w");
  return ferror (f) || fclose (f) != 0;
@@ -4086,8 +4604,8 @@ _ACEOF
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+printf %s "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
   { { ac_try="$ac_link"
 case "(($ac_try" in
@@ -4095,10 +4613,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
   if { ac_try='./conftest$ac_cv_exeext'
   { { case "(($ac_try" in
@@ -4106,39 +4624,40 @@ $as_echo "$ac_try_echo"; } >&5
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+printf "%s\n" "$cross_compiling" >&6; }
 
 rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+printf %s "checking for suffix of object files... " >&6; }
+if test ${ac_cv_objext+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -4152,11 +4671,12 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
@@ -4165,31 +4685,32 @@ $as_echo "$ac_try_echo"; } >&5
        break;;
   esac
 done
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+printf "%s\n" "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
+printf %s "checking whether the compiler supports GNU C... " >&6; }
+if test ${ac_cv_c_compiler_gnu+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 #ifndef __GNUC__
        choke me
@@ -4199,29 +4720,33 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_compiler_gnu=yes
-else
+else $as_nop
   ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 if test $ac_compiler_gnu = yes; then
   GCC=yes
 else
   GCC=
 fi
-ac_test_CFLAGS=${CFLAGS+set}
+ac_test_CFLAGS=${CFLAGS+y}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+printf %s "checking whether $CC accepts -g... " >&6; }
+if test ${ac_cv_prog_cc_g+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
@@ -4230,57 +4755,60 @@ else
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_prog_cc_g=yes
-else
+else $as_nop
   CFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-else
+else $as_nop
   ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_prog_cc_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+if test $ac_test_CFLAGS; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
@@ -4295,94 +4823,144 @@ else
     CFLAGS=
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
+ac_prog_cc_stdc=no
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+printf %s "checking for $CC option to enable C11 features... " >&6; }
+if test ${ac_cv_prog_cc_c11+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c11=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+$ac_c_conftest_c11_program
+_ACEOF
+for ac_arg in '' -std=gnu11
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c11=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c11" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+fi
 
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+if test "x$ac_cv_prog_cc_c11" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c11" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
+     CC="$CC $ac_cv_prog_cc_c11"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
+  ac_prog_cc_stdc=c11
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
+printf %s "checking for $CC option to enable C99 features... " >&6; }
+if test ${ac_cv_prog_cc_c99+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c99_program
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c99=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+fi
 
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
+if test "x$ac_cv_prog_cc_c99" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c99" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
+     CC="$CC $ac_cv_prog_cc_c99"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
+  ac_prog_cc_stdc=c99
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
+printf %s "checking for $CC option to enable C89 features... " >&6; }
+if test ${ac_cv_prog_cc_c89+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c89_program
 _ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
+  if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_prog_cc_c89=$ac_arg
 fi
-rm -f core conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext conftest.beam
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
 rm -f conftest.$ac_ext
 CC=$ac_save_CC
-
 fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
 
+if test "x$ac_cv_prog_cc_c89" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c89" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
+     CC="$CC $ac_cv_prog_cc_c89"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
+  ac_prog_cc_stdc=c89
+fi
 fi
 
 ac_ext=c
@@ -4396,40 +4974,36 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+printf %s "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+  if test ${ac_cv_prog_CPP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+      # Double quotes because $CC needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp
     do
       ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include <limits.h>
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
 
-else
+else $as_nop
   # Broken: fails on valid input.
 continue
 fi
@@ -4441,10 +5015,11 @@ rm -f conftest.err conftest.i conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
   # Broken: success on invalid input.
 continue
-else
+else $as_nop
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -4454,7 +5029,8 @@ rm -f conftest.err conftest.i conftest.$ac_ext
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok
+then :
   break
 fi
 
@@ -4466,29 +5042,24 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+printf "%s\n" "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include <limits.h>
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
 
-else
+else $as_nop
   # Broken: fails on valid input.
 continue
 fi
@@ -4500,10 +5071,11 @@ rm -f conftest.err conftest.i conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
   # Broken: success on invalid input.
 continue
-else
+else $as_nop
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -4513,11 +5085,12 @@ rm -f conftest.err conftest.i conftest.$ac_ext
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok
+then :
 
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details" "$LINENO" 5; }
 fi
@@ -4528,11 +5101,12 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+printf %s "checking for grep that handles long lines and -e... " >&6; }
+if test ${ac_cv_path_GREP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -z "$GREP"; then
   ac_path_GREP_found=false
   # Loop through the user's path and test for each of PROGNAME-LIST
@@ -4540,10 +5114,15 @@ else
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in grep ggrep
+   do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      ac_path_GREP="$as_dir$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
@@ -4552,13 +5131,13 @@ case `"$ac_path_GREP" --version 2>&1` in
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
+  printf %s 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
+    printf "%s\n" 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -4586,16 +5165,17 @@ else
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+printf "%s\n" "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+printf %s "checking for a sed that does not truncate output... " >&6; }
+if test ${ac_cv_path_SED+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
      for ac_i in 1 2 3 4 5 6 7; do
        ac_script="$ac_script$as_nl$ac_script"
@@ -4609,10 +5189,15 @@ else
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in sed gsed
+   do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      ac_path_SED="$as_dir$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
@@ -4621,13 +5206,13 @@ case `"$ac_path_SED" --version 2>&1` in
   ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
 *)
   ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
+  printf %s 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
+    printf "%s\n" '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -4655,19 +5240,20 @@ else
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+printf "%s\n" "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
 
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-cxx-main=<compiler>" >&5
-$as_echo_n "checking for --with-cxx-main=<compiler>... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-cxx-main=<compiler>" >&5
+printf %s "checking for --with-cxx-main=<compiler>... " >&6; }
 
 # Check whether --with-cxx_main was given.
-if test "${with_cxx_main+set}" = set; then :
+if test ${with_cxx_main+y}
+then :
   withval=$with_cxx_main;
 
 	case $withval in
@@ -4682,15 +5268,15 @@ if test "${with_cxx_main+set}" = set; then :
 			CXX=$withval
 		fi;;
 	esac
-else
+else $as_nop
 
 	with_cxx_main=no
 	MAINCC='$(CC)'
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_cxx_main" >&5
-$as_echo "$with_cxx_main" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_cxx_main" >&5
+printf "%s\n" "$with_cxx_main" >&6; }
 
 preset_cxx="$CXX"
 if test -z "$CXX"
@@ -4699,11 +5285,12 @@ then
         gcc)    if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}g++", so it can be a program name with args.
 set dummy ${ac_tool_prefix}g++; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $CXX in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_CXX="$CXX" # Let the user override the test with a path.
@@ -4713,11 +5300,15 @@ else
 for as_dir in notfound
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_CXX="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4729,11 +5320,11 @@ esac
 fi
 CXX=$ac_cv_path_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+printf "%s\n" "$CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4742,11 +5333,12 @@ if test -z "$ac_cv_path_CXX"; then
   ac_pt_CXX=$CXX
   # Extract the first word of "g++", so it can be a program name with args.
 set dummy g++; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $ac_pt_CXX in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_ac_pt_CXX="$ac_pt_CXX" # Let the user override the test with a path.
@@ -4756,11 +5348,15 @@ else
 for as_dir in notfound
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_CXX="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_CXX="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4772,11 +5368,11 @@ esac
 fi
 ac_pt_CXX=$ac_cv_path_ac_pt_CXX
 if test -n "$ac_pt_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CXX" >&5
-$as_echo "$ac_pt_CXX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CXX" >&5
+printf "%s\n" "$ac_pt_CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_pt_CXX" = x; then
@@ -4784,8 +5380,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_pt_CXX
@@ -4797,11 +5393,12 @@ fi
         cc)     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}c++", so it can be a program name with args.
 set dummy ${ac_tool_prefix}c++; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $CXX in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_CXX="$CXX" # Let the user override the test with a path.
@@ -4811,11 +5408,15 @@ else
 for as_dir in notfound
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_CXX="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4827,11 +5428,11 @@ esac
 fi
 CXX=$ac_cv_path_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+printf "%s\n" "$CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4840,11 +5441,12 @@ if test -z "$ac_cv_path_CXX"; then
   ac_pt_CXX=$CXX
   # Extract the first word of "c++", so it can be a program name with args.
 set dummy c++; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $ac_pt_CXX in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_ac_pt_CXX="$ac_pt_CXX" # Let the user override the test with a path.
@@ -4854,11 +5456,15 @@ else
 for as_dir in notfound
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_CXX="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_CXX="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4870,11 +5476,11 @@ esac
 fi
 ac_pt_CXX=$ac_cv_path_ac_pt_CXX
 if test -n "$ac_pt_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CXX" >&5
-$as_echo "$ac_pt_CXX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CXX" >&5
+printf "%s\n" "$ac_pt_CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_pt_CXX" = x; then
@@ -4882,8 +5488,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_pt_CXX
@@ -4895,11 +5501,12 @@ fi
         clang|*/clang)     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}clang++", so it can be a program name with args.
 set dummy ${ac_tool_prefix}clang++; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $CXX in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_CXX="$CXX" # Let the user override the test with a path.
@@ -4909,11 +5516,15 @@ else
 for as_dir in notfound
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_CXX="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4925,11 +5536,11 @@ esac
 fi
 CXX=$ac_cv_path_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+printf "%s\n" "$CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4938,11 +5549,12 @@ if test -z "$ac_cv_path_CXX"; then
   ac_pt_CXX=$CXX
   # Extract the first word of "clang++", so it can be a program name with args.
 set dummy clang++; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $ac_pt_CXX in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_ac_pt_CXX="$ac_pt_CXX" # Let the user override the test with a path.
@@ -4952,11 +5564,15 @@ else
 for as_dir in notfound
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_CXX="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_CXX="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4968,11 +5584,11 @@ esac
 fi
 ac_pt_CXX=$ac_cv_path_ac_pt_CXX
 if test -n "$ac_pt_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CXX" >&5
-$as_echo "$ac_pt_CXX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CXX" >&5
+printf "%s\n" "$ac_pt_CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_pt_CXX" = x; then
@@ -4980,8 +5596,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_pt_CXX
@@ -4993,11 +5609,12 @@ fi
         icc|*/icc)         if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}icpc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}icpc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $CXX in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_CXX="$CXX" # Let the user override the test with a path.
@@ -5007,11 +5624,15 @@ else
 for as_dir in notfound
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_CXX="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5023,11 +5644,11 @@ esac
 fi
 CXX=$ac_cv_path_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+printf "%s\n" "$CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5036,11 +5657,12 @@ if test -z "$ac_cv_path_CXX"; then
   ac_pt_CXX=$CXX
   # Extract the first word of "icpc", so it can be a program name with args.
 set dummy icpc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $ac_pt_CXX in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_ac_pt_CXX="$ac_pt_CXX" # Let the user override the test with a path.
@@ -5050,11 +5672,15 @@ else
 for as_dir in notfound
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_CXX="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_CXX="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5066,11 +5692,11 @@ esac
 fi
 ac_pt_CXX=$ac_cv_path_ac_pt_CXX
 if test -n "$ac_pt_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CXX" >&5
-$as_echo "$ac_pt_CXX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CXX" >&5
+printf "%s\n" "$ac_pt_CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_pt_CXX" = x; then
@@ -5078,8 +5704,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_pt_CXX
@@ -5101,11 +5727,12 @@ then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
@@ -5113,11 +5740,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5128,11 +5759,11 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+printf "%s\n" "$CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5145,11 +5776,12 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
 else
@@ -5157,11 +5789,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5172,11 +5808,11 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+printf "%s\n" "$ac_ct_CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5188,8 +5824,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
@@ -5203,12 +5839,12 @@ fi
 fi
 if test "$preset_cxx" != "$CXX"
 then
-        { $as_echo "$as_me:${as_lineno-$LINENO}:
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}:
 
   By default, distutils will build C++ extension modules with \"$CXX\".
   If this is not intended, then set CXX on the configure command line.
   " >&5
-$as_echo "$as_me:
+printf "%s\n" "$as_me:
 
   By default, distutils will build C++ extension modules with \"$CXX\".
   If this is not intended, then set CXX on the configure command line.
@@ -5219,8 +5855,8 @@ fi
 MULTIARCH=$($CC --print-multiarch 2>/dev/null)
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the platform triplet based on compiler characteristics" >&5
-$as_echo_n "checking for the platform triplet based on compiler characteristics... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the platform triplet based on compiler characteristics" >&5
+printf %s "checking for the platform triplet based on compiler characteristics... " >&6; }
 cat >> conftest.c <<EOF
 #undef bfin
 #undef cris
@@ -5369,11 +6005,11 @@ EOF
 
 if $CPP $CPPFLAGS conftest.c >conftest.out 2>/dev/null; then
   PLATFORM_TRIPLET=`grep -v '^#' conftest.out | grep -v '^ *$' | tr -d ' 	'`
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PLATFORM_TRIPLET" >&5
-$as_echo "$PLATFORM_TRIPLET" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PLATFORM_TRIPLET" >&5
+printf "%s\n" "$PLATFORM_TRIPLET" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
+printf "%s\n" "none" >&6; }
 fi
 rm -f conftest.c conftest.out
 
@@ -5390,8 +6026,8 @@ if test x$MULTIARCH != x; then
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wl,--no-as-needed" >&5
-$as_echo_n "checking for -Wl,--no-as-needed... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -Wl,--no-as-needed" >&5
+printf %s "checking for -Wl,--no-as-needed... " >&6; }
 save_LDFLAGS="$LDFLAGS"
 LDFLAGS="$LDFLAGS -Wl,--no-as-needed"
 
@@ -5399,290 +6035,203 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   NO_AS_NEEDED="-Wl,--no-as-needed"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
   NO_AS_NEEDED=""
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LDFLAGS="$save_LDFLAGS"
 
 
 
 # checks for UNIX variants that set C preprocessor variables
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+ac_header= ac_cache=
+for ac_item in $ac_header_c_list
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP" || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
+  if test $ac_cache; then
+    ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
+    if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
+      printf "%s\n" "#define $ac_item 1" >> confdefs.h
     fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    ac_header= ac_cache=
+  elif test $ac_header; then
+    ac_cache=$ac_item
+  else
+    ac_header=$ac_item
   fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
+done
+
+
+
+
+
+
+
+
+if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
+then :
+
+printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
 
-   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+
+
+
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if test ${ac_cv_safe_to_define___extensions__+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
 
+#         define __EXTENSIONS__ 1
+          $ac_includes_default
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_safe_to_define___extensions__=yes
+else $as_nop
+  ac_cv_safe_to_define___extensions__=no
 fi
-rm -f conftest*
-
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; }
 
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
+printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; }
+if test ${ac_cv_should_define__xopen_source+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_should_define__xopen_source=no
+    if test $ac_cv_header_wchar_h = yes
+then :
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
 
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
+          #include <wchar.h>
+          mbstate_t x;
+int
+main (void)
+{
 
-fi
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
 
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+            #define _XOPEN_SOURCE 500
+            #include <wchar.h>
+            mbstate_t x;
 int
-main ()
+main (void)
 {
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
+
+  ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_should_define__xopen_source=yes
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
+printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; }
 
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+  printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h
 
-fi
+  printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h
 
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+  printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h
 
-fi
+  printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
 
-done
+  printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h
 
+  printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h
 
+  printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
 
-  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_minix_config_h" = xyes; then :
-  MINIX=yes
-else
-  MINIX=
-fi
+  printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
 
+  printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
 
-  if test "$MINIX" = yes; then
+  printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
 
-$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
+  printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
 
+  printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
 
-$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
+  printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
 
+  printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
 
-$as_echo "#define _MINIX 1" >>confdefs.h
+  printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h
 
-  fi
+  if test $ac_cv_header_minix_config_h = yes
+then :
+  MINIX=yes
+    printf "%s\n" "#define _MINIX 1" >>confdefs.h
 
+    printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
-$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if ${ac_cv_safe_to_define___extensions__+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+    printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h
 
-#         define __EXTENSIONS__ 1
-          $ac_includes_default
-int
-main ()
-{
+else $as_nop
+  MINIX=
+fi
+  if test $ac_cv_safe_to_define___extensions__ = yes
+then :
+  printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_safe_to_define___extensions__=yes
-else
-  ac_cv_safe_to_define___extensions__=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  if test $ac_cv_should_define__xopen_source = yes
+then :
+  printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h
+
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
-  test $ac_cv_safe_to_define___extensions__ = yes &&
-    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
 
-  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
 
-  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
-
-  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
-
-  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Android API level" >&5
-$as_echo_n "checking for the Android API level... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the Android API level" >&5
+printf %s "checking for the Android API level... " >&6; }
 cat >> conftest.c <<EOF
 #ifdef __ANDROID__
 android_api = __ANDROID_API__
@@ -5695,29 +6244,27 @@ EOF
 if $CPP $CPPFLAGS conftest.c >conftest.out 2>/dev/null; then
   ANDROID_API_LEVEL=`sed -n -e '/__ANDROID_API__/d' -e 's/^android_api = //p' conftest.out`
   _arm_arch=`sed -n -e '/__ARM_ARCH/d' -e 's/^arm_arch = //p' conftest.out`
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ANDROID_API_LEVEL" >&5
-$as_echo "$ANDROID_API_LEVEL" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ANDROID_API_LEVEL" >&5
+printf "%s\n" "$ANDROID_API_LEVEL" >&6; }
   if test -z "$ANDROID_API_LEVEL"; then
     echo 'Fatal: you must define __ANDROID_API__'
     exit 1
   fi
 
-cat >>confdefs.h <<_ACEOF
-#define ANDROID_API_LEVEL $ANDROID_API_LEVEL
-_ACEOF
+printf "%s\n" "#define ANDROID_API_LEVEL $ANDROID_API_LEVEL" >>confdefs.h
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Android arm ABI" >&5
-$as_echo_n "checking for the Android arm ABI... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_arm_arch" >&5
-$as_echo "$_arm_arch" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the Android arm ABI" >&5
+printf %s "checking for the Android arm ABI... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $_arm_arch" >&5
+printf "%s\n" "$_arm_arch" >&6; }
   if test "$_arm_arch" = 7; then
     BASECFLAGS="${BASECFLAGS} -mfloat-abi=softfp -mfpu=vfpv3-d16"
     LDFLAGS="${LDFLAGS} -march=armv7-a -Wl,--fix-cortex-a8"
   fi
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not Android" >&5
-$as_echo "not Android" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not Android" >&5
+printf "%s\n" "not Android" >&6; }
 fi
 rm -f conftest.c conftest.out
 
@@ -5730,11 +6277,12 @@ atheos*|Linux*/1*)
 esac
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-suffix" >&5
-$as_echo_n "checking for --with-suffix... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-suffix" >&5
+printf %s "checking for --with-suffix... " >&6; }
 
 # Check whether --with-suffix was given.
-if test "${with_suffix+set}" = set; then :
+if test ${with_suffix+y}
+then :
   withval=$with_suffix;
 	case $withval in
 	no)	EXEEXT=;;
@@ -5743,26 +6291,26 @@ if test "${with_suffix+set}" = set; then :
 	esac
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXEEXT" >&5
-$as_echo "$EXEEXT" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $EXEEXT" >&5
+printf "%s\n" "$EXEEXT" >&6; }
 
 # Test whether we're running on a non-case-sensitive system, in which
 # case we give a warning if no ext is given
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for case-insensitive build directory" >&5
-$as_echo_n "checking for case-insensitive build directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for case-insensitive build directory" >&5
+printf %s "checking for case-insensitive build directory... " >&6; }
 if test ! -d CaseSensitiveTestDir; then
 mkdir CaseSensitiveTestDir
 fi
 
 if test -d casesensitivetestdir
 then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
     BUILDEXEEXT=.exe
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 	BUILDEXEEXT=$EXEEXT
 fi
 rmdir CaseSensitiveTestDir
@@ -5775,14 +6323,14 @@ hp*|HP*)
 esac
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBRARY" >&5
-$as_echo_n "checking LIBRARY... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LIBRARY" >&5
+printf %s "checking LIBRARY... " >&6; }
 if test -z "$LIBRARY"
 then
 	LIBRARY='libpython$(VERSION)$(ABIFLAGS).a'
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBRARY" >&5
-$as_echo "$LIBRARY" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBRARY" >&5
+printf "%s\n" "$LIBRARY" >&6; }
 
 # LDLIBRARY is the name of the library to link against (as opposed to the
 # name of the library into which to insert object files). BLDLIBRARY is also
@@ -5821,8 +6369,8 @@ LDVERSION="$VERSION"
 # compiled with CXX, LINKCC is CXX instead. Always using CXX is undesirable:
 # python might then depend on the C++ runtime
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking LINKCC" >&5
-$as_echo_n "checking LINKCC... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LINKCC" >&5
+printf %s "checking LINKCC... " >&6; }
 if test -z "$LINKCC"
 then
 	LINKCC='$(PURIFY) $(MAINCC)'
@@ -5833,8 +6381,8 @@ then
 	   LINKCC=qcc;;
 	esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINKCC" >&5
-$as_echo "$LINKCC" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LINKCC" >&5
+printf "%s\n" "$LINKCC" >&6; }
 
 # EXPORTSYMS holds the list of exported symbols for AIX.
 # EXPORTSFROM holds the module name exporting symbols on AIX.
@@ -5842,16 +6390,16 @@ EXPORTSYMS=
 EXPORTSFROM=
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking EXPORTSYMS" >&5
-$as_echo_n "checking EXPORTSYMS... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking EXPORTSYMS" >&5
+printf %s "checking EXPORTSYMS... " >&6; }
 case $ac_sys_system in
 AIX*)
 	EXPORTSYMS="Modules/python.exp"
 	EXPORTSFROM=. # the main executable
 	;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXPORTSYMS" >&5
-$as_echo "$EXPORTSYMS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $EXPORTSYMS" >&5
+printf "%s\n" "$EXPORTSYMS" >&6; }
 
 # GNULD is set to "yes" if the GNU linker is used.  If this goes wrong
 # make sure we default having it set to "no": this is used by
@@ -5859,8 +6407,8 @@ $as_echo "$EXPORTSYMS" >&6; }
 # to linker command lines, and failing to detect GNU ld simply results
 # in the same bahaviour as before.
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+printf %s "checking for GNU ld... " >&6; }
 ac_prog=ld
 if test "$GCC" = yes; then
        ac_prog=`$CC -print-prog-name=ld`
@@ -5871,13 +6419,14 @@ case `"$ac_prog" -V 2>&1 < /dev/null` in
       *)
           GNULD=no;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNULD" >&5
-$as_echo "$GNULD" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNULD" >&5
+printf "%s\n" "$GNULD" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-shared" >&5
-$as_echo_n "checking for --enable-shared... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --enable-shared" >&5
+printf %s "checking for --enable-shared... " >&6; }
 # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
+if test ${enable_shared+y}
+then :
   enableval=$enable_shared;
 fi
 
@@ -5891,13 +6440,14 @@ then
     enable_shared="no";;
   esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+printf "%s\n" "$enable_shared" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-profiling" >&5
-$as_echo_n "checking for --enable-profiling... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --enable-profiling" >&5
+printf %s "checking for --enable-profiling... " >&6; }
 # Check whether --enable-profiling was given.
-if test "${enable_profiling+set}" = set; then :
+if test ${enable_profiling+y}
+then :
   enableval=$enable_profiling;
 fi
 
@@ -5908,27 +6458,28 @@ if test "x$enable_profiling" = xyes; then
 /* end confdefs.h.  */
 int main() { return 0; }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
-else
+else $as_nop
   enable_profiling=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   CC="$ac_save_cc"
 else
   enable_profiling=no
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_profiling" >&5
-$as_echo "$enable_profiling" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_profiling" >&5
+printf "%s\n" "$enable_profiling" >&6; }
 
 if test "x$enable_profiling" = xyes; then
   BASECFLAGS="-pg $BASECFLAGS"
   LDFLAGS="-pg $LDFLAGS"
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking LDLIBRARY" >&5
-$as_echo_n "checking LDLIBRARY... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LDLIBRARY" >&5
+printf %s "checking LDLIBRARY... " >&6; }
 
 # MacOSX framework builds need more magic. LDLIBRARY is the dynamic
 # library that we build, but we do not want to link against it (we
@@ -5949,7 +6500,7 @@ fi
 if test $enable_shared = "yes"; then
   PY_ENABLE_SHARED=1
 
-$as_echo "#define Py_ENABLE_SHARED 1" >>confdefs.h
+printf "%s\n" "#define Py_ENABLE_SHARED 1" >>confdefs.h
 
   case $ac_sys_system in
     CYGWIN*)
@@ -6013,8 +6564,8 @@ if test "$cross_compiling" = yes; then
 	RUNSHARED=
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LDLIBRARY" >&5
-$as_echo "$LDLIBRARY" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LDLIBRARY" >&5
+printf "%s\n" "$LDLIBRARY" >&6; }
 
 
 if test -n "$ac_tool_prefix"; then
@@ -6022,11 +6573,12 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_AR+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
 else
@@ -6034,11 +6586,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6049,11 +6605,11 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf "%s\n" "$AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -6066,11 +6622,12 @@ if test -z "$AR"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_AR+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 else
@@ -6078,11 +6635,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6093,11 +6654,11 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+printf "%s\n" "$ac_ct_AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -6109,8 +6670,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -6130,11 +6691,12 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_READELF+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_READELF+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$READELF"; then
   ac_cv_prog_READELF="$READELF" # Let the user override the test.
 else
@@ -6142,11 +6704,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_READELF="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6157,11 +6723,11 @@ fi
 fi
 READELF=$ac_cv_prog_READELF
 if test -n "$READELF"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READELF" >&5
-$as_echo "$READELF" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $READELF" >&5
+printf "%s\n" "$READELF" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -6174,11 +6740,12 @@ if test -z "$READELF"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_READELF+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_READELF+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_READELF"; then
   ac_cv_prog_ac_ct_READELF="$ac_ct_READELF" # Let the user override the test.
 else
@@ -6186,11 +6753,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_READELF="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6201,11 +6772,11 @@ fi
 fi
 ac_ct_READELF=$ac_cv_prog_ac_ct_READELF
 if test -n "$ac_ct_READELF"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_READELF" >&5
-$as_echo "$ac_ct_READELF" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_READELF" >&5
+printf "%s\n" "$ac_ct_READELF" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -6217,8 +6788,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     READELF=$ac_ct_READELF
@@ -6243,7 +6814,8 @@ hp*|HP*)
 		INSTALL="${srcdir}/install-sh -c"
 	fi
 esac
-# Find a good install program.  We prefer a C program (faster),
+
+  # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
 # SysV /etc/install, /usr/sbin/install
@@ -6257,20 +6829,25 @@ esac
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+printf %s "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+if test ${ac_cv_path_install+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
-  ./ | .// | /[cC]/* | \
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    # Account for fact that we put trailing slashes in our PATH walk.
+case $as_dir in #((
+  ./ | /[cC]/* | \
   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
   ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
   /usr/ucb/* ) ;;
@@ -6280,13 +6857,13 @@ case $as_dir/ in #((
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
 	    :
 	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
@@ -6294,12 +6871,12 @@ case $as_dir/ in #((
 	    echo one > conftest.one
 	    echo two > conftest.two
 	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	    if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" &&
 	      test -s conftest.one && test -s conftest.two &&
 	      test -s conftest.dir/conftest.one &&
 	      test -s conftest.dir/conftest.two
 	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c"
 	      break 3
 	    fi
 	  fi
@@ -6315,7 +6892,7 @@ IFS=$as_save_IFS
 rm -rf conftest.one conftest.two conftest.dir
 
 fi
-  if test "${ac_cv_path_install+set}" = set; then
+  if test ${ac_cv_path_install+y}; then
     INSTALL=$ac_cv_path_install
   else
     # As a last resort, use the slow shell script.  Don't cache a
@@ -6325,8 +6902,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+printf "%s\n" "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -6336,25 +6913,31 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5
+printf %s "checking for a race-free mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if ${ac_cv_path_mkdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  if test ${ac_cv_path_mkdir+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
+	   as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue
+	   case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir ('*'coreutils) '* | \
+	     'BusyBox '* | \
 	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext
 	       break 3;;
 	   esac
 	 done
@@ -6365,7 +6948,7 @@ IFS=$as_save_IFS
 fi
 
   test -d ./--version && rmdir ./--version
-  if test "${ac_cv_path_mkdir+set}" = set; then
+  if test ${ac_cv_path_mkdir+y}; then
     MKDIR_P="$ac_cv_path_mkdir -p"
   else
     # As a last resort, use the slow shell script.  Don't cache a
@@ -6375,8 +6958,8 @@ fi
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+printf "%s\n" "$MKDIR_P" >&6; }
 
 
 # Not every filesystem supports hard links
@@ -6393,60 +6976,63 @@ fi
 ABIFLAGS=""
 
 # Check for --with-pydebug
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-pydebug" >&5
-$as_echo_n "checking for --with-pydebug... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-pydebug" >&5
+printf %s "checking for --with-pydebug... " >&6; }
 
 # Check whether --with-pydebug was given.
-if test "${with_pydebug+set}" = set; then :
+if test ${with_pydebug+y}
+then :
   withval=$with_pydebug;
 if test "$withval" != no
 then
 
-$as_echo "#define Py_DEBUG 1" >>confdefs.h
+printf "%s\n" "#define Py_DEBUG 1" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; };
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; };
   Py_DEBUG='true'
   ABIFLAGS="${ABIFLAGS}d"
-else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }; Py_DEBUG='false'
+else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }; Py_DEBUG='false'
 fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Check for --with-trace-refs
 # --with-trace-refs
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-trace-refs" >&5
-$as_echo_n "checking for --with-trace-refs... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-trace-refs" >&5
+printf %s "checking for --with-trace-refs... " >&6; }
 
 # Check whether --with-trace-refs was given.
-if test "${with_trace_refs+set}" = set; then :
+if test ${with_trace_refs+y}
+then :
   withval=$with_trace_refs;
-else
+else $as_nop
   with_trace_refs=no
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_trace_refs" >&5
-$as_echo "$with_trace_refs" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_trace_refs" >&5
+printf "%s\n" "$with_trace_refs" >&6; }
 
 if test "$with_trace_refs" = "yes"
 then
 
-$as_echo "#define Py_TRACE_REFS 1" >>confdefs.h
+printf "%s\n" "#define Py_TRACE_REFS 1" >>confdefs.h
 
 fi
 
 # Check for --with-assertions.
 # This allows enabling assertions without Py_DEBUG.
 assertions='false'
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-assertions" >&5
-$as_echo_n "checking for --with-assertions... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-assertions" >&5
+printf %s "checking for --with-assertions... " >&6; }
 
 # Check whether --with-assertions was given.
-if test "${with_assertions+set}" = set; then :
+if test ${with_assertions+y}
+then :
   withval=$with_assertions;
 if test "$withval" != no
 then
@@ -6455,39 +7041,40 @@ fi
 fi
 
 if test "$assertions" = 'true'; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 elif test "$Py_DEBUG" = 'true'; then
   assertions='true'
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: implied by --with-pydebug" >&5
-$as_echo "implied by --with-pydebug" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: implied by --with-pydebug" >&5
+printf "%s\n" "implied by --with-pydebug" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 # Enable optimization flags
 
 
 Py_OPT='false'
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-optimizations" >&5
-$as_echo_n "checking for --enable-optimizations... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --enable-optimizations" >&5
+printf %s "checking for --enable-optimizations... " >&6; }
 # Check whether --enable-optimizations was given.
-if test "${enable_optimizations+set}" = set; then :
+if test ${enable_optimizations+y}
+then :
   enableval=$enable_optimizations;
 if test "$enableval" != no
 then
   Py_OPT='true'
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; };
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; };
 else
   Py_OPT='false'
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; };
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; };
 fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 if test "$Py_OPT" = 'true' ; then
@@ -6500,11 +7087,12 @@ if test "$Py_OPT" = 'true' ; then
   DEF_MAKE_RULE="build_all"
   case $CC in
     *gcc*)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-semantic-interposition" >&5
-$as_echo_n "checking whether C compiler accepts -fno-semantic-interposition... " >&6; }
-if ${ax_cv_check_cflags___fno_semantic_interposition+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-semantic-interposition" >&5
+printf %s "checking whether C compiler accepts -fno-semantic-interposition... " >&6; }
+if test ${ax_cv_check_cflags___fno_semantic_interposition+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS  -fno-semantic-interposition"
@@ -6512,29 +7100,31 @@ else
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ax_cv_check_cflags___fno_semantic_interposition=yes
-else
+else $as_nop
   ax_cv_check_cflags___fno_semantic_interposition=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fno_semantic_interposition" >&5
-$as_echo "$ax_cv_check_cflags___fno_semantic_interposition" >&6; }
-if test "x$ax_cv_check_cflags___fno_semantic_interposition" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fno_semantic_interposition" >&5
+printf "%s\n" "$ax_cv_check_cflags___fno_semantic_interposition" >&6; }
+if test "x$ax_cv_check_cflags___fno_semantic_interposition" = xyes
+then :
 
       CFLAGS_NODIST="$CFLAGS_NODIST -fno-semantic-interposition"
       LDFLAGS_NODIST="$LDFLAGS_NODIST -fno-semantic-interposition"
 
-else
+else $as_nop
   :
 fi
 
@@ -6549,14 +7139,14 @@ else
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking PROFILE_TASK" >&5
-$as_echo_n "checking PROFILE_TASK... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking PROFILE_TASK" >&5
+printf %s "checking PROFILE_TASK... " >&6; }
 if test -z "$PROFILE_TASK"
 then
 	PROFILE_TASK='-m test --pgo --timeout=$(TESTTIMEOUT)'
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROFILE_TASK" >&5
-$as_echo "$PROFILE_TASK" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PROFILE_TASK" >&5
+printf "%s\n" "$PROFILE_TASK" >&6; }
 
 # Make llvm-relatec checks work on systems where llvm tools are not installed with their
 # normal names in the default $PATH (ie: Ubuntu).  They exist under the
@@ -6579,25 +7169,26 @@ then
 fi
 
 # Enable LTO flags
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-lto" >&5
-$as_echo_n "checking for --with-lto... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-lto" >&5
+printf %s "checking for --with-lto... " >&6; }
 
 # Check whether --with-lto was given.
-if test "${with_lto+set}" = set; then :
+if test ${with_lto+y}
+then :
   withval=$with_lto;
 if test "$withval" != no
 then
   Py_LTO='true'
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; };
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; };
 else
   Py_LTO='false'
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; };
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; };
 fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 if test "$Py_LTO" = 'true' ; then
@@ -6607,11 +7198,12 @@ if test "$Py_LTO" = 'true' ; then
       if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}llvm-ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}llvm-ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_LLVM_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_LLVM_AR+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $LLVM_AR in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_LLVM_AR="$LLVM_AR" # Let the user override the test with a path.
@@ -6621,11 +7213,15 @@ else
 for as_dir in ${llvm_path}
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_LLVM_AR="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_LLVM_AR="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6637,11 +7233,11 @@ esac
 fi
 LLVM_AR=$ac_cv_path_LLVM_AR
 if test -n "$LLVM_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LLVM_AR" >&5
-$as_echo "$LLVM_AR" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LLVM_AR" >&5
+printf "%s\n" "$LLVM_AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -6650,11 +7246,12 @@ if test -z "$ac_cv_path_LLVM_AR"; then
   ac_pt_LLVM_AR=$LLVM_AR
   # Extract the first word of "llvm-ar", so it can be a program name with args.
 set dummy llvm-ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_LLVM_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_LLVM_AR+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $ac_pt_LLVM_AR in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_ac_pt_LLVM_AR="$ac_pt_LLVM_AR" # Let the user override the test with a path.
@@ -6664,11 +7261,15 @@ else
 for as_dir in ${llvm_path}
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_LLVM_AR="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_LLVM_AR="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6680,11 +7281,11 @@ esac
 fi
 ac_pt_LLVM_AR=$ac_cv_path_ac_pt_LLVM_AR
 if test -n "$ac_pt_LLVM_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_LLVM_AR" >&5
-$as_echo "$ac_pt_LLVM_AR" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_LLVM_AR" >&5
+printf "%s\n" "$ac_pt_LLVM_AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_pt_LLVM_AR" = x; then
@@ -6692,8 +7293,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     LLVM_AR=$ac_pt_LLVM_AR
@@ -6717,8 +7318,8 @@ fi
         then
           LLVM_AR='/usr/bin/xcrun ar'
           LLVM_AR_FOUND=found
-          { $as_echo "$as_me:${as_lineno-$LINENO}: llvm-ar found via xcrun: ${LLVM_AR}" >&5
-$as_echo "$as_me: llvm-ar found via xcrun: ${LLVM_AR}" >&6;}
+          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: llvm-ar found via xcrun: ${LLVM_AR}" >&5
+printf "%s\n" "$as_me: llvm-ar found via xcrun: ${LLVM_AR}" >&6;}
         fi
       fi
       if test $LLVM_AR_FOUND = not-found
@@ -6774,11 +7375,12 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}llvm-profdata", so it can be a program name with args.
 set dummy ${ac_tool_prefix}llvm-profdata; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_LLVM_PROFDATA+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_LLVM_PROFDATA+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $LLVM_PROFDATA in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_LLVM_PROFDATA="$LLVM_PROFDATA" # Let the user override the test with a path.
@@ -6788,11 +7390,15 @@ else
 for as_dir in ${llvm_path}
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_LLVM_PROFDATA="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_LLVM_PROFDATA="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6804,11 +7410,11 @@ esac
 fi
 LLVM_PROFDATA=$ac_cv_path_LLVM_PROFDATA
 if test -n "$LLVM_PROFDATA"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LLVM_PROFDATA" >&5
-$as_echo "$LLVM_PROFDATA" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LLVM_PROFDATA" >&5
+printf "%s\n" "$LLVM_PROFDATA" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -6817,11 +7423,12 @@ if test -z "$ac_cv_path_LLVM_PROFDATA"; then
   ac_pt_LLVM_PROFDATA=$LLVM_PROFDATA
   # Extract the first word of "llvm-profdata", so it can be a program name with args.
 set dummy llvm-profdata; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_LLVM_PROFDATA+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_LLVM_PROFDATA+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $ac_pt_LLVM_PROFDATA in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_ac_pt_LLVM_PROFDATA="$ac_pt_LLVM_PROFDATA" # Let the user override the test with a path.
@@ -6831,11 +7438,15 @@ else
 for as_dir in ${llvm_path}
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_LLVM_PROFDATA="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_LLVM_PROFDATA="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6847,11 +7458,11 @@ esac
 fi
 ac_pt_LLVM_PROFDATA=$ac_cv_path_ac_pt_LLVM_PROFDATA
 if test -n "$ac_pt_LLVM_PROFDATA"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_LLVM_PROFDATA" >&5
-$as_echo "$ac_pt_LLVM_PROFDATA" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_LLVM_PROFDATA" >&5
+printf "%s\n" "$ac_pt_LLVM_PROFDATA" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_pt_LLVM_PROFDATA" = x; then
@@ -6859,8 +7470,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     LLVM_PROFDATA=$ac_pt_LLVM_PROFDATA
@@ -6885,8 +7496,8 @@ then
     # https://apple.stackexchange.com/questions/197053/
     LLVM_PROFDATA='/usr/bin/xcrun llvm-profdata'
     LLVM_PROF_FOUND=found
-    { $as_echo "$as_me:${as_lineno-$LINENO}: llvm-profdata found via xcrun: ${LLVM_PROFDATA}" >&5
-$as_echo "$as_me: llvm-profdata found via xcrun: ${LLVM_PROFDATA}" >&6;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: llvm-profdata found via xcrun: ${LLVM_PROFDATA}" >&5
+printf "%s\n" "$as_me: llvm-profdata found via xcrun: ${LLVM_PROFDATA}" >&6;}
   fi
 fi
 LLVM_PROF_ERR=no
@@ -7030,19 +7641,20 @@ case $GCC in
 yes)
     CFLAGS_NODIST="$CFLAGS_NODIST -std=c99"
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wextra" >&5
-$as_echo_n "checking for -Wextra... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -Wextra" >&5
+printf %s "checking for -Wextra... " >&6; }
      ac_save_cc="$CC"
      CC="$CC -Wextra -Werror"
-     if ${ac_cv_extra_warnings+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+     if test ${ac_cv_extra_warnings+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -7050,21 +7662,22 @@ main ()
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
            ac_cv_extra_warnings=yes
 
-else
+else $as_nop
 
            ac_cv_extra_warnings=no
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
      CC="$ac_save_cc"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_extra_warnings" >&5
-$as_echo "$ac_cv_extra_warnings" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_extra_warnings" >&5
+printf "%s\n" "$ac_cv_extra_warnings" >&6; }
 
     if test $ac_cv_extra_warnings = yes
     then
@@ -7075,20 +7688,21 @@ $as_echo "$ac_cv_extra_warnings" >&6; }
     # GCC produce warnings for legal Python code.  Enable
     # -fno-strict-aliasing on versions of GCC that support but produce
     # warnings.  See Issue3326
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts and needs -fno-strict-aliasing" >&5
-$as_echo_n "checking whether $CC accepts and needs -fno-strict-aliasing... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts and needs -fno-strict-aliasing" >&5
+printf %s "checking whether $CC accepts and needs -fno-strict-aliasing... " >&6; }
      ac_save_cc="$CC"
      CC="$CC -fno-strict-aliasing"
      save_CFLAGS="$CFLAGS"
-     if ${ac_cv_no_strict_aliasing+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+     if test ${ac_cv_no_strict_aliasing+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -7096,7 +7710,8 @@ main ()
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
 	   CC="$ac_save_cc -fstrict-aliasing"
            CFLAGS="$CFLAGS -Werror -Wstrict-aliasing"
@@ -7105,7 +7720,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
 
 	       void f(int **x) {}
 int
-main ()
+main (void)
 {
 double *x; f((int **) &x);
   ;
@@ -7113,29 +7728,30 @@ double *x; f((int **) &x);
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
 	       ac_cv_no_strict_aliasing=no
 
-else
+else $as_nop
 
                ac_cv_no_strict_aliasing=yes
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-else
+else $as_nop
 
 	   ac_cv_no_strict_aliasing=no
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
      CFLAGS="$save_CFLAGS"
      CC="$ac_save_cc"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_no_strict_aliasing" >&5
-$as_echo "$ac_cv_no_strict_aliasing" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_no_strict_aliasing" >&5
+printf "%s\n" "$ac_cv_no_strict_aliasing" >&6; }
     if test $ac_cv_no_strict_aliasing = yes
     then
       BASECFLAGS="$BASECFLAGS -fno-strict-aliasing"
@@ -7148,20 +7764,21 @@ $as_echo "$ac_cv_no_strict_aliasing" >&6; }
     ac_cv_disable_unused_result_warning=no
     ;;
     *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can turn off $CC unused result warning" >&5
-$as_echo_n "checking if we can turn off $CC unused result warning... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can turn off $CC unused result warning" >&5
+printf %s "checking if we can turn off $CC unused result warning... " >&6; }
      ac_save_cc="$CC"
      CC="$CC -Wunused-result -Werror"
      save_CFLAGS="$CFLAGS"
-     if ${ac_cv_disable_unused_result_warning+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+     if test ${ac_cv_disable_unused_result_warning+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -7169,22 +7786,23 @@ main ()
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
            ac_cv_disable_unused_result_warning=yes
 
-else
+else $as_nop
 
            ac_cv_disable_unused_result_warning=no
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
      CFLAGS="$save_CFLAGS"
      CC="$ac_save_cc"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_disable_unused_result_warning" >&5
-$as_echo "$ac_cv_disable_unused_result_warning" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_disable_unused_result_warning" >&5
+printf "%s\n" "$ac_cv_disable_unused_result_warning" >&6; }
     ;;
     esac
 
@@ -7194,19 +7812,20 @@ $as_echo "$ac_cv_disable_unused_result_warning" >&6; }
       CFLAGS_NODIST="$CFLAGS_NODIST -Wno-unused-result"
     fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can turn off $CC unused parameter warning" >&5
-$as_echo_n "checking if we can turn off $CC unused parameter warning... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can turn off $CC unused parameter warning" >&5
+printf %s "checking if we can turn off $CC unused parameter warning... " >&6; }
      ac_save_cc="$CC"
      CC="$CC -Wunused-parameter -Werror"
-     if ${ac_cv_disable_unused_parameter_warning+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+     if test ${ac_cv_disable_unused_parameter_warning+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -7214,40 +7833,42 @@ main ()
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
            ac_cv_disable_unused_parameter_warning=yes
 
-else
+else $as_nop
 
            ac_cv_disable_unused_parameter_warning=no
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
      CC="$ac_save_cc"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_disable_unused_parameter_warning" >&5
-$as_echo "$ac_cv_disable_unused_parameter_warning" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_disable_unused_parameter_warning" >&5
+printf "%s\n" "$ac_cv_disable_unused_parameter_warning" >&6; }
 
     if test $ac_cv_disable_unused_parameter_warning = yes
     then
       CFLAGS_NODIST="$CFLAGS_NODIST -Wno-unused-parameter"
     fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can turn off $CC missing field initializers warning" >&5
-$as_echo_n "checking if we can turn off $CC missing field initializers warning... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can turn off $CC missing field initializers warning" >&5
+printf %s "checking if we can turn off $CC missing field initializers warning... " >&6; }
      ac_save_cc="$CC"
      CC="$CC -Wmissing-field-initializers -Werror"
-     if ${ac_cv_disable_missing_field_initializers+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+     if test ${ac_cv_disable_missing_field_initializers+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -7255,41 +7876,43 @@ main ()
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
            ac_cv_disable_missing_field_initializers=yes
 
-else
+else $as_nop
 
            ac_cv_disable_missing_field_initializers=no
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
      CC="$ac_save_cc"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_disable_missing_field_initializers" >&5
-$as_echo "$ac_cv_disable_missing_field_initializers" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_disable_missing_field_initializers" >&5
+printf "%s\n" "$ac_cv_disable_missing_field_initializers" >&6; }
 
     if test $ac_cv_disable_missing_field_initializers = yes
     then
       CFLAGS_NODIST="$CFLAGS_NODIST -Wno-missing-field-initializers"
     fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can turn on $CC mixed sign comparison warning" >&5
-$as_echo_n "checking if we can turn on $CC mixed sign comparison warning... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can turn on $CC mixed sign comparison warning" >&5
+printf %s "checking if we can turn on $CC mixed sign comparison warning... " >&6; }
      ac_save_cc="$CC"
      CC="$CC -Wsign-compare"
      save_CFLAGS="$CFLAGS"
-     if ${ac_cv_enable_sign_compare_warning+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+     if test ${ac_cv_enable_sign_compare_warning+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -7297,42 +7920,44 @@ main ()
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
            ac_cv_enable_sign_compare_warning=yes
 
-else
+else $as_nop
 
            ac_cv_enable_sign_compare_warning=no
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
      CFLAGS="$save_CFLAGS"
      CC="$ac_save_cc"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_sign_compare_warning" >&5
-$as_echo "$ac_cv_enable_sign_compare_warning" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_sign_compare_warning" >&5
+printf "%s\n" "$ac_cv_enable_sign_compare_warning" >&6; }
 
     if test $ac_cv_enable_sign_compare_warning = yes
     then
       BASECFLAGS="$BASECFLAGS -Wsign-compare"
     fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can turn on $CC unreachable code warning" >&5
-$as_echo_n "checking if we can turn on $CC unreachable code warning... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can turn on $CC unreachable code warning" >&5
+printf %s "checking if we can turn on $CC unreachable code warning... " >&6; }
      ac_save_cc="$CC"
      CC="$CC -Wunreachable-code"
      save_CFLAGS="$CFLAGS"
-     if ${ac_cv_enable_unreachable_code_warning+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+     if test ${ac_cv_enable_unreachable_code_warning+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -7340,16 +7965,17 @@ main ()
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
            ac_cv_enable_unreachable_code_warning=yes
 
-else
+else $as_nop
 
            ac_cv_enable_unreachable_code_warning=no
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
      CFLAGS="$save_CFLAGS"
@@ -7370,22 +7996,23 @@ fi
     else
       ac_cv_enable_unreachable_code_warning=no
     fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_unreachable_code_warning" >&5
-$as_echo "$ac_cv_enable_unreachable_code_warning" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_unreachable_code_warning" >&5
+printf "%s\n" "$ac_cv_enable_unreachable_code_warning" >&6; }
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can turn on $CC strict-prototypes warning" >&5
-$as_echo_n "checking if we can turn on $CC strict-prototypes warning... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can turn on $CC strict-prototypes warning" >&5
+printf %s "checking if we can turn on $CC strict-prototypes warning... " >&6; }
      ac_save_cc="$CC"
      CC="$CC -Werror -Wstrict-prototypes"
-     if ${ac_cv_enable_enable_strict_prototypes_warning+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+     if test ${ac_cv_enable_enable_strict_prototypes_warning+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -7393,40 +8020,42 @@ main ()
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
        ac_cv_enable_strict_prototypes_warning=yes
 
-else
+else $as_nop
 
        ac_cv_enable_strict_prototypes_warning=no
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
      CC="$ac_save_cc"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_strict_prototypes_warning" >&5
-$as_echo "$ac_cv_enable_strict_prototypes_warning" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_strict_prototypes_warning" >&5
+printf "%s\n" "$ac_cv_enable_strict_prototypes_warning" >&6; }
 
     if test $ac_cv_enable_strict_prototypes_warning = yes
     then
       CFLAGS_NODIST="$CFLAGS_NODIST -Wstrict-prototypes"
     fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can make implicit function declaration an error in $CC" >&5
-$as_echo_n "checking if we can make implicit function declaration an error in $CC... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can make implicit function declaration an error in $CC" >&5
+printf %s "checking if we can make implicit function declaration an error in $CC... " >&6; }
      ac_save_cc="$CC"
      CC="$CC -Werror=implicit-function-declaration"
-     if ${ac_cv_enable_implicit_function_declaration_error+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+     if test ${ac_cv_enable_implicit_function_declaration_error+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -7434,40 +8063,42 @@ main ()
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
            ac_cv_enable_implicit_function_declaration_error=yes
 
-else
+else $as_nop
 
            ac_cv_enable_implicit_function_declaration_error=no
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
      CC="$ac_save_cc"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_implicit_function_declaration_error" >&5
-$as_echo "$ac_cv_enable_implicit_function_declaration_error" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_implicit_function_declaration_error" >&5
+printf "%s\n" "$ac_cv_enable_implicit_function_declaration_error" >&6; }
 
     if test $ac_cv_enable_implicit_function_declaration_error = yes
     then
       CFLAGS_NODIST="$CFLAGS_NODIST -Werror=implicit-function-declaration"
     fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can use visibility in $CC" >&5
-$as_echo_n "checking if we can use visibility in $CC... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can use visibility in $CC" >&5
+printf %s "checking if we can use visibility in $CC... " >&6; }
      ac_save_cc="$CC"
      CC="$CC -fvisibility=hidden"
-     if ${ac_cv_enable_visibility+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+     if test ${ac_cv_enable_visibility+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -7475,21 +8106,22 @@ main ()
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
            ac_cv_enable_visibility=yes
 
-else
+else $as_nop
 
            ac_cv_enable_visibility=no
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
      CC="$ac_save_cc"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_visibility" >&5
-$as_echo "$ac_cv_enable_visibility" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_visibility" >&5
+printf "%s\n" "$ac_cv_enable_visibility" >&6; }
 
     if test $ac_cv_enable_visibility = yes
     then
@@ -7515,8 +8147,8 @@ $as_echo "$ac_cv_enable_visibility" >&6; }
         # used to be here, but non-Apple gcc doesn't accept them.
         if test "${CC}" = gcc
         then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking which compiler should be used" >&5
-$as_echo_n "checking which compiler should be used... " >&6; }
+            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which compiler should be used" >&5
+printf %s "checking which compiler should be used... " >&6; }
             case "${UNIVERSALSDK}" in
             */MacOSX10.4u.sdk)
                 # Build using 10.4 SDK, force usage of gcc when the
@@ -7526,8 +8158,8 @@ $as_echo_n "checking which compiler should be used... " >&6; }
                 CPP=cpp-4.0
                 ;;
             esac
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
         fi
 
         LIPO_INTEL64_FLAGS=""
@@ -7604,8 +8236,8 @@ $as_echo "$CC" >&6; }
         #       below to pick either 10.3, 10.4, or 10.5 as the target.
         # 4. If we are running on OS X 10.2 or earlier, good luck!
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking which MACOSX_DEPLOYMENT_TARGET to use" >&5
-$as_echo_n "checking which MACOSX_DEPLOYMENT_TARGET to use... " >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which MACOSX_DEPLOYMENT_TARGET to use" >&5
+printf %s "checking which MACOSX_DEPLOYMENT_TARGET to use... " >&6; }
         cur_target_major=`sw_vers -productVersion | \
                 sed 's/\([0-9]*\)\.\([0-9]*\).*/\1/'`
         cur_target_minor=`sw_vers -productVersion | \
@@ -7642,32 +8274,33 @@ $as_echo_n "checking which MACOSX_DEPLOYMENT_TARGET to use... " >&6; }
         MACOSX_DEPLOYMENT_TARGET="$CONFIGURE_MACOSX_DEPLOYMENT_TARGET"
         export MACOSX_DEPLOYMENT_TARGET
         EXPORT_MACOSX_DEPLOYMENT_TARGET=''
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MACOSX_DEPLOYMENT_TARGET" >&5
-$as_echo "$MACOSX_DEPLOYMENT_TARGET" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MACOSX_DEPLOYMENT_TARGET" >&5
+printf "%s\n" "$MACOSX_DEPLOYMENT_TARGET" >&6; }
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if specified universal architectures work" >&5
-$as_echo_n "checking if specified universal architectures work... " >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if specified universal architectures work" >&5
+printf %s "checking if specified universal architectures work... " >&6; }
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("%d", 42);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $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; }
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
              as_fn_error $? "check config.log and use the '--with-universal-archs' option" "$LINENO" 5
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
         # end of Darwin* tests
@@ -7713,14 +8346,16 @@ fi
 # complain if unaccepted options are passed (e.g. gcc on Mac OS X).
 # So we have to see first whether pthreads are available without
 # options before we can check whether -Kpthread improves anything.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads are available without options" >&5
-$as_echo_n "checking whether pthreads are available without options... " >&6; }
-if ${ac_cv_pthread_is_default+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pthreads are available without options" >&5
+printf %s "checking whether pthreads are available without options... " >&6; }
+if test ${ac_cv_pthread_is_default+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
   ac_cv_pthread_is_default=no
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -7738,13 +8373,14 @@ int main(){
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
   ac_cv_pthread_is_default=yes
   ac_cv_kthread=no
   ac_cv_pthread=no
 
-else
+else $as_nop
   ac_cv_pthread_is_default=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -7754,8 +8390,8 @@ fi
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthread_is_default" >&5
-$as_echo "$ac_cv_pthread_is_default" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthread_is_default" >&5
+printf "%s\n" "$ac_cv_pthread_is_default" >&6; }
 
 
 if test $ac_cv_pthread_is_default = yes
@@ -7767,16 +8403,18 @@ else
 # Some compilers won't report that they do not support -Kpthread,
 # so we need to run a program to see whether it really made the
 # function available.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -Kpthread" >&5
-$as_echo_n "checking whether $CC accepts -Kpthread... " >&6; }
-if ${ac_cv_kpthread+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -Kpthread" >&5
+printf %s "checking whether $CC accepts -Kpthread... " >&6; }
+if test ${ac_cv_kpthread+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_save_cc="$CC"
 CC="$CC -Kpthread"
-if test "$cross_compiling" = yes; then :
+if test "$cross_compiling" = yes
+then :
   ac_cv_kpthread=no
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -7794,9 +8432,10 @@ int main(){
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_kpthread=yes
-else
+else $as_nop
   ac_cv_kpthread=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -7806,8 +8445,8 @@ fi
 CC="$ac_save_cc"
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_kpthread" >&5
-$as_echo "$ac_cv_kpthread" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_kpthread" >&5
+printf "%s\n" "$ac_cv_kpthread" >&6; }
 fi
 
 if test $ac_cv_kpthread = no -a $ac_cv_pthread_is_default = no
@@ -7817,16 +8456,18 @@ then
 # Some compilers won't report that they do not support -Kthread,
 # so we need to run a program to see whether it really made the
 # function available.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -Kthread" >&5
-$as_echo_n "checking whether $CC accepts -Kthread... " >&6; }
-if ${ac_cv_kthread+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -Kthread" >&5
+printf %s "checking whether $CC accepts -Kthread... " >&6; }
+if test ${ac_cv_kthread+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_save_cc="$CC"
 CC="$CC -Kthread"
-if test "$cross_compiling" = yes; then :
+if test "$cross_compiling" = yes
+then :
   ac_cv_kthread=no
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -7844,9 +8485,10 @@ int main(){
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_kthread=yes
-else
+else $as_nop
   ac_cv_kthread=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -7856,8 +8498,8 @@ fi
 CC="$ac_save_cc"
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_kthread" >&5
-$as_echo "$ac_cv_kthread" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_kthread" >&5
+printf "%s\n" "$ac_cv_kthread" >&6; }
 fi
 
 if test $ac_cv_kthread = no -a $ac_cv_pthread_is_default = no
@@ -7867,16 +8509,18 @@ then
 # Some compilers won't report that they do not support -pthread,
 # so we need to run a program to see whether it really made the
 # function available.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -pthread" >&5
-$as_echo_n "checking whether $CC accepts -pthread... " >&6; }
-if ${ac_cv_pthread+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -pthread" >&5
+printf %s "checking whether $CC accepts -pthread... " >&6; }
+if test ${ac_cv_pthread+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_save_cc="$CC"
 CC="$CC -pthread"
-if test "$cross_compiling" = yes; then :
+if test "$cross_compiling" = yes
+then :
   ac_cv_pthread=no
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -7894,9 +8538,10 @@ int main(){
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_pthread=yes
-else
+else $as_nop
   ac_cv_pthread=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -7906,8 +8551,8 @@ fi
 CC="$ac_save_cc"
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthread" >&5
-$as_echo "$ac_cv_pthread" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthread" >&5
+printf "%s\n" "$ac_cv_pthread" >&6; }
 fi
 
 # If we have set a CC compiler flag for thread support then
@@ -7915,8 +8560,8 @@ fi
 ac_cv_cxx_thread=no
 if test ! -z "$CXX"
 then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX also accepts flags for thread support" >&5
-$as_echo_n "checking whether $CXX also accepts flags for thread support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX also accepts flags for thread support" >&5
+printf %s "checking whether $CXX also accepts flags for thread support... " >&6; }
 ac_save_cxx="$CXX"
 
 if test "$ac_cv_kpthread" = "yes"
@@ -7946,358 +8591,702 @@ then
   fi
   rm -fr conftest*
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_thread" >&5
-$as_echo "$ac_cv_cxx_thread" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_thread" >&5
+printf "%s\n" "$ac_cv_cxx_thread" >&6; }
 fi
 CXX="$ac_save_cxx"
 
 
 # checks for header files
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
+# Autoupdate added the next two lines to ensure that your configure
+# script's behavior did not change.  They are probably safe to remove.
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+printf %s "checking for egrep... " >&6; }
+if test ${ac_cv_path_EGREP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in egrep
+   do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  printf %s 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    printf "%s\n" 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
+  ac_cv_path_EGREP=$EGREP
+fi
 
-int
-main ()
-{
+   fi
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+printf "%s\n" "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+
+ac_fn_c_check_header_compile "$LINENO" "asm/types.h" "ac_cv_header_asm_types_h" "$ac_includes_default"
+if test "x$ac_cv_header_asm_types_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_ASM_TYPES_H 1" >>confdefs.h
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_fn_c_check_header_compile "$LINENO" "crypt.h" "ac_cv_header_crypt_h" "$ac_includes_default"
+if test "x$ac_cv_header_crypt_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_CRYPT_H 1" >>confdefs.h
 
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
+fi
+ac_fn_c_check_header_compile "$LINENO" "conio.h" "ac_cv_header_conio_h" "$ac_includes_default"
+if test "x$ac_cv_header_conio_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_CONIO_H 1" >>confdefs.h
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
+fi
+ac_fn_c_check_header_compile "$LINENO" "direct.h" "ac_cv_header_direct_h" "$ac_includes_default"
+if test "x$ac_cv_header_direct_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_DIRECT_H 1" >>confdefs.h
 
-else
-  ac_cv_header_stdc=no
 fi
-rm -f conftest*
+ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
+if test "x$ac_cv_header_dlfcn_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h
 
 fi
+ac_fn_c_check_header_compile "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default"
+if test "x$ac_cv_header_errno_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_ERRNO_H 1" >>confdefs.h
 
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
+fi
+ac_fn_c_check_header_compile "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default"
+if test "x$ac_cv_header_fcntl_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_FCNTL_H 1" >>confdefs.h
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
+fi
+ac_fn_c_check_header_compile "$LINENO" "grp.h" "ac_cv_header_grp_h" "$ac_includes_default"
+if test "x$ac_cv_header_grp_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_GRP_H 1" >>confdefs.h
 
-else
-  ac_cv_header_stdc=no
 fi
-rm -f conftest*
+ac_fn_c_check_header_compile "$LINENO" "ieeefp.h" "ac_cv_header_ieeefp_h" "$ac_includes_default"
+if test "x$ac_cv_header_ieeefp_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_IEEEFP_H 1" >>confdefs.h
 
 fi
+ac_fn_c_check_header_compile "$LINENO" "io.h" "ac_cv_header_io_h" "$ac_includes_default"
+if test "x$ac_cv_header_io_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_IO_H 1" >>confdefs.h
 
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
+fi
+ac_fn_c_check_header_compile "$LINENO" "langinfo.h" "ac_cv_header_langinfo_h" "$ac_includes_default"
+if test "x$ac_cv_header_langinfo_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LANGINFO_H 1" >>confdefs.h
 
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+fi
+ac_fn_c_check_header_compile "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
+if test "x$ac_cv_header_libintl_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBINTL_H 1" >>confdefs.h
 
-else
-  ac_cv_header_stdc=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ac_fn_c_check_header_compile "$LINENO" "process.h" "ac_cv_header_process_h" "$ac_includes_default"
+if test "x$ac_cv_header_process_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_PROCESS_H 1" >>confdefs.h
+
 fi
+ac_fn_c_check_header_compile "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
+if test "x$ac_cv_header_pthread_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_PTHREAD_H 1" >>confdefs.h
 
 fi
+ac_fn_c_check_header_compile "$LINENO" "sched.h" "ac_cv_header_sched_h" "$ac_includes_default"
+if test "x$ac_cv_header_sched_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SCHED_H 1" >>confdefs.h
+
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
+ac_fn_c_check_header_compile "$LINENO" "shadow.h" "ac_cv_header_shadow_h" "$ac_includes_default"
+if test "x$ac_cv_header_shadow_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SHADOW_H 1" >>confdefs.h
 
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+fi
+ac_fn_c_check_header_compile "$LINENO" "signal.h" "ac_cv_header_signal_h" "$ac_includes_default"
+if test "x$ac_cv_header_signal_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SIGNAL_H 1" >>confdefs.h
 
 fi
+ac_fn_c_check_header_compile "$LINENO" "stropts.h" "ac_cv_header_stropts_h" "$ac_includes_default"
+if test "x$ac_cv_header_stropts_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_STROPTS_H 1" >>confdefs.h
 
-for ac_header in asm/types.h crypt.h conio.h direct.h dlfcn.h errno.h \
-fcntl.h grp.h \
-ieeefp.h io.h langinfo.h libintl.h process.h pthread.h \
-sched.h shadow.h signal.h stropts.h termios.h \
-utime.h \
-poll.h sys/devpoll.h sys/epoll.h sys/poll.h \
-sys/audioio.h sys/xattr.h sys/bsdtty.h sys/event.h sys/file.h sys/ioctl.h \
-sys/kern_control.h sys/loadavg.h sys/lock.h sys/mkdev.h sys/modem.h \
-sys/param.h sys/random.h sys/select.h sys/sendfile.h sys/socket.h sys/statvfs.h \
-sys/stat.h sys/syscall.h sys/sys_domain.h sys/termio.h sys/time.h \
-sys/times.h sys/types.h sys/uio.h sys/un.h sys/utsname.h sys/wait.h pty.h \
-libutil.h sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \
-linux/tipc.h linux/random.h spawn.h util.h alloca.h endian.h \
-sys/endian.h sys/sysmacros.h linux/memfd.h linux/wait.h sys/memfd.h \
-sys/mman.h sys/eventfd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+fi
+ac_fn_c_check_header_compile "$LINENO" "termios.h" "ac_cv_header_termios_h" "$ac_includes_default"
+if test "x$ac_cv_header_termios_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_TERMIOS_H 1" >>confdefs.h
 
 fi
+ac_fn_c_check_header_compile "$LINENO" "utime.h" "ac_cv_header_utime_h" "$ac_includes_default"
+if test "x$ac_cv_header_utime_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_UTIME_H 1" >>confdefs.h
 
-done
+fi
+ac_fn_c_check_header_compile "$LINENO" "poll.h" "ac_cv_header_poll_h" "$ac_includes_default"
+if test "x$ac_cv_header_poll_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_POLL_H 1" >>confdefs.h
 
-ac_header_dirent=no
-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-  as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
-$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-if eval \${$as_ac_Header+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <$ac_hdr>
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/devpoll.h" "ac_cv_header_sys_devpoll_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_devpoll_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_DEVPOLL_H 1" >>confdefs.h
 
-int
-main ()
-{
-if ((DIR *) 0)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$as_ac_Header=yes"
-else
-  eval "$as_ac_Header=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_fn_c_check_header_compile "$LINENO" "sys/epoll.h" "ac_cv_header_sys_epoll_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_epoll_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_EPOLL_H 1" >>confdefs.h
+
 fi
-eval ac_res=\$$as_ac_Header
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "sys/poll.h" "ac_cv_header_sys_poll_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_poll_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_POLL_H 1" >>confdefs.h
 
-ac_header_dirent=$ac_hdr; break
 fi
+ac_fn_c_check_header_compile "$LINENO" "sys/audioio.h" "ac_cv_header_sys_audioio_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_audioio_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_AUDIOIO_H 1" >>confdefs.h
 
-done
-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
-if test $ac_header_dirent = dirent.h; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
-$as_echo_n "checking for library containing opendir... " >&6; }
-if ${ac_cv_search_opendir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/xattr.h" "ac_cv_header_sys_xattr_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_xattr_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_XATTR_H 1" >>confdefs.h
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char opendir ();
-int
-main ()
-{
-return opendir ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' dir; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_opendir=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_opendir+:} false; then :
-  break
+ac_fn_c_check_header_compile "$LINENO" "sys/bsdtty.h" "ac_cv_header_sys_bsdtty_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_bsdtty_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_BSDTTY_H 1" >>confdefs.h
+
 fi
-done
-if ${ac_cv_search_opendir+:} false; then :
+ac_fn_c_check_header_compile "$LINENO" "sys/event.h" "ac_cv_header_sys_event_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_event_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_EVENT_H 1" >>confdefs.h
 
-else
-  ac_cv_search_opendir=no
 fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+ac_fn_c_check_header_compile "$LINENO" "sys/file.h" "ac_cv_header_sys_file_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_file_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_FILE_H 1" >>confdefs.h
+
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
-$as_echo "$ac_cv_search_opendir" >&6; }
-ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+ac_fn_c_check_header_compile "$LINENO" "sys/ioctl.h" "ac_cv_header_sys_ioctl_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_ioctl_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_IOCTL_H 1" >>confdefs.h
 
 fi
+ac_fn_c_check_header_compile "$LINENO" "sys/kern_control.h" "ac_cv_header_sys_kern_control_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_kern_control_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_KERN_CONTROL_H 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
-$as_echo_n "checking for library containing opendir... " >&6; }
-if ${ac_cv_search_opendir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/loadavg.h" "ac_cv_header_sys_loadavg_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_loadavg_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_LOADAVG_H 1" >>confdefs.h
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/lock.h" "ac_cv_header_sys_lock_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_lock_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_LOCK_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_mkdev_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_MKDEV_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/modem.h" "ac_cv_header_sys_modem_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_modem_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_MODEM_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_param_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_PARAM_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/random.h" "ac_cv_header_sys_random_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_random_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_RANDOM_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_select_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_SELECT_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/sendfile.h" "ac_cv_header_sys_sendfile_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_sendfile_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_SENDFILE_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/socket.h" "ac_cv_header_sys_socket_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_socket_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_SOCKET_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/statvfs.h" "ac_cv_header_sys_statvfs_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_statvfs_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_STATVFS_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/stat.h" "ac_cv_header_sys_stat_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_stat_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_STAT_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/syscall.h" "ac_cv_header_sys_syscall_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_syscall_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_SYSCALL_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/sys_domain.h" "ac_cv_header_sys_sys_domain_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_sys_domain_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_SYS_DOMAIN_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/termio.h" "ac_cv_header_sys_termio_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_termio_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_TERMIO_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_time_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_TIME_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/times.h" "ac_cv_header_sys_times_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_times_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_TIMES_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_types_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_TYPES_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/uio.h" "ac_cv_header_sys_uio_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_uio_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_UIO_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/un.h" "ac_cv_header_sys_un_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_un_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_UN_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/utsname.h" "ac_cv_header_sys_utsname_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_utsname_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_UTSNAME_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/wait.h" "ac_cv_header_sys_wait_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_wait_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "pty.h" "ac_cv_header_pty_h" "$ac_includes_default"
+if test "x$ac_cv_header_pty_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_PTY_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "libutil.h" "ac_cv_header_libutil_h" "$ac_includes_default"
+if test "x$ac_cv_header_libutil_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBUTIL_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/resource.h" "ac_cv_header_sys_resource_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_resource_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_RESOURCE_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "netpacket/packet.h" "ac_cv_header_netpacket_packet_h" "$ac_includes_default"
+if test "x$ac_cv_header_netpacket_packet_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_NETPACKET_PACKET_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sysexits.h" "ac_cv_header_sysexits_h" "$ac_includes_default"
+if test "x$ac_cv_header_sysexits_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYSEXITS_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "bluetooth.h" "ac_cv_header_bluetooth_h" "$ac_includes_default"
+if test "x$ac_cv_header_bluetooth_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_BLUETOOTH_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "linux/tipc.h" "ac_cv_header_linux_tipc_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_tipc_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LINUX_TIPC_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "linux/random.h" "ac_cv_header_linux_random_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_random_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LINUX_RANDOM_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "spawn.h" "ac_cv_header_spawn_h" "$ac_includes_default"
+if test "x$ac_cv_header_spawn_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SPAWN_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "util.h" "ac_cv_header_util_h" "$ac_includes_default"
+if test "x$ac_cv_header_util_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_UTIL_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "alloca.h" "ac_cv_header_alloca_h" "$ac_includes_default"
+if test "x$ac_cv_header_alloca_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_ALLOCA_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "endian.h" "ac_cv_header_endian_h" "$ac_includes_default"
+if test "x$ac_cv_header_endian_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_ENDIAN_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/endian.h" "ac_cv_header_sys_endian_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_endian_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_ENDIAN_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_sysmacros_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_SYSMACROS_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "linux/memfd.h" "ac_cv_header_linux_memfd_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_memfd_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LINUX_MEMFD_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "linux/wait.h" "ac_cv_header_linux_wait_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_wait_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LINUX_WAIT_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/memfd.h" "ac_cv_header_sys_memfd_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_memfd_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_MEMFD_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_mman_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_MMAN_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/eventfd.h" "ac_cv_header_sys_eventfd_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_eventfd_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_EVENTFD_H 1" >>confdefs.h
+
+fi
+
+ac_header_dirent=no
+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+  as_ac_Header=`printf "%s\n" "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
+printf %s "checking for $ac_hdr that defines DIR... " >&6; }
+if eval test \${$as_ac_Header+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <$ac_hdr>
+
+int
+main (void)
+{
+if ((DIR *) 0)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  eval "$as_ac_Header=yes"
+else $as_nop
+  eval "$as_ac_Header=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+eval ac_res=\$$as_ac_Header
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Header"\" = x"yes"
+then :
+  cat >>confdefs.h <<_ACEOF
+#define `printf "%s\n" "HAVE_$ac_hdr" | $as_tr_cpp` 1
+_ACEOF
+
+ac_header_dirent=$ac_hdr; break
+fi
+
+done
+# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+if test $ac_header_dirent = dirent.h; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+printf %s "checking for library containing opendir... " >&6; }
+if test ${ac_cv_search_opendir+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 char opendir ();
 int
-main ()
+main (void)
 {
 return opendir ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' x; do
+for ac_lib in '' dir
+do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  if ac_fn_c_try_link "$LINENO"; then :
+  if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_search_opendir=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext
-  if ${ac_cv_search_opendir+:} false; then :
+  if test ${ac_cv_search_opendir+y}
+then :
   break
 fi
 done
-if ${ac_cv_search_opendir+:} false; then :
+if test ${ac_cv_search_opendir+y}
+then :
 
-else
+else $as_nop
   ac_cv_search_opendir=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
-$as_echo "$ac_cv_search_opendir" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+printf "%s\n" "$ac_cv_search_opendir" >&6; }
 ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then :
+if test "$ac_res" != no
+then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h defines makedev" >&5
-$as_echo_n "checking whether sys/types.h defines makedev... " >&6; }
-if ${ac_cv_header_sys_types_h_makedev+:} false; then :
-  $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+printf %s "checking for library containing opendir... " >&6; }
+if test ${ac_cv_search_opendir+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <sys/types.h>
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+char opendir ();
 int
-main ()
+main (void)
 {
-return makedev(0, 0);
+return opendir ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_header_sys_types_h_makedev=yes
-else
-  ac_cv_header_sys_types_h_makedev=no
+for ac_lib in '' x
+do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_search_opendir=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext
+  if test ${ac_cv_search_opendir+y}
+then :
+  break
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_types_h_makedev" >&5
-$as_echo "$ac_cv_header_sys_types_h_makedev" >&6; }
-
-if test $ac_cv_header_sys_types_h_makedev = no; then
-ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_mkdev_h" = xyes; then :
+done
+if test ${ac_cv_search_opendir+y}
+then :
 
-$as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h
+else $as_nop
+  ac_cv_search_opendir=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+printf "%s\n" "$ac_cv_search_opendir" >&6; }
+ac_res=$ac_cv_search_opendir
+if test "$ac_res" != no
+then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
+fi
 
 
-  if test $ac_cv_header_sys_mkdev_h = no; then
-    ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sysmacros_h" = xyes; then :
+ac_fn_c_check_header_compile "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_mkdev_h" = xyes
+then :
 
-$as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h
+printf "%s\n" "#define MAJOR_IN_MKDEV 1" >>confdefs.h
 
 fi
 
+if test $ac_cv_header_sys_mkdev_h = no; then
+  ac_fn_c_check_header_compile "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_sysmacros_h" = xyes
+then :
+
+printf "%s\n" "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h
+
+fi
 
-  fi
 fi
 
 
@@ -8305,24 +9294,17 @@ fi
 # http://permalink.gmane.org/gmane.linux.bluez.kernel/22294
 SAVE_CFLAGS=$CFLAGS
 CFLAGS="-std=c99 $CFLAGS"
-for ac_header in bluetooth/bluetooth.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "bluetooth/bluetooth.h" "ac_cv_header_bluetooth_bluetooth_h" "$ac_includes_default"
-if test "x$ac_cv_header_bluetooth_bluetooth_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_BLUETOOTH_BLUETOOTH_H 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "bluetooth/bluetooth.h" "ac_cv_header_bluetooth_bluetooth_h" "$ac_includes_default"
+if test "x$ac_cv_header_bluetooth_bluetooth_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_BLUETOOTH_BLUETOOTH_H 1" >>confdefs.h
 
 fi
 
-done
-
 CFLAGS=$SAVE_CFLAGS
 
 # On Darwin (OS X) net/if.h requires sys/socket.h to be imported first.
-for ac_header in net/if.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" "#include <stdio.h>
+ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" "#include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
@@ -8336,20 +9318,15 @@ do :
 #endif
 
 "
-if test "x$ac_cv_header_net_if_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_NET_IF_H 1
-_ACEOF
+if test "x$ac_cv_header_net_if_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_NET_IF_H 1" >>confdefs.h
 
 fi
 
-done
-
 
 # On Linux, netlink.h requires asm/types.h
-for ac_header in linux/netlink.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "linux/netlink.h" "ac_cv_header_linux_netlink_h" "
+ac_fn_c_check_header_compile "$LINENO" "linux/netlink.h" "ac_cv_header_linux_netlink_h" "
 #ifdef HAVE_ASM_TYPES_H
 #include <asm/types.h>
 #endif
@@ -8358,20 +9335,15 @@ do :
 #endif
 
 "
-if test "x$ac_cv_header_linux_netlink_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LINUX_NETLINK_H 1
-_ACEOF
+if test "x$ac_cv_header_linux_netlink_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LINUX_NETLINK_H 1" >>confdefs.h
 
 fi
 
-done
-
 
 # On Linux, qrtr.h requires asm/types.h
-for ac_header in linux/qrtr.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "linux/qrtr.h" "ac_cv_header_linux_qrtr_h" "
+ac_fn_c_check_header_compile "$LINENO" "linux/qrtr.h" "ac_cv_header_linux_qrtr_h" "
 #ifdef HAVE_ASM_TYPES_H
 #include <asm/types.h>
 #endif
@@ -8380,80 +9352,101 @@ do :
 #endif
 
 "
-if test "x$ac_cv_header_linux_qrtr_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LINUX_QRTR_H 1
-_ACEOF
+if test "x$ac_cv_header_linux_qrtr_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LINUX_QRTR_H 1" >>confdefs.h
 
 fi
 
-done
-
 
-for ac_header in linux/vm_sockets.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "linux/vm_sockets.h" "ac_cv_header_linux_vm_sockets_h" "
+ac_fn_c_check_header_compile "$LINENO" "linux/vm_sockets.h" "ac_cv_header_linux_vm_sockets_h" "
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
 
 "
-if test "x$ac_cv_header_linux_vm_sockets_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LINUX_VM_SOCKETS_H 1
-_ACEOF
+if test "x$ac_cv_header_linux_vm_sockets_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LINUX_VM_SOCKETS_H 1" >>confdefs.h
 
 fi
 
-done
-
 
 # On Linux, can.h, can/bcm.h, can/j1939.h, can/raw.h require sys/socket.h
-for ac_header in linux/can.h linux/can/bcm.h linux/can/j1939.h linux/can/raw.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
+ac_fn_c_check_header_compile "$LINENO" "linux/can.h" "ac_cv_header_linux_can_h" "
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
 
 "
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+if test "x$ac_cv_header_linux_can_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LINUX_CAN_H 1" >>confdefs.h
 
 fi
+ac_fn_c_check_header_compile "$LINENO" "linux/can/bcm.h" "ac_cv_header_linux_can_bcm_h" "
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
 
-done
+"
+if test "x$ac_cv_header_linux_can_bcm_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LINUX_CAN_BCM_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "linux/can/j1939.h" "ac_cv_header_linux_can_j1939_h" "
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+"
+if test "x$ac_cv_header_linux_can_j1939_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LINUX_CAN_J1939_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "linux/can/raw.h" "ac_cv_header_linux_can_raw_h" "
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+"
+if test "x$ac_cv_header_linux_can_raw_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LINUX_CAN_RAW_H 1" >>confdefs.h
+
+fi
 
 
 # checks for typedefs
 was_it_defined=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_t in time.h" >&5
-$as_echo_n "checking for clock_t in time.h... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_t in time.h" >&5
+printf %s "checking for clock_t in time.h... " >&6; }
+
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <time.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "clock_t" >/dev/null 2>&1; then :
+  $EGREP "clock_t" >/dev/null 2>&1
+then :
   was_it_defined=yes
-else
+else $as_nop
 
 
-$as_echo "#define clock_t long" >>confdefs.h
+printf "%s\n" "#define clock_t long" >>confdefs.h
 
 
 fi
-rm -f conftest*
+rm -rf conftest*
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $was_it_defined" >&5
-$as_echo "$was_it_defined" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $was_it_defined" >&5
+printf "%s\n" "$was_it_defined" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for makedev" >&5
-$as_echo_n "checking for makedev... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for makedev" >&5
+printf %s "checking for makedev... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -8466,7 +9459,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #endif
 
 int
-main ()
+main (void)
 {
 
   makedev(0, 0)
@@ -8475,24 +9468,25 @@ main ()
 }
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_has_makedev=yes
-else
+else $as_nop
   ac_cv_has_makedev=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_has_makedev" >&5
-$as_echo "$ac_cv_has_makedev" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_has_makedev" >&5
+printf "%s\n" "$ac_cv_has_makedev" >&6; }
 if test "$ac_cv_has_makedev" = "yes"; then
 
-$as_echo "#define HAVE_MAKEDEV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_MAKEDEV 1" >>confdefs.h
 
 fi
 
 # byte swapping
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for le64toh" >&5
-$as_echo_n "checking for le64toh... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for le64toh" >&5
+printf %s "checking for le64toh... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -8503,7 +9497,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #endif
 
 int
-main ()
+main (void)
 {
 
    le64toh(1)
@@ -8512,18 +9506,19 @@ main ()
 }
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_has_le64toh=yes
-else
+else $as_nop
   ac_cv_has_le64toh=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_has_le64toh" >&5
-$as_echo "$ac_cv_has_le64toh" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_has_le64toh" >&5
+printf "%s\n" "$ac_cv_has_le64toh" >&6; }
 if test "$ac_cv_has_le64toh" = "yes"; then
 
-$as_echo "#define HAVE_HTOLE64 1" >>confdefs.h
+printf "%s\n" "#define HAVE_HTOLE64 1" >>confdefs.h
 
 fi
 
@@ -8539,15 +9534,15 @@ if test "$use_lfs" = "yes"; then
 case $ac_sys_system/$ac_sys_release in
 AIX*)
 
-$as_echo "#define _LARGE_FILES 1" >>confdefs.h
+printf "%s\n" "#define _LARGE_FILES 1" >>confdefs.h
 
     ;;
 esac
 
-$as_echo "#define _LARGEFILE_SOURCE 1" >>confdefs.h
+printf "%s\n" "#define _LARGEFILE_SOURCE 1" >>confdefs.h
 
 
-$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
+printf "%s\n" "#define _FILE_OFFSET_BITS 64" >>confdefs.h
 
 fi
 
@@ -8560,96 +9555,121 @@ EOF
 
 # Type availability checks
 ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
-if test "x$ac_cv_type_mode_t" = xyes; then :
+if test "x$ac_cv_type_mode_t" = xyes
+then :
 
-else
+else $as_nop
 
-cat >>confdefs.h <<_ACEOF
-#define mode_t int
-_ACEOF
+printf "%s\n" "#define mode_t int" >>confdefs.h
 
 fi
 
 ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
-if test "x$ac_cv_type_off_t" = xyes; then :
+if test "x$ac_cv_type_off_t" = xyes
+then :
 
-else
+else $as_nop
 
-cat >>confdefs.h <<_ACEOF
-#define off_t long int
-_ACEOF
+printf "%s\n" "#define off_t long int" >>confdefs.h
 
 fi
 
-ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-if test "x$ac_cv_type_pid_t" = xyes; then :
 
-else
+  ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default
+"
+if test "x$ac_cv_type_pid_t" = xyes
+then :
+
+else $as_nop
+                                          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+          #if defined _WIN64 && !defined __CYGWIN__
+          LLP64
+          #endif
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
 
-cat >>confdefs.h <<_ACEOF
-#define pid_t int
 _ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_pid_type='int'
+else $as_nop
+  ac_pid_type='__int64'
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+
+printf "%s\n" "#define pid_t $ac_pid_type" >>confdefs.h
+
 
 fi
 
 
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE void
-_ACEOF
+
+printf "%s\n" "#define RETSIGTYPE void" >>confdefs.h
 
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
+if test "x$ac_cv_type_size_t" = xyes
+then :
 
-else
+else $as_nop
 
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
+printf "%s\n" "#define size_t unsigned int" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
-$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
-if ${ac_cv_type_uid_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
+printf %s "checking for uid_t in sys/types.h... " >&6; }
+if test ${ac_cv_type_uid_t+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "uid_t" >/dev/null 2>&1; then :
+  $EGREP "uid_t" >/dev/null 2>&1
+then :
   ac_cv_type_uid_t=yes
-else
+else $as_nop
   ac_cv_type_uid_t=no
 fi
-rm -f conftest*
+rm -rf conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
-$as_echo "$ac_cv_type_uid_t" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
+printf "%s\n" "$ac_cv_type_uid_t" >&6; }
 if test $ac_cv_type_uid_t = no; then
 
-$as_echo "#define uid_t int" >>confdefs.h
+printf "%s\n" "#define uid_t int" >>confdefs.h
 
 
-$as_echo "#define gid_t int" >>confdefs.h
+printf "%s\n" "#define gid_t int" >>confdefs.h
 
 fi
 
 
 ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
-if test "x$ac_cv_type_ssize_t" = xyes; then :
+if test "x$ac_cv_type_ssize_t" = xyes
+then :
 
-$as_echo "#define HAVE_SSIZE_T 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SSIZE_T 1" >>confdefs.h
 
 fi
 
 ac_fn_c_check_type "$LINENO" "__uint128_t" "ac_cv_type___uint128_t" "$ac_includes_default"
-if test "x$ac_cv_type___uint128_t" = xyes; then :
+if test "x$ac_cv_type___uint128_t" = xyes
+then :
 
-$as_echo "#define HAVE_GCC_UINT128_T 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GCC_UINT128_T 1" >>confdefs.h
 
 fi
 
@@ -8660,17 +9680,19 @@ fi
 # 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 int" >&5
-$as_echo_n "checking size of int... " >&6; }
-if ${ac_cv_sizeof_int+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
-
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
+printf %s "checking size of int... " >&6; }
+if test ${ac_cv_sizeof_int+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"
+then :
+
+else $as_nop
   if test "$ac_cv_type_int" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (int)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -8679,31 +9701,31 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
-$as_echo "$ac_cv_sizeof_int" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
+printf "%s\n" "$ac_cv_sizeof_int" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT $ac_cv_sizeof_int
-_ACEOF
+printf "%s\n" "#define SIZEOF_INT $ac_cv_sizeof_int" >>confdefs.h
 
 
 # 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 long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if ${ac_cv_sizeof_long+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
-
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+printf %s "checking size of long... " >&6; }
+if test ${ac_cv_sizeof_long+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"
+then :
+
+else $as_nop
   if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -8712,33 +9734,30 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+printf "%s\n" "$ac_cv_sizeof_long" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
+printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h
 
 
 # The cast to long int works around a bug in the HP C Compiler,
 # see AC_CHECK_SIZEOF for more information.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of long" >&5
-$as_echo_n "checking alignment of long... " >&6; }
-if ${ac_cv_alignof_long+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking alignment of long" >&5
+printf %s "checking alignment of long... " >&6; }
+if test ${ac_cv_alignof_long+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_long"        "$ac_includes_default
-#ifndef offsetof
-# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
-#endif
-typedef struct { char x; long y; } ac__type_alignof_;"; then :
+typedef struct { char x; long y; } ac__type_alignof_;"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute alignment of long
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -8747,31 +9766,31 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_long" >&5
-$as_echo "$ac_cv_alignof_long" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_long" >&5
+printf "%s\n" "$ac_cv_alignof_long" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define ALIGNOF_LONG $ac_cv_alignof_long
-_ACEOF
+printf "%s\n" "#define ALIGNOF_LONG $ac_cv_alignof_long" >>confdefs.h
 
 
 # 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 long long" >&5
-$as_echo_n "checking size of long long... " >&6; }
-if ${ac_cv_sizeof_long_long+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
-
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
+printf %s "checking size of long long... " >&6; }
+if test ${ac_cv_sizeof_long_long+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"
+then :
+
+else $as_nop
   if test "$ac_cv_type_long_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long long)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -8780,31 +9799,31 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
-$as_echo "$ac_cv_sizeof_long_long" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
+printf "%s\n" "$ac_cv_sizeof_long_long" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
-_ACEOF
+printf "%s\n" "#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long" >>confdefs.h
 
 
 # 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 void *" >&5
-$as_echo_n "checking size of void *... " >&6; }
-if ${ac_cv_sizeof_void_p+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p"        "$ac_includes_default"; then :
-
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
+printf %s "checking size of void *... " >&6; }
+if test ${ac_cv_sizeof_void_p+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p"        "$ac_includes_default"
+then :
+
+else $as_nop
   if test "$ac_cv_type_void_p" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (void *)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -8813,31 +9832,31 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
-$as_echo "$ac_cv_sizeof_void_p" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
+printf "%s\n" "$ac_cv_sizeof_void_p" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
-_ACEOF
+printf "%s\n" "#define SIZEOF_VOID_P $ac_cv_sizeof_void_p" >>confdefs.h
 
 
 # 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 short" >&5
-$as_echo_n "checking size of short... " >&6; }
-if ${ac_cv_sizeof_short+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"; then :
-
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
+printf %s "checking size of short... " >&6; }
+if test ${ac_cv_sizeof_short+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"
+then :
+
+else $as_nop
   if test "$ac_cv_type_short" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (short)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -8846,31 +9865,31 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
-$as_echo "$ac_cv_sizeof_short" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
+printf "%s\n" "$ac_cv_sizeof_short" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SHORT $ac_cv_sizeof_short
-_ACEOF
+printf "%s\n" "#define SIZEOF_SHORT $ac_cv_sizeof_short" >>confdefs.h
 
 
 # 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 float" >&5
-$as_echo_n "checking size of float... " >&6; }
-if ${ac_cv_sizeof_float+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (float))" "ac_cv_sizeof_float"        "$ac_includes_default"; then :
-
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of float" >&5
+printf %s "checking size of float... " >&6; }
+if test ${ac_cv_sizeof_float+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (float))" "ac_cv_sizeof_float"        "$ac_includes_default"
+then :
+
+else $as_nop
   if test "$ac_cv_type_float" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (float)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -8879,31 +9898,31 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_float" >&5
-$as_echo "$ac_cv_sizeof_float" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_float" >&5
+printf "%s\n" "$ac_cv_sizeof_float" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_FLOAT $ac_cv_sizeof_float
-_ACEOF
+printf "%s\n" "#define SIZEOF_FLOAT $ac_cv_sizeof_float" >>confdefs.h
 
 
 # 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 double" >&5
-$as_echo_n "checking size of double... " >&6; }
-if ${ac_cv_sizeof_double+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (double))" "ac_cv_sizeof_double"        "$ac_includes_default"; then :
-
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of double" >&5
+printf %s "checking size of double... " >&6; }
+if test ${ac_cv_sizeof_double+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (double))" "ac_cv_sizeof_double"        "$ac_includes_default"
+then :
+
+else $as_nop
   if test "$ac_cv_type_double" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (double)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -8912,31 +9931,31 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_double" >&5
-$as_echo "$ac_cv_sizeof_double" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_double" >&5
+printf "%s\n" "$ac_cv_sizeof_double" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_DOUBLE $ac_cv_sizeof_double
-_ACEOF
+printf "%s\n" "#define SIZEOF_DOUBLE $ac_cv_sizeof_double" >>confdefs.h
 
 
 # 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 fpos_t" >&5
-$as_echo_n "checking size of fpos_t... " >&6; }
-if ${ac_cv_sizeof_fpos_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (fpos_t))" "ac_cv_sizeof_fpos_t"        "$ac_includes_default"; then :
-
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of fpos_t" >&5
+printf %s "checking size of fpos_t... " >&6; }
+if test ${ac_cv_sizeof_fpos_t+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (fpos_t))" "ac_cv_sizeof_fpos_t"        "$ac_includes_default"
+then :
+
+else $as_nop
   if test "$ac_cv_type_fpos_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (fpos_t)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -8945,31 +9964,31 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_fpos_t" >&5
-$as_echo "$ac_cv_sizeof_fpos_t" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_fpos_t" >&5
+printf "%s\n" "$ac_cv_sizeof_fpos_t" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_FPOS_T $ac_cv_sizeof_fpos_t
-_ACEOF
+printf "%s\n" "#define SIZEOF_FPOS_T $ac_cv_sizeof_fpos_t" >>confdefs.h
 
 
 # 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 size_t" >&5
-$as_echo_n "checking size of size_t... " >&6; }
-if ${ac_cv_sizeof_size_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t"        "$ac_includes_default"; then :
-
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
+printf %s "checking size of size_t... " >&6; }
+if test ${ac_cv_sizeof_size_t+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t"        "$ac_includes_default"
+then :
+
+else $as_nop
   if test "$ac_cv_type_size_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (size_t)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -8978,33 +9997,30 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
-$as_echo "$ac_cv_sizeof_size_t" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
+printf "%s\n" "$ac_cv_sizeof_size_t" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
-_ACEOF
+printf "%s\n" "#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t" >>confdefs.h
 
 
 # The cast to long int works around a bug in the HP C Compiler,
 # see AC_CHECK_SIZEOF for more information.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of size_t" >&5
-$as_echo_n "checking alignment of size_t... " >&6; }
-if ${ac_cv_alignof_size_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking alignment of size_t" >&5
+printf %s "checking alignment of size_t... " >&6; }
+if test ${ac_cv_alignof_size_t+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_size_t"        "$ac_includes_default
-#ifndef offsetof
-# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
-#endif
-typedef struct { char x; size_t y; } ac__type_alignof_;"; then :
+typedef struct { char x; size_t y; } ac__type_alignof_;"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_size_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute alignment of size_t
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -9013,31 +10029,31 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_size_t" >&5
-$as_echo "$ac_cv_alignof_size_t" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_size_t" >&5
+printf "%s\n" "$ac_cv_alignof_size_t" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define ALIGNOF_SIZE_T $ac_cv_alignof_size_t
-_ACEOF
+printf "%s\n" "#define ALIGNOF_SIZE_T $ac_cv_alignof_size_t" >>confdefs.h
 
 
 # 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 pid_t" >&5
-$as_echo_n "checking size of pid_t... " >&6; }
-if ${ac_cv_sizeof_pid_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (pid_t))" "ac_cv_sizeof_pid_t"        "$ac_includes_default"; then :
-
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of pid_t" >&5
+printf %s "checking size of pid_t... " >&6; }
+if test ${ac_cv_sizeof_pid_t+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (pid_t))" "ac_cv_sizeof_pid_t"        "$ac_includes_default"
+then :
+
+else $as_nop
   if test "$ac_cv_type_pid_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (pid_t)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -9046,31 +10062,31 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_pid_t" >&5
-$as_echo "$ac_cv_sizeof_pid_t" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_pid_t" >&5
+printf "%s\n" "$ac_cv_sizeof_pid_t" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_PID_T $ac_cv_sizeof_pid_t
-_ACEOF
+printf "%s\n" "#define SIZEOF_PID_T $ac_cv_sizeof_pid_t" >>confdefs.h
 
 
 # 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 uintptr_t" >&5
-$as_echo_n "checking size of uintptr_t... " >&6; }
-if ${ac_cv_sizeof_uintptr_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uintptr_t))" "ac_cv_sizeof_uintptr_t"        "$ac_includes_default"; then :
-
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of uintptr_t" >&5
+printf %s "checking size of uintptr_t... " >&6; }
+if test ${ac_cv_sizeof_uintptr_t+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uintptr_t))" "ac_cv_sizeof_uintptr_t"        "$ac_includes_default"
+then :
+
+else $as_nop
   if test "$ac_cv_type_uintptr_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (uintptr_t)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -9079,23 +10095,22 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uintptr_t" >&5
-$as_echo "$ac_cv_sizeof_uintptr_t" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uintptr_t" >&5
+printf "%s\n" "$ac_cv_sizeof_uintptr_t" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UINTPTR_T $ac_cv_sizeof_uintptr_t
-_ACEOF
+printf "%s\n" "#define SIZEOF_UINTPTR_T $ac_cv_sizeof_uintptr_t" >>confdefs.h
 
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long double" >&5
-$as_echo_n "checking for long double... " >&6; }
-if ${ac_cv_type_long_double+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for long double" >&5
+printf %s "checking for long double... " >&6; }
+if test ${ac_cv_type_long_double+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test "$GCC" = yes; then
        ac_cv_type_long_double=yes
      else
@@ -9105,7 +10120,7 @@ else
 		 not support it.  */
 	      long double foo = 0.0L;
 int
-main ()
+main (void)
 {
 static int test_array [1 - 2 * !(/* On Ultrix 4.3 cc, long double is 4 and double is 8.  */
 	      sizeof (double) <= sizeof (long double))];
@@ -9116,19 +10131,20 @@ return test_array [0];
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_type_long_double=yes
-else
+else $as_nop
   ac_cv_type_long_double=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_double" >&5
-$as_echo "$ac_cv_type_long_double" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_double" >&5
+printf "%s\n" "$ac_cv_type_long_double" >&6; }
   if test $ac_cv_type_long_double = yes; then
 
-$as_echo "#define HAVE_LONG_DOUBLE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LONG_DOUBLE 1" >>confdefs.h
 
   fi
 
@@ -9136,17 +10152,19 @@ $as_echo "#define HAVE_LONG_DOUBLE 1" >>confdefs.h
 # 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 long double" >&5
-$as_echo_n "checking size of long double... " >&6; }
-if ${ac_cv_sizeof_long_double+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long double))" "ac_cv_sizeof_long_double"        "$ac_includes_default"; then :
-
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long double" >&5
+printf %s "checking size of long double... " >&6; }
+if test ${ac_cv_sizeof_long_double+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long double))" "ac_cv_sizeof_long_double"        "$ac_includes_default"
+then :
+
+else $as_nop
   if test "$ac_cv_type_long_double" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long double)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -9155,14 +10173,12 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_double" >&5
-$as_echo "$ac_cv_sizeof_long_double" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_double" >&5
+printf "%s\n" "$ac_cv_sizeof_long_double" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG_DOUBLE $ac_cv_sizeof_long_double
-_ACEOF
+printf "%s\n" "#define SIZEOF_LONG_DOUBLE $ac_cv_sizeof_long_double" >>confdefs.h
 
 
 
@@ -9170,17 +10186,19 @@ _ACEOF
 # 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 _Bool" >&5
-$as_echo_n "checking size of _Bool... " >&6; }
-if ${ac_cv_sizeof__Bool+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (_Bool))" "ac_cv_sizeof__Bool"        "$ac_includes_default"; then :
-
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of _Bool" >&5
+printf %s "checking size of _Bool... " >&6; }
+if test ${ac_cv_sizeof__Bool+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (_Bool))" "ac_cv_sizeof__Bool"        "$ac_includes_default"
+then :
+
+else $as_nop
   if test "$ac_cv_type__Bool" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (_Bool)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -9189,14 +10207,12 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof__Bool" >&5
-$as_echo "$ac_cv_sizeof__Bool" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof__Bool" >&5
+printf "%s\n" "$ac_cv_sizeof__Bool" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF__BOOL $ac_cv_sizeof__Bool
-_ACEOF
+printf "%s\n" "#define SIZEOF__BOOL $ac_cv_sizeof__Bool" >>confdefs.h
 
 
 
@@ -9204,22 +10220,24 @@ _ACEOF
 # 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 off_t" >&5
-$as_echo_n "checking size of off_t... " >&6; }
-if ${ac_cv_sizeof_off_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5
+printf %s "checking size of off_t... " >&6; }
+if test ${ac_cv_sizeof_off_t+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t"        "
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 
-"; then :
+"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_off_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (off_t)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -9228,40 +10246,39 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5
-$as_echo "$ac_cv_sizeof_off_t" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5
+printf "%s\n" "$ac_cv_sizeof_off_t" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_OFF_T $ac_cv_sizeof_off_t
-_ACEOF
+printf "%s\n" "#define SIZEOF_OFF_T $ac_cv_sizeof_off_t" >>confdefs.h
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable large file support" >&5
-$as_echo_n "checking whether to enable large file support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable large file support" >&5
+printf %s "checking whether to enable large file support... " >&6; }
 if test "$ac_cv_sizeof_off_t" -gt "$ac_cv_sizeof_long" -a \
 	"$ac_cv_sizeof_long_long" -ge "$ac_cv_sizeof_off_t"; then
 
-$as_echo "#define HAVE_LARGEFILE_SUPPORT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LARGEFILE_SUPPORT 1" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 # 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 time_t" >&5
-$as_echo_n "checking size of time_t... " >&6; }
-if ${ac_cv_sizeof_time_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5
+printf %s "checking size of time_t... " >&6; }
+if test ${ac_cv_sizeof_time_t+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (time_t))" "ac_cv_sizeof_time_t"        "
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -9270,12 +10287,13 @@ else
 #include <time.h>
 #endif
 
-"; then :
+"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_time_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (time_t)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -9284,14 +10302,12 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_time_t" >&5
-$as_echo "$ac_cv_sizeof_time_t" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_time_t" >&5
+printf "%s\n" "$ac_cv_sizeof_time_t" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_TIME_T $ac_cv_sizeof_time_t
-_ACEOF
+printf "%s\n" "#define SIZEOF_TIME_T $ac_cv_sizeof_time_t" >>confdefs.h
 
 
 
@@ -9305,15 +10321,15 @@ elif test "$ac_cv_pthread" = "yes"
 then CC="$CC -pthread"
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_t" >&5
-$as_echo_n "checking for pthread_t... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_t" >&5
+printf %s "checking for pthread_t... " >&6; }
 have_pthread_t=no
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
   #include <pthread.h>
 int
-main ()
+main (void)
 {
 pthread_t x; x = *(pthread_t*)0;
   ;
@@ -9321,33 +10337,36 @@ pthread_t x; x = *(pthread_t*)0;
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   have_pthread_t=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_pthread_t" >&5
-$as_echo "$have_pthread_t" >&6; }
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_pthread_t" >&5
+printf "%s\n" "$have_pthread_t" >&6; }
 if test "$have_pthread_t" = yes ; then
   # 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_t" >&5
-$as_echo_n "checking size of pthread_t... " >&6; }
-if ${ac_cv_sizeof_pthread_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of pthread_t" >&5
+printf %s "checking size of pthread_t... " >&6; }
+if test ${ac_cv_sizeof_pthread_t+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (pthread_t))" "ac_cv_sizeof_pthread_t"        "
 #ifdef HAVE_PTHREAD_H
 #include <pthread.h>
 #endif
 
-"; then :
+"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_pthread_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (pthread_t)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -9356,14 +10375,12 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_pthread_t" >&5
-$as_echo "$ac_cv_sizeof_pthread_t" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_pthread_t" >&5
+printf "%s\n" "$ac_cv_sizeof_pthread_t" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_PTHREAD_T $ac_cv_sizeof_pthread_t
-_ACEOF
+printf "%s\n" "#define SIZEOF_PTHREAD_T $ac_cv_sizeof_pthread_t" >>confdefs.h
 
 
 fi
@@ -9374,18 +10391,20 @@ fi
 # 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
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of pthread_key_t" >&5
+printf %s "checking size of pthread_key_t... " >&6; }
+if test ${ac_cv_sizeof_pthread_key_t+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (pthread_key_t))" "ac_cv_sizeof_pthread_key_t"        "#include <pthread.h>
-"; then :
+"
+then :
 
-else
+else $as_nop
   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;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$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
@@ -9394,47 +10413,46 @@ See \`config.log' for more details" "$LINENO" 5; }
 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; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_pthread_key_t" >&5
+printf "%s\n" "$ac_cv_sizeof_pthread_key_t" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_PTHREAD_KEY_T $ac_cv_sizeof_pthread_key_t
-_ACEOF
+printf "%s\n" "#define SIZEOF_PTHREAD_KEY_T $ac_cv_sizeof_pthread_key_t" >>confdefs.h
 
 
-{ $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; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pthread_key_t is compatible with int" >&5
+printf %s "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 ()
+main (void)
 {
 pthread_key_t k; k * 1;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_pthread_key_t_is_arithmetic_type=yes
-else
+else $as_nop
   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; }
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pthread_key_t_is_arithmetic_type" >&5
+printf "%s\n" "$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
+printf "%s\n" "#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; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 CC="$ac_save_cc"
 
@@ -9468,9 +10486,10 @@ case $ac_sys_system/$ac_sys_release in
         else
             LIBTOOL_CRUFT=""
     fi
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
   ac_osx_32bit=yes
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -9485,9 +10504,10 @@ else
     }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_osx_32bit=yes
-else
+else $as_nop
   ac_osx_32bit=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -9529,40 +10549,40 @@ fi
     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-framework" >&5
-$as_echo_n "checking for --enable-framework... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --enable-framework" >&5
+printf %s "checking for --enable-framework... " >&6; }
 if test "$enable_framework"
 then
 	BASECFLAGS="$BASECFLAGS -fno-common -dynamic"
 	# -F. is needed to allow linking to the framework while
 	# in the build location.
 
-$as_echo "#define WITH_NEXT_FRAMEWORK 1" >>confdefs.h
+printf "%s\n" "#define WITH_NEXT_FRAMEWORK 1" >>confdefs.h
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	if test $enable_shared = "yes"
 	then
 		as_fn_error $? "Specifying both --enable-shared and --enable-framework is not supported, use only --enable-framework instead" "$LINENO" 5
 	fi
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dyld" >&5
-$as_echo_n "checking for dyld... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dyld" >&5
+printf %s "checking for dyld... " >&6; }
 case $ac_sys_system/$ac_sys_release in
   Darwin/*)
 
-$as_echo "#define WITH_DYLD 1" >>confdefs.h
+printf "%s\n" "#define WITH_DYLD 1" >>confdefs.h
 
-  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: always on for Darwin" >&5
-$as_echo "always on for Darwin" >&6; }
+  	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: always on for Darwin" >&5
+printf "%s\n" "always on for Darwin" >&6; }
   	;;
   *)
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 	;;
 esac
 
@@ -9576,8 +10596,8 @@ esac
 
 # SHLIB_SUFFIX is the extension of shared libraries `(including the dot!)
 # -- usually .so, .sl on HP-UX, .dll on Cygwin
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the extension of shared libraries" >&5
-$as_echo_n "checking the extension of shared libraries... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the extension of shared libraries" >&5
+printf %s "checking the extension of shared libraries... " >&6; }
 if test -z "$SHLIB_SUFFIX"; then
 	case $ac_sys_system in
 	hp*|HP*)
@@ -9590,15 +10610,15 @@ if test -z "$SHLIB_SUFFIX"; then
 	*)	   SHLIB_SUFFIX=.so;;
 	esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHLIB_SUFFIX" >&5
-$as_echo "$SHLIB_SUFFIX" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SHLIB_SUFFIX" >&5
+printf "%s\n" "$SHLIB_SUFFIX" >&6; }
 
 # LDSHARED is the ld *command* used to create shared library
 # -- "cc -G" on SunOS 5.x.
 # (Shared libraries in this instance are shared modules to be loaded into
 # Python, as opposed to building Python itself as a shared library.)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking LDSHARED" >&5
-$as_echo_n "checking LDSHARED... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LDSHARED" >&5
+printf %s "checking LDSHARED... " >&6; }
 if test -z "$LDSHARED"
 then
 	case $ac_sys_system/$ac_sys_release in
@@ -9716,14 +10736,14 @@ then
 	*)	LDSHARED="ld";;
 	esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LDSHARED" >&5
-$as_echo "$LDSHARED" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LDSHARED" >&5
+printf "%s\n" "$LDSHARED" >&6; }
 LDCXXSHARED=${LDCXXSHARED-$LDSHARED}
 BLDSHARED=${BLDSHARED-$LDSHARED}
 # CCSHARED are the C *flags* used to create objects to go into a shared
 # library (module) -- this is only needed for a few systems
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CCSHARED" >&5
-$as_echo_n "checking CCSHARED... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking CCSHARED" >&5
+printf %s "checking CCSHARED... " >&6; }
 if test -z "$CCSHARED"
 then
 	case $ac_sys_system/$ac_sys_release in
@@ -9754,12 +10774,12 @@ then
 		CCSHARED="-fpic -D__SO_PICABILINUX__  -ftls-model=global-dynamic"
 	esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CCSHARED" >&5
-$as_echo "$CCSHARED" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CCSHARED" >&5
+printf "%s\n" "$CCSHARED" >&6; }
 # LINKFORSHARED are the flags passed to the $(CC) command that links
 # the python executable -- this is only needed for a few systems
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking LINKFORSHARED" >&5
-$as_echo_n "checking LINKFORSHARED... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LINKFORSHARED" >&5
+printf %s "checking LINKFORSHARED... " >&6; }
 if test -z "$LINKFORSHARED"
 then
 	case $ac_sys_system/$ac_sys_release in
@@ -9816,13 +10836,13 @@ then
 		LINKFORSHARED='-Wl,-export-dynamic';;
 	esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINKFORSHARED" >&5
-$as_echo "$LINKFORSHARED" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LINKFORSHARED" >&5
+printf "%s\n" "$LINKFORSHARED" >&6; }
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGSFORSHARED" >&5
-$as_echo_n "checking CFLAGSFORSHARED... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking CFLAGSFORSHARED" >&5
+printf %s "checking CFLAGSFORSHARED... " >&6; }
 if test ! "$LIBRARY" = "$LDLIBRARY"
 then
 	case $ac_sys_system in
@@ -9834,8 +10854,8 @@ then
 		CFLAGSFORSHARED='$(CCSHARED)'
 	esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CFLAGSFORSHARED" >&5
-$as_echo "$CFLAGSFORSHARED" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CFLAGSFORSHARED" >&5
+printf "%s\n" "$CFLAGSFORSHARED" >&6; }
 
 # SHLIBS are libraries (except -lc and -lm) to link to the python shared
 # library (with --enable-shared).
@@ -9846,22 +10866,23 @@ $as_echo "$CFLAGSFORSHARED" >&6; }
 # don't need to link LIBS explicitly. The default should be only changed
 # on systems where this approach causes problems.
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking SHLIBS" >&5
-$as_echo_n "checking SHLIBS... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking SHLIBS" >&5
+printf %s "checking SHLIBS... " >&6; }
 case "$ac_sys_system" in
 	*)
 		SHLIBS='$(LIBS)';;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHLIBS" >&5
-$as_echo "$SHLIBS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SHLIBS" >&5
+printf "%s\n" "$SHLIBS" >&6; }
 
 
 # checks for libraries
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sendfile in -lsendfile" >&5
-$as_echo_n "checking for sendfile in -lsendfile... " >&6; }
-if ${ac_cv_lib_sendfile_sendfile+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sendfile in -lsendfile" >&5
+printf %s "checking for sendfile in -lsendfile... " >&6; }
+if test ${ac_cv_lib_sendfile_sendfile+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsendfile  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9870,43 +10891,41 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char sendfile ();
 int
-main ()
+main (void)
 {
 return sendfile ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_sendfile_sendfile=yes
-else
+else $as_nop
   ac_cv_lib_sendfile_sendfile=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sendfile_sendfile" >&5
-$as_echo "$ac_cv_lib_sendfile_sendfile" >&6; }
-if test "x$ac_cv_lib_sendfile_sendfile" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSENDFILE 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sendfile_sendfile" >&5
+printf "%s\n" "$ac_cv_lib_sendfile_sendfile" >&6; }
+if test "x$ac_cv_lib_sendfile_sendfile" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBSENDFILE 1" >>confdefs.h
 
   LIBS="-lsendfile $LIBS"
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+printf %s "checking for dlopen in -ldl... " >&6; }
+if test ${ac_cv_lib_dl_dlopen+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9915,43 +10934,41 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dlopen ();
 int
-main ()
+main (void)
 {
 return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_dl_dlopen=yes
-else
+else $as_nop
   ac_cv_lib_dl_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBDL 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBDL 1" >>confdefs.h
 
   LIBS="-ldl $LIBS"
 
 fi
 	# Dynamic linking for SunOS/Solaris and SYSV
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if ${ac_cv_lib_dld_shl_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+printf %s "checking for shl_load in -ldld... " >&6; }
+if test ${ac_cv_lib_dld_shl_load+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9960,33 +10977,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char shl_load ();
 int
-main ()
+main (void)
 {
 return shl_load ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_dld_shl_load=yes
-else
+else $as_nop
   ac_cv_lib_dld_shl_load=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBDLD 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBDLD 1" >>confdefs.h
 
   LIBS="-ldld $LIBS"
 
@@ -9994,27 +11008,27 @@ fi
 	# Dynamic linking for HP-UX
 
 # checks for uuid.h location
-for ac_header in uuid/uuid.h uuid.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
+if test "x$ac_cv_header_uuid_uuid_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_UUID_UUID_H 1" >>confdefs.h
 
 fi
+ac_fn_c_check_header_compile "$LINENO" "uuid.h" "ac_cv_header_uuid_h" "$ac_includes_default"
+if test "x$ac_cv_header_uuid_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_UUID_H 1" >>confdefs.h
 
-done
+fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_time_safe" >&5
-$as_echo_n "checking for uuid_generate_time_safe... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_time_safe" >&5
+printf %s "checking for uuid_generate_time_safe... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <uuid/uuid.h>
 int
-main ()
+main (void)
 {
 
 #ifndef uuid_generate_time_safe
@@ -10025,28 +11039,29 @@ void *x = uuid_generate_time_safe
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_UUID_GENERATE_TIME_SAFE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_UUID_GENERATE_TIME_SAFE 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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 # AIX provides support for RFC4122 (uuid) in libc.a starting with AIX 6.1 (anno 2007)
 # FreeBSD and OpenBSD provides support as well
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_create" >&5
-$as_echo_n "checking for uuid_create... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uuid_create" >&5
+printf %s "checking for uuid_create... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <uuid.h>
 int
-main ()
+main (void)
 {
 
 #ifndef uuid_create
@@ -10057,28 +11072,29 @@ void *x = uuid_create
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_UUID_CREATE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_UUID_CREATE 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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 # Little-endian FreeBSD, OpenBSD and NetBSD needs encoding into an octet
 # stream in big-endian byte-order
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_enc_be" >&5
-$as_echo_n "checking for uuid_enc_be... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uuid_enc_be" >&5
+printf %s "checking for uuid_enc_be... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <uuid.h>
 int
-main ()
+main (void)
 {
 
 #ifndef uuid_enc_be
@@ -10089,27 +11105,29 @@ void *x = uuid_enc_be
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_UUID_ENC_BE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_UUID_ENC_BE 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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 # 'Real Time' functions on Solaris
 # posix4 on Solaris 2.6
 # pthread (first!) on Linux
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sem_init" >&5
-$as_echo_n "checking for library containing sem_init... " >&6; }
-if ${ac_cv_search_sem_init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing sem_init" >&5
+printf %s "checking for library containing sem_init... " >&6; }
+if test ${ac_cv_search_sem_init+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -10117,57 +11135,60 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char sem_init ();
 int
-main ()
+main (void)
 {
 return sem_init ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' pthread rt posix4; do
+for ac_lib in '' pthread rt posix4
+do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  if ac_fn_c_try_link "$LINENO"; then :
+  if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_search_sem_init=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext
-  if ${ac_cv_search_sem_init+:} false; then :
+  if test ${ac_cv_search_sem_init+y}
+then :
   break
 fi
 done
-if ${ac_cv_search_sem_init+:} false; then :
+if test ${ac_cv_search_sem_init+y}
+then :
 
-else
+else $as_nop
   ac_cv_search_sem_init=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sem_init" >&5
-$as_echo "$ac_cv_search_sem_init" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sem_init" >&5
+printf "%s\n" "$ac_cv_search_sem_init" >&6; }
 ac_res=$ac_cv_search_sem_init
-if test "$ac_res" != no; then :
+if test "$ac_res" != no
+then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 
 # check if we need libintl for locale functions
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for textdomain in -lintl" >&5
-$as_echo_n "checking for textdomain in -lintl... " >&6; }
-if ${ac_cv_lib_intl_textdomain+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for textdomain in -lintl" >&5
+printf %s "checking for textdomain in -lintl... " >&6; }
+if test ${ac_cv_lib_intl_textdomain+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10176,32 +11197,31 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char textdomain ();
 int
-main ()
+main (void)
 {
 return textdomain ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_intl_textdomain=yes
-else
+else $as_nop
   ac_cv_lib_intl_textdomain=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_textdomain" >&5
-$as_echo "$ac_cv_lib_intl_textdomain" >&6; }
-if test "x$ac_cv_lib_intl_textdomain" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_textdomain" >&5
+printf "%s\n" "$ac_cv_lib_intl_textdomain" >&6; }
+if test "x$ac_cv_lib_intl_textdomain" = xyes
+then :
 
-$as_echo "#define WITH_LIBINTL 1" >>confdefs.h
+printf "%s\n" "#define WITH_LIBINTL 1" >>confdefs.h
 
         LIBS="-lintl $LIBS"
 fi
@@ -10209,14 +11229,14 @@ fi
 
 # checks for system dependent C++ extensions support
 case "$ac_sys_system" in
-	AIX*)	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for genuine AIX C++ extensions support" >&5
-$as_echo_n "checking for genuine AIX C++ extensions support... " >&6; }
+	AIX*)	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for genuine AIX C++ extensions support" >&5
+printf %s "checking for genuine AIX C++ extensions support... " >&6; }
 		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 		  #include <load.h>
 int
-main ()
+main (void)
 {
 loadAndInit("", 0, "")
   ;
@@ -10224,48 +11244,49 @@ loadAndInit("", 0, "")
 }
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
 
-$as_echo "#define AIX_GENUINE_CPLUSPLUS 1" >>confdefs.h
+printf "%s\n" "#define AIX_GENUINE_CPLUSPLUS 1" >>confdefs.h
 
-		  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+		  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
-		  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+		  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 # BUILD_GNU_TYPE + AIX_BUILDDATE are used to construct the platform_tag
 # of the AIX system used to build/package Python executable. This tag serves
 # as a baseline for bdist module packages
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the system builddate" >&5
-$as_echo_n "checking for the system builddate... " >&6; }
+               { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the system builddate" >&5
+printf %s "checking for the system builddate... " >&6; }
                AIX_BUILDDATE=$(lslpp -Lcq bos.mp64 | awk -F:  '{ print $NF }')
 
-cat >>confdefs.h <<_ACEOF
-#define AIX_BUILDDATE $AIX_BUILDDATE
-_ACEOF
+printf "%s\n" "#define AIX_BUILDDATE $AIX_BUILDDATE" >>confdefs.h
 
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AIX_BUILDDATE" >&5
-$as_echo "$AIX_BUILDDATE" >&6; }
+               { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AIX_BUILDDATE" >&5
+printf "%s\n" "$AIX_BUILDDATE" >&6; }
                ;;
 	*) ;;
 esac
 
 # check for systems that require aligned memory access
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking aligned memory access is required" >&5
-$as_echo_n "checking aligned memory access is required... " >&6; }
-if ${ac_cv_aligned_required+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking aligned memory access is required" >&5
+printf %s "checking aligned memory access is required... " >&6; }
+if test ${ac_cv_aligned_required+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
   ac_cv_aligned_required=yes
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -10282,9 +11303,10 @@ int main()
     return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_aligned_required=no
-else
+else $as_nop
   ac_cv_aligned_required=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -10294,32 +11316,33 @@ fi
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_aligned_required" >&5
-$as_echo "$ac_cv_aligned_required" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_aligned_required" >&5
+printf "%s\n" "$ac_cv_aligned_required" >&6; }
 if test "$ac_cv_aligned_required" = yes ; then
 
-$as_echo "#define HAVE_ALIGNED_REQUIRED 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ALIGNED_REQUIRED 1" >>confdefs.h
 
 fi
 
 # str, bytes and memoryview hash algorithm
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-hash-algorithm" >&5
-$as_echo_n "checking for --with-hash-algorithm... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-hash-algorithm" >&5
+printf %s "checking for --with-hash-algorithm... " >&6; }
 
 # Check whether --with-hash_algorithm was given.
-if test "${with_hash_algorithm+set}" = set; then :
+if test ${with_hash_algorithm+y}
+then :
   withval=$with_hash_algorithm;
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5
-$as_echo "$withval" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $withval" >&5
+printf "%s\n" "$withval" >&6; }
 case "$withval" in
     siphash24)
-        $as_echo "#define Py_HASH_ALGORITHM 1" >>confdefs.h
+        printf "%s\n" "#define Py_HASH_ALGORITHM 1" >>confdefs.h
 
         ;;
     fnv)
-        $as_echo "#define Py_HASH_ALGORITHM 2" >>confdefs.h
+        printf "%s\n" "#define Py_HASH_ALGORITHM 2" >>confdefs.h
 
         ;;
     *)
@@ -10327,9 +11350,9 @@ case "$withval" in
         ;;
 esac
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: default" >&5
-$as_echo "default" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: default" >&5
+printf "%s\n" "default" >&6; }
 fi
 
 
@@ -10348,11 +11371,12 @@ validate_tzpath() {
 }
 
 TZPATH="/usr/share/zoneinfo:/usr/lib/zoneinfo:/usr/share/lib/zoneinfo:/etc/zoneinfo"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-tzpath" >&5
-$as_echo_n "checking for --with-tzpath... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-tzpath" >&5
+printf %s "checking for --with-tzpath... " >&6; }
 
 # Check whether --with-tzpath was given.
-if test "${with_tzpath+set}" = set; then :
+if test ${with_tzpath+y}
+then :
   withval=$with_tzpath;
 case "$withval" in
     yes)
@@ -10361,80 +11385,84 @@ case "$withval" in
     *)
         validate_tzpath "$withval"
         TZPATH="$withval"
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$withval\"" >&5
-$as_echo "\"$withval\"" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$withval\"" >&5
+printf "%s\n" "\"$withval\"" >&6; }
         ;;
 esac
 
-else
+else $as_nop
   validate_tzpath "$TZPATH"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$TZPATH\"" >&5
-$as_echo "\"$TZPATH\"" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$TZPATH\"" >&5
+printf "%s\n" "\"$TZPATH\"" >&6; }
 fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-address-sanitizer" >&5
-$as_echo_n "checking for --with-address-sanitizer... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-address-sanitizer" >&5
+printf %s "checking for --with-address-sanitizer... " >&6; }
 
 # Check whether --with-address_sanitizer was given.
-if test "${with_address_sanitizer+set}" = set; then :
+if test ${with_address_sanitizer+y}
+then :
   withval=$with_address_sanitizer;
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5
-$as_echo "$withval" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $withval" >&5
+printf "%s\n" "$withval" >&6; }
 BASECFLAGS="-fsanitize=address -fno-omit-frame-pointer $BASECFLAGS"
 LDFLAGS="-fsanitize=address $LDFLAGS"
 # ASan works by controlling memory allocation, our own malloc interferes.
 with_pymalloc="no"
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-memory-sanitizer" >&5
-$as_echo_n "checking for --with-memory-sanitizer... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-memory-sanitizer" >&5
+printf %s "checking for --with-memory-sanitizer... " >&6; }
 
 # Check whether --with-memory_sanitizer was given.
-if test "${with_memory_sanitizer+set}" = set; then :
+if test ${with_memory_sanitizer+y}
+then :
   withval=$with_memory_sanitizer;
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5
-$as_echo "$withval" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $withval" >&5
+printf "%s\n" "$withval" >&6; }
 BASECFLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer $BASECFLAGS"
 LDFLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2 $LDFLAGS"
 # MSan works by controlling memory allocation, our own malloc interferes.
 with_pymalloc="no"
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-undefined-behavior-sanitizer" >&5
-$as_echo_n "checking for --with-undefined-behavior-sanitizer... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-undefined-behavior-sanitizer" >&5
+printf %s "checking for --with-undefined-behavior-sanitizer... " >&6; }
 
 # Check whether --with-undefined_behavior_sanitizer was given.
-if test "${with_undefined_behavior_sanitizer+set}" = set; then :
+if test ${with_undefined_behavior_sanitizer+y}
+then :
   withval=$with_undefined_behavior_sanitizer;
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5
-$as_echo "$withval" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $withval" >&5
+printf "%s\n" "$withval" >&6; }
 BASECFLAGS="-fsanitize=undefined $BASECFLAGS"
 LDFLAGS="-fsanitize=undefined $LDFLAGS"
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Most SVR4 platforms (e.g. Solaris) need -lsocket and -lnsl.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for t_open in -lnsl" >&5
-$as_echo_n "checking for t_open in -lnsl... " >&6; }
-if ${ac_cv_lib_nsl_t_open+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for t_open in -lnsl" >&5
+printf %s "checking for t_open in -lnsl... " >&6; }
+if test ${ac_cv_lib_nsl_t_open+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10443,38 +11471,38 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char t_open ();
 int
-main ()
+main (void)
 {
 return t_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_nsl_t_open=yes
-else
+else $as_nop
   ac_cv_lib_nsl_t_open=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_t_open" >&5
-$as_echo "$ac_cv_lib_nsl_t_open" >&6; }
-if test "x$ac_cv_lib_nsl_t_open" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_t_open" >&5
+printf "%s\n" "$ac_cv_lib_nsl_t_open" >&6; }
+if test "x$ac_cv_lib_nsl_t_open" = xyes
+then :
   LIBS="-lnsl $LIBS"
 fi
  # SVR4
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
-$as_echo_n "checking for socket in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_socket+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
+printf %s "checking for socket in -lsocket... " >&6; }
+if test ${ac_cv_lib_socket_socket+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $LIBS $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10483,73 +11511,75 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char socket ();
 int
-main ()
+main (void)
 {
 return socket ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_socket_socket=yes
-else
+else $as_nop
   ac_cv_lib_socket_socket=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
-$as_echo "$ac_cv_lib_socket_socket" >&6; }
-if test "x$ac_cv_lib_socket_socket" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
+printf "%s\n" "$ac_cv_lib_socket_socket" >&6; }
+if test "x$ac_cv_lib_socket_socket" = xyes
+then :
   LIBS="-lsocket $LIBS"
 fi
  # SVR4 sockets
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-libs" >&5
-$as_echo_n "checking for --with-libs... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-libs" >&5
+printf %s "checking for --with-libs... " >&6; }
 
 # Check whether --with-libs was given.
-if test "${with_libs+set}" = set; then :
+if test ${with_libs+y}
+then :
   withval=$with_libs;
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5
-$as_echo "$withval" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $withval" >&5
+printf "%s\n" "$withval" >&6; }
 LIBS="$withval $LIBS"
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 PKG_PROG_PKG_CONFIG
 
 # Check for use of the system expat library
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-system-expat" >&5
-$as_echo_n "checking for --with-system-expat... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-system-expat" >&5
+printf %s "checking for --with-system-expat... " >&6; }
 
 # Check whether --with-system_expat was given.
-if test "${with_system_expat+set}" = set; then :
+if test ${with_system_expat+y}
+then :
   withval=$with_system_expat;
-else
+else $as_nop
   with_system_expat="no"
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_system_expat" >&5
-$as_echo "$with_system_expat" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_system_expat" >&5
+printf "%s\n" "$with_system_expat" >&6; }
 
 # Check for use of the system libffi library
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-system-ffi" >&5
-$as_echo_n "checking for --with-system-ffi... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-system-ffi" >&5
+printf %s "checking for --with-system-ffi... " >&6; }
 
 # Check whether --with-system_ffi was given.
-if test "${with_system_ffi+set}" = set; then :
+if test ${with_system_ffi+y}
+then :
   withval=$with_system_ffi;
 fi
 
@@ -10566,15 +11596,15 @@ then
             as_fn_error $? "--with-system-ffi accepts no arguments" "$LINENO" 5
             ;;
     esac
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_system_ffi" >&5
-$as_echo "$with_system_ffi" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_system_ffi" >&5
+printf "%s\n" "$with_system_ffi" >&6; }
 else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
     if test "$with_system_ffi" != ""
     then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with(out)-system-ffi is ignored on this platform" >&5
-$as_echo "$as_me: WARNING: --with(out)-system-ffi is ignored on this platform" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: --with(out)-system-ffi is ignored on this platform" >&5
+printf "%s\n" "$as_me: WARNING: --with(out)-system-ffi is ignored on this platform" >&2;}
     fi
     with_system_ffi="yes"
 fi
@@ -10587,28 +11617,30 @@ fi
 
 
 # Check for use of the system libmpdec library
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-system-libmpdec" >&5
-$as_echo_n "checking for --with-system-libmpdec... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-system-libmpdec" >&5
+printf %s "checking for --with-system-libmpdec... " >&6; }
 
 # Check whether --with-system_libmpdec was given.
-if test "${with_system_libmpdec+set}" = set; then :
+if test ${with_system_libmpdec+y}
+then :
   withval=$with_system_libmpdec;
-else
+else $as_nop
   with_system_libmpdec="no"
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_system_libmpdec" >&5
-$as_echo "$with_system_libmpdec" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_system_libmpdec" >&5
+printf "%s\n" "$with_system_libmpdec" >&6; }
 
 # Check whether _decimal should use a coroutine-local or thread-local context
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-decimal-contextvar" >&5
-$as_echo_n "checking for --with-decimal-contextvar... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-decimal-contextvar" >&5
+printf %s "checking for --with-decimal-contextvar... " >&6; }
 
 # Check whether --with-decimal_contextvar was given.
-if test "${with_decimal_contextvar+set}" = set; then :
+if test ${with_decimal_contextvar+y}
+then :
   withval=$with_decimal_contextvar;
-else
+else $as_nop
   with_decimal_contextvar="yes"
 fi
 
@@ -10616,54 +11648,57 @@ fi
 if test "$with_decimal_contextvar" != "no"
 then
 
-$as_echo "#define WITH_DECIMAL_CONTEXTVAR 1" >>confdefs.h
+printf "%s\n" "#define WITH_DECIMAL_CONTEXTVAR 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_decimal_contextvar" >&5
-$as_echo "$with_decimal_contextvar" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_decimal_contextvar" >&5
+printf "%s\n" "$with_decimal_contextvar" >&6; }
 
 # Check for support for loadable sqlite extensions
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-loadable-sqlite-extensions" >&5
-$as_echo_n "checking for --enable-loadable-sqlite-extensions... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --enable-loadable-sqlite-extensions" >&5
+printf %s "checking for --enable-loadable-sqlite-extensions... " >&6; }
 # Check whether --enable-loadable-sqlite-extensions was given.
-if test "${enable_loadable_sqlite_extensions+set}" = set; then :
+if test ${enable_loadable_sqlite_extensions+y}
+then :
   enableval=$enable_loadable_sqlite_extensions;
-else
+else $as_nop
   enable_loadable_sqlite_extensions="no"
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_loadable_sqlite_extensions" >&5
-$as_echo "$enable_loadable_sqlite_extensions" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_loadable_sqlite_extensions" >&5
+printf "%s\n" "$enable_loadable_sqlite_extensions" >&6; }
 
 # Check for --with-tcltk-includes=path and --with-tcltk-libs=path
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-tcltk-includes" >&5
-$as_echo_n "checking for --with-tcltk-includes... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-tcltk-includes" >&5
+printf %s "checking for --with-tcltk-includes... " >&6; }
 
 # Check whether --with-tcltk-includes was given.
-if test "${with_tcltk_includes+set}" = set; then :
+if test ${with_tcltk_includes+y}
+then :
   withval=$with_tcltk_includes;
-else
+else $as_nop
   with_tcltk_includes="default"
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_tcltk_includes" >&5
-$as_echo "$with_tcltk_includes" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-tcltk-libs" >&5
-$as_echo_n "checking for --with-tcltk-libs... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_tcltk_includes" >&5
+printf "%s\n" "$with_tcltk_includes" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-tcltk-libs" >&5
+printf %s "checking for --with-tcltk-libs... " >&6; }
 
 # Check whether --with-tcltk-libs was given.
-if test "${with_tcltk_libs+set}" = set; then :
+if test ${with_tcltk_libs+y}
+then :
   withval=$with_tcltk_libs;
-else
+else $as_nop
   with_tcltk_libs="default"
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_tcltk_libs" >&5
-$as_echo "$with_tcltk_libs" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_tcltk_libs" >&5
+printf "%s\n" "$with_tcltk_libs" >&6; }
 if test "x$with_tcltk_includes" = xdefault || test "x$with_tcltk_libs" = xdefault
 then
   if test "x$with_tcltk_includes" != "x$with_tcltk_libs"
@@ -10683,11 +11718,12 @@ else
 fi
 
 # Check for --with-dbmliborder
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-dbmliborder" >&5
-$as_echo_n "checking for --with-dbmliborder... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-dbmliborder" >&5
+printf %s "checking for --with-dbmliborder... " >&6; }
 
 # Check whether --with-dbmliborder was given.
-if test "${with_dbmliborder+set}" = set; then :
+if test ${with_dbmliborder+y}
+then :
   withval=$with_dbmliborder;
 if test x$with_dbmliborder = xyes
 then
@@ -10702,8 +11738,8 @@ else
 fi
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dbmliborder" >&5
-$as_echo "$with_dbmliborder" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_dbmliborder" >&5
+printf "%s\n" "$with_dbmliborder" >&6; }
 
 # Templates for things AC_DEFINEd more than once.
 # For a single AC_DEFINE, no template is needed.
@@ -10712,7 +11748,7 @@ $as_echo "$with_dbmliborder" >&6; }
 if test "$ac_cv_pthread_is_default" = yes
 then
     # Defining _REENTRANT on system with POSIX threads should not hurt.
-    $as_echo "#define _REENTRANT 1" >>confdefs.h
+    printf "%s\n" "#define _REENTRANT 1" >>confdefs.h
 
     posix_threads=yes
     if test "$ac_sys_system" = "SunOS"; then
@@ -10747,8 +11783,8 @@ else
     # According to the POSIX spec, a pthreads implementation must
     # define _POSIX_THREADS in unistd.h. Some apparently don't
     # (e.g. gnu pth with pthread emulation)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _POSIX_THREADS in unistd.h" >&5
-$as_echo_n "checking for _POSIX_THREADS in unistd.h... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _POSIX_THREADS in unistd.h" >&5
+printf %s "checking for _POSIX_THREADS in unistd.h... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -10759,25 +11795,26 @@ yes
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
+  $EGREP "yes" >/dev/null 2>&1
+then :
   unistd_defines_pthreads=yes
-else
+else $as_nop
   unistd_defines_pthreads=no
 fi
-rm -f conftest*
+rm -rf conftest*
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $unistd_defines_pthreads" >&5
-$as_echo "$unistd_defines_pthreads" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $unistd_defines_pthreads" >&5
+printf "%s\n" "$unistd_defines_pthreads" >&6; }
 
-    $as_echo "#define _REENTRANT 1" >>confdefs.h
+    printf "%s\n" "#define _REENTRANT 1" >>confdefs.h
 
     # Just looking for pthread_create in libpthread is not enough:
     # on HP/UX, pthread.h renames pthread_create to a different symbol name.
     # So we really have to include pthread.h, and then link.
     _libs=$LIBS
     LIBS="$LIBS -lpthread"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
+printf %s "checking for pthread_create in -lpthread... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -10786,7 +11823,7 @@ $as_echo_n "checking for pthread_create in -lpthread... " >&6; }
 
 void * start_routine (void *arg) { exit (0); }
 int
-main ()
+main (void)
 {
 
 pthread_create (NULL, NULL, start_routine, NULL)
@@ -10794,27 +11831,30 @@ pthread_create (NULL, NULL, start_routine, NULL)
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
     posix_threads=yes
 
-else
+else $as_nop
 
     LIBS=$_libs
     ac_fn_c_check_func "$LINENO" "pthread_detach" "ac_cv_func_pthread_detach"
-if test "x$ac_cv_func_pthread_detach" = xyes; then :
+if test "x$ac_cv_func_pthread_detach" = xyes
+then :
 
     posix_threads=yes
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthreads" >&5
-$as_echo_n "checking for pthread_create in -lpthreads... " >&6; }
-if ${ac_cv_lib_pthreads_pthread_create+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthreads" >&5
+printf %s "checking for pthread_create in -lpthreads... " >&6; }
+if test ${ac_cv_lib_pthreads_pthread_create+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthreads  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10823,41 +11863,41 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pthread_create ();
 int
-main ()
+main (void)
 {
 return pthread_create ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pthreads_pthread_create=yes
-else
+else $as_nop
   ac_cv_lib_pthreads_pthread_create=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthreads_pthread_create" >&5
-$as_echo "$ac_cv_lib_pthreads_pthread_create" >&6; }
-if test "x$ac_cv_lib_pthreads_pthread_create" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthreads_pthread_create" >&5
+printf "%s\n" "$ac_cv_lib_pthreads_pthread_create" >&6; }
+if test "x$ac_cv_lib_pthreads_pthread_create" = xyes
+then :
 
     posix_threads=yes
     LIBS="$LIBS -lpthreads"
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lc_r" >&5
-$as_echo_n "checking for pthread_create in -lc_r... " >&6; }
-if ${ac_cv_lib_c_r_pthread_create+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lc_r" >&5
+printf %s "checking for pthread_create in -lc_r... " >&6; }
+if test ${ac_cv_lib_c_r_pthread_create+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc_r  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10866,41 +11906,41 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pthread_create ();
 int
-main ()
+main (void)
 {
 return pthread_create ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_c_r_pthread_create=yes
-else
+else $as_nop
   ac_cv_lib_c_r_pthread_create=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_create" >&5
-$as_echo "$ac_cv_lib_c_r_pthread_create" >&6; }
-if test "x$ac_cv_lib_c_r_pthread_create" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_create" >&5
+printf "%s\n" "$ac_cv_lib_c_r_pthread_create" >&6; }
+if test "x$ac_cv_lib_c_r_pthread_create" = xyes
+then :
 
     posix_threads=yes
     LIBS="$LIBS -lc_r"
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __pthread_create_system in -lpthread" >&5
-$as_echo_n "checking for __pthread_create_system in -lpthread... " >&6; }
-if ${ac_cv_lib_pthread___pthread_create_system+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __pthread_create_system in -lpthread" >&5
+printf %s "checking for __pthread_create_system in -lpthread... " >&6; }
+if test ${ac_cv_lib_pthread___pthread_create_system+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthread  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10909,41 +11949,41 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __pthread_create_system ();
 int
-main ()
+main (void)
 {
 return __pthread_create_system ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pthread___pthread_create_system=yes
-else
+else $as_nop
   ac_cv_lib_pthread___pthread_create_system=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread___pthread_create_system" >&5
-$as_echo "$ac_cv_lib_pthread___pthread_create_system" >&6; }
-if test "x$ac_cv_lib_pthread___pthread_create_system" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread___pthread_create_system" >&5
+printf "%s\n" "$ac_cv_lib_pthread___pthread_create_system" >&6; }
+if test "x$ac_cv_lib_pthread___pthread_create_system" = xyes
+then :
 
     posix_threads=yes
     LIBS="$LIBS -lpthread"
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lcma" >&5
-$as_echo_n "checking for pthread_create in -lcma... " >&6; }
-if ${ac_cv_lib_cma_pthread_create+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lcma" >&5
+printf %s "checking for pthread_create in -lcma... " >&6; }
+if test ${ac_cv_lib_cma_pthread_create+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcma  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10952,35 +11992,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pthread_create ();
 int
-main ()
+main (void)
 {
 return pthread_create ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_cma_pthread_create=yes
-else
+else $as_nop
   ac_cv_lib_cma_pthread_create=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cma_pthread_create" >&5
-$as_echo "$ac_cv_lib_cma_pthread_create" >&6; }
-if test "x$ac_cv_lib_cma_pthread_create" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cma_pthread_create" >&5
+printf "%s\n" "$ac_cv_lib_cma_pthread_create" >&6; }
+if test "x$ac_cv_lib_cma_pthread_create" = xyes
+then :
 
     posix_threads=yes
     LIBS="$LIBS -lcma"
 
-else
+else $as_nop
 
     as_fn_error $? "could not find pthreads on your system" "$LINENO" 5
 
@@ -10996,14 +12035,15 @@ fi
 fi
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usconfig in -lmpc" >&5
-$as_echo_n "checking for usconfig in -lmpc... " >&6; }
-if ${ac_cv_lib_mpc_usconfig+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for usconfig in -lmpc" >&5
+printf %s "checking for usconfig in -lmpc... " >&6; }
+if test ${ac_cv_lib_mpc_usconfig+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmpc  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11012,30 +12052,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char usconfig ();
 int
-main ()
+main (void)
 {
 return usconfig ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_mpc_usconfig=yes
-else
+else $as_nop
   ac_cv_lib_mpc_usconfig=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpc_usconfig" >&5
-$as_echo "$ac_cv_lib_mpc_usconfig" >&6; }
-if test "x$ac_cv_lib_mpc_usconfig" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpc_usconfig" >&5
+printf "%s\n" "$ac_cv_lib_mpc_usconfig" >&6; }
+if test "x$ac_cv_lib_mpc_usconfig" = xyes
+then :
 
     LIBS="$LIBS -lmpc"
 
@@ -11047,34 +12086,36 @@ fi
 if test "$posix_threads" = "yes"; then
       if test "$unistd_defines_pthreads" = "no"; then
 
-$as_echo "#define _POSIX_THREADS 1" >>confdefs.h
+printf "%s\n" "#define _POSIX_THREADS 1" >>confdefs.h
 
       fi
 
       # Bug 662787: Using semaphores causes unexplicable hangs on Solaris 8.
       case  $ac_sys_system/$ac_sys_release in
       SunOS/5.6)
-$as_echo "#define HAVE_PTHREAD_DESTRUCTOR 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PTHREAD_DESTRUCTOR 1" >>confdefs.h
 
 		       ;;
       SunOS/5.8)
-$as_echo "#define HAVE_BROKEN_POSIX_SEMAPHORES 1" >>confdefs.h
+printf "%s\n" "#define HAVE_BROKEN_POSIX_SEMAPHORES 1" >>confdefs.h
 
 		       ;;
       AIX/*)
-$as_echo "#define HAVE_BROKEN_POSIX_SEMAPHORES 1" >>confdefs.h
+printf "%s\n" "#define HAVE_BROKEN_POSIX_SEMAPHORES 1" >>confdefs.h
 
 		       ;;
       esac
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if PTHREAD_SCOPE_SYSTEM is supported" >&5
-$as_echo_n "checking if PTHREAD_SCOPE_SYSTEM is supported... " >&6; }
-      if ${ac_cv_pthread_system_supported+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if PTHREAD_SCOPE_SYSTEM is supported" >&5
+printf %s "checking if PTHREAD_SCOPE_SYSTEM is supported... " >&6; }
+      if test ${ac_cv_pthread_system_supported+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
   ac_cv_pthread_system_supported=no
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -11092,9 +12133,10 @@ else
         return (0);
       }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_pthread_system_supported=yes
-else
+else $as_nop
   ac_cv_pthread_system_supported=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -11104,64 +12146,61 @@ fi
 
 fi
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthread_system_supported" >&5
-$as_echo "$ac_cv_pthread_system_supported" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthread_system_supported" >&5
+printf "%s\n" "$ac_cv_pthread_system_supported" >&6; }
       if test "$ac_cv_pthread_system_supported" = "yes"; then
 
-$as_echo "#define PTHREAD_SYSTEM_SCHED_SUPPORTED 1" >>confdefs.h
+printf "%s\n" "#define PTHREAD_SYSTEM_SCHED_SUPPORTED 1" >>confdefs.h
 
       fi
-      for ac_func in pthread_sigmask
+
+  for ac_func in pthread_sigmask
 do :
   ac_fn_c_check_func "$LINENO" "pthread_sigmask" "ac_cv_func_pthread_sigmask"
-if test "x$ac_cv_func_pthread_sigmask" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_PTHREAD_SIGMASK 1
-_ACEOF
+if test "x$ac_cv_func_pthread_sigmask" = xyes
+then :
+  printf "%s\n" "#define HAVE_PTHREAD_SIGMASK 1" >>confdefs.h
  case $ac_sys_system in
         CYGWIN*)
 
-$as_echo "#define HAVE_BROKEN_PTHREAD_SIGMASK 1" >>confdefs.h
+printf "%s\n" "#define HAVE_BROKEN_PTHREAD_SIGMASK 1" >>confdefs.h
 
             ;;
         esac
 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
+done
+      ac_fn_c_check_func "$LINENO" "pthread_getcpuclockid" "ac_cv_func_pthread_getcpuclockid"
+if test "x$ac_cv_func_pthread_getcpuclockid" = xyes
+then :
+  printf "%s\n" "#define HAVE_PTHREAD_GETCPUCLOCKID 1" >>confdefs.h
 
 fi
-done
 
 fi
 
 
 # Check for enable-ipv6
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if --enable-ipv6 is specified" >&5
-$as_echo_n "checking if --enable-ipv6 is specified... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if --enable-ipv6 is specified" >&5
+printf %s "checking if --enable-ipv6 is specified... " >&6; }
 # Check whether --enable-ipv6 was given.
-if test "${enable_ipv6+set}" = set; then :
+if test ${enable_ipv6+y}
+then :
   enableval=$enable_ipv6;  case "$enableval" in
   no)
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
        ipv6=no
        ;;
-  *)   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-       $as_echo "#define ENABLE_IPV6 1" >>confdefs.h
+  *)   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+       printf "%s\n" "#define ENABLE_IPV6 1" >>confdefs.h
 
        ipv6=yes
        ;;
   esac
-else
+else $as_nop
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -11169,38 +12208,39 @@ else
 #include <sys/types.h>
 #include <sys/socket.h>
 int
-main ()
+main (void)
 {
 int domain = AF_INET6;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   ipv6=yes
 
-else
+else $as_nop
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   ipv6=no
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 if test "$ipv6" = "yes"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if RFC2553 API is available" >&5
-$as_echo_n "checking if RFC2553 API is available... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if RFC2553 API is available" >&5
+printf %s "checking if RFC2553 API is available... " >&6; }
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 	  #include <sys/types.h>
 #include <netinet/in.h>
 int
-main ()
+main (void)
 {
 struct sockaddr_in6 x;
 			    x.sin6_scope_id;
@@ -11209,24 +12249,25 @@ struct sockaddr_in6 x;
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	  ipv6=yes
 
-else
+else $as_nop
 
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 	  ipv6=no
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 if test "$ipv6" = "yes"; then
-	$as_echo "#define ENABLE_IPV6 1" >>confdefs.h
+	printf "%s\n" "#define ENABLE_IPV6 1" >>confdefs.h
 
 fi
 
@@ -11238,8 +12279,8 @@ ipv6lib=none
 ipv6trylibc=no
 
 if test "$ipv6" = "yes"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking ipv6 stack type" >&5
-$as_echo_n "checking ipv6 stack type... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking ipv6 stack type" >&5
+printf %s "checking ipv6 stack type... " >&6; }
 	for i in inria kame linux-glibc linux-inet6 solaris toshiba v6d zeta;
 	do
 		case $i in
@@ -11253,10 +12294,11 @@ yes
 #endif
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
+  $EGREP "yes" >/dev/null 2>&1
+then :
   ipv6type=$i
 fi
-rm -f conftest*
+rm -rf conftest*
 
 			;;
 		kame)
@@ -11269,13 +12311,14 @@ yes
 #endif
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
+  $EGREP "yes" >/dev/null 2>&1
+then :
   ipv6type=$i;
 				ipv6lib=inet6
 				ipv6libdir=/usr/local/v6/lib
 				ipv6trylibc=yes
 fi
-rm -f conftest*
+rm -rf conftest*
 
 			;;
 		linux-glibc)
@@ -11288,11 +12331,12 @@ yes
 #endif
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
+  $EGREP "yes" >/dev/null 2>&1
+then :
   ipv6type=$i;
 				ipv6trylibc=yes
 fi
-rm -f conftest*
+rm -rf conftest*
 
 			;;
 		linux-inet6)
@@ -11321,12 +12365,13 @@ yes
 #endif
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
+  $EGREP "yes" >/dev/null 2>&1
+then :
   ipv6type=$i;
 				ipv6lib=inet6;
 				ipv6libdir=/usr/local/v6/lib
 fi
-rm -f conftest*
+rm -rf conftest*
 
 			;;
 		v6d)
@@ -11339,13 +12384,14 @@ yes
 #endif
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
+  $EGREP "yes" >/dev/null 2>&1
+then :
   ipv6type=$i;
 				ipv6lib=v6;
 				ipv6libdir=/usr/local/v6/lib;
 				BASECFLAGS="-I/usr/local/v6/include $BASECFLAGS"
 fi
-rm -f conftest*
+rm -rf conftest*
 
 			;;
 		zeta)
@@ -11358,12 +12404,13 @@ yes
 #endif
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
+  $EGREP "yes" >/dev/null 2>&1
+then :
   ipv6type=$i;
 				ipv6lib=inet6;
 				ipv6libdir=/usr/local/v6/lib
 fi
-rm -f conftest*
+rm -rf conftest*
 
 			;;
 		esac
@@ -11371,8 +12418,8 @@ rm -f conftest*
 			break
 		fi
 	done
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6type" >&5
-$as_echo "$ipv6type" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ipv6type" >&5
+printf "%s\n" "$ipv6type" >&6; }
 fi
 
 if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then
@@ -11391,72 +12438,75 @@ if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then
 	fi
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAN_RAW_FD_FRAMES" >&5
-$as_echo_n "checking for CAN_RAW_FD_FRAMES... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CAN_RAW_FD_FRAMES" >&5
+printf %s "checking for CAN_RAW_FD_FRAMES... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
  /* CAN_RAW_FD_FRAMES available check */
 #include <linux/can/raw.h>
 int
-main ()
+main (void)
 {
 int can_raw_fd_frames = CAN_RAW_FD_FRAMES;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
 
-$as_echo "#define HAVE_LINUX_CAN_RAW_FD_FRAMES 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LINUX_CAN_RAW_FD_FRAMES 1" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAN_RAW_JOIN_FILTERS" >&5
-$as_echo_n "checking for CAN_RAW_JOIN_FILTERS... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CAN_RAW_JOIN_FILTERS" >&5
+printf %s "checking for CAN_RAW_JOIN_FILTERS... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <linux/can/raw.h>
 int
-main ()
+main (void)
 {
 int can_raw_join_filters = CAN_RAW_JOIN_FILTERS;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
 
-$as_echo "#define HAVE_LINUX_CAN_RAW_JOIN_FILTERS 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LINUX_CAN_RAW_JOIN_FILTERS 1" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 # Check for --with-doc-strings
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-doc-strings" >&5
-$as_echo_n "checking for --with-doc-strings... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-doc-strings" >&5
+printf %s "checking for --with-doc-strings... " >&6; }
 
 # Check whether --with-doc-strings was given.
-if test "${with_doc_strings+set}" = set; then :
+if test ${with_doc_strings+y}
+then :
   withval=$with_doc_strings;
 fi
 
@@ -11467,18 +12517,19 @@ fi
 if test "$with_doc_strings" != "no"
 then
 
-$as_echo "#define WITH_DOC_STRINGS 1" >>confdefs.h
+printf "%s\n" "#define WITH_DOC_STRINGS 1" >>confdefs.h
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_doc_strings" >&5
-$as_echo "$with_doc_strings" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_doc_strings" >&5
+printf "%s\n" "$with_doc_strings" >&6; }
 
 # Check for Python-specific malloc support
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-pymalloc" >&5
-$as_echo_n "checking for --with-pymalloc... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-pymalloc" >&5
+printf %s "checking for --with-pymalloc... " >&6; }
 
 # Check whether --with-pymalloc was given.
-if test "${with_pymalloc+set}" = set; then :
+if test ${with_pymalloc+y}
+then :
   withval=$with_pymalloc;
 fi
 
@@ -11490,18 +12541,19 @@ fi
 if test "$with_pymalloc" != "no"
 then
 
-$as_echo "#define WITH_PYMALLOC 1" >>confdefs.h
+printf "%s\n" "#define WITH_PYMALLOC 1" >>confdefs.h
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_pymalloc" >&5
-$as_echo "$with_pymalloc" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_pymalloc" >&5
+printf "%s\n" "$with_pymalloc" >&6; }
 
 # Check for --with-c-locale-coercion
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-c-locale-coercion" >&5
-$as_echo_n "checking for --with-c-locale-coercion... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-c-locale-coercion" >&5
+printf %s "checking for --with-c-locale-coercion... " >&6; }
 
 # Check whether --with-c-locale-coercion was given.
-if test "${with_c_locale_coercion+set}" = set; then :
+if test ${with_c_locale_coercion+y}
+then :
   withval=$with_c_locale_coercion;
 fi
 
@@ -11513,53 +12565,55 @@ fi
 if test "$with_c_locale_coercion" != "no"
 then
 
-$as_echo "#define PY_COERCE_C_LOCALE 1" >>confdefs.h
+printf "%s\n" "#define PY_COERCE_C_LOCALE 1" >>confdefs.h
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_c_locale_coercion" >&5
-$as_echo "$with_c_locale_coercion" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_c_locale_coercion" >&5
+printf "%s\n" "$with_c_locale_coercion" >&6; }
 
 # Check for Valgrind support
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-valgrind" >&5
-$as_echo_n "checking for --with-valgrind... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-valgrind" >&5
+printf %s "checking for --with-valgrind... " >&6; }
 
 # Check whether --with-valgrind was given.
-if test "${with_valgrind+set}" = set; then :
+if test ${with_valgrind+y}
+then :
   withval=$with_valgrind;
-else
+else $as_nop
   with_valgrind=no
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_valgrind" >&5
-$as_echo "$with_valgrind" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_valgrind" >&5
+printf "%s\n" "$with_valgrind" >&6; }
 if test "$with_valgrind" != no; then
-    ac_fn_c_check_header_mongrel "$LINENO" "valgrind/valgrind.h" "ac_cv_header_valgrind_valgrind_h" "$ac_includes_default"
-if test "x$ac_cv_header_valgrind_valgrind_h" = xyes; then :
+    ac_fn_c_check_header_compile "$LINENO" "valgrind/valgrind.h" "ac_cv_header_valgrind_valgrind_h" "$ac_includes_default"
+if test "x$ac_cv_header_valgrind_valgrind_h" = xyes
+then :
 
-$as_echo "#define WITH_VALGRIND 1" >>confdefs.h
+printf "%s\n" "#define WITH_VALGRIND 1" >>confdefs.h
 
-else
+else $as_nop
   as_fn_error $? "Valgrind support requested but headers not available" "$LINENO" 5
 
 fi
 
-
     OPT="-DDYNAMIC_ANNOTATIONS_ENABLED=1 $OPT"
 fi
 
 # Check for DTrace support
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-dtrace" >&5
-$as_echo_n "checking for --with-dtrace... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-dtrace" >&5
+printf %s "checking for --with-dtrace... " >&6; }
 
 # Check whether --with-dtrace was given.
-if test "${with_dtrace+set}" = set; then :
+if test ${with_dtrace+y}
+then :
   withval=$with_dtrace;
-else
+else $as_nop
   with_dtrace=no
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dtrace" >&5
-$as_echo "$with_dtrace" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_dtrace" >&5
+printf "%s\n" "$with_dtrace" >&6; }
 
 
 
@@ -11573,11 +12627,12 @@ if test "$with_dtrace" = "yes"
 then
     # Extract the first word of "dtrace", so it can be a program name with args.
 set dummy dtrace; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_DTRACE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_DTRACE+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $DTRACE in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_DTRACE="$DTRACE" # Let the user override the test with a path.
@@ -11587,11 +12642,15 @@ else
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_DTRACE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_DTRACE="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11604,11 +12663,11 @@ esac
 fi
 DTRACE=$ac_cv_path_DTRACE
 if test -n "$DTRACE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DTRACE" >&5
-$as_echo "$DTRACE" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DTRACE" >&5
+printf "%s\n" "$DTRACE" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -11616,7 +12675,7 @@ fi
         as_fn_error $? "dtrace command not found on \$PATH" "$LINENO" 5
     fi
 
-$as_echo "#define WITH_DTRACE 1" >>confdefs.h
+printf "%s\n" "#define WITH_DTRACE 1" >>confdefs.h
 
     DTRACE_HEADERS="Include/pydtrace_probes.h"
 
@@ -11624,19 +12683,20 @@ $as_echo "#define WITH_DTRACE 1" >>confdefs.h
     # linked into the binary. Correspondingly, dtrace(1) is missing the ELF
     # generation flag '-G'. We check for presence of this flag, rather than
     # hardcoding support by OS, in the interest of robustness.
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether DTrace probes require linking" >&5
-$as_echo_n "checking whether DTrace probes require linking... " >&6; }
-if ${ac_cv_dtrace_link+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether DTrace probes require linking" >&5
+printf %s "checking whether DTrace probes require linking... " >&6; }
+if test ${ac_cv_dtrace_link+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
               ac_cv_dtrace_link=no
             echo 'BEGIN{}' > conftest.d
             "$DTRACE" $DFLAGS -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \
                 ac_cv_dtrace_link=yes
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_dtrace_link" >&5
-$as_echo "$ac_cv_dtrace_link" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_dtrace_link" >&5
+printf "%s\n" "$ac_cv_dtrace_link" >&6; }
     if test "$ac_cv_dtrace_link" = "yes"; then
         DTRACE_OBJS="Python/pydtrace.o"
     fi
@@ -11648,23 +12708,19 @@ DLINCLDIR=.
 
 # the dlopen() function means we might want to use dynload_shlib.o. some
 # platforms have dlopen(), but don't want to use it.
-for ac_func in dlopen
-do :
-  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DLOPEN 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = xyes
+then :
+  printf "%s\n" "#define HAVE_DLOPEN 1" >>confdefs.h
 
 fi
-done
 
 
 # DYNLOADFILE specifies which dynload_*.o file we will use for dynamic
 # loading of modules.
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking DYNLOADFILE" >&5
-$as_echo_n "checking DYNLOADFILE... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking DYNLOADFILE" >&5
+printf %s "checking DYNLOADFILE... " >&6; }
 if test -z "$DYNLOADFILE"
 then
 	case $ac_sys_system/$ac_sys_release in
@@ -11679,20 +12735,20 @@ then
 	;;
 	esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DYNLOADFILE" >&5
-$as_echo "$DYNLOADFILE" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DYNLOADFILE" >&5
+printf "%s\n" "$DYNLOADFILE" >&6; }
 if test "$DYNLOADFILE" != "dynload_stub.o"
 then
 
-$as_echo "#define HAVE_DYNAMIC_LOADING 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DYNAMIC_LOADING 1" >>confdefs.h
 
 fi
 
 # MACHDEP_OBJS can be set to platform-specific object files needed by Python
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking MACHDEP_OBJS" >&5
-$as_echo_n "checking MACHDEP_OBJS... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking MACHDEP_OBJS" >&5
+printf %s "checking MACHDEP_OBJS... " >&6; }
 if test -z "$MACHDEP_OBJS"
 then
 	MACHDEP_OBJS=$extra_machdep_objs
@@ -11700,282 +12756,1315 @@ else
 	MACHDEP_OBJS="$MACHDEP_OBJS $extra_machdep_objs"
 fi
 if test -z "$MACHDEP_OBJS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
+printf "%s\n" "none" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MACHDEP_OBJS" >&5
-$as_echo "$MACHDEP_OBJS" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MACHDEP_OBJS" >&5
+printf "%s\n" "$MACHDEP_OBJS" >&6; }
 fi
 
 # checks for library functions
-for ac_func in alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
- clock confstr close_range copy_file_range ctermid dup3 execv explicit_bzero \
- explicit_memset faccessat fchmod fchmodat fchown fchownat \
- fdwalk fexecve fdopendir fork fpathconf fstatat ftime ftruncate futimesat \
- futimens futimes gai_strerror getentropy \
- getgrgid_r getgrnam_r \
- getgrouplist getgroups getlogin getloadavg getpeername getpgid getpid \
- getpriority getresuid getresgid getpwent getpwnam_r getpwuid_r getspnam getspent getsid getwd \
- if_nameindex \
- initgroups kill killpg lchown lockf linkat lstat lutimes mmap \
- memrchr mbrtowc mkdirat mkfifo \
- madvise mkfifoat mknod mknodat mktime mremap nice openat pathconf pause pipe2 plock poll \
- posix_fallocate posix_fadvise posix_spawn posix_spawnp pread preadv preadv2 \
- pthread_condattr_setclock pthread_init pthread_kill pwrite pwritev pwritev2 \
- readlink readlinkat readv realpath renameat \
- sem_open sem_timedwait sem_getvalue sem_unlink sendfile setegid seteuid \
- setgid sethostname \
- setlocale setregid setreuid setresuid setresgid setsid setpgid setpgrp setpriority setuid setvbuf \
- sched_get_priority_max sched_setaffinity sched_setscheduler sched_setparam \
- sched_rr_get_interval \
- sigaction sigaltstack sigfillset siginterrupt sigpending sigrelse \
- sigtimedwait sigwait sigwaitinfo snprintf splice strftime strlcpy strsignal symlinkat sync \
- sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile tmpnam tmpnam_r \
- truncate uname unlinkat utimensat utimes vfork waitid waitpid wait3 wait4 \
- wcscoll wcsftime wcsxfrm wmemcmp writev _getpty rtpSpawn
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "alarm" "ac_cv_func_alarm"
+if test "x$ac_cv_func_alarm" = xyes
+then :
+  printf "%s\n" "#define HAVE_ALARM 1" >>confdefs.h
 
 fi
-done
+ac_fn_c_check_func "$LINENO" "accept4" "ac_cv_func_accept4"
+if test "x$ac_cv_func_accept4" = xyes
+then :
+  printf "%s\n" "#define HAVE_ACCEPT4 1" >>confdefs.h
 
+fi
+ac_fn_c_check_func "$LINENO" "setitimer" "ac_cv_func_setitimer"
+if test "x$ac_cv_func_setitimer" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETITIMER 1" >>confdefs.h
 
-# Force lchmod off for Linux. Linux disallows changing the mode of symbolic
-# links. Some libc implementations have a stub lchmod implementation that always
-# returns an error.
-if test "$MACHDEP" != linux; then
-  for ac_func in lchmod
-do :
-  ac_fn_c_check_func "$LINENO" "lchmod" "ac_cv_func_lchmod"
-if test "x$ac_cv_func_lchmod" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LCHMOD 1
-_ACEOF
+fi
+ac_fn_c_check_func "$LINENO" "getitimer" "ac_cv_func_getitimer"
+if test "x$ac_cv_func_getitimer" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETITIMER 1" >>confdefs.h
 
 fi
-done
+ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes
+then :
+  printf "%s\n" "#define HAVE_BIND_TEXTDOMAIN_CODESET 1" >>confdefs.h
 
 fi
+ac_fn_c_check_func "$LINENO" "chown" "ac_cv_func_chown"
+if test "x$ac_cv_func_chown" = xyes
+then :
+  printf "%s\n" "#define HAVE_CHOWN 1" >>confdefs.h
 
-ac_fn_c_check_decl "$LINENO" "dirfd" "ac_cv_have_decl_dirfd" "#include <sys/types.h>
-       #include <dirent.h>
-"
-if test "x$ac_cv_have_decl_dirfd" = xyes; then :
+fi
+ac_fn_c_check_func "$LINENO" "clock" "ac_cv_func_clock"
+if test "x$ac_cv_func_clock" = xyes
+then :
+  printf "%s\n" "#define HAVE_CLOCK 1" >>confdefs.h
 
-$as_echo "#define HAVE_DIRFD 1" >>confdefs.h
+fi
+ac_fn_c_check_func "$LINENO" "confstr" "ac_cv_func_confstr"
+if test "x$ac_cv_func_confstr" = xyes
+then :
+  printf "%s\n" "#define HAVE_CONFSTR 1" >>confdefs.h
 
 fi
+ac_fn_c_check_func "$LINENO" "close_range" "ac_cv_func_close_range"
+if test "x$ac_cv_func_close_range" = xyes
+then :
+  printf "%s\n" "#define HAVE_CLOSE_RANGE 1" >>confdefs.h
 
+fi
+ac_fn_c_check_func "$LINENO" "copy_file_range" "ac_cv_func_copy_file_range"
+if test "x$ac_cv_func_copy_file_range" = xyes
+then :
+  printf "%s\n" "#define HAVE_COPY_FILE_RANGE 1" >>confdefs.h
 
-# For some functions, having a definition is not sufficient, since
-# we want to take their address.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for chroot" >&5
-$as_echo_n "checking for chroot... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <unistd.h>
-int
-main ()
-{
-void *x=chroot
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+fi
+ac_fn_c_check_func "$LINENO" "ctermid" "ac_cv_func_ctermid"
+if test "x$ac_cv_func_ctermid" = xyes
+then :
+  printf "%s\n" "#define HAVE_CTERMID 1" >>confdefs.h
 
-$as_echo "#define HAVE_CHROOT 1" >>confdefs.h
+fi
+ac_fn_c_check_func "$LINENO" "dup3" "ac_cv_func_dup3"
+if test "x$ac_cv_func_dup3" = xyes
+then :
+  printf "%s\n" "#define HAVE_DUP3 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
+ac_fn_c_check_func "$LINENO" "execv" "ac_cv_func_execv"
+if test "x$ac_cv_func_execv" = xyes
+then :
+  printf "%s\n" "#define HAVE_EXECV 1" >>confdefs.h
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for link" >&5
-$as_echo_n "checking for link... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <unistd.h>
-int
-main ()
-{
-void *x=link
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+ac_fn_c_check_func "$LINENO" "explicit_bzero" "ac_cv_func_explicit_bzero"
+if test "x$ac_cv_func_explicit_bzero" = xyes
+then :
+  printf "%s\n" "#define HAVE_EXPLICIT_BZERO 1" >>confdefs.h
 
-$as_echo "#define HAVE_LINK 1" >>confdefs.h
+fi
+ac_fn_c_check_func "$LINENO" "explicit_memset" "ac_cv_func_explicit_memset"
+if test "x$ac_cv_func_explicit_memset" = xyes
+then :
+  printf "%s\n" "#define HAVE_EXPLICIT_MEMSET 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
+ac_fn_c_check_func "$LINENO" "faccessat" "ac_cv_func_faccessat"
+if test "x$ac_cv_func_faccessat" = xyes
+then :
+  printf "%s\n" "#define HAVE_FACCESSAT 1" >>confdefs.h
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for symlink" >&5
-$as_echo_n "checking for symlink... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <unistd.h>
-int
-main ()
-{
-void *x=symlink
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+ac_fn_c_check_func "$LINENO" "fchmod" "ac_cv_func_fchmod"
+if test "x$ac_cv_func_fchmod" = xyes
+then :
+  printf "%s\n" "#define HAVE_FCHMOD 1" >>confdefs.h
 
-$as_echo "#define HAVE_SYMLINK 1" >>confdefs.h
+fi
+ac_fn_c_check_func "$LINENO" "fchmodat" "ac_cv_func_fchmodat"
+if test "x$ac_cv_func_fchmodat" = xyes
+then :
+  printf "%s\n" "#define HAVE_FCHMODAT 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
+ac_fn_c_check_func "$LINENO" "fchown" "ac_cv_func_fchown"
+if test "x$ac_cv_func_fchown" = xyes
+then :
+  printf "%s\n" "#define HAVE_FCHOWN 1" >>confdefs.h
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fchdir" >&5
-$as_echo_n "checking for fchdir... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <unistd.h>
-int
-main ()
-{
-void *x=fchdir
-  ;
+ac_fn_c_check_func "$LINENO" "fchownat" "ac_cv_func_fchownat"
+if test "x$ac_cv_func_fchownat" = xyes
+then :
+  printf "%s\n" "#define HAVE_FCHOWNAT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "fdwalk" "ac_cv_func_fdwalk"
+if test "x$ac_cv_func_fdwalk" = xyes
+then :
+  printf "%s\n" "#define HAVE_FDWALK 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "fexecve" "ac_cv_func_fexecve"
+if test "x$ac_cv_func_fexecve" = xyes
+then :
+  printf "%s\n" "#define HAVE_FEXECVE 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "fdopendir" "ac_cv_func_fdopendir"
+if test "x$ac_cv_func_fdopendir" = xyes
+then :
+  printf "%s\n" "#define HAVE_FDOPENDIR 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "fork" "ac_cv_func_fork"
+if test "x$ac_cv_func_fork" = xyes
+then :
+  printf "%s\n" "#define HAVE_FORK 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "fpathconf" "ac_cv_func_fpathconf"
+if test "x$ac_cv_func_fpathconf" = xyes
+then :
+  printf "%s\n" "#define HAVE_FPATHCONF 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "fstatat" "ac_cv_func_fstatat"
+if test "x$ac_cv_func_fstatat" = xyes
+then :
+  printf "%s\n" "#define HAVE_FSTATAT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "ftime" "ac_cv_func_ftime"
+if test "x$ac_cv_func_ftime" = xyes
+then :
+  printf "%s\n" "#define HAVE_FTIME 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "ftruncate" "ac_cv_func_ftruncate"
+if test "x$ac_cv_func_ftruncate" = xyes
+then :
+  printf "%s\n" "#define HAVE_FTRUNCATE 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "futimesat" "ac_cv_func_futimesat"
+if test "x$ac_cv_func_futimesat" = xyes
+then :
+  printf "%s\n" "#define HAVE_FUTIMESAT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "futimens" "ac_cv_func_futimens"
+if test "x$ac_cv_func_futimens" = xyes
+then :
+  printf "%s\n" "#define HAVE_FUTIMENS 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "futimes" "ac_cv_func_futimes"
+if test "x$ac_cv_func_futimes" = xyes
+then :
+  printf "%s\n" "#define HAVE_FUTIMES 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "gai_strerror" "ac_cv_func_gai_strerror"
+if test "x$ac_cv_func_gai_strerror" = xyes
+then :
+  printf "%s\n" "#define HAVE_GAI_STRERROR 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getentropy" "ac_cv_func_getentropy"
+if test "x$ac_cv_func_getentropy" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETENTROPY 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getgrgid_r" "ac_cv_func_getgrgid_r"
+if test "x$ac_cv_func_getgrgid_r" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETGRGID_R 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getgrnam_r" "ac_cv_func_getgrnam_r"
+if test "x$ac_cv_func_getgrnam_r" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETGRNAM_R 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getgrouplist" "ac_cv_func_getgrouplist"
+if test "x$ac_cv_func_getgrouplist" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETGROUPLIST 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getgroups" "ac_cv_func_getgroups"
+if test "x$ac_cv_func_getgroups" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETGROUPS 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getlogin" "ac_cv_func_getlogin"
+if test "x$ac_cv_func_getlogin" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETLOGIN 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg"
+if test "x$ac_cv_func_getloadavg" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETLOADAVG 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getpeername" "ac_cv_func_getpeername"
+if test "x$ac_cv_func_getpeername" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETPEERNAME 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getpgid" "ac_cv_func_getpgid"
+if test "x$ac_cv_func_getpgid" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETPGID 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getpid" "ac_cv_func_getpid"
+if test "x$ac_cv_func_getpid" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETPID 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getpriority" "ac_cv_func_getpriority"
+if test "x$ac_cv_func_getpriority" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETPRIORITY 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getresuid" "ac_cv_func_getresuid"
+if test "x$ac_cv_func_getresuid" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETRESUID 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getresgid" "ac_cv_func_getresgid"
+if test "x$ac_cv_func_getresgid" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETRESGID 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getpwent" "ac_cv_func_getpwent"
+if test "x$ac_cv_func_getpwent" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETPWENT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getpwnam_r" "ac_cv_func_getpwnam_r"
+if test "x$ac_cv_func_getpwnam_r" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETPWNAM_R 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getpwuid_r" "ac_cv_func_getpwuid_r"
+if test "x$ac_cv_func_getpwuid_r" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETPWUID_R 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getspnam" "ac_cv_func_getspnam"
+if test "x$ac_cv_func_getspnam" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETSPNAM 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getspent" "ac_cv_func_getspent"
+if test "x$ac_cv_func_getspent" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETSPENT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getsid" "ac_cv_func_getsid"
+if test "x$ac_cv_func_getsid" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETSID 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getwd" "ac_cv_func_getwd"
+if test "x$ac_cv_func_getwd" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETWD 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "if_nameindex" "ac_cv_func_if_nameindex"
+if test "x$ac_cv_func_if_nameindex" = xyes
+then :
+  printf "%s\n" "#define HAVE_IF_NAMEINDEX 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "initgroups" "ac_cv_func_initgroups"
+if test "x$ac_cv_func_initgroups" = xyes
+then :
+  printf "%s\n" "#define HAVE_INITGROUPS 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "kill" "ac_cv_func_kill"
+if test "x$ac_cv_func_kill" = xyes
+then :
+  printf "%s\n" "#define HAVE_KILL 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "killpg" "ac_cv_func_killpg"
+if test "x$ac_cv_func_killpg" = xyes
+then :
+  printf "%s\n" "#define HAVE_KILLPG 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "lchown" "ac_cv_func_lchown"
+if test "x$ac_cv_func_lchown" = xyes
+then :
+  printf "%s\n" "#define HAVE_LCHOWN 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "lockf" "ac_cv_func_lockf"
+if test "x$ac_cv_func_lockf" = xyes
+then :
+  printf "%s\n" "#define HAVE_LOCKF 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "linkat" "ac_cv_func_linkat"
+if test "x$ac_cv_func_linkat" = xyes
+then :
+  printf "%s\n" "#define HAVE_LINKAT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "lstat" "ac_cv_func_lstat"
+if test "x$ac_cv_func_lstat" = xyes
+then :
+  printf "%s\n" "#define HAVE_LSTAT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "lutimes" "ac_cv_func_lutimes"
+if test "x$ac_cv_func_lutimes" = xyes
+then :
+  printf "%s\n" "#define HAVE_LUTIMES 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap"
+if test "x$ac_cv_func_mmap" = xyes
+then :
+  printf "%s\n" "#define HAVE_MMAP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "memrchr" "ac_cv_func_memrchr"
+if test "x$ac_cv_func_memrchr" = xyes
+then :
+  printf "%s\n" "#define HAVE_MEMRCHR 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "mbrtowc" "ac_cv_func_mbrtowc"
+if test "x$ac_cv_func_mbrtowc" = xyes
+then :
+  printf "%s\n" "#define HAVE_MBRTOWC 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "mkdirat" "ac_cv_func_mkdirat"
+if test "x$ac_cv_func_mkdirat" = xyes
+then :
+  printf "%s\n" "#define HAVE_MKDIRAT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "mkfifo" "ac_cv_func_mkfifo"
+if test "x$ac_cv_func_mkfifo" = xyes
+then :
+  printf "%s\n" "#define HAVE_MKFIFO 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "madvise" "ac_cv_func_madvise"
+if test "x$ac_cv_func_madvise" = xyes
+then :
+  printf "%s\n" "#define HAVE_MADVISE 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "mkfifoat" "ac_cv_func_mkfifoat"
+if test "x$ac_cv_func_mkfifoat" = xyes
+then :
+  printf "%s\n" "#define HAVE_MKFIFOAT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "mknod" "ac_cv_func_mknod"
+if test "x$ac_cv_func_mknod" = xyes
+then :
+  printf "%s\n" "#define HAVE_MKNOD 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "mknodat" "ac_cv_func_mknodat"
+if test "x$ac_cv_func_mknodat" = xyes
+then :
+  printf "%s\n" "#define HAVE_MKNODAT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "mktime" "ac_cv_func_mktime"
+if test "x$ac_cv_func_mktime" = xyes
+then :
+  printf "%s\n" "#define HAVE_MKTIME 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "mremap" "ac_cv_func_mremap"
+if test "x$ac_cv_func_mremap" = xyes
+then :
+  printf "%s\n" "#define HAVE_MREMAP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "nice" "ac_cv_func_nice"
+if test "x$ac_cv_func_nice" = xyes
+then :
+  printf "%s\n" "#define HAVE_NICE 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "openat" "ac_cv_func_openat"
+if test "x$ac_cv_func_openat" = xyes
+then :
+  printf "%s\n" "#define HAVE_OPENAT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "pathconf" "ac_cv_func_pathconf"
+if test "x$ac_cv_func_pathconf" = xyes
+then :
+  printf "%s\n" "#define HAVE_PATHCONF 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "pause" "ac_cv_func_pause"
+if test "x$ac_cv_func_pause" = xyes
+then :
+  printf "%s\n" "#define HAVE_PAUSE 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "pipe2" "ac_cv_func_pipe2"
+if test "x$ac_cv_func_pipe2" = xyes
+then :
+  printf "%s\n" "#define HAVE_PIPE2 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "plock" "ac_cv_func_plock"
+if test "x$ac_cv_func_plock" = xyes
+then :
+  printf "%s\n" "#define HAVE_PLOCK 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll"
+if test "x$ac_cv_func_poll" = xyes
+then :
+  printf "%s\n" "#define HAVE_POLL 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "posix_fallocate" "ac_cv_func_posix_fallocate"
+if test "x$ac_cv_func_posix_fallocate" = xyes
+then :
+  printf "%s\n" "#define HAVE_POSIX_FALLOCATE 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "posix_fadvise" "ac_cv_func_posix_fadvise"
+if test "x$ac_cv_func_posix_fadvise" = xyes
+then :
+  printf "%s\n" "#define HAVE_POSIX_FADVISE 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "posix_spawn" "ac_cv_func_posix_spawn"
+if test "x$ac_cv_func_posix_spawn" = xyes
+then :
+  printf "%s\n" "#define HAVE_POSIX_SPAWN 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "posix_spawnp" "ac_cv_func_posix_spawnp"
+if test "x$ac_cv_func_posix_spawnp" = xyes
+then :
+  printf "%s\n" "#define HAVE_POSIX_SPAWNP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "pread" "ac_cv_func_pread"
+if test "x$ac_cv_func_pread" = xyes
+then :
+  printf "%s\n" "#define HAVE_PREAD 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "preadv" "ac_cv_func_preadv"
+if test "x$ac_cv_func_preadv" = xyes
+then :
+  printf "%s\n" "#define HAVE_PREADV 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "preadv2" "ac_cv_func_preadv2"
+if test "x$ac_cv_func_preadv2" = xyes
+then :
+  printf "%s\n" "#define HAVE_PREADV2 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "pthread_condattr_setclock" "ac_cv_func_pthread_condattr_setclock"
+if test "x$ac_cv_func_pthread_condattr_setclock" = xyes
+then :
+  printf "%s\n" "#define HAVE_PTHREAD_CONDATTR_SETCLOCK 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "pthread_init" "ac_cv_func_pthread_init"
+if test "x$ac_cv_func_pthread_init" = xyes
+then :
+  printf "%s\n" "#define HAVE_PTHREAD_INIT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "pthread_kill" "ac_cv_func_pthread_kill"
+if test "x$ac_cv_func_pthread_kill" = xyes
+then :
+  printf "%s\n" "#define HAVE_PTHREAD_KILL 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "pwrite" "ac_cv_func_pwrite"
+if test "x$ac_cv_func_pwrite" = xyes
+then :
+  printf "%s\n" "#define HAVE_PWRITE 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "pwritev" "ac_cv_func_pwritev"
+if test "x$ac_cv_func_pwritev" = xyes
+then :
+  printf "%s\n" "#define HAVE_PWRITEV 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "pwritev2" "ac_cv_func_pwritev2"
+if test "x$ac_cv_func_pwritev2" = xyes
+then :
+  printf "%s\n" "#define HAVE_PWRITEV2 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "readlink" "ac_cv_func_readlink"
+if test "x$ac_cv_func_readlink" = xyes
+then :
+  printf "%s\n" "#define HAVE_READLINK 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "readlinkat" "ac_cv_func_readlinkat"
+if test "x$ac_cv_func_readlinkat" = xyes
+then :
+  printf "%s\n" "#define HAVE_READLINKAT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "readv" "ac_cv_func_readv"
+if test "x$ac_cv_func_readv" = xyes
+then :
+  printf "%s\n" "#define HAVE_READV 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "realpath" "ac_cv_func_realpath"
+if test "x$ac_cv_func_realpath" = xyes
+then :
+  printf "%s\n" "#define HAVE_REALPATH 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "renameat" "ac_cv_func_renameat"
+if test "x$ac_cv_func_renameat" = xyes
+then :
+  printf "%s\n" "#define HAVE_RENAMEAT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "sem_open" "ac_cv_func_sem_open"
+if test "x$ac_cv_func_sem_open" = xyes
+then :
+  printf "%s\n" "#define HAVE_SEM_OPEN 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "sem_timedwait" "ac_cv_func_sem_timedwait"
+if test "x$ac_cv_func_sem_timedwait" = xyes
+then :
+  printf "%s\n" "#define HAVE_SEM_TIMEDWAIT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "sem_getvalue" "ac_cv_func_sem_getvalue"
+if test "x$ac_cv_func_sem_getvalue" = xyes
+then :
+  printf "%s\n" "#define HAVE_SEM_GETVALUE 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "sem_unlink" "ac_cv_func_sem_unlink"
+if test "x$ac_cv_func_sem_unlink" = xyes
+then :
+  printf "%s\n" "#define HAVE_SEM_UNLINK 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "sendfile" "ac_cv_func_sendfile"
+if test "x$ac_cv_func_sendfile" = xyes
+then :
+  printf "%s\n" "#define HAVE_SENDFILE 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "setegid" "ac_cv_func_setegid"
+if test "x$ac_cv_func_setegid" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETEGID 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "seteuid" "ac_cv_func_seteuid"
+if test "x$ac_cv_func_seteuid" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETEUID 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "setgid" "ac_cv_func_setgid"
+if test "x$ac_cv_func_setgid" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETGID 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "sethostname" "ac_cv_func_sethostname"
+if test "x$ac_cv_func_sethostname" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETHOSTNAME 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "setlocale" "ac_cv_func_setlocale"
+if test "x$ac_cv_func_setlocale" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETLOCALE 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "setregid" "ac_cv_func_setregid"
+if test "x$ac_cv_func_setregid" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETREGID 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "setreuid" "ac_cv_func_setreuid"
+if test "x$ac_cv_func_setreuid" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETREUID 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "setresuid" "ac_cv_func_setresuid"
+if test "x$ac_cv_func_setresuid" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETRESUID 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "setresgid" "ac_cv_func_setresgid"
+if test "x$ac_cv_func_setresgid" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETRESGID 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "setsid" "ac_cv_func_setsid"
+if test "x$ac_cv_func_setsid" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETSID 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "setpgid" "ac_cv_func_setpgid"
+if test "x$ac_cv_func_setpgid" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETPGID 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "setpgrp" "ac_cv_func_setpgrp"
+if test "x$ac_cv_func_setpgrp" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETPGRP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "setpriority" "ac_cv_func_setpriority"
+if test "x$ac_cv_func_setpriority" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETPRIORITY 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "setuid" "ac_cv_func_setuid"
+if test "x$ac_cv_func_setuid" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETUID 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "setvbuf" "ac_cv_func_setvbuf"
+if test "x$ac_cv_func_setvbuf" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETVBUF 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "sched_get_priority_max" "ac_cv_func_sched_get_priority_max"
+if test "x$ac_cv_func_sched_get_priority_max" = xyes
+then :
+  printf "%s\n" "#define HAVE_SCHED_GET_PRIORITY_MAX 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "sched_setaffinity" "ac_cv_func_sched_setaffinity"
+if test "x$ac_cv_func_sched_setaffinity" = xyes
+then :
+  printf "%s\n" "#define HAVE_SCHED_SETAFFINITY 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "sched_setscheduler" "ac_cv_func_sched_setscheduler"
+if test "x$ac_cv_func_sched_setscheduler" = xyes
+then :
+  printf "%s\n" "#define HAVE_SCHED_SETSCHEDULER 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "sched_setparam" "ac_cv_func_sched_setparam"
+if test "x$ac_cv_func_sched_setparam" = xyes
+then :
+  printf "%s\n" "#define HAVE_SCHED_SETPARAM 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "sched_rr_get_interval" "ac_cv_func_sched_rr_get_interval"
+if test "x$ac_cv_func_sched_rr_get_interval" = xyes
+then :
+  printf "%s\n" "#define HAVE_SCHED_RR_GET_INTERVAL 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction"
+if test "x$ac_cv_func_sigaction" = xyes
+then :
+  printf "%s\n" "#define HAVE_SIGACTION 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "sigaltstack" "ac_cv_func_sigaltstack"
+if test "x$ac_cv_func_sigaltstack" = xyes
+then :
+  printf "%s\n" "#define HAVE_SIGALTSTACK 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "sigfillset" "ac_cv_func_sigfillset"
+if test "x$ac_cv_func_sigfillset" = xyes
+then :
+  printf "%s\n" "#define HAVE_SIGFILLSET 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "siginterrupt" "ac_cv_func_siginterrupt"
+if test "x$ac_cv_func_siginterrupt" = xyes
+then :
+  printf "%s\n" "#define HAVE_SIGINTERRUPT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "sigpending" "ac_cv_func_sigpending"
+if test "x$ac_cv_func_sigpending" = xyes
+then :
+  printf "%s\n" "#define HAVE_SIGPENDING 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "sigrelse" "ac_cv_func_sigrelse"
+if test "x$ac_cv_func_sigrelse" = xyes
+then :
+  printf "%s\n" "#define HAVE_SIGRELSE 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "sigtimedwait" "ac_cv_func_sigtimedwait"
+if test "x$ac_cv_func_sigtimedwait" = xyes
+then :
+  printf "%s\n" "#define HAVE_SIGTIMEDWAIT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "sigwait" "ac_cv_func_sigwait"
+if test "x$ac_cv_func_sigwait" = xyes
+then :
+  printf "%s\n" "#define HAVE_SIGWAIT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "sigwaitinfo" "ac_cv_func_sigwaitinfo"
+if test "x$ac_cv_func_sigwaitinfo" = xyes
+then :
+  printf "%s\n" "#define HAVE_SIGWAITINFO 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf"
+if test "x$ac_cv_func_snprintf" = xyes
+then :
+  printf "%s\n" "#define HAVE_SNPRINTF 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "splice" "ac_cv_func_splice"
+if test "x$ac_cv_func_splice" = xyes
+then :
+  printf "%s\n" "#define HAVE_SPLICE 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime"
+if test "x$ac_cv_func_strftime" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRFTIME 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy"
+if test "x$ac_cv_func_strlcpy" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRLCPY 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strsignal" "ac_cv_func_strsignal"
+if test "x$ac_cv_func_strsignal" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRSIGNAL 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "symlinkat" "ac_cv_func_symlinkat"
+if test "x$ac_cv_func_symlinkat" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYMLINKAT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "sync" "ac_cv_func_sync"
+if test "x$ac_cv_func_sync" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYNC 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "sysconf" "ac_cv_func_sysconf"
+if test "x$ac_cv_func_sysconf" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYSCONF 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "tcgetpgrp" "ac_cv_func_tcgetpgrp"
+if test "x$ac_cv_func_tcgetpgrp" = xyes
+then :
+  printf "%s\n" "#define HAVE_TCGETPGRP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "tcsetpgrp" "ac_cv_func_tcsetpgrp"
+if test "x$ac_cv_func_tcsetpgrp" = xyes
+then :
+  printf "%s\n" "#define HAVE_TCSETPGRP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "tempnam" "ac_cv_func_tempnam"
+if test "x$ac_cv_func_tempnam" = xyes
+then :
+  printf "%s\n" "#define HAVE_TEMPNAM 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "timegm" "ac_cv_func_timegm"
+if test "x$ac_cv_func_timegm" = xyes
+then :
+  printf "%s\n" "#define HAVE_TIMEGM 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "times" "ac_cv_func_times"
+if test "x$ac_cv_func_times" = xyes
+then :
+  printf "%s\n" "#define HAVE_TIMES 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "tmpfile" "ac_cv_func_tmpfile"
+if test "x$ac_cv_func_tmpfile" = xyes
+then :
+  printf "%s\n" "#define HAVE_TMPFILE 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "tmpnam" "ac_cv_func_tmpnam"
+if test "x$ac_cv_func_tmpnam" = xyes
+then :
+  printf "%s\n" "#define HAVE_TMPNAM 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "tmpnam_r" "ac_cv_func_tmpnam_r"
+if test "x$ac_cv_func_tmpnam_r" = xyes
+then :
+  printf "%s\n" "#define HAVE_TMPNAM_R 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "truncate" "ac_cv_func_truncate"
+if test "x$ac_cv_func_truncate" = xyes
+then :
+  printf "%s\n" "#define HAVE_TRUNCATE 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "uname" "ac_cv_func_uname"
+if test "x$ac_cv_func_uname" = xyes
+then :
+  printf "%s\n" "#define HAVE_UNAME 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "unlinkat" "ac_cv_func_unlinkat"
+if test "x$ac_cv_func_unlinkat" = xyes
+then :
+  printf "%s\n" "#define HAVE_UNLINKAT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "utimensat" "ac_cv_func_utimensat"
+if test "x$ac_cv_func_utimensat" = xyes
+then :
+  printf "%s\n" "#define HAVE_UTIMENSAT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "utimes" "ac_cv_func_utimes"
+if test "x$ac_cv_func_utimes" = xyes
+then :
+  printf "%s\n" "#define HAVE_UTIMES 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "vfork" "ac_cv_func_vfork"
+if test "x$ac_cv_func_vfork" = xyes
+then :
+  printf "%s\n" "#define HAVE_VFORK 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "waitid" "ac_cv_func_waitid"
+if test "x$ac_cv_func_waitid" = xyes
+then :
+  printf "%s\n" "#define HAVE_WAITID 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "waitpid" "ac_cv_func_waitpid"
+if test "x$ac_cv_func_waitpid" = xyes
+then :
+  printf "%s\n" "#define HAVE_WAITPID 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "wait3" "ac_cv_func_wait3"
+if test "x$ac_cv_func_wait3" = xyes
+then :
+  printf "%s\n" "#define HAVE_WAIT3 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "wait4" "ac_cv_func_wait4"
+if test "x$ac_cv_func_wait4" = xyes
+then :
+  printf "%s\n" "#define HAVE_WAIT4 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "wcscoll" "ac_cv_func_wcscoll"
+if test "x$ac_cv_func_wcscoll" = xyes
+then :
+  printf "%s\n" "#define HAVE_WCSCOLL 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "wcsftime" "ac_cv_func_wcsftime"
+if test "x$ac_cv_func_wcsftime" = xyes
+then :
+  printf "%s\n" "#define HAVE_WCSFTIME 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "wcsxfrm" "ac_cv_func_wcsxfrm"
+if test "x$ac_cv_func_wcsxfrm" = xyes
+then :
+  printf "%s\n" "#define HAVE_WCSXFRM 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "wmemcmp" "ac_cv_func_wmemcmp"
+if test "x$ac_cv_func_wmemcmp" = xyes
+then :
+  printf "%s\n" "#define HAVE_WMEMCMP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "writev" "ac_cv_func_writev"
+if test "x$ac_cv_func_writev" = xyes
+then :
+  printf "%s\n" "#define HAVE_WRITEV 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "_getpty" "ac_cv_func__getpty"
+if test "x$ac_cv_func__getpty" = xyes
+then :
+  printf "%s\n" "#define HAVE__GETPTY 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "rtpSpawn" "ac_cv_func_rtpSpawn"
+if test "x$ac_cv_func_rtpSpawn" = xyes
+then :
+  printf "%s\n" "#define HAVE_RTPSPAWN 1" >>confdefs.h
+
+fi
+
+
+# Force lchmod off for Linux. Linux disallows changing the mode of symbolic
+# links. Some libc implementations have a stub lchmod implementation that always
+# returns an error.
+if test "$MACHDEP" != linux; then
+  ac_fn_c_check_func "$LINENO" "lchmod" "ac_cv_func_lchmod"
+if test "x$ac_cv_func_lchmod" = xyes
+then :
+  printf "%s\n" "#define HAVE_LCHMOD 1" >>confdefs.h
+
+fi
+
+fi
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5
+printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; }
+if test ${ac_cv_c_undeclared_builtin_options+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_save_CFLAGS=$CFLAGS
+   ac_cv_c_undeclared_builtin_options='cannot detect'
+   for ac_arg in '' -fno-builtin; do
+     CFLAGS="$ac_save_CFLAGS $ac_arg"
+     # This test program should *not* compile successfully.
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+(void) strchr;
+  ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_FCHDIR 1" >>confdefs.h
+else $as_nop
+  # This test program should compile successfully.
+        # No library function is consistently available on
+        # freestanding implementations, so test against a dummy
+        # declaration.  Include always-available headers on the
+        # off chance that they somehow elicit warnings.
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <float.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <stddef.h>
+extern void ac_decl (int, char *);
 
-   { $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; }
+int
+main (void)
+{
+(void) ac_decl (0, (char *) 0);
+  (void) ac_decl;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  if test x"$ac_arg" = x
+then :
+  ac_cv_c_undeclared_builtin_options='none needed'
+else $as_nop
+  ac_cv_c_undeclared_builtin_options=$ac_arg
+fi
+          break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+    done
+    CFLAGS=$ac_save_CFLAGS
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5
+printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; }
+  case $ac_cv_c_undeclared_builtin_options in #(
+  'cannot detect') :
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot make $CC report undeclared builtins
+See \`config.log' for more details" "$LINENO" 5; } ;; #(
+  'none needed') :
+    ac_c_undeclared_builtin_options='' ;; #(
+  *) :
+    ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;;
+esac
+
+ac_fn_check_decl "$LINENO" "dirfd" "ac_cv_have_decl_dirfd" "#include <sys/types.h>
+       #include <dirent.h>
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_dirfd" = xyes
+then :
+
+printf "%s\n" "#define HAVE_DIRFD 1" >>confdefs.h
+
+fi
+
+# For some functions, having a definition is not sufficient, since
+# we want to take their address.
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for chroot" >&5
+printf %s "checking for chroot... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <unistd.h>
+int
+main (void)
+{
+void *x=chroot
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+
+printf "%s\n" "#define HAVE_CHROOT 1" >>confdefs.h
+
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for link" >&5
+printf %s "checking for link... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <unistd.h>
+int
+main (void)
+{
+void *x=link
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+
+printf "%s\n" "#define HAVE_LINK 1" >>confdefs.h
+
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for symlink" >&5
+printf %s "checking for symlink... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <unistd.h>
+int
+main (void)
+{
+void *x=symlink
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+
+printf "%s\n" "#define HAVE_SYMLINK 1" >>confdefs.h
+
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fsync" >&5
-$as_echo_n "checking for fsync... " >&6; }
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fchdir" >&5
+printf %s "checking for fchdir... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <unistd.h>
 int
-main ()
+main (void)
+{
+void *x=fchdir
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+
+printf "%s\n" "#define HAVE_FCHDIR 1" >>confdefs.h
+
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fsync" >&5
+printf %s "checking for fsync... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <unistd.h>
+int
+main (void)
 {
 void *x=fsync
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_FSYNC 1" >>confdefs.h
+printf "%s\n" "#define HAVE_FSYNC 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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fdatasync" >&5
-$as_echo_n "checking for fdatasync... " >&6; }
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fdatasync" >&5
+printf %s "checking for fdatasync... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <unistd.h>
 int
-main ()
+main (void)
 {
 void *x=fdatasync
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_FDATASYNC 1" >>confdefs.h
+printf "%s\n" "#define HAVE_FDATASYNC 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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for epoll" >&5
-$as_echo_n "checking for epoll... " >&6; }
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for epoll" >&5
+printf %s "checking for epoll... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/epoll.h>
 int
-main ()
+main (void)
 {
 void *x=epoll_create
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_EPOLL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_EPOLL 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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for epoll_create1" >&5
-$as_echo_n "checking for epoll_create1... " >&6; }
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for epoll_create1" >&5
+printf %s "checking for epoll_create1... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/epoll.h>
 int
-main ()
+main (void)
 {
 void *x=epoll_create1
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_EPOLL_CREATE1 1" >>confdefs.h
+printf "%s\n" "#define HAVE_EPOLL_CREATE1 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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kqueue" >&5
-$as_echo_n "checking for kqueue... " >&6; }
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for kqueue" >&5
+printf %s "checking for kqueue... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -11983,27 +14072,28 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #include <sys/event.h>
 
 int
-main ()
+main (void)
 {
 int x=kqueue()
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_KQUEUE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_KQUEUE 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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prlimit" >&5
-$as_echo_n "checking for prlimit... " >&6; }
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for prlimit" >&5
+printf %s "checking for prlimit... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -12011,53 +14101,55 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #include <sys/resource.h>
 
 int
-main ()
+main (void)
 {
 void *x=prlimit
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_PRLIMIT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PRLIMIT 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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _dyld_shared_cache_contains_path" >&5
-$as_echo_n "checking for _dyld_shared_cache_contains_path... " >&6; }
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _dyld_shared_cache_contains_path" >&5
+printf %s "checking for _dyld_shared_cache_contains_path... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <mach-o/dyld.h>
 int
-main ()
+main (void)
 {
 void *x=_dyld_shared_cache_contains_path
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH 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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for memfd_create" >&5
-$as_echo_n "checking for memfd_create... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for memfd_create" >&5
+printf %s "checking for memfd_create... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -12069,28 +14161,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #endif
 
 int
-main ()
+main (void)
 {
 void *x=memfd_create
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_MEMFD_CREATE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_MEMFD_CREATE 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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for eventfd" >&5
-$as_echo_n "checking for eventfd... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for eventfd" >&5
+printf %s "checking for eventfd... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -12099,25 +14192,26 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #endif
 
 int
-main ()
+main (void)
 {
 int x = eventfd(0, EFD_CLOEXEC)
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_EVENTFD 1" >>confdefs.h
+printf "%s\n" "#define HAVE_EVENTFD 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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 # On some systems (eg. FreeBSD 5), we would find a definition of the
 # functions ctermid_r, setgroups in the library, but no prototype
@@ -12125,44 +14219,46 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 # address to avoid compiler warnings and potential miscompilations
 # because of the missing prototypes.
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ctermid_r" >&5
-$as_echo_n "checking for ctermid_r... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ctermid_r" >&5
+printf %s "checking for ctermid_r... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
 
 int
-main ()
+main (void)
 {
 void* p = ctermid_r
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_CTERMID_R 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CTERMID_R 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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for flock declaration" >&5
-$as_echo_n "checking for flock declaration... " >&6; }
-if ${ac_cv_flock_decl+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for flock declaration" >&5
+printf %s "checking for flock declaration... " >&6; }
+if test ${ac_cv_flock_decl+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/file.h>
 int
-main ()
+main (void)
 {
 void* p = flock
 
@@ -12170,32 +14266,34 @@ void* p = flock
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_flock_decl=yes
-else
+else $as_nop
   ac_cv_flock_decl=no
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_flock_decl" >&5
-$as_echo "$ac_cv_flock_decl" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_flock_decl" >&5
+printf "%s\n" "$ac_cv_flock_decl" >&6; }
 if test "x${ac_cv_flock_decl}" = xyes; then
-  for ac_func in flock
-do :
-  ac_fn_c_check_func "$LINENO" "flock" "ac_cv_func_flock"
-if test "x$ac_cv_func_flock" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_FLOCK 1
-_ACEOF
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for flock in -lbsd" >&5
-$as_echo_n "checking for flock in -lbsd... " >&6; }
-if ${ac_cv_lib_bsd_flock+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  for ac_func in flock
+do :
+  ac_fn_c_check_func "$LINENO" "flock" "ac_cv_func_flock"
+if test "x$ac_cv_func_flock" = xyes
+then :
+  printf "%s\n" "#define HAVE_FLOCK 1" >>confdefs.h
+
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for flock in -lbsd" >&5
+printf %s "checking for flock in -lbsd... " >&6; }
+if test ${ac_cv_lib_bsd_flock+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12204,109 +14302,111 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char flock ();
 int
-main ()
+main (void)
 {
 return flock ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_bsd_flock=yes
-else
+else $as_nop
   ac_cv_lib_bsd_flock=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_flock" >&5
-$as_echo "$ac_cv_lib_bsd_flock" >&6; }
-if test "x$ac_cv_lib_bsd_flock" = xyes; then :
-  $as_echo "#define HAVE_FLOCK 1" >>confdefs.h
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_flock" >&5
+printf "%s\n" "$ac_cv_lib_bsd_flock" >&6; }
+if test "x$ac_cv_lib_bsd_flock" = xyes
+then :
+  printf "%s\n" "#define HAVE_FLOCK 1" >>confdefs.h
 
 
-$as_echo "#define FLOCK_NEEDS_LIBBSD 1" >>confdefs.h
+printf "%s\n" "#define FLOCK_NEEDS_LIBBSD 1" >>confdefs.h
 
 
 fi
 
 
 fi
-done
 
+done
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpagesize" >&5
-$as_echo_n "checking for getpagesize... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getpagesize" >&5
+printf %s "checking for getpagesize... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <unistd.h>
 
 int
-main ()
+main (void)
 {
 void* p = getpagesize
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_GETPAGESIZE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GETPAGESIZE 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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken unsetenv" >&5
-$as_echo_n "checking for broken unsetenv... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for broken unsetenv" >&5
+printf %s "checking for broken unsetenv... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdlib.h>
 
 int
-main ()
+main (void)
 {
 int res = unsetenv("DUMMY")
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-else
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+else $as_nop
 
-$as_echo "#define HAVE_BROKEN_UNSETENV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_BROKEN_UNSETENV 1" >>confdefs.h
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 for ac_prog in true
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_TRUE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_TRUE+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$TRUE"; then
   ac_cv_prog_TRUE="$TRUE" # Let the user override the test.
 else
@@ -12314,11 +14414,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_TRUE="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -12329,11 +14433,11 @@ fi
 fi
 TRUE=$ac_cv_prog_TRUE
 if test -n "$TRUE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TRUE" >&5
-$as_echo "$TRUE" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TRUE" >&5
+printf "%s\n" "$TRUE" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -12342,11 +14446,12 @@ done
 test -n "$TRUE" || TRUE="/bin/true"
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lc" >&5
-$as_echo_n "checking for inet_aton in -lc... " >&6; }
-if ${ac_cv_lib_c_inet_aton+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lc" >&5
+printf %s "checking for inet_aton in -lc... " >&6; }
+if test ${ac_cv_lib_c_inet_aton+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12355,37 +14460,37 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char inet_aton ();
 int
-main ()
+main (void)
 {
 return inet_aton ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_c_inet_aton=yes
-else
+else $as_nop
   ac_cv_lib_c_inet_aton=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_inet_aton" >&5
-$as_echo "$ac_cv_lib_c_inet_aton" >&6; }
-if test "x$ac_cv_lib_c_inet_aton" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_inet_aton" >&5
+printf "%s\n" "$ac_cv_lib_c_inet_aton" >&6; }
+if test "x$ac_cv_lib_c_inet_aton" = xyes
+then :
   $ac_cv_prog_TRUE
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lresolv" >&5
-$as_echo_n "checking for inet_aton in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv_inet_aton+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lresolv" >&5
+printf %s "checking for inet_aton in -lresolv... " >&6; }
+if test ${ac_cv_lib_resolv_inet_aton+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12394,33 +14499,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char inet_aton ();
 int
-main ()
+main (void)
 {
 return inet_aton ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_resolv_inet_aton=yes
-else
+else $as_nop
   ac_cv_lib_resolv_inet_aton=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_inet_aton" >&5
-$as_echo "$ac_cv_lib_resolv_inet_aton" >&6; }
-if test "x$ac_cv_lib_resolv_inet_aton" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBRESOLV 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_inet_aton" >&5
+printf "%s\n" "$ac_cv_lib_resolv_inet_aton" >&6; }
+if test "x$ac_cv_lib_resolv_inet_aton" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBRESOLV 1" >>confdefs.h
 
   LIBS="-lresolv $LIBS"
 
@@ -12432,14 +14534,16 @@ fi
 
 # On Tru64, chflags seems to be present, but calling it will
 # exit Python
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for chflags" >&5
-$as_echo_n "checking for chflags... " >&6; }
-if ${ac_cv_have_chflags+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for chflags" >&5
+printf %s "checking for chflags... " >&6; }
+if test ${ac_cv_have_chflags+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
   ac_cv_have_chflags=cross
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -12453,9 +14557,10 @@ int main(int argc, char*argv[])
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_have_chflags=yes
-else
+else $as_nop
   ac_cv_have_chflags=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -12464,31 +14569,34 @@ fi
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_chflags" >&5
-$as_echo "$ac_cv_have_chflags" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_chflags" >&5
+printf "%s\n" "$ac_cv_have_chflags" >&6; }
 if test "$ac_cv_have_chflags" = cross ; then
   ac_fn_c_check_func "$LINENO" "chflags" "ac_cv_func_chflags"
-if test "x$ac_cv_func_chflags" = xyes; then :
+if test "x$ac_cv_func_chflags" = xyes
+then :
   ac_cv_have_chflags="yes"
-else
+else $as_nop
   ac_cv_have_chflags="no"
 fi
 
 fi
 if test "$ac_cv_have_chflags" = yes ; then
 
-$as_echo "#define HAVE_CHFLAGS 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CHFLAGS 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lchflags" >&5
-$as_echo_n "checking for lchflags... " >&6; }
-if ${ac_cv_have_lchflags+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lchflags" >&5
+printf %s "checking for lchflags... " >&6; }
+if test ${ac_cv_have_lchflags+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
   ac_cv_have_lchflags=cross
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -12502,9 +14610,10 @@ int main(int argc, char*argv[])
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_have_lchflags=yes
-else
+else $as_nop
   ac_cv_have_lchflags=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -12513,20 +14622,21 @@ fi
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_lchflags" >&5
-$as_echo "$ac_cv_have_lchflags" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_lchflags" >&5
+printf "%s\n" "$ac_cv_have_lchflags" >&6; }
 if test "$ac_cv_have_lchflags" = cross ; then
   ac_fn_c_check_func "$LINENO" "lchflags" "ac_cv_func_lchflags"
-if test "x$ac_cv_func_lchflags" = xyes; then :
+if test "x$ac_cv_func_lchflags" = xyes
+then :
   ac_cv_have_lchflags="yes"
-else
+else $as_nop
   ac_cv_have_lchflags="no"
 fi
 
 fi
 if test "$ac_cv_have_lchflags" = yes ; then
 
-$as_echo "#define HAVE_LCHFLAGS 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LCHFLAGS 1" >>confdefs.h
 
 fi
 
@@ -12539,11 +14649,12 @@ Darwin/*)
 	;;
 esac
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lz" >&5
-$as_echo_n "checking for inflateCopy in -lz... " >&6; }
-if ${ac_cv_lib_z_inflateCopy+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lz" >&5
+printf %s "checking for inflateCopy in -lz... " >&6; }
+if test ${ac_cv_lib_z_inflateCopy+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lz  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12552,32 +14663,31 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char inflateCopy ();
 int
-main ()
+main (void)
 {
 return inflateCopy ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_z_inflateCopy=yes
-else
+else $as_nop
   ac_cv_lib_z_inflateCopy=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflateCopy" >&5
-$as_echo "$ac_cv_lib_z_inflateCopy" >&6; }
-if test "x$ac_cv_lib_z_inflateCopy" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflateCopy" >&5
+printf "%s\n" "$ac_cv_lib_z_inflateCopy" >&6; }
+if test "x$ac_cv_lib_z_inflateCopy" = xyes
+then :
 
-$as_echo "#define HAVE_ZLIB_COPY 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ZLIB_COPY 1" >>confdefs.h
 
 fi
 
@@ -12589,37 +14699,38 @@ Darwin/*)
 	;;
 esac
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for hstrerror" >&5
-$as_echo_n "checking for hstrerror... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for hstrerror" >&5
+printf %s "checking for hstrerror... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <netdb.h>
 
 int
-main ()
+main (void)
 {
 void* p = hstrerror; hstrerror(0)
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
-$as_echo "#define HAVE_HSTRERROR 1" >>confdefs.h
+printf "%s\n" "#define HAVE_HSTRERROR 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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton" >&5
-$as_echo_n "checking for inet_aton... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inet_aton" >&5
+printf %s "checking for inet_aton... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -12629,29 +14740,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #include <arpa/inet.h>
 
 int
-main ()
+main (void)
 {
 void* p = inet_aton;inet_aton(0,0)
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
-$as_echo "#define HAVE_INET_ATON 1" >>confdefs.h
+printf "%s\n" "#define HAVE_INET_ATON 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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_pton" >&5
-$as_echo_n "checking for inet_pton... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inet_pton" >&5
+printf %s "checking for inet_pton... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -12661,29 +14773,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #include <arpa/inet.h>
 
 int
-main ()
+main (void)
 {
 void* p = inet_pton
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_INET_PTON 1" >>confdefs.h
+printf "%s\n" "#define HAVE_INET_PTON 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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 # On some systems, setgroups is in unistd.h, on others, in grp.h
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for setgroups" >&5
-$as_echo_n "checking for setgroups... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for setgroups" >&5
+printf %s "checking for setgroups... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -12693,42 +14806,44 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #endif
 
 int
-main ()
+main (void)
 {
 void* p = setgroups
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_SETGROUPS 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SETGROUPS 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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 # check for openpty and forkpty
 
-for ac_func in openpty
+
+  for ac_func in openpty
 do :
   ac_fn_c_check_func "$LINENO" "openpty" "ac_cv_func_openpty"
-if test "x$ac_cv_func_openpty" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_OPENPTY 1
-_ACEOF
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty in -lutil" >&5
-$as_echo_n "checking for openpty in -lutil... " >&6; }
-if ${ac_cv_lib_util_openpty+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+if test "x$ac_cv_func_openpty" = xyes
+then :
+  printf "%s\n" "#define HAVE_OPENPTY 1" >>confdefs.h
+
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openpty in -lutil" >&5
+printf %s "checking for openpty in -lutil... " >&6; }
+if test ${ac_cv_lib_util_openpty+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12737,38 +14852,38 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char openpty ();
 int
-main ()
+main (void)
 {
 return openpty ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_util_openpty=yes
-else
+else $as_nop
   ac_cv_lib_util_openpty=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_openpty" >&5
-$as_echo "$ac_cv_lib_util_openpty" >&6; }
-if test "x$ac_cv_lib_util_openpty" = xyes; then :
-  $as_echo "#define HAVE_OPENPTY 1" >>confdefs.h
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_openpty" >&5
+printf "%s\n" "$ac_cv_lib_util_openpty" >&6; }
+if test "x$ac_cv_lib_util_openpty" = xyes
+then :
+  printf "%s\n" "#define HAVE_OPENPTY 1" >>confdefs.h
  LIBS="$LIBS -lutil"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty in -lbsd" >&5
-$as_echo_n "checking for openpty in -lbsd... " >&6; }
-if ${ac_cv_lib_bsd_openpty+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openpty in -lbsd" >&5
+printf %s "checking for openpty in -lbsd... " >&6; }
+if test ${ac_cv_lib_bsd_openpty+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12777,31 +14892,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char openpty ();
 int
-main ()
+main (void)
 {
 return openpty ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_bsd_openpty=yes
-else
+else $as_nop
   ac_cv_lib_bsd_openpty=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_openpty" >&5
-$as_echo "$ac_cv_lib_bsd_openpty" >&6; }
-if test "x$ac_cv_lib_bsd_openpty" = xyes; then :
-  $as_echo "#define HAVE_OPENPTY 1" >>confdefs.h
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_openpty" >&5
+printf "%s\n" "$ac_cv_lib_bsd_openpty" >&6; }
+if test "x$ac_cv_lib_bsd_openpty" = xyes
+then :
+  printf "%s\n" "#define HAVE_OPENPTY 1" >>confdefs.h
  LIBS="$LIBS -lbsd"
 fi
 
@@ -12810,22 +14924,23 @@ fi
 
 
 fi
+
 done
 
-for ac_func in forkpty
+  for ac_func in forkpty
 do :
   ac_fn_c_check_func "$LINENO" "forkpty" "ac_cv_func_forkpty"
-if test "x$ac_cv_func_forkpty" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_FORKPTY 1
-_ACEOF
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for forkpty in -lutil" >&5
-$as_echo_n "checking for forkpty in -lutil... " >&6; }
-if ${ac_cv_lib_util_forkpty+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+if test "x$ac_cv_func_forkpty" = xyes
+then :
+  printf "%s\n" "#define HAVE_FORKPTY 1" >>confdefs.h
+
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for forkpty in -lutil" >&5
+printf %s "checking for forkpty in -lutil... " >&6; }
+if test ${ac_cv_lib_util_forkpty+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12834,38 +14949,38 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char forkpty ();
 int
-main ()
+main (void)
 {
 return forkpty ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_util_forkpty=yes
-else
+else $as_nop
   ac_cv_lib_util_forkpty=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_forkpty" >&5
-$as_echo "$ac_cv_lib_util_forkpty" >&6; }
-if test "x$ac_cv_lib_util_forkpty" = xyes; then :
-  $as_echo "#define HAVE_FORKPTY 1" >>confdefs.h
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_forkpty" >&5
+printf "%s\n" "$ac_cv_lib_util_forkpty" >&6; }
+if test "x$ac_cv_lib_util_forkpty" = xyes
+then :
+  printf "%s\n" "#define HAVE_FORKPTY 1" >>confdefs.h
  LIBS="$LIBS -lutil"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for forkpty in -lbsd" >&5
-$as_echo_n "checking for forkpty in -lbsd... " >&6; }
-if ${ac_cv_lib_bsd_forkpty+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for forkpty in -lbsd" >&5
+printf %s "checking for forkpty in -lbsd... " >&6; }
+if test ${ac_cv_lib_bsd_forkpty+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12874,31 +14989,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char forkpty ();
 int
-main ()
+main (void)
 {
 return forkpty ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_bsd_forkpty=yes
-else
+else $as_nop
   ac_cv_lib_bsd_forkpty=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_forkpty" >&5
-$as_echo "$ac_cv_lib_bsd_forkpty" >&6; }
-if test "x$ac_cv_lib_bsd_forkpty" = xyes; then :
-  $as_echo "#define HAVE_FORKPTY 1" >>confdefs.h
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_forkpty" >&5
+printf "%s\n" "$ac_cv_lib_bsd_forkpty" >&6; }
+if test "x$ac_cv_lib_bsd_forkpty" = xyes
+then :
+  printf "%s\n" "#define HAVE_FORKPTY 1" >>confdefs.h
  LIBS="$LIBS -lbsd"
 fi
 
@@ -12907,28 +15021,54 @@ fi
 
 
 fi
-done
 
+done
 
 # check for long file support functions
-for ac_func in fseek64 fseeko fstatvfs ftell64 ftello statvfs
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "fseek64" "ac_cv_func_fseek64"
+if test "x$ac_cv_func_fseek64" = xyes
+then :
+  printf "%s\n" "#define HAVE_FSEEK64 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "fseeko" "ac_cv_func_fseeko"
+if test "x$ac_cv_func_fseeko" = xyes
+then :
+  printf "%s\n" "#define HAVE_FSEEKO 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "fstatvfs" "ac_cv_func_fstatvfs"
+if test "x$ac_cv_func_fstatvfs" = xyes
+then :
+  printf "%s\n" "#define HAVE_FSTATVFS 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "ftell64" "ac_cv_func_ftell64"
+if test "x$ac_cv_func_ftell64" = xyes
+then :
+  printf "%s\n" "#define HAVE_FTELL64 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "ftello" "ac_cv_func_ftello"
+if test "x$ac_cv_func_ftello" = xyes
+then :
+  printf "%s\n" "#define HAVE_FTELLO 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "statvfs" "ac_cv_func_statvfs"
+if test "x$ac_cv_func_statvfs" = xyes
+then :
+  printf "%s\n" "#define HAVE_STATVFS 1" >>confdefs.h
 
 fi
-done
 
 
 ac_fn_c_check_func "$LINENO" "dup2" "ac_cv_func_dup2"
-if test "x$ac_cv_func_dup2" = xyes; then :
-  $as_echo "#define HAVE_DUP2 1" >>confdefs.h
+if test "x$ac_cv_func_dup2" = xyes
+then :
+  printf "%s\n" "#define HAVE_DUP2 1" >>confdefs.h
 
-else
+else $as_nop
   case " $LIBOBJS " in
   *" dup2.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS dup2.$ac_objext"
@@ -12938,70 +15078,72 @@ esac
 fi
 
 
-for ac_func in getpgrp
+  for ac_func in getpgrp
 do :
   ac_fn_c_check_func "$LINENO" "getpgrp" "ac_cv_func_getpgrp"
-if test "x$ac_cv_func_getpgrp" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GETPGRP 1
-_ACEOF
+if test "x$ac_cv_func_getpgrp" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETPGRP 1" >>confdefs.h
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <unistd.h>
 int
-main ()
+main (void)
 {
 getpgrp(0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define GETPGRP_HAVE_ARG 1" >>confdefs.h
+printf "%s\n" "#define GETPGRP_HAVE_ARG 1" >>confdefs.h
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
+
 done
 
-for ac_func in setpgrp
+  for ac_func in setpgrp
 do :
   ac_fn_c_check_func "$LINENO" "setpgrp" "ac_cv_func_setpgrp"
-if test "x$ac_cv_func_setpgrp" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SETPGRP 1
-_ACEOF
+if test "x$ac_cv_func_setpgrp" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETPGRP 1" >>confdefs.h
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <unistd.h>
 int
-main ()
+main (void)
 {
 setpgrp(0,0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define SETPGRP_HAVE_ARG 1" >>confdefs.h
+printf "%s\n" "#define SETPGRP_HAVE_ARG 1" >>confdefs.h
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-done
 
+done
 
 # We search for both crypt and crypt_r as one or the other may be defined
 # This gets us our -lcrypt in LIBS when required on the target platform.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5
-$as_echo_n "checking for library containing crypt... " >&6; }
-if ${ac_cv_search_crypt+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5
+printf %s "checking for library containing crypt... " >&6; }
+if test ${ac_cv_search_crypt+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -13009,55 +15151,58 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char crypt ();
 int
-main ()
+main (void)
 {
 return crypt ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' crypt; do
+for ac_lib in '' crypt
+do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  if ac_fn_c_try_link "$LINENO"; then :
+  if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_search_crypt=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext
-  if ${ac_cv_search_crypt+:} false; then :
+  if test ${ac_cv_search_crypt+y}
+then :
   break
 fi
 done
-if ${ac_cv_search_crypt+:} false; then :
+if test ${ac_cv_search_crypt+y}
+then :
 
-else
+else $as_nop
   ac_cv_search_crypt=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_crypt" >&5
-$as_echo "$ac_cv_search_crypt" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_crypt" >&5
+printf "%s\n" "$ac_cv_search_crypt" >&6; }
 ac_res=$ac_cv_search_crypt
-if test "$ac_res" != no; then :
+if test "$ac_res" != no
+then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt_r" >&5
-$as_echo_n "checking for library containing crypt_r... " >&6; }
-if ${ac_cv_search_crypt_r+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing crypt_r" >&5
+printf %s "checking for library containing crypt_r... " >&6; }
+if test ${ac_cv_search_crypt_r+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -13065,53 +15210,56 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char crypt_r ();
 int
-main ()
+main (void)
 {
 return crypt_r ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' crypt; do
+for ac_lib in '' crypt
+do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  if ac_fn_c_try_link "$LINENO"; then :
+  if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_search_crypt_r=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext
-  if ${ac_cv_search_crypt_r+:} false; then :
+  if test ${ac_cv_search_crypt_r+y}
+then :
   break
 fi
 done
-if ${ac_cv_search_crypt_r+:} false; then :
+if test ${ac_cv_search_crypt_r+y}
+then :
 
-else
+else $as_nop
   ac_cv_search_crypt_r=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_crypt_r" >&5
-$as_echo "$ac_cv_search_crypt_r" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_crypt_r" >&5
+printf "%s\n" "$ac_cv_search_crypt_r" >&6; }
 ac_res=$ac_cv_search_crypt_r
-if test "$ac_res" != no; then :
+if test "$ac_res" != no
+then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 
 ac_fn_c_check_func "$LINENO" "crypt_r" "ac_cv_func_crypt_r"
-if test "x$ac_cv_func_crypt_r" = xyes; then :
+if test "x$ac_cv_func_crypt_r" = xyes
+then :
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -13119,7 +15267,7 @@ if test "x$ac_cv_func_crypt_r" = xyes; then :
 #include <crypt.h>
 
 int
-main ()
+main (void)
 {
 
 struct crypt_data d;
@@ -13129,31 +15277,33 @@ char *r = crypt_r("", "", &d);
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_CRYPT_R 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CRYPT_R 1" >>confdefs.h
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
 
 
-for ac_func in clock_gettime
+
+  for ac_func in clock_gettime
 do :
   ac_fn_c_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime"
-if test "x$ac_cv_func_clock_gettime" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_CLOCK_GETTIME 1
-_ACEOF
-
-else
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
-$as_echo_n "checking for clock_gettime in -lrt... " >&6; }
-if ${ac_cv_lib_rt_clock_gettime+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+if test "x$ac_cv_func_clock_gettime" = xyes
+then :
+  printf "%s\n" "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
+
+else $as_nop
+
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
+printf %s "checking for clock_gettime in -lrt... " >&6; }
+if test ${ac_cv_lib_rt_clock_gettime+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13162,60 +15312,60 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char clock_gettime ();
 int
-main ()
+main (void)
 {
 return clock_gettime ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_rt_clock_gettime=yes
-else
+else $as_nop
   ac_cv_lib_rt_clock_gettime=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
-$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
-if test "x$ac_cv_lib_rt_clock_gettime" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
+printf "%s\n" "$ac_cv_lib_rt_clock_gettime" >&6; }
+if test "x$ac_cv_lib_rt_clock_gettime" = xyes
+then :
 
         LIBS="$LIBS -lrt"
-        $as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
+        printf "%s\n" "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
 
 
-$as_echo "#define TIMEMODULE_LIB rt" >>confdefs.h
+printf "%s\n" "#define TIMEMODULE_LIB rt" >>confdefs.h
 
 
 fi
 
 
 fi
+
 done
 
 
-for ac_func in clock_getres
+  for ac_func in clock_getres
 do :
   ac_fn_c_check_func "$LINENO" "clock_getres" "ac_cv_func_clock_getres"
-if test "x$ac_cv_func_clock_getres" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_CLOCK_GETRES 1
-_ACEOF
-
-else
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_getres in -lrt" >&5
-$as_echo_n "checking for clock_getres in -lrt... " >&6; }
-if ${ac_cv_lib_rt_clock_getres+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+if test "x$ac_cv_func_clock_getres" = xyes
+then :
+  printf "%s\n" "#define HAVE_CLOCK_GETRES 1" >>confdefs.h
+
+else $as_nop
+
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_getres in -lrt" >&5
+printf %s "checking for clock_getres in -lrt... " >&6; }
+if test ${ac_cv_lib_rt_clock_getres+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13224,56 +15374,56 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char clock_getres ();
 int
-main ()
+main (void)
 {
 return clock_getres ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_rt_clock_getres=yes
-else
+else $as_nop
   ac_cv_lib_rt_clock_getres=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_getres" >&5
-$as_echo "$ac_cv_lib_rt_clock_getres" >&6; }
-if test "x$ac_cv_lib_rt_clock_getres" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_getres" >&5
+printf "%s\n" "$ac_cv_lib_rt_clock_getres" >&6; }
+if test "x$ac_cv_lib_rt_clock_getres" = xyes
+then :
 
-        $as_echo "#define HAVE_CLOCK_GETRES 1" >>confdefs.h
+        printf "%s\n" "#define HAVE_CLOCK_GETRES 1" >>confdefs.h
 
 
 fi
 
 
 fi
+
 done
 
 
-for ac_func in clock_settime
+  for ac_func in clock_settime
 do :
   ac_fn_c_check_func "$LINENO" "clock_settime" "ac_cv_func_clock_settime"
-if test "x$ac_cv_func_clock_settime" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_CLOCK_SETTIME 1
-_ACEOF
-
-else
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_settime in -lrt" >&5
-$as_echo_n "checking for clock_settime in -lrt... " >&6; }
-if ${ac_cv_lib_rt_clock_settime+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+if test "x$ac_cv_func_clock_settime" = xyes
+then :
+  printf "%s\n" "#define HAVE_CLOCK_SETTIME 1" >>confdefs.h
+
+else $as_nop
+
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_settime in -lrt" >&5
+printf %s "checking for clock_settime in -lrt... " >&6; }
+if test ${ac_cv_lib_rt_clock_settime+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13282,43 +15432,42 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char clock_settime ();
 int
-main ()
+main (void)
 {
 return clock_settime ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_rt_clock_settime=yes
-else
+else $as_nop
   ac_cv_lib_rt_clock_settime=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_settime" >&5
-$as_echo "$ac_cv_lib_rt_clock_settime" >&6; }
-if test "x$ac_cv_lib_rt_clock_settime" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_settime" >&5
+printf "%s\n" "$ac_cv_lib_rt_clock_settime" >&6; }
+if test "x$ac_cv_lib_rt_clock_settime" = xyes
+then :
 
-        $as_echo "#define HAVE_CLOCK_SETTIME 1" >>confdefs.h
+        printf "%s\n" "#define HAVE_CLOCK_SETTIME 1" >>confdefs.h
 
 
 fi
 
 
 fi
-done
 
+done
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for major" >&5
-$as_echo_n "checking for major... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for major" >&5
+printf %s "checking for major... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -13331,7 +15480,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #endif
 
 int
-main ()
+main (void)
 {
 
   makedev(major(0),minor(0));
@@ -13340,27 +15489,28 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
 
-$as_echo "#define HAVE_DEVICE_MACROS 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DEVICE_MACROS 1" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 # On OSF/1 V5.1, getaddrinfo is available, but a define
 # for [no]getaddrinfo in netdb.h.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5
-$as_echo_n "checking for getaddrinfo... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5
+printf %s "checking for getaddrinfo... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -13370,37 +15520,40 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #include <stdio.h>
 
 int
-main ()
+main (void)
 {
 getaddrinfo(NULL, NULL, NULL, NULL);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   have_getaddrinfo=yes
-else
+else $as_nop
   have_getaddrinfo=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_getaddrinfo" >&5
-$as_echo "$have_getaddrinfo" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_getaddrinfo" >&5
+printf "%s\n" "$have_getaddrinfo" >&6; }
 if test $have_getaddrinfo = yes
 then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking getaddrinfo bug" >&5
-$as_echo_n "checking getaddrinfo bug... " >&6; }
-  if ${ac_cv_buggy_getaddrinfo+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking getaddrinfo bug" >&5
+printf %s "checking getaddrinfo bug... " >&6; }
+  if test ${ac_cv_buggy_getaddrinfo+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
 
 if test "${enable_ipv6+set}" = set; then
   ac_cv_buggy_getaddrinfo="no -- configured with --(en|dis)able-ipv6"
 else
   ac_cv_buggy_getaddrinfo=yes
 fi
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -13494,9 +15647,10 @@ int main()
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_buggy_getaddrinfo=no
-else
+else $as_nop
   ac_cv_buggy_getaddrinfo=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -13507,8 +15661,8 @@ fi
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_buggy_getaddrinfo" >&5
-$as_echo "$ac_cv_buggy_getaddrinfo" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_buggy_getaddrinfo" >&5
+printf "%s\n" "$ac_cv_buggy_getaddrinfo" >&6; }
 
 if test $have_getaddrinfo = no || test "$ac_cv_buggy_getaddrinfo" = yes
 then
@@ -13520,70 +15674,42 @@ then
 	fi
 else
 
-$as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GETADDRINFO 1" >>confdefs.h
 
 fi
 
-for ac_func in getnameinfo
-do :
-  ac_fn_c_check_func "$LINENO" "getnameinfo" "ac_cv_func_getnameinfo"
-if test "x$ac_cv_func_getnameinfo" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GETNAMEINFO 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "getnameinfo" "ac_cv_func_getnameinfo"
+if test "x$ac_cv_func_getnameinfo" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETNAMEINFO 1" >>confdefs.h
 
 fi
-done
 
 
 # checks for structures
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
-$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if ${ac_cv_header_time+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
 
-int
-main ()
-{
-if ((struct tm *) 0)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_time=yes
-else
-  ac_cv_header_time=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
-$as_echo "$ac_cv_header_time" >&6; }
-if test $ac_cv_header_time = yes; then
 
-$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
+# Obsolete code to be removed.
+if test $ac_cv_header_sys_time_h = yes; then
+
+printf "%s\n" "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
 
 fi
+# End of obsolete code.
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
-$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if ${ac_cv_struct_tm+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
+printf %s "checking whether struct tm is in sys/time.h or time.h... " >&6; }
+if test ${ac_cv_struct_tm+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <time.h>
 
 int
-main ()
+main (void)
 {
 struct tm tm;
 				     int *p = &tm.tm_sec;
@@ -13592,18 +15718,19 @@ struct tm tm;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_struct_tm=time.h
-else
+else $as_nop
   ac_cv_struct_tm=sys/time.h
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
-$as_echo "$ac_cv_struct_tm" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
+printf "%s\n" "$ac_cv_struct_tm" >&6; }
 if test $ac_cv_struct_tm = sys/time.h; then
 
-$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
+printf "%s\n" "#define TM_IN_SYS_TIME 1" >>confdefs.h
 
 fi
 
@@ -13611,37 +15738,35 @@ ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_
 #include <$ac_cv_struct_tm>
 
 "
-if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then :
+if test "x$ac_cv_member_struct_tm_tm_zone" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_TM_TM_ZONE 1
-_ACEOF
+printf "%s\n" "#define HAVE_STRUCT_TM_TM_ZONE 1" >>confdefs.h
 
 
 fi
 
 if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
 
-$as_echo "#define HAVE_TM_ZONE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_TM_ZONE 1" >>confdefs.h
 
 else
-  ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
-"
-if test "x$ac_cv_have_decl_tzname" = xyes; then :
+  ac_fn_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_tzname" = xyes
+then :
   ac_have_decl=1
-else
+else $as_nop
   ac_have_decl=0
 fi
+printf "%s\n" "#define HAVE_DECL_TZNAME $ac_have_decl" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_TZNAME $ac_have_decl
-_ACEOF
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
-$as_echo_n "checking for tzname... " >&6; }
-if ${ac_cv_var_tzname+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
+printf %s "checking for tzname... " >&6; }
+if test ${ac_cv_var_tzname+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <time.h>
@@ -13650,86 +15775,81 @@ extern char *tzname[];
 #endif
 
 int
-main ()
+main (void)
 {
 return tzname[0][0];
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_var_tzname=yes
-else
+else $as_nop
   ac_cv_var_tzname=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5
-$as_echo "$ac_cv_var_tzname" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5
+printf "%s\n" "$ac_cv_var_tzname" >&6; }
   if test $ac_cv_var_tzname = yes; then
 
-$as_echo "#define HAVE_TZNAME 1" >>confdefs.h
+printf "%s\n" "#define HAVE_TZNAME 1" >>confdefs.h
 
   fi
 fi
 
 ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_rdev" = xyes; then :
+if test "x$ac_cv_member_struct_stat_st_rdev" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_RDEV 1
-_ACEOF
+printf "%s\n" "#define HAVE_STRUCT_STAT_ST_RDEV 1" >>confdefs.h
 
 
 fi
 
 ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_blksize" = xyes; then :
+if test "x$ac_cv_member_struct_stat_st_blksize" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-_ACEOF
+printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BLKSIZE 1" >>confdefs.h
 
 
 fi
 
 ac_fn_c_check_member "$LINENO" "struct stat" "st_flags" "ac_cv_member_struct_stat_st_flags" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_flags" = xyes; then :
+if test "x$ac_cv_member_struct_stat_st_flags" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_FLAGS 1
-_ACEOF
+printf "%s\n" "#define HAVE_STRUCT_STAT_ST_FLAGS 1" >>confdefs.h
 
 
 fi
 
 ac_fn_c_check_member "$LINENO" "struct stat" "st_gen" "ac_cv_member_struct_stat_st_gen" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_gen" = xyes; then :
+if test "x$ac_cv_member_struct_stat_st_gen" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_GEN 1
-_ACEOF
+printf "%s\n" "#define HAVE_STRUCT_STAT_ST_GEN 1" >>confdefs.h
 
 
 fi
 
 ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtime" "ac_cv_member_struct_stat_st_birthtime" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_birthtime" = xyes; then :
+if test "x$ac_cv_member_struct_stat_st_birthtime" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1
-_ACEOF
+printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1" >>confdefs.h
 
 
 fi
 
 ac_fn_c_check_member "$LINENO" "struct stat" "st_blocks" "ac_cv_member_struct_stat_st_blocks" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_blocks" = xyes; then :
+if test "x$ac_cv_member_struct_stat_st_blocks" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_BLOCKS 1
-_ACEOF
+printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BLOCKS 1" >>confdefs.h
 
 
 fi
@@ -13739,11 +15859,10 @@ ac_fn_c_check_member "$LINENO" "struct passwd" "pw_gecos" "ac_cv_member_struct_p
   #include <pwd.h>
 
 "
-if test "x$ac_cv_member_struct_passwd_pw_gecos" = xyes; then :
+if test "x$ac_cv_member_struct_passwd_pw_gecos" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_PASSWD_PW_GECOS 1
-_ACEOF
+printf "%s\n" "#define HAVE_STRUCT_PASSWD_PW_GECOS 1" >>confdefs.h
 
 
 fi
@@ -13752,11 +15871,10 @@ ac_fn_c_check_member "$LINENO" "struct passwd" "pw_passwd" "ac_cv_member_struct_
   #include <pwd.h>
 
 "
-if test "x$ac_cv_member_struct_passwd_pw_passwd" = xyes; then :
+if test "x$ac_cv_member_struct_passwd_pw_passwd" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_PASSWD_PW_PASSWD 1
-_ACEOF
+printf "%s\n" "#define HAVE_STRUCT_PASSWD_PW_PASSWD 1" >>confdefs.h
 
 
 fi
@@ -13764,53 +15882,54 @@ fi
 # Issue #21085: In Cygwin, siginfo_t does not have si_band field.
 ac_fn_c_check_member "$LINENO" "siginfo_t" "si_band" "ac_cv_member_siginfo_t_si_band" "#include <signal.h>
 "
-if test "x$ac_cv_member_siginfo_t_si_band" = xyes; then :
+if test "x$ac_cv_member_siginfo_t_si_band" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_SIGINFO_T_SI_BAND 1
-_ACEOF
+printf "%s\n" "#define HAVE_SIGINFO_T_SI_BAND 1" >>confdefs.h
 
 
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for time.h that defines altzone" >&5
-$as_echo_n "checking for time.h that defines altzone... " >&6; }
-if ${ac_cv_header_time_altzone+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for time.h that defines altzone" >&5
+printf %s "checking for time.h that defines altzone... " >&6; }
+if test ${ac_cv_header_time_altzone+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <time.h>
 int
-main ()
+main (void)
 {
 return altzone;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_header_time_altzone=yes
-else
+else $as_nop
   ac_cv_header_time_altzone=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time_altzone" >&5
-$as_echo "$ac_cv_header_time_altzone" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time_altzone" >&5
+printf "%s\n" "$ac_cv_header_time_altzone" >&6; }
 if test $ac_cv_header_time_altzone = yes; then
 
-$as_echo "#define HAVE_ALTZONE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ALTZONE 1" >>confdefs.h
 
 fi
 
 was_it_defined=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/select.h and sys/time.h may both be included" >&5
-$as_echo_n "checking whether sys/select.h and sys/time.h may both be included... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether sys/select.h and sys/time.h may both be included" >&5
+printf %s "checking whether sys/select.h and sys/time.h may both be included... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -13819,96 +15938,102 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #include <sys/time.h>
 
 int
-main ()
+main (void)
 {
 ;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
 
-$as_echo "#define SYS_SELECT_WITH_SYS_TIME 1" >>confdefs.h
+printf "%s\n" "#define SYS_SELECT_WITH_SYS_TIME 1" >>confdefs.h
 
   was_it_defined=yes
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $was_it_defined" >&5
-$as_echo "$was_it_defined" >&6; }
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $was_it_defined" >&5
+printf "%s\n" "$was_it_defined" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for addrinfo" >&5
-$as_echo_n "checking for addrinfo... " >&6; }
-if ${ac_cv_struct_addrinfo+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for addrinfo" >&5
+printf %s "checking for addrinfo... " >&6; }
+if test ${ac_cv_struct_addrinfo+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <netdb.h>
 int
-main ()
+main (void)
 {
 struct addrinfo a
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_struct_addrinfo=yes
-else
+else $as_nop
   ac_cv_struct_addrinfo=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_addrinfo" >&5
-$as_echo "$ac_cv_struct_addrinfo" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_addrinfo" >&5
+printf "%s\n" "$ac_cv_struct_addrinfo" >&6; }
 if test $ac_cv_struct_addrinfo = yes; then
 
-$as_echo "#define HAVE_ADDRINFO 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ADDRINFO 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sockaddr_storage" >&5
-$as_echo_n "checking for sockaddr_storage... " >&6; }
-if ${ac_cv_struct_sockaddr_storage+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sockaddr_storage" >&5
+printf %s "checking for sockaddr_storage... " >&6; }
+if test ${ac_cv_struct_sockaddr_storage+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #		include <sys/types.h>
 #		include <sys/socket.h>
 int
-main ()
+main (void)
 {
 struct sockaddr_storage s
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_struct_sockaddr_storage=yes
-else
+else $as_nop
   ac_cv_struct_sockaddr_storage=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_sockaddr_storage" >&5
-$as_echo "$ac_cv_struct_sockaddr_storage" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_sockaddr_storage" >&5
+printf "%s\n" "$ac_cv_struct_sockaddr_storage" >&6; }
 if test $ac_cv_struct_sockaddr_storage = yes; then
 
-$as_echo "#define HAVE_SOCKADDR_STORAGE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SOCKADDR_STORAGE 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sockaddr_alg" >&5
-$as_echo_n "checking for sockaddr_alg... " >&6; }
-if ${ac_cv_struct_sockaddr_alg+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sockaddr_alg" >&5
+printf %s "checking for sockaddr_alg... " >&6; }
+if test ${ac_cv_struct_sockaddr_alg+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -13916,41 +16041,43 @@ else
 #		include <sys/socket.h>
 #		include <linux/if_alg.h>
 int
-main ()
+main (void)
 {
 struct sockaddr_alg s
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_struct_sockaddr_alg=yes
-else
+else $as_nop
   ac_cv_struct_sockaddr_alg=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_sockaddr_alg" >&5
-$as_echo "$ac_cv_struct_sockaddr_alg" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_sockaddr_alg" >&5
+printf "%s\n" "$ac_cv_struct_sockaddr_alg" >&6; }
 if test $ac_cv_struct_sockaddr_alg = yes; then
 
-$as_echo "#define HAVE_SOCKADDR_ALG 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SOCKADDR_ALG 1" >>confdefs.h
 
 fi
 
 # checks for compiler characteristics
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether char is unsigned" >&5
-$as_echo_n "checking whether char is unsigned... " >&6; }
-if ${ac_cv_c_char_unsigned+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether char is unsigned" >&5
+printf %s "checking whether char is unsigned... " >&6; }
+if test ${ac_cv_c_char_unsigned+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
-main ()
+main (void)
 {
 static int test_array [1 - 2 * !(((char) -1) < 0)];
 test_array [0] = 0;
@@ -13960,30 +16087,32 @@ return test_array [0];
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_c_char_unsigned=no
-else
+else $as_nop
   ac_cv_c_char_unsigned=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_char_unsigned" >&5
-$as_echo "$ac_cv_c_char_unsigned" >&6; }
-if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
-  $as_echo "#define __CHAR_UNSIGNED__ 1" >>confdefs.h
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_char_unsigned" >&5
+printf "%s\n" "$ac_cv_c_char_unsigned" >&6; }
+if test $ac_cv_c_char_unsigned = yes; then
+  printf "%s\n" "#define __CHAR_UNSIGNED__ 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
-$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if ${ac_cv_c_const+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+printf %s "checking for an ANSI C-conforming const... " >&6; }
+if test ${ac_cv_c_const+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
 #ifndef __cplusplus
@@ -13996,7 +16125,7 @@ main ()
   /* NEC SVR4.0.2 mips cc rejects this.  */
   struct point {int x, y;};
   static struct point const zero = {0,0};
-  /* AIX XL C 1.02.0.0 rejects this.
+  /* IBM XL C 1.02.0.0 rejects this.
      It does not let you subtract one const X* pointer from another in
      an arm of an if-expression whose if-part is not a constant
      expression */
@@ -14024,7 +16153,7 @@ main ()
     iptr p = 0;
     ++p;
   }
-  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
+  { /* IBM XL C 1.02.0.0 rejects this sort of thing, saying
        "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
     struct s { int j; const int *ap[3]; } bx;
     struct s *b = &bx; b->j = 5;
@@ -14040,75 +16169,78 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_c_const=yes
-else
+else $as_nop
   ac_cv_c_const=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
-$as_echo "$ac_cv_c_const" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+printf "%s\n" "$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
-$as_echo "#define const /**/" >>confdefs.h
+printf "%s\n" "#define const /**/" >>confdefs.h
 
 fi
 
 
 works=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working signed char" >&5
-$as_echo_n "checking for working signed char... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working signed char" >&5
+printf %s "checking for working signed char... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 signed char c;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   works=yes
-else
+else $as_nop
 
-$as_echo "#define signed /**/" >>confdefs.h
+printf "%s\n" "#define signed /**/" >>confdefs.h
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $works" >&5
-$as_echo "$works" >&6; }
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $works" >&5
+printf "%s\n" "$works" >&6; }
 
 have_prototypes=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototypes" >&5
-$as_echo_n "checking for prototypes... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for prototypes" >&5
+printf %s "checking for prototypes... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int foo(int x) { return 0; }
 int
-main ()
+main (void)
 {
 return foo(10);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_PROTOTYPES 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PROTOTYPES 1" >>confdefs.h
 
    have_prototypes=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_prototypes" >&5
-$as_echo "$have_prototypes" >&6; }
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_prototypes" >&5
+printf "%s\n" "$have_prototypes" >&6; }
 
 works=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for variable length prototypes and stdarg.h" >&5
-$as_echo_n "checking for variable length prototypes and stdarg.h... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for variable length prototypes and stdarg.h" >&5
+printf %s "checking for variable length prototypes and stdarg.h... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -14123,28 +16255,29 @@ int foo(int x, ...) {
 }
 
 int
-main ()
+main (void)
 {
 return foo(10, "", 3.14);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
 
-$as_echo "#define HAVE_STDARG_PROTOTYPES 1" >>confdefs.h
+printf "%s\n" "#define HAVE_STDARG_PROTOTYPES 1" >>confdefs.h
 
   works=yes
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $works" >&5
-$as_echo "$works" >&6; }
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $works" >&5
+printf "%s\n" "$works" >&6; }
 
 # check for socketpair
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socketpair" >&5
-$as_echo_n "checking for socketpair... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socketpair" >&5
+printf %s "checking for socketpair... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -14152,35 +16285,36 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #include <sys/socket.h>
 
 int
-main ()
+main (void)
 {
 void *x=socketpair
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_SOCKETPAIR 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SOCKETPAIR 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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 # check if sockaddr has sa_len member
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if sockaddr has sa_len member" >&5
-$as_echo_n "checking if sockaddr has sa_len member... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if sockaddr has sa_len member" >&5
+printf %s "checking if sockaddr has sa_len member... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <sys/socket.h>
 int
-main ()
+main (void)
 {
 struct sockaddr x;
 x.sa_len = 0;
@@ -14188,29 +16322,31 @@ x.sa_len = 0;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 # sigh -- gethostbyname_r is a mess; it can have 3, 5 or 6 arguments :-(
 
 
 ac_fn_c_check_func "$LINENO" "gethostbyname_r" "ac_cv_func_gethostbyname_r"
-if test "x$ac_cv_func_gethostbyname_r" = xyes; then :
+if test "x$ac_cv_func_gethostbyname_r" = xyes
+then :
 
-  $as_echo "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h
+  printf "%s\n" "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking gethostbyname_r with 6 args" >&5
-$as_echo_n "checking gethostbyname_r with 6 args... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking gethostbyname_r with 6 args" >&5
+printf %s "checking gethostbyname_r with 6 args... " >&6; }
   OLD_CFLAGS=$CFLAGS
   CFLAGS="$CFLAGS $MY_CPPFLAGS $MY_THREAD_CPPFLAGS $MY_CFLAGS"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14219,7 +16355,7 @@ $as_echo_n "checking gethostbyname_r with 6 args... " >&6; }
 #   include <netdb.h>
 
 int
-main ()
+main (void)
 {
 
     char *name;
@@ -14234,29 +16370,30 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-    $as_echo "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h
+    printf "%s\n" "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_GETHOSTBYNAME_R_6_ARG 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GETHOSTBYNAME_R_6_ARG 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking gethostbyname_r with 5 args" >&5
-$as_echo_n "checking gethostbyname_r with 5 args... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking gethostbyname_r with 5 args" >&5
+printf %s "checking gethostbyname_r with 5 args... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #       include <netdb.h>
 
 int
-main ()
+main (void)
 {
 
         char *name;
@@ -14271,29 +16408,30 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-        $as_echo "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h
+        printf "%s\n" "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_GETHOSTBYNAME_R_5_ARG 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GETHOSTBYNAME_R_5_ARG 1" >>confdefs.h
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking gethostbyname_r with 3 args" >&5
-$as_echo_n "checking gethostbyname_r with 3 args... " >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking gethostbyname_r with 3 args" >&5
+printf %s "checking gethostbyname_r with 3 args... " >&6; }
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #           include <netdb.h>
 
 int
-main ()
+main (void)
 {
 
             char *name;
@@ -14306,43 +16444,40 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-            $as_echo "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h
+            printf "%s\n" "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_GETHOSTBYNAME_R_3_ARG 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GETHOSTBYNAME_R_3_ARG 1" >>confdefs.h
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
-           { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+           { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   CFLAGS=$OLD_CFLAGS
 
-else
+else $as_nop
 
-  for ac_func in gethostbyname
-do :
   ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-if test "x$ac_cv_func_gethostbyname" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GETHOSTBYNAME 1
-_ACEOF
+if test "x$ac_cv_func_gethostbyname" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETHOSTBYNAME 1" >>confdefs.h
 
 fi
-done
 
 
 fi
@@ -14358,14 +16493,16 @@ fi
 
 # Linux requires this for correct f.p. operations
 ac_fn_c_check_func "$LINENO" "__fpu_control" "ac_cv_func___fpu_control"
-if test "x$ac_cv_func___fpu_control" = xyes; then :
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __fpu_control in -lieee" >&5
-$as_echo_n "checking for __fpu_control in -lieee... " >&6; }
-if ${ac_cv_lib_ieee___fpu_control+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+if test "x$ac_cv_func___fpu_control" = xyes
+then :
+
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __fpu_control in -lieee" >&5
+printf %s "checking for __fpu_control in -lieee... " >&6; }
+if test ${ac_cv_lib_ieee___fpu_control+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lieee  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14374,33 +16511,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __fpu_control ();
 int
-main ()
+main (void)
 {
 return __fpu_control ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_ieee___fpu_control=yes
-else
+else $as_nop
   ac_cv_lib_ieee___fpu_control=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ieee___fpu_control" >&5
-$as_echo "$ac_cv_lib_ieee___fpu_control" >&6; }
-if test "x$ac_cv_lib_ieee___fpu_control" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBIEEE 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ieee___fpu_control" >&5
+printf "%s\n" "$ac_cv_lib_ieee___fpu_control" >&6; }
+if test "x$ac_cv_lib_ieee___fpu_control" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBIEEE 1" >>confdefs.h
 
   LIBS="-lieee $LIBS"
 
@@ -14416,49 +16550,51 @@ case $ac_sys_system in
 Darwin) ;;
 *) LIBM=-lm
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-libm=STRING" >&5
-$as_echo_n "checking for --with-libm=STRING... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-libm=STRING" >&5
+printf %s "checking for --with-libm=STRING... " >&6; }
 
 # Check whether --with-libm was given.
-if test "${with_libm+set}" = set; then :
+if test ${with_libm+y}
+then :
   withval=$with_libm;
 if test "$withval" = no
 then LIBM=
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: force LIBM empty" >&5
-$as_echo "force LIBM empty" >&6; }
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: force LIBM empty" >&5
+printf "%s\n" "force LIBM empty" >&6; }
 elif test "$withval" != yes
 then LIBM=$withval
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: set LIBM=\"$withval\"" >&5
-$as_echo "set LIBM=\"$withval\"" >&6; }
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: set LIBM=\"$withval\"" >&5
+printf "%s\n" "set LIBM=\"$withval\"" >&6; }
 else as_fn_error $? "proper usage is --with-libm=STRING" "$LINENO" 5
 fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: default LIBM=\"$LIBM\"" >&5
-$as_echo "default LIBM=\"$LIBM\"" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: default LIBM=\"$LIBM\"" >&5
+printf "%s\n" "default LIBM=\"$LIBM\"" >&6; }
 fi
 
 
 # check for --with-libc=...
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-libc=STRING" >&5
-$as_echo_n "checking for --with-libc=STRING... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-libc=STRING" >&5
+printf %s "checking for --with-libc=STRING... " >&6; }
 
 # Check whether --with-libc was given.
-if test "${with_libc+set}" = set; then :
+if test ${with_libc+y}
+then :
   withval=$with_libc;
 if test "$withval" = no
 then LIBC=
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: force LIBC empty" >&5
-$as_echo "force LIBC empty" >&6; }
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: force LIBC empty" >&5
+printf "%s\n" "force LIBC empty" >&6; }
 elif test "$withval" != yes
 then LIBC=$withval
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: set LIBC=\"$withval\"" >&5
-$as_echo "set LIBC=\"$withval\"" >&6; }
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: set LIBC=\"$withval\"" >&5
+printf "%s\n" "set LIBC=\"$withval\"" >&6; }
 else as_fn_error $? "proper usage is --with-libc=STRING" "$LINENO" 5
 fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: default LIBC=\"$LIBC\"" >&5
-$as_echo "default LIBC=\"$LIBC\"" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: default LIBC=\"$LIBC\"" >&5
+printf "%s\n" "default LIBC=\"$LIBC\"" >&6; }
 fi
 
 
@@ -14466,13 +16602,13 @@ fi
 # * Check for gcc x64 inline assembler *
 # **************************************
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x64 gcc inline assembler" >&5
-$as_echo_n "checking for x64 gcc inline assembler... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for x64 gcc inline assembler" >&5
+printf %s "checking for x64 gcc inline assembler... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   __asm__ __volatile__ ("movq %rcx, %rax");
@@ -14481,19 +16617,20 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   have_gcc_asm_for_x64=yes
-else
+else $as_nop
   have_gcc_asm_for_x64=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gcc_asm_for_x64" >&5
-$as_echo "$have_gcc_asm_for_x64" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_gcc_asm_for_x64" >&5
+printf "%s\n" "$have_gcc_asm_for_x64" >&6; }
 if test "$have_gcc_asm_for_x64" = yes
 then
 
-$as_echo "#define HAVE_GCC_ASM_FOR_X64 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GCC_ASM_FOR_X64 1" >>confdefs.h
 
 fi
 
@@ -14501,11 +16638,12 @@ fi
 # * Check for various properties of floating point *
 # **************************************************
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether float word ordering is bigendian" >&5
-$as_echo_n "checking whether float word ordering is bigendian... " >&6; }
-if ${ax_cv_c_float_words_bigendian+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether float word ordering is bigendian" >&5
+printf %s "checking whether float word ordering is bigendian... " >&6; }
+if test ${ax_cv_c_float_words_bigendian+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
 
 ax_cv_c_float_words_bigendian=unknown
@@ -14517,7 +16655,8 @@ double d = 909042349670368103374704789055050114762116927356156320147971208440534
 
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
 
 if grep noonsees conftest.$ac_objext >/dev/null ; then
@@ -14533,15 +16672,15 @@ fi
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_c_float_words_bigendian" >&5
-$as_echo "$ax_cv_c_float_words_bigendian" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_c_float_words_bigendian" >&5
+printf "%s\n" "$ax_cv_c_float_words_bigendian" >&6; }
 
 case $ax_cv_c_float_words_bigendian in
   yes)
 
-$as_echo "#define FLOAT_WORDS_BIGENDIAN 1" >>confdefs.h
+printf "%s\n" "#define FLOAT_WORDS_BIGENDIAN 1" >>confdefs.h
  ;;
   no)
      ;;
@@ -14558,12 +16697,12 @@ esac
 if test "$ax_cv_c_float_words_bigendian" = "yes"
 then
 
-$as_echo "#define DOUBLE_IS_BIG_ENDIAN_IEEE754 1" >>confdefs.h
+printf "%s\n" "#define DOUBLE_IS_BIG_ENDIAN_IEEE754 1" >>confdefs.h
 
 elif test "$ax_cv_c_float_words_bigendian" = "no"
 then
 
-$as_echo "#define DOUBLE_IS_LITTLE_ENDIAN_IEEE754 1" >>confdefs.h
+printf "%s\n" "#define DOUBLE_IS_LITTLE_ENDIAN_IEEE754 1" >>confdefs.h
 
 else
   # Some ARM platforms use a mixed-endian representation for doubles.
@@ -14573,7 +16712,7 @@ else
   # FLOAT_WORDS_BIGENDIAN doesnt actually detect this case, but if it's not big
   # or little, then it must be this?
 
-$as_echo "#define DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754 1" >>confdefs.h
+printf "%s\n" "#define DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754 1" >>confdefs.h
 
 fi
 
@@ -14587,13 +16726,13 @@ fi
 # This inline assembler syntax may also work for suncc and icc,
 # so we try it on all platforms.
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can use gcc inline assembler to get and set x87 control word" >&5
-$as_echo_n "checking whether we can use gcc inline assembler to get and set x87 control word... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we can use gcc inline assembler to get and set x87 control word" >&5
+printf %s "checking whether we can use gcc inline assembler to get and set x87 control word... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   unsigned short cw;
@@ -14604,29 +16743,30 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   have_gcc_asm_for_x87=yes
-else
+else $as_nop
   have_gcc_asm_for_x87=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gcc_asm_for_x87" >&5
-$as_echo "$have_gcc_asm_for_x87" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_gcc_asm_for_x87" >&5
+printf "%s\n" "$have_gcc_asm_for_x87" >&6; }
 if test "$have_gcc_asm_for_x87" = yes
 then
 
-$as_echo "#define HAVE_GCC_ASM_FOR_X87 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GCC_ASM_FOR_X87 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can use gcc inline assembler to get and set mc68881 fpcr" >&5
-$as_echo_n "checking whether we can use gcc inline assembler to get and set mc68881 fpcr... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we can use gcc inline assembler to get and set mc68881 fpcr" >&5
+printf %s "checking whether we can use gcc inline assembler to get and set mc68881 fpcr... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   unsigned int fpcr;
@@ -14637,19 +16777,20 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   have_gcc_asm_for_mc68881=yes
-else
+else $as_nop
   have_gcc_asm_for_mc68881=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gcc_asm_for_mc68881" >&5
-$as_echo "$have_gcc_asm_for_mc68881" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_gcc_asm_for_mc68881" >&5
+printf "%s\n" "$have_gcc_asm_for_mc68881" >&6; }
 if test "$have_gcc_asm_for_mc68881" = yes
 then
 
-$as_echo "#define HAVE_GCC_ASM_FOR_MC68881 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GCC_ASM_FOR_MC68881 1" >>confdefs.h
 
 fi
 
@@ -14658,14 +16799,15 @@ fi
 # IEEE 754 platforms.  On IEEE 754, test should return 1 if rounding
 # mode is round-to-nearest and double rounding issues are present, and
 # 0 otherwise.  See http://bugs.python.org/issue2937 for more info.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x87-style double rounding" >&5
-$as_echo_n "checking for x87-style double rounding... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for x87-style double rounding" >&5
+printf %s "checking for x87-style double rounding... " >&6; }
 # $BASECFLAGS may affect the result
 ac_save_cc="$CC"
 CC="$CC $BASECFLAGS"
-if test "$cross_compiling" = yes; then :
+if test "$cross_compiling" = yes
+then :
   ac_cv_x87_double_rounding=no
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -14689,9 +16831,10 @@ int main() {
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_x87_double_rounding=no
-else
+else $as_nop
   ac_cv_x87_double_rounding=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -14699,12 +16842,12 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
 CC="$ac_save_cc"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_x87_double_rounding" >&5
-$as_echo "$ac_cv_x87_double_rounding" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_x87_double_rounding" >&5
+printf "%s\n" "$ac_cv_x87_double_rounding" >&6; }
 if test "$ac_cv_x87_double_rounding" = yes
 then
 
-$as_echo "#define X87_DOUBLE_ROUNDING 1" >>confdefs.h
+printf "%s\n" "#define X87_DOUBLE_ROUNDING 1" >>confdefs.h
 
 fi
 
@@ -14715,63 +16858,125 @@ fi
 LIBS_SAVE=$LIBS
 LIBS="$LIBS $LIBM"
 
-for ac_func in acosh asinh atanh copysign erf erfc expm1 finite gamma
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "acosh" "ac_cv_func_acosh"
+if test "x$ac_cv_func_acosh" = xyes
+then :
+  printf "%s\n" "#define HAVE_ACOSH 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "asinh" "ac_cv_func_asinh"
+if test "x$ac_cv_func_asinh" = xyes
+then :
+  printf "%s\n" "#define HAVE_ASINH 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "atanh" "ac_cv_func_atanh"
+if test "x$ac_cv_func_atanh" = xyes
+then :
+  printf "%s\n" "#define HAVE_ATANH 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "copysign" "ac_cv_func_copysign"
+if test "x$ac_cv_func_copysign" = xyes
+then :
+  printf "%s\n" "#define HAVE_COPYSIGN 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "erf" "ac_cv_func_erf"
+if test "x$ac_cv_func_erf" = xyes
+then :
+  printf "%s\n" "#define HAVE_ERF 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "erfc" "ac_cv_func_erfc"
+if test "x$ac_cv_func_erfc" = xyes
+then :
+  printf "%s\n" "#define HAVE_ERFC 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "expm1" "ac_cv_func_expm1"
+if test "x$ac_cv_func_expm1" = xyes
+then :
+  printf "%s\n" "#define HAVE_EXPM1 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "finite" "ac_cv_func_finite"
+if test "x$ac_cv_func_finite" = xyes
+then :
+  printf "%s\n" "#define HAVE_FINITE 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "gamma" "ac_cv_func_gamma"
+if test "x$ac_cv_func_gamma" = xyes
+then :
+  printf "%s\n" "#define HAVE_GAMMA 1" >>confdefs.h
+
+fi
+
+ac_fn_c_check_func "$LINENO" "hypot" "ac_cv_func_hypot"
+if test "x$ac_cv_func_hypot" = xyes
+then :
+  printf "%s\n" "#define HAVE_HYPOT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "lgamma" "ac_cv_func_lgamma"
+if test "x$ac_cv_func_lgamma" = xyes
+then :
+  printf "%s\n" "#define HAVE_LGAMMA 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "log1p" "ac_cv_func_log1p"
+if test "x$ac_cv_func_log1p" = xyes
+then :
+  printf "%s\n" "#define HAVE_LOG1P 1" >>confdefs.h
 
 fi
-done
+ac_fn_c_check_func "$LINENO" "log2" "ac_cv_func_log2"
+if test "x$ac_cv_func_log2" = xyes
+then :
+  printf "%s\n" "#define HAVE_LOG2 1" >>confdefs.h
 
-for ac_func in hypot lgamma log1p log2 round tgamma
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+fi
+ac_fn_c_check_func "$LINENO" "round" "ac_cv_func_round"
+if test "x$ac_cv_func_round" = xyes
+then :
+  printf "%s\n" "#define HAVE_ROUND 1" >>confdefs.h
 
 fi
-done
+ac_fn_c_check_func "$LINENO" "tgamma" "ac_cv_func_tgamma"
+if test "x$ac_cv_func_tgamma" = xyes
+then :
+  printf "%s\n" "#define HAVE_TGAMMA 1" >>confdefs.h
 
-ac_fn_c_check_decl "$LINENO" "isinf" "ac_cv_have_decl_isinf" "#include <math.h>
-"
-if test "x$ac_cv_have_decl_isinf" = xyes; then :
+fi
+
+ac_fn_check_decl "$LINENO" "isinf" "ac_cv_have_decl_isinf" "#include <math.h>
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_isinf" = xyes
+then :
   ac_have_decl=1
-else
+else $as_nop
   ac_have_decl=0
 fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_ISINF $ac_have_decl
-_ACEOF
-ac_fn_c_check_decl "$LINENO" "isnan" "ac_cv_have_decl_isnan" "#include <math.h>
-"
-if test "x$ac_cv_have_decl_isnan" = xyes; then :
+printf "%s\n" "#define HAVE_DECL_ISINF $ac_have_decl" >>confdefs.h
+ac_fn_check_decl "$LINENO" "isnan" "ac_cv_have_decl_isnan" "#include <math.h>
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_isnan" = xyes
+then :
   ac_have_decl=1
-else
+else $as_nop
   ac_have_decl=0
 fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_ISNAN $ac_have_decl
-_ACEOF
-ac_fn_c_check_decl "$LINENO" "isfinite" "ac_cv_have_decl_isfinite" "#include <math.h>
-"
-if test "x$ac_cv_have_decl_isfinite" = xyes; then :
+printf "%s\n" "#define HAVE_DECL_ISNAN $ac_have_decl" >>confdefs.h
+ac_fn_check_decl "$LINENO" "isfinite" "ac_cv_have_decl_isfinite" "#include <math.h>
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_isfinite" = xyes
+then :
   ac_have_decl=1
-else
+else $as_nop
   ac_have_decl=0
 fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_ISFINITE $ac_have_decl
-_ACEOF
+printf "%s\n" "#define HAVE_DECL_ISFINITE $ac_have_decl" >>confdefs.h
 
 
 # For multiprocessing module, check that sem_open
@@ -14779,14 +16984,16 @@ _ACEOF
 # the kernel module that provides POSIX semaphores
 # isn't loaded by default, so an attempt to call
 # sem_open results in a 'Signal 12' error.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether POSIX semaphores are enabled" >&5
-$as_echo_n "checking whether POSIX semaphores are enabled... " >&6; }
-if ${ac_cv_posix_semaphores_enabled+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether POSIX semaphores are enabled" >&5
+printf %s "checking whether POSIX semaphores are enabled... " >&6; }
+if test ${ac_cv_posix_semaphores_enabled+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
   ac_cv_posix_semaphores_enabled=yes
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -14808,9 +17015,10 @@ int main(void) {
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_posix_semaphores_enabled=yes
-else
+else $as_nop
   ac_cv_posix_semaphores_enabled=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -14820,24 +17028,26 @@ fi
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_posix_semaphores_enabled" >&5
-$as_echo "$ac_cv_posix_semaphores_enabled" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_posix_semaphores_enabled" >&5
+printf "%s\n" "$ac_cv_posix_semaphores_enabled" >&6; }
 if test $ac_cv_posix_semaphores_enabled = no
 then
 
-$as_echo "#define POSIX_SEMAPHORES_NOT_ENABLED 1" >>confdefs.h
+printf "%s\n" "#define POSIX_SEMAPHORES_NOT_ENABLED 1" >>confdefs.h
 
 fi
 
 # Multiprocessing check for broken sem_getvalue
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken sem_getvalue" >&5
-$as_echo_n "checking for broken sem_getvalue... " >&6; }
-if ${ac_cv_broken_sem_getvalue+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for broken sem_getvalue" >&5
+printf %s "checking for broken sem_getvalue... " >&6; }
+if test ${ac_cv_broken_sem_getvalue+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
   ac_cv_broken_sem_getvalue=yes
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -14863,9 +17073,10 @@ int main(void){
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_broken_sem_getvalue=no
-else
+else $as_nop
   ac_cv_broken_sem_getvalue=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -14875,110 +17086,95 @@ fi
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_broken_sem_getvalue" >&5
-$as_echo "$ac_cv_broken_sem_getvalue" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_broken_sem_getvalue" >&5
+printf "%s\n" "$ac_cv_broken_sem_getvalue" >&6; }
 if test $ac_cv_broken_sem_getvalue = yes
 then
 
-$as_echo "#define HAVE_BROKEN_SEM_GETVALUE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_BROKEN_SEM_GETVALUE 1" >>confdefs.h
 
 fi
 
-ac_fn_c_check_decl "$LINENO" "RTLD_LAZY" "ac_cv_have_decl_RTLD_LAZY" "#include <dlfcn.h>
-"
-if test "x$ac_cv_have_decl_RTLD_LAZY" = xyes; then :
+ac_fn_check_decl "$LINENO" "RTLD_LAZY" "ac_cv_have_decl_RTLD_LAZY" "#include <dlfcn.h>
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_RTLD_LAZY" = xyes
+then :
   ac_have_decl=1
-else
+else $as_nop
   ac_have_decl=0
 fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_RTLD_LAZY $ac_have_decl
-_ACEOF
-ac_fn_c_check_decl "$LINENO" "RTLD_NOW" "ac_cv_have_decl_RTLD_NOW" "#include <dlfcn.h>
-"
-if test "x$ac_cv_have_decl_RTLD_NOW" = xyes; then :
+printf "%s\n" "#define HAVE_DECL_RTLD_LAZY $ac_have_decl" >>confdefs.h
+ac_fn_check_decl "$LINENO" "RTLD_NOW" "ac_cv_have_decl_RTLD_NOW" "#include <dlfcn.h>
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_RTLD_NOW" = xyes
+then :
   ac_have_decl=1
-else
+else $as_nop
   ac_have_decl=0
 fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_RTLD_NOW $ac_have_decl
-_ACEOF
-ac_fn_c_check_decl "$LINENO" "RTLD_GLOBAL" "ac_cv_have_decl_RTLD_GLOBAL" "#include <dlfcn.h>
-"
-if test "x$ac_cv_have_decl_RTLD_GLOBAL" = xyes; then :
+printf "%s\n" "#define HAVE_DECL_RTLD_NOW $ac_have_decl" >>confdefs.h
+ac_fn_check_decl "$LINENO" "RTLD_GLOBAL" "ac_cv_have_decl_RTLD_GLOBAL" "#include <dlfcn.h>
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_RTLD_GLOBAL" = xyes
+then :
   ac_have_decl=1
-else
+else $as_nop
   ac_have_decl=0
 fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_RTLD_GLOBAL $ac_have_decl
-_ACEOF
-ac_fn_c_check_decl "$LINENO" "RTLD_LOCAL" "ac_cv_have_decl_RTLD_LOCAL" "#include <dlfcn.h>
-"
-if test "x$ac_cv_have_decl_RTLD_LOCAL" = xyes; then :
+printf "%s\n" "#define HAVE_DECL_RTLD_GLOBAL $ac_have_decl" >>confdefs.h
+ac_fn_check_decl "$LINENO" "RTLD_LOCAL" "ac_cv_have_decl_RTLD_LOCAL" "#include <dlfcn.h>
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_RTLD_LOCAL" = xyes
+then :
   ac_have_decl=1
-else
+else $as_nop
   ac_have_decl=0
 fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_RTLD_LOCAL $ac_have_decl
-_ACEOF
-ac_fn_c_check_decl "$LINENO" "RTLD_NODELETE" "ac_cv_have_decl_RTLD_NODELETE" "#include <dlfcn.h>
-"
-if test "x$ac_cv_have_decl_RTLD_NODELETE" = xyes; then :
+printf "%s\n" "#define HAVE_DECL_RTLD_LOCAL $ac_have_decl" >>confdefs.h
+ac_fn_check_decl "$LINENO" "RTLD_NODELETE" "ac_cv_have_decl_RTLD_NODELETE" "#include <dlfcn.h>
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_RTLD_NODELETE" = xyes
+then :
   ac_have_decl=1
-else
+else $as_nop
   ac_have_decl=0
 fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_RTLD_NODELETE $ac_have_decl
-_ACEOF
-ac_fn_c_check_decl "$LINENO" "RTLD_NOLOAD" "ac_cv_have_decl_RTLD_NOLOAD" "#include <dlfcn.h>
-"
-if test "x$ac_cv_have_decl_RTLD_NOLOAD" = xyes; then :
+printf "%s\n" "#define HAVE_DECL_RTLD_NODELETE $ac_have_decl" >>confdefs.h
+ac_fn_check_decl "$LINENO" "RTLD_NOLOAD" "ac_cv_have_decl_RTLD_NOLOAD" "#include <dlfcn.h>
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_RTLD_NOLOAD" = xyes
+then :
   ac_have_decl=1
-else
+else $as_nop
   ac_have_decl=0
 fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_RTLD_NOLOAD $ac_have_decl
-_ACEOF
-ac_fn_c_check_decl "$LINENO" "RTLD_DEEPBIND" "ac_cv_have_decl_RTLD_DEEPBIND" "#include <dlfcn.h>
-"
-if test "x$ac_cv_have_decl_RTLD_DEEPBIND" = xyes; then :
+printf "%s\n" "#define HAVE_DECL_RTLD_NOLOAD $ac_have_decl" >>confdefs.h
+ac_fn_check_decl "$LINENO" "RTLD_DEEPBIND" "ac_cv_have_decl_RTLD_DEEPBIND" "#include <dlfcn.h>
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_RTLD_DEEPBIND" = xyes
+then :
   ac_have_decl=1
-else
+else $as_nop
   ac_have_decl=0
 fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_RTLD_DEEPBIND $ac_have_decl
-_ACEOF
-ac_fn_c_check_decl "$LINENO" "RTLD_MEMBER" "ac_cv_have_decl_RTLD_MEMBER" "#include <dlfcn.h>
-"
-if test "x$ac_cv_have_decl_RTLD_MEMBER" = xyes; then :
+printf "%s\n" "#define HAVE_DECL_RTLD_DEEPBIND $ac_have_decl" >>confdefs.h
+ac_fn_check_decl "$LINENO" "RTLD_MEMBER" "ac_cv_have_decl_RTLD_MEMBER" "#include <dlfcn.h>
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_RTLD_MEMBER" = xyes
+then :
   ac_have_decl=1
-else
+else $as_nop
   ac_have_decl=0
 fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_RTLD_MEMBER $ac_have_decl
-_ACEOF
+printf "%s\n" "#define HAVE_DECL_RTLD_MEMBER $ac_have_decl" >>confdefs.h
 
 
 # determine what size digit to use for Python's longs
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking digit size for Python's longs" >&5
-$as_echo_n "checking digit size for Python's longs... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking digit size for Python's longs" >&5
+printf %s "checking digit size for Python's longs... " >&6; }
 # Check whether --enable-big-digits was given.
-if test "${enable_big_digits+set}" = set; then :
+if test ${enable_big_digits+y}
+then :
   enableval=$enable_big_digits; case $enable_big_digits in
 yes)
   enable_big_digits=30 ;;
@@ -14989,36 +17185,34 @@ no)
 *)
   as_fn_error $? "bad value $enable_big_digits for --enable-big-digits; value should be 15 or 30" "$LINENO" 5 ;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_big_digits" >&5
-$as_echo "$enable_big_digits" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_big_digits" >&5
+printf "%s\n" "$enable_big_digits" >&6; }
 
-cat >>confdefs.h <<_ACEOF
-#define PYLONG_BITS_IN_DIGIT $enable_big_digits
-_ACEOF
+printf "%s\n" "#define PYLONG_BITS_IN_DIGIT $enable_big_digits" >>confdefs.h
 
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no value specified" >&5
-$as_echo "no value specified" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no value specified" >&5
+printf "%s\n" "no value specified" >&6; }
 fi
 
 
 # check for wchar.h
-ac_fn_c_check_header_mongrel "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$ac_includes_default"
-if test "x$ac_cv_header_wchar_h" = xyes; then :
+ac_fn_c_check_header_compile "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$ac_includes_default"
+if test "x$ac_cv_header_wchar_h" = xyes
+then :
 
 
-$as_echo "#define HAVE_WCHAR_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_WCHAR_H 1" >>confdefs.h
 
   wchar_h="yes"
 
-else
+else $as_nop
   wchar_h="no"
 
 fi
 
 
-
 # determine wchar_t size
 if test "$wchar_h" = yes
 then
@@ -15026,18 +17220,20 @@ then
 # 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 wchar_t" >&5
-$as_echo_n "checking size of wchar_t... " >&6; }
-if ${ac_cv_sizeof_wchar_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of wchar_t" >&5
+printf %s "checking size of wchar_t... " >&6; }
+if test ${ac_cv_sizeof_wchar_t+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (wchar_t))" "ac_cv_sizeof_wchar_t"        "#include <wchar.h>
-"; then :
+"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_wchar_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (wchar_t)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -15046,20 +17242,18 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_wchar_t" >&5
-$as_echo "$ac_cv_sizeof_wchar_t" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_wchar_t" >&5
+printf "%s\n" "$ac_cv_sizeof_wchar_t" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
-_ACEOF
+printf "%s\n" "#define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t" >>confdefs.h
 
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UCS-4 tcl" >&5
-$as_echo_n "checking for UCS-4 tcl... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for UCS-4 tcl" >&5
+printf %s "checking for UCS-4 tcl... " >&6; }
 have_ucs4_tcl=no
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -15069,38 +17263,41 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 # error "NOT UCS4_TCL"
 #endif
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
 
-$as_echo "#define HAVE_UCS4_TCL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_UCS4_TCL 1" >>confdefs.h
 
   have_ucs4_tcl=yes
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ucs4_tcl" >&5
-$as_echo "$have_ucs4_tcl" >&6; }
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_ucs4_tcl" >&5
+printf "%s\n" "$have_ucs4_tcl" >&6; }
 
 # check whether wchar_t is signed or not
 if test "$wchar_h" = yes
 then
   # check whether wchar_t is signed or not
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wchar_t is signed" >&5
-$as_echo_n "checking whether wchar_t is signed... " >&6; }
-  if ${ac_cv_wchar_t_signed+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  if test "$cross_compiling" = yes; then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether wchar_t is signed" >&5
+printf %s "checking whether wchar_t is signed... " >&6; }
+  if test ${ac_cv_wchar_t_signed+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+
+  if test "$cross_compiling" = yes
+then :
   ac_cv_wchar_t_signed=yes
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -15112,9 +17309,10 @@ else
   }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_wchar_t_signed=yes
-else
+else $as_nop
   ac_cv_wchar_t_signed=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -15123,24 +17321,24 @@ fi
 
 fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_wchar_t_signed" >&5
-$as_echo "$ac_cv_wchar_t_signed" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_wchar_t_signed" >&5
+printf "%s\n" "$ac_cv_wchar_t_signed" >&6; }
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wchar_t is usable" >&5
-$as_echo_n "checking whether wchar_t is usable... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether wchar_t is usable" >&5
+printf %s "checking whether wchar_t is usable... " >&6; }
 # wchar_t is only usable if it maps to an unsigned type
 if test "$ac_cv_sizeof_wchar_t" -ge 2 \
           -a "$ac_cv_wchar_t_signed" = "no"
 then
 
-$as_echo "#define HAVE_USABLE_WCHAR_T 1" >>confdefs.h
+printf "%s\n" "#define HAVE_USABLE_WCHAR_T 1" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 case $ac_sys_system/$ac_sys_release in
@@ -15152,7 +17350,7 @@ SunOS/*)
       # non-Unicode locales is not Unicode and hence cannot be used directly.
       # https://docs.oracle.com/cd/E37838_01/html/E61053/gmwke.html
 
-$as_echo "#define HAVE_NON_UNICODE_WCHAR_T_REPRESENTATION 1" >>confdefs.h
+printf "%s\n" "#define HAVE_NON_UNICODE_WCHAR_T_REPRESENTATION 1" >>confdefs.h
 
     fi
   fi
@@ -15160,11 +17358,12 @@ $as_echo "#define HAVE_NON_UNICODE_WCHAR_T_REPRESENTATION 1" >>confdefs.h
 esac
 
 # check for endianness
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if ${ac_cv_c_bigendian+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+printf %s "checking whether byte ordering is bigendian... " >&6; }
+if test ${ac_cv_c_bigendian+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_cv_c_bigendian=unknown
     # See if we're dealing with a universal compiler.
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15175,7 +17374,8 @@ else
 	     typedef int dummy;
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
 	# Check for potential -arch flags.  It is not universal unless
 	# there are at least two -arch flags with different values.
@@ -15199,7 +17399,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
 	 fi
        done
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
     if test $ac_cv_c_bigendian = unknown; then
       # See if sys/param.h defines the BYTE_ORDER macro.
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15208,7 +17408,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	     #include <sys/param.h>
 
 int
-main ()
+main (void)
 {
 #if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
 		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
@@ -15220,7 +17420,8 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   # It does; now see whether it defined to BIG_ENDIAN or not.
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -15228,7 +17429,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
 		#include <sys/param.h>
 
 int
-main ()
+main (void)
 {
 #if BYTE_ORDER != BIG_ENDIAN
 		 not big endian
@@ -15238,14 +17439,15 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_c_bigendian=yes
-else
+else $as_nop
   ac_cv_c_bigendian=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
     fi
     if test $ac_cv_c_bigendian = unknown; then
       # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
@@ -15254,7 +17456,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 #include <limits.h>
 
 int
-main ()
+main (void)
 {
 #if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
 	      bogus endian macros
@@ -15264,14 +17466,15 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   # It does; now see whether it defined to _BIG_ENDIAN or not.
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <limits.h>
 
 int
-main ()
+main (void)
 {
 #ifndef _BIG_ENDIAN
 		 not big endian
@@ -15281,31 +17484,33 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_c_bigendian=yes
-else
+else $as_nop
   ac_cv_c_bigendian=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
     fi
     if test $ac_cv_c_bigendian = unknown; then
       # Compile a test program.
-      if test "$cross_compiling" = yes; then :
+      if test "$cross_compiling" = yes
+then :
   # Try to guess by grepping values from an object file.
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-short int ascii_mm[] =
+unsigned short int ascii_mm[] =
 		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-		short int ascii_ii[] =
+		unsigned short int ascii_ii[] =
 		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
 		int use_ascii (int i) {
 		  return ascii_mm[i] + ascii_ii[i];
 		}
-		short int ebcdic_ii[] =
+		unsigned short int ebcdic_ii[] =
 		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-		short int ebcdic_mm[] =
+		unsigned short int ebcdic_mm[] =
 		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
 		int use_ebcdic (int i) {
 		  return ebcdic_mm[i] + ebcdic_ii[i];
@@ -15313,14 +17518,15 @@ short int ascii_mm[] =
 		extern int foo;
 
 int
-main ()
+main (void)
 {
 return use_ascii (foo) == use_ebcdic (foo);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
 	      ac_cv_c_bigendian=yes
 	    fi
@@ -15333,13 +17539,13 @@ if ac_fn_c_try_compile "$LINENO"; then :
 	      fi
 	    fi
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
-main ()
+main (void)
 {
 
 	     /* Are we little or big endian?  From Harbison&Steele.  */
@@ -15355,9 +17561,10 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_c_bigendian=no
-else
+else $as_nop
   ac_cv_c_bigendian=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -15366,17 +17573,17 @@ fi
 
     fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-$as_echo "$ac_cv_c_bigendian" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+printf "%s\n" "$ac_cv_c_bigendian" >&6; }
  case $ac_cv_c_bigendian in #(
    yes)
-     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
+     printf "%s\n" "#define WORDS_BIGENDIAN 1" >>confdefs.h
 ;; #(
    no)
       ;; #(
    universal)
 
-$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 
      ;; #(
    *)
@@ -15401,15 +17608,15 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 # In Python 3.2 and older, --with-wide-unicode added a 'u' flag.
 # In Python 3.7 and older, --with-pymalloc added a 'm' flag.
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking ABIFLAGS" >&5
-$as_echo_n "checking ABIFLAGS... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ABIFLAGS" >&5
-$as_echo "$ABIFLAGS" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking SOABI" >&5
-$as_echo_n "checking SOABI... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking ABIFLAGS" >&5
+printf %s "checking ABIFLAGS... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ABIFLAGS" >&5
+printf "%s\n" "$ABIFLAGS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking SOABI" >&5
+printf %s "checking SOABI... " >&6; }
 SOABI='cpython-'`echo $VERSION | tr -d .`${ABIFLAGS}${PLATFORM_TRIPLET:+-$PLATFORM_TRIPLET}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SOABI" >&5
-$as_echo "$SOABI" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SOABI" >&5
+printf "%s\n" "$SOABI" >&6; }
 
 # Release and debug (Py_DEBUG) ABI are compatible, but not Py_TRACE_REFS ABI
 if test "$Py_DEBUG" = 'true' -a "$with_trace_refs" != "yes"; then
@@ -15417,20 +17624,18 @@ if test "$Py_DEBUG" = 'true' -a "$with_trace_refs" != "yes"; then
 
   ALT_SOABI='cpython-'`echo $VERSION | tr -d .``echo $ABIFLAGS | tr -d d`${PLATFORM_TRIPLET:+-$PLATFORM_TRIPLET}
 
-cat >>confdefs.h <<_ACEOF
-#define ALT_SOABI "${ALT_SOABI}"
-_ACEOF
+printf "%s\n" "#define ALT_SOABI \"${ALT_SOABI}\"" >>confdefs.h
 
 fi
 
 
 EXT_SUFFIX=.${SOABI}${SHLIB_SUFFIX}
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking LDVERSION" >&5
-$as_echo_n "checking LDVERSION... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LDVERSION" >&5
+printf %s "checking LDVERSION... " >&6; }
 LDVERSION='$(VERSION)$(ABIFLAGS)'
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LDVERSION" >&5
-$as_echo "$LDVERSION" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LDVERSION" >&5
+printf "%s\n" "$LDVERSION" >&6; }
 
 # On Android and Cygwin the shared libraries must be linked with libpython.
 
@@ -15449,11 +17654,12 @@ BINLIBDEST='$(LIBDIR)/python$(VERSION)'
 # /usr/$LIDIRNAME/python$VERSION
 
 PLATLIBDIR="lib"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-platlibdir" >&5
-$as_echo_n "checking for --with-platlibdir... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-platlibdir" >&5
+printf %s "checking for --with-platlibdir... " >&6; }
 
 # Check whether --with-platlibdir was given.
-if test "${with_platlibdir+set}" = set; then :
+if test ${with_platlibdir+y}
+then :
   withval=$with_platlibdir;
 # ignore 3 options:
 #   --with-platlibdir
@@ -15461,17 +17667,17 @@ if test "${with_platlibdir+set}" = set; then :
 #   --without-platlibdir
 if test -n "$withval" -a "$withval" != yes -a "$withval" != no
 then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   PLATLIBDIR="$withval"
   BINLIBDEST='${exec_prefix}/${PLATLIBDIR}/python$(VERSION)'
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -15487,37 +17693,40 @@ fi
 # Check for --with-wheel-pkg-dir=PATH
 
 WHEEL_PKG_DIR=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-wheel-pkg-dir" >&5
-$as_echo_n "checking for --with-wheel-pkg-dir... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-wheel-pkg-dir" >&5
+printf %s "checking for --with-wheel-pkg-dir... " >&6; }
 
 # Check whether --with-wheel-pkg-dir was given.
-if test "${with_wheel_pkg_dir+set}" = set; then :
+if test ${with_wheel_pkg_dir+y}
+then :
   withval=$with_wheel_pkg_dir;
 if test -n "$withval"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   WHEEL_PKG_DIR="$withval"
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Check whether right shifting a negative integer extends the sign bit
 # or fills with zeros (like the Cray J90, according to Tim Peters).
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether right shift extends the sign bit" >&5
-$as_echo_n "checking whether right shift extends the sign bit... " >&6; }
-if ${ac_cv_rshift_extends_sign+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether right shift extends the sign bit" >&5
+printf %s "checking whether right shift extends the sign bit... " >&6; }
+if test ${ac_cv_rshift_extends_sign+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+
+if test "$cross_compiling" = yes
+then :
   ac_cv_rshift_extends_sign=yes
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -15527,9 +17736,10 @@ int main()
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_rshift_extends_sign=yes
-else
+else $as_nop
   ac_cv_rshift_extends_sign=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -15538,27 +17748,28 @@ fi
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_rshift_extends_sign" >&5
-$as_echo "$ac_cv_rshift_extends_sign" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_rshift_extends_sign" >&5
+printf "%s\n" "$ac_cv_rshift_extends_sign" >&6; }
 if test "$ac_cv_rshift_extends_sign" = no
 then
 
-$as_echo "#define SIGNED_RIGHT_SHIFT_ZERO_FILLS 1" >>confdefs.h
+printf "%s\n" "#define SIGNED_RIGHT_SHIFT_ZERO_FILLS 1" >>confdefs.h
 
 fi
 
 # check for getc_unlocked and related locking functions
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getc_unlocked() and friends" >&5
-$as_echo_n "checking for getc_unlocked() and friends... " >&6; }
-if ${ac_cv_have_getc_unlocked+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getc_unlocked() and friends" >&5
+printf %s "checking for getc_unlocked() and friends... " >&6; }
+if test ${ac_cv_have_getc_unlocked+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 
 	FILE *f = fopen("/dev/null", "r");
@@ -15570,29 +17781,31 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_have_getc_unlocked=yes
-else
+else $as_nop
   ac_cv_have_getc_unlocked=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_getc_unlocked" >&5
-$as_echo "$ac_cv_have_getc_unlocked" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_getc_unlocked" >&5
+printf "%s\n" "$ac_cv_have_getc_unlocked" >&6; }
 if test "$ac_cv_have_getc_unlocked" = yes
 then
 
-$as_echo "#define HAVE_GETC_UNLOCKED 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GETC_UNLOCKED 1" >>confdefs.h
 
 fi
 
 
 # Check whether --with-readline was given.
-if test "${with_readline+set}" = set; then :
+if test ${with_readline+y}
+then :
   withval=$with_readline;
-else
+else $as_nop
   with_readline=yes
 fi
 
@@ -15607,7 +17820,7 @@ if test "$with_readline" != no; then
   editline|edit)
     LIBREADLINE=edit
 
-$as_echo "#define WITH_EDITLINE 1" >>confdefs.h
+printf "%s\n" "#define WITH_EDITLINE 1" >>confdefs.h
 
     ;;
   yes|readline)
@@ -15621,8 +17834,8 @@ $as_echo "#define WITH_EDITLINE 1" >>confdefs.h
   # On some systems we need to link readline to a termcap compatible
   # library.  NOTE: Keep the precedence of listed libraries synchronised
   # with setup.py.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link readline libs" >&5
-$as_echo_n "checking how to link readline libs... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link readline libs" >&5
+printf %s "checking how to link readline libs... " >&6; }
   for py_libtermcap in "" tinfo ncursesw ncurses curses termcap; do
     if test -z "$py_libtermcap"; then
       READLINE_LIBS="-l$LIBREADLINE"
@@ -15636,22 +17849,20 @@ $as_echo_n "checking how to link readline libs... " >&6; }
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char readline ();
 int
-main ()
+main (void)
 {
 return readline ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   py_cv_lib_readline=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     if test $py_cv_lib_readline = yes; then
       break
@@ -15661,20 +17872,20 @@ rm -f core conftest.err conftest.$ac_objext \
   # Uncomment this line if you want to use READLINE_LIBS in Makefile or scripts
   #AC_SUBST([READLINE_LIBS])
   if test $py_cv_lib_readline = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
+printf "%s\n" "none" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINE_LIBS" >&5
-$as_echo "$READLINE_LIBS" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $READLINE_LIBS" >&5
+printf "%s\n" "$READLINE_LIBS" >&6; }
 
-$as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBREADLINE 1" >>confdefs.h
 
   fi
 fi
 
 if test "$py_cv_lib_readline" = yes; then
   # check for readline 2.2
-  ac_fn_c_check_decl "$LINENO" "rl_completion_append_character" "ac_cv_have_decl_rl_completion_append_character" "
+  ac_fn_check_decl "$LINENO" "rl_completion_append_character" "ac_cv_have_decl_rl_completion_append_character" "
 #include <stdio.h> /* Must be first for Gnu Readline */
 #ifdef WITH_EDITLINE
 # include <editline/readline.h>
@@ -15682,14 +17893,14 @@ if test "$py_cv_lib_readline" = yes; then
 # include <readline/readline.h>
 #endif
 
-"
-if test "x$ac_cv_have_decl_rl_completion_append_character" = xyes; then :
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_rl_completion_append_character" = xyes
+then :
 
-$as_echo "#define HAVE_RL_COMPLETION_APPEND_CHARACTER 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RL_COMPLETION_APPEND_CHARACTER 1" >>confdefs.h
 
 fi
-
-  ac_fn_c_check_decl "$LINENO" "rl_completion_suppress_append" "ac_cv_have_decl_rl_completion_suppress_append" "
+  ac_fn_check_decl "$LINENO" "rl_completion_suppress_append" "ac_cv_have_decl_rl_completion_suppress_append" "
 #include <stdio.h> /* Must be first for Gnu Readline */
 #ifdef WITH_EDITLINE
 # include <editline/readline.h>
@@ -15697,21 +17908,22 @@ fi
 # include <readline/readline.h>
 #endif
 
-"
-if test "x$ac_cv_have_decl_rl_completion_suppress_append" = xyes; then :
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_rl_completion_suppress_append" = xyes
+then :
 
-$as_echo "#define HAVE_RL_COMPLETION_SUPPRESS_APPEND 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RL_COMPLETION_SUPPRESS_APPEND 1" >>confdefs.h
 
 fi
 
-
   # check for readline 4.0
-  as_ac_Lib=`$as_echo "ac_cv_lib_$LIBREADLINE''_rl_pre_input_hook" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_pre_input_hook in -l$LIBREADLINE" >&5
-$as_echo_n "checking for rl_pre_input_hook in -l$LIBREADLINE... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIBREADLINE""_rl_pre_input_hook" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_pre_input_hook in -l$LIBREADLINE" >&5
+printf %s "checking for rl_pre_input_hook in -l$LIBREADLINE... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$LIBREADLINE $READLINE_LIBS $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15720,44 +17932,44 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char rl_pre_input_hook ();
 int
-main ()
+main (void)
 {
 return rl_pre_input_hook ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
 
-$as_echo "#define HAVE_RL_PRE_INPUT_HOOK 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RL_PRE_INPUT_HOOK 1" >>confdefs.h
 
 fi
 
 
   # also in 4.0
-  as_ac_Lib=`$as_echo "ac_cv_lib_$LIBREADLINE''_rl_completion_display_matches_hook" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_display_matches_hook in -l$LIBREADLINE" >&5
-$as_echo_n "checking for rl_completion_display_matches_hook in -l$LIBREADLINE... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIBREADLINE""_rl_completion_display_matches_hook" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_completion_display_matches_hook in -l$LIBREADLINE" >&5
+printf %s "checking for rl_completion_display_matches_hook in -l$LIBREADLINE... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$LIBREADLINE $READLINE_LIBS $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15766,44 +17978,44 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char rl_completion_display_matches_hook ();
 int
-main ()
+main (void)
 {
 return rl_completion_display_matches_hook ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
 
-$as_echo "#define HAVE_RL_COMPLETION_DISPLAY_MATCHES_HOOK 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RL_COMPLETION_DISPLAY_MATCHES_HOOK 1" >>confdefs.h
 
 fi
 
 
   # also in 4.0, but not in editline
-  as_ac_Lib=`$as_echo "ac_cv_lib_$LIBREADLINE''_rl_resize_terminal" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_resize_terminal in -l$LIBREADLINE" >&5
-$as_echo_n "checking for rl_resize_terminal in -l$LIBREADLINE... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIBREADLINE""_rl_resize_terminal" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_resize_terminal in -l$LIBREADLINE" >&5
+printf %s "checking for rl_resize_terminal in -l$LIBREADLINE... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$LIBREADLINE $READLINE_LIBS $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15812,44 +18024,44 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char rl_resize_terminal ();
 int
-main ()
+main (void)
 {
 return rl_resize_terminal ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
 
-$as_echo "#define HAVE_RL_RESIZE_TERMINAL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RL_RESIZE_TERMINAL 1" >>confdefs.h
 
 fi
 
 
   # check for readline 4.2
-  as_ac_Lib=`$as_echo "ac_cv_lib_$LIBREADLINE''_rl_completion_matches" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -l$LIBREADLINE" >&5
-$as_echo_n "checking for rl_completion_matches in -l$LIBREADLINE... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIBREADLINE""_rl_completion_matches" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -l$LIBREADLINE" >&5
+printf %s "checking for rl_completion_matches in -l$LIBREADLINE... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$LIBREADLINE $READLINE_LIBS $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15858,39 +18070,38 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char rl_completion_matches ();
 int
-main ()
+main (void)
 {
 return rl_completion_matches ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
 
-$as_echo "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h
 
 fi
 
 
   # also in readline 4.2
-  ac_fn_c_check_decl "$LINENO" "rl_catch_signals" "ac_cv_have_decl_rl_catch_signals" "
+  ac_fn_check_decl "$LINENO" "rl_catch_signals" "ac_cv_have_decl_rl_catch_signals" "
 #include <stdio.h> /* Must be first for Gnu Readline */
 #ifdef WITH_EDITLINE
 # include <editline/readline.h>
@@ -15898,20 +18109,21 @@ fi
 # include <readline/readline.h>
 #endif
 
-"
-if test "x$ac_cv_have_decl_rl_catch_signals" = xyes; then :
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_rl_catch_signals" = xyes
+then :
 
-$as_echo "#define HAVE_RL_CATCH_SIGNAL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RL_CATCH_SIGNAL 1" >>confdefs.h
 
 fi
 
-
-  as_ac_Lib=`$as_echo "ac_cv_lib_$LIBREADLINE''_append_history" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for append_history in -l$LIBREADLINE" >&5
-$as_echo_n "checking for append_history in -l$LIBREADLINE... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIBREADLINE""_append_history" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for append_history in -l$LIBREADLINE" >&5
+printf %s "checking for append_history in -l$LIBREADLINE... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$LIBREADLINE $READLINE_LIBS $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15920,33 +18132,32 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char append_history ();
 int
-main ()
+main (void)
 {
 return append_history ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
 
-$as_echo "#define HAVE_RL_APPEND_HISTORY 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RL_APPEND_HISTORY 1" >>confdefs.h
 
 fi
 
@@ -15955,15 +18166,17 @@ fi
 # End of readline checks: restore LIBS
 LIBS=$LIBS_no_readline
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken nice()" >&5
-$as_echo_n "checking for broken nice()... " >&6; }
-if ${ac_cv_broken_nice+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for broken nice()" >&5
+printf %s "checking for broken nice()... " >&6; }
+if test ${ac_cv_broken_nice+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
-if test "$cross_compiling" = yes; then :
+if test "$cross_compiling" = yes
+then :
   ac_cv_broken_nice=no
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -15978,9 +18191,10 @@ int main()
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_broken_nice=yes
-else
+else $as_nop
   ac_cv_broken_nice=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -15989,23 +18203,25 @@ fi
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_broken_nice" >&5
-$as_echo "$ac_cv_broken_nice" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_broken_nice" >&5
+printf "%s\n" "$ac_cv_broken_nice" >&6; }
 if test "$ac_cv_broken_nice" = yes
 then
 
-$as_echo "#define HAVE_BROKEN_NICE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_BROKEN_NICE 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken poll()" >&5
-$as_echo_n "checking for broken poll()... " >&6; }
-if ${ac_cv_broken_poll+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for broken poll()" >&5
+printf %s "checking for broken poll()... " >&6; }
+if test ${ac_cv_broken_poll+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
   ac_cv_broken_poll=no
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -16029,9 +18245,10 @@ int main()
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_broken_poll=yes
-else
+else $as_nop
   ac_cv_broken_poll=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -16040,25 +18257,27 @@ fi
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_broken_poll" >&5
-$as_echo "$ac_cv_broken_poll" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_broken_poll" >&5
+printf "%s\n" "$ac_cv_broken_poll" >&6; }
 if test "$ac_cv_broken_poll" = yes
 then
 
-$as_echo "#define HAVE_BROKEN_POLL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_BROKEN_POLL 1" >>confdefs.h
 
 fi
 
 # check tzset(3) exists and works like we expect it to
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working tzset()" >&5
-$as_echo_n "checking for working tzset()... " >&6; }
-if ${ac_cv_working_tzset+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working tzset()" >&5
+printf %s "checking for working tzset()... " >&6; }
+if test ${ac_cv_working_tzset+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+
+if test "$cross_compiling" = yes
+then :
   ac_cv_working_tzset=no
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -16126,9 +18345,10 @@ int main()
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_working_tzset=yes
-else
+else $as_nop
   ac_cv_working_tzset=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -16137,26 +18357,27 @@ fi
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_tzset" >&5
-$as_echo "$ac_cv_working_tzset" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_tzset" >&5
+printf "%s\n" "$ac_cv_working_tzset" >&6; }
 if test "$ac_cv_working_tzset" = yes
 then
 
-$as_echo "#define HAVE_WORKING_TZSET 1" >>confdefs.h
+printf "%s\n" "#define HAVE_WORKING_TZSET 1" >>confdefs.h
 
 fi
 
 # Look for subsecond timestamps in struct stat
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tv_nsec in struct stat" >&5
-$as_echo_n "checking for tv_nsec in struct stat... " >&6; }
-if ${ac_cv_stat_tv_nsec+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tv_nsec in struct stat" >&5
+printf %s "checking for tv_nsec in struct stat... " >&6; }
+if test ${ac_cv_stat_tv_nsec+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/stat.h>
 int
-main ()
+main (void)
 {
 
 struct stat st;
@@ -16166,34 +18387,36 @@ st.st_mtim.tv_nsec = 1;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_stat_tv_nsec=yes
-else
+else $as_nop
   ac_cv_stat_tv_nsec=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_stat_tv_nsec" >&5
-$as_echo "$ac_cv_stat_tv_nsec" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_stat_tv_nsec" >&5
+printf "%s\n" "$ac_cv_stat_tv_nsec" >&6; }
 if test "$ac_cv_stat_tv_nsec" = yes
 then
 
-$as_echo "#define HAVE_STAT_TV_NSEC 1" >>confdefs.h
+printf "%s\n" "#define HAVE_STAT_TV_NSEC 1" >>confdefs.h
 
 fi
 
 # Look for BSD style subsecond timestamps in struct stat
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tv_nsec2 in struct stat" >&5
-$as_echo_n "checking for tv_nsec2 in struct stat... " >&6; }
-if ${ac_cv_stat_tv_nsec2+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tv_nsec2 in struct stat" >&5
+printf %s "checking for tv_nsec2 in struct stat... " >&6; }
+if test ${ac_cv_stat_tv_nsec2+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/stat.h>
 int
-main ()
+main (void)
 {
 
 struct stat st;
@@ -16203,20 +18426,21 @@ st.st_mtimespec.tv_nsec = 1;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_stat_tv_nsec2=yes
-else
+else $as_nop
   ac_cv_stat_tv_nsec2=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_stat_tv_nsec2" >&5
-$as_echo "$ac_cv_stat_tv_nsec2" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_stat_tv_nsec2" >&5
+printf "%s\n" "$ac_cv_stat_tv_nsec2" >&6; }
 if test "$ac_cv_stat_tv_nsec2" = yes
 then
 
-$as_echo "#define HAVE_STAT_TV_NSEC2 1" >>confdefs.h
+printf "%s\n" "#define HAVE_STAT_TV_NSEC2 1" >>confdefs.h
 
 fi
 
@@ -16226,50 +18450,46 @@ if test "$cross_compiling" = no; then
   CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
 fi
 
-for ac_header in curses.h ncurses.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default"
+if test "x$ac_cv_header_curses_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_CURSES_H 1" >>confdefs.h
 
 fi
+ac_fn_c_check_header_compile "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default"
+if test "x$ac_cv_header_ncurses_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_NCURSES_H 1" >>confdefs.h
 
-done
+fi
 
 
 # On Solaris, term.h requires curses.h
-for ac_header in term.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "term.h" "ac_cv_header_term_h" "
+ac_fn_c_check_header_compile "$LINENO" "term.h" "ac_cv_header_term_h" "
 #ifdef HAVE_CURSES_H
 #include <curses.h>
 #endif
 
 "
-if test "x$ac_cv_header_term_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_TERM_H 1
-_ACEOF
+if test "x$ac_cv_header_term_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_TERM_H 1" >>confdefs.h
 
 fi
 
-done
-
 
 # On HP/UX 11.0, mvwdelch is a block with a return statement
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mvwdelch is an expression" >&5
-$as_echo_n "checking whether mvwdelch is an expression... " >&6; }
-if ${ac_cv_mvwdelch_is_expression+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mvwdelch is an expression" >&5
+printf %s "checking whether mvwdelch is an expression... " >&6; }
+if test ${ac_cv_mvwdelch_is_expression+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <curses.h>
 int
-main ()
+main (void)
 {
 
   int rtn;
@@ -16279,21 +18499,22 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_mvwdelch_is_expression=yes
-else
+else $as_nop
   ac_cv_mvwdelch_is_expression=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mvwdelch_is_expression" >&5
-$as_echo "$ac_cv_mvwdelch_is_expression" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mvwdelch_is_expression" >&5
+printf "%s\n" "$ac_cv_mvwdelch_is_expression" >&6; }
 
 if test "$ac_cv_mvwdelch_is_expression" = yes
 then
 
-$as_echo "#define MVWDELCH_IS_EXPRESSION 1" >>confdefs.h
+printf "%s\n" "#define MVWDELCH_IS_EXPRESSION 1" >>confdefs.h
 
 fi
 
@@ -16301,11 +18522,12 @@ fi
 # structs since version 5.7.  If the macro is defined as zero before including
 # [n]curses.h, ncurses will expose fields of the structs regardless of the
 # configuration.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether WINDOW has _flags" >&5
-$as_echo_n "checking whether WINDOW has _flags... " >&6; }
-if ${ac_cv_window_has_flags+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether WINDOW has _flags" >&5
+printf %s "checking whether WINDOW has _flags... " >&6; }
+if test ${ac_cv_window_has_flags+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -16313,7 +18535,7 @@ else
   #include <curses.h>
 
 int
-main ()
+main (void)
 {
 
   WINDOW *w;
@@ -16323,32 +18545,33 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_window_has_flags=yes
-else
+else $as_nop
   ac_cv_window_has_flags=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_window_has_flags" >&5
-$as_echo "$ac_cv_window_has_flags" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_window_has_flags" >&5
+printf "%s\n" "$ac_cv_window_has_flags" >&6; }
 
 
 if test "$ac_cv_window_has_flags" = yes
 then
 
-$as_echo "#define WINDOW_HAS_FLAGS 1" >>confdefs.h
+printf "%s\n" "#define WINDOW_HAS_FLAGS 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for is_pad" >&5
-$as_echo_n "checking for is_pad... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for is_pad" >&5
+printf %s "checking for is_pad... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <curses.h>
 int
-main ()
+main (void)
 {
 
 #ifndef is_pad
@@ -16359,104 +18582,108 @@ void *x=is_pad
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_CURSES_IS_PAD 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CURSES_IS_PAD 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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for is_term_resized" >&5
-$as_echo_n "checking for is_term_resized... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for is_term_resized" >&5
+printf %s "checking for is_term_resized... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <curses.h>
 int
-main ()
+main (void)
 {
 void *x=is_term_resized
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_CURSES_IS_TERM_RESIZED 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CURSES_IS_TERM_RESIZED 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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for resize_term" >&5
-$as_echo_n "checking for resize_term... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for resize_term" >&5
+printf %s "checking for resize_term... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <curses.h>
 int
-main ()
+main (void)
 {
 void *x=resize_term
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_CURSES_RESIZE_TERM 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CURSES_RESIZE_TERM 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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for resizeterm" >&5
-$as_echo_n "checking for resizeterm... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for resizeterm" >&5
+printf %s "checking for resizeterm... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <curses.h>
 int
-main ()
+main (void)
 {
 void *x=resizeterm
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_CURSES_RESIZETERM 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CURSES_RESIZETERM 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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for immedok" >&5
-$as_echo_n "checking for immedok... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for immedok" >&5
+printf %s "checking for immedok... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <curses.h>
 int
-main ()
+main (void)
 {
 
 #ifndef immedok
@@ -16467,26 +18694,27 @@ void *x=immedok
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_CURSES_IMMEDOK 1" >>confdefs.h
+printf "%s\n" "#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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for syncok" >&5
-$as_echo_n "checking for syncok... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for syncok" >&5
+printf %s "checking for syncok... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <curses.h>
 int
-main ()
+main (void)
 {
 
 #ifndef syncok
@@ -16497,26 +18725,27 @@ void *x=syncok
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_CURSES_SYNCOK 1" >>confdefs.h
+printf "%s\n" "#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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wchgat" >&5
-$as_echo_n "checking for wchgat... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wchgat" >&5
+printf %s "checking for wchgat... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <curses.h>
 int
-main ()
+main (void)
 {
 
 #ifndef wchgat
@@ -16527,26 +18756,27 @@ void *x=wchgat
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_CURSES_WCHGAT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CURSES_WCHGAT 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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for filter" >&5
-$as_echo_n "checking for filter... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for filter" >&5
+printf %s "checking for filter... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <curses.h>
 int
-main ()
+main (void)
 {
 
 #ifndef filter
@@ -16557,26 +18787,27 @@ void *x=filter
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_CURSES_FILTER 1" >>confdefs.h
+printf "%s\n" "#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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for has_key" >&5
-$as_echo_n "checking for has_key... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for has_key" >&5
+printf %s "checking for has_key... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <curses.h>
 int
-main ()
+main (void)
 {
 
 #ifndef has_key
@@ -16587,26 +18818,27 @@ void *x=has_key
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_CURSES_HAS_KEY 1" >>confdefs.h
+printf "%s\n" "#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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for typeahead" >&5
-$as_echo_n "checking for typeahead... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for typeahead" >&5
+printf %s "checking for typeahead... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <curses.h>
 int
-main ()
+main (void)
 {
 
 #ifndef typeahead
@@ -16617,26 +18849,27 @@ void *x=typeahead
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_CURSES_TYPEAHEAD 1" >>confdefs.h
+printf "%s\n" "#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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for use_env" >&5
-$as_echo_n "checking for use_env... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for use_env" >&5
+printf %s "checking for use_env... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <curses.h>
 int
-main ()
+main (void)
 {
 
 #ifndef use_env
@@ -16647,46 +18880,48 @@ void *x=use_env
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_CURSES_USE_ENV 1" >>confdefs.h
+printf "%s\n" "#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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 # last curses configure check
 CPPFLAGS=$ac_save_cppflags
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for device files" >&5
-$as_echo "$as_me: checking for device files" >&6;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for device files" >&5
+printf "%s\n" "$as_me: checking for device files" >&6;}
 
 if test "x$cross_compiling" = xyes; then
   if test "${ac_cv_file__dev_ptmx+set}" != set; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/ptmx" >&5
-$as_echo_n "checking for /dev/ptmx... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5
-$as_echo "not set" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /dev/ptmx" >&5
+printf %s "checking for /dev/ptmx... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not set" >&5
+printf "%s\n" "not set" >&6; }
     as_fn_error $? "set ac_cv_file__dev_ptmx to yes/no in your CONFIG_SITE file when cross compiling" "$LINENO" 5
   fi
   if test "${ac_cv_file__dev_ptc+set}" != set; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/ptc" >&5
-$as_echo_n "checking for /dev/ptc... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5
-$as_echo "not set" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /dev/ptc" >&5
+printf %s "checking for /dev/ptc... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not set" >&5
+printf "%s\n" "not set" >&6; }
     as_fn_error $? "set ac_cv_file__dev_ptc to yes/no in your CONFIG_SITE file when cross compiling" "$LINENO" 5
   fi
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/ptmx" >&5
-$as_echo_n "checking for /dev/ptmx... " >&6; }
-if ${ac_cv_file__dev_ptmx+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /dev/ptmx" >&5
+printf %s "checking for /dev/ptmx... " >&6; }
+if test ${ac_cv_file__dev_ptmx+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   test "$cross_compiling" = yes &&
   as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/dev/ptmx"; then
@@ -16695,22 +18930,24 @@ else
   ac_cv_file__dev_ptmx=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__dev_ptmx" >&5
-$as_echo "$ac_cv_file__dev_ptmx" >&6; }
-if test "x$ac_cv_file__dev_ptmx" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__dev_ptmx" >&5
+printf "%s\n" "$ac_cv_file__dev_ptmx" >&6; }
+if test "x$ac_cv_file__dev_ptmx" = xyes
+then :
 
 fi
 
 if test "x$ac_cv_file__dev_ptmx" = xyes; then
 
-$as_echo "#define HAVE_DEV_PTMX 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DEV_PTMX 1" >>confdefs.h
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/ptc" >&5
-$as_echo_n "checking for /dev/ptc... " >&6; }
-if ${ac_cv_file__dev_ptc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /dev/ptc" >&5
+printf %s "checking for /dev/ptc... " >&6; }
+if test ${ac_cv_file__dev_ptc+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   test "$cross_compiling" = yes &&
   as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/dev/ptc"; then
@@ -16719,15 +18956,16 @@ else
   ac_cv_file__dev_ptc=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__dev_ptc" >&5
-$as_echo "$ac_cv_file__dev_ptc" >&6; }
-if test "x$ac_cv_file__dev_ptc" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__dev_ptc" >&5
+printf "%s\n" "$ac_cv_file__dev_ptc" >&6; }
+if test "x$ac_cv_file__dev_ptc" = xyes
+then :
 
 fi
 
 if test "x$ac_cv_file__dev_ptc" = xyes; then
 
-$as_echo "#define HAVE_DEV_PTC 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DEV_PTC 1" >>confdefs.h
 
 fi
 
@@ -16736,15 +18974,17 @@ then
 	LIBS="$LIBS -framework CoreFoundation"
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for %zd printf() format support" >&5
-$as_echo_n "checking for %zd printf() format support... " >&6; }
-if ${ac_cv_have_size_t_format+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for %zd printf() format support" >&5
+printf %s "checking for %zd printf() format support... " >&6; }
+if test ${ac_cv_have_size_t_format+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
   ac_cv_have_size_t_format="cross -- assuming yes"
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -16784,9 +19024,10 @@ int main()
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_have_size_t_format=yes
-else
+else $as_nop
   ac_cv_have_size_t_format=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -16794,11 +19035,11 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_size_t_format" >&5
-$as_echo "$ac_cv_have_size_t_format" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_size_t_format" >&5
+printf "%s\n" "$ac_cv_have_size_t_format" >&6; }
 if test "$ac_cv_have_size_t_format" != no ; then
 
-$as_echo "#define PY_FORMAT_SIZE_T \"z\"" >>confdefs.h
+printf "%s\n" "#define PY_FORMAT_SIZE_T \"z\"" >>confdefs.h
 
 fi
 
@@ -16811,23 +19052,26 @@ ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "
 #endif
 
 "
-if test "x$ac_cv_type_socklen_t" = xyes; then :
+if test "x$ac_cv_type_socklen_t" = xyes
+then :
 
-else
+else $as_nop
 
-$as_echo "#define socklen_t int" >>confdefs.h
+printf "%s\n" "#define socklen_t int" >>confdefs.h
 
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken mbstowcs" >&5
-$as_echo_n "checking for broken mbstowcs... " >&6; }
-if ${ac_cv_broken_mbstowcs+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for broken mbstowcs" >&5
+printf %s "checking for broken mbstowcs... " >&6; }
+if test ${ac_cv_broken_mbstowcs+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
   ac_cv_broken_mbstowcs=no
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -16841,9 +19085,10 @@ int main() {
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_broken_mbstowcs=no
-else
+else $as_nop
   ac_cv_broken_mbstowcs=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -16852,57 +19097,60 @@ fi
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_broken_mbstowcs" >&5
-$as_echo "$ac_cv_broken_mbstowcs" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_broken_mbstowcs" >&5
+printf "%s\n" "$ac_cv_broken_mbstowcs" >&6; }
 if test "$ac_cv_broken_mbstowcs" = yes
 then
 
-$as_echo "#define HAVE_BROKEN_MBSTOWCS 1" >>confdefs.h
+printf "%s\n" "#define HAVE_BROKEN_MBSTOWCS 1" >>confdefs.h
 
 fi
 
 # Check for --with-computed-gotos
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-computed-gotos" >&5
-$as_echo_n "checking for --with-computed-gotos... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-computed-gotos" >&5
+printf %s "checking for --with-computed-gotos... " >&6; }
 
 # Check whether --with-computed-gotos was given.
-if test "${with_computed_gotos+set}" = set; then :
+if test ${with_computed_gotos+y}
+then :
   withval=$with_computed_gotos;
 if test "$withval" = yes
 then
 
-$as_echo "#define USE_COMPUTED_GOTOS 1" >>confdefs.h
+printf "%s\n" "#define USE_COMPUTED_GOTOS 1" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 fi
 if test "$withval" = no
 then
 
-$as_echo "#define USE_COMPUTED_GOTOS 0" >>confdefs.h
+printf "%s\n" "#define USE_COMPUTED_GOTOS 0" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no value specified" >&5
-$as_echo "no value specified" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no value specified" >&5
+printf "%s\n" "no value specified" >&6; }
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports computed gotos" >&5
-$as_echo_n "checking whether $CC supports computed gotos... " >&6; }
-if ${ac_cv_computed_gotos+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports computed gotos" >&5
+printf %s "checking whether $CC supports computed gotos... " >&6; }
+if test ${ac_cv_computed_gotos+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
   if test "${with_computed_gotos+set}" = set; then
    ac_cv_computed_gotos="$with_computed_gotos -- configured --with(out)-computed-gotos"
  else
    ac_cv_computed_gotos=no
  fi
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -16918,9 +19166,10 @@ LABEL2:
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_computed_gotos=yes
-else
+else $as_nop
   ac_cv_computed_gotos=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -16929,18 +19178,18 @@ fi
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_computed_gotos" >&5
-$as_echo "$ac_cv_computed_gotos" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_computed_gotos" >&5
+printf "%s\n" "$ac_cv_computed_gotos" >&6; }
 case "$ac_cv_computed_gotos" in yes*)
 
-$as_echo "#define HAVE_COMPUTED_GOTOS 1" >>confdefs.h
+printf "%s\n" "#define HAVE_COMPUTED_GOTOS 1" >>confdefs.h
 
 esac
 
 case $ac_sys_system in
 AIX*)
 
-$as_echo "#define HAVE_BROKEN_PIPE_BUF 1" >>confdefs.h
+printf "%s\n" "#define HAVE_BROKEN_PIPE_BUF 1" >>confdefs.h
  ;;
 esac
 
@@ -16954,26 +19203,26 @@ done
 
 
 SRCDIRS="Parser Objects Python Modules Modules/_io Programs"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for build directories" >&5
-$as_echo_n "checking for build directories... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for build directories" >&5
+printf %s "checking for build directories... " >&6; }
 for dir in $SRCDIRS; do
     if test ! -d $dir; then
         mkdir $dir
     fi
 done
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
-$as_echo "done" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5
+printf "%s\n" "done" >&6; }
 
 # Availability of -O2:
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -O2" >&5
-$as_echo_n "checking for -O2... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -O2" >&5
+printf %s "checking for -O2... " >&6; }
 saved_cflags="$CFLAGS"
 CFLAGS="-O2"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
 
@@ -16981,28 +19230,30 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   have_O2=yes
-else
+else $as_nop
   have_O2=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_O2" >&5
-$as_echo "$have_O2" >&6; }
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_O2" >&5
+printf "%s\n" "$have_O2" >&6; }
 CFLAGS="$saved_cflags"
 
 # _FORTIFY_SOURCE wrappers for memmove and bcopy are incorrect:
 # http://sourceware.org/ml/libc-alpha/2010-12/msg00009.html
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for glibc _FORTIFY_SOURCE/memmove bug" >&5
-$as_echo_n "checking for glibc _FORTIFY_SOURCE/memmove bug... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glibc _FORTIFY_SOURCE/memmove bug" >&5
+printf %s "checking for glibc _FORTIFY_SOURCE/memmove bug... " >&6; }
 saved_cflags="$CFLAGS"
 CFLAGS="-O2 -D_FORTIFY_SOURCE=2"
 if test "$have_O2" = no; then
     CFLAGS=""
 fi
-if test "$cross_compiling" = yes; then :
+if test "$cross_compiling" = yes
+then :
   have_glibc_memmove_bug=undefined
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -17022,9 +19273,10 @@ int main() {
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   have_glibc_memmove_bug=no
-else
+else $as_nop
   have_glibc_memmove_bug=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -17032,11 +19284,11 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
 CFLAGS="$saved_cflags"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_glibc_memmove_bug" >&5
-$as_echo "$have_glibc_memmove_bug" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_glibc_memmove_bug" >&5
+printf "%s\n" "$have_glibc_memmove_bug" >&6; }
 if test "$have_glibc_memmove_bug" = yes; then
 
-$as_echo "#define HAVE_GLIBC_MEMMOVE_BUG 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GLIBC_MEMMOVE_BUG 1" >>confdefs.h
 
 fi
 
@@ -17046,13 +19298,14 @@ if test "$have_gcc_asm_for_x87" = yes; then
     # http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html
     case $CC in
         *gcc*)
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc ipa-pure-const bug" >&5
-$as_echo_n "checking for gcc ipa-pure-const bug... " >&6; }
+            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gcc ipa-pure-const bug" >&5
+printf %s "checking for gcc ipa-pure-const bug... " >&6; }
             saved_cflags="$CFLAGS"
             CFLAGS="-O2"
-            if test "$cross_compiling" = yes; then :
+            if test "$cross_compiling" = yes
+then :
   have_ipa_pure_const_bug=undefined
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -17073,9 +19326,10 @@ else
             }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   have_ipa_pure_const_bug=no
-else
+else $as_nop
   have_ipa_pure_const_bug=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -17083,11 +19337,11 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
             CFLAGS="$saved_cflags"
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ipa_pure_const_bug" >&5
-$as_echo "$have_ipa_pure_const_bug" >&6; }
+            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_ipa_pure_const_bug" >&5
+printf "%s\n" "$have_ipa_pure_const_bug" >&6; }
             if test "$have_ipa_pure_const_bug" = yes; then
 
-$as_echo "#define HAVE_IPA_PURE_CONST_BUG 1" >>confdefs.h
+printf "%s\n" "#define HAVE_IPA_PURE_CONST_BUG 1" >>confdefs.h
 
             fi
         ;;
@@ -17095,8 +19349,8 @@ $as_echo "#define HAVE_IPA_PURE_CONST_BUG 1" >>confdefs.h
 fi
 
 # Check for stdatomic.h
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdatomic.h" >&5
-$as_echo_n "checking for stdatomic.h... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdatomic.h" >&5
+printf %s "checking for stdatomic.h... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -17113,26 +19367,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   have_stdatomic_h=yes
-else
+else $as_nop
   have_stdatomic_h=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_stdatomic_h" >&5
-$as_echo "$have_stdatomic_h" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_stdatomic_h" >&5
+printf "%s\n" "$have_stdatomic_h" >&6; }
 
 if test "$have_stdatomic_h" = yes; then
 
-$as_echo "#define HAVE_STD_ATOMIC 1" >>confdefs.h
+printf "%s\n" "#define HAVE_STD_ATOMIC 1" >>confdefs.h
 
 fi
 
 # Check for GCC >= 4.7 and clang __atomic builtin functions
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for builtin __atomic_load_n and __atomic_store_n functions" >&5
-$as_echo_n "checking for builtin __atomic_load_n and __atomic_store_n functions... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for builtin __atomic_load_n and __atomic_store_n functions" >&5
+printf %s "checking for builtin __atomic_load_n and __atomic_store_n functions... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -17146,31 +19401,33 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   have_builtin_atomic=yes
-else
+else $as_nop
   have_builtin_atomic=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_builtin_atomic" >&5
-$as_echo "$have_builtin_atomic" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_builtin_atomic" >&5
+printf "%s\n" "$have_builtin_atomic" >&6; }
 
 if test "$have_builtin_atomic" = yes; then
 
-$as_echo "#define HAVE_BUILTIN_ATOMIC 1" >>confdefs.h
+printf "%s\n" "#define HAVE_BUILTIN_ATOMIC 1" >>confdefs.h
 
 fi
 
 # ensurepip option
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ensurepip" >&5
-$as_echo_n "checking for ensurepip... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ensurepip" >&5
+printf %s "checking for ensurepip... " >&6; }
 
 # Check whether --with-ensurepip was given.
-if test "${with_ensurepip+set}" = set; then :
+if test ${with_ensurepip+y}
+then :
   withval=$with_ensurepip;
-else
+else $as_nop
   with_ensurepip=upgrade
 fi
 
@@ -17184,13 +19441,13 @@ case $with_ensurepip in #(
   *) :
     as_fn_error $? "--with-ensurepip=upgrade|install|no" "$LINENO" 5 ;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENSUREPIP" >&5
-$as_echo "$ENSUREPIP" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ENSUREPIP" >&5
+printf "%s\n" "$ENSUREPIP" >&6; }
 
 
 # check if the dirent structure of a d_type field and DT_UNKNOWN is defined
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the dirent structure of a d_type field" >&5
-$as_echo_n "checking if the dirent structure of a d_type field... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the dirent structure of a d_type field" >&5
+printf %s "checking if the dirent structure of a d_type field... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -17204,25 +19461,26 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   have_dirent_d_type=yes
-else
+else $as_nop
   have_dirent_d_type=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_dirent_d_type" >&5
-$as_echo "$have_dirent_d_type" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_dirent_d_type" >&5
+printf "%s\n" "$have_dirent_d_type" >&6; }
 
 if test "$have_dirent_d_type" = yes; then
 
-$as_echo "#define HAVE_DIRENT_D_TYPE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DIRENT_D_TYPE 1" >>confdefs.h
 
 fi
 
 # check if the Linux getrandom() syscall is available
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Linux getrandom() syscall" >&5
-$as_echo_n "checking for the Linux getrandom() syscall... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the Linux getrandom() syscall" >&5
+printf %s "checking for the Linux getrandom() syscall... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -17242,26 +19500,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   have_getrandom_syscall=yes
-else
+else $as_nop
   have_getrandom_syscall=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_getrandom_syscall" >&5
-$as_echo "$have_getrandom_syscall" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_getrandom_syscall" >&5
+printf "%s\n" "$have_getrandom_syscall" >&6; }
 
 if test "$have_getrandom_syscall" = yes; then
 
-$as_echo "#define HAVE_GETRANDOM_SYSCALL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GETRANDOM_SYSCALL 1" >>confdefs.h
 
 fi
 
 # check if the getrandom() function is available
 # the test was written for the Solaris function of <sys/random.h>
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the getrandom() function" >&5
-$as_echo_n "checking for the getrandom() function... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the getrandom() function" >&5
+printf %s "checking for the getrandom() function... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -17279,19 +19538,20 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   have_getrandom=yes
-else
+else $as_nop
   have_getrandom=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_getrandom" >&5
-$as_echo "$have_getrandom" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_getrandom" >&5
+printf "%s\n" "$have_getrandom" >&6; }
 
 if test "$have_getrandom" = yes; then
 
-$as_echo "#define HAVE_GETRANDOM 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GETRANDOM 1" >>confdefs.h
 
 fi
 
@@ -17299,11 +19559,12 @@ fi
 # shm_* may only be available if linking against librt
 save_LIBS="$LIBS"
 save_includes_default="$ac_includes_default"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing shm_open" >&5
-$as_echo_n "checking for library containing shm_open... " >&6; }
-if ${ac_cv_search_shm_open+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing shm_open" >&5
+printf %s "checking for library containing shm_open... " >&6; }
+if test ${ac_cv_search_shm_open+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -17311,67 +19572,64 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char shm_open ();
 int
-main ()
+main (void)
 {
 return shm_open ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' rt; do
+for ac_lib in '' rt
+do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  if ac_fn_c_try_link "$LINENO"; then :
+  if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_search_shm_open=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext
-  if ${ac_cv_search_shm_open+:} false; then :
+  if test ${ac_cv_search_shm_open+y}
+then :
   break
 fi
 done
-if ${ac_cv_search_shm_open+:} false; then :
+if test ${ac_cv_search_shm_open+y}
+then :
 
-else
+else $as_nop
   ac_cv_search_shm_open=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_shm_open" >&5
-$as_echo "$ac_cv_search_shm_open" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_shm_open" >&5
+printf "%s\n" "$ac_cv_search_shm_open" >&6; }
 ac_res=$ac_cv_search_shm_open
-if test "$ac_res" != no; then :
+if test "$ac_res" != no
+then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 if test "$ac_cv_search_shm_open" = "-lrt"; then
 
-$as_echo "#define SHM_NEEDS_LIBRT 1" >>confdefs.h
+printf "%s\n" "#define SHM_NEEDS_LIBRT 1" >>confdefs.h
 
 fi
-for ac_header in sys/mman.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_mman_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_MMAN_H 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_mman_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_MMAN_H 1" >>confdefs.h
 
 fi
 
-done
-
 # temporarily override ac_includes_default for AC_CHECK_FUNCS below
 ac_includes_default="\
 ${ac_includes_default}
@@ -17381,17 +19639,18 @@ ${ac_includes_default}
 #  endif
 #endif
 "
-for ac_func in shm_open shm_unlink
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "shm_open" "ac_cv_func_shm_open"
+if test "x$ac_cv_func_shm_open" = xyes
+then :
+  printf "%s\n" "#define HAVE_SHM_OPEN 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "shm_unlink" "ac_cv_func_shm_unlink"
+if test "x$ac_cv_func_shm_unlink" = xyes
+then :
+  printf "%s\n" "#define HAVE_SHM_UNLINK 1" >>confdefs.h
 
 fi
-done
 
 # we don't want to link with librt always, restore LIBS
 LIBS="$save_LIBS"
@@ -17402,7 +19661,8 @@ ac_includes_default="$save_includes_default"
     found=false
 
 # Check whether --with-openssl was given.
-if test "${with_openssl+set}" = set; then :
+if test ${with_openssl+y}
+then :
   withval=$with_openssl;
             case "$withval" in
             "" | y | ye | yes | n | no)
@@ -17412,18 +19672,19 @@ if test "${with_openssl+set}" = set; then :
               ;;
             esac
 
-else
+else $as_nop
 
             # if pkg-config is installed and openssl has installed a .pc file,
             # then use that information and don't search ssldirs
             if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_PKG_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$PKG_CONFIG"; then
   ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
 else
@@ -17431,11 +19692,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -17446,11 +19711,11 @@ fi
 fi
 PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+printf "%s\n" "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -17459,11 +19724,12 @@ if test -z "$ac_cv_prog_PKG_CONFIG"; then
   ac_ct_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_PKG_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_PKG_CONFIG"; then
   ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
 else
@@ -17471,11 +19737,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -17486,11 +19756,11 @@ fi
 fi
 ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
 if test -n "$ac_ct_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
-$as_echo "$ac_ct_PKG_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
+printf "%s\n" "$ac_ct_PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_PKG_CONFIG" = x; then
@@ -17498,8 +19768,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     PKG_CONFIG=$ac_ct_PKG_CONFIG
@@ -17533,19 +19803,19 @@ fi
     if ! $found; then
         OPENSSL_INCLUDES=
         for ssldir in $ssldirs; do
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl/ssl.h in $ssldir" >&5
-$as_echo_n "checking for openssl/ssl.h in $ssldir... " >&6; }
+            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl/ssl.h in $ssldir" >&5
+printf %s "checking for openssl/ssl.h in $ssldir... " >&6; }
             if test -f "$ssldir/include/openssl/ssl.h"; then
                 OPENSSL_INCLUDES="-I$ssldir/include"
                 OPENSSL_LDFLAGS="-L$ssldir/lib"
                 OPENSSL_LIBS="-lssl -lcrypto"
                 found=true
-                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
                 break
             else
-                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
             fi
         done
 
@@ -17556,8 +19826,8 @@ $as_echo "no" >&6; }
     # try the preprocessor and linker with our new flags,
     # being careful not to pollute the global LIBS, LDFLAGS, and CPPFLAGS
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiling and linking against OpenSSL works" >&5
-$as_echo_n "checking whether compiling and linking against OpenSSL works... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether compiling and linking against OpenSSL works" >&5
+printf %s "checking whether compiling and linking against OpenSSL works... " >&6; }
     echo "Trying link with OPENSSL_LDFLAGS=$OPENSSL_LDFLAGS;" \
         "OPENSSL_LIBS=$OPENSSL_LIBS; OPENSSL_INCLUDES=$OPENSSL_INCLUDES" >&5
 
@@ -17571,27 +19841,28 @@ $as_echo_n "checking whether compiling and linking against OpenSSL works... " >&
 /* end confdefs.h.  */
 #include <openssl/ssl.h>
 int
-main ()
+main (void)
 {
 SSL_new(NULL)
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
             have_openssl=yes
 
-else
+else $as_nop
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
             have_openssl=no
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     CPPFLAGS="$save_CPPFLAGS"
     LDFLAGS="$save_LDFLAGS"
@@ -17603,13 +19874,14 @@ rm -f core conftest.err conftest.$ac_objext \
 
 
 # rpath to libssl and libcrypto
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-openssl-rpath" >&5
-$as_echo_n "checking for --with-openssl-rpath... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-openssl-rpath" >&5
+printf %s "checking for --with-openssl-rpath... " >&6; }
 
 # Check whether --with-openssl-rpath was given.
-if test "${with_openssl_rpath+set}" = set; then :
+if test ${with_openssl_rpath+y}
+then :
   withval=$with_openssl_rpath;
-else
+else $as_nop
   with_openssl_rpath=no
 
 fi
@@ -17620,54 +19892,54 @@ case $with_openssl_rpath in #(
   no) :
     OPENSSL_RPATH= ;; #(
   *) :
-    if test -d "$with_openssl_rpath"; then :
+    if test -d "$with_openssl_rpath"
+then :
   OPENSSL_RPATH="$with_openssl_rpath"
-else
+else $as_nop
   as_fn_error $? "--with-openssl-rpath \"$with_openssl_rpath\" is not a directory" "$LINENO" 5
 fi
 
  ;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENSSL_RPATH" >&5
-$as_echo "$OPENSSL_RPATH" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OPENSSL_RPATH" >&5
+printf "%s\n" "$OPENSSL_RPATH" >&6; }
 
 
 # ssl module default cipher suite string
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-ssl-default-suites" >&5
-$as_echo_n "checking for --with-ssl-default-suites... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-ssl-default-suites" >&5
+printf %s "checking for --with-ssl-default-suites... " >&6; }
 
 # Check whether --with-ssl-default-suites was given.
-if test "${with_ssl_default_suites+set}" = set; then :
+if test ${with_ssl_default_suites+y}
+then :
   withval=$with_ssl_default_suites;
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5
-$as_echo "$withval" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $withval" >&5
+printf "%s\n" "$withval" >&6; }
 case "$withval" in
     python)
-        $as_echo "#define PY_SSL_DEFAULT_CIPHERS 1" >>confdefs.h
+        printf "%s\n" "#define PY_SSL_DEFAULT_CIPHERS 1" >>confdefs.h
 
         ;;
     openssl)
-        $as_echo "#define PY_SSL_DEFAULT_CIPHERS 2" >>confdefs.h
+        printf "%s\n" "#define PY_SSL_DEFAULT_CIPHERS 2" >>confdefs.h
 
         ;;
     *)
-        $as_echo "#define PY_SSL_DEFAULT_CIPHERS 0" >>confdefs.h
+        printf "%s\n" "#define PY_SSL_DEFAULT_CIPHERS 0" >>confdefs.h
 
-        cat >>confdefs.h <<_ACEOF
-#define PY_SSL_DEFAULT_CIPHER_STRING "$withval"
-_ACEOF
+        printf "%s\n" "#define PY_SSL_DEFAULT_CIPHER_STRING \"$withval\"" >>confdefs.h
 
         ;;
 esac
 
-else
+else $as_nop
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: python" >&5
-$as_echo "python" >&6; }
-$as_echo "#define PY_SSL_DEFAULT_CIPHERS 1" >>confdefs.h
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: python" >&5
+printf "%s\n" "python" >&6; }
+printf "%s\n" "#define PY_SSL_DEFAULT_CIPHERS 1" >>confdefs.h
 
 
 fi
@@ -17676,13 +19948,14 @@ fi
 # builtin hash modules
 default_hashlib_hashes="md5,sha1,sha256,sha512,sha3,blake2"
 
-$as_echo "#define PY_BUILTIN_HASHLIB_HASHES /**/" >>confdefs.h
+printf "%s\n" "#define PY_BUILTIN_HASHLIB_HASHES /**/" >>confdefs.h
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-builtin-hashlib-hashes" >&5
-$as_echo_n "checking for --with-builtin-hashlib-hashes... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-builtin-hashlib-hashes" >&5
+printf %s "checking for --with-builtin-hashlib-hashes... " >&6; }
 
 # Check whether --with-builtin-hashlib-hashes was given.
-if test "${with_builtin_hashlib_hashes+set}" = set; then :
+if test ${with_builtin_hashlib_hashes+y}
+then :
   withval=$with_builtin_hashlib_hashes;
 case "$withval" in
     yes)
@@ -17692,20 +19965,16 @@ case "$withval" in
         withval=""
         ;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5
-$as_echo "$withval" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define PY_BUILTIN_HASHLIB_HASHES "$withval"
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $withval" >&5
+printf "%s\n" "$withval" >&6; }
+printf "%s\n" "#define PY_BUILTIN_HASHLIB_HASHES \"$withval\"" >>confdefs.h
 
 
-else
+else $as_nop
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $default_hashlib_hashes" >&5
-$as_echo "$default_hashlib_hashes" >&6; };
-cat >>confdefs.h <<_ACEOF
-#define PY_BUILTIN_HASHLIB_HASHES "$default_hashlib_hashes"
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $default_hashlib_hashes" >&5
+printf "%s\n" "$default_hashlib_hashes" >&6; };
+printf "%s\n" "#define PY_BUILTIN_HASHLIB_HASHES \"$default_hashlib_hashes\"" >>confdefs.h
 
 
 fi
@@ -17713,48 +19982,50 @@ fi
 
 # --with-experimental-isolated-subinterpreters
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-experimental-isolated-subinterpreters" >&5
-$as_echo_n "checking for --with-experimental-isolated-subinterpreters... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-experimental-isolated-subinterpreters" >&5
+printf %s "checking for --with-experimental-isolated-subinterpreters... " >&6; }
 
 # Check whether --with-experimental-isolated-subinterpreters was given.
-if test "${with_experimental_isolated_subinterpreters+set}" = set; then :
+if test ${with_experimental_isolated_subinterpreters+y}
+then :
   withval=$with_experimental_isolated_subinterpreters;
 if test "$withval" != no
 then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; };
-  $as_echo "#define EXPERIMENTAL_ISOLATED_SUBINTERPRETERS 1" >>confdefs.h
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; };
+  printf "%s\n" "#define EXPERIMENTAL_ISOLATED_SUBINTERPRETERS 1" >>confdefs.h
 
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; };
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; };
 fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # --with-static-libpython
 STATIC_LIBPYTHON=1
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-static-libpython" >&5
-$as_echo_n "checking for --with-static-libpython... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-static-libpython" >&5
+printf %s "checking for --with-static-libpython... " >&6; }
 
 # Check whether --with-static-libpython was given.
-if test "${with_static_libpython+set}" = set; then :
+if test ${with_static_libpython+y}
+then :
   withval=$with_static_libpython;
 if test "$withval" = no
 then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; };
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; };
   STATIC_LIBPYTHON=0
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; };
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; };
 fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 fi
 
 LIBRARY_DEPS='$(PY3LIBRARY) $(EXPORTSYMS)'
@@ -17771,21 +20042,22 @@ fi
 
 # Check whether to disable test modules. Once set, setup.py will not build
 # test extension modules and "make install" will not install test suites.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --disable-test-modules" >&5
-$as_echo_n "checking for --disable-test-modules... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --disable-test-modules" >&5
+printf %s "checking for --disable-test-modules... " >&6; }
 # Check whether --enable-test-modules was given.
-if test "${enable_test_modules+set}" = set; then :
+if test ${enable_test_modules+y}
+then :
   enableval=$enable_test_modules;
 fi
 
 if test "$enable_test_modules" = no; then
     TEST_MODULES=no
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 else
     TEST_MODULES=yes
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -17822,8 +20094,8 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -17853,15 +20125,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
      /^ac_cv_env_/b end
      t clear
      :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/
      t end
      s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
@@ -17875,8 +20147,8 @@ $as_echo "$as_me: updating cache $cache_file" >&6;}
       fi
     fi
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -17893,7 +20165,7 @@ U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -17910,8 +20182,8 @@ LTLIBOBJS=$ac_ltlibobjs
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
@@ -17934,14 +20206,16 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+as_nop=:
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else
+else $as_nop
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
@@ -17951,46 +20225,46 @@ esac
 fi
 
 
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
 
 # The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if ${PATH_SEPARATOR+false} :; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -17999,13 +20273,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -18014,8 +20281,12 @@ case $0 in #((
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
   done
 IFS=$as_save_IFS
 
@@ -18027,30 +20298,10 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
 # as_fn_error STATUS ERROR [LINENO LOG_FD]
@@ -18063,13 +20314,14 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $2" >&2
+  printf "%s\n" "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
 
+
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -18096,18 +20348,20 @@ as_fn_unset ()
   { eval $1=; unset $1;}
 }
 as_unset=as_fn_unset
+
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else
+else $as_nop
   as_fn_append ()
   {
     eval $1=\$$1\$2
@@ -18119,12 +20373,13 @@ fi # as_fn_append
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else
+else $as_nop
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
@@ -18155,7 +20410,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+printf "%s\n" X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -18177,6 +20432,10 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -18190,6 +20449,12 @@ case `echo -n x` in #(((((
   ECHO_N='-n';;
 esac
 
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n.  New code should use
+# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -18231,7 +20496,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -18240,7 +20505,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+printf "%s\n" X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -18303,7 +20568,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by python $as_me 3.10, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -18361,14 +20626,16 @@ $config_headers
 Report bugs to <https://bugs.python.org/>."
 
 _ACEOF
+ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
+ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
 python config.status 3.10
-configured by $0, generated by GNU Autoconf 2.69,
+configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -18407,15 +20674,15 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
+    printf "%s\n" "$ac_cs_version"; exit ;;
   --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
+    printf "%s\n" "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
@@ -18423,7 +20690,7 @@ do
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -18432,7 +20699,7 @@ do
     as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
+    printf "%s\n" "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
@@ -18460,7 +20727,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   exec "\$@"
@@ -18474,7 +20741,7 @@ exec 5>>config.log
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  $as_echo "$ac_log"
+  printf "%s\n" "$ac_log"
 } >&5
 
 _ACEOF
@@ -18508,8 +20775,8 @@ done
 # We use the long form for the default assignment because of an extremely
 # bizarre bug on SunOS 4.1.3.
 if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files
+  test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
@@ -18845,7 +21112,7 @@ do
 	   esac ||
 	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
@@ -18853,17 +21120,17 @@ do
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	  printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+printf "%s\n" "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
     case $configure_input in #(
     *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
+       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
        sed 's/[\\\\&|]/\\\\&/g'`;; #(
     *) ac_sed_conf_input=$configure_input;;
     esac
@@ -18880,7 +21147,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
+printf "%s\n" X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -18904,9 +21171,9 @@ $as_echo X"$ac_file" |
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -18968,8 +21235,8 @@ ac_sed_dataroot='
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
@@ -19013,9 +21280,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
       "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$ac_tmp/stdin"
@@ -19031,20 +21298,20 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
   #
   if test x"$ac_file" != x-; then
     {
-      $as_echo "/* $configure_input  */" \
+      printf "%s\n" "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
-    $as_echo "/* $configure_input  */" \
+    printf "%s\n" "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
@@ -19090,8 +21357,8 @@ if test "$no_create" != yes; then
   $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 
@@ -19115,3 +21382,4 @@ if test "$Py_OPT" = 'false' -a "$Py_DEBUG" != 'true'; then
     echo "" >&6
     echo "" >&6
 fi
+


From webhook-mailer at python.org  Mon Aug  2 22:17:34 2021
From: webhook-mailer at python.org (benjaminp)
Date: Tue, 03 Aug 2021 02:17:34 -0000
Subject: [Python-checkins] closes bpo-39091: Fix segfault when Exception
 constructor returns non-exception for gen.throw. (#17658)
Message-ID: <mailman.865.1627957055.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/83ca46b7784b7357d82ec47b33295e09ed7380cb
commit: 83ca46b7784b7357d82ec47b33295e09ed7380cb
branch: main
author: Noah <33094578+coolreader18 at users.noreply.github.com>
committer: benjaminp <benjamin at locrian.net>
date: 2021-08-02T19:17:18-07:00
summary:

closes bpo-39091: Fix segfault when Exception constructor returns non-exception for gen.throw. (#17658)

Co-authored-by: Benjamin Peterson <benjamin at python.org>

files:
A Misc/NEWS.d/next/Core and Builtins/2019-12-21-14-18-32.bpo-39091.dOexgQ.rst
M Lib/test/test_generators.py
M Misc/ACKS
M Python/errors.c

diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py
index ebf8bb7e32098..53d579e723c47 100644
--- a/Lib/test/test_generators.py
+++ b/Lib/test/test_generators.py
@@ -270,6 +270,32 @@ def gen():
         self.assertEqual(next(g), "done")
         self.assertEqual(sys.exc_info(), (None, None, None))
 
+    def test_except_throw_bad_exception(self):
+        class E(Exception):
+            def __new__(cls, *args, **kwargs):
+                return cls
+
+        def boring_generator():
+            yield
+
+        gen = boring_generator()
+
+        err_msg = 'should have returned an instance of BaseException'
+
+        with self.assertRaisesRegex(TypeError, err_msg):
+            gen.throw(E)
+
+        self.assertRaises(StopIteration, next, gen)
+
+        def generator():
+            with self.assertRaisesRegex(TypeError, err_msg):
+                yield
+
+        gen = generator()
+        next(gen)
+        with self.assertRaises(StopIteration):
+            gen.throw(E)
+
     def test_stopiteration_error(self):
         # See also PEP 479.
 
diff --git a/Misc/ACKS b/Misc/ACKS
index 97a360c8ecfc3..f845c1c5a4898 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1300,6 +1300,7 @@ Peter Otten
 Michael Otteneder
 Richard Oudkerk
 Russel Owen
+Noah Oxer
 Joonas Paalasmaa
 Yaroslav Pankovych
 Martin Packman
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-12-21-14-18-32.bpo-39091.dOexgQ.rst b/Misc/NEWS.d/next/Core and Builtins/2019-12-21-14-18-32.bpo-39091.dOexgQ.rst
new file mode 100644
index 0000000000000..c3b4e810d658b
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2019-12-21-14-18-32.bpo-39091.dOexgQ.rst	
@@ -0,0 +1 @@
+Fix crash when using passing a non-exception to a generator's ``throw()`` method. Patch by Noah Oxer
diff --git a/Python/errors.c b/Python/errors.c
index 1f84215a136a4..eeb84e83835e9 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -85,17 +85,29 @@ _PyErr_GetTopmostException(PyThreadState *tstate)
 }
 
 static PyObject*
-_PyErr_CreateException(PyObject *exception, PyObject *value)
+_PyErr_CreateException(PyObject *exception_type, PyObject *value)
 {
+    PyObject *exc;
+
     if (value == NULL || value == Py_None) {
-        return _PyObject_CallNoArg(exception);
+        exc = _PyObject_CallNoArg(exception_type);
     }
     else if (PyTuple_Check(value)) {
-        return PyObject_Call(exception, value, NULL);
+        exc = PyObject_Call(exception_type, value, NULL);
     }
     else {
-        return PyObject_CallOneArg(exception, value);
+        exc = PyObject_CallOneArg(exception_type, value);
+    }
+
+    if (exc != NULL && !PyExceptionInstance_Check(exc)) {
+        PyErr_Format(PyExc_TypeError,
+                     "calling %R should have returned an instance of "
+                     "BaseException, not %s",
+                     exception_type, Py_TYPE(exc)->tp_name);
+        Py_CLEAR(exc);
     }
+
+    return exc;
 }
 
 void


From webhook-mailer at python.org  Tue Aug  3 06:11:06 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 03 Aug 2021 10:11:06 -0000
Subject: [Python-checkins] bpo-39091: Fix segfault when Exception
 constructor returns non-exception for gen.throw. (GH-17658) (GH-27572)
Message-ID: <mailman.866.1627985466.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/8ce7f2f4ef04e19209f1dfd2a0cf50ddcd0e999f
commit: 8ce7f2f4ef04e19209f1dfd2a0cf50ddcd0e999f
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-03T12:10:38+02:00
summary:

bpo-39091: Fix segfault when Exception constructor returns non-exception for gen.throw. (GH-17658) (GH-27572)

Co-authored-by: Benjamin Peterson <benjamin at python.org>
(cherry picked from commit 83ca46b7784b7357d82ec47b33295e09ed7380cb)

Co-authored-by: Noah <33094578+coolreader18 at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2019-12-21-14-18-32.bpo-39091.dOexgQ.rst
M Lib/test/test_generators.py
M Misc/ACKS
M Python/errors.c

diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py
index ebf8bb7e320982..53d579e723c470 100644
--- a/Lib/test/test_generators.py
+++ b/Lib/test/test_generators.py
@@ -270,6 +270,32 @@ def gen():
         self.assertEqual(next(g), "done")
         self.assertEqual(sys.exc_info(), (None, None, None))
 
+    def test_except_throw_bad_exception(self):
+        class E(Exception):
+            def __new__(cls, *args, **kwargs):
+                return cls
+
+        def boring_generator():
+            yield
+
+        gen = boring_generator()
+
+        err_msg = 'should have returned an instance of BaseException'
+
+        with self.assertRaisesRegex(TypeError, err_msg):
+            gen.throw(E)
+
+        self.assertRaises(StopIteration, next, gen)
+
+        def generator():
+            with self.assertRaisesRegex(TypeError, err_msg):
+                yield
+
+        gen = generator()
+        next(gen)
+        with self.assertRaises(StopIteration):
+            gen.throw(E)
+
     def test_stopiteration_error(self):
         # See also PEP 479.
 
diff --git a/Misc/ACKS b/Misc/ACKS
index 3f0506ecf758e5..3e750c08bfd001 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1300,6 +1300,7 @@ Peter Otten
 Michael Otteneder
 Richard Oudkerk
 Russel Owen
+Noah Oxer
 Joonas Paalasmaa
 Yaroslav Pankovych
 Martin Packman
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-12-21-14-18-32.bpo-39091.dOexgQ.rst b/Misc/NEWS.d/next/Core and Builtins/2019-12-21-14-18-32.bpo-39091.dOexgQ.rst
new file mode 100644
index 00000000000000..c3b4e810d658b2
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2019-12-21-14-18-32.bpo-39091.dOexgQ.rst	
@@ -0,0 +1 @@
+Fix crash when using passing a non-exception to a generator's ``throw()`` method. Patch by Noah Oxer
diff --git a/Python/errors.c b/Python/errors.c
index f743d3089e20ba..d4b9db1aba34ee 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -85,17 +85,29 @@ _PyErr_GetTopmostException(PyThreadState *tstate)
 }
 
 static PyObject*
-_PyErr_CreateException(PyObject *exception, PyObject *value)
+_PyErr_CreateException(PyObject *exception_type, PyObject *value)
 {
+    PyObject *exc;
+
     if (value == NULL || value == Py_None) {
-        return _PyObject_CallNoArg(exception);
+        exc = _PyObject_CallNoArg(exception_type);
     }
     else if (PyTuple_Check(value)) {
-        return PyObject_Call(exception, value, NULL);
+        exc = PyObject_Call(exception_type, value, NULL);
     }
     else {
-        return PyObject_CallOneArg(exception, value);
+        exc = PyObject_CallOneArg(exception_type, value);
+    }
+
+    if (exc != NULL && !PyExceptionInstance_Check(exc)) {
+        PyErr_Format(PyExc_TypeError,
+                     "calling %R should have returned an instance of "
+                     "BaseException, not %s",
+                     exception_type, Py_TYPE(exc)->tp_name);
+        Py_CLEAR(exc);
     }
+
+    return exc;
 }
 
 void


From webhook-mailer at python.org  Tue Aug  3 06:11:06 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 03 Aug 2021 10:11:06 -0000
Subject: [Python-checkins] bpo-39091: Fix segfault when Exception
 constructor returns non-exception for gen.throw. (GH-17658) (GH-27573)
Message-ID: <mailman.867.1627985468.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/0b551db04a99a97abb1e44a071c688c3ca704b67
commit: 0b551db04a99a97abb1e44a071c688c3ca704b67
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-03T12:10:54+02:00
summary:

bpo-39091: Fix segfault when Exception constructor returns non-exception for gen.throw. (GH-17658) (GH-27573)

Co-authored-by: Benjamin Peterson <benjamin at python.org>
(cherry picked from commit 83ca46b7784b7357d82ec47b33295e09ed7380cb)

Co-authored-by: Noah <33094578+coolreader18 at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2019-12-21-14-18-32.bpo-39091.dOexgQ.rst
M Lib/test/test_generators.py
M Misc/ACKS
M Python/errors.c

diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py
index 3bf152280868e8..17fb87acc8f677 100644
--- a/Lib/test/test_generators.py
+++ b/Lib/test/test_generators.py
@@ -270,6 +270,32 @@ def gen():
         self.assertEqual(next(g), "done")
         self.assertEqual(sys.exc_info(), (None, None, None))
 
+    def test_except_throw_bad_exception(self):
+        class E(Exception):
+            def __new__(cls, *args, **kwargs):
+                return cls
+
+        def boring_generator():
+            yield
+
+        gen = boring_generator()
+
+        err_msg = 'should have returned an instance of BaseException'
+
+        with self.assertRaisesRegex(TypeError, err_msg):
+            gen.throw(E)
+
+        self.assertRaises(StopIteration, next, gen)
+
+        def generator():
+            with self.assertRaisesRegex(TypeError, err_msg):
+                yield
+
+        gen = generator()
+        next(gen)
+        with self.assertRaises(StopIteration):
+            gen.throw(E)
+
     def test_stopiteration_error(self):
         # See also PEP 479.
 
diff --git a/Misc/ACKS b/Misc/ACKS
index fc5602d39b65af..59ae1462b86a24 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1279,6 +1279,7 @@ Peter Otten
 Michael Otteneder
 Richard Oudkerk
 Russel Owen
+Noah Oxer
 Joonas Paalasmaa
 Martin Packman
 Shriphani Palakodety
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-12-21-14-18-32.bpo-39091.dOexgQ.rst b/Misc/NEWS.d/next/Core and Builtins/2019-12-21-14-18-32.bpo-39091.dOexgQ.rst
new file mode 100644
index 00000000000000..c3b4e810d658b2
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2019-12-21-14-18-32.bpo-39091.dOexgQ.rst	
@@ -0,0 +1 @@
+Fix crash when using passing a non-exception to a generator's ``throw()`` method. Patch by Noah Oxer
diff --git a/Python/errors.c b/Python/errors.c
index 87af39d527a512..2c020cd2660c53 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -85,17 +85,29 @@ _PyErr_GetTopmostException(PyThreadState *tstate)
 }
 
 static PyObject*
-_PyErr_CreateException(PyObject *exception, PyObject *value)
+_PyErr_CreateException(PyObject *exception_type, PyObject *value)
 {
+    PyObject *exc;
+
     if (value == NULL || value == Py_None) {
-        return _PyObject_CallNoArg(exception);
+        exc = _PyObject_CallNoArg(exception_type);
     }
     else if (PyTuple_Check(value)) {
-        return PyObject_Call(exception, value, NULL);
+        exc = PyObject_Call(exception_type, value, NULL);
     }
     else {
-        return PyObject_CallOneArg(exception, value);
+        exc = PyObject_CallOneArg(exception_type, value);
+    }
+
+    if (exc != NULL && !PyExceptionInstance_Check(exc)) {
+        PyErr_Format(PyExc_TypeError,
+                     "calling %R should have returned an instance of "
+                     "BaseException, not %s",
+                     exception_type, Py_TYPE(exc)->tp_name);
+        Py_CLEAR(exc);
     }
+
+    return exc;
 }
 
 void


From webhook-mailer at python.org  Tue Aug  3 07:01:31 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 03 Aug 2021 11:01:31 -0000
Subject: [Python-checkins] bpo-27275: Change popitem() and pop() methods of
 collections.OrderedDict (GH-27530)
Message-ID: <mailman.868.1627988491.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/8c9f847997196aa76500d1ae104cbe7fe2a467ed
commit: 8c9f847997196aa76500d1ae104cbe7fe2a467ed
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-03T13:00:55+02:00
summary:

bpo-27275: Change popitem() and pop() methods of collections.OrderedDict (GH-27530)

* Unify the C and Python implementations of OrderedDict.popitem().

The C implementation no longer calls ``__getitem__`` and ``__delitem__``
methods of the OrderedDict subclasses.

* Change popitem() and pop() methods of collections.OrderedDict

For consistency with dict both implementations (pure Python and C)
of these methods in OrderedDict no longer call __getitem__ and
__delitem__ methods of the OrderedDict subclasses.

Previously only the Python implementation of popitem() did not
call them.

files:
A Misc/NEWS.d/next/Library/2021-08-01-19-49-09.bpo-27275.QsvE0k.rst
M Lib/collections/__init__.py
M Lib/test/test_ordered_dict.py
M Objects/odictobject.c

diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py
index bae0805d6686c5..d989d85d6d8293 100644
--- a/Lib/collections/__init__.py
+++ b/Lib/collections/__init__.py
@@ -236,11 +236,19 @@ def pop(self, key, default=__marker):
         is raised.
 
         '''
-        if key in self:
-            result = self[key]
-            del self[key]
+        marker = self.__marker
+        result = dict.pop(self, key, marker)
+        if result is not marker:
+            # The same as in __delitem__().
+            link = self.__map.pop(key)
+            link_prev = link.prev
+            link_next = link.next
+            link_prev.next = link_next
+            link_next.prev = link_prev
+            link.prev = None
+            link.next = None
             return result
-        if default is self.__marker:
+        if default is marker:
             raise KeyError(key)
         return default
 
diff --git a/Lib/test/test_ordered_dict.py b/Lib/test/test_ordered_dict.py
index d48edb5881a14d..d51296a2d12441 100644
--- a/Lib/test/test_ordered_dict.py
+++ b/Lib/test/test_ordered_dict.py
@@ -896,5 +896,88 @@ def test_popitem(self):
         self.assertRaises(KeyError, d.popitem)
 
 
+class SimpleLRUCache:
+
+    def __init__(self, size):
+        super().__init__()
+        self.size = size
+        self.counts = dict.fromkeys(('get', 'set', 'del'), 0)
+
+    def __getitem__(self, item):
+        self.counts['get'] += 1
+        value = super().__getitem__(item)
+        self.move_to_end(item)
+        return value
+
+    def __setitem__(self, key, value):
+        self.counts['set'] += 1
+        while key not in self and len(self) >= self.size:
+            self.popitem(last=False)
+        super().__setitem__(key, value)
+        self.move_to_end(key)
+
+    def __delitem__(self, key):
+        self.counts['del'] += 1
+        super().__delitem__(key)
+
+
+class SimpleLRUCacheTests:
+
+    def test_add_after_full(self):
+        c = self.type2test(2)
+        c['t1'] = 1
+        c['t2'] = 2
+        c['t3'] = 3
+        self.assertEqual(c.counts, {'get': 0, 'set': 3, 'del': 0})
+        self.assertEqual(list(c), ['t2', 't3'])
+        self.assertEqual(c.counts, {'get': 0, 'set': 3, 'del': 0})
+
+    def test_popitem(self):
+        c = self.type2test(3)
+        for i in range(1, 4):
+            c[i] = i
+        self.assertEqual(c.popitem(last=False), (1, 1))
+        self.assertEqual(c.popitem(last=True), (3, 3))
+        self.assertEqual(c.counts, {'get': 0, 'set': 3, 'del': 0})
+
+    def test_pop(self):
+        c = self.type2test(3)
+        for i in range(1, 4):
+            c[i] = i
+        self.assertEqual(c.counts, {'get': 0, 'set': 3, 'del': 0})
+        self.assertEqual(c.pop(2), 2)
+        self.assertEqual(c.counts, {'get': 0, 'set': 3, 'del': 0})
+        self.assertEqual(c.pop(4, 0), 0)
+        self.assertEqual(c.counts, {'get': 0, 'set': 3, 'del': 0})
+        self.assertRaises(KeyError, c.pop, 4)
+        self.assertEqual(c.counts, {'get': 0, 'set': 3, 'del': 0})
+
+    def test_change_order_on_get(self):
+        c = self.type2test(3)
+        for i in range(1, 4):
+            c[i] = i
+        self.assertEqual(list(c), list(range(1, 4)))
+        self.assertEqual(c.counts, {'get': 0, 'set': 3, 'del': 0})
+        self.assertEqual(c[2], 2)
+        self.assertEqual(c.counts, {'get': 1, 'set': 3, 'del': 0})
+        self.assertEqual(list(c), [1, 3, 2])
+
+
+class PySimpleLRUCacheTests(SimpleLRUCacheTests, unittest.TestCase):
+
+    class type2test(SimpleLRUCache, py_coll.OrderedDict):
+        pass
+
+
+ at unittest.skipUnless(c_coll, 'requires the C version of the collections module')
+class CSimpleLRUCacheTests(SimpleLRUCacheTests, unittest.TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        class type2test(SimpleLRUCache, c_coll.OrderedDict):
+            pass
+        cls.type2test = type2test
+
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/Misc/NEWS.d/next/Library/2021-08-01-19-49-09.bpo-27275.QsvE0k.rst b/Misc/NEWS.d/next/Library/2021-08-01-19-49-09.bpo-27275.QsvE0k.rst
new file mode 100644
index 00000000000000..1f5afaf4d108e4
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-01-19-49-09.bpo-27275.QsvE0k.rst
@@ -0,0 +1,3 @@
+:meth:`collections.OrderedDict.popitem` and :meth:`collections.OrderedDict.pop`
+no longer call ``__getitem__`` and ``__delitem__`` methods of the OrderedDict
+subclasses.
diff --git a/Objects/odictobject.c b/Objects/odictobject.c
index fb1ac0ce48dcfc..e5361da6dcdedb 100644
--- a/Objects/odictobject.c
+++ b/Objects/odictobject.c
@@ -1047,81 +1047,26 @@ OrderedDict_setdefault_impl(PyODictObject *self, PyObject *key,
 
 /* pop() */
 
-/* forward */
-static PyObject * _odict_popkey(PyObject *, PyObject *, PyObject *);
-
-/* Skips __missing__() calls. */
-/*[clinic input]
-OrderedDict.pop
-
-    key: object
-    default: object = NULL
-
-od.pop(key[,default]) -> v, remove specified key and return the corresponding value.
-
-If the key is not found, return the default if given; otherwise,
-raise a KeyError.
-[clinic start generated code]*/
-
-static PyObject *
-OrderedDict_pop_impl(PyODictObject *self, PyObject *key,
-                     PyObject *default_value)
-/*[clinic end generated code: output=7a6447d104e7494b input=7efe36601007dff7]*/
-{
-    return _odict_popkey((PyObject *)self, key, default_value);
-}
-
 static PyObject *
 _odict_popkey_hash(PyObject *od, PyObject *key, PyObject *failobj,
                    Py_hash_t hash)
 {
-    _ODictNode *node;
     PyObject *value = NULL;
 
-    /* Pop the node first to avoid a possible dict resize (due to
-       eval loop reentrancy) and complications due to hash collision
-       resolution. */
-    node = _odict_find_node_hash((PyODictObject *)od, key, hash);
-    if (node == NULL) {
-        if (PyErr_Occurred())
-            return NULL;
-    }
-    else {
+    _ODictNode *node = _odict_find_node_hash((PyODictObject *)od, key, hash);
+    if (node != NULL) {
+        /* Pop the node first to avoid a possible dict resize (due to
+           eval loop reentrancy) and complications due to hash collision
+           resolution. */
         int res = _odict_clear_node((PyODictObject *)od, node, key, hash);
         if (res < 0) {
             return NULL;
         }
+        /* Now delete the value from the dict. */
+        value = _PyDict_Pop_KnownHash(od, key, hash, failobj);
     }
-
-    /* Now delete the value from the dict. */
-    if (PyODict_CheckExact(od)) {
-        if (node != NULL) {
-            value = _PyDict_GetItem_KnownHash(od, key, hash);  /* borrowed */
-            if (value != NULL) {
-                Py_INCREF(value);
-                if (_PyDict_DelItem_KnownHash(od, key, hash) < 0) {
-                    Py_DECREF(value);
-                    return NULL;
-                }
-            }
-        }
-    }
-    else {
-        int exists = PySequence_Contains(od, key);
-        if (exists < 0)
-            return NULL;
-        if (exists) {
-            value = PyObject_GetItem(od, key);
-            if (value != NULL) {
-                if (PyObject_DelItem(od, key) == -1) {
-                    Py_CLEAR(value);
-                }
-            }
-        }
-    }
-
-    /* Apply the fallback value, if necessary. */
-    if (value == NULL && !PyErr_Occurred()) {
+    else if (value == NULL && !PyErr_Occurred()) {
+        /* Apply the fallback value, if necessary. */
         if (failobj) {
             value = failobj;
             Py_INCREF(failobj);
@@ -1134,14 +1079,28 @@ _odict_popkey_hash(PyObject *od, PyObject *key, PyObject *failobj,
     return value;
 }
 
+/* Skips __missing__() calls. */
+/*[clinic input]
+OrderedDict.pop
+
+    key: object
+    default: object = NULL
+
+od.pop(key[,default]) -> v, remove specified key and return the corresponding value.
+
+If the key is not found, return the default if given; otherwise,
+raise a KeyError.
+[clinic start generated code]*/
+
 static PyObject *
-_odict_popkey(PyObject *od, PyObject *key, PyObject *failobj)
+OrderedDict_pop_impl(PyODictObject *self, PyObject *key,
+                     PyObject *default_value)
+/*[clinic end generated code: output=7a6447d104e7494b input=7efe36601007dff7]*/
 {
     Py_hash_t hash = PyObject_Hash(key);
     if (hash == -1)
         return NULL;
-
-    return _odict_popkey_hash(od, key, failobj, hash);
+    return _odict_popkey_hash((PyObject *)self, key, default_value, hash);
 }
 
 


From webhook-mailer at python.org  Tue Aug  3 07:28:23 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 03 Aug 2021 11:28:23 -0000
Subject: [Python-checkins] bpo-41737: expand doc for NotADirectoryError
 (GH-27471)
Message-ID: <mailman.869.1627990104.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/f7c23a99cd4f8179b6ba2cffaeb78b852c0f6488
commit: f7c23a99cd4f8179b6ba2cffaeb78b852c0f6488
branch: main
author: andrei kulakov <andrei.avk at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-03T13:28:09+02:00
summary:

bpo-41737: expand doc for NotADirectoryError (GH-27471)

files:
M Doc/library/exceptions.rst

diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst
index 0a5037a4b2106..669979f7c5d5d 100644
--- a/Doc/library/exceptions.rst
+++ b/Doc/library/exceptions.rst
@@ -690,8 +690,10 @@ depending on the system error code.
 
 .. exception:: NotADirectoryError
 
-   Raised when a directory operation (such as :func:`os.listdir`) is requested
-   on something which is not a directory.
+   Raised when a directory operation (such as :func:`os.listdir`) is requested on
+   something which is not a directory.  On most POSIX platforms, it may also be
+   raised if an operation attempts to open or traverse a non-directory file as if
+   it were a directory.
    Corresponds to :c:data:`errno` ``ENOTDIR``.
 
 .. exception:: PermissionError


From webhook-mailer at python.org  Tue Aug  3 08:03:45 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 03 Aug 2021 12:03:45 -0000
Subject: [Python-checkins] bpo-41737: expand doc for NotADirectoryError
 (GH-27471) (GH-27577)
Message-ID: <mailman.870.1627992225.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/b5f026112768eb0a06622263bdea86d7d85981c5
commit: b5f026112768eb0a06622263bdea86d7d85981c5
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-03T14:03:40+02:00
summary:

bpo-41737: expand doc for NotADirectoryError (GH-27471) (GH-27577)

(cherry picked from commit f7c23a99cd4f8179b6ba2cffaeb78b852c0f6488)

Co-authored-by: andrei kulakov <andrei.avk at gmail.com>

files:
M Doc/library/exceptions.rst

diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst
index 6bed5c70f0ad0..85cd193f903b0 100644
--- a/Doc/library/exceptions.rst
+++ b/Doc/library/exceptions.rst
@@ -659,8 +659,10 @@ depending on the system error code.
 
 .. exception:: NotADirectoryError
 
-   Raised when a directory operation (such as :func:`os.listdir`) is requested
-   on something which is not a directory.
+   Raised when a directory operation (such as :func:`os.listdir`) is requested on
+   something which is not a directory.  On most POSIX platforms, it may also be
+   raised if an operation attempts to open or traverse a non-directory file as if
+   it were a directory.
    Corresponds to :c:data:`errno` ``ENOTDIR``.
 
 .. exception:: PermissionError


From webhook-mailer at python.org  Tue Aug  3 08:05:09 2021
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 03 Aug 2021 12:05:09 -0000
Subject: [Python-checkins] bpo-41737: expand doc for NotADirectoryError
 (GH-27471)
Message-ID: <mailman.871.1627992310.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/84494db41902774ea6ac72e5b308b429850bbf71
commit: 84494db41902774ea6ac72e5b308b429850bbf71
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-03T05:05:04-07:00
summary:

bpo-41737: expand doc for NotADirectoryError (GH-27471)

(cherry picked from commit f7c23a99cd4f8179b6ba2cffaeb78b852c0f6488)

Co-authored-by: andrei kulakov <andrei.avk at gmail.com>

files:
M Doc/library/exceptions.rst

diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst
index d5d81dfd9e638..0e606360efae1 100644
--- a/Doc/library/exceptions.rst
+++ b/Doc/library/exceptions.rst
@@ -690,8 +690,10 @@ depending on the system error code.
 
 .. exception:: NotADirectoryError
 
-   Raised when a directory operation (such as :func:`os.listdir`) is requested
-   on something which is not a directory.
+   Raised when a directory operation (such as :func:`os.listdir`) is requested on
+   something which is not a directory.  On most POSIX platforms, it may also be
+   raised if an operation attempts to open or traverse a non-directory file as if
+   it were a directory.
    Corresponds to :c:data:`errno` ``ENOTDIR``.
 
 .. exception:: PermissionError


From webhook-mailer at python.org  Tue Aug  3 08:47:54 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 03 Aug 2021 12:47:54 -0000
Subject: [Python-checkins] bpo-44808: fixes test for interactive inspect
 getsource of a class (GH-27571)
Message-ID: <mailman.872.1627994875.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/58325971de0faf330c9c38269dae8315a0746e59
commit: 58325971de0faf330c9c38269dae8315a0746e59
branch: main
author: andrei kulakov <andrei.avk at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-03T14:47:30+02:00
summary:

bpo-44808: fixes test for interactive inspect getsource of a class (GH-27571)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
M Lib/test/test_inspect.py

diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
index b0c42a2dcf6ce..e87311ac0230f 100644
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -586,19 +586,15 @@ def test_getsource_on_code_object(self):
         self.assertSourceEqual(mod.eggs.__code__, 12, 18)
 
 class TestGetsourceInteractive(unittest.TestCase):
-    def tearDown(self):
-        mod.ParrotDroppings.__module__ = self.mod
-        sys.modules['__main__'] = self.main
-
     def test_getclasses_interactive(self):
-        self.main = sys.modules['__main__']
-        self.mod = mod.ParrotDroppings.__module__
-        class MockModule:
-            __file__ = None
-        sys.modules['__main__'] = MockModule
-        mod.ParrotDroppings.__module__ = '__main__'
-        with self.assertRaisesRegex(OSError, 'source code not available') as e:
-            inspect.getsource(mod.ParrotDroppings)
+        # bpo-44648: simulate a REPL session;
+        # there is no `__file__` in the __main__ module
+        code = "import sys, inspect; \
+                assert not hasattr(sys.modules['__main__'], '__file__'); \
+                A = type('A', (), {}); \
+                inspect.getsource(A)"
+        _, _, stderr = assert_python_failure("-c", code, __isolated=True)
+        self.assertIn(b'OSError: source code not available', stderr)
 
 class TestGettingSourceOfToplevelFrames(GetSourceBase):
     fodderModule = mod


From webhook-mailer at python.org  Tue Aug  3 09:08:07 2021
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 03 Aug 2021 13:08:07 -0000
Subject: [Python-checkins] bpo-44808: fixes test for interactive inspect
 getsource of a class (GH-27571)
Message-ID: <mailman.873.1627996088.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/bc2841c7a9fe2b05ef77ebdf77701188dc83b2ce
commit: bc2841c7a9fe2b05ef77ebdf77701188dc83b2ce
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-03T06:07:59-07:00
summary:

bpo-44808: fixes test for interactive inspect getsource of a class (GH-27571)


Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 58325971de0faf330c9c38269dae8315a0746e59)

Co-authored-by: andrei kulakov <andrei.avk at gmail.com>

files:
M Lib/test/test_inspect.py

diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
index 157f315999c42..a9778282d90a4 100644
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -586,19 +586,15 @@ def test_getsource_on_code_object(self):
         self.assertSourceEqual(mod.eggs.__code__, 12, 18)
 
 class TestGetsourceInteractive(unittest.TestCase):
-    def tearDown(self):
-        mod.ParrotDroppings.__module__ = self.mod
-        sys.modules['__main__'] = self.main
-
     def test_getclasses_interactive(self):
-        self.main = sys.modules['__main__']
-        self.mod = mod.ParrotDroppings.__module__
-        class MockModule:
-            __file__ = None
-        sys.modules['__main__'] = MockModule
-        mod.ParrotDroppings.__module__ = '__main__'
-        with self.assertRaisesRegex(OSError, 'source code not available') as e:
-            inspect.getsource(mod.ParrotDroppings)
+        # bpo-44648: simulate a REPL session;
+        # there is no `__file__` in the __main__ module
+        code = "import sys, inspect; \
+                assert not hasattr(sys.modules['__main__'], '__file__'); \
+                A = type('A', (), {}); \
+                inspect.getsource(A)"
+        _, _, stderr = assert_python_failure("-c", code, __isolated=True)
+        self.assertIn(b'OSError: source code not available', stderr)
 
 class TestGettingSourceOfToplevelFrames(GetSourceBase):
     fodderModule = mod


From webhook-mailer at python.org  Tue Aug  3 11:52:54 2021
From: webhook-mailer at python.org (zooba)
Date: Tue, 03 Aug 2021 15:52:54 -0000
Subject: [Python-checkins] Ensure LICENSE.txt file is generated even in PGO
 builds (GH-27580)
Message-ID: <mailman.874.1628005975.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/6871fd0e8e5257f3ffebd1a1b2ca50e5f494e7f6
commit: 6871fd0e8e5257f3ffebd1a1b2ca50e5f494e7f6
branch: main
author: Steve Dower <steve.dower at python.org>
committer: zooba <steve.dower at microsoft.com>
date: 2021-08-03T16:52:45+01:00
summary:

Ensure LICENSE.txt file is generated even in PGO builds (GH-27580)

files:
M PCbuild/regen.targets

diff --git a/PCbuild/regen.targets b/PCbuild/regen.targets
index 27fdd6e29b8bc..9492cff2d8c3e 100644
--- a/PCbuild/regen.targets
+++ b/PCbuild/regen.targets
@@ -101,7 +101,8 @@
   </ItemGroup>
 
   <Target Name="_RegenTestFrozenmain" Inputs="@(_TestFrozenSources)" Outputs="@(_TestFrozenOutputs)"
-          Condition="$(Platform) == 'Win32' or $(Platform) == 'x64'">
+          Condition="($(Platform) == 'Win32' or $(Platform) == 'x64') and
+                     $(Configuration) != 'PGInstrument' and $(Configuration) != 'PGUpdate'">
     <Message Text="Regenerate @(_TestFrozenOutputs->'%(Filename)%(Extension)', ' ')" Importance="high" />
     <Exec Command="$(PythonExe) Programs\freeze_test_frozenmain.py Programs/test_frozenmain.h"
           WorkingDirectory="$(PySourcePath)" />
@@ -121,7 +122,5 @@
     <Message Text="Wrote $(OutDir)LICENSE.txt" Importance="high" />
   </Target>
 
-  <Target Name="PostBuildRegen"
-          Condition="$(Configuration) != 'PGInstrument' and $(Configuration) != 'PGUpdate'"
-          DependsOnTargets="_RegenTestFrozenmain;_RegenLicense" />
+  <Target Name="PostBuildRegen" DependsOnTargets="_RegenTestFrozenmain;_RegenLicense" />
 </Project>


From webhook-mailer at python.org  Tue Aug  3 12:38:14 2021
From: webhook-mailer at python.org (pablogsal)
Date: Tue, 03 Aug 2021 16:38:14 -0000
Subject: [Python-checkins] Ensure LICENSE.txt file is generated even in PGO
 builds (GH-27580) (GH-27582)
Message-ID: <mailman.875.1628008695.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/4b46db68d0cb4a84f4f13501218a3ec2438fca1e
commit: 4b46db68d0cb4a84f4f13501218a3ec2438fca1e
branch: 3.10
author: Steve Dower <steve.dower at python.org>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-08-03T17:38:04+01:00
summary:

Ensure LICENSE.txt file is generated even in PGO builds (GH-27580) (GH-27582)

files:
M PCbuild/regen.targets

diff --git a/PCbuild/regen.targets b/PCbuild/regen.targets
index ff56d1148e845..08ace5707c6a8 100644
--- a/PCbuild/regen.targets
+++ b/PCbuild/regen.targets
@@ -110,7 +110,5 @@
     <Message Text="Wrote $(OutDir)LICENSE.txt" Importance="high" />
   </Target>
 
-  <Target Name="PostBuildRegen"
-          Condition="$(Configuration) != 'PGInstrument' and $(Configuration) != 'PGUpdate'"
-          DependsOnTargets="_RegenLicense" />
+  <Target Name="PostBuildRegen" DependsOnTargets="_RegenLicense" />
 </Project>


From webhook-mailer at python.org  Tue Aug  3 13:21:30 2021
From: webhook-mailer at python.org (ammaraskar)
Date: Tue, 03 Aug 2021 17:21:30 -0000
Subject: [Python-checkins] bpo-41886: Fix documented type of PyType_Type
 (GH-22454)
Message-ID: <mailman.876.1628011291.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/ac811f9b5a68ce8756911ef2c8be83b46696018f
commit: ac811f9b5a68ce8756911ef2c8be83b46696018f
branch: main
author: da-woods <dw-git at d-woods.co.uk>
committer: ammaraskar <ammar_askar at hotmail.com>
date: 2021-08-03T13:21:25-04:00
summary:

bpo-41886: Fix documented type of PyType_Type (GH-22454)

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

diff --git a/Doc/c-api/type.rst b/Doc/c-api/type.rst
index 46cb3768fcee4..630c7db437cb4 100644
--- a/Doc/c-api/type.rst
+++ b/Doc/c-api/type.rst
@@ -13,7 +13,7 @@ Type Objects
    The C structure of the objects used to describe built-in types.
 
 
-.. c:var:: PyObject* PyType_Type
+.. c:var:: PyTypeObject PyType_Type
 
    This is the type object for type objects; it is the same object as
    :class:`type` in the Python layer.


From webhook-mailer at python.org  Tue Aug  3 13:48:17 2021
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 03 Aug 2021 17:48:17 -0000
Subject: [Python-checkins] bpo-41886: Fix documented type of PyType_Type
 (GH-22454)
Message-ID: <mailman.877.1628012899.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/f26fec4f74ae7da972595703bc39d3d30b8cfdf9
commit: f26fec4f74ae7da972595703bc39d3d30b8cfdf9
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-03T10:48:08-07:00
summary:

bpo-41886: Fix documented type of PyType_Type (GH-22454)

(cherry picked from commit ac811f9b5a68ce8756911ef2c8be83b46696018f)

Co-authored-by: da-woods <dw-git at d-woods.co.uk>

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

diff --git a/Doc/c-api/type.rst b/Doc/c-api/type.rst
index d7f4bd67def13..69894cae2069e 100644
--- a/Doc/c-api/type.rst
+++ b/Doc/c-api/type.rst
@@ -13,7 +13,7 @@ Type Objects
    The C structure of the objects used to describe built-in types.
 
 
-.. c:var:: PyObject* PyType_Type
+.. c:var:: PyTypeObject PyType_Type
 
    This is the type object for type objects; it is the same object as
    :class:`type` in the Python layer.


From webhook-mailer at python.org  Tue Aug  3 13:50:34 2021
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 03 Aug 2021 17:50:34 -0000
Subject: [Python-checkins] bpo-41886: Fix documented type of PyType_Type
 (GH-22454)
Message-ID: <mailman.878.1628013035.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/952aa31c89f70d3c53596449bd2ed9a4817a2364
commit: 952aa31c89f70d3c53596449bd2ed9a4817a2364
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-03T10:50:24-07:00
summary:

bpo-41886: Fix documented type of PyType_Type (GH-22454)

(cherry picked from commit ac811f9b5a68ce8756911ef2c8be83b46696018f)

Co-authored-by: da-woods <dw-git at d-woods.co.uk>

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

diff --git a/Doc/c-api/type.rst b/Doc/c-api/type.rst
index 7a677593d073d..4d0c65cc31f76 100644
--- a/Doc/c-api/type.rst
+++ b/Doc/c-api/type.rst
@@ -13,7 +13,7 @@ Type Objects
    The C structure of the objects used to describe built-in types.
 
 
-.. c:var:: PyObject* PyType_Type
+.. c:var:: PyTypeObject PyType_Type
 
    This is the type object for type objects; it is the same object as
    :class:`type` in the Python layer.


From webhook-mailer at python.org  Wed Aug  4 06:39:57 2021
From: webhook-mailer at python.org (markshannon)
Date: Wed, 04 Aug 2021 10:39:57 -0000
Subject: [Python-checkins] Add option to write specialization stats to files
 and script to summarize. (GH-27575)
Message-ID: <mailman.879.1628073598.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/c83919bd635f4433f1c6ae8504996a9fe3c215e5
commit: c83919bd635f4433f1c6ae8504996a9fe3c215e5
branch: main
author: Mark Shannon <mark at hotpy.org>
committer: markshannon <mark at hotpy.org>
date: 2021-08-04T11:39:52+01:00
summary:

Add option to write specialization stats to files and script to summarize. (GH-27575)

* Add option to write stats to random file in a directory.

* Add script to summarize stats.

files:
A Tools/scripts/summarize_specialization_stats.py
M Include/internal/pycore_code.h
M Python/ceval.c
M Python/specialize.c

diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
index 2a50a0700feaa1..312939ee1d26e6 100644
--- a/Include/internal/pycore_code.h
+++ b/Include/internal/pycore_code.h
@@ -302,6 +302,7 @@ int _Py_Specialize_BinarySubscr(PyObject *sub, PyObject *container, _Py_CODEUNIT
 
 #define SPECIALIZATION_STATS 0
 #define SPECIALIZATION_STATS_DETAILED 0
+#define SPECIALIZATION_STATS_TO_FILE 0
 
 #if SPECIALIZATION_STATS
 
diff --git a/Python/ceval.c b/Python/ceval.c
index 4f7edb84fc3696..e3658b81388321 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -4408,6 +4408,7 @@ opname ## _miss: \
             cache_backoff(cache); \
         } \
         oparg = cache->original_oparg; \
+        STAT_DEC(opname, unquickened); \
         JUMP_TO_INSTRUCTION(opname); \
     }
 
@@ -4423,6 +4424,7 @@ opname ## _miss: \
             next_instr[-1] = _Py_MAKECODEUNIT(opname ## _ADAPTIVE, oparg); \
             STAT_INC(opname, deopt); \
         } \
+        STAT_DEC(opname, unquickened); \
         JUMP_TO_INSTRUCTION(opname); \
     }
 
diff --git a/Python/specialize.c b/Python/specialize.c
index 680ffb428e4441..1ca49d244a87b0 100644
--- a/Python/specialize.c
+++ b/Python/specialize.c
@@ -117,10 +117,10 @@ _Py_GetSpecializationStats(void) {
 #endif
 
 
-#define PRINT_STAT(name, field) fprintf(stderr, "    %s." #field " : %" PRIu64 "\n", name, stats->field);
+#define PRINT_STAT(name, field) fprintf(out, "    %s." #field " : %" PRIu64 "\n", name, stats->field);
 
 static void
-print_stats(SpecializationStats *stats, const char *name)
+print_stats(FILE *out, SpecializationStats *stats, const char *name)
 {
     PRINT_STAT(name, specialization_success);
     PRINT_STAT(name, specialization_failure);
@@ -133,18 +133,18 @@ print_stats(SpecializationStats *stats, const char *name)
     if (stats->miss_types == NULL) {
         return;
     }
-    fprintf(stderr, "    %s.fails:\n", name);
+    fprintf(out, "    %s.fails:\n", name);
     PyObject *key, *count;
     Py_ssize_t pos = 0;
     while (PyDict_Next(stats->miss_types, &pos, &key, &count)) {
         PyObject *type = PyTuple_GetItem(key, 0);
         PyObject *name = PyTuple_GetItem(key, 1);
         PyObject *kind = PyTuple_GetItem(key, 2);
-        fprintf(stderr, "        %s.", ((PyTypeObject *)type)->tp_name);
-        PyObject_Print(name, stderr, Py_PRINT_RAW);
-        fprintf(stderr, " (");
-        PyObject_Print(kind, stderr, Py_PRINT_RAW);
-        fprintf(stderr, "): %ld\n", PyLong_AsLong(count));
+        fprintf(out, "        %s.", ((PyTypeObject *)type)->tp_name);
+        PyObject_Print(name, out, Py_PRINT_RAW);
+        fprintf(out, " (");
+        PyObject_Print(kind, out, Py_PRINT_RAW);
+        fprintf(out, "): %ld\n", PyLong_AsLong(count));
     }
 #endif
 }
@@ -153,10 +153,29 @@ print_stats(SpecializationStats *stats, const char *name)
 void
 _Py_PrintSpecializationStats(void)
 {
-    printf("Specialization stats:\n");
-    print_stats(&_specialization_stats[LOAD_ATTR], "load_attr");
-    print_stats(&_specialization_stats[LOAD_GLOBAL], "load_global");
-    print_stats(&_specialization_stats[BINARY_SUBSCR], "binary_subscr");
+    FILE *out = stderr;
+#if SPECIALIZATION_STATS_TO_FILE
+    /* Write to a file instead of stderr. */
+# ifdef MS_WINDOWS
+    const char *dirname = "c:\\temp\\py_stats\\";
+# else
+    const char *dirname = "/tmp/py_stats/";
+# endif
+    char buf[48];
+    sprintf(buf, "%s%u_%u.txt", dirname, (unsigned)clock(), (unsigned)rand());
+    FILE *fout = fopen(buf, "w");
+    if (fout) {
+        out = fout;
+    }
+#else
+    fprintf(out, "Specialization stats:\n");
+#endif
+    print_stats(out, &_specialization_stats[LOAD_ATTR], "load_attr");
+    print_stats(out, &_specialization_stats[LOAD_GLOBAL], "load_global");
+    print_stats(out, &_specialization_stats[BINARY_SUBSCR], "binary_subscr");
+    if (out != stderr) {
+        fclose(out);
+    }
 }
 
 #if SPECIALIZATION_STATS_DETAILED
diff --git a/Tools/scripts/summarize_specialization_stats.py b/Tools/scripts/summarize_specialization_stats.py
new file mode 100644
index 00000000000000..1a13ae8cb6ce5a
--- /dev/null
+++ b/Tools/scripts/summarize_specialization_stats.py
@@ -0,0 +1,41 @@
+"""Print a summary of specialization stats for all files in the
+default stats folders.
+"""
+
+import collections
+import os.path
+
+if os.name == "nt":
+    DEFAULT_DIR = "c:\\temp\\py_stats\\"
+else:
+    DEFAULT_DIR = "/tmp/py_stats/"
+
+
+TOTAL = "deferred", "hit", "miss", "unquickened"
+
+def print_stats(name, family_stats):
+    total = sum(family_stats[kind] for kind in TOTAL)
+    if total == 0:
+        return
+    print(name+":")
+    for key in sorted(family_stats):
+        if not key.startswith("specialization"):
+            print(f"{key:>12}:{family_stats[key]:>12} {100*family_stats[key]/total:0.1f}%")
+    for key in ("specialization_success",  "specialization_failure"):
+        print(f"  {key}:{family_stats[key]:>12}")
+
+def main():
+    stats = collections.defaultdict(collections.Counter)
+    for filename in os.listdir(DEFAULT_DIR):
+        for line in open(os.path.join(DEFAULT_DIR, filename)):
+            key, value = line.split(":")
+            key = key.strip()
+            family, stat = key.split(".")
+            value = int(value.strip())
+            stats[family][stat] += value
+
+    for name in sorted(stats):
+        print_stats(name, stats[name])
+
+if __name__ == "__main__":
+    main()


From webhook-mailer at python.org  Wed Aug  4 11:41:23 2021
From: webhook-mailer at python.org (markshannon)
Date: Wed, 04 Aug 2021 15:41:23 -0000
Subject: [Python-checkins] bpo-44821: Eagerly assign __dict__ for new
 objects. (GH-27589)
Message-ID: <mailman.880.1628091683.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/cee67fa66129b5d1db5c8aa3884338f82f0da3de
commit: cee67fa66129b5d1db5c8aa3884338f82f0da3de
branch: main
author: Mark Shannon <mark at hotpy.org>
committer: markshannon <mark at hotpy.org>
date: 2021-08-04T16:41:14+01:00
summary:

bpo-44821: Eagerly assign __dict__ for new objects. (GH-27589)

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-04-11-37-38.bpo-44821.67YHGI.rst
M Include/internal/pycore_object.h
M Lib/test/test_capi.py
M Lib/test/test_gdb.py
M Objects/dictobject.c
M Objects/typeobject.c

diff --git a/Include/internal/pycore_object.h b/Include/internal/pycore_object.h
index 4091f5178eed1..744b41ae5d90d 100644
--- a/Include/internal/pycore_object.h
+++ b/Include/internal/pycore_object.h
@@ -180,6 +180,8 @@ extern int _Py_CheckSlotResult(
 
 extern PyObject* _PyType_AllocNoTrack(PyTypeObject *type, Py_ssize_t nitems);
 
+extern int _PyObject_InitializeDict(PyObject *obj);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py
index 169e7acbf92b4..9165f45db64f3 100644
--- a/Lib/test/test_capi.py
+++ b/Lib/test/test_capi.py
@@ -323,9 +323,13 @@ class C(): pass
                         break
         """
         rc, out, err = assert_python_ok('-c', code)
-        self.assertIn(b'MemoryError 1', out)
-        self.assertIn(b'MemoryError 2 20', out)
-        self.assertIn(b'MemoryError 3 30', out)
+        lines = out.splitlines()
+        for i, line in enumerate(lines, 1):
+            self.assertIn(b'MemoryError', out)
+            *_, count = line.split(b' ')
+            count = int(count)
+            self.assertLessEqual(count, i*5)
+            self.assertGreaterEqual(count, i*5-1)
 
     def test_mapping_keys_values_items(self):
         class Mapping1(dict):
diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py
index 7bdef25c76384..98b36d6cd049c 100644
--- a/Lib/test/test_gdb.py
+++ b/Lib/test/test_gdb.py
@@ -566,7 +566,7 @@ def test_builtins_help(self):
         #  http://bugs.python.org/issue8032#msg100537 )
         gdb_repr, gdb_output = self.get_gdb_repr('id(__builtins__.help)', import_site=True)
 
-        m = re.match(r'<_Helper at remote 0x-?[0-9a-f]+>', gdb_repr)
+        m = re.match(r'<_Helper\(\) at remote 0x-?[0-9a-f]+>', gdb_repr)
         self.assertTrue(m,
                         msg='Unexpected rendering %r' % gdb_repr)
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-04-11-37-38.bpo-44821.67YHGI.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-04-11-37-38.bpo-44821.67YHGI.rst
new file mode 100644
index 0000000000000..1e254a62773bb
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-04-11-37-38.bpo-44821.67YHGI.rst	
@@ -0,0 +1,2 @@
+Create instance dictionaries (__dict__) eagerly, to improve regularity of
+object layout and assist specialization.
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 5fb9d01561236..5ad630feaf1e8 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -4866,19 +4866,44 @@ _PyDict_NewKeysForClass(void)
 
 #define CACHED_KEYS(tp) (((PyHeapTypeObject*)tp)->ht_cached_keys)
 
+int
+_PyObject_InitializeDict(PyObject *obj)
+{
+    PyObject **dictptr = _PyObject_GetDictPtr(obj);
+    if (dictptr == NULL) {
+        return 0;
+    }
+    assert(*dictptr == NULL);
+    PyTypeObject *tp = Py_TYPE(obj);
+    PyObject *dict;
+    if (_PyType_HasFeature(tp, Py_TPFLAGS_HEAPTYPE) && CACHED_KEYS(tp)) {
+        dictkeys_incref(CACHED_KEYS(tp));
+        dict = new_dict_with_shared_keys(CACHED_KEYS(tp));
+    }
+    else {
+        dict = PyDict_New();
+    }
+    if (dict == NULL) {
+        return -1;
+    }
+    *dictptr = dict;
+    return 0;
+}
+
+
 PyObject *
 PyObject_GenericGetDict(PyObject *obj, void *context)
 {
-    PyObject *dict, **dictptr = _PyObject_GetDictPtr(obj);
+    PyObject **dictptr = _PyObject_GetDictPtr(obj);
     if (dictptr == NULL) {
         PyErr_SetString(PyExc_AttributeError,
                         "This object has no __dict__");
         return NULL;
     }
-    dict = *dictptr;
+    PyObject *dict = *dictptr;
     if (dict == NULL) {
         PyTypeObject *tp = Py_TYPE(obj);
-        if ((tp->tp_flags & Py_TPFLAGS_HEAPTYPE) && CACHED_KEYS(tp)) {
+        if (_PyType_HasFeature(tp, Py_TPFLAGS_HEAPTYPE) && CACHED_KEYS(tp)) {
             dictkeys_incref(CACHED_KEYS(tp));
             *dictptr = dict = new_dict_with_shared_keys(CACHED_KEYS(tp));
         }
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 2240f780bb9ce..7ae50c453ed2f 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -4505,7 +4505,15 @@ object_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
         Py_DECREF(joined);
         return NULL;
     }
-    return type->tp_alloc(type, 0);
+    PyObject *obj = type->tp_alloc(type, 0);
+    if (obj == NULL) {
+        return NULL;
+    }
+    if (_PyObject_InitializeDict(obj)) {
+        Py_DECREF(obj);
+        return NULL;
+    }
+    return obj;
 }
 
 static void


From webhook-mailer at python.org  Wed Aug  4 12:09:32 2021
From: webhook-mailer at python.org (vstinner)
Date: Wed, 04 Aug 2021 16:09:32 -0000
Subject: [Python-checkins] bpo-41117: Cleanup subtract_refs() (GH-27593)
Message-ID: <mailman.881.1628093373.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/c34fa2bb06ea44045af8493dfa414addb2b7ce66
commit: c34fa2bb06ea44045af8493dfa414addb2b7ce66
branch: main
author: Victor Stinner <vstinner at python.org>
committer: vstinner <vstinner at python.org>
date: 2021-08-04T18:09:14+02:00
summary:

bpo-41117: Cleanup subtract_refs() (GH-27593)

subtract_refs() reuses the 'op' variable rather than calling the
FROM_GC() macro twice.

Issue reported by William Pickard.

files:
M Modules/gcmodule.c

diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
index e5e5aa3287b0d..2592c397cf2f7 100644
--- a/Modules/gcmodule.c
+++ b/Modules/gcmodule.c
@@ -479,9 +479,9 @@ subtract_refs(PyGC_Head *containers)
     for (; gc != containers; gc = GC_NEXT(gc)) {
         PyObject *op = FROM_GC(gc);
         traverse = Py_TYPE(op)->tp_traverse;
-        (void) traverse(FROM_GC(gc),
-                       (visitproc)visit_decref,
-                       op);
+        (void) traverse(op,
+                        (visitproc)visit_decref,
+                        op);
     }
 }
 


From webhook-mailer at python.org  Wed Aug  4 13:46:49 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 04 Aug 2021 17:46:49 -0000
Subject: [Python-checkins] Fix hyperlink conflict in turtle docs (GH-27592)
Message-ID: <mailman.882.1628099210.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/3d2b4c6f18d7e644e5850d2af74ac5dc530eb24c
commit: 3d2b4c6f18d7e644e5850d2af74ac5dc530eb24c
branch: main
author: Harry <harry.lees at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-04T19:46:30+02:00
summary:

Fix hyperlink conflict in turtle docs (GH-27592)

files:
M Doc/library/turtle.rst

diff --git a/Doc/library/turtle.rst b/Doc/library/turtle.rst
index 9e8e85da2bbb9..17bf8829a9fed 100644
--- a/Doc/library/turtle.rst
+++ b/Doc/library/turtle.rst
@@ -193,8 +193,8 @@ Methods of TurtleScreen/Screen
 Window control
    | :func:`bgcolor`
    | :func:`bgpic`
-   | :func:`clear` | :func:`clearscreen`
-   | :func:`reset` | :func:`resetscreen`
+   | :func:`clearscreen`
+   | :func:`resetscreen`
    | :func:`screensize`
    | :func:`setworldcoordinates`
 
@@ -1069,7 +1069,6 @@ More drawing control
 ~~~~~~~~~~~~~~~~~~~~
 
 .. function:: reset()
-   :noindex:
 
    Delete the turtle's drawings from the screen, re-center the turtle and set
    variables to the default values.
@@ -1091,7 +1090,6 @@ More drawing control
 
 
 .. function:: clear()
-   :noindex:
 
    Delete the turtle's drawings from the screen.  Do not move turtle.  State and
    position of the turtle as well as drawings of other turtles are not affected.
@@ -1627,11 +1625,7 @@ Window control
 
 
 .. function:: clear()
-              clearscreen()
-
-   Delete all drawings and all turtles from the TurtleScreen.  Reset the now
-   empty TurtleScreen to its initial state: white background, no background
-   image, no event bindings and tracing on.
+   :noindex:
 
    .. note::
       This TurtleScreen method is available as a global function only under the
@@ -1639,10 +1633,15 @@ Window control
       derived from the Turtle method ``clear``.
 
 
-.. function:: reset()
-              resetscreen()
+.. function:: clearscreen()
 
-   Reset all Turtles on the Screen to their initial state.
+   Delete all drawings and all turtles from the TurtleScreen.  Reset the now
+   empty TurtleScreen to its initial state: white background, no background
+   image, no event bindings and tracing on.
+
+
+.. function:: reset()
+   :noindex:
 
    .. note::
       This TurtleScreen method is available as a global function only under the
@@ -1650,6 +1649,11 @@ Window control
       derived from the Turtle method ``reset``.
 
 
+.. function:: resetscreen()
+
+   Reset all Turtles on the Screen to their initial state.
+
+
 .. function:: screensize(canvwidth=None, canvheight=None, bg=None)
 
    :param canvwidth: positive integer, new width of canvas in pixels


From webhook-mailer at python.org  Wed Aug  4 14:01:40 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 04 Aug 2021 18:01:40 -0000
Subject: [Python-checkins] Note that tp_clear and m_clear are not always
 called (GH-27581)
Message-ID: <mailman.883.1628100101.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/10faada709561663d6b1f623d308ff45e3808cca
commit: 10faada709561663d6b1f623d308ff45e3808cca
branch: main
author: Petr Viktorin <encukou at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-04T20:01:31+02:00
summary:

Note that tp_clear and m_clear are not always called (GH-27581)

files:
M Doc/c-api/module.rst
M Doc/c-api/typeobj.rst

diff --git a/Doc/c-api/module.rst b/Doc/c-api/module.rst
index a2541afb685c3..94c8d9f981713 100644
--- a/Doc/c-api/module.rst
+++ b/Doc/c-api/module.rst
@@ -221,6 +221,12 @@ or request "multi-phase initialization" by returning the definition struct itsel
       than 0 and the module state (as returned by :c:func:`PyModule_GetState`)
       is ``NULL``.
 
+      Like :c:member:`PyTypeObject.tp_clear`, this function is not *always*
+      called before a module is deallocated. For example, when reference
+      counting is enough to determine that an object is no longer used,
+      the cyclic garbage collector is not involved and
+      :c:member:`~PyModuleDef.m_free` is called directly.
+
       .. versionchanged:: 3.9
          No longer called before the module state is allocated.
 
diff --git a/Doc/c-api/typeobj.rst b/Doc/c-api/typeobj.rst
index b18e3852be3ad..b17fb22b69495 100644
--- a/Doc/c-api/typeobj.rst
+++ b/Doc/c-api/typeobj.rst
@@ -1381,6 +1381,12 @@ and :c:type:`PyType_Type` effectively act as defaults.)
    so that *self* knows the contained object can no longer be used.  The
    :c:func:`Py_CLEAR` macro performs the operations in a safe order.
 
+   Note that :c:member:`~PyTypeObject.tp_clear` is not *always* called
+   before an instance is deallocated. For example, when reference counting
+   is enough to determine that an object is no longer used, the cyclic garbage
+   collector is not involved and :c:member:`~PyTypeObject.tp_dealloc` is
+   called directly.
+
    Because the goal of :c:member:`~PyTypeObject.tp_clear` functions is to break reference cycles,
    it's not necessary to clear contained objects like Python strings or Python
    integers, which can't participate in reference cycles. On the other hand, it may


From webhook-mailer at python.org  Wed Aug  4 14:07:09 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 04 Aug 2021 18:07:09 -0000
Subject: [Python-checkins] bpo-44801: Check arguments in substitution of
 ParamSpec in Callable (GH-27585)
Message-ID: <mailman.884.1628100430.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/3875a6954741065b136650db67ac533bc70a3eac
commit: 3875a6954741065b136650db67ac533bc70a3eac
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-04T20:07:01+02:00
summary:

bpo-44801: Check arguments in substitution of ParamSpec in Callable (GH-27585)

files:
A Misc/NEWS.d/next/Library/2021-08-03-20-37-45.bpo-44801.i49Aug.rst
M Lib/_collections_abc.py
M Lib/test/test_typing.py
M Lib/typing.py

diff --git a/Lib/_collections_abc.py b/Lib/_collections_abc.py
index 33db9b259817c..87a9cd2d46de9 100644
--- a/Lib/_collections_abc.py
+++ b/Lib/_collections_abc.py
@@ -426,22 +426,16 @@ class _CallableGenericAlias(GenericAlias):
     __slots__ = ()
 
     def __new__(cls, origin, args):
-        return cls.__create_ga(origin, args)
-
-    @classmethod
-    def __create_ga(cls, origin, args):
-        if not isinstance(args, tuple) or len(args) != 2:
+        if not (isinstance(args, tuple) and len(args) == 2):
             raise TypeError(
                 "Callable must be used as Callable[[arg, ...], result].")
         t_args, t_result = args
-        if isinstance(t_args, (list, tuple)):
-            ga_args = tuple(t_args) + (t_result,)
-        # This relaxes what t_args can be on purpose to allow things like
-        # PEP 612 ParamSpec.  Responsibility for whether a user is using
-        # Callable[...] properly is deferred to static type checkers.
-        else:
-            ga_args = args
-        return super().__new__(cls, origin, ga_args)
+        if isinstance(t_args, list):
+            args = (*t_args, t_result)
+        elif not _is_param_expr(t_args):
+            raise TypeError(f"Expected a list of types, an ellipsis, "
+                            f"ParamSpec, or Concatenate. Got {t_args}")
+        return super().__new__(cls, origin, args)
 
     @property
     def __parameters__(self):
@@ -456,7 +450,7 @@ def __parameters__(self):
         return tuple(dict.fromkeys(params))
 
     def __repr__(self):
-        if _has_special_args(self.__args__):
+        if len(self.__args__) == 2 and _is_param_expr(self.__args__[0]):
             return super().__repr__()
         return (f'collections.abc.Callable'
                 f'[[{", ".join([_type_repr(a) for a in self.__args__[:-1]])}], '
@@ -464,7 +458,7 @@ def __repr__(self):
 
     def __reduce__(self):
         args = self.__args__
-        if not _has_special_args(args):
+        if not (len(args) == 2 and _is_param_expr(args[0])):
             args = list(args[:-1]), args[-1]
         return _CallableGenericAlias, (Callable, args)
 
@@ -479,10 +473,11 @@ def __getitem__(self, item):
         param_len = len(self.__parameters__)
         if param_len == 0:
             raise TypeError(f'{self} is not a generic class')
-        if (param_len == 1
-                and isinstance(item, (tuple, list))
-                and len(item) > 1) or not isinstance(item, tuple):
+        if not isinstance(item, tuple):
             item = (item,)
+        if (param_len == 1 and _is_param_expr(self.__parameters__[0])
+                and item and not _is_param_expr(item[0])):
+            item = (list(item),)
         item_len = len(item)
         if item_len != param_len:
             raise TypeError(f'Too {"many" if item_len > param_len else "few"}'
@@ -492,7 +487,13 @@ def __getitem__(self, item):
         new_args = []
         for arg in self.__args__:
             if _is_typevarlike(arg):
-                arg = subst[arg]
+                if _is_param_expr(arg):
+                    arg = subst[arg]
+                    if not _is_param_expr(arg):
+                        raise TypeError(f"Expected a list of types, an ellipsis, "
+                                        f"ParamSpec, or Concatenate. Got {arg}")
+                else:
+                    arg = subst[arg]
             # Looks like a GenericAlias
             elif hasattr(arg, '__parameters__') and isinstance(arg.__parameters__, tuple):
                 subparams = arg.__parameters__
@@ -502,32 +503,31 @@ def __getitem__(self, item):
             new_args.append(arg)
 
         # args[0] occurs due to things like Z[[int, str, bool]] from PEP 612
-        if not isinstance(new_args[0], (tuple, list)):
+        if not isinstance(new_args[0], list):
             t_result = new_args[-1]
             t_args = new_args[:-1]
             new_args = (t_args, t_result)
         return _CallableGenericAlias(Callable, tuple(new_args))
 
+
 def _is_typevarlike(arg):
     obj = type(arg)
     # looks like a TypeVar/ParamSpec
     return (obj.__module__ == 'typing'
             and obj.__name__ in {'ParamSpec', 'TypeVar'})
 
-def _has_special_args(args):
-    """Checks if args[0] matches either ``...``, ``ParamSpec`` or
+def _is_param_expr(obj):
+    """Checks if obj matches either a list of types, ``...``, ``ParamSpec`` or
     ``_ConcatenateGenericAlias`` from typing.py
     """
-    if len(args) != 2:
-        return False
-    obj = args[0]
     if obj is Ellipsis:
         return True
+    if isinstance(obj, list):
+        return True
     obj = type(obj)
     names = ('ParamSpec', '_ConcatenateGenericAlias')
     return obj.__module__ == 'typing' and any(obj.__name__ == name for name in names)
 
-
 def _type_repr(obj):
     """Return the repr() of an object, special-casing types (internal helper).
 
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index 1a172a06705de..439d963af5bd4 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -581,17 +581,33 @@ def test_paramspec(self):
         Callable = self.Callable
         fullname = f"{Callable.__module__}.Callable"
         P = ParamSpec('P')
+        P2 = ParamSpec('P2')
         C1 = Callable[P, T]
         # substitution
-        self.assertEqual(C1[int, str], Callable[[int], str])
+        self.assertEqual(C1[[int], str], Callable[[int], str])
         self.assertEqual(C1[[int, str], str], Callable[[int, str], str])
+        self.assertEqual(C1[[], str], Callable[[], str])
+        self.assertEqual(C1[..., str], Callable[..., str])
+        self.assertEqual(C1[P2, str], Callable[P2, str])
+        self.assertEqual(C1[Concatenate[int, P2], str],
+                         Callable[Concatenate[int, P2], str])
         self.assertEqual(repr(C1), f"{fullname}[~P, ~T]")
-        self.assertEqual(repr(C1[int, str]), f"{fullname}[[int], str]")
+        self.assertEqual(repr(C1[[int, str], str]), f"{fullname}[[int, str], str]")
+        with self.assertRaises(TypeError):
+            C1[int, str]
 
         C2 = Callable[P, int]
+        self.assertEqual(C2[[int]], Callable[[int], int])
+        self.assertEqual(C2[[int, str]], Callable[[int, str], int])
+        self.assertEqual(C2[[]], Callable[[], int])
+        self.assertEqual(C2[...], Callable[..., int])
+        self.assertEqual(C2[P2], Callable[P2, int])
+        self.assertEqual(C2[Concatenate[int, P2]],
+                         Callable[Concatenate[int, P2], int])
         # special case in PEP 612 where
         # X[int, str, float] == X[[int, str, float]]
-        self.assertEqual(C2[int, str, float], C2[[int, str, float]])
+        self.assertEqual(C2[int], Callable[[int], int])
+        self.assertEqual(C2[int, str], Callable[[int, str], int])
         self.assertEqual(repr(C2), f"{fullname}[~P, int]")
         self.assertEqual(repr(C2[int, str]), f"{fullname}[[int, str], int]")
 
@@ -4656,6 +4672,29 @@ class Z(Generic[P]):
         self.assertEqual(G5.__parameters__, G6.__parameters__)
         self.assertEqual(G5, G6)
 
+        G7 = Z[int]
+        self.assertEqual(G7.__args__, ((int,),))
+        self.assertEqual(G7.__parameters__, ())
+
+        with self.assertRaisesRegex(TypeError, "many arguments for"):
+            Z[[int, str], bool]
+        with self.assertRaisesRegex(TypeError, "many arguments for"):
+            Z[P_2, bool]
+
+    def test_multiple_paramspecs_in_user_generics(self):
+        P = ParamSpec("P")
+        P2 = ParamSpec("P2")
+
+        class X(Generic[P, P2]):
+            f: Callable[P, int]
+            g: Callable[P2, str]
+
+        G1 = X[[int, str], [bytes]]
+        G2 = X[[int], [str, bytes]]
+        self.assertNotEqual(G1, G2)
+        self.assertEqual(G1.__args__, ((int, str), (bytes,)))
+        self.assertEqual(G2.__args__, ((int,), (str, bytes)))
+
     def test_no_paramspec_in__parameters__(self):
         # ParamSpec should not be found in __parameters__
         # of generics. Usages outside Callable, Concatenate
diff --git a/Lib/typing.py b/Lib/typing.py
index 7a12d31f2b35e..9c595ae541aa1 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -182,6 +182,11 @@ def _type_check(arg, msg, is_argument=True, module=None):
     return arg
 
 
+def _is_param_expr(arg):
+    return arg is ... or isinstance(arg,
+            (tuple, list, ParamSpec, _ConcatenateGenericAlias))
+
+
 def _type_repr(obj):
     """Return the repr() of an object, special-casing types (internal helper).
 
@@ -236,7 +241,9 @@ def _prepare_paramspec_params(cls, params):
     variables (internal helper).
     """
     # Special case where Z[[int, str, bool]] == Z[int, str, bool] in PEP 612.
-    if len(cls.__parameters__) == 1 and len(params) > 1:
+    if (len(cls.__parameters__) == 1
+            and params and not _is_param_expr(params[0])):
+        assert isinstance(cls.__parameters__[0], ParamSpec)
         return (params,)
     else:
         _check_generic(cls, params, len(cls.__parameters__))
@@ -1033,7 +1040,13 @@ def __getitem__(self, params):
         new_args = []
         for arg in self.__args__:
             if isinstance(arg, self._typevar_types):
-                arg = subst[arg]
+                if isinstance(arg, ParamSpec):
+                    arg = subst[arg]
+                    if not _is_param_expr(arg):
+                        raise TypeError(f"Expected a list of types, an ellipsis, "
+                                        f"ParamSpec, or Concatenate. Got {arg}")
+                else:
+                    arg = subst[arg]
             elif isinstance(arg, (_GenericAlias, GenericAlias, types.UnionType)):
                 subparams = arg.__parameters__
                 if subparams:
@@ -1131,8 +1144,7 @@ class _CallableGenericAlias(_GenericAlias, _root=True):
     def __repr__(self):
         assert self._name == 'Callable'
         args = self.__args__
-        if len(args) == 2 and (args[0] is Ellipsis
-                               or isinstance(args[0], (ParamSpec, _ConcatenateGenericAlias))):
+        if len(args) == 2 and _is_param_expr(args[0]):
             return super().__repr__()
         return (f'typing.Callable'
                 f'[[{", ".join([_type_repr(a) for a in args[:-1]])}], '
@@ -1140,8 +1152,7 @@ def __repr__(self):
 
     def __reduce__(self):
         args = self.__args__
-        if not (len(args) == 2 and (args[0] is Ellipsis
-                                    or isinstance(args[0], (ParamSpec, _ConcatenateGenericAlias)))):
+        if not (len(args) == 2 and _is_param_expr(args[0])):
             args = list(args[:-1]), args[-1]
         return operator.getitem, (Callable, args)
 
@@ -1864,8 +1875,7 @@ def get_args(tp):
     if isinstance(tp, (_GenericAlias, GenericAlias)):
         res = tp.__args__
         if (tp.__origin__ is collections.abc.Callable
-                and not (res[0] is Ellipsis
-                         or isinstance(res[0], (ParamSpec, _ConcatenateGenericAlias)))):
+                and not (len(res) == 2 and _is_param_expr(res[0]))):
             res = (list(res[:-1]), res[-1])
         return res
     if isinstance(tp, types.UnionType):
diff --git a/Misc/NEWS.d/next/Library/2021-08-03-20-37-45.bpo-44801.i49Aug.rst b/Misc/NEWS.d/next/Library/2021-08-03-20-37-45.bpo-44801.i49Aug.rst
new file mode 100644
index 0000000000000..05e372a5fabb0
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-03-20-37-45.bpo-44801.i49Aug.rst
@@ -0,0 +1,3 @@
+Ensure that the :class:`~typing.ParamSpec` variable in Callable
+can only be substituted with a parameters expression (a list of types,
+an ellipsis, ParamSpec or Concatenate).


From webhook-mailer at python.org  Wed Aug  4 14:14:22 2021
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 04 Aug 2021 18:14:22 -0000
Subject: [Python-checkins] Fix hyperlink conflict in turtle docs (GH-27592)
Message-ID: <mailman.885.1628100863.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/40a863185ee53b7c9044d970dfa0207a971764c2
commit: 40a863185ee53b7c9044d970dfa0207a971764c2
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-04T11:14:12-07:00
summary:

Fix hyperlink conflict in turtle docs (GH-27592)

(cherry picked from commit 3d2b4c6f18d7e644e5850d2af74ac5dc530eb24c)

Co-authored-by: Harry <harry.lees at gmail.com>

files:
M Doc/library/turtle.rst

diff --git a/Doc/library/turtle.rst b/Doc/library/turtle.rst
index 6a9d61916ad1a..228cf1e01e74a 100644
--- a/Doc/library/turtle.rst
+++ b/Doc/library/turtle.rst
@@ -193,8 +193,8 @@ Methods of TurtleScreen/Screen
 Window control
    | :func:`bgcolor`
    | :func:`bgpic`
-   | :func:`clear` | :func:`clearscreen`
-   | :func:`reset` | :func:`resetscreen`
+   | :func:`clearscreen`
+   | :func:`resetscreen`
    | :func:`screensize`
    | :func:`setworldcoordinates`
 
@@ -1069,7 +1069,6 @@ More drawing control
 ~~~~~~~~~~~~~~~~~~~~
 
 .. function:: reset()
-   :noindex:
 
    Delete the turtle's drawings from the screen, re-center the turtle and set
    variables to the default values.
@@ -1091,7 +1090,6 @@ More drawing control
 
 
 .. function:: clear()
-   :noindex:
 
    Delete the turtle's drawings from the screen.  Do not move turtle.  State and
    position of the turtle as well as drawings of other turtles are not affected.
@@ -1627,11 +1625,7 @@ Window control
 
 
 .. function:: clear()
-              clearscreen()
-
-   Delete all drawings and all turtles from the TurtleScreen.  Reset the now
-   empty TurtleScreen to its initial state: white background, no background
-   image, no event bindings and tracing on.
+   :noindex:
 
    .. note::
       This TurtleScreen method is available as a global function only under the
@@ -1639,10 +1633,15 @@ Window control
       derived from the Turtle method ``clear``.
 
 
-.. function:: reset()
-              resetscreen()
+.. function:: clearscreen()
 
-   Reset all Turtles on the Screen to their initial state.
+   Delete all drawings and all turtles from the TurtleScreen.  Reset the now
+   empty TurtleScreen to its initial state: white background, no background
+   image, no event bindings and tracing on.
+
+
+.. function:: reset()
+   :noindex:
 
    .. note::
       This TurtleScreen method is available as a global function only under the
@@ -1650,6 +1649,11 @@ Window control
       derived from the Turtle method ``reset``.
 
 
+.. function:: resetscreen()
+
+   Reset all Turtles on the Screen to their initial state.
+
+
 .. function:: screensize(canvwidth=None, canvheight=None, bg=None)
 
    :param canvwidth: positive integer, new width of canvas in pixels


From webhook-mailer at python.org  Wed Aug  4 14:15:25 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 04 Aug 2021 18:15:25 -0000
Subject: [Python-checkins] Fix hyperlink conflict in turtle docs (GH-27592)
 (GH-27595)
Message-ID: <mailman.886.1628100926.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/bf9425be5d4c77e2b47c45ff94f6b53dc72f7529
commit: bf9425be5d4c77e2b47c45ff94f6b53dc72f7529
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-04T20:15:19+02:00
summary:

Fix hyperlink conflict in turtle docs (GH-27592) (GH-27595)

(cherry picked from commit 3d2b4c6f18d7e644e5850d2af74ac5dc530eb24c)

Co-authored-by: Harry <harry.lees at gmail.com>

files:
M Doc/library/turtle.rst

diff --git a/Doc/library/turtle.rst b/Doc/library/turtle.rst
index 6a9d61916ad1a..228cf1e01e74a 100644
--- a/Doc/library/turtle.rst
+++ b/Doc/library/turtle.rst
@@ -193,8 +193,8 @@ Methods of TurtleScreen/Screen
 Window control
    | :func:`bgcolor`
    | :func:`bgpic`
-   | :func:`clear` | :func:`clearscreen`
-   | :func:`reset` | :func:`resetscreen`
+   | :func:`clearscreen`
+   | :func:`resetscreen`
    | :func:`screensize`
    | :func:`setworldcoordinates`
 
@@ -1069,7 +1069,6 @@ More drawing control
 ~~~~~~~~~~~~~~~~~~~~
 
 .. function:: reset()
-   :noindex:
 
    Delete the turtle's drawings from the screen, re-center the turtle and set
    variables to the default values.
@@ -1091,7 +1090,6 @@ More drawing control
 
 
 .. function:: clear()
-   :noindex:
 
    Delete the turtle's drawings from the screen.  Do not move turtle.  State and
    position of the turtle as well as drawings of other turtles are not affected.
@@ -1627,11 +1625,7 @@ Window control
 
 
 .. function:: clear()
-              clearscreen()
-
-   Delete all drawings and all turtles from the TurtleScreen.  Reset the now
-   empty TurtleScreen to its initial state: white background, no background
-   image, no event bindings and tracing on.
+   :noindex:
 
    .. note::
       This TurtleScreen method is available as a global function only under the
@@ -1639,10 +1633,15 @@ Window control
       derived from the Turtle method ``clear``.
 
 
-.. function:: reset()
-              resetscreen()
+.. function:: clearscreen()
 
-   Reset all Turtles on the Screen to their initial state.
+   Delete all drawings and all turtles from the TurtleScreen.  Reset the now
+   empty TurtleScreen to its initial state: white background, no background
+   image, no event bindings and tracing on.
+
+
+.. function:: reset()
+   :noindex:
 
    .. note::
       This TurtleScreen method is available as a global function only under the
@@ -1650,6 +1649,11 @@ Window control
       derived from the Turtle method ``reset``.
 
 
+.. function:: resetscreen()
+
+   Reset all Turtles on the Screen to their initial state.
+
+
 .. function:: screensize(canvwidth=None, canvheight=None, bg=None)
 
    :param canvwidth: positive integer, new width of canvas in pixels


From webhook-mailer at python.org  Wed Aug  4 14:23:51 2021
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 04 Aug 2021 18:23:51 -0000
Subject: [Python-checkins] Note that tp_clear and m_clear are not always
 called (GH-27581)
Message-ID: <mailman.887.1628101433.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/f4b3217874743762c3e157979c0cd315853f18a9
commit: f4b3217874743762c3e157979c0cd315853f18a9
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-04T11:23:41-07:00
summary:

Note that tp_clear and m_clear are not always called (GH-27581)

(cherry picked from commit 10faada709561663d6b1f623d308ff45e3808cca)

Co-authored-by: Petr Viktorin <encukou at gmail.com>

files:
M Doc/c-api/module.rst
M Doc/c-api/typeobj.rst

diff --git a/Doc/c-api/module.rst b/Doc/c-api/module.rst
index a2541afb685c3..94c8d9f981713 100644
--- a/Doc/c-api/module.rst
+++ b/Doc/c-api/module.rst
@@ -221,6 +221,12 @@ or request "multi-phase initialization" by returning the definition struct itsel
       than 0 and the module state (as returned by :c:func:`PyModule_GetState`)
       is ``NULL``.
 
+      Like :c:member:`PyTypeObject.tp_clear`, this function is not *always*
+      called before a module is deallocated. For example, when reference
+      counting is enough to determine that an object is no longer used,
+      the cyclic garbage collector is not involved and
+      :c:member:`~PyModuleDef.m_free` is called directly.
+
       .. versionchanged:: 3.9
          No longer called before the module state is allocated.
 
diff --git a/Doc/c-api/typeobj.rst b/Doc/c-api/typeobj.rst
index 5fda9b086c006..7ef081a13a6e1 100644
--- a/Doc/c-api/typeobj.rst
+++ b/Doc/c-api/typeobj.rst
@@ -1380,6 +1380,12 @@ and :c:type:`PyType_Type` effectively act as defaults.)
    so that *self* knows the contained object can no longer be used.  The
    :c:func:`Py_CLEAR` macro performs the operations in a safe order.
 
+   Note that :c:member:`~PyTypeObject.tp_clear` is not *always* called
+   before an instance is deallocated. For example, when reference counting
+   is enough to determine that an object is no longer used, the cyclic garbage
+   collector is not involved and :c:member:`~PyTypeObject.tp_dealloc` is
+   called directly.
+
    Because the goal of :c:member:`~PyTypeObject.tp_clear` functions is to break reference cycles,
    it's not necessary to clear contained objects like Python strings or Python
    integers, which can't participate in reference cycles. On the other hand, it may


From webhook-mailer at python.org  Wed Aug  4 14:24:12 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 04 Aug 2021 18:24:12 -0000
Subject: [Python-checkins] Note that tp_clear and m_clear are not always
 called (GH-27581) (GH-27597)
Message-ID: <mailman.888.1628101453.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/467c873e495ca9246f2cd52024672f3aece7d7d9
commit: 467c873e495ca9246f2cd52024672f3aece7d7d9
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-04T20:24:03+02:00
summary:

Note that tp_clear and m_clear are not always called (GH-27581) (GH-27597)

(cherry picked from commit 10faada709561663d6b1f623d308ff45e3808cca)

Co-authored-by: Petr Viktorin <encukou at gmail.com>

files:
M Doc/c-api/module.rst
M Doc/c-api/typeobj.rst

diff --git a/Doc/c-api/module.rst b/Doc/c-api/module.rst
index 90766dca78bfa..f0569ed4fca35 100644
--- a/Doc/c-api/module.rst
+++ b/Doc/c-api/module.rst
@@ -221,6 +221,12 @@ or request "multi-phase initialization" by returning the definition struct itsel
       than 0 and the module state (as returned by :c:func:`PyModule_GetState`)
       is ``NULL``.
 
+      Like :c:member:`PyTypeObject.tp_clear`, this function is not *always*
+      called before a module is deallocated. For example, when reference
+      counting is enough to determine that an object is no longer used,
+      the cyclic garbage collector is not involved and
+      :c:member:`~PyModuleDef.m_free` is called directly.
+
       .. versionchanged:: 3.9
          No longer called before the module state is allocated.
 
diff --git a/Doc/c-api/typeobj.rst b/Doc/c-api/typeobj.rst
index ddcb8ae3d0950..5a1f5f994dddd 100644
--- a/Doc/c-api/typeobj.rst
+++ b/Doc/c-api/typeobj.rst
@@ -1294,6 +1294,12 @@ and :c:type:`PyType_Type` effectively act as defaults.)
    so that *self* knows the contained object can no longer be used.  The
    :c:func:`Py_CLEAR` macro performs the operations in a safe order.
 
+   Note that :c:member:`~PyTypeObject.tp_clear` is not *always* called
+   before an instance is deallocated. For example, when reference counting
+   is enough to determine that an object is no longer used, the cyclic garbage
+   collector is not involved and :c:member:`~PyTypeObject.tp_dealloc` is
+   called directly.
+
    Because the goal of :c:member:`~PyTypeObject.tp_clear` functions is to break reference cycles,
    it's not necessary to clear contained objects like Python strings or Python
    integers, which can't participate in reference cycles. On the other hand, it may


From webhook-mailer at python.org  Wed Aug  4 14:54:06 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 04 Aug 2021 18:54:06 -0000
Subject: [Python-checkins] Fix 404 link to the pyporting mailing list
 (GH-27320)
Message-ID: <mailman.889.1628103247.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/977d99d1cca6ddd87fe6f218bca46e7ef105bd72
commit: 977d99d1cca6ddd87fe6f218bca46e7ef105bd72
branch: main
author: Rohit Nishad <47008599+rohitnishad613 at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-04T20:53:58+02:00
summary:

Fix 404 link to the pyporting mailing list (GH-27320)

Co-authored-by: Mariatta Wijaya <Mariatta at users.noreply.github.com>
Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
M Doc/howto/pyporting.rst

diff --git a/Doc/howto/pyporting.rst b/Doc/howto/pyporting.rst
index 1543823c104c28..abcc34287e3d29 100644
--- a/Doc/howto/pyporting.rst
+++ b/Doc/howto/pyporting.rst
@@ -20,8 +20,8 @@ Porting Python 2 Code to Python 3
    came into existence, you can read Nick Coghlan's `Python 3 Q & A`_ or
    Brett Cannon's `Why Python 3 exists`_.
 
-   For help with porting, you can email the python-porting_ mailing list with
-   questions.
+
+   For help with porting, you can view the archived python-porting_ mailing list.
 
 The Short Explanation
 =====================
@@ -446,7 +446,7 @@ to make sure everything functions as expected in both versions of Python.
 
 .. _pytype: https://github.com/google/pytype
 .. _python-future: http://python-future.org/
-.. _python-porting: https://mail.python.org/mailman/listinfo/python-porting
+.. _python-porting: https://mail.python.org/pipermail/python-porting/
 .. _six: https://pypi.org/project/six
 .. _tox: https://pypi.org/project/tox
 .. _trove classifier: https://pypi.org/classifiers


From webhook-mailer at python.org  Wed Aug  4 15:01:42 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 04 Aug 2021 19:01:42 -0000
Subject: [Python-checkins] bpo-44564 Move formatted assertion under
 deprecation warning context (GH-27090)
Message-ID: <mailman.890.1628103703.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/f99c015638b46e46ae3ee3f27b96a514007cdaef
commit: f99c015638b46e46ae3ee3f27b96a514007cdaef
branch: main
author: Brandon Schabell <brandonschabell at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-04T21:01:30+02:00
summary:

bpo-44564 Move formatted assertion under deprecation warning context (GH-27090)

files:
M Lib/test/test_enum.py

diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py
index 0267ff5684c0d..116f61e5cf092 100644
--- a/Lib/test/test_enum.py
+++ b/Lib/test/test_enum.py
@@ -2321,7 +2321,7 @@ class OkayEnum(CustomStrEnum):
         self.assertEqual(str(OkayEnum.one), 'one')
         with self.assertWarns(DeprecationWarning):
             self.assertEqual('{}'.format(OkayEnum.one), '1')
-        self.assertEqual(OkayEnum.one, '{}'.format(OkayEnum.one))
+            self.assertEqual(OkayEnum.one, '{}'.format(OkayEnum.one))
         self.assertEqual(repr(OkayEnum.one), 'OkayEnum.one')
         #
         class DumbMixin:


From webhook-mailer at python.org  Wed Aug  4 15:15:48 2021
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 04 Aug 2021 19:15:48 -0000
Subject: [Python-checkins] Fix 404 link to the pyporting mailing list
 (GH-27320)
Message-ID: <mailman.891.1628104549.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/770be3a9e128d96657172314c46351425a3ee0f7
commit: 770be3a9e128d96657172314c46351425a3ee0f7
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-04T12:15:40-07:00
summary:

Fix 404 link to the pyporting mailing list (GH-27320)


Co-authored-by: Mariatta Wijaya <Mariatta at users.noreply.github.com>
Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 977d99d1cca6ddd87fe6f218bca46e7ef105bd72)

Co-authored-by: Rohit Nishad <47008599+rohitnishad613 at users.noreply.github.com>

files:
M Doc/howto/pyporting.rst

diff --git a/Doc/howto/pyporting.rst b/Doc/howto/pyporting.rst
index 1543823c104c28..abcc34287e3d29 100644
--- a/Doc/howto/pyporting.rst
+++ b/Doc/howto/pyporting.rst
@@ -20,8 +20,8 @@ Porting Python 2 Code to Python 3
    came into existence, you can read Nick Coghlan's `Python 3 Q & A`_ or
    Brett Cannon's `Why Python 3 exists`_.
 
-   For help with porting, you can email the python-porting_ mailing list with
-   questions.
+
+   For help with porting, you can view the archived python-porting_ mailing list.
 
 The Short Explanation
 =====================
@@ -446,7 +446,7 @@ to make sure everything functions as expected in both versions of Python.
 
 .. _pytype: https://github.com/google/pytype
 .. _python-future: http://python-future.org/
-.. _python-porting: https://mail.python.org/mailman/listinfo/python-porting
+.. _python-porting: https://mail.python.org/pipermail/python-porting/
 .. _six: https://pypi.org/project/six
 .. _tox: https://pypi.org/project/tox
 .. _trove classifier: https://pypi.org/classifiers


From webhook-mailer at python.org  Wed Aug  4 15:24:01 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 04 Aug 2021 19:24:01 -0000
Subject: [Python-checkins] Fix 404 link to the pyporting mailing list
 (GH-27320) (GH-27601)
Message-ID: <mailman.892.1628105042.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/ed0d91bafa0de848aa2fcbabbe1b9ef9752748cc
commit: ed0d91bafa0de848aa2fcbabbe1b9ef9752748cc
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-04T21:23:48+02:00
summary:

Fix 404 link to the pyporting mailing list (GH-27320) (GH-27601)

Co-authored-by: Mariatta Wijaya <Mariatta at users.noreply.github.com>
Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 977d99d1cca6ddd87fe6f218bca46e7ef105bd72)

Co-authored-by: Rohit Nishad <47008599+rohitnishad613 at users.noreply.github.com>

files:
M Doc/howto/pyporting.rst

diff --git a/Doc/howto/pyporting.rst b/Doc/howto/pyporting.rst
index 1543823c104c28..abcc34287e3d29 100644
--- a/Doc/howto/pyporting.rst
+++ b/Doc/howto/pyporting.rst
@@ -20,8 +20,8 @@ Porting Python 2 Code to Python 3
    came into existence, you can read Nick Coghlan's `Python 3 Q & A`_ or
    Brett Cannon's `Why Python 3 exists`_.
 
-   For help with porting, you can email the python-porting_ mailing list with
-   questions.
+
+   For help with porting, you can view the archived python-porting_ mailing list.
 
 The Short Explanation
 =====================
@@ -446,7 +446,7 @@ to make sure everything functions as expected in both versions of Python.
 
 .. _pytype: https://github.com/google/pytype
 .. _python-future: http://python-future.org/
-.. _python-porting: https://mail.python.org/mailman/listinfo/python-porting
+.. _python-porting: https://mail.python.org/pipermail/python-porting/
 .. _six: https://pypi.org/project/six
 .. _tox: https://pypi.org/project/tox
 .. _trove classifier: https://pypi.org/classifiers


From webhook-mailer at python.org  Wed Aug  4 15:29:18 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 04 Aug 2021 19:29:18 -0000
Subject: [Python-checkins] Fix typo in 'xml.dom.minidom' documentation
 (GH-27602)
Message-ID: <mailman.893.1628105359.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/cc77193127381be16467ad10f421d3ba147ed972
commit: cc77193127381be16467ad10f421d3ba147ed972
branch: main
author: Cristi?n Maureira-Fredes <cmaureir at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-04T21:29:01+02:00
summary:

Fix typo in 'xml.dom.minidom' documentation (GH-27602)

files:
M Doc/library/xml.dom.minidom.rst

diff --git a/Doc/library/xml.dom.minidom.rst b/Doc/library/xml.dom.minidom.rst
index bf72c46561b7c..d3a5f872204a3 100644
--- a/Doc/library/xml.dom.minidom.rst
+++ b/Doc/library/xml.dom.minidom.rst
@@ -145,7 +145,7 @@ module documentation.  This section lists the differences between the API and
    For the :class:`Document` node, an additional keyword argument *encoding* can
    be used to specify the encoding field of the XML header.
 
-   Silimarly, explicitly stating the *standalone* argument causes the
+   Similarly, explicitly stating the *standalone* argument causes the
    standalone document declarations to be added to the prologue of the XML
    document.
    If the value is set to `True`, `standalone="yes"` is added,


From webhook-mailer at python.org  Wed Aug  4 15:35:03 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 04 Aug 2021 19:35:03 -0000
Subject: [Python-checkins] [doc] bpo-43066: zipfile - add note on leading
 slash in the filename arg (GH-26899)
Message-ID: <mailman.894.1628105705.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/7c5dab4340032eb15d3797d8b601ef11649bbab3
commit: 7c5dab4340032eb15d3797d8b601ef11649bbab3
branch: main
author: andrei kulakov <andrei.avk at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-04T21:34:34+02:00
summary:

[doc] bpo-43066: zipfile - add note on leading slash in the filename arg (GH-26899)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Misc/NEWS.d/next/Documentation/2021-06-24-14-37-16.bpo-43066.Ti7ahX.rst
M Doc/library/zipfile.rst

diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst
index 19a67ab694cb96..a0bbdbf595aa8c 100644
--- a/Doc/library/zipfile.rst
+++ b/Doc/library/zipfile.rst
@@ -78,7 +78,6 @@ The module defines the following items:
    of the last modification to the file; the fields are described in section
    :ref:`zipinfo-objects`.
 
-
 .. function:: is_zipfile(filename)
 
    Returns ``True`` if *filename* is a valid ZIP file based on its magic number,
@@ -406,6 +405,11 @@ ZipFile Objects
       If ``arcname`` (or ``filename``, if ``arcname`` is  not given) contains a null
       byte, the name of the file in the archive will be truncated at the null byte.
 
+   .. note::
+
+      A leading slash in the filename may lead to the archive being impossible to
+      open in some zip programs on Windows systems.
+
    .. versionchanged:: 3.6
       Calling :meth:`write` on a ZipFile created with mode ``'r'`` or
       a closed ZipFile will raise a :exc:`ValueError`.  Previously,
diff --git a/Misc/NEWS.d/next/Documentation/2021-06-24-14-37-16.bpo-43066.Ti7ahX.rst b/Misc/NEWS.d/next/Documentation/2021-06-24-14-37-16.bpo-43066.Ti7ahX.rst
new file mode 100644
index 00000000000000..3e38522839e8be
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2021-06-24-14-37-16.bpo-43066.Ti7ahX.rst
@@ -0,0 +1,2 @@
+Added a warning to :mod:`zipfile` docs: filename arg with a leading slash may cause archive to
+be un-openable on Windows systems.


From webhook-mailer at python.org  Wed Aug  4 15:39:55 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 04 Aug 2021 19:39:55 -0000
Subject: [Python-checkins] bpo-42958: Improve description of shallow= in
 filecmp.cmp docs (GH-27166)
Message-ID: <mailman.895.1628105996.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/a8dc4893d2b28827e82447326ea47759c161a722
commit: a8dc4893d2b28827e82447326ea47759c161a722
branch: main
author: andrei kulakov <andrei.avk at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-04T21:39:45+02:00
summary:

bpo-42958: Improve description of shallow= in filecmp.cmp docs (GH-27166)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
Co-authored-by: Alexander Vandenbulcke <alexander.vandenbulcke95 at gmail.com>

files:
A Misc/NEWS.d/next/Documentation/2021-07-15-11-19-03.bpo-42958.gC5IHM.rst
M Doc/library/filecmp.rst
M Lib/filecmp.py

diff --git a/Doc/library/filecmp.rst b/Doc/library/filecmp.rst
index c60603b30a6d7..83e9e14ddcacd 100644
--- a/Doc/library/filecmp.rst
+++ b/Doc/library/filecmp.rst
@@ -22,8 +22,11 @@ The :mod:`filecmp` module defines the following functions:
    Compare the files named *f1* and *f2*, returning ``True`` if they seem equal,
    ``False`` otherwise.
 
-   If *shallow* is true, files with identical :func:`os.stat` signatures are
-   taken to be equal.  Otherwise, the contents of the files are compared.
+   If *shallow* is true and the :func:`os.stat` signatures (file type, size, and
+   modification time) of both files are identical, the files are taken to be
+   equal.
+
+   Otherwise, the files are treated as different if their sizes or contents differ.
 
    Note that no external programs are called from this function, giving it
    portability and efficiency.
diff --git a/Lib/filecmp.py b/Lib/filecmp.py
index 7c47eb022cc8c..70a4b23c98220 100644
--- a/Lib/filecmp.py
+++ b/Lib/filecmp.py
@@ -36,8 +36,9 @@ def cmp(f1, f2, shallow=True):
 
     f2 -- Second file name
 
-    shallow -- Just check stat signature (do not read the files).
-               defaults to True.
+    shallow -- treat files as identical if their stat signatures (type, size,
+               mtime) are identical. Otherwise, files are considered different
+               if their sizes or contents differ.  [default: True]
 
     Return value:
 
diff --git a/Misc/NEWS.d/next/Documentation/2021-07-15-11-19-03.bpo-42958.gC5IHM.rst b/Misc/NEWS.d/next/Documentation/2021-07-15-11-19-03.bpo-42958.gC5IHM.rst
new file mode 100644
index 0000000000000..c93b84d095526
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2021-07-15-11-19-03.bpo-42958.gC5IHM.rst
@@ -0,0 +1,2 @@
+Updated the docstring and docs of :func:`filecmp.cmp` to be more accurate
+and less confusing especially in respect to *shallow* arg.


From webhook-mailer at python.org  Wed Aug  4 15:50:26 2021
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 04 Aug 2021 19:50:26 -0000
Subject: [Python-checkins] Fix typo in 'xml.dom.minidom' documentation
 (GH-27602)
Message-ID: <mailman.896.1628106627.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/cdcae41377ba4b3bd352218f909e58035f16d8e1
commit: cdcae41377ba4b3bd352218f909e58035f16d8e1
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-04T12:50:18-07:00
summary:

Fix typo in 'xml.dom.minidom' documentation (GH-27602)

(cherry picked from commit cc77193127381be16467ad10f421d3ba147ed972)

Co-authored-by: Cristi?n Maureira-Fredes <cmaureir at users.noreply.github.com>

files:
M Doc/library/xml.dom.minidom.rst

diff --git a/Doc/library/xml.dom.minidom.rst b/Doc/library/xml.dom.minidom.rst
index bf72c46561b7c..d3a5f872204a3 100644
--- a/Doc/library/xml.dom.minidom.rst
+++ b/Doc/library/xml.dom.minidom.rst
@@ -145,7 +145,7 @@ module documentation.  This section lists the differences between the API and
    For the :class:`Document` node, an additional keyword argument *encoding* can
    be used to specify the encoding field of the XML header.
 
-   Silimarly, explicitly stating the *standalone* argument causes the
+   Similarly, explicitly stating the *standalone* argument causes the
    standalone document declarations to be added to the prologue of the XML
    document.
    If the value is set to `True`, `standalone="yes"` is added,


From webhook-mailer at python.org  Wed Aug  4 15:53:37 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 04 Aug 2021 19:53:37 -0000
Subject: [Python-checkins] Fix typo in 'xml.dom.minidom' documentation
 (GH-27602) (GH-27604)
Message-ID: <mailman.897.1628106818.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/60ec3b818e993eb4c57884a7a96f96a6c1eea92f
commit: 60ec3b818e993eb4c57884a7a96f96a6c1eea92f
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-04T21:53:29+02:00
summary:

Fix typo in 'xml.dom.minidom' documentation (GH-27602) (GH-27604)

(cherry picked from commit cc77193127381be16467ad10f421d3ba147ed972)

Co-authored-by: Cristi?n Maureira-Fredes <cmaureir at users.noreply.github.com>

files:
M Doc/library/xml.dom.minidom.rst

diff --git a/Doc/library/xml.dom.minidom.rst b/Doc/library/xml.dom.minidom.rst
index bf72c46561b7c..d3a5f872204a3 100644
--- a/Doc/library/xml.dom.minidom.rst
+++ b/Doc/library/xml.dom.minidom.rst
@@ -145,7 +145,7 @@ module documentation.  This section lists the differences between the API and
    For the :class:`Document` node, an additional keyword argument *encoding* can
    be used to specify the encoding field of the XML header.
 
-   Silimarly, explicitly stating the *standalone* argument causes the
+   Similarly, explicitly stating the *standalone* argument causes the
    standalone document declarations to be added to the prologue of the XML
    document.
    If the value is set to `True`, `standalone="yes"` is added,


From webhook-mailer at python.org  Wed Aug  4 15:59:12 2021
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 04 Aug 2021 19:59:12 -0000
Subject: [Python-checkins] [doc] bpo-43066: zipfile - add note on leading
 slash in the filename arg (GH-26899)
Message-ID: <mailman.898.1628107153.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/98f6a72ff621c2033e8f2c38df410e9bfa2b772a
commit: 98f6a72ff621c2033e8f2c38df410e9bfa2b772a
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-04T12:59:04-07:00
summary:

[doc] bpo-43066: zipfile - add note on leading slash in the filename arg (GH-26899)


Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 7c5dab4340032eb15d3797d8b601ef11649bbab3)

Co-authored-by: andrei kulakov <andrei.avk at gmail.com>

files:
A Misc/NEWS.d/next/Documentation/2021-06-24-14-37-16.bpo-43066.Ti7ahX.rst
M Doc/library/zipfile.rst

diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst
index 3db55e646c47cc..4888838db2c4b2 100644
--- a/Doc/library/zipfile.rst
+++ b/Doc/library/zipfile.rst
@@ -78,7 +78,6 @@ The module defines the following items:
    of the last modification to the file; the fields are described in section
    :ref:`zipinfo-objects`.
 
-
 .. function:: is_zipfile(filename)
 
    Returns ``True`` if *filename* is a valid ZIP file based on its magic number,
@@ -406,6 +405,11 @@ ZipFile Objects
       If ``arcname`` (or ``filename``, if ``arcname`` is  not given) contains a null
       byte, the name of the file in the archive will be truncated at the null byte.
 
+   .. note::
+
+      A leading slash in the filename may lead to the archive being impossible to
+      open in some zip programs on Windows systems.
+
    .. versionchanged:: 3.6
       Calling :meth:`write` on a ZipFile created with mode ``'r'`` or
       a closed ZipFile will raise a :exc:`ValueError`.  Previously,
diff --git a/Misc/NEWS.d/next/Documentation/2021-06-24-14-37-16.bpo-43066.Ti7ahX.rst b/Misc/NEWS.d/next/Documentation/2021-06-24-14-37-16.bpo-43066.Ti7ahX.rst
new file mode 100644
index 00000000000000..3e38522839e8be
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2021-06-24-14-37-16.bpo-43066.Ti7ahX.rst
@@ -0,0 +1,2 @@
+Added a warning to :mod:`zipfile` docs: filename arg with a leading slash may cause archive to
+be un-openable on Windows systems.


From webhook-mailer at python.org  Wed Aug  4 16:00:58 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 04 Aug 2021 20:00:58 -0000
Subject: [Python-checkins] [doc] bpo-43066: zipfile - add note on leading
 slash in the filename arg (GH-26899) (GH-27606)
Message-ID: <mailman.899.1628107259.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/1a2c0ecfa2ef8542baee951f12b60afd165be9cf
commit: 1a2c0ecfa2ef8542baee951f12b60afd165be9cf
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-04T22:00:52+02:00
summary:

[doc] bpo-43066: zipfile - add note on leading slash in the filename arg (GH-26899) (GH-27606)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 7c5dab4340032eb15d3797d8b601ef11649bbab3)

Co-authored-by: andrei kulakov <andrei.avk at gmail.com>

files:
A Misc/NEWS.d/next/Documentation/2021-06-24-14-37-16.bpo-43066.Ti7ahX.rst
M Doc/library/zipfile.rst

diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst
index 7126d8bd703f6..d55a308be7651 100644
--- a/Doc/library/zipfile.rst
+++ b/Doc/library/zipfile.rst
@@ -78,7 +78,6 @@ The module defines the following items:
    of the last modification to the file; the fields are described in section
    :ref:`zipinfo-objects`.
 
-
 .. function:: is_zipfile(filename)
 
    Returns ``True`` if *filename* is a valid ZIP file based on its magic number,
@@ -406,6 +405,11 @@ ZipFile Objects
       If ``arcname`` (or ``filename``, if ``arcname`` is  not given) contains a null
       byte, the name of the file in the archive will be truncated at the null byte.
 
+   .. note::
+
+      A leading slash in the filename may lead to the archive being impossible to
+      open in some zip programs on Windows systems.
+
    .. versionchanged:: 3.6
       Calling :meth:`write` on a ZipFile created with mode ``'r'`` or
       a closed ZipFile will raise a :exc:`ValueError`.  Previously,
diff --git a/Misc/NEWS.d/next/Documentation/2021-06-24-14-37-16.bpo-43066.Ti7ahX.rst b/Misc/NEWS.d/next/Documentation/2021-06-24-14-37-16.bpo-43066.Ti7ahX.rst
new file mode 100644
index 0000000000000..3e38522839e8b
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2021-06-24-14-37-16.bpo-43066.Ti7ahX.rst
@@ -0,0 +1,2 @@
+Added a warning to :mod:`zipfile` docs: filename arg with a leading slash may cause archive to
+be un-openable on Windows systems.


From webhook-mailer at python.org  Wed Aug  4 16:03:41 2021
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 04 Aug 2021 20:03:41 -0000
Subject: [Python-checkins] bpo-42958: Improve description of shallow= in
 filecmp.cmp docs (GH-27166)
Message-ID: <mailman.900.1628107421.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/c2593b4d06712cefcdeae93b32f88faa4772bc3a
commit: c2593b4d06712cefcdeae93b32f88faa4772bc3a
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-04T13:03:33-07:00
summary:

bpo-42958: Improve description of shallow= in filecmp.cmp docs (GH-27166)


Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
Co-authored-by: Alexander Vandenbulcke <alexander.vandenbulcke95 at gmail.com>
(cherry picked from commit a8dc4893d2b28827e82447326ea47759c161a722)

Co-authored-by: andrei kulakov <andrei.avk at gmail.com>

files:
A Misc/NEWS.d/next/Documentation/2021-07-15-11-19-03.bpo-42958.gC5IHM.rst
M Doc/library/filecmp.rst
M Lib/filecmp.py

diff --git a/Doc/library/filecmp.rst b/Doc/library/filecmp.rst
index c60603b30a6d7..83e9e14ddcacd 100644
--- a/Doc/library/filecmp.rst
+++ b/Doc/library/filecmp.rst
@@ -22,8 +22,11 @@ The :mod:`filecmp` module defines the following functions:
    Compare the files named *f1* and *f2*, returning ``True`` if they seem equal,
    ``False`` otherwise.
 
-   If *shallow* is true, files with identical :func:`os.stat` signatures are
-   taken to be equal.  Otherwise, the contents of the files are compared.
+   If *shallow* is true and the :func:`os.stat` signatures (file type, size, and
+   modification time) of both files are identical, the files are taken to be
+   equal.
+
+   Otherwise, the files are treated as different if their sizes or contents differ.
 
    Note that no external programs are called from this function, giving it
    portability and efficiency.
diff --git a/Lib/filecmp.py b/Lib/filecmp.py
index 7c47eb022cc8c..70a4b23c98220 100644
--- a/Lib/filecmp.py
+++ b/Lib/filecmp.py
@@ -36,8 +36,9 @@ def cmp(f1, f2, shallow=True):
 
     f2 -- Second file name
 
-    shallow -- Just check stat signature (do not read the files).
-               defaults to True.
+    shallow -- treat files as identical if their stat signatures (type, size,
+               mtime) are identical. Otherwise, files are considered different
+               if their sizes or contents differ.  [default: True]
 
     Return value:
 
diff --git a/Misc/NEWS.d/next/Documentation/2021-07-15-11-19-03.bpo-42958.gC5IHM.rst b/Misc/NEWS.d/next/Documentation/2021-07-15-11-19-03.bpo-42958.gC5IHM.rst
new file mode 100644
index 0000000000000..c93b84d095526
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2021-07-15-11-19-03.bpo-42958.gC5IHM.rst
@@ -0,0 +1,2 @@
+Updated the docstring and docs of :func:`filecmp.cmp` to be more accurate
+and less confusing especially in respect to *shallow* arg.


From webhook-mailer at python.org  Wed Aug  4 16:09:59 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 04 Aug 2021 20:09:59 -0000
Subject: [Python-checkins] bpo-42958: Improve description of shallow= in
 filecmp.cmp docs (GH-27166) (GH-27608)
Message-ID: <mailman.901.1628107800.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/7dad0337518a0d599caf8f803a5bf45db67cbe9b
commit: 7dad0337518a0d599caf8f803a5bf45db67cbe9b
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-04T22:09:45+02:00
summary:

bpo-42958: Improve description of shallow= in filecmp.cmp docs (GH-27166) (GH-27608)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
Co-authored-by: Alexander Vandenbulcke <alexander.vandenbulcke95 at gmail.com>
(cherry picked from commit a8dc4893d2b28827e82447326ea47759c161a722)

Co-authored-by: andrei kulakov <andrei.avk at gmail.com>

files:
A Misc/NEWS.d/next/Documentation/2021-07-15-11-19-03.bpo-42958.gC5IHM.rst
M Doc/library/filecmp.rst
M Lib/filecmp.py

diff --git a/Doc/library/filecmp.rst b/Doc/library/filecmp.rst
index 31b9b4afab934..1d04c3ef9fd27 100644
--- a/Doc/library/filecmp.rst
+++ b/Doc/library/filecmp.rst
@@ -22,8 +22,11 @@ The :mod:`filecmp` module defines the following functions:
    Compare the files named *f1* and *f2*, returning ``True`` if they seem equal,
    ``False`` otherwise.
 
-   If *shallow* is true, files with identical :func:`os.stat` signatures are
-   taken to be equal.  Otherwise, the contents of the files are compared.
+   If *shallow* is true and the :func:`os.stat` signatures (file type, size, and
+   modification time) of both files are identical, the files are taken to be
+   equal.
+
+   Otherwise, the files are treated as different if their sizes or contents differ.
 
    Note that no external programs are called from this function, giving it
    portability and efficiency.
diff --git a/Lib/filecmp.py b/Lib/filecmp.py
index 7a4da6beb5050..1893f909de83c 100644
--- a/Lib/filecmp.py
+++ b/Lib/filecmp.py
@@ -36,8 +36,9 @@ def cmp(f1, f2, shallow=True):
 
     f2 -- Second file name
 
-    shallow -- Just check stat signature (do not read the files).
-               defaults to True.
+    shallow -- treat files as identical if their stat signatures (type, size,
+               mtime) are identical. Otherwise, files are considered different
+               if their sizes or contents differ.  [default: True]
 
     Return value:
 
diff --git a/Misc/NEWS.d/next/Documentation/2021-07-15-11-19-03.bpo-42958.gC5IHM.rst b/Misc/NEWS.d/next/Documentation/2021-07-15-11-19-03.bpo-42958.gC5IHM.rst
new file mode 100644
index 0000000000000..c93b84d095526
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2021-07-15-11-19-03.bpo-42958.gC5IHM.rst
@@ -0,0 +1,2 @@
+Updated the docstring and docs of :func:`filecmp.cmp` to be more accurate
+and less confusing especially in respect to *shallow* arg.


From webhook-mailer at python.org  Wed Aug  4 16:36:35 2021
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 04 Aug 2021 20:36:35 -0000
Subject: [Python-checkins] bpo-44801: Check arguments in substitution of
 ParamSpec in Callable (GH-27585)
Message-ID: <mailman.902.1628109396.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/536e35ae6a2555a01f4b51a68ad71dbf7923536d
commit: 536e35ae6a2555a01f4b51a68ad71dbf7923536d
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-04T13:36:01-07:00
summary:

bpo-44801: Check arguments in substitution of ParamSpec in Callable (GH-27585)

(cherry picked from commit 3875a6954741065b136650db67ac533bc70a3eac)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
A Misc/NEWS.d/next/Library/2021-08-03-20-37-45.bpo-44801.i49Aug.rst
M Lib/_collections_abc.py
M Lib/test/test_typing.py
M Lib/typing.py

diff --git a/Lib/_collections_abc.py b/Lib/_collections_abc.py
index 33db9b259817c1..87a9cd2d46de99 100644
--- a/Lib/_collections_abc.py
+++ b/Lib/_collections_abc.py
@@ -426,22 +426,16 @@ class _CallableGenericAlias(GenericAlias):
     __slots__ = ()
 
     def __new__(cls, origin, args):
-        return cls.__create_ga(origin, args)
-
-    @classmethod
-    def __create_ga(cls, origin, args):
-        if not isinstance(args, tuple) or len(args) != 2:
+        if not (isinstance(args, tuple) and len(args) == 2):
             raise TypeError(
                 "Callable must be used as Callable[[arg, ...], result].")
         t_args, t_result = args
-        if isinstance(t_args, (list, tuple)):
-            ga_args = tuple(t_args) + (t_result,)
-        # This relaxes what t_args can be on purpose to allow things like
-        # PEP 612 ParamSpec.  Responsibility for whether a user is using
-        # Callable[...] properly is deferred to static type checkers.
-        else:
-            ga_args = args
-        return super().__new__(cls, origin, ga_args)
+        if isinstance(t_args, list):
+            args = (*t_args, t_result)
+        elif not _is_param_expr(t_args):
+            raise TypeError(f"Expected a list of types, an ellipsis, "
+                            f"ParamSpec, or Concatenate. Got {t_args}")
+        return super().__new__(cls, origin, args)
 
     @property
     def __parameters__(self):
@@ -456,7 +450,7 @@ def __parameters__(self):
         return tuple(dict.fromkeys(params))
 
     def __repr__(self):
-        if _has_special_args(self.__args__):
+        if len(self.__args__) == 2 and _is_param_expr(self.__args__[0]):
             return super().__repr__()
         return (f'collections.abc.Callable'
                 f'[[{", ".join([_type_repr(a) for a in self.__args__[:-1]])}], '
@@ -464,7 +458,7 @@ def __repr__(self):
 
     def __reduce__(self):
         args = self.__args__
-        if not _has_special_args(args):
+        if not (len(args) == 2 and _is_param_expr(args[0])):
             args = list(args[:-1]), args[-1]
         return _CallableGenericAlias, (Callable, args)
 
@@ -479,10 +473,11 @@ def __getitem__(self, item):
         param_len = len(self.__parameters__)
         if param_len == 0:
             raise TypeError(f'{self} is not a generic class')
-        if (param_len == 1
-                and isinstance(item, (tuple, list))
-                and len(item) > 1) or not isinstance(item, tuple):
+        if not isinstance(item, tuple):
             item = (item,)
+        if (param_len == 1 and _is_param_expr(self.__parameters__[0])
+                and item and not _is_param_expr(item[0])):
+            item = (list(item),)
         item_len = len(item)
         if item_len != param_len:
             raise TypeError(f'Too {"many" if item_len > param_len else "few"}'
@@ -492,7 +487,13 @@ def __getitem__(self, item):
         new_args = []
         for arg in self.__args__:
             if _is_typevarlike(arg):
-                arg = subst[arg]
+                if _is_param_expr(arg):
+                    arg = subst[arg]
+                    if not _is_param_expr(arg):
+                        raise TypeError(f"Expected a list of types, an ellipsis, "
+                                        f"ParamSpec, or Concatenate. Got {arg}")
+                else:
+                    arg = subst[arg]
             # Looks like a GenericAlias
             elif hasattr(arg, '__parameters__') and isinstance(arg.__parameters__, tuple):
                 subparams = arg.__parameters__
@@ -502,32 +503,31 @@ def __getitem__(self, item):
             new_args.append(arg)
 
         # args[0] occurs due to things like Z[[int, str, bool]] from PEP 612
-        if not isinstance(new_args[0], (tuple, list)):
+        if not isinstance(new_args[0], list):
             t_result = new_args[-1]
             t_args = new_args[:-1]
             new_args = (t_args, t_result)
         return _CallableGenericAlias(Callable, tuple(new_args))
 
+
 def _is_typevarlike(arg):
     obj = type(arg)
     # looks like a TypeVar/ParamSpec
     return (obj.__module__ == 'typing'
             and obj.__name__ in {'ParamSpec', 'TypeVar'})
 
-def _has_special_args(args):
-    """Checks if args[0] matches either ``...``, ``ParamSpec`` or
+def _is_param_expr(obj):
+    """Checks if obj matches either a list of types, ``...``, ``ParamSpec`` or
     ``_ConcatenateGenericAlias`` from typing.py
     """
-    if len(args) != 2:
-        return False
-    obj = args[0]
     if obj is Ellipsis:
         return True
+    if isinstance(obj, list):
+        return True
     obj = type(obj)
     names = ('ParamSpec', '_ConcatenateGenericAlias')
     return obj.__module__ == 'typing' and any(obj.__name__ == name for name in names)
 
-
 def _type_repr(obj):
     """Return the repr() of an object, special-casing types (internal helper).
 
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index 6e557c47833383..6e5609d723bee3 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -575,17 +575,33 @@ def test_paramspec(self):
         Callable = self.Callable
         fullname = f"{Callable.__module__}.Callable"
         P = ParamSpec('P')
+        P2 = ParamSpec('P2')
         C1 = Callable[P, T]
         # substitution
-        self.assertEqual(C1[int, str], Callable[[int], str])
+        self.assertEqual(C1[[int], str], Callable[[int], str])
         self.assertEqual(C1[[int, str], str], Callable[[int, str], str])
+        self.assertEqual(C1[[], str], Callable[[], str])
+        self.assertEqual(C1[..., str], Callable[..., str])
+        self.assertEqual(C1[P2, str], Callable[P2, str])
+        self.assertEqual(C1[Concatenate[int, P2], str],
+                         Callable[Concatenate[int, P2], str])
         self.assertEqual(repr(C1), f"{fullname}[~P, ~T]")
-        self.assertEqual(repr(C1[int, str]), f"{fullname}[[int], str]")
+        self.assertEqual(repr(C1[[int, str], str]), f"{fullname}[[int, str], str]")
+        with self.assertRaises(TypeError):
+            C1[int, str]
 
         C2 = Callable[P, int]
+        self.assertEqual(C2[[int]], Callable[[int], int])
+        self.assertEqual(C2[[int, str]], Callable[[int, str], int])
+        self.assertEqual(C2[[]], Callable[[], int])
+        self.assertEqual(C2[...], Callable[..., int])
+        self.assertEqual(C2[P2], Callable[P2, int])
+        self.assertEqual(C2[Concatenate[int, P2]],
+                         Callable[Concatenate[int, P2], int])
         # special case in PEP 612 where
         # X[int, str, float] == X[[int, str, float]]
-        self.assertEqual(C2[int, str, float], C2[[int, str, float]])
+        self.assertEqual(C2[int], Callable[[int], int])
+        self.assertEqual(C2[int, str], Callable[[int, str], int])
         self.assertEqual(repr(C2), f"{fullname}[~P, int]")
         self.assertEqual(repr(C2[int, str]), f"{fullname}[[int, str], int]")
 
@@ -4616,6 +4632,29 @@ class Z(Generic[P]):
         self.assertEqual(G5.__parameters__, G6.__parameters__)
         self.assertEqual(G5, G6)
 
+        G7 = Z[int]
+        self.assertEqual(G7.__args__, ((int,),))
+        self.assertEqual(G7.__parameters__, ())
+
+        with self.assertRaisesRegex(TypeError, "many arguments for"):
+            Z[[int, str], bool]
+        with self.assertRaisesRegex(TypeError, "many arguments for"):
+            Z[P_2, bool]
+
+    def test_multiple_paramspecs_in_user_generics(self):
+        P = ParamSpec("P")
+        P2 = ParamSpec("P2")
+
+        class X(Generic[P, P2]):
+            f: Callable[P, int]
+            g: Callable[P2, str]
+
+        G1 = X[[int, str], [bytes]]
+        G2 = X[[int], [str, bytes]]
+        self.assertNotEqual(G1, G2)
+        self.assertEqual(G1.__args__, ((int, str), (bytes,)))
+        self.assertEqual(G2.__args__, ((int,), (str, bytes)))
+
     def test_no_paramspec_in__parameters__(self):
         # ParamSpec should not be found in __parameters__
         # of generics. Usages outside Callable, Concatenate
diff --git a/Lib/typing.py b/Lib/typing.py
index 6f884e1fe98602..3cbc8a42c2010a 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -174,6 +174,11 @@ def _type_check(arg, msg, is_argument=True, module=None):
     return arg
 
 
+def _is_param_expr(arg):
+    return arg is ... or isinstance(arg,
+            (tuple, list, ParamSpec, _ConcatenateGenericAlias))
+
+
 def _type_repr(obj):
     """Return the repr() of an object, special-casing types (internal helper).
 
@@ -228,7 +233,9 @@ def _prepare_paramspec_params(cls, params):
     variables (internal helper).
     """
     # Special case where Z[[int, str, bool]] == Z[int, str, bool] in PEP 612.
-    if len(cls.__parameters__) == 1 and len(params) > 1:
+    if (len(cls.__parameters__) == 1
+            and params and not _is_param_expr(params[0])):
+        assert isinstance(cls.__parameters__[0], ParamSpec)
         return (params,)
     else:
         _check_generic(cls, params, len(cls.__parameters__))
@@ -1031,7 +1038,13 @@ def __getitem__(self, params):
         new_args = []
         for arg in self.__args__:
             if isinstance(arg, self._typevar_types):
-                arg = subst[arg]
+                if isinstance(arg, ParamSpec):
+                    arg = subst[arg]
+                    if not _is_param_expr(arg):
+                        raise TypeError(f"Expected a list of types, an ellipsis, "
+                                        f"ParamSpec, or Concatenate. Got {arg}")
+                else:
+                    arg = subst[arg]
             elif isinstance(arg, (_GenericAlias, GenericAlias, types.UnionType)):
                 subparams = arg.__parameters__
                 if subparams:
@@ -1129,8 +1142,7 @@ class _CallableGenericAlias(_GenericAlias, _root=True):
     def __repr__(self):
         assert self._name == 'Callable'
         args = self.__args__
-        if len(args) == 2 and (args[0] is Ellipsis
-                               or isinstance(args[0], (ParamSpec, _ConcatenateGenericAlias))):
+        if len(args) == 2 and _is_param_expr(args[0]):
             return super().__repr__()
         return (f'typing.Callable'
                 f'[[{", ".join([_type_repr(a) for a in args[:-1]])}], '
@@ -1138,8 +1150,7 @@ def __repr__(self):
 
     def __reduce__(self):
         args = self.__args__
-        if not (len(args) == 2 and (args[0] is Ellipsis
-                                    or isinstance(args[0], (ParamSpec, _ConcatenateGenericAlias)))):
+        if not (len(args) == 2 and _is_param_expr(args[0])):
             args = list(args[:-1]), args[-1]
         return operator.getitem, (Callable, args)
 
@@ -1865,8 +1876,7 @@ def get_args(tp):
     if isinstance(tp, (_GenericAlias, GenericAlias)):
         res = tp.__args__
         if (tp.__origin__ is collections.abc.Callable
-                and not (res[0] is Ellipsis
-                         or isinstance(res[0], (ParamSpec, _ConcatenateGenericAlias)))):
+                and not (len(res) == 2 and _is_param_expr(res[0]))):
             res = (list(res[:-1]), res[-1])
         return res
     if isinstance(tp, types.UnionType):
diff --git a/Misc/NEWS.d/next/Library/2021-08-03-20-37-45.bpo-44801.i49Aug.rst b/Misc/NEWS.d/next/Library/2021-08-03-20-37-45.bpo-44801.i49Aug.rst
new file mode 100644
index 00000000000000..05e372a5fabb03
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-03-20-37-45.bpo-44801.i49Aug.rst
@@ -0,0 +1,3 @@
+Ensure that the :class:`~typing.ParamSpec` variable in Callable
+can only be substituted with a parameters expression (a list of types,
+an ellipsis, ParamSpec or Concatenate).


From webhook-mailer at python.org  Wed Aug  4 16:43:15 2021
From: webhook-mailer at python.org (brettcannon)
Date: Wed, 04 Aug 2021 20:43:15 -0000
Subject: [Python-checkins] bpo-41706: Fix special method invocation docs to
 mention using type() (GH-22084)
Message-ID: <mailman.903.1628109796.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/80f33f266b4ad5925a3e58ea3a54ae139a6b6f0e
commit: 80f33f266b4ad5925a3e58ea3a54ae139a6b6f0e
branch: main
author: William Chargin <wchargin at gmail.com>
committer: brettcannon <brett at python.org>
date: 2021-08-04T13:43:06-07:00
summary:

bpo-41706: Fix special method invocation docs to mention using type() (GH-22084)

files:
A Misc/NEWS.d/next/Documentation/2020-09-03-13-37-19.bpo-41706._zXWOR.rst
M Doc/reference/datamodel.rst

diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index bb0b7e059f132..2c76e5656b0e6 100644
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -2439,7 +2439,7 @@ left undefined.
    (``+``, ``-``, ``*``, ``@``, ``/``, ``//``, ``%``, :func:`divmod`,
    :func:`pow`, ``**``, ``<<``, ``>>``, ``&``, ``^``, ``|``).  For instance, to
    evaluate the expression ``x + y``, where *x* is an instance of a class that
-   has an :meth:`__add__` method, ``x.__add__(y)`` is called.  The
+   has an :meth:`__add__` method, ``type(x).__add__(x, y)`` is called.  The
    :meth:`__divmod__` method should be the equivalent to using
    :meth:`__floordiv__` and :meth:`__mod__`; it should not be related to
    :meth:`__truediv__`.  Note that :meth:`__pow__` should be defined to accept
@@ -2475,8 +2475,9 @@ left undefined.
    (swapped) operands.  These functions are only called if the left operand does
    not support the corresponding operation [#]_ and the operands are of different
    types. [#]_ For instance, to evaluate the expression ``x - y``, where *y* is
-   an instance of a class that has an :meth:`__rsub__` method, ``y.__rsub__(x)``
-   is called if ``x.__sub__(y)`` returns *NotImplemented*.
+   an instance of a class that has an :meth:`__rsub__` method,
+   ``type(y).__rsub__(y, x)`` is called if ``type(x).__sub__(x, y)`` returns
+   *NotImplemented*.
 
    .. index:: builtin: pow
 
diff --git a/Misc/NEWS.d/next/Documentation/2020-09-03-13-37-19.bpo-41706._zXWOR.rst b/Misc/NEWS.d/next/Documentation/2020-09-03-13-37-19.bpo-41706._zXWOR.rst
new file mode 100644
index 0000000000000..6406494ec03c7
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2020-09-03-13-37-19.bpo-41706._zXWOR.rst
@@ -0,0 +1,2 @@
+Fix docs about how methods like ``__add__`` are invoked when evaluating
+operator expressions.


From webhook-mailer at python.org  Thu Aug  5 01:04:11 2021
From: webhook-mailer at python.org (methane)
Date: Thu, 05 Aug 2021 05:04:11 -0000
Subject: [Python-checkins] platform: Import subprocess in function.
 (GH-27610)
Message-ID: <mailman.904.1628139852.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/3e4cb7f40f28f1c49e0e4c3e841549c53065af3c
commit: 3e4cb7f40f28f1c49e0e4c3e841549c53065af3c
branch: main
author: Inada Naoki <songofacandy at gmail.com>
committer: methane <songofacandy at gmail.com>
date: 2021-08-05T14:04:01+09:00
summary:

platform: Import subprocess in function. (GH-27610)

files:
M Lib/platform.py

diff --git a/Lib/platform.py b/Lib/platform.py
index 39c8ad587a8b7..0f17964da4100 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -116,7 +116,6 @@
 import os
 import re
 import sys
-import subprocess
 import functools
 import itertools
 
@@ -748,6 +747,7 @@ def from_subprocess():
         """
         Fall back to `uname -p`
         """
+        import subprocess
         try:
             return subprocess.check_output(
                 ['uname', '-p'],


From webhook-mailer at python.org  Thu Aug  5 03:22:31 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Thu, 05 Aug 2021 07:22:31 -0000
Subject: [Python-checkins] bpo-44822: Don't truncate `str`s with embedded
 NULL chars returned by `sqlite3` UDF callbacks (GH-27588)
Message-ID: <mailman.905.1628148151.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/8f010dc920e1f6dc6a357e7cc1460a7a567c05c6
commit: 8f010dc920e1f6dc6a357e7cc1460a7a567c05c6
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-05T10:22:08+03:00
summary:

bpo-44822: Don't truncate `str`s with embedded NULL chars returned by `sqlite3` UDF callbacks (GH-27588)

files:
A Misc/NEWS.d/next/Library/2021-08-04-12-29-00.bpo-44822.zePNXA.rst
M Lib/sqlite3/test/userfunctions.py
M Modules/_sqlite/connection.c

diff --git a/Lib/sqlite3/test/userfunctions.py b/Lib/sqlite3/test/userfunctions.py
index 1ed090e3d9256..b3da3c425b803 100644
--- a/Lib/sqlite3/test/userfunctions.py
+++ b/Lib/sqlite3/test/userfunctions.py
@@ -53,6 +53,8 @@ def wrapper(self, *args, **kwargs):
 
 def func_returntext():
     return "foo"
+def func_returntextwithnull():
+    return "1\x002"
 def func_returnunicode():
     return "bar"
 def func_returnint():
@@ -163,11 +165,21 @@ def step(self, val):
     def finalize(self):
         return self.val
 
+class AggrText:
+    def __init__(self):
+        self.txt = ""
+    def step(self, txt):
+        self.txt = self.txt + txt
+    def finalize(self):
+        return self.txt
+
+
 class FunctionTests(unittest.TestCase):
     def setUp(self):
         self.con = sqlite.connect(":memory:")
 
         self.con.create_function("returntext", 0, func_returntext)
+        self.con.create_function("returntextwithnull", 0, func_returntextwithnull)
         self.con.create_function("returnunicode", 0, func_returnunicode)
         self.con.create_function("returnint", 0, func_returnint)
         self.con.create_function("returnfloat", 0, func_returnfloat)
@@ -211,6 +223,12 @@ def test_func_return_text(self):
         self.assertEqual(type(val), str)
         self.assertEqual(val, "foo")
 
+    def test_func_return_text_with_null_char(self):
+        cur = self.con.cursor()
+        res = cur.execute("select returntextwithnull()").fetchone()[0]
+        self.assertEqual(type(res), str)
+        self.assertEqual(res, "1\x002")
+
     def test_func_return_unicode(self):
         cur = self.con.cursor()
         cur.execute("select returnunicode()")
@@ -390,6 +408,7 @@ def setUp(self):
         self.con.create_aggregate("checkType", 2, AggrCheckType)
         self.con.create_aggregate("checkTypes", -1, AggrCheckTypes)
         self.con.create_aggregate("mysum", 1, AggrSum)
+        self.con.create_aggregate("aggtxt", 1, AggrText)
 
     def tearDown(self):
         #self.cur.close()
@@ -486,6 +505,15 @@ def test_aggr_no_match(self):
         val = cur.fetchone()[0]
         self.assertIsNone(val)
 
+    def test_aggr_text(self):
+        cur = self.con.cursor()
+        for txt in ["foo", "1\x002"]:
+            with self.subTest(txt=txt):
+                cur.execute("select aggtxt(?) from test", (txt,))
+                val = cur.fetchone()[0]
+                self.assertEqual(val, txt)
+
+
 class AuthorizerTests(unittest.TestCase):
     @staticmethod
     def authorizer_cb(action, arg1, arg2, dbname, source):
diff --git a/Misc/NEWS.d/next/Library/2021-08-04-12-29-00.bpo-44822.zePNXA.rst b/Misc/NEWS.d/next/Library/2021-08-04-12-29-00.bpo-44822.zePNXA.rst
new file mode 100644
index 0000000000000..d078142886d2e
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-04-12-29-00.bpo-44822.zePNXA.rst
@@ -0,0 +1,3 @@
+:mod:`sqlite3` user-defined functions and aggregators returning
+:class:`strings <str>` with embedded NUL characters are no longer
+truncated. Patch by Erlend E. Aasland.
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index f75cf83380711..aae6c66d63fab 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -519,10 +519,17 @@ _pysqlite_set_result(sqlite3_context* context, PyObject* py_val)
     } else if (PyFloat_Check(py_val)) {
         sqlite3_result_double(context, PyFloat_AsDouble(py_val));
     } else if (PyUnicode_Check(py_val)) {
-        const char *str = PyUnicode_AsUTF8(py_val);
-        if (str == NULL)
+        Py_ssize_t sz;
+        const char *str = PyUnicode_AsUTF8AndSize(py_val, &sz);
+        if (str == NULL) {
             return -1;
-        sqlite3_result_text(context, str, -1, SQLITE_TRANSIENT);
+        }
+        if (sz > INT_MAX) {
+            PyErr_SetString(PyExc_OverflowError,
+                            "string is longer than INT_MAX bytes");
+            return -1;
+        }
+        sqlite3_result_text(context, str, (int)sz, SQLITE_TRANSIENT);
     } else if (PyObject_CheckBuffer(py_val)) {
         Py_buffer view;
         if (PyObject_GetBuffer(py_val, &view, PyBUF_SIMPLE) != 0) {


From webhook-mailer at python.org  Thu Aug  5 09:58:26 2021
From: webhook-mailer at python.org (vsajip)
Date: Thu, 05 Aug 2021 13:58:26 -0000
Subject: [Python-checkins] bpo-44291: Fix reconnection in
 logging.handlers.SysLogHandler (GH-26490)
Message-ID: <mailman.906.1628171907.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/3d315c311676888201f4a3576e4ee3698684a3a2
commit: 3d315c311676888201f4a3576e4ee3698684a3a2
branch: main
author: Kirill Pinchuk <192182+cybergrind at users.noreply.github.com>
committer: vsajip <vinay_sajip at yahoo.co.uk>
date: 2021-08-05T14:58:16+01:00
summary:

bpo-44291: Fix reconnection in logging.handlers.SysLogHandler (GH-26490)

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

diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index e2579db58046d..f1a2e3b69986e 100644
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -835,6 +835,36 @@ def __init__(self, address=('localhost', SYSLOG_UDP_PORT),
         self.address = address
         self.facility = facility
         self.socktype = socktype
+        self.socket = None
+        self.createSocket()
+
+    def _connect_unixsocket(self, address):
+        use_socktype = self.socktype
+        if use_socktype is None:
+            use_socktype = socket.SOCK_DGRAM
+        self.socket = socket.socket(socket.AF_UNIX, use_socktype)
+        try:
+            self.socket.connect(address)
+            # it worked, so set self.socktype to the used type
+            self.socktype = use_socktype
+        except OSError:
+            self.socket.close()
+            if self.socktype is not None:
+                # user didn't specify falling back, so fail
+                raise
+            use_socktype = socket.SOCK_STREAM
+            self.socket = socket.socket(socket.AF_UNIX, use_socktype)
+            try:
+                self.socket.connect(address)
+                # it worked, so set self.socktype to the used type
+                self.socktype = use_socktype
+            except OSError:
+                self.socket.close()
+                raise
+
+    def createSocket(self):
+        address = self.address
+        socktype = self.socktype
 
         if isinstance(address, str):
             self.unixsocket = True
@@ -871,30 +901,6 @@ def __init__(self, address=('localhost', SYSLOG_UDP_PORT),
             self.socket = sock
             self.socktype = socktype
 
-    def _connect_unixsocket(self, address):
-        use_socktype = self.socktype
-        if use_socktype is None:
-            use_socktype = socket.SOCK_DGRAM
-        self.socket = socket.socket(socket.AF_UNIX, use_socktype)
-        try:
-            self.socket.connect(address)
-            # it worked, so set self.socktype to the used type
-            self.socktype = use_socktype
-        except OSError:
-            self.socket.close()
-            if self.socktype is not None:
-                # user didn't specify falling back, so fail
-                raise
-            use_socktype = socket.SOCK_STREAM
-            self.socket = socket.socket(socket.AF_UNIX, use_socktype)
-            try:
-                self.socket.connect(address)
-                # it worked, so set self.socktype to the used type
-                self.socktype = use_socktype
-            except OSError:
-                self.socket.close()
-                raise
-
     def encodePriority(self, facility, priority):
         """
         Encode the facility and priority. You can pass in strings or
@@ -914,7 +920,10 @@ def close(self):
         """
         self.acquire()
         try:
-            self.socket.close()
+            sock = self.socket
+            if sock:
+                self.socket = None
+                sock.close()
             logging.Handler.close(self)
         finally:
             self.release()
@@ -954,6 +963,10 @@ def emit(self, record):
             # Message is a string. Convert to bytes as required by RFC 5424
             msg = msg.encode('utf-8')
             msg = prio + msg
+
+            if not self.socket:
+                self.createSocket()
+
             if self.unixsocket:
                 try:
                     self.socket.send(msg)
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index b3393d304b122..9998f1a02e4c9 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -1942,6 +1942,14 @@ def test_output(self):
         self.handled.wait()
         self.assertEqual(self.log_output, b'<11>h\xc3\xa4m-sp\xc3\xa4m')
 
+    def test_udp_reconnection(self):
+        logger = logging.getLogger("slh")
+        self.sl_hdlr.close()
+        self.handled.clear()
+        logger.error("sp\xe4m")
+        self.handled.wait(0.1)
+        self.assertEqual(self.log_output, b'<11>sp\xc3\xa4m\x00')
+
 @unittest.skipUnless(hasattr(socket, "AF_UNIX"), "Unix sockets required")
 class UnixSysLogHandlerTest(SysLogHandlerTest):
 


From webhook-mailer at python.org  Thu Aug  5 13:29:07 2021
From: webhook-mailer at python.org (pablogsal)
Date: Thu, 05 Aug 2021 17:29:07 -0000
Subject: [Python-checkins] bpo-44838: Refine the custom syntax errors for
 invalid 'if' expressions (GH-27615)
Message-ID: <mailman.907.1628184549.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/f5cbea6b1b5fc39cca377c6cc93f222916015fc4
commit: f5cbea6b1b5fc39cca377c6cc93f222916015fc4
branch: main
author: Pablo Galindo Salgado <Pablogsal at gmail.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-08-05T18:28:57+01:00
summary:

bpo-44838: Refine the custom syntax errors for invalid 'if' expressions (GH-27615)

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-05-17-42-03.bpo-44838.r_Lkj_.rst
M Grammar/python.gram
M Lib/test/test_syntax.py
M Parser/parser.c

diff --git a/Grammar/python.gram b/Grammar/python.gram
index 91d8a694d1e8b..b107e474630c6 100644
--- a/Grammar/python.gram
+++ b/Grammar/python.gram
@@ -1083,7 +1083,7 @@ invalid_expression:
     # Soft keywords need to also be ignored because they can be parsed as NAME NAME
    | !(NAME STRING | SOFT_KEYWORD) a=disjunction b=expression_without_invalid {
         RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "invalid syntax. Perhaps you forgot a comma?") }
-   | a=disjunction 'if' b=disjunction !'else' { RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "expected 'else' after 'if' expression") }
+   | a=disjunction 'if' b=disjunction !('else'|':') { RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "expected 'else' after 'if' expression") }
 
 invalid_named_expression:
     | a=expression ':=' expression {
diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
index d5a52ba628a81..c77aafeb36361 100644
--- a/Lib/test/test_syntax.py
+++ b/Lib/test/test_syntax.py
@@ -152,6 +152,14 @@
 Traceback (most recent call last):
 SyntaxError: expected 'else' after 'if' expression
 
+>>> if True:
+...     print("Hello"
+...
+... if 2:
+...    print(123))
+Traceback (most recent call last):
+SyntaxError: invalid syntax
+
 >>> True = True = 3
 Traceback (most recent call last):
 SyntaxError: cannot assign to True
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-05-17-42-03.bpo-44838.r_Lkj_.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-05-17-42-03.bpo-44838.r_Lkj_.rst
new file mode 100644
index 0000000000000..a542a5d70933a
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-05-17-42-03.bpo-44838.r_Lkj_.rst	
@@ -0,0 +1,2 @@
+Fixed a bug that was causing the parser to raise an incorrect custom
+:exc:`SyntaxError` for invalid 'if' expressions. Patch by Pablo Galindo.
diff --git a/Parser/parser.c b/Parser/parser.c
index 5db7c3a4a2f1c..543827a7e0aa5 100644
--- a/Parser/parser.c
+++ b/Parser/parser.c
@@ -438,38 +438,38 @@ static char *soft_keywords[] = {
 #define _tmp_144_type 1364
 #define _tmp_145_type 1365
 #define _tmp_146_type 1366
-#define _loop0_147_type 1367
+#define _tmp_147_type 1367
 #define _loop0_148_type 1368
 #define _loop0_149_type 1369
-#define _tmp_150_type 1370
+#define _loop0_150_type 1370
 #define _tmp_151_type 1371
 #define _tmp_152_type 1372
 #define _tmp_153_type 1373
-#define _loop0_154_type 1374
-#define _loop1_155_type 1375
-#define _loop0_156_type 1376
-#define _loop1_157_type 1377
-#define _tmp_158_type 1378
+#define _tmp_154_type 1374
+#define _loop0_155_type 1375
+#define _loop1_156_type 1376
+#define _loop0_157_type 1377
+#define _loop1_158_type 1378
 #define _tmp_159_type 1379
 #define _tmp_160_type 1380
-#define _loop0_162_type 1381
-#define _gather_161_type 1382
-#define _loop0_164_type 1383
-#define _gather_163_type 1384
-#define _loop0_166_type 1385
-#define _gather_165_type 1386
-#define _loop0_168_type 1387
-#define _gather_167_type 1388
-#define _tmp_169_type 1389
+#define _tmp_161_type 1381
+#define _loop0_163_type 1382
+#define _gather_162_type 1383
+#define _loop0_165_type 1384
+#define _gather_164_type 1385
+#define _loop0_167_type 1386
+#define _gather_166_type 1387
+#define _loop0_169_type 1388
+#define _gather_168_type 1389
 #define _tmp_170_type 1390
 #define _tmp_171_type 1391
 #define _tmp_172_type 1392
 #define _tmp_173_type 1393
 #define _tmp_174_type 1394
 #define _tmp_175_type 1395
-#define _loop0_177_type 1396
-#define _gather_176_type 1397
-#define _tmp_178_type 1398
+#define _tmp_176_type 1396
+#define _loop0_178_type 1397
+#define _gather_177_type 1398
 #define _tmp_179_type 1399
 #define _tmp_180_type 1400
 #define _tmp_181_type 1401
@@ -496,6 +496,7 @@ static char *soft_keywords[] = {
 #define _tmp_202_type 1422
 #define _tmp_203_type 1423
 #define _tmp_204_type 1424
+#define _tmp_205_type 1425
 
 static mod_ty file_rule(Parser *p);
 static mod_ty interactive_rule(Parser *p);
@@ -864,38 +865,38 @@ static void *_tmp_143_rule(Parser *p);
 static void *_tmp_144_rule(Parser *p);
 static void *_tmp_145_rule(Parser *p);
 static void *_tmp_146_rule(Parser *p);
-static asdl_seq *_loop0_147_rule(Parser *p);
+static void *_tmp_147_rule(Parser *p);
 static asdl_seq *_loop0_148_rule(Parser *p);
 static asdl_seq *_loop0_149_rule(Parser *p);
-static void *_tmp_150_rule(Parser *p);
+static asdl_seq *_loop0_150_rule(Parser *p);
 static void *_tmp_151_rule(Parser *p);
 static void *_tmp_152_rule(Parser *p);
 static void *_tmp_153_rule(Parser *p);
-static asdl_seq *_loop0_154_rule(Parser *p);
-static asdl_seq *_loop1_155_rule(Parser *p);
-static asdl_seq *_loop0_156_rule(Parser *p);
-static asdl_seq *_loop1_157_rule(Parser *p);
-static void *_tmp_158_rule(Parser *p);
+static void *_tmp_154_rule(Parser *p);
+static asdl_seq *_loop0_155_rule(Parser *p);
+static asdl_seq *_loop1_156_rule(Parser *p);
+static asdl_seq *_loop0_157_rule(Parser *p);
+static asdl_seq *_loop1_158_rule(Parser *p);
 static void *_tmp_159_rule(Parser *p);
 static void *_tmp_160_rule(Parser *p);
-static asdl_seq *_loop0_162_rule(Parser *p);
-static asdl_seq *_gather_161_rule(Parser *p);
-static asdl_seq *_loop0_164_rule(Parser *p);
-static asdl_seq *_gather_163_rule(Parser *p);
-static asdl_seq *_loop0_166_rule(Parser *p);
-static asdl_seq *_gather_165_rule(Parser *p);
-static asdl_seq *_loop0_168_rule(Parser *p);
-static asdl_seq *_gather_167_rule(Parser *p);
-static void *_tmp_169_rule(Parser *p);
+static void *_tmp_161_rule(Parser *p);
+static asdl_seq *_loop0_163_rule(Parser *p);
+static asdl_seq *_gather_162_rule(Parser *p);
+static asdl_seq *_loop0_165_rule(Parser *p);
+static asdl_seq *_gather_164_rule(Parser *p);
+static asdl_seq *_loop0_167_rule(Parser *p);
+static asdl_seq *_gather_166_rule(Parser *p);
+static asdl_seq *_loop0_169_rule(Parser *p);
+static asdl_seq *_gather_168_rule(Parser *p);
 static void *_tmp_170_rule(Parser *p);
 static void *_tmp_171_rule(Parser *p);
 static void *_tmp_172_rule(Parser *p);
 static void *_tmp_173_rule(Parser *p);
 static void *_tmp_174_rule(Parser *p);
 static void *_tmp_175_rule(Parser *p);
-static asdl_seq *_loop0_177_rule(Parser *p);
-static asdl_seq *_gather_176_rule(Parser *p);
-static void *_tmp_178_rule(Parser *p);
+static void *_tmp_176_rule(Parser *p);
+static asdl_seq *_loop0_178_rule(Parser *p);
+static asdl_seq *_gather_177_rule(Parser *p);
 static void *_tmp_179_rule(Parser *p);
 static void *_tmp_180_rule(Parser *p);
 static void *_tmp_181_rule(Parser *p);
@@ -922,6 +923,7 @@ static void *_tmp_201_rule(Parser *p);
 static void *_tmp_202_rule(Parser *p);
 static void *_tmp_203_rule(Parser *p);
 static void *_tmp_204_rule(Parser *p);
+static void *_tmp_205_rule(Parser *p);
 
 
 // file: statements? $
@@ -18207,7 +18209,7 @@ invalid_legacy_expression_rule(Parser *p)
 // invalid_expression:
 //     | invalid_legacy_expression
 //     | !(NAME STRING | SOFT_KEYWORD) disjunction expression_without_invalid
-//     | disjunction 'if' disjunction !'else'
+//     | disjunction 'if' disjunction !('else' | ':')
 static void *
 invalid_expression_rule(Parser *p)
 {
@@ -18266,12 +18268,12 @@ invalid_expression_rule(Parser *p)
         D(fprintf(stderr, "%*c%s invalid_expression[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "!(NAME STRING | SOFT_KEYWORD) disjunction expression_without_invalid"));
     }
-    { // disjunction 'if' disjunction !'else'
+    { // disjunction 'if' disjunction !('else' | ':')
         if (p->error_indicator) {
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> invalid_expression[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "disjunction 'if' disjunction !'else'"));
+        D(fprintf(stderr, "%*c> invalid_expression[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "disjunction 'if' disjunction !('else' | ':')"));
         Token * _keyword;
         expr_ty a;
         expr_ty b;
@@ -18282,10 +18284,10 @@ invalid_expression_rule(Parser *p)
             &&
             (b = disjunction_rule(p))  // disjunction
             &&
-            _PyPegen_lookahead_with_int(0, _PyPegen_expect_token, p, 518)  // token='else'
+            _PyPegen_lookahead(0, _tmp_144_rule, p)
         )
         {
-            D(fprintf(stderr, "%*c+ invalid_expression[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "disjunction 'if' disjunction !'else'"));
+            D(fprintf(stderr, "%*c+ invalid_expression[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "disjunction 'if' disjunction !('else' | ':')"));
             _res = RAISE_SYNTAX_ERROR_KNOWN_RANGE ( a , b , "expected 'else' after 'if' expression" );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
@@ -18296,7 +18298,7 @@ invalid_expression_rule(Parser *p)
         }
         p->mark = _mark;
         D(fprintf(stderr, "%*c%s invalid_expression[%d-%d]: %s failed!\n", p->level, ' ',
-                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "disjunction 'if' disjunction !'else'"));
+                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "disjunction 'if' disjunction !('else' | ':')"));
     }
     _res = NULL;
   done:
@@ -18364,7 +18366,7 @@ invalid_named_expression_rule(Parser *p)
             &&
             (b = bitwise_or_rule(p))  // bitwise_or
             &&
-            _PyPegen_lookahead(0, _tmp_144_rule, p)
+            _PyPegen_lookahead(0, _tmp_145_rule, p)
         )
         {
             D(fprintf(stderr, "%*c+ invalid_named_expression[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "NAME '=' bitwise_or !('=' | ':=')"));
@@ -18390,7 +18392,7 @@ invalid_named_expression_rule(Parser *p)
         Token * b;
         expr_ty bitwise_or_var;
         if (
-            _PyPegen_lookahead(0, _tmp_145_rule, p)
+            _PyPegen_lookahead(0, _tmp_146_rule, p)
             &&
             (a = bitwise_or_rule(p))  // bitwise_or
             &&
@@ -18398,7 +18400,7 @@ invalid_named_expression_rule(Parser *p)
             &&
             (bitwise_or_var = bitwise_or_rule(p))  // bitwise_or
             &&
-            _PyPegen_lookahead(0, _tmp_146_rule, p)
+            _PyPegen_lookahead(0, _tmp_147_rule, p)
         )
         {
             D(fprintf(stderr, "%*c+ invalid_named_expression[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "!(list | tuple | genexp | 'True' | 'None' | 'False') bitwise_or '=' bitwise_or !('=' | ':=')"));
@@ -18475,7 +18477,7 @@ invalid_assignment_rule(Parser *p)
         D(fprintf(stderr, "%*c> invalid_assignment[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "star_named_expression ',' star_named_expressions* ':' expression"));
         Token * _literal;
         Token * _literal_1;
-        asdl_seq * _loop0_147_var;
+        asdl_seq * _loop0_148_var;
         expr_ty a;
         expr_ty expression_var;
         if (
@@ -18483,7 +18485,7 @@ invalid_assignment_rule(Parser *p)
             &&
             (_literal = _PyPegen_expect_token(p, 12))  // token=','
             &&
-            (_loop0_147_var = _loop0_147_rule(p))  // star_named_expressions*
+            (_loop0_148_var = _loop0_148_rule(p))  // star_named_expressions*
             &&
             (_literal_1 = _PyPegen_expect_token(p, 11))  // token=':'
             &&
@@ -18540,10 +18542,10 @@ invalid_assignment_rule(Parser *p)
         }
         D(fprintf(stderr, "%*c> invalid_assignment[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "((star_targets '='))* star_expressions '='"));
         Token * _literal;
-        asdl_seq * _loop0_148_var;
+        asdl_seq * _loop0_149_var;
         expr_ty a;
         if (
-            (_loop0_148_var = _loop0_148_rule(p))  // ((star_targets '='))*
+            (_loop0_149_var = _loop0_149_rule(p))  // ((star_targets '='))*
             &&
             (a = star_expressions_rule(p))  // star_expressions
             &&
@@ -18570,10 +18572,10 @@ invalid_assignment_rule(Parser *p)
         }
         D(fprintf(stderr, "%*c> invalid_assignment[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "((star_targets '='))* yield_expr '='"));
         Token * _literal;
-        asdl_seq * _loop0_149_var;
+        asdl_seq * _loop0_150_var;
         expr_ty a;
         if (
-            (_loop0_149_var = _loop0_149_rule(p))  // ((star_targets '='))*
+            (_loop0_150_var = _loop0_150_rule(p))  // ((star_targets '='))*
             &&
             (a = yield_expr_rule(p))  // yield_expr
             &&
@@ -18599,7 +18601,7 @@ invalid_assignment_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> invalid_assignment[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "star_expressions augassign (yield_expr | star_expressions)"));
-        void *_tmp_150_var;
+        void *_tmp_151_var;
         expr_ty a;
         AugOperator* augassign_var;
         if (
@@ -18607,7 +18609,7 @@ invalid_assignment_rule(Parser *p)
             &&
             (augassign_var = augassign_rule(p))  // augassign
             &&
-            (_tmp_150_var = _tmp_150_rule(p))  // yield_expr | star_expressions
+            (_tmp_151_var = _tmp_151_rule(p))  // yield_expr | star_expressions
         )
         {
             D(fprintf(stderr, "%*c+ invalid_assignment[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "star_expressions augassign (yield_expr | star_expressions)"));
@@ -18821,11 +18823,11 @@ invalid_comprehension_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> invalid_comprehension[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "('[' | '(' | '{') starred_expression for_if_clauses"));
-        void *_tmp_151_var;
+        void *_tmp_152_var;
         expr_ty a;
         asdl_comprehension_seq* for_if_clauses_var;
         if (
-            (_tmp_151_var = _tmp_151_rule(p))  // '[' | '(' | '{'
+            (_tmp_152_var = _tmp_152_rule(p))  // '[' | '(' | '{'
             &&
             (a = starred_expression_rule(p))  // starred_expression
             &&
@@ -18852,12 +18854,12 @@ invalid_comprehension_rule(Parser *p)
         }
         D(fprintf(stderr, "%*c> invalid_comprehension[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "('[' | '{') star_named_expression ',' star_named_expressions for_if_clauses"));
         Token * _literal;
-        void *_tmp_152_var;
+        void *_tmp_153_var;
         expr_ty a;
         asdl_expr_seq* b;
         asdl_comprehension_seq* for_if_clauses_var;
         if (
-            (_tmp_152_var = _tmp_152_rule(p))  // '[' | '{'
+            (_tmp_153_var = _tmp_153_rule(p))  // '[' | '{'
             &&
             (a = star_named_expression_rule(p))  // star_named_expression
             &&
@@ -18887,12 +18889,12 @@ invalid_comprehension_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> invalid_comprehension[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "('[' | '{') star_named_expression ',' for_if_clauses"));
-        void *_tmp_153_var;
+        void *_tmp_154_var;
         expr_ty a;
         Token * b;
         asdl_comprehension_seq* for_if_clauses_var;
         if (
-            (_tmp_153_var = _tmp_153_rule(p))  // '[' | '{'
+            (_tmp_154_var = _tmp_154_rule(p))  // '[' | '{'
             &&
             (a = star_named_expression_rule(p))  // star_named_expression
             &&
@@ -18990,11 +18992,11 @@ invalid_parameters_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> invalid_parameters[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "param_no_default* invalid_parameters_helper param_no_default"));
-        asdl_seq * _loop0_154_var;
+        asdl_seq * _loop0_155_var;
         arg_ty a;
         void *invalid_parameters_helper_var;
         if (
-            (_loop0_154_var = _loop0_154_rule(p))  // param_no_default*
+            (_loop0_155_var = _loop0_155_rule(p))  // param_no_default*
             &&
             (invalid_parameters_helper_var = invalid_parameters_helper_rule(p))  // invalid_parameters_helper
             &&
@@ -19061,13 +19063,13 @@ invalid_parameters_helper_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> invalid_parameters_helper[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "param_with_default+"));
-        asdl_seq * _loop1_155_var;
+        asdl_seq * _loop1_156_var;
         if (
-            (_loop1_155_var = _loop1_155_rule(p))  // param_with_default+
+            (_loop1_156_var = _loop1_156_rule(p))  // param_with_default+
         )
         {
             D(fprintf(stderr, "%*c+ invalid_parameters_helper[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "param_with_default+"));
-            _res = _loop1_155_var;
+            _res = _loop1_156_var;
             goto done;
         }
         p->mark = _mark;
@@ -19098,11 +19100,11 @@ invalid_lambda_parameters_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> invalid_lambda_parameters[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "lambda_param_no_default* invalid_lambda_parameters_helper lambda_param_no_default"));
-        asdl_seq * _loop0_156_var;
+        asdl_seq * _loop0_157_var;
         arg_ty a;
         void *invalid_lambda_parameters_helper_var;
         if (
-            (_loop0_156_var = _loop0_156_rule(p))  // lambda_param_no_default*
+            (_loop0_157_var = _loop0_157_rule(p))  // lambda_param_no_default*
             &&
             (invalid_lambda_parameters_helper_var = invalid_lambda_parameters_helper_rule(p))  // invalid_lambda_parameters_helper
             &&
@@ -19171,13 +19173,13 @@ invalid_lambda_parameters_helper_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> invalid_lambda_parameters_helper[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "lambda_param_with_default+"));
-        asdl_seq * _loop1_157_var;
+        asdl_seq * _loop1_158_var;
         if (
-            (_loop1_157_var = _loop1_157_rule(p))  // lambda_param_with_default+
+            (_loop1_158_var = _loop1_158_rule(p))  // lambda_param_with_default+
         )
         {
             D(fprintf(stderr, "%*c+ invalid_lambda_parameters_helper[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "lambda_param_with_default+"));
-            _res = _loop1_157_var;
+            _res = _loop1_158_var;
             goto done;
         }
         p->mark = _mark;
@@ -19207,12 +19209,12 @@ invalid_star_etc_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> invalid_star_etc[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'*' (')' | ',' (')' | '**'))"));
-        void *_tmp_158_var;
+        void *_tmp_159_var;
         Token * a;
         if (
             (a = _PyPegen_expect_token(p, 16))  // token='*'
             &&
-            (_tmp_158_var = _tmp_158_rule(p))  // ')' | ',' (')' | '**')
+            (_tmp_159_var = _tmp_159_rule(p))  // ')' | ',' (')' | '**')
         )
         {
             D(fprintf(stderr, "%*c+ invalid_star_etc[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'*' (')' | ',' (')' | '**'))"));
@@ -19282,11 +19284,11 @@ invalid_lambda_star_etc_rule(Parser *p)
         }
         D(fprintf(stderr, "%*c> invalid_lambda_star_etc[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'*' (':' | ',' (':' | '**'))"));
         Token * _literal;
-        void *_tmp_159_var;
+        void *_tmp_160_var;
         if (
             (_literal = _PyPegen_expect_token(p, 16))  // token='*'
             &&
-            (_tmp_159_var = _tmp_159_rule(p))  // ':' | ',' (':' | '**')
+            (_tmp_160_var = _tmp_160_rule(p))  // ':' | ',' (':' | '**')
         )
         {
             D(fprintf(stderr, "%*c+ invalid_lambda_star_etc[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'*' (':' | ',' (':' | '**'))"));
@@ -19388,7 +19390,7 @@ invalid_with_item_rule(Parser *p)
             &&
             (a = expression_rule(p))  // expression
             &&
-            _PyPegen_lookahead(1, _tmp_160_rule, p)
+            _PyPegen_lookahead(1, _tmp_161_rule, p)
         )
         {
             D(fprintf(stderr, "%*c+ invalid_with_item[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "expression 'as' expression &(',' | ')' | ':')"));
@@ -19601,7 +19603,7 @@ invalid_with_stmt_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> invalid_with_stmt[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "ASYNC? 'with' ','.(expression ['as' star_target])+ &&':'"));
-        asdl_seq * _gather_161_var;
+        asdl_seq * _gather_162_var;
         Token * _keyword;
         Token * _literal;
         void *_opt_var;
@@ -19611,13 +19613,13 @@ invalid_with_stmt_rule(Parser *p)
             &&
             (_keyword = _PyPegen_expect_token(p, 521))  // token='with'
             &&
-            (_gather_161_var = _gather_161_rule(p))  // ','.(expression ['as' star_target])+
+            (_gather_162_var = _gather_162_rule(p))  // ','.(expression ['as' star_target])+
             &&
             (_literal = _PyPegen_expect_forced_token(p, 11, ":"))  // forced_token=':'
         )
         {
             D(fprintf(stderr, "%*c+ invalid_with_stmt[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "ASYNC? 'with' ','.(expression ['as' star_target])+ &&':'"));
-            _res = _PyPegen_dummy_name(p, _opt_var, _keyword, _gather_161_var, _literal);
+            _res = _PyPegen_dummy_name(p, _opt_var, _keyword, _gather_162_var, _literal);
             goto done;
         }
         p->mark = _mark;
@@ -19630,7 +19632,7 @@ invalid_with_stmt_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> invalid_with_stmt[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "ASYNC? 'with' '(' ','.(expressions ['as' star_target])+ ','? ')' &&':'"));
-        asdl_seq * _gather_163_var;
+        asdl_seq * _gather_164_var;
         Token * _keyword;
         Token * _literal;
         Token * _literal_1;
@@ -19646,7 +19648,7 @@ invalid_with_stmt_rule(Parser *p)
             &&
             (_literal = _PyPegen_expect_token(p, 7))  // token='('
             &&
-            (_gather_163_var = _gather_163_rule(p))  // ','.(expressions ['as' star_target])+
+            (_gather_164_var = _gather_164_rule(p))  // ','.(expressions ['as' star_target])+
             &&
             (_opt_var_1 = _PyPegen_expect_token(p, 12), 1)  // ','?
             &&
@@ -19656,7 +19658,7 @@ invalid_with_stmt_rule(Parser *p)
         )
         {
             D(fprintf(stderr, "%*c+ invalid_with_stmt[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "ASYNC? 'with' '(' ','.(expressions ['as' star_target])+ ','? ')' &&':'"));
-            _res = _PyPegen_dummy_name(p, _opt_var, _keyword, _literal, _gather_163_var, _opt_var_1, _literal_1, _literal_2);
+            _res = _PyPegen_dummy_name(p, _opt_var, _keyword, _literal, _gather_164_var, _opt_var_1, _literal_1, _literal_2);
             goto done;
         }
         p->mark = _mark;
@@ -19688,7 +19690,7 @@ invalid_with_stmt_indent_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> invalid_with_stmt_indent[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "ASYNC? 'with' ','.(expression ['as' star_target])+ ':' NEWLINE !INDENT"));
-        asdl_seq * _gather_165_var;
+        asdl_seq * _gather_166_var;
         Token * _literal;
         void *_opt_var;
         UNUSED(_opt_var); // Silence compiler warnings
@@ -19699,7 +19701,7 @@ invalid_with_stmt_indent_rule(Parser *p)
             &&
             (a = _PyPegen_expect_token(p, 521))  // token='with'
             &&
-            (_gather_165_var = _gather_165_rule(p))  // ','.(expression ['as' star_target])+
+            (_gather_166_var = _gather_166_rule(p))  // ','.(expression ['as' star_target])+
             &&
             (_literal = _PyPegen_expect_token(p, 11))  // token=':'
             &&
@@ -19727,7 +19729,7 @@ invalid_with_stmt_indent_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> invalid_with_stmt_indent[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "ASYNC? 'with' '(' ','.(expressions ['as' star_target])+ ','? ')' ':' NEWLINE !INDENT"));
-        asdl_seq * _gather_167_var;
+        asdl_seq * _gather_168_var;
         Token * _literal;
         Token * _literal_1;
         Token * _literal_2;
@@ -19744,7 +19746,7 @@ invalid_with_stmt_indent_rule(Parser *p)
             &&
             (_literal = _PyPegen_expect_token(p, 7))  // token='('
             &&
-            (_gather_167_var = _gather_167_rule(p))  // ','.(expressions ['as' star_target])+
+            (_gather_168_var = _gather_168_rule(p))  // ','.(expressions ['as' star_target])+
             &&
             (_opt_var_1 = _PyPegen_expect_token(p, 12), 1)  // ','?
             &&
@@ -19835,7 +19837,7 @@ invalid_try_stmt_rule(Parser *p)
             &&
             (block_var = block_rule(p))  // block
             &&
-            _PyPegen_lookahead(0, _tmp_169_rule, p)
+            _PyPegen_lookahead(0, _tmp_170_rule, p)
         )
         {
             D(fprintf(stderr, "%*c+ invalid_try_stmt[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'try' ':' block !('except' | 'finally')"));
@@ -19893,7 +19895,7 @@ invalid_except_stmt_rule(Parser *p)
             &&
             (expressions_var = expressions_rule(p))  // expressions
             &&
-            (_opt_var = _tmp_170_rule(p), 1)  // ['as' NAME]
+            (_opt_var = _tmp_171_rule(p), 1)  // ['as' NAME]
             &&
             (_literal_1 = _PyPegen_expect_token(p, 11))  // token=':'
         )
@@ -19927,7 +19929,7 @@ invalid_except_stmt_rule(Parser *p)
             &&
             (expression_var = expression_rule(p))  // expression
             &&
-            (_opt_var = _tmp_171_rule(p), 1)  // ['as' NAME]
+            (_opt_var = _tmp_172_rule(p), 1)  // ['as' NAME]
             &&
             (newline_var = _PyPegen_expect_token(p, NEWLINE))  // token='NEWLINE'
         )
@@ -20057,7 +20059,7 @@ invalid_except_stmt_indent_rule(Parser *p)
             &&
             (expression_var = expression_rule(p))  // expression
             &&
-            (_opt_var = _tmp_172_rule(p), 1)  // ['as' NAME]
+            (_opt_var = _tmp_173_rule(p), 1)  // ['as' NAME]
             &&
             (_literal = _PyPegen_expect_token(p, 11))  // token=':'
             &&
@@ -20441,7 +20443,7 @@ invalid_class_argument_pattern_rule(Parser *p)
         asdl_pattern_seq* a;
         asdl_seq* keyword_patterns_var;
         if (
-            (_opt_var = _tmp_173_rule(p), 1)  // [positional_patterns ',']
+            (_opt_var = _tmp_174_rule(p), 1)  // [positional_patterns ',']
             &&
             (keyword_patterns_var = keyword_patterns_rule(p))  // keyword_patterns
             &&
@@ -20875,7 +20877,7 @@ invalid_def_raw_rule(Parser *p)
             &&
             (_literal_1 = _PyPegen_expect_token(p, 8))  // token=')'
             &&
-            (_opt_var_2 = _tmp_174_rule(p), 1)  // ['->' expression]
+            (_opt_var_2 = _tmp_175_rule(p), 1)  // ['->' expression]
             &&
             (_literal_2 = _PyPegen_expect_token(p, 11))  // token=':'
             &&
@@ -20931,7 +20933,7 @@ invalid_class_def_raw_rule(Parser *p)
             &&
             (name_var = _PyPegen_name_token(p))  // NAME
             &&
-            (_opt_var = _tmp_175_rule(p), 1)  // ['(' arguments? ')']
+            (_opt_var = _tmp_176_rule(p), 1)  // ['(' arguments? ')']
             &&
             (_literal = _PyPegen_expect_token(p, 11))  // token=':'
             &&
@@ -20979,11 +20981,11 @@ invalid_double_starred_kvpairs_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> invalid_double_starred_kvpairs[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "','.double_starred_kvpair+ ',' invalid_kvpair"));
-        asdl_seq * _gather_176_var;
+        asdl_seq * _gather_177_var;
         Token * _literal;
         void *invalid_kvpair_var;
         if (
-            (_gather_176_var = _gather_176_rule(p))  // ','.double_starred_kvpair+
+            (_gather_177_var = _gather_177_rule(p))  // ','.double_starred_kvpair+
             &&
             (_literal = _PyPegen_expect_token(p, 12))  // token=','
             &&
@@ -20991,7 +20993,7 @@ invalid_double_starred_kvpairs_rule(Parser *p)
         )
         {
             D(fprintf(stderr, "%*c+ invalid_double_starred_kvpairs[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "','.double_starred_kvpair+ ',' invalid_kvpair"));
-            _res = _PyPegen_dummy_name(p, _gather_176_var, _literal, invalid_kvpair_var);
+            _res = _PyPegen_dummy_name(p, _gather_177_var, _literal, invalid_kvpair_var);
             goto done;
         }
         p->mark = _mark;
@@ -21044,7 +21046,7 @@ invalid_double_starred_kvpairs_rule(Parser *p)
             &&
             (a = _PyPegen_expect_token(p, 11))  // token=':'
             &&
-            _PyPegen_lookahead(1, _tmp_178_rule, p)
+            _PyPegen_lookahead(1, _tmp_179_rule, p)
         )
         {
             D(fprintf(stderr, "%*c+ invalid_double_starred_kvpairs[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "expression ':' &('}' | ',')"));
@@ -21961,12 +21963,12 @@ _loop1_14_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> _loop1_14[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(star_targets '=')"));
-        void *_tmp_179_var;
+        void *_tmp_180_var;
         while (
-            (_tmp_179_var = _tmp_179_rule(p))  // star_targets '='
+            (_tmp_180_var = _tmp_180_rule(p))  // star_targets '='
         )
         {
-            _res = _tmp_179_var;
+            _res = _tmp_180_var;
             if (_n == _children_capacity) {
                 _children_capacity *= 2;
                 void **_new_children = PyMem_Realloc(_children, _children_capacity*sizeof(void *));
@@ -22513,12 +22515,12 @@ _loop0_24_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> _loop0_24[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "('.' | '...')"));
-        void *_tmp_180_var;
+        void *_tmp_181_var;
         while (
-            (_tmp_180_var = _tmp_180_rule(p))  // '.' | '...'
+            (_tmp_181_var = _tmp_181_rule(p))  // '.' | '...'
         )
         {
-            _res = _tmp_180_var;
+            _res = _tmp_181_var;
             if (_n == _children_capacity) {
                 _children_capacity *= 2;
                 void **_new_children = PyMem_Realloc(_children, _children_capacity*sizeof(void *));
@@ -22579,12 +22581,12 @@ _loop1_25_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> _loop1_25[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "('.' | '...')"));
-        void *_tmp_181_var;
+        void *_tmp_182_var;
         while (
-            (_tmp_181_var = _tmp_181_rule(p))  // '.' | '...'
+            (_tmp_182_var = _tmp_182_rule(p))  // '.' | '...'
         )
         {
-            _res = _tmp_181_var;
+            _res = _tmp_182_var;
             if (_n == _children_capacity) {
                 _children_capacity *= 2;
                 void **_new_children = PyMem_Realloc(_children, _children_capacity*sizeof(void *));
@@ -22966,12 +22968,12 @@ _loop1_32_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> _loop1_32[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "('@' named_expression NEWLINE)"));
-        void *_tmp_182_var;
+        void *_tmp_183_var;
         while (
-            (_tmp_182_var = _tmp_182_rule(p))  // '@' named_expression NEWLINE
+            (_tmp_183_var = _tmp_183_rule(p))  // '@' named_expression NEWLINE
         )
         {
-            _res = _tmp_182_var;
+            _res = _tmp_183_var;
             if (_n == _children_capacity) {
                 _children_capacity *= 2;
                 void **_new_children = PyMem_Realloc(_children, _children_capacity*sizeof(void *));
@@ -25730,12 +25732,12 @@ _loop1_77_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> _loop1_77[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(',' expression)"));
-        void *_tmp_183_var;
+        void *_tmp_184_var;
         while (
-            (_tmp_183_var = _tmp_183_rule(p))  // ',' expression
+            (_tmp_184_var = _tmp_184_rule(p))  // ',' expression
         )
         {
-            _res = _tmp_183_var;
+            _res = _tmp_184_var;
             if (_n == _children_capacity) {
                 _children_capacity *= 2;
                 void **_new_children = PyMem_Realloc(_children, _children_capacity*sizeof(void *));
@@ -25801,12 +25803,12 @@ _loop1_78_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> _loop1_78[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(',' star_expression)"));
-        void *_tmp_184_var;
+        void *_tmp_185_var;
         while (
-            (_tmp_184_var = _tmp_184_rule(p))  // ',' star_expression
+            (_tmp_185_var = _tmp_185_rule(p))  // ',' star_expression
         )
         {
-            _res = _tmp_184_var;
+            _res = _tmp_185_var;
             if (_n == _children_capacity) {
                 _children_capacity *= 2;
                 void **_new_children = PyMem_Realloc(_children, _children_capacity*sizeof(void *));
@@ -25986,12 +25988,12 @@ _loop1_81_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> _loop1_81[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "('or' conjunction)"));
-        void *_tmp_185_var;
+        void *_tmp_186_var;
         while (
-            (_tmp_185_var = _tmp_185_rule(p))  // 'or' conjunction
+            (_tmp_186_var = _tmp_186_rule(p))  // 'or' conjunction
         )
         {
-            _res = _tmp_185_var;
+            _res = _tmp_186_var;
             if (_n == _children_capacity) {
                 _children_capacity *= 2;
                 void **_new_children = PyMem_Realloc(_children, _children_capacity*sizeof(void *));
@@ -26057,12 +26059,12 @@ _loop1_82_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> _loop1_82[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "('and' inversion)"));
-        void *_tmp_186_var;
+        void *_tmp_187_var;
         while (
-            (_tmp_186_var = _tmp_186_rule(p))  // 'and' inversion
+            (_tmp_187_var = _tmp_187_rule(p))  // 'and' inversion
         )
         {
-            _res = _tmp_186_var;
+            _res = _tmp_187_var;
             if (_n == _children_capacity) {
                 _children_capacity *= 2;
                 void **_new_children = PyMem_Realloc(_children, _children_capacity*sizeof(void *));
@@ -27937,12 +27939,12 @@ _loop0_111_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> _loop0_111[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "('if' disjunction)"));
-        void *_tmp_187_var;
+        void *_tmp_188_var;
         while (
-            (_tmp_187_var = _tmp_187_rule(p))  // 'if' disjunction
+            (_tmp_188_var = _tmp_188_rule(p))  // 'if' disjunction
         )
         {
-            _res = _tmp_187_var;
+            _res = _tmp_188_var;
             if (_n == _children_capacity) {
                 _children_capacity *= 2;
                 void **_new_children = PyMem_Realloc(_children, _children_capacity*sizeof(void *));
@@ -28003,12 +28005,12 @@ _loop0_112_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> _loop0_112[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "('if' disjunction)"));
-        void *_tmp_188_var;
+        void *_tmp_189_var;
         while (
-            (_tmp_188_var = _tmp_188_rule(p))  // 'if' disjunction
+            (_tmp_189_var = _tmp_189_rule(p))  // 'if' disjunction
         )
         {
-            _res = _tmp_188_var;
+            _res = _tmp_189_var;
             if (_n == _children_capacity) {
                 _children_capacity *= 2;
                 void **_new_children = PyMem_Realloc(_children, _children_capacity*sizeof(void *));
@@ -28131,7 +28133,7 @@ _loop0_115_rule(Parser *p)
         while (
             (_literal = _PyPegen_expect_token(p, 12))  // token=','
             &&
-            (elem = _tmp_189_rule(p))  // starred_expression | (assigment_expression | expression !':=') !'='
+            (elem = _tmp_190_rule(p))  // starred_expression | (assigment_expression | expression !':=') !'='
         )
         {
             _res = elem;
@@ -28195,7 +28197,7 @@ _gather_114_rule(Parser *p)
         void *elem;
         asdl_seq * seq;
         if (
-            (elem = _tmp_189_rule(p))  // starred_expression | (assigment_expression | expression !':=') !'='
+            (elem = _tmp_190_rule(p))  // starred_expression | (assigment_expression | expression !':=') !'='
             &&
             (seq = _loop0_115_rule(p))  // _loop0_115
         )
@@ -28741,12 +28743,12 @@ _loop0_125_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> _loop0_125[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(',' star_target)"));
-        void *_tmp_190_var;
+        void *_tmp_191_var;
         while (
-            (_tmp_190_var = _tmp_190_rule(p))  // ',' star_target
+            (_tmp_191_var = _tmp_191_rule(p))  // ',' star_target
         )
         {
-            _res = _tmp_190_var;
+            _res = _tmp_191_var;
             if (_n == _children_capacity) {
                 _children_capacity *= 2;
                 void **_new_children = PyMem_Realloc(_children, _children_capacity*sizeof(void *));
@@ -28921,12 +28923,12 @@ _loop1_128_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> _loop1_128[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(',' star_target)"));
-        void *_tmp_191_var;
+        void *_tmp_192_var;
         while (
-            (_tmp_191_var = _tmp_191_rule(p))  // ',' star_target
+            (_tmp_192_var = _tmp_192_rule(p))  // ',' star_target
         )
         {
-            _res = _tmp_191_var;
+            _res = _tmp_192_var;
             if (_n == _children_capacity) {
                 _children_capacity *= 2;
                 void **_new_children = PyMem_Realloc(_children, _children_capacity*sizeof(void *));
@@ -29767,9 +29769,64 @@ _tmp_143_rule(Parser *p)
     return _res;
 }
 
-// _tmp_144: '=' | ':='
+// _tmp_144: 'else' | ':'
 static void *
 _tmp_144_rule(Parser *p)
+{
+    D(p->level++);
+    if (p->error_indicator) {
+        D(p->level--);
+        return NULL;
+    }
+    void * _res = NULL;
+    int _mark = p->mark;
+    { // 'else'
+        if (p->error_indicator) {
+            D(p->level--);
+            return NULL;
+        }
+        D(fprintf(stderr, "%*c> _tmp_144[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'else'"));
+        Token * _keyword;
+        if (
+            (_keyword = _PyPegen_expect_token(p, 518))  // token='else'
+        )
+        {
+            D(fprintf(stderr, "%*c+ _tmp_144[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'else'"));
+            _res = _keyword;
+            goto done;
+        }
+        p->mark = _mark;
+        D(fprintf(stderr, "%*c%s _tmp_144[%d-%d]: %s failed!\n", p->level, ' ',
+                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'else'"));
+    }
+    { // ':'
+        if (p->error_indicator) {
+            D(p->level--);
+            return NULL;
+        }
+        D(fprintf(stderr, "%*c> _tmp_144[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "':'"));
+        Token * _literal;
+        if (
+            (_literal = _PyPegen_expect_token(p, 11))  // token=':'
+        )
+        {
+            D(fprintf(stderr, "%*c+ _tmp_144[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "':'"));
+            _res = _literal;
+            goto done;
+        }
+        p->mark = _mark;
+        D(fprintf(stderr, "%*c%s _tmp_144[%d-%d]: %s failed!\n", p->level, ' ',
+                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "':'"));
+    }
+    _res = NULL;
+  done:
+    D(p->level--);
+    return _res;
+}
+
+// _tmp_145: '=' | ':='
+static void *
+_tmp_145_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -29783,18 +29840,18 @@ _tmp_144_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_144[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'='"));
+        D(fprintf(stderr, "%*c> _tmp_145[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'='"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 22))  // token='='
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_144[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'='"));
+            D(fprintf(stderr, "%*c+ _tmp_145[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'='"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_144[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_145[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'='"));
     }
     { // ':='
@@ -29802,18 +29859,18 @@ _tmp_144_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_144[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "':='"));
+        D(fprintf(stderr, "%*c> _tmp_145[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "':='"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 53))  // token=':='
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_144[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "':='"));
+            D(fprintf(stderr, "%*c+ _tmp_145[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "':='"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_144[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_145[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "':='"));
     }
     _res = NULL;
@@ -29822,9 +29879,9 @@ _tmp_144_rule(Parser *p)
     return _res;
 }
 
-// _tmp_145: list | tuple | genexp | 'True' | 'None' | 'False'
+// _tmp_146: list | tuple | genexp | 'True' | 'None' | 'False'
 static void *
-_tmp_145_rule(Parser *p)
+_tmp_146_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -29838,18 +29895,18 @@ _tmp_145_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_145[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "list"));
+        D(fprintf(stderr, "%*c> _tmp_146[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "list"));
         expr_ty list_var;
         if (
             (list_var = list_rule(p))  // list
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_145[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "list"));
+            D(fprintf(stderr, "%*c+ _tmp_146[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "list"));
             _res = list_var;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_145[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_146[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "list"));
     }
     { // tuple
@@ -29857,18 +29914,18 @@ _tmp_145_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_145[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "tuple"));
+        D(fprintf(stderr, "%*c> _tmp_146[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "tuple"));
         expr_ty tuple_var;
         if (
             (tuple_var = tuple_rule(p))  // tuple
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_145[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "tuple"));
+            D(fprintf(stderr, "%*c+ _tmp_146[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "tuple"));
             _res = tuple_var;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_145[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_146[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "tuple"));
     }
     { // genexp
@@ -29876,18 +29933,18 @@ _tmp_145_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_145[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "genexp"));
+        D(fprintf(stderr, "%*c> _tmp_146[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "genexp"));
         expr_ty genexp_var;
         if (
             (genexp_var = genexp_rule(p))  // genexp
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_145[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "genexp"));
+            D(fprintf(stderr, "%*c+ _tmp_146[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "genexp"));
             _res = genexp_var;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_145[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_146[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "genexp"));
     }
     { // 'True'
@@ -29895,18 +29952,18 @@ _tmp_145_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_145[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'True'"));
+        D(fprintf(stderr, "%*c> _tmp_146[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'True'"));
         Token * _keyword;
         if (
             (_keyword = _PyPegen_expect_token(p, 526))  // token='True'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_145[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'True'"));
+            D(fprintf(stderr, "%*c+ _tmp_146[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'True'"));
             _res = _keyword;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_145[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_146[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'True'"));
     }
     { // 'None'
@@ -29914,18 +29971,18 @@ _tmp_145_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_145[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'None'"));
+        D(fprintf(stderr, "%*c> _tmp_146[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'None'"));
         Token * _keyword;
         if (
             (_keyword = _PyPegen_expect_token(p, 525))  // token='None'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_145[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'None'"));
+            D(fprintf(stderr, "%*c+ _tmp_146[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'None'"));
             _res = _keyword;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_145[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_146[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'None'"));
     }
     { // 'False'
@@ -29933,18 +29990,18 @@ _tmp_145_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_145[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'False'"));
+        D(fprintf(stderr, "%*c> _tmp_146[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'False'"));
         Token * _keyword;
         if (
             (_keyword = _PyPegen_expect_token(p, 527))  // token='False'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_145[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'False'"));
+            D(fprintf(stderr, "%*c+ _tmp_146[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'False'"));
             _res = _keyword;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_145[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_146[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'False'"));
     }
     _res = NULL;
@@ -29953,9 +30010,9 @@ _tmp_145_rule(Parser *p)
     return _res;
 }
 
-// _tmp_146: '=' | ':='
+// _tmp_147: '=' | ':='
 static void *
-_tmp_146_rule(Parser *p)
+_tmp_147_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -29969,18 +30026,18 @@ _tmp_146_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_146[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'='"));
+        D(fprintf(stderr, "%*c> _tmp_147[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'='"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 22))  // token='='
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_146[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'='"));
+            D(fprintf(stderr, "%*c+ _tmp_147[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'='"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_146[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_147[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'='"));
     }
     { // ':='
@@ -29988,18 +30045,18 @@ _tmp_146_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_146[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "':='"));
+        D(fprintf(stderr, "%*c> _tmp_147[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "':='"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 53))  // token=':='
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_146[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "':='"));
+            D(fprintf(stderr, "%*c+ _tmp_147[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "':='"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_146[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_147[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "':='"));
     }
     _res = NULL;
@@ -30008,9 +30065,9 @@ _tmp_146_rule(Parser *p)
     return _res;
 }
 
-// _loop0_147: star_named_expressions
+// _loop0_148: star_named_expressions
 static asdl_seq *
-_loop0_147_rule(Parser *p)
+_loop0_148_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30034,7 +30091,7 @@ _loop0_147_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _loop0_147[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "star_named_expressions"));
+        D(fprintf(stderr, "%*c> _loop0_148[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "star_named_expressions"));
         asdl_expr_seq* star_named_expressions_var;
         while (
             (star_named_expressions_var = star_named_expressions_rule(p))  // star_named_expressions
@@ -30056,7 +30113,7 @@ _loop0_147_rule(Parser *p)
             _mark = p->mark;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _loop0_147[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _loop0_148[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "star_named_expressions"));
     }
     asdl_seq *_seq = (asdl_seq*)_Py_asdl_generic_seq_new(_n, p->arena);
@@ -30069,14 +30126,14 @@ _loop0_147_rule(Parser *p)
     }
     for (int i = 0; i < _n; i++) asdl_seq_SET_UNTYPED(_seq, i, _children[i]);
     PyMem_Free(_children);
-    _PyPegen_insert_memo(p, _start_mark, _loop0_147_type, _seq);
+    _PyPegen_insert_memo(p, _start_mark, _loop0_148_type, _seq);
     D(p->level--);
     return _seq;
 }
 
-// _loop0_148: (star_targets '=')
+// _loop0_149: (star_targets '=')
 static asdl_seq *
-_loop0_148_rule(Parser *p)
+_loop0_149_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30100,13 +30157,13 @@ _loop0_148_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _loop0_148[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(star_targets '=')"));
-        void *_tmp_192_var;
+        D(fprintf(stderr, "%*c> _loop0_149[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(star_targets '=')"));
+        void *_tmp_193_var;
         while (
-            (_tmp_192_var = _tmp_192_rule(p))  // star_targets '='
+            (_tmp_193_var = _tmp_193_rule(p))  // star_targets '='
         )
         {
-            _res = _tmp_192_var;
+            _res = _tmp_193_var;
             if (_n == _children_capacity) {
                 _children_capacity *= 2;
                 void **_new_children = PyMem_Realloc(_children, _children_capacity*sizeof(void *));
@@ -30122,7 +30179,7 @@ _loop0_148_rule(Parser *p)
             _mark = p->mark;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _loop0_148[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _loop0_149[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "(star_targets '=')"));
     }
     asdl_seq *_seq = (asdl_seq*)_Py_asdl_generic_seq_new(_n, p->arena);
@@ -30135,14 +30192,14 @@ _loop0_148_rule(Parser *p)
     }
     for (int i = 0; i < _n; i++) asdl_seq_SET_UNTYPED(_seq, i, _children[i]);
     PyMem_Free(_children);
-    _PyPegen_insert_memo(p, _start_mark, _loop0_148_type, _seq);
+    _PyPegen_insert_memo(p, _start_mark, _loop0_149_type, _seq);
     D(p->level--);
     return _seq;
 }
 
-// _loop0_149: (star_targets '=')
+// _loop0_150: (star_targets '=')
 static asdl_seq *
-_loop0_149_rule(Parser *p)
+_loop0_150_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30166,13 +30223,13 @@ _loop0_149_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _loop0_149[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(star_targets '=')"));
-        void *_tmp_193_var;
+        D(fprintf(stderr, "%*c> _loop0_150[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(star_targets '=')"));
+        void *_tmp_194_var;
         while (
-            (_tmp_193_var = _tmp_193_rule(p))  // star_targets '='
+            (_tmp_194_var = _tmp_194_rule(p))  // star_targets '='
         )
         {
-            _res = _tmp_193_var;
+            _res = _tmp_194_var;
             if (_n == _children_capacity) {
                 _children_capacity *= 2;
                 void **_new_children = PyMem_Realloc(_children, _children_capacity*sizeof(void *));
@@ -30188,7 +30245,7 @@ _loop0_149_rule(Parser *p)
             _mark = p->mark;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _loop0_149[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _loop0_150[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "(star_targets '=')"));
     }
     asdl_seq *_seq = (asdl_seq*)_Py_asdl_generic_seq_new(_n, p->arena);
@@ -30201,14 +30258,14 @@ _loop0_149_rule(Parser *p)
     }
     for (int i = 0; i < _n; i++) asdl_seq_SET_UNTYPED(_seq, i, _children[i]);
     PyMem_Free(_children);
-    _PyPegen_insert_memo(p, _start_mark, _loop0_149_type, _seq);
+    _PyPegen_insert_memo(p, _start_mark, _loop0_150_type, _seq);
     D(p->level--);
     return _seq;
 }
 
-// _tmp_150: yield_expr | star_expressions
+// _tmp_151: yield_expr | star_expressions
 static void *
-_tmp_150_rule(Parser *p)
+_tmp_151_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30222,18 +30279,18 @@ _tmp_150_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_150[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "yield_expr"));
+        D(fprintf(stderr, "%*c> _tmp_151[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "yield_expr"));
         expr_ty yield_expr_var;
         if (
             (yield_expr_var = yield_expr_rule(p))  // yield_expr
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_150[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "yield_expr"));
+            D(fprintf(stderr, "%*c+ _tmp_151[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "yield_expr"));
             _res = yield_expr_var;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_150[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_151[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "yield_expr"));
     }
     { // star_expressions
@@ -30241,18 +30298,18 @@ _tmp_150_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_150[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "star_expressions"));
+        D(fprintf(stderr, "%*c> _tmp_151[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "star_expressions"));
         expr_ty star_expressions_var;
         if (
             (star_expressions_var = star_expressions_rule(p))  // star_expressions
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_150[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "star_expressions"));
+            D(fprintf(stderr, "%*c+ _tmp_151[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "star_expressions"));
             _res = star_expressions_var;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_150[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_151[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "star_expressions"));
     }
     _res = NULL;
@@ -30261,9 +30318,9 @@ _tmp_150_rule(Parser *p)
     return _res;
 }
 
-// _tmp_151: '[' | '(' | '{'
+// _tmp_152: '[' | '(' | '{'
 static void *
-_tmp_151_rule(Parser *p)
+_tmp_152_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30277,18 +30334,18 @@ _tmp_151_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_151[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'['"));
+        D(fprintf(stderr, "%*c> _tmp_152[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'['"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 9))  // token='['
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_151[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'['"));
+            D(fprintf(stderr, "%*c+ _tmp_152[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'['"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_151[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_152[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'['"));
     }
     { // '('
@@ -30296,18 +30353,18 @@ _tmp_151_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_151[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'('"));
+        D(fprintf(stderr, "%*c> _tmp_152[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'('"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 7))  // token='('
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_151[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'('"));
+            D(fprintf(stderr, "%*c+ _tmp_152[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'('"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_151[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_152[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'('"));
     }
     { // '{'
@@ -30315,18 +30372,18 @@ _tmp_151_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_151[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'{'"));
+        D(fprintf(stderr, "%*c> _tmp_152[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'{'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 25))  // token='{'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_151[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'{'"));
+            D(fprintf(stderr, "%*c+ _tmp_152[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'{'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_151[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_152[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'{'"));
     }
     _res = NULL;
@@ -30335,9 +30392,9 @@ _tmp_151_rule(Parser *p)
     return _res;
 }
 
-// _tmp_152: '[' | '{'
+// _tmp_153: '[' | '{'
 static void *
-_tmp_152_rule(Parser *p)
+_tmp_153_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30351,18 +30408,18 @@ _tmp_152_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_152[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'['"));
+        D(fprintf(stderr, "%*c> _tmp_153[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'['"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 9))  // token='['
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_152[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'['"));
+            D(fprintf(stderr, "%*c+ _tmp_153[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'['"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_152[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_153[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'['"));
     }
     { // '{'
@@ -30370,18 +30427,18 @@ _tmp_152_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_152[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'{'"));
+        D(fprintf(stderr, "%*c> _tmp_153[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'{'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 25))  // token='{'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_152[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'{'"));
+            D(fprintf(stderr, "%*c+ _tmp_153[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'{'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_152[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_153[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'{'"));
     }
     _res = NULL;
@@ -30390,9 +30447,9 @@ _tmp_152_rule(Parser *p)
     return _res;
 }
 
-// _tmp_153: '[' | '{'
+// _tmp_154: '[' | '{'
 static void *
-_tmp_153_rule(Parser *p)
+_tmp_154_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30406,18 +30463,18 @@ _tmp_153_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_153[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'['"));
+        D(fprintf(stderr, "%*c> _tmp_154[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'['"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 9))  // token='['
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_153[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'['"));
+            D(fprintf(stderr, "%*c+ _tmp_154[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'['"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_153[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_154[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'['"));
     }
     { // '{'
@@ -30425,18 +30482,18 @@ _tmp_153_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_153[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'{'"));
+        D(fprintf(stderr, "%*c> _tmp_154[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'{'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 25))  // token='{'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_153[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'{'"));
+            D(fprintf(stderr, "%*c+ _tmp_154[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'{'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_153[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_154[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'{'"));
     }
     _res = NULL;
@@ -30445,9 +30502,9 @@ _tmp_153_rule(Parser *p)
     return _res;
 }
 
-// _loop0_154: param_no_default
+// _loop0_155: param_no_default
 static asdl_seq *
-_loop0_154_rule(Parser *p)
+_loop0_155_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30471,7 +30528,7 @@ _loop0_154_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _loop0_154[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "param_no_default"));
+        D(fprintf(stderr, "%*c> _loop0_155[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "param_no_default"));
         arg_ty param_no_default_var;
         while (
             (param_no_default_var = param_no_default_rule(p))  // param_no_default
@@ -30493,7 +30550,7 @@ _loop0_154_rule(Parser *p)
             _mark = p->mark;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _loop0_154[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _loop0_155[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "param_no_default"));
     }
     asdl_seq *_seq = (asdl_seq*)_Py_asdl_generic_seq_new(_n, p->arena);
@@ -30506,14 +30563,14 @@ _loop0_154_rule(Parser *p)
     }
     for (int i = 0; i < _n; i++) asdl_seq_SET_UNTYPED(_seq, i, _children[i]);
     PyMem_Free(_children);
-    _PyPegen_insert_memo(p, _start_mark, _loop0_154_type, _seq);
+    _PyPegen_insert_memo(p, _start_mark, _loop0_155_type, _seq);
     D(p->level--);
     return _seq;
 }
 
-// _loop1_155: param_with_default
+// _loop1_156: param_with_default
 static asdl_seq *
-_loop1_155_rule(Parser *p)
+_loop1_156_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30537,7 +30594,7 @@ _loop1_155_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _loop1_155[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "param_with_default"));
+        D(fprintf(stderr, "%*c> _loop1_156[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "param_with_default"));
         NameDefaultPair* param_with_default_var;
         while (
             (param_with_default_var = param_with_default_rule(p))  // param_with_default
@@ -30559,7 +30616,7 @@ _loop1_155_rule(Parser *p)
             _mark = p->mark;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _loop1_155[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _loop1_156[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "param_with_default"));
     }
     if (_n == 0 || p->error_indicator) {
@@ -30577,14 +30634,14 @@ _loop1_155_rule(Parser *p)
     }
     for (int i = 0; i < _n; i++) asdl_seq_SET_UNTYPED(_seq, i, _children[i]);
     PyMem_Free(_children);
-    _PyPegen_insert_memo(p, _start_mark, _loop1_155_type, _seq);
+    _PyPegen_insert_memo(p, _start_mark, _loop1_156_type, _seq);
     D(p->level--);
     return _seq;
 }
 
-// _loop0_156: lambda_param_no_default
+// _loop0_157: lambda_param_no_default
 static asdl_seq *
-_loop0_156_rule(Parser *p)
+_loop0_157_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30608,7 +30665,7 @@ _loop0_156_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _loop0_156[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "lambda_param_no_default"));
+        D(fprintf(stderr, "%*c> _loop0_157[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "lambda_param_no_default"));
         arg_ty lambda_param_no_default_var;
         while (
             (lambda_param_no_default_var = lambda_param_no_default_rule(p))  // lambda_param_no_default
@@ -30630,7 +30687,7 @@ _loop0_156_rule(Parser *p)
             _mark = p->mark;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _loop0_156[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _loop0_157[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "lambda_param_no_default"));
     }
     asdl_seq *_seq = (asdl_seq*)_Py_asdl_generic_seq_new(_n, p->arena);
@@ -30643,14 +30700,14 @@ _loop0_156_rule(Parser *p)
     }
     for (int i = 0; i < _n; i++) asdl_seq_SET_UNTYPED(_seq, i, _children[i]);
     PyMem_Free(_children);
-    _PyPegen_insert_memo(p, _start_mark, _loop0_156_type, _seq);
+    _PyPegen_insert_memo(p, _start_mark, _loop0_157_type, _seq);
     D(p->level--);
     return _seq;
 }
 
-// _loop1_157: lambda_param_with_default
+// _loop1_158: lambda_param_with_default
 static asdl_seq *
-_loop1_157_rule(Parser *p)
+_loop1_158_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30674,7 +30731,7 @@ _loop1_157_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _loop1_157[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "lambda_param_with_default"));
+        D(fprintf(stderr, "%*c> _loop1_158[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "lambda_param_with_default"));
         NameDefaultPair* lambda_param_with_default_var;
         while (
             (lambda_param_with_default_var = lambda_param_with_default_rule(p))  // lambda_param_with_default
@@ -30696,7 +30753,7 @@ _loop1_157_rule(Parser *p)
             _mark = p->mark;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _loop1_157[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _loop1_158[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "lambda_param_with_default"));
     }
     if (_n == 0 || p->error_indicator) {
@@ -30714,14 +30771,14 @@ _loop1_157_rule(Parser *p)
     }
     for (int i = 0; i < _n; i++) asdl_seq_SET_UNTYPED(_seq, i, _children[i]);
     PyMem_Free(_children);
-    _PyPegen_insert_memo(p, _start_mark, _loop1_157_type, _seq);
+    _PyPegen_insert_memo(p, _start_mark, _loop1_158_type, _seq);
     D(p->level--);
     return _seq;
 }
 
-// _tmp_158: ')' | ',' (')' | '**')
+// _tmp_159: ')' | ',' (')' | '**')
 static void *
-_tmp_158_rule(Parser *p)
+_tmp_159_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30735,18 +30792,18 @@ _tmp_158_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_158[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "')'"));
+        D(fprintf(stderr, "%*c> _tmp_159[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "')'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 8))  // token=')'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_158[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "')'"));
+            D(fprintf(stderr, "%*c+ _tmp_159[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "')'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_158[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_159[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "')'"));
     }
     { // ',' (')' | '**')
@@ -30754,21 +30811,21 @@ _tmp_158_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_158[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' (')' | '**')"));
+        D(fprintf(stderr, "%*c> _tmp_159[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' (')' | '**')"));
         Token * _literal;
-        void *_tmp_194_var;
+        void *_tmp_195_var;
         if (
             (_literal = _PyPegen_expect_token(p, 12))  // token=','
             &&
-            (_tmp_194_var = _tmp_194_rule(p))  // ')' | '**'
+            (_tmp_195_var = _tmp_195_rule(p))  // ')' | '**'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_158[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "',' (')' | '**')"));
-            _res = _PyPegen_dummy_name(p, _literal, _tmp_194_var);
+            D(fprintf(stderr, "%*c+ _tmp_159[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "',' (')' | '**')"));
+            _res = _PyPegen_dummy_name(p, _literal, _tmp_195_var);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_158[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_159[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "',' (')' | '**')"));
     }
     _res = NULL;
@@ -30777,9 +30834,9 @@ _tmp_158_rule(Parser *p)
     return _res;
 }
 
-// _tmp_159: ':' | ',' (':' | '**')
+// _tmp_160: ':' | ',' (':' | '**')
 static void *
-_tmp_159_rule(Parser *p)
+_tmp_160_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30793,18 +30850,18 @@ _tmp_159_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_159[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "':'"));
+        D(fprintf(stderr, "%*c> _tmp_160[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "':'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 11))  // token=':'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_159[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "':'"));
+            D(fprintf(stderr, "%*c+ _tmp_160[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "':'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_159[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_160[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "':'"));
     }
     { // ',' (':' | '**')
@@ -30812,21 +30869,21 @@ _tmp_159_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_159[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' (':' | '**')"));
+        D(fprintf(stderr, "%*c> _tmp_160[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' (':' | '**')"));
         Token * _literal;
-        void *_tmp_195_var;
+        void *_tmp_196_var;
         if (
             (_literal = _PyPegen_expect_token(p, 12))  // token=','
             &&
-            (_tmp_195_var = _tmp_195_rule(p))  // ':' | '**'
+            (_tmp_196_var = _tmp_196_rule(p))  // ':' | '**'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_159[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "',' (':' | '**')"));
-            _res = _PyPegen_dummy_name(p, _literal, _tmp_195_var);
+            D(fprintf(stderr, "%*c+ _tmp_160[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "',' (':' | '**')"));
+            _res = _PyPegen_dummy_name(p, _literal, _tmp_196_var);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_159[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_160[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "',' (':' | '**')"));
     }
     _res = NULL;
@@ -30835,9 +30892,9 @@ _tmp_159_rule(Parser *p)
     return _res;
 }
 
-// _tmp_160: ',' | ')' | ':'
+// _tmp_161: ',' | ')' | ':'
 static void *
-_tmp_160_rule(Parser *p)
+_tmp_161_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30851,18 +30908,18 @@ _tmp_160_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_160[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "','"));
+        D(fprintf(stderr, "%*c> _tmp_161[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "','"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 12))  // token=','
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_160[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "','"));
+            D(fprintf(stderr, "%*c+ _tmp_161[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "','"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_160[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_161[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "','"));
     }
     { // ')'
@@ -30870,18 +30927,18 @@ _tmp_160_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_160[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "')'"));
+        D(fprintf(stderr, "%*c> _tmp_161[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "')'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 8))  // token=')'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_160[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "')'"));
+            D(fprintf(stderr, "%*c+ _tmp_161[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "')'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_160[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_161[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "')'"));
     }
     { // ':'
@@ -30889,18 +30946,18 @@ _tmp_160_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_160[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "':'"));
+        D(fprintf(stderr, "%*c> _tmp_161[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "':'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 11))  // token=':'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_160[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "':'"));
+            D(fprintf(stderr, "%*c+ _tmp_161[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "':'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_160[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_161[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "':'"));
     }
     _res = NULL;
@@ -30909,9 +30966,9 @@ _tmp_160_rule(Parser *p)
     return _res;
 }
 
-// _loop0_162: ',' (expression ['as' star_target])
+// _loop0_163: ',' (expression ['as' star_target])
 static asdl_seq *
-_loop0_162_rule(Parser *p)
+_loop0_163_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30935,13 +30992,13 @@ _loop0_162_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _loop0_162[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' (expression ['as' star_target])"));
+        D(fprintf(stderr, "%*c> _loop0_163[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' (expression ['as' star_target])"));
         Token * _literal;
         void *elem;
         while (
             (_literal = _PyPegen_expect_token(p, 12))  // token=','
             &&
-            (elem = _tmp_196_rule(p))  // expression ['as' star_target]
+            (elem = _tmp_197_rule(p))  // expression ['as' star_target]
         )
         {
             _res = elem;
@@ -30966,7 +31023,7 @@ _loop0_162_rule(Parser *p)
             _mark = p->mark;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _loop0_162[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _loop0_163[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "',' (expression ['as' star_target])"));
     }
     asdl_seq *_seq = (asdl_seq*)_Py_asdl_generic_seq_new(_n, p->arena);
@@ -30979,14 +31036,14 @@ _loop0_162_rule(Parser *p)
     }
     for (int i = 0; i < _n; i++) asdl_seq_SET_UNTYPED(_seq, i, _children[i]);
     PyMem_Free(_children);
-    _PyPegen_insert_memo(p, _start_mark, _loop0_162_type, _seq);
+    _PyPegen_insert_memo(p, _start_mark, _loop0_163_type, _seq);
     D(p->level--);
     return _seq;
 }
 
-// _gather_161: (expression ['as' star_target]) _loop0_162
+// _gather_162: (expression ['as' star_target]) _loop0_163
 static asdl_seq *
-_gather_161_rule(Parser *p)
+_gather_162_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30995,27 +31052,27 @@ _gather_161_rule(Parser *p)
     }
     asdl_seq * _res = NULL;
     int _mark = p->mark;
-    { // (expression ['as' star_target]) _loop0_162
+    { // (expression ['as' star_target]) _loop0_163
         if (p->error_indicator) {
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _gather_161[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(expression ['as' star_target]) _loop0_162"));
+        D(fprintf(stderr, "%*c> _gather_162[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(expression ['as' star_target]) _loop0_163"));
         void *elem;
         asdl_seq * seq;
         if (
-            (elem = _tmp_196_rule(p))  // expression ['as' star_target]
+            (elem = _tmp_197_rule(p))  // expression ['as' star_target]
             &&
-            (seq = _loop0_162_rule(p))  // _loop0_162
+            (seq = _loop0_163_rule(p))  // _loop0_163
         )
         {
-            D(fprintf(stderr, "%*c+ _gather_161[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "(expression ['as' star_target]) _loop0_162"));
+            D(fprintf(stderr, "%*c+ _gather_162[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "(expression ['as' star_target]) _loop0_163"));
             _res = _PyPegen_seq_insert_in_front(p, elem, seq);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _gather_161[%d-%d]: %s failed!\n", p->level, ' ',
-                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "(expression ['as' star_target]) _loop0_162"));
+        D(fprintf(stderr, "%*c%s _gather_162[%d-%d]: %s failed!\n", p->level, ' ',
+                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "(expression ['as' star_target]) _loop0_163"));
     }
     _res = NULL;
   done:
@@ -31023,9 +31080,9 @@ _gather_161_rule(Parser *p)
     return _res;
 }
 
-// _loop0_164: ',' (expressions ['as' star_target])
+// _loop0_165: ',' (expressions ['as' star_target])
 static asdl_seq *
-_loop0_164_rule(Parser *p)
+_loop0_165_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31049,13 +31106,13 @@ _loop0_164_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _loop0_164[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' (expressions ['as' star_target])"));
+        D(fprintf(stderr, "%*c> _loop0_165[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' (expressions ['as' star_target])"));
         Token * _literal;
         void *elem;
         while (
             (_literal = _PyPegen_expect_token(p, 12))  // token=','
             &&
-            (elem = _tmp_197_rule(p))  // expressions ['as' star_target]
+            (elem = _tmp_198_rule(p))  // expressions ['as' star_target]
         )
         {
             _res = elem;
@@ -31080,7 +31137,7 @@ _loop0_164_rule(Parser *p)
             _mark = p->mark;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _loop0_164[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _loop0_165[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "',' (expressions ['as' star_target])"));
     }
     asdl_seq *_seq = (asdl_seq*)_Py_asdl_generic_seq_new(_n, p->arena);
@@ -31093,14 +31150,14 @@ _loop0_164_rule(Parser *p)
     }
     for (int i = 0; i < _n; i++) asdl_seq_SET_UNTYPED(_seq, i, _children[i]);
     PyMem_Free(_children);
-    _PyPegen_insert_memo(p, _start_mark, _loop0_164_type, _seq);
+    _PyPegen_insert_memo(p, _start_mark, _loop0_165_type, _seq);
     D(p->level--);
     return _seq;
 }
 
-// _gather_163: (expressions ['as' star_target]) _loop0_164
+// _gather_164: (expressions ['as' star_target]) _loop0_165
 static asdl_seq *
-_gather_163_rule(Parser *p)
+_gather_164_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31109,27 +31166,27 @@ _gather_163_rule(Parser *p)
     }
     asdl_seq * _res = NULL;
     int _mark = p->mark;
-    { // (expressions ['as' star_target]) _loop0_164
+    { // (expressions ['as' star_target]) _loop0_165
         if (p->error_indicator) {
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _gather_163[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(expressions ['as' star_target]) _loop0_164"));
+        D(fprintf(stderr, "%*c> _gather_164[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(expressions ['as' star_target]) _loop0_165"));
         void *elem;
         asdl_seq * seq;
         if (
-            (elem = _tmp_197_rule(p))  // expressions ['as' star_target]
+            (elem = _tmp_198_rule(p))  // expressions ['as' star_target]
             &&
-            (seq = _loop0_164_rule(p))  // _loop0_164
+            (seq = _loop0_165_rule(p))  // _loop0_165
         )
         {
-            D(fprintf(stderr, "%*c+ _gather_163[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "(expressions ['as' star_target]) _loop0_164"));
+            D(fprintf(stderr, "%*c+ _gather_164[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "(expressions ['as' star_target]) _loop0_165"));
             _res = _PyPegen_seq_insert_in_front(p, elem, seq);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _gather_163[%d-%d]: %s failed!\n", p->level, ' ',
-                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "(expressions ['as' star_target]) _loop0_164"));
+        D(fprintf(stderr, "%*c%s _gather_164[%d-%d]: %s failed!\n", p->level, ' ',
+                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "(expressions ['as' star_target]) _loop0_165"));
     }
     _res = NULL;
   done:
@@ -31137,9 +31194,9 @@ _gather_163_rule(Parser *p)
     return _res;
 }
 
-// _loop0_166: ',' (expression ['as' star_target])
+// _loop0_167: ',' (expression ['as' star_target])
 static asdl_seq *
-_loop0_166_rule(Parser *p)
+_loop0_167_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31163,13 +31220,13 @@ _loop0_166_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _loop0_166[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' (expression ['as' star_target])"));
+        D(fprintf(stderr, "%*c> _loop0_167[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' (expression ['as' star_target])"));
         Token * _literal;
         void *elem;
         while (
             (_literal = _PyPegen_expect_token(p, 12))  // token=','
             &&
-            (elem = _tmp_198_rule(p))  // expression ['as' star_target]
+            (elem = _tmp_199_rule(p))  // expression ['as' star_target]
         )
         {
             _res = elem;
@@ -31194,7 +31251,7 @@ _loop0_166_rule(Parser *p)
             _mark = p->mark;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _loop0_166[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _loop0_167[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "',' (expression ['as' star_target])"));
     }
     asdl_seq *_seq = (asdl_seq*)_Py_asdl_generic_seq_new(_n, p->arena);
@@ -31207,14 +31264,14 @@ _loop0_166_rule(Parser *p)
     }
     for (int i = 0; i < _n; i++) asdl_seq_SET_UNTYPED(_seq, i, _children[i]);
     PyMem_Free(_children);
-    _PyPegen_insert_memo(p, _start_mark, _loop0_166_type, _seq);
+    _PyPegen_insert_memo(p, _start_mark, _loop0_167_type, _seq);
     D(p->level--);
     return _seq;
 }
 
-// _gather_165: (expression ['as' star_target]) _loop0_166
+// _gather_166: (expression ['as' star_target]) _loop0_167
 static asdl_seq *
-_gather_165_rule(Parser *p)
+_gather_166_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31223,27 +31280,27 @@ _gather_165_rule(Parser *p)
     }
     asdl_seq * _res = NULL;
     int _mark = p->mark;
-    { // (expression ['as' star_target]) _loop0_166
+    { // (expression ['as' star_target]) _loop0_167
         if (p->error_indicator) {
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _gather_165[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(expression ['as' star_target]) _loop0_166"));
+        D(fprintf(stderr, "%*c> _gather_166[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(expression ['as' star_target]) _loop0_167"));
         void *elem;
         asdl_seq * seq;
         if (
-            (elem = _tmp_198_rule(p))  // expression ['as' star_target]
+            (elem = _tmp_199_rule(p))  // expression ['as' star_target]
             &&
-            (seq = _loop0_166_rule(p))  // _loop0_166
+            (seq = _loop0_167_rule(p))  // _loop0_167
         )
         {
-            D(fprintf(stderr, "%*c+ _gather_165[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "(expression ['as' star_target]) _loop0_166"));
+            D(fprintf(stderr, "%*c+ _gather_166[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "(expression ['as' star_target]) _loop0_167"));
             _res = _PyPegen_seq_insert_in_front(p, elem, seq);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _gather_165[%d-%d]: %s failed!\n", p->level, ' ',
-                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "(expression ['as' star_target]) _loop0_166"));
+        D(fprintf(stderr, "%*c%s _gather_166[%d-%d]: %s failed!\n", p->level, ' ',
+                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "(expression ['as' star_target]) _loop0_167"));
     }
     _res = NULL;
   done:
@@ -31251,9 +31308,9 @@ _gather_165_rule(Parser *p)
     return _res;
 }
 
-// _loop0_168: ',' (expressions ['as' star_target])
+// _loop0_169: ',' (expressions ['as' star_target])
 static asdl_seq *
-_loop0_168_rule(Parser *p)
+_loop0_169_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31277,13 +31334,13 @@ _loop0_168_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _loop0_168[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' (expressions ['as' star_target])"));
+        D(fprintf(stderr, "%*c> _loop0_169[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' (expressions ['as' star_target])"));
         Token * _literal;
         void *elem;
         while (
             (_literal = _PyPegen_expect_token(p, 12))  // token=','
             &&
-            (elem = _tmp_199_rule(p))  // expressions ['as' star_target]
+            (elem = _tmp_200_rule(p))  // expressions ['as' star_target]
         )
         {
             _res = elem;
@@ -31308,7 +31365,7 @@ _loop0_168_rule(Parser *p)
             _mark = p->mark;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _loop0_168[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _loop0_169[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "',' (expressions ['as' star_target])"));
     }
     asdl_seq *_seq = (asdl_seq*)_Py_asdl_generic_seq_new(_n, p->arena);
@@ -31321,14 +31378,14 @@ _loop0_168_rule(Parser *p)
     }
     for (int i = 0; i < _n; i++) asdl_seq_SET_UNTYPED(_seq, i, _children[i]);
     PyMem_Free(_children);
-    _PyPegen_insert_memo(p, _start_mark, _loop0_168_type, _seq);
+    _PyPegen_insert_memo(p, _start_mark, _loop0_169_type, _seq);
     D(p->level--);
     return _seq;
 }
 
-// _gather_167: (expressions ['as' star_target]) _loop0_168
+// _gather_168: (expressions ['as' star_target]) _loop0_169
 static asdl_seq *
-_gather_167_rule(Parser *p)
+_gather_168_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31337,27 +31394,27 @@ _gather_167_rule(Parser *p)
     }
     asdl_seq * _res = NULL;
     int _mark = p->mark;
-    { // (expressions ['as' star_target]) _loop0_168
+    { // (expressions ['as' star_target]) _loop0_169
         if (p->error_indicator) {
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _gather_167[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(expressions ['as' star_target]) _loop0_168"));
+        D(fprintf(stderr, "%*c> _gather_168[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(expressions ['as' star_target]) _loop0_169"));
         void *elem;
         asdl_seq * seq;
         if (
-            (elem = _tmp_199_rule(p))  // expressions ['as' star_target]
+            (elem = _tmp_200_rule(p))  // expressions ['as' star_target]
             &&
-            (seq = _loop0_168_rule(p))  // _loop0_168
+            (seq = _loop0_169_rule(p))  // _loop0_169
         )
         {
-            D(fprintf(stderr, "%*c+ _gather_167[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "(expressions ['as' star_target]) _loop0_168"));
+            D(fprintf(stderr, "%*c+ _gather_168[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "(expressions ['as' star_target]) _loop0_169"));
             _res = _PyPegen_seq_insert_in_front(p, elem, seq);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _gather_167[%d-%d]: %s failed!\n", p->level, ' ',
-                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "(expressions ['as' star_target]) _loop0_168"));
+        D(fprintf(stderr, "%*c%s _gather_168[%d-%d]: %s failed!\n", p->level, ' ',
+                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "(expressions ['as' star_target]) _loop0_169"));
     }
     _res = NULL;
   done:
@@ -31365,9 +31422,9 @@ _gather_167_rule(Parser *p)
     return _res;
 }
 
-// _tmp_169: 'except' | 'finally'
+// _tmp_170: 'except' | 'finally'
 static void *
-_tmp_169_rule(Parser *p)
+_tmp_170_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31381,18 +31438,18 @@ _tmp_169_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_169[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'except'"));
+        D(fprintf(stderr, "%*c> _tmp_170[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'except'"));
         Token * _keyword;
         if (
             (_keyword = _PyPegen_expect_token(p, 523))  // token='except'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_169[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'except'"));
+            D(fprintf(stderr, "%*c+ _tmp_170[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'except'"));
             _res = _keyword;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_169[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_170[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'except'"));
     }
     { // 'finally'
@@ -31400,18 +31457,18 @@ _tmp_169_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_169[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'finally'"));
+        D(fprintf(stderr, "%*c> _tmp_170[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'finally'"));
         Token * _keyword;
         if (
             (_keyword = _PyPegen_expect_token(p, 524))  // token='finally'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_169[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'finally'"));
+            D(fprintf(stderr, "%*c+ _tmp_170[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'finally'"));
             _res = _keyword;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_169[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_170[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'finally'"));
     }
     _res = NULL;
@@ -31420,9 +31477,9 @@ _tmp_169_rule(Parser *p)
     return _res;
 }
 
-// _tmp_170: 'as' NAME
+// _tmp_171: 'as' NAME
 static void *
-_tmp_170_rule(Parser *p)
+_tmp_171_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31436,7 +31493,7 @@ _tmp_170_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_170[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'as' NAME"));
+        D(fprintf(stderr, "%*c> _tmp_171[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'as' NAME"));
         Token * _keyword;
         expr_ty name_var;
         if (
@@ -31445,12 +31502,12 @@ _tmp_170_rule(Parser *p)
             (name_var = _PyPegen_name_token(p))  // NAME
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_170[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'as' NAME"));
+            D(fprintf(stderr, "%*c+ _tmp_171[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'as' NAME"));
             _res = _PyPegen_dummy_name(p, _keyword, name_var);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_170[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_171[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'as' NAME"));
     }
     _res = NULL;
@@ -31459,9 +31516,9 @@ _tmp_170_rule(Parser *p)
     return _res;
 }
 
-// _tmp_171: 'as' NAME
+// _tmp_172: 'as' NAME
 static void *
-_tmp_171_rule(Parser *p)
+_tmp_172_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31475,7 +31532,7 @@ _tmp_171_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_171[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'as' NAME"));
+        D(fprintf(stderr, "%*c> _tmp_172[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'as' NAME"));
         Token * _keyword;
         expr_ty name_var;
         if (
@@ -31484,12 +31541,12 @@ _tmp_171_rule(Parser *p)
             (name_var = _PyPegen_name_token(p))  // NAME
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_171[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'as' NAME"));
+            D(fprintf(stderr, "%*c+ _tmp_172[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'as' NAME"));
             _res = _PyPegen_dummy_name(p, _keyword, name_var);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_171[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_172[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'as' NAME"));
     }
     _res = NULL;
@@ -31498,9 +31555,9 @@ _tmp_171_rule(Parser *p)
     return _res;
 }
 
-// _tmp_172: 'as' NAME
+// _tmp_173: 'as' NAME
 static void *
-_tmp_172_rule(Parser *p)
+_tmp_173_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31514,7 +31571,7 @@ _tmp_172_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_172[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'as' NAME"));
+        D(fprintf(stderr, "%*c> _tmp_173[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'as' NAME"));
         Token * _keyword;
         expr_ty name_var;
         if (
@@ -31523,12 +31580,12 @@ _tmp_172_rule(Parser *p)
             (name_var = _PyPegen_name_token(p))  // NAME
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_172[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'as' NAME"));
+            D(fprintf(stderr, "%*c+ _tmp_173[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'as' NAME"));
             _res = _PyPegen_dummy_name(p, _keyword, name_var);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_172[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_173[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'as' NAME"));
     }
     _res = NULL;
@@ -31537,9 +31594,9 @@ _tmp_172_rule(Parser *p)
     return _res;
 }
 
-// _tmp_173: positional_patterns ','
+// _tmp_174: positional_patterns ','
 static void *
-_tmp_173_rule(Parser *p)
+_tmp_174_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31553,7 +31610,7 @@ _tmp_173_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_173[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "positional_patterns ','"));
+        D(fprintf(stderr, "%*c> _tmp_174[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "positional_patterns ','"));
         Token * _literal;
         asdl_pattern_seq* positional_patterns_var;
         if (
@@ -31562,12 +31619,12 @@ _tmp_173_rule(Parser *p)
             (_literal = _PyPegen_expect_token(p, 12))  // token=','
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_173[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "positional_patterns ','"));
+            D(fprintf(stderr, "%*c+ _tmp_174[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "positional_patterns ','"));
             _res = _PyPegen_dummy_name(p, positional_patterns_var, _literal);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_173[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_174[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "positional_patterns ','"));
     }
     _res = NULL;
@@ -31576,9 +31633,9 @@ _tmp_173_rule(Parser *p)
     return _res;
 }
 
-// _tmp_174: '->' expression
+// _tmp_175: '->' expression
 static void *
-_tmp_174_rule(Parser *p)
+_tmp_175_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31592,7 +31649,7 @@ _tmp_174_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_174[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'->' expression"));
+        D(fprintf(stderr, "%*c> _tmp_175[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'->' expression"));
         Token * _literal;
         expr_ty expression_var;
         if (
@@ -31601,12 +31658,12 @@ _tmp_174_rule(Parser *p)
             (expression_var = expression_rule(p))  // expression
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_174[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'->' expression"));
+            D(fprintf(stderr, "%*c+ _tmp_175[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'->' expression"));
             _res = _PyPegen_dummy_name(p, _literal, expression_var);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_174[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_175[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'->' expression"));
     }
     _res = NULL;
@@ -31615,9 +31672,9 @@ _tmp_174_rule(Parser *p)
     return _res;
 }
 
-// _tmp_175: '(' arguments? ')'
+// _tmp_176: '(' arguments? ')'
 static void *
-_tmp_175_rule(Parser *p)
+_tmp_176_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31631,7 +31688,7 @@ _tmp_175_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_175[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'(' arguments? ')'"));
+        D(fprintf(stderr, "%*c> _tmp_176[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'(' arguments? ')'"));
         Token * _literal;
         Token * _literal_1;
         void *_opt_var;
@@ -31644,12 +31701,12 @@ _tmp_175_rule(Parser *p)
             (_literal_1 = _PyPegen_expect_token(p, 8))  // token=')'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_175[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'(' arguments? ')'"));
+            D(fprintf(stderr, "%*c+ _tmp_176[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'(' arguments? ')'"));
             _res = _PyPegen_dummy_name(p, _literal, _opt_var, _literal_1);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_175[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_176[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'(' arguments? ')'"));
     }
     _res = NULL;
@@ -31658,9 +31715,9 @@ _tmp_175_rule(Parser *p)
     return _res;
 }
 
-// _loop0_177: ',' double_starred_kvpair
+// _loop0_178: ',' double_starred_kvpair
 static asdl_seq *
-_loop0_177_rule(Parser *p)
+_loop0_178_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31684,7 +31741,7 @@ _loop0_177_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _loop0_177[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' double_starred_kvpair"));
+        D(fprintf(stderr, "%*c> _loop0_178[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' double_starred_kvpair"));
         Token * _literal;
         KeyValuePair* elem;
         while (
@@ -31715,7 +31772,7 @@ _loop0_177_rule(Parser *p)
             _mark = p->mark;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _loop0_177[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _loop0_178[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "',' double_starred_kvpair"));
     }
     asdl_seq *_seq = (asdl_seq*)_Py_asdl_generic_seq_new(_n, p->arena);
@@ -31728,14 +31785,14 @@ _loop0_177_rule(Parser *p)
     }
     for (int i = 0; i < _n; i++) asdl_seq_SET_UNTYPED(_seq, i, _children[i]);
     PyMem_Free(_children);
-    _PyPegen_insert_memo(p, _start_mark, _loop0_177_type, _seq);
+    _PyPegen_insert_memo(p, _start_mark, _loop0_178_type, _seq);
     D(p->level--);
     return _seq;
 }
 
-// _gather_176: double_starred_kvpair _loop0_177
+// _gather_177: double_starred_kvpair _loop0_178
 static asdl_seq *
-_gather_176_rule(Parser *p)
+_gather_177_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31744,27 +31801,27 @@ _gather_176_rule(Parser *p)
     }
     asdl_seq * _res = NULL;
     int _mark = p->mark;
-    { // double_starred_kvpair _loop0_177
+    { // double_starred_kvpair _loop0_178
         if (p->error_indicator) {
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _gather_176[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "double_starred_kvpair _loop0_177"));
+        D(fprintf(stderr, "%*c> _gather_177[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "double_starred_kvpair _loop0_178"));
         KeyValuePair* elem;
         asdl_seq * seq;
         if (
             (elem = double_starred_kvpair_rule(p))  // double_starred_kvpair
             &&
-            (seq = _loop0_177_rule(p))  // _loop0_177
+            (seq = _loop0_178_rule(p))  // _loop0_178
         )
         {
-            D(fprintf(stderr, "%*c+ _gather_176[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "double_starred_kvpair _loop0_177"));
+            D(fprintf(stderr, "%*c+ _gather_177[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "double_starred_kvpair _loop0_178"));
             _res = _PyPegen_seq_insert_in_front(p, elem, seq);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _gather_176[%d-%d]: %s failed!\n", p->level, ' ',
-                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "double_starred_kvpair _loop0_177"));
+        D(fprintf(stderr, "%*c%s _gather_177[%d-%d]: %s failed!\n", p->level, ' ',
+                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "double_starred_kvpair _loop0_178"));
     }
     _res = NULL;
   done:
@@ -31772,9 +31829,9 @@ _gather_176_rule(Parser *p)
     return _res;
 }
 
-// _tmp_178: '}' | ','
+// _tmp_179: '}' | ','
 static void *
-_tmp_178_rule(Parser *p)
+_tmp_179_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31788,18 +31845,18 @@ _tmp_178_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_178[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'}'"));
+        D(fprintf(stderr, "%*c> _tmp_179[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'}'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 26))  // token='}'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_178[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'}'"));
+            D(fprintf(stderr, "%*c+ _tmp_179[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'}'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_178[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_179[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'}'"));
     }
     { // ','
@@ -31807,18 +31864,18 @@ _tmp_178_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_178[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "','"));
+        D(fprintf(stderr, "%*c> _tmp_179[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "','"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 12))  // token=','
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_178[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "','"));
+            D(fprintf(stderr, "%*c+ _tmp_179[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "','"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_178[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_179[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "','"));
     }
     _res = NULL;
@@ -31827,9 +31884,9 @@ _tmp_178_rule(Parser *p)
     return _res;
 }
 
-// _tmp_179: star_targets '='
+// _tmp_180: star_targets '='
 static void *
-_tmp_179_rule(Parser *p)
+_tmp_180_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31843,7 +31900,7 @@ _tmp_179_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_179[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "star_targets '='"));
+        D(fprintf(stderr, "%*c> _tmp_180[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "star_targets '='"));
         Token * _literal;
         expr_ty z;
         if (
@@ -31852,7 +31909,7 @@ _tmp_179_rule(Parser *p)
             (_literal = _PyPegen_expect_token(p, 22))  // token='='
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_179[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "star_targets '='"));
+            D(fprintf(stderr, "%*c+ _tmp_180[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "star_targets '='"));
             _res = z;
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
@@ -31862,7 +31919,7 @@ _tmp_179_rule(Parser *p)
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_179[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_180[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "star_targets '='"));
     }
     _res = NULL;
@@ -31871,9 +31928,9 @@ _tmp_179_rule(Parser *p)
     return _res;
 }
 
-// _tmp_180: '.' | '...'
+// _tmp_181: '.' | '...'
 static void *
-_tmp_180_rule(Parser *p)
+_tmp_181_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31887,18 +31944,18 @@ _tmp_180_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_180[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'.'"));
+        D(fprintf(stderr, "%*c> _tmp_181[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'.'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 23))  // token='.'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_180[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'.'"));
+            D(fprintf(stderr, "%*c+ _tmp_181[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'.'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_180[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_181[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'.'"));
     }
     { // '...'
@@ -31906,18 +31963,18 @@ _tmp_180_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_180[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'...'"));
+        D(fprintf(stderr, "%*c> _tmp_181[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'...'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 52))  // token='...'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_180[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'...'"));
+            D(fprintf(stderr, "%*c+ _tmp_181[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'...'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_180[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_181[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'...'"));
     }
     _res = NULL;
@@ -31926,9 +31983,9 @@ _tmp_180_rule(Parser *p)
     return _res;
 }
 
-// _tmp_181: '.' | '...'
+// _tmp_182: '.' | '...'
 static void *
-_tmp_181_rule(Parser *p)
+_tmp_182_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31942,18 +31999,18 @@ _tmp_181_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_181[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'.'"));
+        D(fprintf(stderr, "%*c> _tmp_182[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'.'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 23))  // token='.'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_181[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'.'"));
+            D(fprintf(stderr, "%*c+ _tmp_182[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'.'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_181[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_182[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'.'"));
     }
     { // '...'
@@ -31961,18 +32018,18 @@ _tmp_181_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_181[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'...'"));
+        D(fprintf(stderr, "%*c> _tmp_182[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'...'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 52))  // token='...'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_181[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'...'"));
+            D(fprintf(stderr, "%*c+ _tmp_182[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'...'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_181[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_182[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'...'"));
     }
     _res = NULL;
@@ -31981,9 +32038,9 @@ _tmp_181_rule(Parser *p)
     return _res;
 }
 
-// _tmp_182: '@' named_expression NEWLINE
+// _tmp_183: '@' named_expression NEWLINE
 static void *
-_tmp_182_rule(Parser *p)
+_tmp_183_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31997,7 +32054,7 @@ _tmp_182_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_182[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'@' named_expression NEWLINE"));
+        D(fprintf(stderr, "%*c> _tmp_183[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'@' named_expression NEWLINE"));
         Token * _literal;
         expr_ty f;
         Token * newline_var;
@@ -32009,7 +32066,7 @@ _tmp_182_rule(Parser *p)
             (newline_var = _PyPegen_expect_token(p, NEWLINE))  // token='NEWLINE'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_182[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'@' named_expression NEWLINE"));
+            D(fprintf(stderr, "%*c+ _tmp_183[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'@' named_expression NEWLINE"));
             _res = f;
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
@@ -32019,7 +32076,7 @@ _tmp_182_rule(Parser *p)
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_182[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_183[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'@' named_expression NEWLINE"));
     }
     _res = NULL;
@@ -32028,9 +32085,9 @@ _tmp_182_rule(Parser *p)
     return _res;
 }
 
-// _tmp_183: ',' expression
+// _tmp_184: ',' expression
 static void *
-_tmp_183_rule(Parser *p)
+_tmp_184_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32044,7 +32101,7 @@ _tmp_183_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_183[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' expression"));
+        D(fprintf(stderr, "%*c> _tmp_184[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' expression"));
         Token * _literal;
         expr_ty c;
         if (
@@ -32053,7 +32110,7 @@ _tmp_183_rule(Parser *p)
             (c = expression_rule(p))  // expression
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_183[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "',' expression"));
+            D(fprintf(stderr, "%*c+ _tmp_184[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "',' expression"));
             _res = c;
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
@@ -32063,7 +32120,7 @@ _tmp_183_rule(Parser *p)
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_183[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_184[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "',' expression"));
     }
     _res = NULL;
@@ -32072,9 +32129,9 @@ _tmp_183_rule(Parser *p)
     return _res;
 }
 
-// _tmp_184: ',' star_expression
+// _tmp_185: ',' star_expression
 static void *
-_tmp_184_rule(Parser *p)
+_tmp_185_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32088,7 +32145,7 @@ _tmp_184_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_184[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' star_expression"));
+        D(fprintf(stderr, "%*c> _tmp_185[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' star_expression"));
         Token * _literal;
         expr_ty c;
         if (
@@ -32097,7 +32154,7 @@ _tmp_184_rule(Parser *p)
             (c = star_expression_rule(p))  // star_expression
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_184[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "',' star_expression"));
+            D(fprintf(stderr, "%*c+ _tmp_185[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "',' star_expression"));
             _res = c;
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
@@ -32107,7 +32164,7 @@ _tmp_184_rule(Parser *p)
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_184[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_185[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "',' star_expression"));
     }
     _res = NULL;
@@ -32116,9 +32173,9 @@ _tmp_184_rule(Parser *p)
     return _res;
 }
 
-// _tmp_185: 'or' conjunction
+// _tmp_186: 'or' conjunction
 static void *
-_tmp_185_rule(Parser *p)
+_tmp_186_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32132,7 +32189,7 @@ _tmp_185_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_185[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'or' conjunction"));
+        D(fprintf(stderr, "%*c> _tmp_186[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'or' conjunction"));
         Token * _keyword;
         expr_ty c;
         if (
@@ -32141,7 +32198,7 @@ _tmp_185_rule(Parser *p)
             (c = conjunction_rule(p))  // conjunction
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_185[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'or' conjunction"));
+            D(fprintf(stderr, "%*c+ _tmp_186[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'or' conjunction"));
             _res = c;
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
@@ -32151,7 +32208,7 @@ _tmp_185_rule(Parser *p)
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_185[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_186[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'or' conjunction"));
     }
     _res = NULL;
@@ -32160,9 +32217,9 @@ _tmp_185_rule(Parser *p)
     return _res;
 }
 
-// _tmp_186: 'and' inversion
+// _tmp_187: 'and' inversion
 static void *
-_tmp_186_rule(Parser *p)
+_tmp_187_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32176,7 +32233,7 @@ _tmp_186_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_186[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'and' inversion"));
+        D(fprintf(stderr, "%*c> _tmp_187[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'and' inversion"));
         Token * _keyword;
         expr_ty c;
         if (
@@ -32185,7 +32242,7 @@ _tmp_186_rule(Parser *p)
             (c = inversion_rule(p))  // inversion
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_186[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'and' inversion"));
+            D(fprintf(stderr, "%*c+ _tmp_187[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'and' inversion"));
             _res = c;
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
@@ -32195,7 +32252,7 @@ _tmp_186_rule(Parser *p)
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_186[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_187[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'and' inversion"));
     }
     _res = NULL;
@@ -32204,9 +32261,9 @@ _tmp_186_rule(Parser *p)
     return _res;
 }
 
-// _tmp_187: 'if' disjunction
+// _tmp_188: 'if' disjunction
 static void *
-_tmp_187_rule(Parser *p)
+_tmp_188_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32220,7 +32277,7 @@ _tmp_187_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_187[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'if' disjunction"));
+        D(fprintf(stderr, "%*c> _tmp_188[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'if' disjunction"));
         Token * _keyword;
         expr_ty z;
         if (
@@ -32229,7 +32286,7 @@ _tmp_187_rule(Parser *p)
             (z = disjunction_rule(p))  // disjunction
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_187[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'if' disjunction"));
+            D(fprintf(stderr, "%*c+ _tmp_188[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'if' disjunction"));
             _res = z;
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
@@ -32239,7 +32296,7 @@ _tmp_187_rule(Parser *p)
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_187[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_188[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'if' disjunction"));
     }
     _res = NULL;
@@ -32248,9 +32305,9 @@ _tmp_187_rule(Parser *p)
     return _res;
 }
 
-// _tmp_188: 'if' disjunction
+// _tmp_189: 'if' disjunction
 static void *
-_tmp_188_rule(Parser *p)
+_tmp_189_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32264,7 +32321,7 @@ _tmp_188_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_188[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'if' disjunction"));
+        D(fprintf(stderr, "%*c> _tmp_189[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'if' disjunction"));
         Token * _keyword;
         expr_ty z;
         if (
@@ -32273,7 +32330,7 @@ _tmp_188_rule(Parser *p)
             (z = disjunction_rule(p))  // disjunction
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_188[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'if' disjunction"));
+            D(fprintf(stderr, "%*c+ _tmp_189[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'if' disjunction"));
             _res = z;
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
@@ -32283,7 +32340,7 @@ _tmp_188_rule(Parser *p)
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_188[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_189[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'if' disjunction"));
     }
     _res = NULL;
@@ -32292,9 +32349,9 @@ _tmp_188_rule(Parser *p)
     return _res;
 }
 
-// _tmp_189: starred_expression | (assigment_expression | expression !':=') !'='
+// _tmp_190: starred_expression | (assigment_expression | expression !':=') !'='
 static void *
-_tmp_189_rule(Parser *p)
+_tmp_190_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32308,18 +32365,18 @@ _tmp_189_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_189[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "starred_expression"));
+        D(fprintf(stderr, "%*c> _tmp_190[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "starred_expression"));
         expr_ty starred_expression_var;
         if (
             (starred_expression_var = starred_expression_rule(p))  // starred_expression
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_189[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "starred_expression"));
+            D(fprintf(stderr, "%*c+ _tmp_190[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "starred_expression"));
             _res = starred_expression_var;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_189[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_190[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "starred_expression"));
     }
     { // (assigment_expression | expression !':=') !'='
@@ -32327,20 +32384,20 @@ _tmp_189_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_189[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(assigment_expression | expression !':=') !'='"));
-        void *_tmp_200_var;
+        D(fprintf(stderr, "%*c> _tmp_190[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(assigment_expression | expression !':=') !'='"));
+        void *_tmp_201_var;
         if (
-            (_tmp_200_var = _tmp_200_rule(p))  // assigment_expression | expression !':='
+            (_tmp_201_var = _tmp_201_rule(p))  // assigment_expression | expression !':='
             &&
             _PyPegen_lookahead_with_int(0, _PyPegen_expect_token, p, 22)  // token='='
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_189[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "(assigment_expression | expression !':=') !'='"));
-            _res = _tmp_200_var;
+            D(fprintf(stderr, "%*c+ _tmp_190[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "(assigment_expression | expression !':=') !'='"));
+            _res = _tmp_201_var;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_189[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_190[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "(assigment_expression | expression !':=') !'='"));
     }
     _res = NULL;
@@ -32349,9 +32406,9 @@ _tmp_189_rule(Parser *p)
     return _res;
 }
 
-// _tmp_190: ',' star_target
+// _tmp_191: ',' star_target
 static void *
-_tmp_190_rule(Parser *p)
+_tmp_191_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32365,7 +32422,7 @@ _tmp_190_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_190[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' star_target"));
+        D(fprintf(stderr, "%*c> _tmp_191[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' star_target"));
         Token * _literal;
         expr_ty c;
         if (
@@ -32374,7 +32431,7 @@ _tmp_190_rule(Parser *p)
             (c = star_target_rule(p))  // star_target
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_190[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "',' star_target"));
+            D(fprintf(stderr, "%*c+ _tmp_191[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "',' star_target"));
             _res = c;
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
@@ -32384,7 +32441,7 @@ _tmp_190_rule(Parser *p)
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_190[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_191[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "',' star_target"));
     }
     _res = NULL;
@@ -32393,9 +32450,9 @@ _tmp_190_rule(Parser *p)
     return _res;
 }
 
-// _tmp_191: ',' star_target
+// _tmp_192: ',' star_target
 static void *
-_tmp_191_rule(Parser *p)
+_tmp_192_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32409,7 +32466,7 @@ _tmp_191_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_191[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' star_target"));
+        D(fprintf(stderr, "%*c> _tmp_192[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' star_target"));
         Token * _literal;
         expr_ty c;
         if (
@@ -32418,7 +32475,7 @@ _tmp_191_rule(Parser *p)
             (c = star_target_rule(p))  // star_target
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_191[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "',' star_target"));
+            D(fprintf(stderr, "%*c+ _tmp_192[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "',' star_target"));
             _res = c;
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
@@ -32428,7 +32485,7 @@ _tmp_191_rule(Parser *p)
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_191[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_192[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "',' star_target"));
     }
     _res = NULL;
@@ -32437,9 +32494,9 @@ _tmp_191_rule(Parser *p)
     return _res;
 }
 
-// _tmp_192: star_targets '='
+// _tmp_193: star_targets '='
 static void *
-_tmp_192_rule(Parser *p)
+_tmp_193_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32453,7 +32510,7 @@ _tmp_192_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_192[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "star_targets '='"));
+        D(fprintf(stderr, "%*c> _tmp_193[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "star_targets '='"));
         Token * _literal;
         expr_ty star_targets_var;
         if (
@@ -32462,12 +32519,12 @@ _tmp_192_rule(Parser *p)
             (_literal = _PyPegen_expect_token(p, 22))  // token='='
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_192[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "star_targets '='"));
+            D(fprintf(stderr, "%*c+ _tmp_193[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "star_targets '='"));
             _res = _PyPegen_dummy_name(p, star_targets_var, _literal);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_192[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_193[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "star_targets '='"));
     }
     _res = NULL;
@@ -32476,9 +32533,9 @@ _tmp_192_rule(Parser *p)
     return _res;
 }
 
-// _tmp_193: star_targets '='
+// _tmp_194: star_targets '='
 static void *
-_tmp_193_rule(Parser *p)
+_tmp_194_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32492,7 +32549,7 @@ _tmp_193_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_193[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "star_targets '='"));
+        D(fprintf(stderr, "%*c> _tmp_194[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "star_targets '='"));
         Token * _literal;
         expr_ty star_targets_var;
         if (
@@ -32501,12 +32558,12 @@ _tmp_193_rule(Parser *p)
             (_literal = _PyPegen_expect_token(p, 22))  // token='='
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_193[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "star_targets '='"));
+            D(fprintf(stderr, "%*c+ _tmp_194[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "star_targets '='"));
             _res = _PyPegen_dummy_name(p, star_targets_var, _literal);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_193[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_194[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "star_targets '='"));
     }
     _res = NULL;
@@ -32515,9 +32572,9 @@ _tmp_193_rule(Parser *p)
     return _res;
 }
 
-// _tmp_194: ')' | '**'
+// _tmp_195: ')' | '**'
 static void *
-_tmp_194_rule(Parser *p)
+_tmp_195_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32531,18 +32588,18 @@ _tmp_194_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_194[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "')'"));
+        D(fprintf(stderr, "%*c> _tmp_195[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "')'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 8))  // token=')'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_194[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "')'"));
+            D(fprintf(stderr, "%*c+ _tmp_195[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "')'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_194[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_195[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "')'"));
     }
     { // '**'
@@ -32550,18 +32607,18 @@ _tmp_194_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_194[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'**'"));
+        D(fprintf(stderr, "%*c> _tmp_195[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'**'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 35))  // token='**'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_194[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'**'"));
+            D(fprintf(stderr, "%*c+ _tmp_195[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'**'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_194[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_195[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'**'"));
     }
     _res = NULL;
@@ -32570,9 +32627,9 @@ _tmp_194_rule(Parser *p)
     return _res;
 }
 
-// _tmp_195: ':' | '**'
+// _tmp_196: ':' | '**'
 static void *
-_tmp_195_rule(Parser *p)
+_tmp_196_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32586,18 +32643,18 @@ _tmp_195_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_195[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "':'"));
+        D(fprintf(stderr, "%*c> _tmp_196[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "':'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 11))  // token=':'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_195[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "':'"));
+            D(fprintf(stderr, "%*c+ _tmp_196[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "':'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_195[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_196[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "':'"));
     }
     { // '**'
@@ -32605,18 +32662,18 @@ _tmp_195_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_195[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'**'"));
+        D(fprintf(stderr, "%*c> _tmp_196[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'**'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 35))  // token='**'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_195[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'**'"));
+            D(fprintf(stderr, "%*c+ _tmp_196[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'**'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_195[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_196[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'**'"));
     }
     _res = NULL;
@@ -32625,9 +32682,9 @@ _tmp_195_rule(Parser *p)
     return _res;
 }
 
-// _tmp_196: expression ['as' star_target]
+// _tmp_197: expression ['as' star_target]
 static void *
-_tmp_196_rule(Parser *p)
+_tmp_197_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32641,22 +32698,22 @@ _tmp_196_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_196[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "expression ['as' star_target]"));
+        D(fprintf(stderr, "%*c> _tmp_197[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "expression ['as' star_target]"));
         void *_opt_var;
         UNUSED(_opt_var); // Silence compiler warnings
         expr_ty expression_var;
         if (
             (expression_var = expression_rule(p))  // expression
             &&
-            (_opt_var = _tmp_201_rule(p), 1)  // ['as' star_target]
+            (_opt_var = _tmp_202_rule(p), 1)  // ['as' star_target]
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_196[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "expression ['as' star_target]"));
+            D(fprintf(stderr, "%*c+ _tmp_197[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "expression ['as' star_target]"));
             _res = _PyPegen_dummy_name(p, expression_var, _opt_var);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_196[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_197[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "expression ['as' star_target]"));
     }
     _res = NULL;
@@ -32665,9 +32722,9 @@ _tmp_196_rule(Parser *p)
     return _res;
 }
 
-// _tmp_197: expressions ['as' star_target]
+// _tmp_198: expressions ['as' star_target]
 static void *
-_tmp_197_rule(Parser *p)
+_tmp_198_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32681,22 +32738,22 @@ _tmp_197_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_197[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "expressions ['as' star_target]"));
+        D(fprintf(stderr, "%*c> _tmp_198[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "expressions ['as' star_target]"));
         void *_opt_var;
         UNUSED(_opt_var); // Silence compiler warnings
         expr_ty expressions_var;
         if (
             (expressions_var = expressions_rule(p))  // expressions
             &&
-            (_opt_var = _tmp_202_rule(p), 1)  // ['as' star_target]
+            (_opt_var = _tmp_203_rule(p), 1)  // ['as' star_target]
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_197[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "expressions ['as' star_target]"));
+            D(fprintf(stderr, "%*c+ _tmp_198[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "expressions ['as' star_target]"));
             _res = _PyPegen_dummy_name(p, expressions_var, _opt_var);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_197[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_198[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "expressions ['as' star_target]"));
     }
     _res = NULL;
@@ -32705,9 +32762,9 @@ _tmp_197_rule(Parser *p)
     return _res;
 }
 
-// _tmp_198: expression ['as' star_target]
+// _tmp_199: expression ['as' star_target]
 static void *
-_tmp_198_rule(Parser *p)
+_tmp_199_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32721,22 +32778,22 @@ _tmp_198_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_198[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "expression ['as' star_target]"));
+        D(fprintf(stderr, "%*c> _tmp_199[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "expression ['as' star_target]"));
         void *_opt_var;
         UNUSED(_opt_var); // Silence compiler warnings
         expr_ty expression_var;
         if (
             (expression_var = expression_rule(p))  // expression
             &&
-            (_opt_var = _tmp_203_rule(p), 1)  // ['as' star_target]
+            (_opt_var = _tmp_204_rule(p), 1)  // ['as' star_target]
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_198[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "expression ['as' star_target]"));
+            D(fprintf(stderr, "%*c+ _tmp_199[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "expression ['as' star_target]"));
             _res = _PyPegen_dummy_name(p, expression_var, _opt_var);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_198[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_199[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "expression ['as' star_target]"));
     }
     _res = NULL;
@@ -32745,9 +32802,9 @@ _tmp_198_rule(Parser *p)
     return _res;
 }
 
-// _tmp_199: expressions ['as' star_target]
+// _tmp_200: expressions ['as' star_target]
 static void *
-_tmp_199_rule(Parser *p)
+_tmp_200_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32761,22 +32818,22 @@ _tmp_199_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_199[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "expressions ['as' star_target]"));
+        D(fprintf(stderr, "%*c> _tmp_200[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "expressions ['as' star_target]"));
         void *_opt_var;
         UNUSED(_opt_var); // Silence compiler warnings
         expr_ty expressions_var;
         if (
             (expressions_var = expressions_rule(p))  // expressions
             &&
-            (_opt_var = _tmp_204_rule(p), 1)  // ['as' star_target]
+            (_opt_var = _tmp_205_rule(p), 1)  // ['as' star_target]
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_199[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "expressions ['as' star_target]"));
+            D(fprintf(stderr, "%*c+ _tmp_200[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "expressions ['as' star_target]"));
             _res = _PyPegen_dummy_name(p, expressions_var, _opt_var);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_199[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_200[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "expressions ['as' star_target]"));
     }
     _res = NULL;
@@ -32785,9 +32842,9 @@ _tmp_199_rule(Parser *p)
     return _res;
 }
 
-// _tmp_200: assigment_expression | expression !':='
+// _tmp_201: assigment_expression | expression !':='
 static void *
-_tmp_200_rule(Parser *p)
+_tmp_201_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32801,18 +32858,18 @@ _tmp_200_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_200[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "assigment_expression"));
+        D(fprintf(stderr, "%*c> _tmp_201[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "assigment_expression"));
         expr_ty assigment_expression_var;
         if (
             (assigment_expression_var = assigment_expression_rule(p))  // assigment_expression
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_200[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "assigment_expression"));
+            D(fprintf(stderr, "%*c+ _tmp_201[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "assigment_expression"));
             _res = assigment_expression_var;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_200[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_201[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "assigment_expression"));
     }
     { // expression !':='
@@ -32820,7 +32877,7 @@ _tmp_200_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_200[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "expression !':='"));
+        D(fprintf(stderr, "%*c> _tmp_201[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "expression !':='"));
         expr_ty expression_var;
         if (
             (expression_var = expression_rule(p))  // expression
@@ -32828,12 +32885,12 @@ _tmp_200_rule(Parser *p)
             _PyPegen_lookahead_with_int(0, _PyPegen_expect_token, p, 53)  // token=':='
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_200[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "expression !':='"));
+            D(fprintf(stderr, "%*c+ _tmp_201[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "expression !':='"));
             _res = expression_var;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_200[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_201[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "expression !':='"));
     }
     _res = NULL;
@@ -32842,9 +32899,9 @@ _tmp_200_rule(Parser *p)
     return _res;
 }
 
-// _tmp_201: 'as' star_target
+// _tmp_202: 'as' star_target
 static void *
-_tmp_201_rule(Parser *p)
+_tmp_202_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32858,7 +32915,7 @@ _tmp_201_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_201[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
+        D(fprintf(stderr, "%*c> _tmp_202[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
         Token * _keyword;
         expr_ty star_target_var;
         if (
@@ -32867,12 +32924,12 @@ _tmp_201_rule(Parser *p)
             (star_target_var = star_target_rule(p))  // star_target
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_201[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
+            D(fprintf(stderr, "%*c+ _tmp_202[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
             _res = _PyPegen_dummy_name(p, _keyword, star_target_var);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_201[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_202[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'as' star_target"));
     }
     _res = NULL;
@@ -32881,9 +32938,9 @@ _tmp_201_rule(Parser *p)
     return _res;
 }
 
-// _tmp_202: 'as' star_target
+// _tmp_203: 'as' star_target
 static void *
-_tmp_202_rule(Parser *p)
+_tmp_203_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32897,7 +32954,7 @@ _tmp_202_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_202[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
+        D(fprintf(stderr, "%*c> _tmp_203[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
         Token * _keyword;
         expr_ty star_target_var;
         if (
@@ -32906,12 +32963,12 @@ _tmp_202_rule(Parser *p)
             (star_target_var = star_target_rule(p))  // star_target
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_202[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
+            D(fprintf(stderr, "%*c+ _tmp_203[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
             _res = _PyPegen_dummy_name(p, _keyword, star_target_var);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_202[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_203[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'as' star_target"));
     }
     _res = NULL;
@@ -32920,9 +32977,9 @@ _tmp_202_rule(Parser *p)
     return _res;
 }
 
-// _tmp_203: 'as' star_target
+// _tmp_204: 'as' star_target
 static void *
-_tmp_203_rule(Parser *p)
+_tmp_204_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32936,7 +32993,7 @@ _tmp_203_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_203[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
+        D(fprintf(stderr, "%*c> _tmp_204[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
         Token * _keyword;
         expr_ty star_target_var;
         if (
@@ -32945,12 +33002,12 @@ _tmp_203_rule(Parser *p)
             (star_target_var = star_target_rule(p))  // star_target
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_203[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
+            D(fprintf(stderr, "%*c+ _tmp_204[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
             _res = _PyPegen_dummy_name(p, _keyword, star_target_var);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_203[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_204[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'as' star_target"));
     }
     _res = NULL;
@@ -32959,9 +33016,9 @@ _tmp_203_rule(Parser *p)
     return _res;
 }
 
-// _tmp_204: 'as' star_target
+// _tmp_205: 'as' star_target
 static void *
-_tmp_204_rule(Parser *p)
+_tmp_205_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32975,7 +33032,7 @@ _tmp_204_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_204[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
+        D(fprintf(stderr, "%*c> _tmp_205[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
         Token * _keyword;
         expr_ty star_target_var;
         if (
@@ -32984,12 +33041,12 @@ _tmp_204_rule(Parser *p)
             (star_target_var = star_target_rule(p))  // star_target
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_204[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
+            D(fprintf(stderr, "%*c+ _tmp_205[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
             _res = _PyPegen_dummy_name(p, _keyword, star_target_var);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_204[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_205[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'as' star_target"));
     }
     _res = NULL;


From webhook-mailer at python.org  Thu Aug  5 14:00:31 2021
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 05 Aug 2021 18:00:31 -0000
Subject: [Python-checkins] [3.10] bpo-44838: Refine the custom syntax errors
 for invalid 'if' expressions (GH-27615). (GH-27616)
Message-ID: <mailman.908.1628186433.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/b1bd16c2528295b8b28395827f6b589dccea0624
commit: b1bd16c2528295b8b28395827f6b589dccea0624
branch: 3.10
author: Pablo Galindo Salgado <Pablogsal at gmail.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-05T11:00:19-07:00
summary:

[3.10] bpo-44838: Refine the custom syntax errors for invalid 'if' expressions (GH-27615). (GH-27616)



?

(cherry picked from commit f5cbea6b1b5fc39cca377c6cc93f222916015fc4)

Co-authored-by: Pablo Galindo Salgado <Pablogsal at gmail.com>

Automerge-Triggered-By: GH:lysnikolaou

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-05-17-42-03.bpo-44838.r_Lkj_.rst
M Grammar/python.gram
M Lib/test/test_syntax.py
M Parser/parser.c

diff --git a/Grammar/python.gram b/Grammar/python.gram
index 3e7475a3fa6f4..decc57807867b 100644
--- a/Grammar/python.gram
+++ b/Grammar/python.gram
@@ -859,7 +859,7 @@ invalid_expression:
     # Soft keywords need to also be ignored because they can be parsed as NAME NAME
    | !(NAME STRING | SOFT_KEYWORD) a=disjunction b=expression_without_invalid {
         RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "invalid syntax. Perhaps you forgot a comma?") }
-   | a=disjunction 'if' b=disjunction !'else' { RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "expected 'else' after 'if' expression") }
+   | a=disjunction 'if' b=disjunction !('else'|':') { RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "expected 'else' after 'if' expression") }
 
 invalid_named_expression:
     | a=expression ':=' expression {
diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
index d5a52ba628a81..c77aafeb36361 100644
--- a/Lib/test/test_syntax.py
+++ b/Lib/test/test_syntax.py
@@ -152,6 +152,14 @@
 Traceback (most recent call last):
 SyntaxError: expected 'else' after 'if' expression
 
+>>> if True:
+...     print("Hello"
+...
+... if 2:
+...    print(123))
+Traceback (most recent call last):
+SyntaxError: invalid syntax
+
 >>> True = True = 3
 Traceback (most recent call last):
 SyntaxError: cannot assign to True
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-05-17-42-03.bpo-44838.r_Lkj_.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-05-17-42-03.bpo-44838.r_Lkj_.rst
new file mode 100644
index 0000000000000..a542a5d70933a
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-05-17-42-03.bpo-44838.r_Lkj_.rst	
@@ -0,0 +1,2 @@
+Fixed a bug that was causing the parser to raise an incorrect custom
+:exc:`SyntaxError` for invalid 'if' expressions. Patch by Pablo Galindo.
diff --git a/Parser/parser.c b/Parser/parser.c
index b37e3d6855ce9..acaa7b0e8db3f 100644
--- a/Parser/parser.c
+++ b/Parser/parser.c
@@ -439,38 +439,38 @@ static char *soft_keywords[] = {
 #define _tmp_144_type 1365
 #define _tmp_145_type 1366
 #define _tmp_146_type 1367
-#define _loop0_147_type 1368
+#define _tmp_147_type 1368
 #define _loop0_148_type 1369
 #define _loop0_149_type 1370
-#define _tmp_150_type 1371
+#define _loop0_150_type 1371
 #define _tmp_151_type 1372
 #define _tmp_152_type 1373
 #define _tmp_153_type 1374
-#define _loop0_154_type 1375
-#define _loop1_155_type 1376
-#define _loop0_156_type 1377
-#define _loop1_157_type 1378
-#define _tmp_158_type 1379
+#define _tmp_154_type 1375
+#define _loop0_155_type 1376
+#define _loop1_156_type 1377
+#define _loop0_157_type 1378
+#define _loop1_158_type 1379
 #define _tmp_159_type 1380
 #define _tmp_160_type 1381
-#define _loop0_162_type 1382
-#define _gather_161_type 1383
-#define _loop0_164_type 1384
-#define _gather_163_type 1385
-#define _loop0_166_type 1386
-#define _gather_165_type 1387
-#define _loop0_168_type 1388
-#define _gather_167_type 1389
-#define _tmp_169_type 1390
+#define _tmp_161_type 1382
+#define _loop0_163_type 1383
+#define _gather_162_type 1384
+#define _loop0_165_type 1385
+#define _gather_164_type 1386
+#define _loop0_167_type 1387
+#define _gather_166_type 1388
+#define _loop0_169_type 1389
+#define _gather_168_type 1390
 #define _tmp_170_type 1391
 #define _tmp_171_type 1392
 #define _tmp_172_type 1393
 #define _tmp_173_type 1394
 #define _tmp_174_type 1395
 #define _tmp_175_type 1396
-#define _loop0_177_type 1397
-#define _gather_176_type 1398
-#define _tmp_178_type 1399
+#define _tmp_176_type 1397
+#define _loop0_178_type 1398
+#define _gather_177_type 1399
 #define _tmp_179_type 1400
 #define _tmp_180_type 1401
 #define _tmp_181_type 1402
@@ -497,6 +497,7 @@ static char *soft_keywords[] = {
 #define _tmp_202_type 1423
 #define _tmp_203_type 1424
 #define _tmp_204_type 1425
+#define _tmp_205_type 1426
 
 static mod_ty file_rule(Parser *p);
 static mod_ty interactive_rule(Parser *p);
@@ -866,38 +867,38 @@ static void *_tmp_143_rule(Parser *p);
 static void *_tmp_144_rule(Parser *p);
 static void *_tmp_145_rule(Parser *p);
 static void *_tmp_146_rule(Parser *p);
-static asdl_seq *_loop0_147_rule(Parser *p);
+static void *_tmp_147_rule(Parser *p);
 static asdl_seq *_loop0_148_rule(Parser *p);
 static asdl_seq *_loop0_149_rule(Parser *p);
-static void *_tmp_150_rule(Parser *p);
+static asdl_seq *_loop0_150_rule(Parser *p);
 static void *_tmp_151_rule(Parser *p);
 static void *_tmp_152_rule(Parser *p);
 static void *_tmp_153_rule(Parser *p);
-static asdl_seq *_loop0_154_rule(Parser *p);
-static asdl_seq *_loop1_155_rule(Parser *p);
-static asdl_seq *_loop0_156_rule(Parser *p);
-static asdl_seq *_loop1_157_rule(Parser *p);
-static void *_tmp_158_rule(Parser *p);
+static void *_tmp_154_rule(Parser *p);
+static asdl_seq *_loop0_155_rule(Parser *p);
+static asdl_seq *_loop1_156_rule(Parser *p);
+static asdl_seq *_loop0_157_rule(Parser *p);
+static asdl_seq *_loop1_158_rule(Parser *p);
 static void *_tmp_159_rule(Parser *p);
 static void *_tmp_160_rule(Parser *p);
-static asdl_seq *_loop0_162_rule(Parser *p);
-static asdl_seq *_gather_161_rule(Parser *p);
-static asdl_seq *_loop0_164_rule(Parser *p);
-static asdl_seq *_gather_163_rule(Parser *p);
-static asdl_seq *_loop0_166_rule(Parser *p);
-static asdl_seq *_gather_165_rule(Parser *p);
-static asdl_seq *_loop0_168_rule(Parser *p);
-static asdl_seq *_gather_167_rule(Parser *p);
-static void *_tmp_169_rule(Parser *p);
+static void *_tmp_161_rule(Parser *p);
+static asdl_seq *_loop0_163_rule(Parser *p);
+static asdl_seq *_gather_162_rule(Parser *p);
+static asdl_seq *_loop0_165_rule(Parser *p);
+static asdl_seq *_gather_164_rule(Parser *p);
+static asdl_seq *_loop0_167_rule(Parser *p);
+static asdl_seq *_gather_166_rule(Parser *p);
+static asdl_seq *_loop0_169_rule(Parser *p);
+static asdl_seq *_gather_168_rule(Parser *p);
 static void *_tmp_170_rule(Parser *p);
 static void *_tmp_171_rule(Parser *p);
 static void *_tmp_172_rule(Parser *p);
 static void *_tmp_173_rule(Parser *p);
 static void *_tmp_174_rule(Parser *p);
 static void *_tmp_175_rule(Parser *p);
-static asdl_seq *_loop0_177_rule(Parser *p);
-static asdl_seq *_gather_176_rule(Parser *p);
-static void *_tmp_178_rule(Parser *p);
+static void *_tmp_176_rule(Parser *p);
+static asdl_seq *_loop0_178_rule(Parser *p);
+static asdl_seq *_gather_177_rule(Parser *p);
 static void *_tmp_179_rule(Parser *p);
 static void *_tmp_180_rule(Parser *p);
 static void *_tmp_181_rule(Parser *p);
@@ -924,6 +925,7 @@ static void *_tmp_201_rule(Parser *p);
 static void *_tmp_202_rule(Parser *p);
 static void *_tmp_203_rule(Parser *p);
 static void *_tmp_204_rule(Parser *p);
+static void *_tmp_205_rule(Parser *p);
 
 
 // file: statements? $
@@ -18229,7 +18231,7 @@ invalid_legacy_expression_rule(Parser *p)
 // invalid_expression:
 //     | invalid_legacy_expression
 //     | !(NAME STRING | SOFT_KEYWORD) disjunction expression_without_invalid
-//     | disjunction 'if' disjunction !'else'
+//     | disjunction 'if' disjunction !('else' | ':')
 static void *
 invalid_expression_rule(Parser *p)
 {
@@ -18288,12 +18290,12 @@ invalid_expression_rule(Parser *p)
         D(fprintf(stderr, "%*c%s invalid_expression[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "!(NAME STRING | SOFT_KEYWORD) disjunction expression_without_invalid"));
     }
-    { // disjunction 'if' disjunction !'else'
+    { // disjunction 'if' disjunction !('else' | ':')
         if (p->error_indicator) {
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> invalid_expression[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "disjunction 'if' disjunction !'else'"));
+        D(fprintf(stderr, "%*c> invalid_expression[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "disjunction 'if' disjunction !('else' | ':')"));
         Token * _keyword;
         expr_ty a;
         expr_ty b;
@@ -18304,10 +18306,10 @@ invalid_expression_rule(Parser *p)
             &&
             (b = disjunction_rule(p))  // disjunction
             &&
-            _PyPegen_lookahead_with_int(0, _PyPegen_expect_token, p, 516)  // token='else'
+            _PyPegen_lookahead(0, _tmp_144_rule, p)
         )
         {
-            D(fprintf(stderr, "%*c+ invalid_expression[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "disjunction 'if' disjunction !'else'"));
+            D(fprintf(stderr, "%*c+ invalid_expression[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "disjunction 'if' disjunction !('else' | ':')"));
             _res = RAISE_SYNTAX_ERROR_KNOWN_RANGE ( a , b , "expected 'else' after 'if' expression" );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
@@ -18318,7 +18320,7 @@ invalid_expression_rule(Parser *p)
         }
         p->mark = _mark;
         D(fprintf(stderr, "%*c%s invalid_expression[%d-%d]: %s failed!\n", p->level, ' ',
-                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "disjunction 'if' disjunction !'else'"));
+                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "disjunction 'if' disjunction !('else' | ':')"));
     }
     _res = NULL;
   done:
@@ -18386,7 +18388,7 @@ invalid_named_expression_rule(Parser *p)
             &&
             (b = bitwise_or_rule(p))  // bitwise_or
             &&
-            _PyPegen_lookahead(0, _tmp_144_rule, p)
+            _PyPegen_lookahead(0, _tmp_145_rule, p)
         )
         {
             D(fprintf(stderr, "%*c+ invalid_named_expression[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "NAME '=' bitwise_or !('=' | ':=')"));
@@ -18412,7 +18414,7 @@ invalid_named_expression_rule(Parser *p)
         Token * b;
         expr_ty bitwise_or_var;
         if (
-            _PyPegen_lookahead(0, _tmp_145_rule, p)
+            _PyPegen_lookahead(0, _tmp_146_rule, p)
             &&
             (a = bitwise_or_rule(p))  // bitwise_or
             &&
@@ -18420,7 +18422,7 @@ invalid_named_expression_rule(Parser *p)
             &&
             (bitwise_or_var = bitwise_or_rule(p))  // bitwise_or
             &&
-            _PyPegen_lookahead(0, _tmp_146_rule, p)
+            _PyPegen_lookahead(0, _tmp_147_rule, p)
         )
         {
             D(fprintf(stderr, "%*c+ invalid_named_expression[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "!(list | tuple | genexp | 'True' | 'None' | 'False') bitwise_or '=' bitwise_or !('=' | ':=')"));
@@ -18497,7 +18499,7 @@ invalid_assignment_rule(Parser *p)
         D(fprintf(stderr, "%*c> invalid_assignment[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "star_named_expression ',' star_named_expressions* ':' expression"));
         Token * _literal;
         Token * _literal_1;
-        asdl_seq * _loop0_147_var;
+        asdl_seq * _loop0_148_var;
         expr_ty a;
         expr_ty expression_var;
         if (
@@ -18505,7 +18507,7 @@ invalid_assignment_rule(Parser *p)
             &&
             (_literal = _PyPegen_expect_token(p, 12))  // token=','
             &&
-            (_loop0_147_var = _loop0_147_rule(p))  // star_named_expressions*
+            (_loop0_148_var = _loop0_148_rule(p))  // star_named_expressions*
             &&
             (_literal_1 = _PyPegen_expect_token(p, 11))  // token=':'
             &&
@@ -18562,10 +18564,10 @@ invalid_assignment_rule(Parser *p)
         }
         D(fprintf(stderr, "%*c> invalid_assignment[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "((star_targets '='))* star_expressions '='"));
         Token * _literal;
-        asdl_seq * _loop0_148_var;
+        asdl_seq * _loop0_149_var;
         expr_ty a;
         if (
-            (_loop0_148_var = _loop0_148_rule(p))  // ((star_targets '='))*
+            (_loop0_149_var = _loop0_149_rule(p))  // ((star_targets '='))*
             &&
             (a = star_expressions_rule(p))  // star_expressions
             &&
@@ -18592,10 +18594,10 @@ invalid_assignment_rule(Parser *p)
         }
         D(fprintf(stderr, "%*c> invalid_assignment[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "((star_targets '='))* yield_expr '='"));
         Token * _literal;
-        asdl_seq * _loop0_149_var;
+        asdl_seq * _loop0_150_var;
         expr_ty a;
         if (
-            (_loop0_149_var = _loop0_149_rule(p))  // ((star_targets '='))*
+            (_loop0_150_var = _loop0_150_rule(p))  // ((star_targets '='))*
             &&
             (a = yield_expr_rule(p))  // yield_expr
             &&
@@ -18621,7 +18623,7 @@ invalid_assignment_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> invalid_assignment[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "star_expressions augassign (yield_expr | star_expressions)"));
-        void *_tmp_150_var;
+        void *_tmp_151_var;
         expr_ty a;
         AugOperator* augassign_var;
         if (
@@ -18629,7 +18631,7 @@ invalid_assignment_rule(Parser *p)
             &&
             (augassign_var = augassign_rule(p))  // augassign
             &&
-            (_tmp_150_var = _tmp_150_rule(p))  // yield_expr | star_expressions
+            (_tmp_151_var = _tmp_151_rule(p))  // yield_expr | star_expressions
         )
         {
             D(fprintf(stderr, "%*c+ invalid_assignment[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "star_expressions augassign (yield_expr | star_expressions)"));
@@ -18888,11 +18890,11 @@ invalid_comprehension_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> invalid_comprehension[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "('[' | '(' | '{') starred_expression for_if_clauses"));
-        void *_tmp_151_var;
+        void *_tmp_152_var;
         expr_ty a;
         asdl_comprehension_seq* for_if_clauses_var;
         if (
-            (_tmp_151_var = _tmp_151_rule(p))  // '[' | '(' | '{'
+            (_tmp_152_var = _tmp_152_rule(p))  // '[' | '(' | '{'
             &&
             (a = starred_expression_rule(p))  // starred_expression
             &&
@@ -18919,12 +18921,12 @@ invalid_comprehension_rule(Parser *p)
         }
         D(fprintf(stderr, "%*c> invalid_comprehension[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "('[' | '{') star_named_expression ',' star_named_expressions for_if_clauses"));
         Token * _literal;
-        void *_tmp_152_var;
+        void *_tmp_153_var;
         expr_ty a;
         asdl_expr_seq* b;
         asdl_comprehension_seq* for_if_clauses_var;
         if (
-            (_tmp_152_var = _tmp_152_rule(p))  // '[' | '{'
+            (_tmp_153_var = _tmp_153_rule(p))  // '[' | '{'
             &&
             (a = star_named_expression_rule(p))  // star_named_expression
             &&
@@ -18954,12 +18956,12 @@ invalid_comprehension_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> invalid_comprehension[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "('[' | '{') star_named_expression ',' for_if_clauses"));
-        void *_tmp_153_var;
+        void *_tmp_154_var;
         expr_ty a;
         Token * b;
         asdl_comprehension_seq* for_if_clauses_var;
         if (
-            (_tmp_153_var = _tmp_153_rule(p))  // '[' | '{'
+            (_tmp_154_var = _tmp_154_rule(p))  // '[' | '{'
             &&
             (a = star_named_expression_rule(p))  // star_named_expression
             &&
@@ -19057,11 +19059,11 @@ invalid_parameters_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> invalid_parameters[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "param_no_default* invalid_parameters_helper param_no_default"));
-        asdl_seq * _loop0_154_var;
+        asdl_seq * _loop0_155_var;
         arg_ty a;
         void *invalid_parameters_helper_var;
         if (
-            (_loop0_154_var = _loop0_154_rule(p))  // param_no_default*
+            (_loop0_155_var = _loop0_155_rule(p))  // param_no_default*
             &&
             (invalid_parameters_helper_var = invalid_parameters_helper_rule(p))  // invalid_parameters_helper
             &&
@@ -19128,13 +19130,13 @@ invalid_parameters_helper_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> invalid_parameters_helper[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "param_with_default+"));
-        asdl_seq * _loop1_155_var;
+        asdl_seq * _loop1_156_var;
         if (
-            (_loop1_155_var = _loop1_155_rule(p))  // param_with_default+
+            (_loop1_156_var = _loop1_156_rule(p))  // param_with_default+
         )
         {
             D(fprintf(stderr, "%*c+ invalid_parameters_helper[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "param_with_default+"));
-            _res = _loop1_155_var;
+            _res = _loop1_156_var;
             goto done;
         }
         p->mark = _mark;
@@ -19165,11 +19167,11 @@ invalid_lambda_parameters_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> invalid_lambda_parameters[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "lambda_param_no_default* invalid_lambda_parameters_helper lambda_param_no_default"));
-        asdl_seq * _loop0_156_var;
+        asdl_seq * _loop0_157_var;
         arg_ty a;
         void *invalid_lambda_parameters_helper_var;
         if (
-            (_loop0_156_var = _loop0_156_rule(p))  // lambda_param_no_default*
+            (_loop0_157_var = _loop0_157_rule(p))  // lambda_param_no_default*
             &&
             (invalid_lambda_parameters_helper_var = invalid_lambda_parameters_helper_rule(p))  // invalid_lambda_parameters_helper
             &&
@@ -19238,13 +19240,13 @@ invalid_lambda_parameters_helper_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> invalid_lambda_parameters_helper[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "lambda_param_with_default+"));
-        asdl_seq * _loop1_157_var;
+        asdl_seq * _loop1_158_var;
         if (
-            (_loop1_157_var = _loop1_157_rule(p))  // lambda_param_with_default+
+            (_loop1_158_var = _loop1_158_rule(p))  // lambda_param_with_default+
         )
         {
             D(fprintf(stderr, "%*c+ invalid_lambda_parameters_helper[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "lambda_param_with_default+"));
-            _res = _loop1_157_var;
+            _res = _loop1_158_var;
             goto done;
         }
         p->mark = _mark;
@@ -19274,12 +19276,12 @@ invalid_star_etc_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> invalid_star_etc[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'*' (')' | ',' (')' | '**'))"));
-        void *_tmp_158_var;
+        void *_tmp_159_var;
         Token * a;
         if (
             (a = _PyPegen_expect_token(p, 16))  // token='*'
             &&
-            (_tmp_158_var = _tmp_158_rule(p))  // ')' | ',' (')' | '**')
+            (_tmp_159_var = _tmp_159_rule(p))  // ')' | ',' (')' | '**')
         )
         {
             D(fprintf(stderr, "%*c+ invalid_star_etc[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'*' (')' | ',' (')' | '**'))"));
@@ -19349,11 +19351,11 @@ invalid_lambda_star_etc_rule(Parser *p)
         }
         D(fprintf(stderr, "%*c> invalid_lambda_star_etc[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'*' (':' | ',' (':' | '**'))"));
         Token * _literal;
-        void *_tmp_159_var;
+        void *_tmp_160_var;
         if (
             (_literal = _PyPegen_expect_token(p, 16))  // token='*'
             &&
-            (_tmp_159_var = _tmp_159_rule(p))  // ':' | ',' (':' | '**')
+            (_tmp_160_var = _tmp_160_rule(p))  // ':' | ',' (':' | '**')
         )
         {
             D(fprintf(stderr, "%*c+ invalid_lambda_star_etc[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'*' (':' | ',' (':' | '**'))"));
@@ -19455,7 +19457,7 @@ invalid_with_item_rule(Parser *p)
             &&
             (a = expression_rule(p))  // expression
             &&
-            _PyPegen_lookahead(1, _tmp_160_rule, p)
+            _PyPegen_lookahead(1, _tmp_161_rule, p)
         )
         {
             D(fprintf(stderr, "%*c+ invalid_with_item[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "expression 'as' expression &(',' | ')' | ':')"));
@@ -19668,7 +19670,7 @@ invalid_with_stmt_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> invalid_with_stmt[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "ASYNC? 'with' ','.(expression ['as' star_target])+ &&':'"));
-        asdl_seq * _gather_161_var;
+        asdl_seq * _gather_162_var;
         Token * _keyword;
         Token * _literal;
         void *_opt_var;
@@ -19678,13 +19680,13 @@ invalid_with_stmt_rule(Parser *p)
             &&
             (_keyword = _PyPegen_expect_token(p, 519))  // token='with'
             &&
-            (_gather_161_var = _gather_161_rule(p))  // ','.(expression ['as' star_target])+
+            (_gather_162_var = _gather_162_rule(p))  // ','.(expression ['as' star_target])+
             &&
             (_literal = _PyPegen_expect_forced_token(p, 11, ":"))  // forced_token=':'
         )
         {
             D(fprintf(stderr, "%*c+ invalid_with_stmt[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "ASYNC? 'with' ','.(expression ['as' star_target])+ &&':'"));
-            _res = _PyPegen_dummy_name(p, _opt_var, _keyword, _gather_161_var, _literal);
+            _res = _PyPegen_dummy_name(p, _opt_var, _keyword, _gather_162_var, _literal);
             goto done;
         }
         p->mark = _mark;
@@ -19697,7 +19699,7 @@ invalid_with_stmt_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> invalid_with_stmt[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "ASYNC? 'with' '(' ','.(expressions ['as' star_target])+ ','? ')' &&':'"));
-        asdl_seq * _gather_163_var;
+        asdl_seq * _gather_164_var;
         Token * _keyword;
         Token * _literal;
         Token * _literal_1;
@@ -19713,7 +19715,7 @@ invalid_with_stmt_rule(Parser *p)
             &&
             (_literal = _PyPegen_expect_token(p, 7))  // token='('
             &&
-            (_gather_163_var = _gather_163_rule(p))  // ','.(expressions ['as' star_target])+
+            (_gather_164_var = _gather_164_rule(p))  // ','.(expressions ['as' star_target])+
             &&
             (_opt_var_1 = _PyPegen_expect_token(p, 12), 1)  // ','?
             &&
@@ -19723,7 +19725,7 @@ invalid_with_stmt_rule(Parser *p)
         )
         {
             D(fprintf(stderr, "%*c+ invalid_with_stmt[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "ASYNC? 'with' '(' ','.(expressions ['as' star_target])+ ','? ')' &&':'"));
-            _res = _PyPegen_dummy_name(p, _opt_var, _keyword, _literal, _gather_163_var, _opt_var_1, _literal_1, _literal_2);
+            _res = _PyPegen_dummy_name(p, _opt_var, _keyword, _literal, _gather_164_var, _opt_var_1, _literal_1, _literal_2);
             goto done;
         }
         p->mark = _mark;
@@ -19755,7 +19757,7 @@ invalid_with_stmt_indent_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> invalid_with_stmt_indent[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "ASYNC? 'with' ','.(expression ['as' star_target])+ ':' NEWLINE !INDENT"));
-        asdl_seq * _gather_165_var;
+        asdl_seq * _gather_166_var;
         Token * _literal;
         void *_opt_var;
         UNUSED(_opt_var); // Silence compiler warnings
@@ -19766,7 +19768,7 @@ invalid_with_stmt_indent_rule(Parser *p)
             &&
             (a = _PyPegen_expect_token(p, 519))  // token='with'
             &&
-            (_gather_165_var = _gather_165_rule(p))  // ','.(expression ['as' star_target])+
+            (_gather_166_var = _gather_166_rule(p))  // ','.(expression ['as' star_target])+
             &&
             (_literal = _PyPegen_expect_token(p, 11))  // token=':'
             &&
@@ -19794,7 +19796,7 @@ invalid_with_stmt_indent_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> invalid_with_stmt_indent[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "ASYNC? 'with' '(' ','.(expressions ['as' star_target])+ ','? ')' ':' NEWLINE !INDENT"));
-        asdl_seq * _gather_167_var;
+        asdl_seq * _gather_168_var;
         Token * _literal;
         Token * _literal_1;
         Token * _literal_2;
@@ -19811,7 +19813,7 @@ invalid_with_stmt_indent_rule(Parser *p)
             &&
             (_literal = _PyPegen_expect_token(p, 7))  // token='('
             &&
-            (_gather_167_var = _gather_167_rule(p))  // ','.(expressions ['as' star_target])+
+            (_gather_168_var = _gather_168_rule(p))  // ','.(expressions ['as' star_target])+
             &&
             (_opt_var_1 = _PyPegen_expect_token(p, 12), 1)  // ','?
             &&
@@ -19902,7 +19904,7 @@ invalid_try_stmt_rule(Parser *p)
             &&
             (block_var = block_rule(p))  // block
             &&
-            _PyPegen_lookahead(0, _tmp_169_rule, p)
+            _PyPegen_lookahead(0, _tmp_170_rule, p)
         )
         {
             D(fprintf(stderr, "%*c+ invalid_try_stmt[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'try' ':' block !('except' | 'finally')"));
@@ -19960,7 +19962,7 @@ invalid_except_stmt_rule(Parser *p)
             &&
             (expressions_var = expressions_rule(p))  // expressions
             &&
-            (_opt_var = _tmp_170_rule(p), 1)  // ['as' NAME]
+            (_opt_var = _tmp_171_rule(p), 1)  // ['as' NAME]
             &&
             (_literal_1 = _PyPegen_expect_token(p, 11))  // token=':'
         )
@@ -19994,7 +19996,7 @@ invalid_except_stmt_rule(Parser *p)
             &&
             (expression_var = expression_rule(p))  // expression
             &&
-            (_opt_var = _tmp_171_rule(p), 1)  // ['as' NAME]
+            (_opt_var = _tmp_172_rule(p), 1)  // ['as' NAME]
             &&
             (newline_var = _PyPegen_expect_token(p, NEWLINE))  // token='NEWLINE'
         )
@@ -20124,7 +20126,7 @@ invalid_except_stmt_indent_rule(Parser *p)
             &&
             (expression_var = expression_rule(p))  // expression
             &&
-            (_opt_var = _tmp_172_rule(p), 1)  // ['as' NAME]
+            (_opt_var = _tmp_173_rule(p), 1)  // ['as' NAME]
             &&
             (_literal = _PyPegen_expect_token(p, 11))  // token=':'
             &&
@@ -20508,7 +20510,7 @@ invalid_class_argument_pattern_rule(Parser *p)
         asdl_pattern_seq* a;
         asdl_seq* keyword_patterns_var;
         if (
-            (_opt_var = _tmp_173_rule(p), 1)  // [positional_patterns ',']
+            (_opt_var = _tmp_174_rule(p), 1)  // [positional_patterns ',']
             &&
             (keyword_patterns_var = keyword_patterns_rule(p))  // keyword_patterns
             &&
@@ -20942,7 +20944,7 @@ invalid_def_raw_rule(Parser *p)
             &&
             (_literal_1 = _PyPegen_expect_token(p, 8))  // token=')'
             &&
-            (_opt_var_2 = _tmp_174_rule(p), 1)  // ['->' expression]
+            (_opt_var_2 = _tmp_175_rule(p), 1)  // ['->' expression]
             &&
             (_literal_2 = _PyPegen_expect_token(p, 11))  // token=':'
             &&
@@ -20998,7 +21000,7 @@ invalid_class_def_raw_rule(Parser *p)
             &&
             (name_var = _PyPegen_name_token(p))  // NAME
             &&
-            (_opt_var = _tmp_175_rule(p), 1)  // ['(' arguments? ')']
+            (_opt_var = _tmp_176_rule(p), 1)  // ['(' arguments? ')']
             &&
             (_literal = _PyPegen_expect_token(p, 11))  // token=':'
             &&
@@ -21046,11 +21048,11 @@ invalid_double_starred_kvpairs_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> invalid_double_starred_kvpairs[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "','.double_starred_kvpair+ ',' invalid_kvpair"));
-        asdl_seq * _gather_176_var;
+        asdl_seq * _gather_177_var;
         Token * _literal;
         void *invalid_kvpair_var;
         if (
-            (_gather_176_var = _gather_176_rule(p))  // ','.double_starred_kvpair+
+            (_gather_177_var = _gather_177_rule(p))  // ','.double_starred_kvpair+
             &&
             (_literal = _PyPegen_expect_token(p, 12))  // token=','
             &&
@@ -21058,7 +21060,7 @@ invalid_double_starred_kvpairs_rule(Parser *p)
         )
         {
             D(fprintf(stderr, "%*c+ invalid_double_starred_kvpairs[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "','.double_starred_kvpair+ ',' invalid_kvpair"));
-            _res = _PyPegen_dummy_name(p, _gather_176_var, _literal, invalid_kvpair_var);
+            _res = _PyPegen_dummy_name(p, _gather_177_var, _literal, invalid_kvpair_var);
             goto done;
         }
         p->mark = _mark;
@@ -21111,7 +21113,7 @@ invalid_double_starred_kvpairs_rule(Parser *p)
             &&
             (a = _PyPegen_expect_token(p, 11))  // token=':'
             &&
-            _PyPegen_lookahead(1, _tmp_178_rule, p)
+            _PyPegen_lookahead(1, _tmp_179_rule, p)
         )
         {
             D(fprintf(stderr, "%*c+ invalid_double_starred_kvpairs[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "expression ':' &('}' | ',')"));
@@ -22484,12 +22486,12 @@ _loop1_22_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> _loop1_22[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(star_targets '=')"));
-        void *_tmp_179_var;
+        void *_tmp_180_var;
         while (
-            (_tmp_179_var = _tmp_179_rule(p))  // star_targets '='
+            (_tmp_180_var = _tmp_180_rule(p))  // star_targets '='
         )
         {
-            _res = _tmp_179_var;
+            _res = _tmp_180_var;
             if (_n == _children_capacity) {
                 _children_capacity *= 2;
                 void **_new_children = PyMem_Realloc(_children, _children_capacity*sizeof(void *));
@@ -22992,12 +22994,12 @@ _loop0_31_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> _loop0_31[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "('.' | '...')"));
-        void *_tmp_180_var;
+        void *_tmp_181_var;
         while (
-            (_tmp_180_var = _tmp_180_rule(p))  // '.' | '...'
+            (_tmp_181_var = _tmp_181_rule(p))  // '.' | '...'
         )
         {
-            _res = _tmp_180_var;
+            _res = _tmp_181_var;
             if (_n == _children_capacity) {
                 _children_capacity *= 2;
                 void **_new_children = PyMem_Realloc(_children, _children_capacity*sizeof(void *));
@@ -23058,12 +23060,12 @@ _loop1_32_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> _loop1_32[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "('.' | '...')"));
-        void *_tmp_181_var;
+        void *_tmp_182_var;
         while (
-            (_tmp_181_var = _tmp_181_rule(p))  // '.' | '...'
+            (_tmp_182_var = _tmp_182_rule(p))  // '.' | '...'
         )
         {
-            _res = _tmp_181_var;
+            _res = _tmp_182_var;
             if (_n == _children_capacity) {
                 _children_capacity *= 2;
                 void **_new_children = PyMem_Realloc(_children, _children_capacity*sizeof(void *));
@@ -26174,12 +26176,12 @@ _loop1_84_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> _loop1_84[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "('@' named_expression NEWLINE)"));
-        void *_tmp_182_var;
+        void *_tmp_183_var;
         while (
-            (_tmp_182_var = _tmp_182_rule(p))  // '@' named_expression NEWLINE
+            (_tmp_183_var = _tmp_183_rule(p))  // '@' named_expression NEWLINE
         )
         {
-            _res = _tmp_182_var;
+            _res = _tmp_183_var;
             if (_n == _children_capacity) {
                 _children_capacity *= 2;
                 void **_new_children = PyMem_Realloc(_children, _children_capacity*sizeof(void *));
@@ -26292,12 +26294,12 @@ _loop1_86_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> _loop1_86[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(',' star_expression)"));
-        void *_tmp_183_var;
+        void *_tmp_184_var;
         while (
-            (_tmp_183_var = _tmp_183_rule(p))  // ',' star_expression
+            (_tmp_184_var = _tmp_184_rule(p))  // ',' star_expression
         )
         {
-            _res = _tmp_183_var;
+            _res = _tmp_184_var;
             if (_n == _children_capacity) {
                 _children_capacity *= 2;
                 void **_new_children = PyMem_Realloc(_children, _children_capacity*sizeof(void *));
@@ -26477,12 +26479,12 @@ _loop1_89_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> _loop1_89[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(',' expression)"));
-        void *_tmp_184_var;
+        void *_tmp_185_var;
         while (
-            (_tmp_184_var = _tmp_184_rule(p))  // ',' expression
+            (_tmp_185_var = _tmp_185_rule(p))  // ',' expression
         )
         {
-            _res = _tmp_184_var;
+            _res = _tmp_185_var;
             if (_n == _children_capacity) {
                 _children_capacity *= 2;
                 void **_new_children = PyMem_Realloc(_children, _children_capacity*sizeof(void *));
@@ -27507,12 +27509,12 @@ _loop1_104_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> _loop1_104[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "('or' conjunction)"));
-        void *_tmp_185_var;
+        void *_tmp_186_var;
         while (
-            (_tmp_185_var = _tmp_185_rule(p))  // 'or' conjunction
+            (_tmp_186_var = _tmp_186_rule(p))  // 'or' conjunction
         )
         {
-            _res = _tmp_185_var;
+            _res = _tmp_186_var;
             if (_n == _children_capacity) {
                 _children_capacity *= 2;
                 void **_new_children = PyMem_Realloc(_children, _children_capacity*sizeof(void *));
@@ -27578,12 +27580,12 @@ _loop1_105_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> _loop1_105[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "('and' inversion)"));
-        void *_tmp_186_var;
+        void *_tmp_187_var;
         while (
-            (_tmp_186_var = _tmp_186_rule(p))  // 'and' inversion
+            (_tmp_187_var = _tmp_187_rule(p))  // 'and' inversion
         )
         {
-            _res = _tmp_186_var;
+            _res = _tmp_187_var;
             if (_n == _children_capacity) {
                 _children_capacity *= 2;
                 void **_new_children = PyMem_Realloc(_children, _children_capacity*sizeof(void *));
@@ -28556,12 +28558,12 @@ _loop0_121_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> _loop0_121[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "('if' disjunction)"));
-        void *_tmp_187_var;
+        void *_tmp_188_var;
         while (
-            (_tmp_187_var = _tmp_187_rule(p))  // 'if' disjunction
+            (_tmp_188_var = _tmp_188_rule(p))  // 'if' disjunction
         )
         {
-            _res = _tmp_187_var;
+            _res = _tmp_188_var;
             if (_n == _children_capacity) {
                 _children_capacity *= 2;
                 void **_new_children = PyMem_Realloc(_children, _children_capacity*sizeof(void *));
@@ -28622,12 +28624,12 @@ _loop0_122_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> _loop0_122[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "('if' disjunction)"));
-        void *_tmp_188_var;
+        void *_tmp_189_var;
         while (
-            (_tmp_188_var = _tmp_188_rule(p))  // 'if' disjunction
+            (_tmp_189_var = _tmp_189_rule(p))  // 'if' disjunction
         )
         {
-            _res = _tmp_188_var;
+            _res = _tmp_189_var;
             if (_n == _children_capacity) {
                 _children_capacity *= 2;
                 void **_new_children = PyMem_Realloc(_children, _children_capacity*sizeof(void *));
@@ -28693,7 +28695,7 @@ _loop0_124_rule(Parser *p)
         while (
             (_literal = _PyPegen_expect_token(p, 12))  // token=','
             &&
-            (elem = _tmp_189_rule(p))  // starred_expression | (assigment_expression | expression !':=') !'='
+            (elem = _tmp_190_rule(p))  // starred_expression | (assigment_expression | expression !':=') !'='
         )
         {
             _res = elem;
@@ -28757,7 +28759,7 @@ _gather_123_rule(Parser *p)
         void *elem;
         asdl_seq * seq;
         if (
-            (elem = _tmp_189_rule(p))  // starred_expression | (assigment_expression | expression !':=') !'='
+            (elem = _tmp_190_rule(p))  // starred_expression | (assigment_expression | expression !':=') !'='
             &&
             (seq = _loop0_124_rule(p))  // _loop0_124
         )
@@ -29303,12 +29305,12 @@ _loop0_134_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> _loop0_134[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(',' star_target)"));
-        void *_tmp_190_var;
+        void *_tmp_191_var;
         while (
-            (_tmp_190_var = _tmp_190_rule(p))  // ',' star_target
+            (_tmp_191_var = _tmp_191_rule(p))  // ',' star_target
         )
         {
-            _res = _tmp_190_var;
+            _res = _tmp_191_var;
             if (_n == _children_capacity) {
                 _children_capacity *= 2;
                 void **_new_children = PyMem_Realloc(_children, _children_capacity*sizeof(void *));
@@ -29483,12 +29485,12 @@ _loop1_137_rule(Parser *p)
             return NULL;
         }
         D(fprintf(stderr, "%*c> _loop1_137[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(',' star_target)"));
-        void *_tmp_191_var;
+        void *_tmp_192_var;
         while (
-            (_tmp_191_var = _tmp_191_rule(p))  // ',' star_target
+            (_tmp_192_var = _tmp_192_rule(p))  // ',' star_target
         )
         {
-            _res = _tmp_191_var;
+            _res = _tmp_192_var;
             if (_n == _children_capacity) {
                 _children_capacity *= 2;
                 void **_new_children = PyMem_Realloc(_children, _children_capacity*sizeof(void *));
@@ -29834,9 +29836,64 @@ _tmp_143_rule(Parser *p)
     return _res;
 }
 
-// _tmp_144: '=' | ':='
+// _tmp_144: 'else' | ':'
 static void *
 _tmp_144_rule(Parser *p)
+{
+    D(p->level++);
+    if (p->error_indicator) {
+        D(p->level--);
+        return NULL;
+    }
+    void * _res = NULL;
+    int _mark = p->mark;
+    { // 'else'
+        if (p->error_indicator) {
+            D(p->level--);
+            return NULL;
+        }
+        D(fprintf(stderr, "%*c> _tmp_144[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'else'"));
+        Token * _keyword;
+        if (
+            (_keyword = _PyPegen_expect_token(p, 516))  // token='else'
+        )
+        {
+            D(fprintf(stderr, "%*c+ _tmp_144[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'else'"));
+            _res = _keyword;
+            goto done;
+        }
+        p->mark = _mark;
+        D(fprintf(stderr, "%*c%s _tmp_144[%d-%d]: %s failed!\n", p->level, ' ',
+                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'else'"));
+    }
+    { // ':'
+        if (p->error_indicator) {
+            D(p->level--);
+            return NULL;
+        }
+        D(fprintf(stderr, "%*c> _tmp_144[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "':'"));
+        Token * _literal;
+        if (
+            (_literal = _PyPegen_expect_token(p, 11))  // token=':'
+        )
+        {
+            D(fprintf(stderr, "%*c+ _tmp_144[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "':'"));
+            _res = _literal;
+            goto done;
+        }
+        p->mark = _mark;
+        D(fprintf(stderr, "%*c%s _tmp_144[%d-%d]: %s failed!\n", p->level, ' ',
+                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "':'"));
+    }
+    _res = NULL;
+  done:
+    D(p->level--);
+    return _res;
+}
+
+// _tmp_145: '=' | ':='
+static void *
+_tmp_145_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -29850,18 +29907,18 @@ _tmp_144_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_144[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'='"));
+        D(fprintf(stderr, "%*c> _tmp_145[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'='"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 22))  // token='='
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_144[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'='"));
+            D(fprintf(stderr, "%*c+ _tmp_145[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'='"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_144[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_145[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'='"));
     }
     { // ':='
@@ -29869,18 +29926,18 @@ _tmp_144_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_144[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "':='"));
+        D(fprintf(stderr, "%*c> _tmp_145[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "':='"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 53))  // token=':='
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_144[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "':='"));
+            D(fprintf(stderr, "%*c+ _tmp_145[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "':='"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_144[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_145[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "':='"));
     }
     _res = NULL;
@@ -29889,9 +29946,9 @@ _tmp_144_rule(Parser *p)
     return _res;
 }
 
-// _tmp_145: list | tuple | genexp | 'True' | 'None' | 'False'
+// _tmp_146: list | tuple | genexp | 'True' | 'None' | 'False'
 static void *
-_tmp_145_rule(Parser *p)
+_tmp_146_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -29905,18 +29962,18 @@ _tmp_145_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_145[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "list"));
+        D(fprintf(stderr, "%*c> _tmp_146[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "list"));
         expr_ty list_var;
         if (
             (list_var = list_rule(p))  // list
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_145[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "list"));
+            D(fprintf(stderr, "%*c+ _tmp_146[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "list"));
             _res = list_var;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_145[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_146[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "list"));
     }
     { // tuple
@@ -29924,18 +29981,18 @@ _tmp_145_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_145[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "tuple"));
+        D(fprintf(stderr, "%*c> _tmp_146[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "tuple"));
         expr_ty tuple_var;
         if (
             (tuple_var = tuple_rule(p))  // tuple
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_145[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "tuple"));
+            D(fprintf(stderr, "%*c+ _tmp_146[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "tuple"));
             _res = tuple_var;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_145[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_146[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "tuple"));
     }
     { // genexp
@@ -29943,18 +30000,18 @@ _tmp_145_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_145[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "genexp"));
+        D(fprintf(stderr, "%*c> _tmp_146[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "genexp"));
         expr_ty genexp_var;
         if (
             (genexp_var = genexp_rule(p))  // genexp
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_145[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "genexp"));
+            D(fprintf(stderr, "%*c+ _tmp_146[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "genexp"));
             _res = genexp_var;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_145[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_146[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "genexp"));
     }
     { // 'True'
@@ -29962,18 +30019,18 @@ _tmp_145_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_145[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'True'"));
+        D(fprintf(stderr, "%*c> _tmp_146[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'True'"));
         Token * _keyword;
         if (
             (_keyword = _PyPegen_expect_token(p, 524))  // token='True'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_145[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'True'"));
+            D(fprintf(stderr, "%*c+ _tmp_146[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'True'"));
             _res = _keyword;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_145[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_146[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'True'"));
     }
     { // 'None'
@@ -29981,18 +30038,18 @@ _tmp_145_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_145[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'None'"));
+        D(fprintf(stderr, "%*c> _tmp_146[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'None'"));
         Token * _keyword;
         if (
             (_keyword = _PyPegen_expect_token(p, 523))  // token='None'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_145[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'None'"));
+            D(fprintf(stderr, "%*c+ _tmp_146[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'None'"));
             _res = _keyword;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_145[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_146[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'None'"));
     }
     { // 'False'
@@ -30000,18 +30057,18 @@ _tmp_145_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_145[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'False'"));
+        D(fprintf(stderr, "%*c> _tmp_146[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'False'"));
         Token * _keyword;
         if (
             (_keyword = _PyPegen_expect_token(p, 525))  // token='False'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_145[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'False'"));
+            D(fprintf(stderr, "%*c+ _tmp_146[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'False'"));
             _res = _keyword;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_145[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_146[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'False'"));
     }
     _res = NULL;
@@ -30020,9 +30077,9 @@ _tmp_145_rule(Parser *p)
     return _res;
 }
 
-// _tmp_146: '=' | ':='
+// _tmp_147: '=' | ':='
 static void *
-_tmp_146_rule(Parser *p)
+_tmp_147_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30036,18 +30093,18 @@ _tmp_146_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_146[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'='"));
+        D(fprintf(stderr, "%*c> _tmp_147[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'='"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 22))  // token='='
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_146[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'='"));
+            D(fprintf(stderr, "%*c+ _tmp_147[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'='"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_146[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_147[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'='"));
     }
     { // ':='
@@ -30055,18 +30112,18 @@ _tmp_146_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_146[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "':='"));
+        D(fprintf(stderr, "%*c> _tmp_147[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "':='"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 53))  // token=':='
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_146[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "':='"));
+            D(fprintf(stderr, "%*c+ _tmp_147[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "':='"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_146[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_147[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "':='"));
     }
     _res = NULL;
@@ -30075,9 +30132,9 @@ _tmp_146_rule(Parser *p)
     return _res;
 }
 
-// _loop0_147: star_named_expressions
+// _loop0_148: star_named_expressions
 static asdl_seq *
-_loop0_147_rule(Parser *p)
+_loop0_148_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30101,7 +30158,7 @@ _loop0_147_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _loop0_147[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "star_named_expressions"));
+        D(fprintf(stderr, "%*c> _loop0_148[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "star_named_expressions"));
         asdl_expr_seq* star_named_expressions_var;
         while (
             (star_named_expressions_var = star_named_expressions_rule(p))  // star_named_expressions
@@ -30123,7 +30180,7 @@ _loop0_147_rule(Parser *p)
             _mark = p->mark;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _loop0_147[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _loop0_148[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "star_named_expressions"));
     }
     asdl_seq *_seq = (asdl_seq*)_Py_asdl_generic_seq_new(_n, p->arena);
@@ -30136,14 +30193,14 @@ _loop0_147_rule(Parser *p)
     }
     for (int i = 0; i < _n; i++) asdl_seq_SET_UNTYPED(_seq, i, _children[i]);
     PyMem_Free(_children);
-    _PyPegen_insert_memo(p, _start_mark, _loop0_147_type, _seq);
+    _PyPegen_insert_memo(p, _start_mark, _loop0_148_type, _seq);
     D(p->level--);
     return _seq;
 }
 
-// _loop0_148: (star_targets '=')
+// _loop0_149: (star_targets '=')
 static asdl_seq *
-_loop0_148_rule(Parser *p)
+_loop0_149_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30167,13 +30224,13 @@ _loop0_148_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _loop0_148[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(star_targets '=')"));
-        void *_tmp_192_var;
+        D(fprintf(stderr, "%*c> _loop0_149[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(star_targets '=')"));
+        void *_tmp_193_var;
         while (
-            (_tmp_192_var = _tmp_192_rule(p))  // star_targets '='
+            (_tmp_193_var = _tmp_193_rule(p))  // star_targets '='
         )
         {
-            _res = _tmp_192_var;
+            _res = _tmp_193_var;
             if (_n == _children_capacity) {
                 _children_capacity *= 2;
                 void **_new_children = PyMem_Realloc(_children, _children_capacity*sizeof(void *));
@@ -30189,7 +30246,7 @@ _loop0_148_rule(Parser *p)
             _mark = p->mark;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _loop0_148[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _loop0_149[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "(star_targets '=')"));
     }
     asdl_seq *_seq = (asdl_seq*)_Py_asdl_generic_seq_new(_n, p->arena);
@@ -30202,14 +30259,14 @@ _loop0_148_rule(Parser *p)
     }
     for (int i = 0; i < _n; i++) asdl_seq_SET_UNTYPED(_seq, i, _children[i]);
     PyMem_Free(_children);
-    _PyPegen_insert_memo(p, _start_mark, _loop0_148_type, _seq);
+    _PyPegen_insert_memo(p, _start_mark, _loop0_149_type, _seq);
     D(p->level--);
     return _seq;
 }
 
-// _loop0_149: (star_targets '=')
+// _loop0_150: (star_targets '=')
 static asdl_seq *
-_loop0_149_rule(Parser *p)
+_loop0_150_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30233,13 +30290,13 @@ _loop0_149_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _loop0_149[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(star_targets '=')"));
-        void *_tmp_193_var;
+        D(fprintf(stderr, "%*c> _loop0_150[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(star_targets '=')"));
+        void *_tmp_194_var;
         while (
-            (_tmp_193_var = _tmp_193_rule(p))  // star_targets '='
+            (_tmp_194_var = _tmp_194_rule(p))  // star_targets '='
         )
         {
-            _res = _tmp_193_var;
+            _res = _tmp_194_var;
             if (_n == _children_capacity) {
                 _children_capacity *= 2;
                 void **_new_children = PyMem_Realloc(_children, _children_capacity*sizeof(void *));
@@ -30255,7 +30312,7 @@ _loop0_149_rule(Parser *p)
             _mark = p->mark;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _loop0_149[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _loop0_150[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "(star_targets '=')"));
     }
     asdl_seq *_seq = (asdl_seq*)_Py_asdl_generic_seq_new(_n, p->arena);
@@ -30268,14 +30325,14 @@ _loop0_149_rule(Parser *p)
     }
     for (int i = 0; i < _n; i++) asdl_seq_SET_UNTYPED(_seq, i, _children[i]);
     PyMem_Free(_children);
-    _PyPegen_insert_memo(p, _start_mark, _loop0_149_type, _seq);
+    _PyPegen_insert_memo(p, _start_mark, _loop0_150_type, _seq);
     D(p->level--);
     return _seq;
 }
 
-// _tmp_150: yield_expr | star_expressions
+// _tmp_151: yield_expr | star_expressions
 static void *
-_tmp_150_rule(Parser *p)
+_tmp_151_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30289,18 +30346,18 @@ _tmp_150_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_150[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "yield_expr"));
+        D(fprintf(stderr, "%*c> _tmp_151[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "yield_expr"));
         expr_ty yield_expr_var;
         if (
             (yield_expr_var = yield_expr_rule(p))  // yield_expr
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_150[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "yield_expr"));
+            D(fprintf(stderr, "%*c+ _tmp_151[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "yield_expr"));
             _res = yield_expr_var;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_150[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_151[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "yield_expr"));
     }
     { // star_expressions
@@ -30308,18 +30365,18 @@ _tmp_150_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_150[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "star_expressions"));
+        D(fprintf(stderr, "%*c> _tmp_151[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "star_expressions"));
         expr_ty star_expressions_var;
         if (
             (star_expressions_var = star_expressions_rule(p))  // star_expressions
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_150[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "star_expressions"));
+            D(fprintf(stderr, "%*c+ _tmp_151[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "star_expressions"));
             _res = star_expressions_var;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_150[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_151[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "star_expressions"));
     }
     _res = NULL;
@@ -30328,9 +30385,9 @@ _tmp_150_rule(Parser *p)
     return _res;
 }
 
-// _tmp_151: '[' | '(' | '{'
+// _tmp_152: '[' | '(' | '{'
 static void *
-_tmp_151_rule(Parser *p)
+_tmp_152_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30344,18 +30401,18 @@ _tmp_151_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_151[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'['"));
+        D(fprintf(stderr, "%*c> _tmp_152[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'['"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 9))  // token='['
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_151[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'['"));
+            D(fprintf(stderr, "%*c+ _tmp_152[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'['"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_151[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_152[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'['"));
     }
     { // '('
@@ -30363,18 +30420,18 @@ _tmp_151_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_151[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'('"));
+        D(fprintf(stderr, "%*c> _tmp_152[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'('"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 7))  // token='('
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_151[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'('"));
+            D(fprintf(stderr, "%*c+ _tmp_152[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'('"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_151[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_152[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'('"));
     }
     { // '{'
@@ -30382,18 +30439,18 @@ _tmp_151_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_151[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'{'"));
+        D(fprintf(stderr, "%*c> _tmp_152[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'{'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 25))  // token='{'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_151[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'{'"));
+            D(fprintf(stderr, "%*c+ _tmp_152[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'{'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_151[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_152[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'{'"));
     }
     _res = NULL;
@@ -30402,9 +30459,9 @@ _tmp_151_rule(Parser *p)
     return _res;
 }
 
-// _tmp_152: '[' | '{'
+// _tmp_153: '[' | '{'
 static void *
-_tmp_152_rule(Parser *p)
+_tmp_153_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30418,18 +30475,18 @@ _tmp_152_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_152[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'['"));
+        D(fprintf(stderr, "%*c> _tmp_153[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'['"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 9))  // token='['
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_152[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'['"));
+            D(fprintf(stderr, "%*c+ _tmp_153[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'['"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_152[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_153[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'['"));
     }
     { // '{'
@@ -30437,18 +30494,18 @@ _tmp_152_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_152[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'{'"));
+        D(fprintf(stderr, "%*c> _tmp_153[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'{'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 25))  // token='{'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_152[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'{'"));
+            D(fprintf(stderr, "%*c+ _tmp_153[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'{'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_152[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_153[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'{'"));
     }
     _res = NULL;
@@ -30457,9 +30514,9 @@ _tmp_152_rule(Parser *p)
     return _res;
 }
 
-// _tmp_153: '[' | '{'
+// _tmp_154: '[' | '{'
 static void *
-_tmp_153_rule(Parser *p)
+_tmp_154_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30473,18 +30530,18 @@ _tmp_153_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_153[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'['"));
+        D(fprintf(stderr, "%*c> _tmp_154[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'['"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 9))  // token='['
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_153[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'['"));
+            D(fprintf(stderr, "%*c+ _tmp_154[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'['"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_153[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_154[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'['"));
     }
     { // '{'
@@ -30492,18 +30549,18 @@ _tmp_153_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_153[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'{'"));
+        D(fprintf(stderr, "%*c> _tmp_154[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'{'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 25))  // token='{'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_153[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'{'"));
+            D(fprintf(stderr, "%*c+ _tmp_154[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'{'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_153[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_154[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'{'"));
     }
     _res = NULL;
@@ -30512,9 +30569,9 @@ _tmp_153_rule(Parser *p)
     return _res;
 }
 
-// _loop0_154: param_no_default
+// _loop0_155: param_no_default
 static asdl_seq *
-_loop0_154_rule(Parser *p)
+_loop0_155_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30538,7 +30595,7 @@ _loop0_154_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _loop0_154[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "param_no_default"));
+        D(fprintf(stderr, "%*c> _loop0_155[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "param_no_default"));
         arg_ty param_no_default_var;
         while (
             (param_no_default_var = param_no_default_rule(p))  // param_no_default
@@ -30560,7 +30617,7 @@ _loop0_154_rule(Parser *p)
             _mark = p->mark;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _loop0_154[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _loop0_155[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "param_no_default"));
     }
     asdl_seq *_seq = (asdl_seq*)_Py_asdl_generic_seq_new(_n, p->arena);
@@ -30573,14 +30630,14 @@ _loop0_154_rule(Parser *p)
     }
     for (int i = 0; i < _n; i++) asdl_seq_SET_UNTYPED(_seq, i, _children[i]);
     PyMem_Free(_children);
-    _PyPegen_insert_memo(p, _start_mark, _loop0_154_type, _seq);
+    _PyPegen_insert_memo(p, _start_mark, _loop0_155_type, _seq);
     D(p->level--);
     return _seq;
 }
 
-// _loop1_155: param_with_default
+// _loop1_156: param_with_default
 static asdl_seq *
-_loop1_155_rule(Parser *p)
+_loop1_156_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30604,7 +30661,7 @@ _loop1_155_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _loop1_155[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "param_with_default"));
+        D(fprintf(stderr, "%*c> _loop1_156[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "param_with_default"));
         NameDefaultPair* param_with_default_var;
         while (
             (param_with_default_var = param_with_default_rule(p))  // param_with_default
@@ -30626,7 +30683,7 @@ _loop1_155_rule(Parser *p)
             _mark = p->mark;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _loop1_155[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _loop1_156[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "param_with_default"));
     }
     if (_n == 0 || p->error_indicator) {
@@ -30644,14 +30701,14 @@ _loop1_155_rule(Parser *p)
     }
     for (int i = 0; i < _n; i++) asdl_seq_SET_UNTYPED(_seq, i, _children[i]);
     PyMem_Free(_children);
-    _PyPegen_insert_memo(p, _start_mark, _loop1_155_type, _seq);
+    _PyPegen_insert_memo(p, _start_mark, _loop1_156_type, _seq);
     D(p->level--);
     return _seq;
 }
 
-// _loop0_156: lambda_param_no_default
+// _loop0_157: lambda_param_no_default
 static asdl_seq *
-_loop0_156_rule(Parser *p)
+_loop0_157_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30675,7 +30732,7 @@ _loop0_156_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _loop0_156[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "lambda_param_no_default"));
+        D(fprintf(stderr, "%*c> _loop0_157[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "lambda_param_no_default"));
         arg_ty lambda_param_no_default_var;
         while (
             (lambda_param_no_default_var = lambda_param_no_default_rule(p))  // lambda_param_no_default
@@ -30697,7 +30754,7 @@ _loop0_156_rule(Parser *p)
             _mark = p->mark;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _loop0_156[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _loop0_157[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "lambda_param_no_default"));
     }
     asdl_seq *_seq = (asdl_seq*)_Py_asdl_generic_seq_new(_n, p->arena);
@@ -30710,14 +30767,14 @@ _loop0_156_rule(Parser *p)
     }
     for (int i = 0; i < _n; i++) asdl_seq_SET_UNTYPED(_seq, i, _children[i]);
     PyMem_Free(_children);
-    _PyPegen_insert_memo(p, _start_mark, _loop0_156_type, _seq);
+    _PyPegen_insert_memo(p, _start_mark, _loop0_157_type, _seq);
     D(p->level--);
     return _seq;
 }
 
-// _loop1_157: lambda_param_with_default
+// _loop1_158: lambda_param_with_default
 static asdl_seq *
-_loop1_157_rule(Parser *p)
+_loop1_158_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30741,7 +30798,7 @@ _loop1_157_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _loop1_157[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "lambda_param_with_default"));
+        D(fprintf(stderr, "%*c> _loop1_158[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "lambda_param_with_default"));
         NameDefaultPair* lambda_param_with_default_var;
         while (
             (lambda_param_with_default_var = lambda_param_with_default_rule(p))  // lambda_param_with_default
@@ -30763,7 +30820,7 @@ _loop1_157_rule(Parser *p)
             _mark = p->mark;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _loop1_157[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _loop1_158[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "lambda_param_with_default"));
     }
     if (_n == 0 || p->error_indicator) {
@@ -30781,14 +30838,14 @@ _loop1_157_rule(Parser *p)
     }
     for (int i = 0; i < _n; i++) asdl_seq_SET_UNTYPED(_seq, i, _children[i]);
     PyMem_Free(_children);
-    _PyPegen_insert_memo(p, _start_mark, _loop1_157_type, _seq);
+    _PyPegen_insert_memo(p, _start_mark, _loop1_158_type, _seq);
     D(p->level--);
     return _seq;
 }
 
-// _tmp_158: ')' | ',' (')' | '**')
+// _tmp_159: ')' | ',' (')' | '**')
 static void *
-_tmp_158_rule(Parser *p)
+_tmp_159_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30802,18 +30859,18 @@ _tmp_158_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_158[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "')'"));
+        D(fprintf(stderr, "%*c> _tmp_159[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "')'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 8))  // token=')'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_158[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "')'"));
+            D(fprintf(stderr, "%*c+ _tmp_159[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "')'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_158[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_159[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "')'"));
     }
     { // ',' (')' | '**')
@@ -30821,21 +30878,21 @@ _tmp_158_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_158[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' (')' | '**')"));
+        D(fprintf(stderr, "%*c> _tmp_159[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' (')' | '**')"));
         Token * _literal;
-        void *_tmp_194_var;
+        void *_tmp_195_var;
         if (
             (_literal = _PyPegen_expect_token(p, 12))  // token=','
             &&
-            (_tmp_194_var = _tmp_194_rule(p))  // ')' | '**'
+            (_tmp_195_var = _tmp_195_rule(p))  // ')' | '**'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_158[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "',' (')' | '**')"));
-            _res = _PyPegen_dummy_name(p, _literal, _tmp_194_var);
+            D(fprintf(stderr, "%*c+ _tmp_159[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "',' (')' | '**')"));
+            _res = _PyPegen_dummy_name(p, _literal, _tmp_195_var);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_158[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_159[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "',' (')' | '**')"));
     }
     _res = NULL;
@@ -30844,9 +30901,9 @@ _tmp_158_rule(Parser *p)
     return _res;
 }
 
-// _tmp_159: ':' | ',' (':' | '**')
+// _tmp_160: ':' | ',' (':' | '**')
 static void *
-_tmp_159_rule(Parser *p)
+_tmp_160_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30860,18 +30917,18 @@ _tmp_159_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_159[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "':'"));
+        D(fprintf(stderr, "%*c> _tmp_160[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "':'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 11))  // token=':'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_159[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "':'"));
+            D(fprintf(stderr, "%*c+ _tmp_160[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "':'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_159[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_160[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "':'"));
     }
     { // ',' (':' | '**')
@@ -30879,21 +30936,21 @@ _tmp_159_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_159[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' (':' | '**')"));
+        D(fprintf(stderr, "%*c> _tmp_160[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' (':' | '**')"));
         Token * _literal;
-        void *_tmp_195_var;
+        void *_tmp_196_var;
         if (
             (_literal = _PyPegen_expect_token(p, 12))  // token=','
             &&
-            (_tmp_195_var = _tmp_195_rule(p))  // ':' | '**'
+            (_tmp_196_var = _tmp_196_rule(p))  // ':' | '**'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_159[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "',' (':' | '**')"));
-            _res = _PyPegen_dummy_name(p, _literal, _tmp_195_var);
+            D(fprintf(stderr, "%*c+ _tmp_160[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "',' (':' | '**')"));
+            _res = _PyPegen_dummy_name(p, _literal, _tmp_196_var);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_159[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_160[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "',' (':' | '**')"));
     }
     _res = NULL;
@@ -30902,9 +30959,9 @@ _tmp_159_rule(Parser *p)
     return _res;
 }
 
-// _tmp_160: ',' | ')' | ':'
+// _tmp_161: ',' | ')' | ':'
 static void *
-_tmp_160_rule(Parser *p)
+_tmp_161_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -30918,18 +30975,18 @@ _tmp_160_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_160[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "','"));
+        D(fprintf(stderr, "%*c> _tmp_161[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "','"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 12))  // token=','
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_160[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "','"));
+            D(fprintf(stderr, "%*c+ _tmp_161[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "','"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_160[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_161[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "','"));
     }
     { // ')'
@@ -30937,18 +30994,18 @@ _tmp_160_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_160[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "')'"));
+        D(fprintf(stderr, "%*c> _tmp_161[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "')'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 8))  // token=')'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_160[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "')'"));
+            D(fprintf(stderr, "%*c+ _tmp_161[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "')'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_160[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_161[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "')'"));
     }
     { // ':'
@@ -30956,18 +31013,18 @@ _tmp_160_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_160[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "':'"));
+        D(fprintf(stderr, "%*c> _tmp_161[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "':'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 11))  // token=':'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_160[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "':'"));
+            D(fprintf(stderr, "%*c+ _tmp_161[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "':'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_160[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_161[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "':'"));
     }
     _res = NULL;
@@ -30976,9 +31033,9 @@ _tmp_160_rule(Parser *p)
     return _res;
 }
 
-// _loop0_162: ',' (expression ['as' star_target])
+// _loop0_163: ',' (expression ['as' star_target])
 static asdl_seq *
-_loop0_162_rule(Parser *p)
+_loop0_163_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31002,13 +31059,13 @@ _loop0_162_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _loop0_162[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' (expression ['as' star_target])"));
+        D(fprintf(stderr, "%*c> _loop0_163[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' (expression ['as' star_target])"));
         Token * _literal;
         void *elem;
         while (
             (_literal = _PyPegen_expect_token(p, 12))  // token=','
             &&
-            (elem = _tmp_196_rule(p))  // expression ['as' star_target]
+            (elem = _tmp_197_rule(p))  // expression ['as' star_target]
         )
         {
             _res = elem;
@@ -31033,7 +31090,7 @@ _loop0_162_rule(Parser *p)
             _mark = p->mark;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _loop0_162[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _loop0_163[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "',' (expression ['as' star_target])"));
     }
     asdl_seq *_seq = (asdl_seq*)_Py_asdl_generic_seq_new(_n, p->arena);
@@ -31046,14 +31103,14 @@ _loop0_162_rule(Parser *p)
     }
     for (int i = 0; i < _n; i++) asdl_seq_SET_UNTYPED(_seq, i, _children[i]);
     PyMem_Free(_children);
-    _PyPegen_insert_memo(p, _start_mark, _loop0_162_type, _seq);
+    _PyPegen_insert_memo(p, _start_mark, _loop0_163_type, _seq);
     D(p->level--);
     return _seq;
 }
 
-// _gather_161: (expression ['as' star_target]) _loop0_162
+// _gather_162: (expression ['as' star_target]) _loop0_163
 static asdl_seq *
-_gather_161_rule(Parser *p)
+_gather_162_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31062,27 +31119,27 @@ _gather_161_rule(Parser *p)
     }
     asdl_seq * _res = NULL;
     int _mark = p->mark;
-    { // (expression ['as' star_target]) _loop0_162
+    { // (expression ['as' star_target]) _loop0_163
         if (p->error_indicator) {
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _gather_161[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(expression ['as' star_target]) _loop0_162"));
+        D(fprintf(stderr, "%*c> _gather_162[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(expression ['as' star_target]) _loop0_163"));
         void *elem;
         asdl_seq * seq;
         if (
-            (elem = _tmp_196_rule(p))  // expression ['as' star_target]
+            (elem = _tmp_197_rule(p))  // expression ['as' star_target]
             &&
-            (seq = _loop0_162_rule(p))  // _loop0_162
+            (seq = _loop0_163_rule(p))  // _loop0_163
         )
         {
-            D(fprintf(stderr, "%*c+ _gather_161[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "(expression ['as' star_target]) _loop0_162"));
+            D(fprintf(stderr, "%*c+ _gather_162[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "(expression ['as' star_target]) _loop0_163"));
             _res = _PyPegen_seq_insert_in_front(p, elem, seq);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _gather_161[%d-%d]: %s failed!\n", p->level, ' ',
-                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "(expression ['as' star_target]) _loop0_162"));
+        D(fprintf(stderr, "%*c%s _gather_162[%d-%d]: %s failed!\n", p->level, ' ',
+                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "(expression ['as' star_target]) _loop0_163"));
     }
     _res = NULL;
   done:
@@ -31090,9 +31147,9 @@ _gather_161_rule(Parser *p)
     return _res;
 }
 
-// _loop0_164: ',' (expressions ['as' star_target])
+// _loop0_165: ',' (expressions ['as' star_target])
 static asdl_seq *
-_loop0_164_rule(Parser *p)
+_loop0_165_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31116,13 +31173,13 @@ _loop0_164_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _loop0_164[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' (expressions ['as' star_target])"));
+        D(fprintf(stderr, "%*c> _loop0_165[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' (expressions ['as' star_target])"));
         Token * _literal;
         void *elem;
         while (
             (_literal = _PyPegen_expect_token(p, 12))  // token=','
             &&
-            (elem = _tmp_197_rule(p))  // expressions ['as' star_target]
+            (elem = _tmp_198_rule(p))  // expressions ['as' star_target]
         )
         {
             _res = elem;
@@ -31147,7 +31204,7 @@ _loop0_164_rule(Parser *p)
             _mark = p->mark;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _loop0_164[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _loop0_165[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "',' (expressions ['as' star_target])"));
     }
     asdl_seq *_seq = (asdl_seq*)_Py_asdl_generic_seq_new(_n, p->arena);
@@ -31160,14 +31217,14 @@ _loop0_164_rule(Parser *p)
     }
     for (int i = 0; i < _n; i++) asdl_seq_SET_UNTYPED(_seq, i, _children[i]);
     PyMem_Free(_children);
-    _PyPegen_insert_memo(p, _start_mark, _loop0_164_type, _seq);
+    _PyPegen_insert_memo(p, _start_mark, _loop0_165_type, _seq);
     D(p->level--);
     return _seq;
 }
 
-// _gather_163: (expressions ['as' star_target]) _loop0_164
+// _gather_164: (expressions ['as' star_target]) _loop0_165
 static asdl_seq *
-_gather_163_rule(Parser *p)
+_gather_164_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31176,27 +31233,27 @@ _gather_163_rule(Parser *p)
     }
     asdl_seq * _res = NULL;
     int _mark = p->mark;
-    { // (expressions ['as' star_target]) _loop0_164
+    { // (expressions ['as' star_target]) _loop0_165
         if (p->error_indicator) {
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _gather_163[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(expressions ['as' star_target]) _loop0_164"));
+        D(fprintf(stderr, "%*c> _gather_164[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(expressions ['as' star_target]) _loop0_165"));
         void *elem;
         asdl_seq * seq;
         if (
-            (elem = _tmp_197_rule(p))  // expressions ['as' star_target]
+            (elem = _tmp_198_rule(p))  // expressions ['as' star_target]
             &&
-            (seq = _loop0_164_rule(p))  // _loop0_164
+            (seq = _loop0_165_rule(p))  // _loop0_165
         )
         {
-            D(fprintf(stderr, "%*c+ _gather_163[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "(expressions ['as' star_target]) _loop0_164"));
+            D(fprintf(stderr, "%*c+ _gather_164[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "(expressions ['as' star_target]) _loop0_165"));
             _res = _PyPegen_seq_insert_in_front(p, elem, seq);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _gather_163[%d-%d]: %s failed!\n", p->level, ' ',
-                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "(expressions ['as' star_target]) _loop0_164"));
+        D(fprintf(stderr, "%*c%s _gather_164[%d-%d]: %s failed!\n", p->level, ' ',
+                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "(expressions ['as' star_target]) _loop0_165"));
     }
     _res = NULL;
   done:
@@ -31204,9 +31261,9 @@ _gather_163_rule(Parser *p)
     return _res;
 }
 
-// _loop0_166: ',' (expression ['as' star_target])
+// _loop0_167: ',' (expression ['as' star_target])
 static asdl_seq *
-_loop0_166_rule(Parser *p)
+_loop0_167_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31230,13 +31287,13 @@ _loop0_166_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _loop0_166[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' (expression ['as' star_target])"));
+        D(fprintf(stderr, "%*c> _loop0_167[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' (expression ['as' star_target])"));
         Token * _literal;
         void *elem;
         while (
             (_literal = _PyPegen_expect_token(p, 12))  // token=','
             &&
-            (elem = _tmp_198_rule(p))  // expression ['as' star_target]
+            (elem = _tmp_199_rule(p))  // expression ['as' star_target]
         )
         {
             _res = elem;
@@ -31261,7 +31318,7 @@ _loop0_166_rule(Parser *p)
             _mark = p->mark;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _loop0_166[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _loop0_167[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "',' (expression ['as' star_target])"));
     }
     asdl_seq *_seq = (asdl_seq*)_Py_asdl_generic_seq_new(_n, p->arena);
@@ -31274,14 +31331,14 @@ _loop0_166_rule(Parser *p)
     }
     for (int i = 0; i < _n; i++) asdl_seq_SET_UNTYPED(_seq, i, _children[i]);
     PyMem_Free(_children);
-    _PyPegen_insert_memo(p, _start_mark, _loop0_166_type, _seq);
+    _PyPegen_insert_memo(p, _start_mark, _loop0_167_type, _seq);
     D(p->level--);
     return _seq;
 }
 
-// _gather_165: (expression ['as' star_target]) _loop0_166
+// _gather_166: (expression ['as' star_target]) _loop0_167
 static asdl_seq *
-_gather_165_rule(Parser *p)
+_gather_166_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31290,27 +31347,27 @@ _gather_165_rule(Parser *p)
     }
     asdl_seq * _res = NULL;
     int _mark = p->mark;
-    { // (expression ['as' star_target]) _loop0_166
+    { // (expression ['as' star_target]) _loop0_167
         if (p->error_indicator) {
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _gather_165[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(expression ['as' star_target]) _loop0_166"));
+        D(fprintf(stderr, "%*c> _gather_166[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(expression ['as' star_target]) _loop0_167"));
         void *elem;
         asdl_seq * seq;
         if (
-            (elem = _tmp_198_rule(p))  // expression ['as' star_target]
+            (elem = _tmp_199_rule(p))  // expression ['as' star_target]
             &&
-            (seq = _loop0_166_rule(p))  // _loop0_166
+            (seq = _loop0_167_rule(p))  // _loop0_167
         )
         {
-            D(fprintf(stderr, "%*c+ _gather_165[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "(expression ['as' star_target]) _loop0_166"));
+            D(fprintf(stderr, "%*c+ _gather_166[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "(expression ['as' star_target]) _loop0_167"));
             _res = _PyPegen_seq_insert_in_front(p, elem, seq);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _gather_165[%d-%d]: %s failed!\n", p->level, ' ',
-                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "(expression ['as' star_target]) _loop0_166"));
+        D(fprintf(stderr, "%*c%s _gather_166[%d-%d]: %s failed!\n", p->level, ' ',
+                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "(expression ['as' star_target]) _loop0_167"));
     }
     _res = NULL;
   done:
@@ -31318,9 +31375,9 @@ _gather_165_rule(Parser *p)
     return _res;
 }
 
-// _loop0_168: ',' (expressions ['as' star_target])
+// _loop0_169: ',' (expressions ['as' star_target])
 static asdl_seq *
-_loop0_168_rule(Parser *p)
+_loop0_169_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31344,13 +31401,13 @@ _loop0_168_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _loop0_168[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' (expressions ['as' star_target])"));
+        D(fprintf(stderr, "%*c> _loop0_169[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' (expressions ['as' star_target])"));
         Token * _literal;
         void *elem;
         while (
             (_literal = _PyPegen_expect_token(p, 12))  // token=','
             &&
-            (elem = _tmp_199_rule(p))  // expressions ['as' star_target]
+            (elem = _tmp_200_rule(p))  // expressions ['as' star_target]
         )
         {
             _res = elem;
@@ -31375,7 +31432,7 @@ _loop0_168_rule(Parser *p)
             _mark = p->mark;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _loop0_168[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _loop0_169[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "',' (expressions ['as' star_target])"));
     }
     asdl_seq *_seq = (asdl_seq*)_Py_asdl_generic_seq_new(_n, p->arena);
@@ -31388,14 +31445,14 @@ _loop0_168_rule(Parser *p)
     }
     for (int i = 0; i < _n; i++) asdl_seq_SET_UNTYPED(_seq, i, _children[i]);
     PyMem_Free(_children);
-    _PyPegen_insert_memo(p, _start_mark, _loop0_168_type, _seq);
+    _PyPegen_insert_memo(p, _start_mark, _loop0_169_type, _seq);
     D(p->level--);
     return _seq;
 }
 
-// _gather_167: (expressions ['as' star_target]) _loop0_168
+// _gather_168: (expressions ['as' star_target]) _loop0_169
 static asdl_seq *
-_gather_167_rule(Parser *p)
+_gather_168_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31404,27 +31461,27 @@ _gather_167_rule(Parser *p)
     }
     asdl_seq * _res = NULL;
     int _mark = p->mark;
-    { // (expressions ['as' star_target]) _loop0_168
+    { // (expressions ['as' star_target]) _loop0_169
         if (p->error_indicator) {
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _gather_167[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(expressions ['as' star_target]) _loop0_168"));
+        D(fprintf(stderr, "%*c> _gather_168[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(expressions ['as' star_target]) _loop0_169"));
         void *elem;
         asdl_seq * seq;
         if (
-            (elem = _tmp_199_rule(p))  // expressions ['as' star_target]
+            (elem = _tmp_200_rule(p))  // expressions ['as' star_target]
             &&
-            (seq = _loop0_168_rule(p))  // _loop0_168
+            (seq = _loop0_169_rule(p))  // _loop0_169
         )
         {
-            D(fprintf(stderr, "%*c+ _gather_167[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "(expressions ['as' star_target]) _loop0_168"));
+            D(fprintf(stderr, "%*c+ _gather_168[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "(expressions ['as' star_target]) _loop0_169"));
             _res = _PyPegen_seq_insert_in_front(p, elem, seq);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _gather_167[%d-%d]: %s failed!\n", p->level, ' ',
-                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "(expressions ['as' star_target]) _loop0_168"));
+        D(fprintf(stderr, "%*c%s _gather_168[%d-%d]: %s failed!\n", p->level, ' ',
+                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "(expressions ['as' star_target]) _loop0_169"));
     }
     _res = NULL;
   done:
@@ -31432,9 +31489,9 @@ _gather_167_rule(Parser *p)
     return _res;
 }
 
-// _tmp_169: 'except' | 'finally'
+// _tmp_170: 'except' | 'finally'
 static void *
-_tmp_169_rule(Parser *p)
+_tmp_170_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31448,18 +31505,18 @@ _tmp_169_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_169[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'except'"));
+        D(fprintf(stderr, "%*c> _tmp_170[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'except'"));
         Token * _keyword;
         if (
             (_keyword = _PyPegen_expect_token(p, 521))  // token='except'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_169[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'except'"));
+            D(fprintf(stderr, "%*c+ _tmp_170[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'except'"));
             _res = _keyword;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_169[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_170[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'except'"));
     }
     { // 'finally'
@@ -31467,18 +31524,18 @@ _tmp_169_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_169[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'finally'"));
+        D(fprintf(stderr, "%*c> _tmp_170[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'finally'"));
         Token * _keyword;
         if (
             (_keyword = _PyPegen_expect_token(p, 522))  // token='finally'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_169[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'finally'"));
+            D(fprintf(stderr, "%*c+ _tmp_170[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'finally'"));
             _res = _keyword;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_169[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_170[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'finally'"));
     }
     _res = NULL;
@@ -31487,9 +31544,9 @@ _tmp_169_rule(Parser *p)
     return _res;
 }
 
-// _tmp_170: 'as' NAME
+// _tmp_171: 'as' NAME
 static void *
-_tmp_170_rule(Parser *p)
+_tmp_171_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31503,7 +31560,7 @@ _tmp_170_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_170[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'as' NAME"));
+        D(fprintf(stderr, "%*c> _tmp_171[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'as' NAME"));
         Token * _keyword;
         expr_ty name_var;
         if (
@@ -31512,12 +31569,12 @@ _tmp_170_rule(Parser *p)
             (name_var = _PyPegen_name_token(p))  // NAME
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_170[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'as' NAME"));
+            D(fprintf(stderr, "%*c+ _tmp_171[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'as' NAME"));
             _res = _PyPegen_dummy_name(p, _keyword, name_var);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_170[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_171[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'as' NAME"));
     }
     _res = NULL;
@@ -31526,9 +31583,9 @@ _tmp_170_rule(Parser *p)
     return _res;
 }
 
-// _tmp_171: 'as' NAME
+// _tmp_172: 'as' NAME
 static void *
-_tmp_171_rule(Parser *p)
+_tmp_172_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31542,7 +31599,7 @@ _tmp_171_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_171[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'as' NAME"));
+        D(fprintf(stderr, "%*c> _tmp_172[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'as' NAME"));
         Token * _keyword;
         expr_ty name_var;
         if (
@@ -31551,12 +31608,12 @@ _tmp_171_rule(Parser *p)
             (name_var = _PyPegen_name_token(p))  // NAME
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_171[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'as' NAME"));
+            D(fprintf(stderr, "%*c+ _tmp_172[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'as' NAME"));
             _res = _PyPegen_dummy_name(p, _keyword, name_var);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_171[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_172[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'as' NAME"));
     }
     _res = NULL;
@@ -31565,9 +31622,9 @@ _tmp_171_rule(Parser *p)
     return _res;
 }
 
-// _tmp_172: 'as' NAME
+// _tmp_173: 'as' NAME
 static void *
-_tmp_172_rule(Parser *p)
+_tmp_173_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31581,7 +31638,7 @@ _tmp_172_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_172[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'as' NAME"));
+        D(fprintf(stderr, "%*c> _tmp_173[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'as' NAME"));
         Token * _keyword;
         expr_ty name_var;
         if (
@@ -31590,12 +31647,12 @@ _tmp_172_rule(Parser *p)
             (name_var = _PyPegen_name_token(p))  // NAME
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_172[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'as' NAME"));
+            D(fprintf(stderr, "%*c+ _tmp_173[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'as' NAME"));
             _res = _PyPegen_dummy_name(p, _keyword, name_var);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_172[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_173[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'as' NAME"));
     }
     _res = NULL;
@@ -31604,9 +31661,9 @@ _tmp_172_rule(Parser *p)
     return _res;
 }
 
-// _tmp_173: positional_patterns ','
+// _tmp_174: positional_patterns ','
 static void *
-_tmp_173_rule(Parser *p)
+_tmp_174_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31620,7 +31677,7 @@ _tmp_173_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_173[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "positional_patterns ','"));
+        D(fprintf(stderr, "%*c> _tmp_174[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "positional_patterns ','"));
         Token * _literal;
         asdl_pattern_seq* positional_patterns_var;
         if (
@@ -31629,12 +31686,12 @@ _tmp_173_rule(Parser *p)
             (_literal = _PyPegen_expect_token(p, 12))  // token=','
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_173[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "positional_patterns ','"));
+            D(fprintf(stderr, "%*c+ _tmp_174[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "positional_patterns ','"));
             _res = _PyPegen_dummy_name(p, positional_patterns_var, _literal);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_173[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_174[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "positional_patterns ','"));
     }
     _res = NULL;
@@ -31643,9 +31700,9 @@ _tmp_173_rule(Parser *p)
     return _res;
 }
 
-// _tmp_174: '->' expression
+// _tmp_175: '->' expression
 static void *
-_tmp_174_rule(Parser *p)
+_tmp_175_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31659,7 +31716,7 @@ _tmp_174_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_174[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'->' expression"));
+        D(fprintf(stderr, "%*c> _tmp_175[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'->' expression"));
         Token * _literal;
         expr_ty expression_var;
         if (
@@ -31668,12 +31725,12 @@ _tmp_174_rule(Parser *p)
             (expression_var = expression_rule(p))  // expression
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_174[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'->' expression"));
+            D(fprintf(stderr, "%*c+ _tmp_175[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'->' expression"));
             _res = _PyPegen_dummy_name(p, _literal, expression_var);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_174[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_175[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'->' expression"));
     }
     _res = NULL;
@@ -31682,9 +31739,9 @@ _tmp_174_rule(Parser *p)
     return _res;
 }
 
-// _tmp_175: '(' arguments? ')'
+// _tmp_176: '(' arguments? ')'
 static void *
-_tmp_175_rule(Parser *p)
+_tmp_176_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31698,7 +31755,7 @@ _tmp_175_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_175[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'(' arguments? ')'"));
+        D(fprintf(stderr, "%*c> _tmp_176[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'(' arguments? ')'"));
         Token * _literal;
         Token * _literal_1;
         void *_opt_var;
@@ -31711,12 +31768,12 @@ _tmp_175_rule(Parser *p)
             (_literal_1 = _PyPegen_expect_token(p, 8))  // token=')'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_175[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'(' arguments? ')'"));
+            D(fprintf(stderr, "%*c+ _tmp_176[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'(' arguments? ')'"));
             _res = _PyPegen_dummy_name(p, _literal, _opt_var, _literal_1);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_175[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_176[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'(' arguments? ')'"));
     }
     _res = NULL;
@@ -31725,9 +31782,9 @@ _tmp_175_rule(Parser *p)
     return _res;
 }
 
-// _loop0_177: ',' double_starred_kvpair
+// _loop0_178: ',' double_starred_kvpair
 static asdl_seq *
-_loop0_177_rule(Parser *p)
+_loop0_178_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31751,7 +31808,7 @@ _loop0_177_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _loop0_177[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' double_starred_kvpair"));
+        D(fprintf(stderr, "%*c> _loop0_178[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' double_starred_kvpair"));
         Token * _literal;
         KeyValuePair* elem;
         while (
@@ -31782,7 +31839,7 @@ _loop0_177_rule(Parser *p)
             _mark = p->mark;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _loop0_177[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _loop0_178[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "',' double_starred_kvpair"));
     }
     asdl_seq *_seq = (asdl_seq*)_Py_asdl_generic_seq_new(_n, p->arena);
@@ -31795,14 +31852,14 @@ _loop0_177_rule(Parser *p)
     }
     for (int i = 0; i < _n; i++) asdl_seq_SET_UNTYPED(_seq, i, _children[i]);
     PyMem_Free(_children);
-    _PyPegen_insert_memo(p, _start_mark, _loop0_177_type, _seq);
+    _PyPegen_insert_memo(p, _start_mark, _loop0_178_type, _seq);
     D(p->level--);
     return _seq;
 }
 
-// _gather_176: double_starred_kvpair _loop0_177
+// _gather_177: double_starred_kvpair _loop0_178
 static asdl_seq *
-_gather_176_rule(Parser *p)
+_gather_177_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31811,27 +31868,27 @@ _gather_176_rule(Parser *p)
     }
     asdl_seq * _res = NULL;
     int _mark = p->mark;
-    { // double_starred_kvpair _loop0_177
+    { // double_starred_kvpair _loop0_178
         if (p->error_indicator) {
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _gather_176[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "double_starred_kvpair _loop0_177"));
+        D(fprintf(stderr, "%*c> _gather_177[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "double_starred_kvpair _loop0_178"));
         KeyValuePair* elem;
         asdl_seq * seq;
         if (
             (elem = double_starred_kvpair_rule(p))  // double_starred_kvpair
             &&
-            (seq = _loop0_177_rule(p))  // _loop0_177
+            (seq = _loop0_178_rule(p))  // _loop0_178
         )
         {
-            D(fprintf(stderr, "%*c+ _gather_176[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "double_starred_kvpair _loop0_177"));
+            D(fprintf(stderr, "%*c+ _gather_177[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "double_starred_kvpair _loop0_178"));
             _res = _PyPegen_seq_insert_in_front(p, elem, seq);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _gather_176[%d-%d]: %s failed!\n", p->level, ' ',
-                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "double_starred_kvpair _loop0_177"));
+        D(fprintf(stderr, "%*c%s _gather_177[%d-%d]: %s failed!\n", p->level, ' ',
+                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "double_starred_kvpair _loop0_178"));
     }
     _res = NULL;
   done:
@@ -31839,9 +31896,9 @@ _gather_176_rule(Parser *p)
     return _res;
 }
 
-// _tmp_178: '}' | ','
+// _tmp_179: '}' | ','
 static void *
-_tmp_178_rule(Parser *p)
+_tmp_179_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31855,18 +31912,18 @@ _tmp_178_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_178[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'}'"));
+        D(fprintf(stderr, "%*c> _tmp_179[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'}'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 26))  // token='}'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_178[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'}'"));
+            D(fprintf(stderr, "%*c+ _tmp_179[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'}'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_178[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_179[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'}'"));
     }
     { // ','
@@ -31874,18 +31931,18 @@ _tmp_178_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_178[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "','"));
+        D(fprintf(stderr, "%*c> _tmp_179[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "','"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 12))  // token=','
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_178[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "','"));
+            D(fprintf(stderr, "%*c+ _tmp_179[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "','"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_178[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_179[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "','"));
     }
     _res = NULL;
@@ -31894,9 +31951,9 @@ _tmp_178_rule(Parser *p)
     return _res;
 }
 
-// _tmp_179: star_targets '='
+// _tmp_180: star_targets '='
 static void *
-_tmp_179_rule(Parser *p)
+_tmp_180_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31910,7 +31967,7 @@ _tmp_179_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_179[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "star_targets '='"));
+        D(fprintf(stderr, "%*c> _tmp_180[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "star_targets '='"));
         Token * _literal;
         expr_ty z;
         if (
@@ -31919,7 +31976,7 @@ _tmp_179_rule(Parser *p)
             (_literal = _PyPegen_expect_token(p, 22))  // token='='
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_179[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "star_targets '='"));
+            D(fprintf(stderr, "%*c+ _tmp_180[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "star_targets '='"));
             _res = z;
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
@@ -31929,7 +31986,7 @@ _tmp_179_rule(Parser *p)
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_179[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_180[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "star_targets '='"));
     }
     _res = NULL;
@@ -31938,9 +31995,9 @@ _tmp_179_rule(Parser *p)
     return _res;
 }
 
-// _tmp_180: '.' | '...'
+// _tmp_181: '.' | '...'
 static void *
-_tmp_180_rule(Parser *p)
+_tmp_181_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -31954,18 +32011,18 @@ _tmp_180_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_180[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'.'"));
+        D(fprintf(stderr, "%*c> _tmp_181[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'.'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 23))  // token='.'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_180[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'.'"));
+            D(fprintf(stderr, "%*c+ _tmp_181[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'.'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_180[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_181[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'.'"));
     }
     { // '...'
@@ -31973,18 +32030,18 @@ _tmp_180_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_180[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'...'"));
+        D(fprintf(stderr, "%*c> _tmp_181[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'...'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 52))  // token='...'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_180[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'...'"));
+            D(fprintf(stderr, "%*c+ _tmp_181[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'...'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_180[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_181[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'...'"));
     }
     _res = NULL;
@@ -31993,9 +32050,9 @@ _tmp_180_rule(Parser *p)
     return _res;
 }
 
-// _tmp_181: '.' | '...'
+// _tmp_182: '.' | '...'
 static void *
-_tmp_181_rule(Parser *p)
+_tmp_182_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32009,18 +32066,18 @@ _tmp_181_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_181[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'.'"));
+        D(fprintf(stderr, "%*c> _tmp_182[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'.'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 23))  // token='.'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_181[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'.'"));
+            D(fprintf(stderr, "%*c+ _tmp_182[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'.'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_181[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_182[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'.'"));
     }
     { // '...'
@@ -32028,18 +32085,18 @@ _tmp_181_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_181[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'...'"));
+        D(fprintf(stderr, "%*c> _tmp_182[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'...'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 52))  // token='...'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_181[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'...'"));
+            D(fprintf(stderr, "%*c+ _tmp_182[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'...'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_181[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_182[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'...'"));
     }
     _res = NULL;
@@ -32048,9 +32105,9 @@ _tmp_181_rule(Parser *p)
     return _res;
 }
 
-// _tmp_182: '@' named_expression NEWLINE
+// _tmp_183: '@' named_expression NEWLINE
 static void *
-_tmp_182_rule(Parser *p)
+_tmp_183_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32064,7 +32121,7 @@ _tmp_182_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_182[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'@' named_expression NEWLINE"));
+        D(fprintf(stderr, "%*c> _tmp_183[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'@' named_expression NEWLINE"));
         Token * _literal;
         expr_ty f;
         Token * newline_var;
@@ -32076,7 +32133,7 @@ _tmp_182_rule(Parser *p)
             (newline_var = _PyPegen_expect_token(p, NEWLINE))  // token='NEWLINE'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_182[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'@' named_expression NEWLINE"));
+            D(fprintf(stderr, "%*c+ _tmp_183[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'@' named_expression NEWLINE"));
             _res = f;
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
@@ -32086,7 +32143,7 @@ _tmp_182_rule(Parser *p)
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_182[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_183[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'@' named_expression NEWLINE"));
     }
     _res = NULL;
@@ -32095,9 +32152,9 @@ _tmp_182_rule(Parser *p)
     return _res;
 }
 
-// _tmp_183: ',' star_expression
+// _tmp_184: ',' star_expression
 static void *
-_tmp_183_rule(Parser *p)
+_tmp_184_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32111,7 +32168,7 @@ _tmp_183_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_183[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' star_expression"));
+        D(fprintf(stderr, "%*c> _tmp_184[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' star_expression"));
         Token * _literal;
         expr_ty c;
         if (
@@ -32120,7 +32177,7 @@ _tmp_183_rule(Parser *p)
             (c = star_expression_rule(p))  // star_expression
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_183[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "',' star_expression"));
+            D(fprintf(stderr, "%*c+ _tmp_184[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "',' star_expression"));
             _res = c;
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
@@ -32130,7 +32187,7 @@ _tmp_183_rule(Parser *p)
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_183[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_184[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "',' star_expression"));
     }
     _res = NULL;
@@ -32139,9 +32196,9 @@ _tmp_183_rule(Parser *p)
     return _res;
 }
 
-// _tmp_184: ',' expression
+// _tmp_185: ',' expression
 static void *
-_tmp_184_rule(Parser *p)
+_tmp_185_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32155,7 +32212,7 @@ _tmp_184_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_184[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' expression"));
+        D(fprintf(stderr, "%*c> _tmp_185[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' expression"));
         Token * _literal;
         expr_ty c;
         if (
@@ -32164,7 +32221,7 @@ _tmp_184_rule(Parser *p)
             (c = expression_rule(p))  // expression
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_184[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "',' expression"));
+            D(fprintf(stderr, "%*c+ _tmp_185[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "',' expression"));
             _res = c;
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
@@ -32174,7 +32231,7 @@ _tmp_184_rule(Parser *p)
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_184[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_185[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "',' expression"));
     }
     _res = NULL;
@@ -32183,9 +32240,9 @@ _tmp_184_rule(Parser *p)
     return _res;
 }
 
-// _tmp_185: 'or' conjunction
+// _tmp_186: 'or' conjunction
 static void *
-_tmp_185_rule(Parser *p)
+_tmp_186_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32199,7 +32256,7 @@ _tmp_185_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_185[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'or' conjunction"));
+        D(fprintf(stderr, "%*c> _tmp_186[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'or' conjunction"));
         Token * _keyword;
         expr_ty c;
         if (
@@ -32208,7 +32265,7 @@ _tmp_185_rule(Parser *p)
             (c = conjunction_rule(p))  // conjunction
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_185[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'or' conjunction"));
+            D(fprintf(stderr, "%*c+ _tmp_186[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'or' conjunction"));
             _res = c;
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
@@ -32218,7 +32275,7 @@ _tmp_185_rule(Parser *p)
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_185[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_186[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'or' conjunction"));
     }
     _res = NULL;
@@ -32227,9 +32284,9 @@ _tmp_185_rule(Parser *p)
     return _res;
 }
 
-// _tmp_186: 'and' inversion
+// _tmp_187: 'and' inversion
 static void *
-_tmp_186_rule(Parser *p)
+_tmp_187_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32243,7 +32300,7 @@ _tmp_186_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_186[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'and' inversion"));
+        D(fprintf(stderr, "%*c> _tmp_187[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'and' inversion"));
         Token * _keyword;
         expr_ty c;
         if (
@@ -32252,7 +32309,7 @@ _tmp_186_rule(Parser *p)
             (c = inversion_rule(p))  // inversion
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_186[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'and' inversion"));
+            D(fprintf(stderr, "%*c+ _tmp_187[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'and' inversion"));
             _res = c;
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
@@ -32262,7 +32319,7 @@ _tmp_186_rule(Parser *p)
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_186[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_187[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'and' inversion"));
     }
     _res = NULL;
@@ -32271,9 +32328,9 @@ _tmp_186_rule(Parser *p)
     return _res;
 }
 
-// _tmp_187: 'if' disjunction
+// _tmp_188: 'if' disjunction
 static void *
-_tmp_187_rule(Parser *p)
+_tmp_188_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32287,7 +32344,7 @@ _tmp_187_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_187[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'if' disjunction"));
+        D(fprintf(stderr, "%*c> _tmp_188[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'if' disjunction"));
         Token * _keyword;
         expr_ty z;
         if (
@@ -32296,7 +32353,7 @@ _tmp_187_rule(Parser *p)
             (z = disjunction_rule(p))  // disjunction
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_187[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'if' disjunction"));
+            D(fprintf(stderr, "%*c+ _tmp_188[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'if' disjunction"));
             _res = z;
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
@@ -32306,7 +32363,7 @@ _tmp_187_rule(Parser *p)
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_187[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_188[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'if' disjunction"));
     }
     _res = NULL;
@@ -32315,9 +32372,9 @@ _tmp_187_rule(Parser *p)
     return _res;
 }
 
-// _tmp_188: 'if' disjunction
+// _tmp_189: 'if' disjunction
 static void *
-_tmp_188_rule(Parser *p)
+_tmp_189_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32331,7 +32388,7 @@ _tmp_188_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_188[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'if' disjunction"));
+        D(fprintf(stderr, "%*c> _tmp_189[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'if' disjunction"));
         Token * _keyword;
         expr_ty z;
         if (
@@ -32340,7 +32397,7 @@ _tmp_188_rule(Parser *p)
             (z = disjunction_rule(p))  // disjunction
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_188[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'if' disjunction"));
+            D(fprintf(stderr, "%*c+ _tmp_189[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'if' disjunction"));
             _res = z;
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
@@ -32350,7 +32407,7 @@ _tmp_188_rule(Parser *p)
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_188[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_189[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'if' disjunction"));
     }
     _res = NULL;
@@ -32359,9 +32416,9 @@ _tmp_188_rule(Parser *p)
     return _res;
 }
 
-// _tmp_189: starred_expression | (assigment_expression | expression !':=') !'='
+// _tmp_190: starred_expression | (assigment_expression | expression !':=') !'='
 static void *
-_tmp_189_rule(Parser *p)
+_tmp_190_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32375,18 +32432,18 @@ _tmp_189_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_189[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "starred_expression"));
+        D(fprintf(stderr, "%*c> _tmp_190[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "starred_expression"));
         expr_ty starred_expression_var;
         if (
             (starred_expression_var = starred_expression_rule(p))  // starred_expression
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_189[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "starred_expression"));
+            D(fprintf(stderr, "%*c+ _tmp_190[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "starred_expression"));
             _res = starred_expression_var;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_189[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_190[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "starred_expression"));
     }
     { // (assigment_expression | expression !':=') !'='
@@ -32394,20 +32451,20 @@ _tmp_189_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_189[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(assigment_expression | expression !':=') !'='"));
-        void *_tmp_200_var;
+        D(fprintf(stderr, "%*c> _tmp_190[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "(assigment_expression | expression !':=') !'='"));
+        void *_tmp_201_var;
         if (
-            (_tmp_200_var = _tmp_200_rule(p))  // assigment_expression | expression !':='
+            (_tmp_201_var = _tmp_201_rule(p))  // assigment_expression | expression !':='
             &&
             _PyPegen_lookahead_with_int(0, _PyPegen_expect_token, p, 22)  // token='='
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_189[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "(assigment_expression | expression !':=') !'='"));
-            _res = _tmp_200_var;
+            D(fprintf(stderr, "%*c+ _tmp_190[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "(assigment_expression | expression !':=') !'='"));
+            _res = _tmp_201_var;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_189[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_190[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "(assigment_expression | expression !':=') !'='"));
     }
     _res = NULL;
@@ -32416,9 +32473,9 @@ _tmp_189_rule(Parser *p)
     return _res;
 }
 
-// _tmp_190: ',' star_target
+// _tmp_191: ',' star_target
 static void *
-_tmp_190_rule(Parser *p)
+_tmp_191_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32432,7 +32489,7 @@ _tmp_190_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_190[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' star_target"));
+        D(fprintf(stderr, "%*c> _tmp_191[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' star_target"));
         Token * _literal;
         expr_ty c;
         if (
@@ -32441,7 +32498,7 @@ _tmp_190_rule(Parser *p)
             (c = star_target_rule(p))  // star_target
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_190[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "',' star_target"));
+            D(fprintf(stderr, "%*c+ _tmp_191[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "',' star_target"));
             _res = c;
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
@@ -32451,7 +32508,7 @@ _tmp_190_rule(Parser *p)
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_190[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_191[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "',' star_target"));
     }
     _res = NULL;
@@ -32460,9 +32517,9 @@ _tmp_190_rule(Parser *p)
     return _res;
 }
 
-// _tmp_191: ',' star_target
+// _tmp_192: ',' star_target
 static void *
-_tmp_191_rule(Parser *p)
+_tmp_192_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32476,7 +32533,7 @@ _tmp_191_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_191[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' star_target"));
+        D(fprintf(stderr, "%*c> _tmp_192[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "',' star_target"));
         Token * _literal;
         expr_ty c;
         if (
@@ -32485,7 +32542,7 @@ _tmp_191_rule(Parser *p)
             (c = star_target_rule(p))  // star_target
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_191[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "',' star_target"));
+            D(fprintf(stderr, "%*c+ _tmp_192[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "',' star_target"));
             _res = c;
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
@@ -32495,7 +32552,7 @@ _tmp_191_rule(Parser *p)
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_191[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_192[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "',' star_target"));
     }
     _res = NULL;
@@ -32504,9 +32561,9 @@ _tmp_191_rule(Parser *p)
     return _res;
 }
 
-// _tmp_192: star_targets '='
+// _tmp_193: star_targets '='
 static void *
-_tmp_192_rule(Parser *p)
+_tmp_193_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32520,7 +32577,7 @@ _tmp_192_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_192[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "star_targets '='"));
+        D(fprintf(stderr, "%*c> _tmp_193[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "star_targets '='"));
         Token * _literal;
         expr_ty star_targets_var;
         if (
@@ -32529,12 +32586,12 @@ _tmp_192_rule(Parser *p)
             (_literal = _PyPegen_expect_token(p, 22))  // token='='
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_192[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "star_targets '='"));
+            D(fprintf(stderr, "%*c+ _tmp_193[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "star_targets '='"));
             _res = _PyPegen_dummy_name(p, star_targets_var, _literal);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_192[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_193[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "star_targets '='"));
     }
     _res = NULL;
@@ -32543,9 +32600,9 @@ _tmp_192_rule(Parser *p)
     return _res;
 }
 
-// _tmp_193: star_targets '='
+// _tmp_194: star_targets '='
 static void *
-_tmp_193_rule(Parser *p)
+_tmp_194_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32559,7 +32616,7 @@ _tmp_193_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_193[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "star_targets '='"));
+        D(fprintf(stderr, "%*c> _tmp_194[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "star_targets '='"));
         Token * _literal;
         expr_ty star_targets_var;
         if (
@@ -32568,12 +32625,12 @@ _tmp_193_rule(Parser *p)
             (_literal = _PyPegen_expect_token(p, 22))  // token='='
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_193[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "star_targets '='"));
+            D(fprintf(stderr, "%*c+ _tmp_194[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "star_targets '='"));
             _res = _PyPegen_dummy_name(p, star_targets_var, _literal);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_193[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_194[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "star_targets '='"));
     }
     _res = NULL;
@@ -32582,9 +32639,9 @@ _tmp_193_rule(Parser *p)
     return _res;
 }
 
-// _tmp_194: ')' | '**'
+// _tmp_195: ')' | '**'
 static void *
-_tmp_194_rule(Parser *p)
+_tmp_195_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32598,18 +32655,18 @@ _tmp_194_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_194[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "')'"));
+        D(fprintf(stderr, "%*c> _tmp_195[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "')'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 8))  // token=')'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_194[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "')'"));
+            D(fprintf(stderr, "%*c+ _tmp_195[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "')'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_194[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_195[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "')'"));
     }
     { // '**'
@@ -32617,18 +32674,18 @@ _tmp_194_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_194[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'**'"));
+        D(fprintf(stderr, "%*c> _tmp_195[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'**'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 35))  // token='**'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_194[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'**'"));
+            D(fprintf(stderr, "%*c+ _tmp_195[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'**'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_194[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_195[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'**'"));
     }
     _res = NULL;
@@ -32637,9 +32694,9 @@ _tmp_194_rule(Parser *p)
     return _res;
 }
 
-// _tmp_195: ':' | '**'
+// _tmp_196: ':' | '**'
 static void *
-_tmp_195_rule(Parser *p)
+_tmp_196_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32653,18 +32710,18 @@ _tmp_195_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_195[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "':'"));
+        D(fprintf(stderr, "%*c> _tmp_196[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "':'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 11))  // token=':'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_195[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "':'"));
+            D(fprintf(stderr, "%*c+ _tmp_196[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "':'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_195[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_196[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "':'"));
     }
     { // '**'
@@ -32672,18 +32729,18 @@ _tmp_195_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_195[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'**'"));
+        D(fprintf(stderr, "%*c> _tmp_196[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'**'"));
         Token * _literal;
         if (
             (_literal = _PyPegen_expect_token(p, 35))  // token='**'
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_195[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'**'"));
+            D(fprintf(stderr, "%*c+ _tmp_196[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'**'"));
             _res = _literal;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_195[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_196[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'**'"));
     }
     _res = NULL;
@@ -32692,9 +32749,9 @@ _tmp_195_rule(Parser *p)
     return _res;
 }
 
-// _tmp_196: expression ['as' star_target]
+// _tmp_197: expression ['as' star_target]
 static void *
-_tmp_196_rule(Parser *p)
+_tmp_197_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32708,22 +32765,22 @@ _tmp_196_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_196[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "expression ['as' star_target]"));
+        D(fprintf(stderr, "%*c> _tmp_197[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "expression ['as' star_target]"));
         void *_opt_var;
         UNUSED(_opt_var); // Silence compiler warnings
         expr_ty expression_var;
         if (
             (expression_var = expression_rule(p))  // expression
             &&
-            (_opt_var = _tmp_201_rule(p), 1)  // ['as' star_target]
+            (_opt_var = _tmp_202_rule(p), 1)  // ['as' star_target]
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_196[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "expression ['as' star_target]"));
+            D(fprintf(stderr, "%*c+ _tmp_197[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "expression ['as' star_target]"));
             _res = _PyPegen_dummy_name(p, expression_var, _opt_var);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_196[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_197[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "expression ['as' star_target]"));
     }
     _res = NULL;
@@ -32732,9 +32789,9 @@ _tmp_196_rule(Parser *p)
     return _res;
 }
 
-// _tmp_197: expressions ['as' star_target]
+// _tmp_198: expressions ['as' star_target]
 static void *
-_tmp_197_rule(Parser *p)
+_tmp_198_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32748,22 +32805,22 @@ _tmp_197_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_197[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "expressions ['as' star_target]"));
+        D(fprintf(stderr, "%*c> _tmp_198[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "expressions ['as' star_target]"));
         void *_opt_var;
         UNUSED(_opt_var); // Silence compiler warnings
         expr_ty expressions_var;
         if (
             (expressions_var = expressions_rule(p))  // expressions
             &&
-            (_opt_var = _tmp_202_rule(p), 1)  // ['as' star_target]
+            (_opt_var = _tmp_203_rule(p), 1)  // ['as' star_target]
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_197[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "expressions ['as' star_target]"));
+            D(fprintf(stderr, "%*c+ _tmp_198[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "expressions ['as' star_target]"));
             _res = _PyPegen_dummy_name(p, expressions_var, _opt_var);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_197[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_198[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "expressions ['as' star_target]"));
     }
     _res = NULL;
@@ -32772,9 +32829,9 @@ _tmp_197_rule(Parser *p)
     return _res;
 }
 
-// _tmp_198: expression ['as' star_target]
+// _tmp_199: expression ['as' star_target]
 static void *
-_tmp_198_rule(Parser *p)
+_tmp_199_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32788,22 +32845,22 @@ _tmp_198_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_198[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "expression ['as' star_target]"));
+        D(fprintf(stderr, "%*c> _tmp_199[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "expression ['as' star_target]"));
         void *_opt_var;
         UNUSED(_opt_var); // Silence compiler warnings
         expr_ty expression_var;
         if (
             (expression_var = expression_rule(p))  // expression
             &&
-            (_opt_var = _tmp_203_rule(p), 1)  // ['as' star_target]
+            (_opt_var = _tmp_204_rule(p), 1)  // ['as' star_target]
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_198[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "expression ['as' star_target]"));
+            D(fprintf(stderr, "%*c+ _tmp_199[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "expression ['as' star_target]"));
             _res = _PyPegen_dummy_name(p, expression_var, _opt_var);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_198[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_199[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "expression ['as' star_target]"));
     }
     _res = NULL;
@@ -32812,9 +32869,9 @@ _tmp_198_rule(Parser *p)
     return _res;
 }
 
-// _tmp_199: expressions ['as' star_target]
+// _tmp_200: expressions ['as' star_target]
 static void *
-_tmp_199_rule(Parser *p)
+_tmp_200_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32828,22 +32885,22 @@ _tmp_199_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_199[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "expressions ['as' star_target]"));
+        D(fprintf(stderr, "%*c> _tmp_200[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "expressions ['as' star_target]"));
         void *_opt_var;
         UNUSED(_opt_var); // Silence compiler warnings
         expr_ty expressions_var;
         if (
             (expressions_var = expressions_rule(p))  // expressions
             &&
-            (_opt_var = _tmp_204_rule(p), 1)  // ['as' star_target]
+            (_opt_var = _tmp_205_rule(p), 1)  // ['as' star_target]
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_199[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "expressions ['as' star_target]"));
+            D(fprintf(stderr, "%*c+ _tmp_200[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "expressions ['as' star_target]"));
             _res = _PyPegen_dummy_name(p, expressions_var, _opt_var);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_199[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_200[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "expressions ['as' star_target]"));
     }
     _res = NULL;
@@ -32852,9 +32909,9 @@ _tmp_199_rule(Parser *p)
     return _res;
 }
 
-// _tmp_200: assigment_expression | expression !':='
+// _tmp_201: assigment_expression | expression !':='
 static void *
-_tmp_200_rule(Parser *p)
+_tmp_201_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32868,18 +32925,18 @@ _tmp_200_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_200[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "assigment_expression"));
+        D(fprintf(stderr, "%*c> _tmp_201[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "assigment_expression"));
         expr_ty assigment_expression_var;
         if (
             (assigment_expression_var = assigment_expression_rule(p))  // assigment_expression
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_200[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "assigment_expression"));
+            D(fprintf(stderr, "%*c+ _tmp_201[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "assigment_expression"));
             _res = assigment_expression_var;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_200[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_201[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "assigment_expression"));
     }
     { // expression !':='
@@ -32887,7 +32944,7 @@ _tmp_200_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_200[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "expression !':='"));
+        D(fprintf(stderr, "%*c> _tmp_201[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "expression !':='"));
         expr_ty expression_var;
         if (
             (expression_var = expression_rule(p))  // expression
@@ -32895,12 +32952,12 @@ _tmp_200_rule(Parser *p)
             _PyPegen_lookahead_with_int(0, _PyPegen_expect_token, p, 53)  // token=':='
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_200[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "expression !':='"));
+            D(fprintf(stderr, "%*c+ _tmp_201[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "expression !':='"));
             _res = expression_var;
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_200[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_201[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "expression !':='"));
     }
     _res = NULL;
@@ -32909,9 +32966,9 @@ _tmp_200_rule(Parser *p)
     return _res;
 }
 
-// _tmp_201: 'as' star_target
+// _tmp_202: 'as' star_target
 static void *
-_tmp_201_rule(Parser *p)
+_tmp_202_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32925,7 +32982,7 @@ _tmp_201_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_201[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
+        D(fprintf(stderr, "%*c> _tmp_202[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
         Token * _keyword;
         expr_ty star_target_var;
         if (
@@ -32934,12 +32991,12 @@ _tmp_201_rule(Parser *p)
             (star_target_var = star_target_rule(p))  // star_target
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_201[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
+            D(fprintf(stderr, "%*c+ _tmp_202[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
             _res = _PyPegen_dummy_name(p, _keyword, star_target_var);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_201[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_202[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'as' star_target"));
     }
     _res = NULL;
@@ -32948,9 +33005,9 @@ _tmp_201_rule(Parser *p)
     return _res;
 }
 
-// _tmp_202: 'as' star_target
+// _tmp_203: 'as' star_target
 static void *
-_tmp_202_rule(Parser *p)
+_tmp_203_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -32964,7 +33021,7 @@ _tmp_202_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_202[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
+        D(fprintf(stderr, "%*c> _tmp_203[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
         Token * _keyword;
         expr_ty star_target_var;
         if (
@@ -32973,12 +33030,12 @@ _tmp_202_rule(Parser *p)
             (star_target_var = star_target_rule(p))  // star_target
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_202[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
+            D(fprintf(stderr, "%*c+ _tmp_203[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
             _res = _PyPegen_dummy_name(p, _keyword, star_target_var);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_202[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_203[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'as' star_target"));
     }
     _res = NULL;
@@ -32987,9 +33044,9 @@ _tmp_202_rule(Parser *p)
     return _res;
 }
 
-// _tmp_203: 'as' star_target
+// _tmp_204: 'as' star_target
 static void *
-_tmp_203_rule(Parser *p)
+_tmp_204_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -33003,7 +33060,7 @@ _tmp_203_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_203[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
+        D(fprintf(stderr, "%*c> _tmp_204[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
         Token * _keyword;
         expr_ty star_target_var;
         if (
@@ -33012,12 +33069,12 @@ _tmp_203_rule(Parser *p)
             (star_target_var = star_target_rule(p))  // star_target
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_203[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
+            D(fprintf(stderr, "%*c+ _tmp_204[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
             _res = _PyPegen_dummy_name(p, _keyword, star_target_var);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_203[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_204[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'as' star_target"));
     }
     _res = NULL;
@@ -33026,9 +33083,9 @@ _tmp_203_rule(Parser *p)
     return _res;
 }
 
-// _tmp_204: 'as' star_target
+// _tmp_205: 'as' star_target
 static void *
-_tmp_204_rule(Parser *p)
+_tmp_205_rule(Parser *p)
 {
     D(p->level++);
     if (p->error_indicator) {
@@ -33042,7 +33099,7 @@ _tmp_204_rule(Parser *p)
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> _tmp_204[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
+        D(fprintf(stderr, "%*c> _tmp_205[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
         Token * _keyword;
         expr_ty star_target_var;
         if (
@@ -33051,12 +33108,12 @@ _tmp_204_rule(Parser *p)
             (star_target_var = star_target_rule(p))  // star_target
         )
         {
-            D(fprintf(stderr, "%*c+ _tmp_204[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
+            D(fprintf(stderr, "%*c+ _tmp_205[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'as' star_target"));
             _res = _PyPegen_dummy_name(p, _keyword, star_target_var);
             goto done;
         }
         p->mark = _mark;
-        D(fprintf(stderr, "%*c%s _tmp_204[%d-%d]: %s failed!\n", p->level, ' ',
+        D(fprintf(stderr, "%*c%s _tmp_205[%d-%d]: %s failed!\n", p->level, ' ',
                   p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'as' star_target"));
     }
     _res = NULL;


From webhook-mailer at python.org  Thu Aug  5 16:48:26 2021
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 05 Aug 2021 20:48:26 -0000
Subject: [Python-checkins] bpo-44679: [doc] fix typo in unittest.mock.rst
 (GH-27618)
Message-ID: <mailman.909.1628196507.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/938e84b4fa410f1a86f5e0708ebc3af6bb8efb0e
commit: 938e84b4fa410f1a86f5e0708ebc3af6bb8efb0e
branch: main
author: Jack DeVries <58614260+jdevries3133 at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-05T13:48:18-07:00
summary:

bpo-44679: [doc] fix typo in unittest.mock.rst (GH-27618)

files:
M Doc/library/unittest.mock.rst

diff --git a/Doc/library/unittest.mock.rst b/Doc/library/unittest.mock.rst
index e760321ba129c..2f82fded9943d 100644
--- a/Doc/library/unittest.mock.rst
+++ b/Doc/library/unittest.mock.rst
@@ -2208,7 +2208,7 @@ In this example we monkey patch ``method`` to return ``sentinel.some_object``:
     >>> real.method.return_value = sentinel.some_object
     >>> result = real.method()
     >>> assert result is sentinel.some_object
-    >>> sentinel.some_object
+    >>> result
     sentinel.some_object
 
 


From webhook-mailer at python.org  Thu Aug  5 17:10:24 2021
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 05 Aug 2021 21:10:24 -0000
Subject: [Python-checkins] bpo-44679: [doc] fix typo in unittest.mock.rst
 (GH-27618)
Message-ID: <mailman.910.1628197825.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/0a642d57736be6802c712bdbf2dcff39fe8a39b7
commit: 0a642d57736be6802c712bdbf2dcff39fe8a39b7
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-05T14:10:14-07:00
summary:

bpo-44679: [doc] fix typo in unittest.mock.rst (GH-27618)

(cherry picked from commit 938e84b4fa410f1a86f5e0708ebc3af6bb8efb0e)

Co-authored-by: Jack DeVries <58614260+jdevries3133 at users.noreply.github.com>

files:
M Doc/library/unittest.mock.rst

diff --git a/Doc/library/unittest.mock.rst b/Doc/library/unittest.mock.rst
index f1c0757c510fa..d0640b42ef40a 100644
--- a/Doc/library/unittest.mock.rst
+++ b/Doc/library/unittest.mock.rst
@@ -2208,7 +2208,7 @@ In this example we monkey patch ``method`` to return ``sentinel.some_object``:
     >>> real.method.return_value = sentinel.some_object
     >>> result = real.method()
     >>> assert result is sentinel.some_object
-    >>> sentinel.some_object
+    >>> result
     sentinel.some_object
 
 


From webhook-mailer at python.org  Fri Aug  6 07:11:19 2021
From: webhook-mailer at python.org (vstinner)
Date: Fri, 06 Aug 2021 11:11:19 -0000
Subject: [Python-checkins] bpo-44584: Deprecate PYTHONTHREADDEBUG env var
 (GH-27065)
Message-ID: <mailman.911.1628248281.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/4d77691172aae81bdcbb0ea75839d0e896c43781
commit: 4d77691172aae81bdcbb0ea75839d0e896c43781
branch: main
author: Victor Stinner <vstinner at python.org>
committer: vstinner <vstinner at python.org>
date: 2021-08-06T13:11:12+02:00
summary:

bpo-44584: Deprecate PYTHONTHREADDEBUG env var (GH-27065)

The threading debug (PYTHONTHREADDEBUG environment variable) is
deprecated in Python 3.10 and will be removed in Python 3.12. This
feature requires a debug build of Python.

files:
A Misc/NEWS.d/next/Core and Builtins/2021-07-08-12-18-56.bpo-44584.qKnSqV.rst
M Doc/using/cmdline.rst
M Doc/whatsnew/3.10.rst
M Lib/test/test_threading.py
M Misc/python.man
M Python/pylifecycle.c
M Python/thread.c

diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 98fdba24e28bf4..9e391604a1a59d 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -962,10 +962,12 @@ Debug-mode variables
 
 .. envvar:: PYTHONTHREADDEBUG
 
-   If set, Python will print threading debug info.
+   If set, Python will print threading debug info into stdout.
 
    Need a :ref:`debug build of Python <debug-build>`.
 
+   .. deprecated-removed:: 3.10 3.12
+
 
 .. envvar:: PYTHONDUMPREFS
 
diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst
index 52901506362921..ae6ad9c52ccade 100644
--- a/Doc/whatsnew/3.10.rst
+++ b/Doc/whatsnew/3.10.rst
@@ -1691,6 +1691,11 @@ Deprecated
   * NPN features like :meth:`ssl.SSLSocket.selected_npn_protocol` and
     :meth:`ssl.SSLContext.set_npn_protocols` are replaced by ALPN.
 
+* The threading debug (:envvar:`PYTHONTHREADDEBUG` environment variable) is
+  deprecated in Python 3.10 and will be removed in Python 3.12. This feature
+  requires a :ref:`debug build of Python <debug-build>`.
+  (Contributed by Victor Stinner in :issue:`44584`.)
+
 .. _whatsnew310-removed:
 
 Removed
diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index 23fe2d3f4d32e2..c51de6f4b85537 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -32,6 +32,9 @@
 # on platforms known to behave badly.
 platforms_to_skip = ('netbsd5', 'hp-ux11')
 
+# Is Python built with Py_DEBUG macro defined?
+Py_DEBUG = hasattr(sys, 'gettotalrefcount')
+
 
 def restore_default_excepthook(testcase):
     testcase.addCleanup(setattr, threading, 'excepthook', threading.excepthook)
@@ -915,6 +918,16 @@ def noop(): pass
             threading.Thread(target=noop).start()
             # Thread.join() is not called
 
+    @unittest.skipUnless(Py_DEBUG, 'need debug build (Py_DEBUG)')
+    def test_debug_deprecation(self):
+        # bpo-44584: The PYTHONTHREADDEBUG environment variable is deprecated
+        rc, out, err = assert_python_ok("-Wdefault", "-c", "pass",
+                                        PYTHONTHREADDEBUG="1")
+        msg = (b'DeprecationWarning: The threading debug '
+               b'(PYTHONTHREADDEBUG environment variable) '
+               b'is deprecated and will be removed in Python 3.12')
+        self.assertIn(msg, err)
+
 
 class ThreadJoinOnShutdown(BaseTestCase):
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-07-08-12-18-56.bpo-44584.qKnSqV.rst b/Misc/NEWS.d/next/Core and Builtins/2021-07-08-12-18-56.bpo-44584.qKnSqV.rst
new file mode 100644
index 00000000000000..4afb33b047d4be
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-07-08-12-18-56.bpo-44584.qKnSqV.rst	
@@ -0,0 +1,3 @@
+The threading debug (:envvar:`PYTHONTHREADDEBUG` environment variable) is
+deprecated in Python 3.10 and will be removed in Python 3.12. This feature
+requires a debug build of Python. Patch by Victor Stinner.
diff --git a/Misc/python.man b/Misc/python.man
index 10cb807c38a02c..45a49271d4dfe3 100644
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -550,6 +550,7 @@ if Python was configured with the
 \fB\--with-pydebug\fP build option.
 .IP PYTHONTHREADDEBUG
 If this environment variable is set, Python will print threading debug info.
+The feature is deprecated in Python 3.10 and will be removed in Python 3.12.
 .IP PYTHONDUMPREFS
 If this environment variable is set, Python will dump objects and reference
 counts still alive after shutting down the interpreter.
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index d31a9c15fd1ec5..eeaf20b4617a20 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -1057,6 +1057,8 @@ pyinit_main_reconfigure(PyThreadState *tstate)
 static PyStatus
 init_interp_main(PyThreadState *tstate)
 {
+    extern void _PyThread_debug_deprecation(void);
+
     assert(!_PyErr_Occurred(tstate));
 
     PyStatus status;
@@ -1158,6 +1160,9 @@ init_interp_main(PyThreadState *tstate)
 #endif
     }
 
+    // Warn about PYTHONTHREADDEBUG deprecation
+    _PyThread_debug_deprecation();
+
     assert(!_PyErr_Occurred(tstate));
 
     return _PyStatus_OK();
diff --git a/Python/thread.c b/Python/thread.c
index a10f5728dc0ceb..dfe28b6bdb680d 100644
--- a/Python/thread.c
+++ b/Python/thread.c
@@ -75,6 +75,25 @@ PyThread_init_thread(void)
     PyThread__init_thread();
 }
 
+void
+_PyThread_debug_deprecation(void)
+{
+#ifdef Py_DEBUG
+    if (thread_debug) {
+        // Flush previous dprintf() logs
+        fflush(stdout);
+        if (PyErr_WarnEx(PyExc_DeprecationWarning,
+                         "The threading debug (PYTHONTHREADDEBUG environment "
+                         "variable) is deprecated and will be removed "
+                         "in Python 3.12",
+                         0))
+        {
+            _PyErr_WriteUnraisableMsg("at Python startup", NULL);
+        }
+    }
+#endif
+}
+
 #if defined(_POSIX_THREADS)
 #   define PYTHREAD_NAME "pthread"
 #   include "thread_pthread.h"


From webhook-mailer at python.org  Fri Aug  6 07:33:16 2021
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 06 Aug 2021 11:33:16 -0000
Subject: [Python-checkins] bpo-44584: Deprecate PYTHONTHREADDEBUG env var
 (GH-27065)
Message-ID: <mailman.912.1628249597.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/a11158ecef8cff795f7db8f4047cbd20cc9cf37e
commit: a11158ecef8cff795f7db8f4047cbd20cc9cf37e
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-06T04:32:37-07:00
summary:

bpo-44584: Deprecate PYTHONTHREADDEBUG env var (GH-27065)


The threading debug (PYTHONTHREADDEBUG environment variable) is
deprecated in Python 3.10 and will be removed in Python 3.12. This
feature requires a debug build of Python.
(cherry picked from commit 4d77691172aae81bdcbb0ea75839d0e896c43781)

Co-authored-by: Victor Stinner <vstinner at python.org>

files:
A Misc/NEWS.d/next/Core and Builtins/2021-07-08-12-18-56.bpo-44584.qKnSqV.rst
M Doc/using/cmdline.rst
M Doc/whatsnew/3.10.rst
M Lib/test/test_threading.py
M Misc/python.man
M Python/pylifecycle.c
M Python/thread.c

diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 25e05d413de877..f22548facd0f92 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -942,10 +942,12 @@ Debug-mode variables
 
 .. envvar:: PYTHONTHREADDEBUG
 
-   If set, Python will print threading debug info.
+   If set, Python will print threading debug info into stdout.
 
    Need a :ref:`debug build of Python <debug-build>`.
 
+   .. deprecated-removed:: 3.10 3.12
+
 
 .. envvar:: PYTHONDUMPREFS
 
diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst
index 5af1693e90cacf..d9a90fb63f18ed 100644
--- a/Doc/whatsnew/3.10.rst
+++ b/Doc/whatsnew/3.10.rst
@@ -1687,6 +1687,11 @@ Deprecated
   * NPN features like :meth:`ssl.SSLSocket.selected_npn_protocol` and
     :meth:`ssl.SSLContext.set_npn_protocols` are replaced by ALPN.
 
+* The threading debug (:envvar:`PYTHONTHREADDEBUG` environment variable) is
+  deprecated in Python 3.10 and will be removed in Python 3.12. This feature
+  requires a :ref:`debug build of Python <debug-build>`.
+  (Contributed by Victor Stinner in :issue:`44584`.)
+
 .. _whatsnew310-removed:
 
 Removed
diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index 23fe2d3f4d32e2..c51de6f4b85537 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -32,6 +32,9 @@
 # on platforms known to behave badly.
 platforms_to_skip = ('netbsd5', 'hp-ux11')
 
+# Is Python built with Py_DEBUG macro defined?
+Py_DEBUG = hasattr(sys, 'gettotalrefcount')
+
 
 def restore_default_excepthook(testcase):
     testcase.addCleanup(setattr, threading, 'excepthook', threading.excepthook)
@@ -915,6 +918,16 @@ def noop(): pass
             threading.Thread(target=noop).start()
             # Thread.join() is not called
 
+    @unittest.skipUnless(Py_DEBUG, 'need debug build (Py_DEBUG)')
+    def test_debug_deprecation(self):
+        # bpo-44584: The PYTHONTHREADDEBUG environment variable is deprecated
+        rc, out, err = assert_python_ok("-Wdefault", "-c", "pass",
+                                        PYTHONTHREADDEBUG="1")
+        msg = (b'DeprecationWarning: The threading debug '
+               b'(PYTHONTHREADDEBUG environment variable) '
+               b'is deprecated and will be removed in Python 3.12')
+        self.assertIn(msg, err)
+
 
 class ThreadJoinOnShutdown(BaseTestCase):
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-07-08-12-18-56.bpo-44584.qKnSqV.rst b/Misc/NEWS.d/next/Core and Builtins/2021-07-08-12-18-56.bpo-44584.qKnSqV.rst
new file mode 100644
index 00000000000000..4afb33b047d4be
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-07-08-12-18-56.bpo-44584.qKnSqV.rst	
@@ -0,0 +1,3 @@
+The threading debug (:envvar:`PYTHONTHREADDEBUG` environment variable) is
+deprecated in Python 3.10 and will be removed in Python 3.12. This feature
+requires a debug build of Python. Patch by Victor Stinner.
diff --git a/Misc/python.man b/Misc/python.man
index 10cb807c38a02c..45a49271d4dfe3 100644
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -550,6 +550,7 @@ if Python was configured with the
 \fB\--with-pydebug\fP build option.
 .IP PYTHONTHREADDEBUG
 If this environment variable is set, Python will print threading debug info.
+The feature is deprecated in Python 3.10 and will be removed in Python 3.12.
 .IP PYTHONDUMPREFS
 If this environment variable is set, Python will dump objects and reference
 counts still alive after shutting down the interpreter.
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index d31a9c15fd1ec5..eeaf20b4617a20 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -1057,6 +1057,8 @@ pyinit_main_reconfigure(PyThreadState *tstate)
 static PyStatus
 init_interp_main(PyThreadState *tstate)
 {
+    extern void _PyThread_debug_deprecation(void);
+
     assert(!_PyErr_Occurred(tstate));
 
     PyStatus status;
@@ -1158,6 +1160,9 @@ init_interp_main(PyThreadState *tstate)
 #endif
     }
 
+    // Warn about PYTHONTHREADDEBUG deprecation
+    _PyThread_debug_deprecation();
+
     assert(!_PyErr_Occurred(tstate));
 
     return _PyStatus_OK();
diff --git a/Python/thread.c b/Python/thread.c
index a10f5728dc0ceb..dfe28b6bdb680d 100644
--- a/Python/thread.c
+++ b/Python/thread.c
@@ -75,6 +75,25 @@ PyThread_init_thread(void)
     PyThread__init_thread();
 }
 
+void
+_PyThread_debug_deprecation(void)
+{
+#ifdef Py_DEBUG
+    if (thread_debug) {
+        // Flush previous dprintf() logs
+        fflush(stdout);
+        if (PyErr_WarnEx(PyExc_DeprecationWarning,
+                         "The threading debug (PYTHONTHREADDEBUG environment "
+                         "variable) is deprecated and will be removed "
+                         "in Python 3.12",
+                         0))
+        {
+            _PyErr_WriteUnraisableMsg("at Python startup", NULL);
+        }
+    }
+#endif
+}
+
 #if defined(_POSIX_THREADS)
 #   define PYTHREAD_NAME "pthread"
 #   include "thread_pthread.h"


From webhook-mailer at python.org  Fri Aug  6 08:51:00 2021
From: webhook-mailer at python.org (ambv)
Date: Fri, 06 Aug 2021 12:51:00 -0000
Subject: [Python-checkins] bpo-40928: notify users running test_decimal on
 macOS of malloc warnings (GH-26783)
Message-ID: <mailman.913.1628254261.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/15d3c14df32a35ac69898a7852115722e30d7857
commit: 15d3c14df32a35ac69898a7852115722e30d7857
branch: main
author: Jack DeVries <58614260+jdevries3133 at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-06T14:50:56+02:00
summary:

bpo-40928: notify users running test_decimal on macOS of malloc warnings (GH-26783)

* When trying to allocate very large regions on macOS, malloc does not   fail silently. It sends a noisy error out to STDERR
* This provides a helper function to warn the user, and provides the warning for test_decimal, which consistently generates these warnings on macOS.

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Misc/NEWS.d/next/Tests/2021-08-06-00-07-15.bpo-40928.aIwb6G.rst
M Lib/test/support/__init__.py
M Lib/test/test_decimal.py

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index e2847d5d3771ea..b380271d24f230 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -467,6 +467,24 @@ def requires_debug_ranges(reason='requires co_positions / debug_ranges'):
 TEST_DATA_DIR = os.path.join(TEST_HOME_DIR, "data")
 
 
+def darwin_malloc_err_warning(test_name):
+    """Assure user that loud errors generated by macOS libc's malloc are
+    expected."""
+    if sys.platform != 'darwin':
+        return
+
+    import shutil
+    msg = ' NOTICE '
+    detail = (f'{test_name} may generate "malloc can\'t allocate region"\n'
+              'warnings on macOS systems. This behavior is known. Do not\n'
+              'report a bug unless tests are also failing. See bpo-40928.')
+
+    padding, _ = shutil.get_terminal_size()
+    print(msg.center(padding, '-'))
+    print(detail)
+    print('-' * padding)
+
+
 def findfile(filename, subdir=None):
     """Try to find a file on sys.path or in the test directory.  If it is not
     found the argument passed to the function is returned (this does not
diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py
index 058829b03a3dee..28d56909b30034 100644
--- a/Lib/test/test_decimal.py
+++ b/Lib/test/test_decimal.py
@@ -36,7 +36,8 @@
                           requires_IEEE_754, requires_docstrings,
                           requires_legacy_unicode_capi)
 from test.support import (TestFailed,
-                          run_with_locale, cpython_only)
+                          run_with_locale, cpython_only,
+                          darwin_malloc_err_warning)
 from test.support.import_helper import import_fresh_module
 from test.support import warnings_helper
 import random
@@ -44,6 +45,10 @@
 import threading
 
 
+if sys.platform == 'darwin':
+    darwin_malloc_err_warning('test_decimal')
+
+
 C = import_fresh_module('decimal', fresh=['_decimal'])
 P = import_fresh_module('decimal', blocked=['_decimal'])
 orig_sys_decimal = sys.modules['decimal']
diff --git a/Misc/NEWS.d/next/Tests/2021-08-06-00-07-15.bpo-40928.aIwb6G.rst b/Misc/NEWS.d/next/Tests/2021-08-06-00-07-15.bpo-40928.aIwb6G.rst
new file mode 100644
index 00000000000000..c9a5e1b01e58aa
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2021-08-06-00-07-15.bpo-40928.aIwb6G.rst
@@ -0,0 +1,2 @@
+Notify users running test_decimal regression tests on macOS of potential
+harmless "malloc can't allocate region" messages spewed by test_decimal.


From webhook-mailer at python.org  Fri Aug  6 09:15:18 2021
From: webhook-mailer at python.org (vstinner)
Date: Fri, 06 Aug 2021 13:15:18 -0000
Subject: [Python-checkins] bpo-44849: Fix os.set_inheritable() on FreeBSD 14
 with O_PATH (GH-27623)
Message-ID: <mailman.914.1628255719.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/c24896c0e3b32c8a9f614ef51366007b67d5c665
commit: c24896c0e3b32c8a9f614ef51366007b67d5c665
branch: main
author: Victor Stinner <vstinner at python.org>
committer: vstinner <vstinner at python.org>
date: 2021-08-06T15:15:10+02:00
summary:

bpo-44849: Fix os.set_inheritable() on FreeBSD 14 with O_PATH (GH-27623)

Fix the os.set_inheritable() function on FreeBSD 14 for file
descriptor opened with the O_PATH flag: ignore the EBADF error on
ioctl(), fallback on the fcntl() implementation.

files:
A Misc/NEWS.d/next/Library/2021-08-06-13-00-28.bpo-44849.O78F_f.rst
M Python/fileutils.c

diff --git a/Misc/NEWS.d/next/Library/2021-08-06-13-00-28.bpo-44849.O78F_f.rst b/Misc/NEWS.d/next/Library/2021-08-06-13-00-28.bpo-44849.O78F_f.rst
new file mode 100644
index 00000000000000..b1f225485ddef5
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-06-13-00-28.bpo-44849.O78F_f.rst
@@ -0,0 +1,4 @@
+Fix the :func:`os.set_inheritable` function on FreeBSD 14 for file descriptor
+opened with the :data:`~os.O_PATH` flag: ignore the :data:`~errno.EBADF`
+error on ``ioctl()``, fallback on the ``fcntl()`` implementation. Patch by
+Victor Stinner.
diff --git a/Python/fileutils.c b/Python/fileutils.c
index a8fab00629da41..e8a7eda505c7ec 100644
--- a/Python/fileutils.c
+++ b/Python/fileutils.c
@@ -1374,10 +1374,11 @@ set_inheritable(int fd, int inheritable, int raise, int *atomic_flag_works)
             return 0;
         }
 
-#ifdef __linux__
+#ifdef O_PATH
         if (errno == EBADF) {
-            // On Linux, ioctl(FIOCLEX) will fail with EBADF for O_PATH file descriptors
-            // Fall through to the fcntl() path
+            // bpo-44849: On Linux and FreeBSD, ioctl(FIOCLEX) fails with EBADF
+            // on O_PATH file descriptors. Fall through to the fcntl()
+            // implementation.
         }
         else
 #endif


From webhook-mailer at python.org  Fri Aug  6 09:35:46 2021
From: webhook-mailer at python.org (ambv)
Date: Fri, 06 Aug 2021 13:35:46 -0000
Subject: [Python-checkins] [3.9] bpo-40928: notify users running
 test_decimal on macOS of malloc warnings (GH-26783) (GH-27629)
Message-ID: <mailman.915.1628256947.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/693a661478036dc2c5b48e138dd09320a972c25a
commit: 693a661478036dc2c5b48e138dd09320a972c25a
branch: 3.9
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2021-08-06T15:35:11+02:00
summary:

[3.9] bpo-40928: notify users running test_decimal on macOS of malloc warnings (GH-26783) (GH-27629)

* When trying to allocate very large regions on macOS, malloc does not   fail silently. It sends a noisy error out to STDERR
* This provides a helper function to warn the user, and provides the warning for test_decimal, which consistently generates these warnings on macOS.

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>.
(cherry picked from commit 15d3c14df32a35ac69898a7852115722e30d7857)

Co-authored-by: Jack DeVries <58614260+jdevries3133 at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Tests/2021-08-06-00-07-15.bpo-40928.aIwb6G.rst
M Lib/test/support/__init__.py
M Lib/test/test_decimal.py

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index bc263b3033e1fc..ff7db991589c2b 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -986,6 +986,25 @@ def temp_umask(umask):
 # TEST_DATA_DIR is used as a target download location for remote resources
 TEST_DATA_DIR = os.path.join(TEST_HOME_DIR, "data")
 
+
+def darwin_malloc_err_warning(test_name):
+    """Assure user that loud errors generated by macOS libc's malloc are
+    expected."""
+    if sys.platform != 'darwin':
+        return
+
+    import shutil
+    msg = ' NOTICE '
+    detail = (f'{test_name} may generate "malloc can\'t allocate region"\n'
+              'warnings on macOS systems. This behavior is known. Do not\n'
+              'report a bug unless tests are also failing. See bpo-40928.')
+
+    padding, _ = shutil.get_terminal_size()
+    print(msg.center(padding, '-'))
+    print(detail)
+    print('-' * padding)
+
+
 def findfile(filename, subdir=None):
     """Try to find a file on sys.path or in the test directory.  If it is not
     found the argument passed to the function is returned (this does not
diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py
index fd62f37de18736..d37c53da2cf4f5 100644
--- a/Lib/test/test_decimal.py
+++ b/Lib/test/test_decimal.py
@@ -35,12 +35,17 @@
 from test.support import (run_unittest, run_doctest, is_resource_enabled,
                           requires_IEEE_754, requires_docstrings)
 from test.support import (import_fresh_module, TestFailed,
-                          run_with_locale, cpython_only)
+                          run_with_locale, cpython_only,
+                          darwin_malloc_err_warning)
 import random
 import inspect
 import threading
 
 
+if sys.platform == 'darwin':
+    darwin_malloc_err_warning('test_decimal')
+
+
 C = import_fresh_module('decimal', fresh=['_decimal'])
 P = import_fresh_module('decimal', blocked=['_decimal'])
 orig_sys_decimal = sys.modules['decimal']
diff --git a/Misc/NEWS.d/next/Tests/2021-08-06-00-07-15.bpo-40928.aIwb6G.rst b/Misc/NEWS.d/next/Tests/2021-08-06-00-07-15.bpo-40928.aIwb6G.rst
new file mode 100644
index 00000000000000..c9a5e1b01e58aa
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2021-08-06-00-07-15.bpo-40928.aIwb6G.rst
@@ -0,0 +1,2 @@
+Notify users running test_decimal regression tests on macOS of potential
+harmless "malloc can't allocate region" messages spewed by test_decimal.


From webhook-mailer at python.org  Fri Aug  6 09:36:40 2021
From: webhook-mailer at python.org (ambv)
Date: Fri, 06 Aug 2021 13:36:40 -0000
Subject: [Python-checkins] bpo-44524: Fix an issue wherein
 `_GenericAlias._name` was not properly set for specialforms (GH-27614)
Message-ID: <mailman.916.1628257000.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/8bdf12e99a3dc7ada5f85bba79c2a9eb9931f5b0
commit: 8bdf12e99a3dc7ada5f85bba79c2a9eb9931f5b0
branch: main
author: Bas van Beek <43369155+BvB93 at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-06T15:36:35+02:00
summary:

bpo-44524: Fix an issue wherein `_GenericAlias._name` was not properly set for specialforms (GH-27614)

Co-authored-by: Ken Jin <28750310+Fidget-Spinner at users.noreply.github.com>
Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Misc/NEWS.d/next/Library/2021-08-05-18-20-17.bpo-44524.9T1tfe.rst
M Lib/test/test_typing.py
M Lib/typing.py

diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index 439d963af5bd4..06141f8bbcb61 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -4791,66 +4791,185 @@ def test_no_isinstance(self):
             issubclass(int, TypeGuard)
 
 
+SpecialAttrsP = typing.ParamSpec('SpecialAttrsP')
+SpecialAttrsT = typing.TypeVar('SpecialAttrsT', int, float, complex)
+
+
 class SpecialAttrsTests(BaseTestCase):
+
     def test_special_attrs(self):
-        cls_to_check = (
+        cls_to_check = {
             # ABC classes
-            typing.AbstractSet,
-            typing.AsyncContextManager,
-            typing.AsyncGenerator,
-            typing.AsyncIterable,
-            typing.AsyncIterator,
-            typing.Awaitable,
-            typing.ByteString,
-            typing.Callable,
-            typing.ChainMap,
-            typing.Collection,
-            typing.Container,
-            typing.ContextManager,
-            typing.Coroutine,
-            typing.Counter,
-            typing.DefaultDict,
-            typing.Deque,
-            typing.Dict,
-            typing.FrozenSet,
-            typing.Generator,
-            typing.Hashable,
-            typing.ItemsView,
-            typing.Iterable,
-            typing.Iterator,
-            typing.KeysView,
-            typing.List,
-            typing.Mapping,
-            typing.MappingView,
-            typing.MutableMapping,
-            typing.MutableSequence,
-            typing.MutableSet,
-            typing.OrderedDict,
-            typing.Reversible,
-            typing.Sequence,
-            typing.Set,
-            typing.Sized,
-            typing.Tuple,
-            typing.Type,
-            typing.ValuesView,
+            typing.AbstractSet: 'AbstractSet',
+            typing.AsyncContextManager: 'AsyncContextManager',
+            typing.AsyncGenerator: 'AsyncGenerator',
+            typing.AsyncIterable: 'AsyncIterable',
+            typing.AsyncIterator: 'AsyncIterator',
+            typing.Awaitable: 'Awaitable',
+            typing.ByteString: 'ByteString',
+            typing.Callable: 'Callable',
+            typing.ChainMap: 'ChainMap',
+            typing.Collection: 'Collection',
+            typing.Container: 'Container',
+            typing.ContextManager: 'ContextManager',
+            typing.Coroutine: 'Coroutine',
+            typing.Counter: 'Counter',
+            typing.DefaultDict: 'DefaultDict',
+            typing.Deque: 'Deque',
+            typing.Dict: 'Dict',
+            typing.FrozenSet: 'FrozenSet',
+            typing.Generator: 'Generator',
+            typing.Hashable: 'Hashable',
+            typing.ItemsView: 'ItemsView',
+            typing.Iterable: 'Iterable',
+            typing.Iterator: 'Iterator',
+            typing.KeysView: 'KeysView',
+            typing.List: 'List',
+            typing.Mapping: 'Mapping',
+            typing.MappingView: 'MappingView',
+            typing.MutableMapping: 'MutableMapping',
+            typing.MutableSequence: 'MutableSequence',
+            typing.MutableSet: 'MutableSet',
+            typing.OrderedDict: 'OrderedDict',
+            typing.Reversible: 'Reversible',
+            typing.Sequence: 'Sequence',
+            typing.Set: 'Set',
+            typing.Sized: 'Sized',
+            typing.Tuple: 'Tuple',
+            typing.Type: 'Type',
+            typing.ValuesView: 'ValuesView',
+            # Subscribed ABC classes
+            typing.AbstractSet[Any]: 'AbstractSet',
+            typing.AsyncContextManager[Any]: 'AsyncContextManager',
+            typing.AsyncGenerator[Any, Any]: 'AsyncGenerator',
+            typing.AsyncIterable[Any]: 'AsyncIterable',
+            typing.AsyncIterator[Any]: 'AsyncIterator',
+            typing.Awaitable[Any]: 'Awaitable',
+            typing.Callable[[], Any]: 'Callable',
+            typing.Callable[..., Any]: 'Callable',
+            typing.ChainMap[Any, Any]: 'ChainMap',
+            typing.Collection[Any]: 'Collection',
+            typing.Container[Any]: 'Container',
+            typing.ContextManager[Any]: 'ContextManager',
+            typing.Coroutine[Any, Any, Any]: 'Coroutine',
+            typing.Counter[Any]: 'Counter',
+            typing.DefaultDict[Any, Any]: 'DefaultDict',
+            typing.Deque[Any]: 'Deque',
+            typing.Dict[Any, Any]: 'Dict',
+            typing.FrozenSet[Any]: 'FrozenSet',
+            typing.Generator[Any, Any, Any]: 'Generator',
+            typing.ItemsView[Any, Any]: 'ItemsView',
+            typing.Iterable[Any]: 'Iterable',
+            typing.Iterator[Any]: 'Iterator',
+            typing.KeysView[Any]: 'KeysView',
+            typing.List[Any]: 'List',
+            typing.Mapping[Any, Any]: 'Mapping',
+            typing.MappingView[Any]: 'MappingView',
+            typing.MutableMapping[Any, Any]: 'MutableMapping',
+            typing.MutableSequence[Any]: 'MutableSequence',
+            typing.MutableSet[Any]: 'MutableSet',
+            typing.OrderedDict[Any, Any]: 'OrderedDict',
+            typing.Reversible[Any]: 'Reversible',
+            typing.Sequence[Any]: 'Sequence',
+            typing.Set[Any]: 'Set',
+            typing.Tuple[Any]: 'Tuple',
+            typing.Tuple[Any, ...]: 'Tuple',
+            typing.Type[Any]: 'Type',
+            typing.ValuesView[Any]: 'ValuesView',
             # Special Forms
-            typing.Any,
-            typing.NoReturn,
-            typing.ClassVar,
-            typing.Final,
-            typing.Union,
-            typing.Optional,
-            typing.Literal,
-            typing.TypeAlias,
-            typing.Concatenate,
-            typing.TypeGuard,
-        )
+            typing.Annotated: 'Annotated',
+            typing.Any: 'Any',
+            typing.ClassVar: 'ClassVar',
+            typing.Concatenate: 'Concatenate',
+            typing.Final: 'Final',
+            typing.ForwardRef: 'ForwardRef',
+            typing.Literal: 'Literal',
+            typing.NewType: 'NewType',
+            typing.NoReturn: 'NoReturn',
+            typing.Optional: 'Optional',
+            typing.TypeAlias: 'TypeAlias',
+            typing.TypeGuard: 'TypeGuard',
+            typing.TypeVar: 'TypeVar',
+            typing.Union: 'Union',
+            # Subscribed special forms
+            typing.Annotated[Any, "Annotation"]: 'Annotated',
+            typing.ClassVar[Any]: 'ClassVar',
+            typing.Concatenate[Any, SpecialAttrsP]: 'Concatenate',
+            typing.Final[Any]: 'Final',
+            typing.Literal[Any]: 'Literal',
+            typing.Optional[Any]: 'Optional',
+            typing.TypeGuard[Any]: 'TypeGuard',
+            typing.Union[Any]: 'Any',
+            typing.Union[int, float]: 'Union',
+            # Incompatible special forms (tested in test_special_attrs2)
+            # - typing.ForwardRef('set[Any]')
+            # - typing.NewType('TypeName', Any)
+            # - typing.ParamSpec('SpecialAttrsP')
+            # - typing.TypeVar('T')
+        }
 
-        for cls in cls_to_check:
+        for cls, name in cls_to_check.items():
             with self.subTest(cls=cls):
-                self.assertEqual(cls.__name__, cls._name)
-                self.assertEqual(cls.__qualname__, cls._name)
-                self.assertEqual(cls.__module__, 'typing')
+                self.assertEqual(cls.__name__, name, str(cls))
+                self.assertEqual(cls.__qualname__, name, str(cls))
+                self.assertEqual(cls.__module__, 'typing', str(cls))
+                self.assertEqual(getattr(cls, '_name', name), name, str(cls))
+                for proto in range(pickle.HIGHEST_PROTOCOL + 1):
+                    s = pickle.dumps(cls, proto)
+                    loaded = pickle.loads(s)
+                    self.assertIs(cls, loaded)
+
+    TypeName = typing.NewType('SpecialAttrsTests.TypeName', Any)
+
+    def test_special_attrs2(self):
+        # Forward refs provide a different introspection API. __name__ and
+        # __qualname__ make little sense for forward refs as they can store
+        # complex typing expressions.
+        fr = typing.ForwardRef('set[Any]')
+        self.assertFalse(hasattr(fr, '__name__'))
+        self.assertFalse(hasattr(fr, '__qualname__'))
+        self.assertEqual(fr.__module__, 'typing')
+        # Forward refs are currently unpicklable.
+        for proto in range(pickle.HIGHEST_PROTOCOL + 1):
+            with self.assertRaises(TypeError) as exc:
+                pickle.dumps(fr, proto)
+
+        self.assertEqual(SpecialAttrsTests.TypeName.__name__, 'TypeName')
+        self.assertEqual(
+            SpecialAttrsTests.TypeName.__qualname__,
+            'SpecialAttrsTests.TypeName',
+        )
+        self.assertEqual(
+            SpecialAttrsTests.TypeName.__module__,
+            'test.test_typing',
+        )
+        # NewTypes are picklable assuming correct qualname information.
+        for proto in range(pickle.HIGHEST_PROTOCOL + 1):
+            s = pickle.dumps(SpecialAttrsTests.TypeName, proto)
+            loaded = pickle.loads(s)
+            self.assertIs(SpecialAttrsTests.TypeName, loaded)
+
+        # Type variables don't support non-global instantiation per PEP 484
+        # restriction that "The argument to TypeVar() must be a string equal
+        # to the variable name to which it is assigned".  Thus, providing
+        # __qualname__ is unnecessary.
+        self.assertEqual(SpecialAttrsT.__name__, 'SpecialAttrsT')
+        self.assertFalse(hasattr(SpecialAttrsT, '__qualname__'))
+        self.assertEqual(SpecialAttrsT.__module__, 'test.test_typing')
+        # Module-level type variables are picklable.
+        for proto in range(pickle.HIGHEST_PROTOCOL + 1):
+            s = pickle.dumps(SpecialAttrsT, proto)
+            loaded = pickle.loads(s)
+            self.assertIs(SpecialAttrsT, loaded)
+
+        self.assertEqual(SpecialAttrsP.__name__, 'SpecialAttrsP')
+        self.assertFalse(hasattr(SpecialAttrsP, '__qualname__'))
+        self.assertEqual(SpecialAttrsP.__module__, 'test.test_typing')
+        # Module-level ParamSpecs are picklable.
+        for proto in range(pickle.HIGHEST_PROTOCOL + 1):
+            s = pickle.dumps(SpecialAttrsP, proto)
+            loaded = pickle.loads(s)
+            self.assertIs(SpecialAttrsP, loaded)
 
 class AllTests(BaseTestCase):
     """Tests for __all__."""
diff --git a/Lib/typing.py b/Lib/typing.py
index 9c595ae541aa1..51468aeaf5b75 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -461,7 +461,7 @@ class Starship:
     be used with isinstance() or issubclass().
     """
     item = _type_check(parameters, f'{self} accepts only single type.')
-    return _GenericAlias(self, (item,))
+    return _GenericAlias(self, (item,), name="ClassVar")
 
 @_SpecialForm
 def Final(self, parameters):
@@ -482,7 +482,7 @@ class FastConnector(Connection):
     There is no runtime checking of these properties.
     """
     item = _type_check(parameters, f'{self} accepts only single type.')
-    return _GenericAlias(self, (item,))
+    return _GenericAlias(self, (item,), name="Final")
 
 @_SpecialForm
 def Union(self, parameters):
@@ -520,7 +520,12 @@ def Union(self, parameters):
     parameters = _remove_dups_flatten(parameters)
     if len(parameters) == 1:
         return parameters[0]
-    return _UnionGenericAlias(self, parameters)
+
+    if len(parameters) == 2 and type(None) in parameters:
+        name = "Optional"
+    else:
+        name = "Union"
+    return _UnionGenericAlias(self, parameters, name=name)
 
 @_SpecialForm
 def Optional(self, parameters):
@@ -565,7 +570,7 @@ def open_helper(file: str, mode: MODE) -> str:
     except TypeError:  # unhashable parameters
         pass
 
-    return _LiteralGenericAlias(self, parameters)
+    return _LiteralGenericAlias(self, parameters, name="Literal")
 
 
 @_SpecialForm
@@ -604,7 +609,7 @@ def Concatenate(self, parameters):
                         "ParamSpec variable.")
     msg = "Concatenate[arg, ...]: each arg must be a type."
     parameters = tuple(_type_check(p, msg) for p in parameters)
-    return _ConcatenateGenericAlias(self, parameters)
+    return _ConcatenateGenericAlias(self, parameters, name="Concatenate")
 
 
 @_SpecialForm
@@ -652,7 +657,7 @@ def is_str(val: Union[str, float]):
     PEP 647 (User-Defined Type Guards).
     """
     item = _type_check(parameters, f'{self} accepts only single type.')
-    return _GenericAlias(self, (item,))
+    return _GenericAlias(self, (item,), name="TypeGuard")
 
 
 class ForwardRef(_Final, _root=True):
@@ -1237,6 +1242,10 @@ def __subclasscheck__(self, cls):
             if issubclass(cls, arg):
                 return True
 
+    def __reduce__(self):
+        func, (origin, args) = super().__reduce__()
+        return func, (Union, args)
+
 
 def _value_and_type_iter(parameters):
     return ((p, type(p)) for p in parameters)
@@ -1566,7 +1575,7 @@ def __init__(self, origin, metadata):
         if isinstance(origin, _AnnotatedAlias):
             metadata = origin.__metadata__ + metadata
             origin = origin.__origin__
-        super().__init__(origin, origin)
+        super().__init__(origin, origin, name="Annotated")
         self.__metadata__ = metadata
 
     def copy_with(self, params):
diff --git a/Misc/NEWS.d/next/Library/2021-08-05-18-20-17.bpo-44524.9T1tfe.rst b/Misc/NEWS.d/next/Library/2021-08-05-18-20-17.bpo-44524.9T1tfe.rst
new file mode 100644
index 0000000000000..0c9e82050883d
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-05-18-20-17.bpo-44524.9T1tfe.rst
@@ -0,0 +1,2 @@
+Fixed an issue wherein the ``__name__`` and ``__qualname__`` attributes of
+subscribed specialforms could be ``None``.


From webhook-mailer at python.org  Fri Aug  6 09:40:49 2021
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 06 Aug 2021 13:40:49 -0000
Subject: [Python-checkins] bpo-44849: Fix os.set_inheritable() on FreeBSD 14
 with O_PATH (GH-27623)
Message-ID: <mailman.917.1628257249.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/2ae2235c7a7627725df40c7875245cd17d90f39f
commit: 2ae2235c7a7627725df40c7875245cd17d90f39f
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-06T06:40:44-07:00
summary:

bpo-44849: Fix os.set_inheritable() on FreeBSD 14 with O_PATH (GH-27623)


Fix the os.set_inheritable() function on FreeBSD 14 for file
descriptor opened with the O_PATH flag: ignore the EBADF error on
ioctl(), fallback on the fcntl() implementation.
(cherry picked from commit c24896c0e3b32c8a9f614ef51366007b67d5c665)

Co-authored-by: Victor Stinner <vstinner at python.org>

files:
A Misc/NEWS.d/next/Library/2021-08-06-13-00-28.bpo-44849.O78F_f.rst
M Python/fileutils.c

diff --git a/Misc/NEWS.d/next/Library/2021-08-06-13-00-28.bpo-44849.O78F_f.rst b/Misc/NEWS.d/next/Library/2021-08-06-13-00-28.bpo-44849.O78F_f.rst
new file mode 100644
index 00000000000000..b1f225485ddef5
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-06-13-00-28.bpo-44849.O78F_f.rst
@@ -0,0 +1,4 @@
+Fix the :func:`os.set_inheritable` function on FreeBSD 14 for file descriptor
+opened with the :data:`~os.O_PATH` flag: ignore the :data:`~errno.EBADF`
+error on ``ioctl()``, fallback on the ``fcntl()`` implementation. Patch by
+Victor Stinner.
diff --git a/Python/fileutils.c b/Python/fileutils.c
index a8fab00629da41..e8a7eda505c7ec 100644
--- a/Python/fileutils.c
+++ b/Python/fileutils.c
@@ -1374,10 +1374,11 @@ set_inheritable(int fd, int inheritable, int raise, int *atomic_flag_works)
             return 0;
         }
 
-#ifdef __linux__
+#ifdef O_PATH
         if (errno == EBADF) {
-            // On Linux, ioctl(FIOCLEX) will fail with EBADF for O_PATH file descriptors
-            // Fall through to the fcntl() path
+            // bpo-44849: On Linux and FreeBSD, ioctl(FIOCLEX) fails with EBADF
+            // on O_PATH file descriptors. Fall through to the fcntl()
+            // implementation.
         }
         else
 #endif


From webhook-mailer at python.org  Fri Aug  6 09:42:59 2021
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 06 Aug 2021 13:42:59 -0000
Subject: [Python-checkins] bpo-44849: Fix os.set_inheritable() on FreeBSD 14
 with O_PATH (GH-27623)
Message-ID: <mailman.918.1628257380.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/791c28a56f043618111a19377f8527326037230e
commit: 791c28a56f043618111a19377f8527326037230e
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-06T06:42:51-07:00
summary:

bpo-44849: Fix os.set_inheritable() on FreeBSD 14 with O_PATH (GH-27623)


Fix the os.set_inheritable() function on FreeBSD 14 for file
descriptor opened with the O_PATH flag: ignore the EBADF error on
ioctl(), fallback on the fcntl() implementation.
(cherry picked from commit c24896c0e3b32c8a9f614ef51366007b67d5c665)

Co-authored-by: Victor Stinner <vstinner at python.org>

files:
A Misc/NEWS.d/next/Library/2021-08-06-13-00-28.bpo-44849.O78F_f.rst
M Python/fileutils.c

diff --git a/Misc/NEWS.d/next/Library/2021-08-06-13-00-28.bpo-44849.O78F_f.rst b/Misc/NEWS.d/next/Library/2021-08-06-13-00-28.bpo-44849.O78F_f.rst
new file mode 100644
index 00000000000000..b1f225485ddef5
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-06-13-00-28.bpo-44849.O78F_f.rst
@@ -0,0 +1,4 @@
+Fix the :func:`os.set_inheritable` function on FreeBSD 14 for file descriptor
+opened with the :data:`~os.O_PATH` flag: ignore the :data:`~errno.EBADF`
+error on ``ioctl()``, fallback on the ``fcntl()`` implementation. Patch by
+Victor Stinner.
diff --git a/Python/fileutils.c b/Python/fileutils.c
index 45ea2043912597..11c659d5a46fae 100644
--- a/Python/fileutils.c
+++ b/Python/fileutils.c
@@ -1314,10 +1314,11 @@ set_inheritable(int fd, int inheritable, int raise, int *atomic_flag_works)
             return 0;
         }
 
-#ifdef __linux__
+#ifdef O_PATH
         if (errno == EBADF) {
-            // On Linux, ioctl(FIOCLEX) will fail with EBADF for O_PATH file descriptors
-            // Fall through to the fcntl() path
+            // bpo-44849: On Linux and FreeBSD, ioctl(FIOCLEX) fails with EBADF
+            // on O_PATH file descriptors. Fall through to the fcntl()
+            // implementation.
         }
         else
 #endif


From webhook-mailer at python.org  Fri Aug  6 11:38:32 2021
From: webhook-mailer at python.org (ambv)
Date: Fri, 06 Aug 2021 15:38:32 -0000
Subject: [Python-checkins] bpo-44679: [doc] fix typo in unittest.mock.rst
 (GH-27618) (GH-27619)
Message-ID: <mailman.919.1628264313.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/8c17db6cd4e29f922a195acdb5aff3ef9c2340e5
commit: 8c17db6cd4e29f922a195acdb5aff3ef9c2340e5
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-06T17:38:21+02:00
summary:

bpo-44679: [doc] fix typo in unittest.mock.rst (GH-27618) (GH-27619)

(cherry picked from commit 938e84b4fa410f1a86f5e0708ebc3af6bb8efb0e)

Co-authored-by: Jack DeVries <58614260+jdevries3133 at users.noreply.github.com>

files:
M Doc/library/unittest.mock.rst

diff --git a/Doc/library/unittest.mock.rst b/Doc/library/unittest.mock.rst
index b3e71705801088..3c74b61779d478 100644
--- a/Doc/library/unittest.mock.rst
+++ b/Doc/library/unittest.mock.rst
@@ -2207,7 +2207,7 @@ In this example we monkey patch ``method`` to return ``sentinel.some_object``:
     >>> real.method.return_value = sentinel.some_object
     >>> result = real.method()
     >>> assert result is sentinel.some_object
-    >>> sentinel.some_object
+    >>> result
     sentinel.some_object
 
 


From webhook-mailer at python.org  Fri Aug  6 13:09:11 2021
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 06 Aug 2021 17:09:11 -0000
Subject: [Python-checkins] bpo-40928: notify users running test_decimal on
 macOS of malloc warnings (GH-26783)
Message-ID: <mailman.920.1628269752.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/a5d99632766b458b42f327e8bd0f82b0345c9a63
commit: a5d99632766b458b42f327e8bd0f82b0345c9a63
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-06T10:09:06-07:00
summary:

bpo-40928: notify users running test_decimal on macOS of malloc warnings (GH-26783)


* When trying to allocate very large regions on macOS, malloc does not   fail silently. It sends a noisy error out to STDERR
* This provides a helper function to warn the user, and provides the warning for test_decimal, which consistently generates these warnings on macOS.

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 15d3c14df32a35ac69898a7852115722e30d7857)

Co-authored-by: Jack DeVries <58614260+jdevries3133 at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Tests/2021-08-06-00-07-15.bpo-40928.aIwb6G.rst
M Lib/test/support/__init__.py
M Lib/test/test_decimal.py

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index 4a2ed1ea5ae0c0..cb3acecbbd1197 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -459,6 +459,24 @@ def requires_lzma(reason='requires lzma'):
 TEST_DATA_DIR = os.path.join(TEST_HOME_DIR, "data")
 
 
+def darwin_malloc_err_warning(test_name):
+    """Assure user that loud errors generated by macOS libc's malloc are
+    expected."""
+    if sys.platform != 'darwin':
+        return
+
+    import shutil
+    msg = ' NOTICE '
+    detail = (f'{test_name} may generate "malloc can\'t allocate region"\n'
+              'warnings on macOS systems. This behavior is known. Do not\n'
+              'report a bug unless tests are also failing. See bpo-40928.')
+
+    padding, _ = shutil.get_terminal_size()
+    print(msg.center(padding, '-'))
+    print(detail)
+    print('-' * padding)
+
+
 def findfile(filename, subdir=None):
     """Try to find a file on sys.path or in the test directory.  If it is not
     found the argument passed to the function is returned (this does not
diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py
index 058829b03a3dee..28d56909b30034 100644
--- a/Lib/test/test_decimal.py
+++ b/Lib/test/test_decimal.py
@@ -36,7 +36,8 @@
                           requires_IEEE_754, requires_docstrings,
                           requires_legacy_unicode_capi)
 from test.support import (TestFailed,
-                          run_with_locale, cpython_only)
+                          run_with_locale, cpython_only,
+                          darwin_malloc_err_warning)
 from test.support.import_helper import import_fresh_module
 from test.support import warnings_helper
 import random
@@ -44,6 +45,10 @@
 import threading
 
 
+if sys.platform == 'darwin':
+    darwin_malloc_err_warning('test_decimal')
+
+
 C = import_fresh_module('decimal', fresh=['_decimal'])
 P = import_fresh_module('decimal', blocked=['_decimal'])
 orig_sys_decimal = sys.modules['decimal']
diff --git a/Misc/NEWS.d/next/Tests/2021-08-06-00-07-15.bpo-40928.aIwb6G.rst b/Misc/NEWS.d/next/Tests/2021-08-06-00-07-15.bpo-40928.aIwb6G.rst
new file mode 100644
index 00000000000000..c9a5e1b01e58aa
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2021-08-06-00-07-15.bpo-40928.aIwb6G.rst
@@ -0,0 +1,2 @@
+Notify users running test_decimal regression tests on macOS of potential
+harmless "malloc can't allocate region" messages spewed by test_decimal.


From webhook-mailer at python.org  Fri Aug  6 13:57:47 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Fri, 06 Aug 2021 17:57:47 -0000
Subject: [Python-checkins] [3.9] bpo-43853: Handle sqlite3_value_text()
 errors (GH-25422). (GH-27627)
Message-ID: <mailman.921.1628272668.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/8c07fef867707694c9f2fcee4d7a9563ad78ed14
commit: 8c07fef867707694c9f2fcee4d7a9563ad78ed14
branch: 3.9
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-06T20:57:39+03:00
summary:

[3.9] bpo-43853: Handle sqlite3_value_text() errors (GH-25422). (GH-27627)

(cherry picked from commit 006fd869e4798b68e266f5de89c83ddb531a756b)

files:
A Misc/NEWS.d/next/Library/2021-04-15-12-02-17.bpo-43853.XXCVAp.rst
M Lib/sqlite3/test/userfunctions.py
M Modules/_sqlite/connection.c

diff --git a/Lib/sqlite3/test/userfunctions.py b/Lib/sqlite3/test/userfunctions.py
index c11c82e1275778..a1c29d482366e4 100644
--- a/Lib/sqlite3/test/userfunctions.py
+++ b/Lib/sqlite3/test/userfunctions.py
@@ -236,9 +236,11 @@ def CheckFuncException(self):
 
     def CheckParamString(self):
         cur = self.con.cursor()
-        cur.execute("select isstring(?)", ("foo",))
-        val = cur.fetchone()[0]
-        self.assertEqual(val, 1)
+        for text in ["foo", str()]:
+            with self.subTest(text=text):
+                cur.execute("select isstring(?)", (text,))
+                val = cur.fetchone()[0]
+                self.assertEqual(val, 1)
 
     def CheckParamInt(self):
         cur = self.con.cursor()
@@ -387,9 +389,9 @@ def CheckAggrExceptionInFinalize(self):
 
     def CheckAggrCheckParamStr(self):
         cur = self.con.cursor()
-        cur.execute("select checkType('str', ?)", ("foo",))
+        cur.execute("select checkTypes('str', ?, ?)", ("foo", str()))
         val = cur.fetchone()[0]
-        self.assertEqual(val, 1)
+        self.assertEqual(val, 2)
 
     def CheckAggrCheckParamInt(self):
         cur = self.con.cursor()
diff --git a/Misc/NEWS.d/next/Library/2021-04-15-12-02-17.bpo-43853.XXCVAp.rst b/Misc/NEWS.d/next/Library/2021-04-15-12-02-17.bpo-43853.XXCVAp.rst
new file mode 100644
index 00000000000000..c5c3a0ae83c7f4
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-04-15-12-02-17.bpo-43853.XXCVAp.rst
@@ -0,0 +1,3 @@
+Improve :mod:`sqlite3` error handling: ``sqlite3_value_text()`` errors that
+set ``SQLITE_NOMEM`` now raise :exc:`MemoryError`. Patch by Erlend E.
+Aasland.
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index 1cf31489d07f9f..986a82918b5fe8 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -546,7 +546,6 @@ PyObject* _pysqlite_build_py_params(sqlite3_context *context, int argc, sqlite3_
     int i;
     sqlite3_value* cur_value;
     PyObject* cur_py_value;
-    const char* val_str;
     Py_ssize_t buflen;
 
     args = PyTuple_New(argc);
@@ -563,16 +562,19 @@ PyObject* _pysqlite_build_py_params(sqlite3_context *context, int argc, sqlite3_
             case SQLITE_FLOAT:
                 cur_py_value = PyFloat_FromDouble(sqlite3_value_double(cur_value));
                 break;
-            case SQLITE_TEXT:
-                val_str = (const char*)sqlite3_value_text(cur_value);
-                cur_py_value = PyUnicode_FromString(val_str);
-                /* TODO: have a way to show errors here */
-                if (!cur_py_value) {
-                    PyErr_Clear();
-                    Py_INCREF(Py_None);
-                    cur_py_value = Py_None;
+            case SQLITE_TEXT: {
+                sqlite3 *db = sqlite3_context_db_handle(context);
+                const char *text = (const char *)sqlite3_value_text(cur_value);
+
+                if (text == NULL && sqlite3_errcode(db) == SQLITE_NOMEM) {
+                    PyErr_NoMemory();
+                    goto error;
                 }
+
+                Py_ssize_t size = sqlite3_value_bytes(cur_value);
+                cur_py_value = PyUnicode_FromStringAndSize(text, size);
                 break;
+            }
             case SQLITE_BLOB:
                 buflen = sqlite3_value_bytes(cur_value);
                 cur_py_value = PyBytes_FromStringAndSize(
@@ -585,8 +587,7 @@ PyObject* _pysqlite_build_py_params(sqlite3_context *context, int argc, sqlite3_
         }
 
         if (!cur_py_value) {
-            Py_DECREF(args);
-            return NULL;
+            goto error;
         }
 
         PyTuple_SetItem(args, i, cur_py_value);
@@ -594,6 +595,10 @@ PyObject* _pysqlite_build_py_params(sqlite3_context *context, int argc, sqlite3_
     }
 
     return args;
+
+error:
+    Py_DECREF(args);
+    return NULL;
 }
 
 void _pysqlite_func_callback(sqlite3_context* context, int argc, sqlite3_value** argv)


From webhook-mailer at python.org  Fri Aug  6 14:00:05 2021
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 06 Aug 2021 18:00:05 -0000
Subject: [Python-checkins] bpo-44822: Don't truncate `str`s with embedded
 NULL chars returned by `sqlite3` UDF callbacks (GH-27588)
Message-ID: <mailman.922.1628272806.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/2b1e713f877102bbca299f0f5d7db969d78db49f
commit: 2b1e713f877102bbca299f0f5d7db969d78db49f
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-06T10:59:51-07:00
summary:

bpo-44822: Don't truncate `str`s with embedded NULL chars returned by `sqlite3` UDF callbacks (GH-27588)

(cherry picked from commit 8f010dc920e1f6dc6a357e7cc1460a7a567c05c6)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at innova.no>

files:
A Misc/NEWS.d/next/Library/2021-08-04-12-29-00.bpo-44822.zePNXA.rst
M Lib/sqlite3/test/userfunctions.py
M Modules/_sqlite/connection.c

diff --git a/Lib/sqlite3/test/userfunctions.py b/Lib/sqlite3/test/userfunctions.py
index 429089072496ed..75e803582e06ba 100644
--- a/Lib/sqlite3/test/userfunctions.py
+++ b/Lib/sqlite3/test/userfunctions.py
@@ -28,6 +28,8 @@
 
 def func_returntext():
     return "foo"
+def func_returntextwithnull():
+    return "1\x002"
 def func_returnunicode():
     return "bar"
 def func_returnint():
@@ -138,11 +140,21 @@ def step(self, val):
     def finalize(self):
         return self.val
 
+class AggrText:
+    def __init__(self):
+        self.txt = ""
+    def step(self, txt):
+        self.txt = self.txt + txt
+    def finalize(self):
+        return self.txt
+
+
 class FunctionTests(unittest.TestCase):
     def setUp(self):
         self.con = sqlite.connect(":memory:")
 
         self.con.create_function("returntext", 0, func_returntext)
+        self.con.create_function("returntextwithnull", 0, func_returntextwithnull)
         self.con.create_function("returnunicode", 0, func_returnunicode)
         self.con.create_function("returnint", 0, func_returnint)
         self.con.create_function("returnfloat", 0, func_returnfloat)
@@ -186,6 +198,12 @@ def test_func_return_text(self):
         self.assertEqual(type(val), str)
         self.assertEqual(val, "foo")
 
+    def test_func_return_text_with_null_char(self):
+        cur = self.con.cursor()
+        res = cur.execute("select returntextwithnull()").fetchone()[0]
+        self.assertEqual(type(res), str)
+        self.assertEqual(res, "1\x002")
+
     def test_func_return_unicode(self):
         cur = self.con.cursor()
         cur.execute("select returnunicode()")
@@ -364,6 +382,7 @@ def setUp(self):
         self.con.create_aggregate("checkType", 2, AggrCheckType)
         self.con.create_aggregate("checkTypes", -1, AggrCheckTypes)
         self.con.create_aggregate("mysum", 1, AggrSum)
+        self.con.create_aggregate("aggtxt", 1, AggrText)
 
     def tearDown(self):
         #self.cur.close()
@@ -457,6 +476,15 @@ def test_aggr_no_match(self):
         val = cur.fetchone()[0]
         self.assertIsNone(val)
 
+    def test_aggr_text(self):
+        cur = self.con.cursor()
+        for txt in ["foo", "1\x002"]:
+            with self.subTest(txt=txt):
+                cur.execute("select aggtxt(?) from test", (txt,))
+                val = cur.fetchone()[0]
+                self.assertEqual(val, txt)
+
+
 class AuthorizerTests(unittest.TestCase):
     @staticmethod
     def authorizer_cb(action, arg1, arg2, dbname, source):
diff --git a/Misc/NEWS.d/next/Library/2021-08-04-12-29-00.bpo-44822.zePNXA.rst b/Misc/NEWS.d/next/Library/2021-08-04-12-29-00.bpo-44822.zePNXA.rst
new file mode 100644
index 00000000000000..d078142886d2e0
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-04-12-29-00.bpo-44822.zePNXA.rst
@@ -0,0 +1,3 @@
+:mod:`sqlite3` user-defined functions and aggregators returning
+:class:`strings <str>` with embedded NUL characters are no longer
+truncated. Patch by Erlend E. Aasland.
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index 9c05a154559d92..f060ef1ef42480 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -549,10 +549,17 @@ _pysqlite_set_result(sqlite3_context* context, PyObject* py_val)
     } else if (PyFloat_Check(py_val)) {
         sqlite3_result_double(context, PyFloat_AsDouble(py_val));
     } else if (PyUnicode_Check(py_val)) {
-        const char *str = PyUnicode_AsUTF8(py_val);
-        if (str == NULL)
+        Py_ssize_t sz;
+        const char *str = PyUnicode_AsUTF8AndSize(py_val, &sz);
+        if (str == NULL) {
             return -1;
-        sqlite3_result_text(context, str, -1, SQLITE_TRANSIENT);
+        }
+        if (sz > INT_MAX) {
+            PyErr_SetString(PyExc_OverflowError,
+                            "string is longer than INT_MAX bytes");
+            return -1;
+        }
+        sqlite3_result_text(context, str, (int)sz, SQLITE_TRANSIENT);
     } else if (PyObject_CheckBuffer(py_val)) {
         Py_buffer view;
         if (PyObject_GetBuffer(py_val, &view, PyBUF_SIMPLE) != 0) {


From webhook-mailer at python.org  Fri Aug  6 14:14:08 2021
From: webhook-mailer at python.org (ambv)
Date: Fri, 06 Aug 2021 18:14:08 -0000
Subject: [Python-checkins] bpo-44756: [docs] revert automated virtual
 environment creation on `make html` (GH-27635)
Message-ID: <mailman.923.1628273649.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/55fa87b1ef46bbb9db7612b2dc2dd7fb039d9bc3
commit: 55fa87b1ef46bbb9db7612b2dc2dd7fb039d9bc3
branch: main
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2021-08-06T20:13:59+02:00
summary:

bpo-44756: [docs] revert automated virtual environment creation on `make html` (GH-27635)

It turned out to be disruptive for downstream distributors.

files:
A Misc/NEWS.d/next/Documentation/2021-08-06-19-36-21.bpo-44756.1Ngzon.rst
M Doc/Makefile
M Doc/README.rst

diff --git a/Doc/Makefile b/Doc/Makefile
index ac02bbca971b5b..24528a1c4f3269 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -45,7 +45,7 @@ help:
 	@echo "  check      to run a check for frequent markup errors"
 	@echo "  serve      to serve the documentation on the localhost (8000)"
 
-build: venv
+build:
 	-mkdir -p build
 # Look first for a Misc/NEWS file (building from a source release tarball
 # or old repo) and use that, otherwise look for a Misc/NEWS.d directory
@@ -145,7 +145,8 @@ clean-venv:
 
 venv:
 	@if [ -d $(VENVDIR) ] ; then \
-		echo "venv already exists"; \
+		echo "venv already exists."; \
+		echo "To recreate it, remove it first with \`make clean-venv'."; \
 	else \
 		$(PYTHON) -m venv $(VENVDIR); \
 		$(VENVDIR)/bin/python3 -m pip install -U pip setuptools; \
diff --git a/Doc/README.rst b/Doc/README.rst
index 20c0432ba1d350..7e8a27b4066d87 100644
--- a/Doc/README.rst
+++ b/Doc/README.rst
@@ -29,13 +29,20 @@ Using make
 ----------
 
 To get started on UNIX, you can create a virtual environment and build
-documentation with the command::
+documentation with the commands::
 
+  make venv
   make html
 
 The virtual environment in the ``venv`` directory will contain all the tools
-necessary to build the documentation.  You can also configure where the virtual
-environment directory will be with the ``VENVDIR`` variable.
+necessary to build the documentation downloaded and installed from PyPI.
+If you'd like to create the virtual environment in a different location,
+you can specify it using the ``VENVDIR`` variable.
+
+You can also skip creating the virtual environment altogether, in which case
+the Makefile will look for instances of ``sphinxbuild`` and ``blurb``
+installed on your process ``PATH`` (configurable with the ``SPHINXBUILD`` and
+``BLURB`` variables).
 
 On Windows, we try to emulate the Makefile as closely as possible with a
 ``make.bat`` file. If you need to specify the Python interpreter to use,
diff --git a/Misc/NEWS.d/next/Documentation/2021-08-06-19-36-21.bpo-44756.1Ngzon.rst b/Misc/NEWS.d/next/Documentation/2021-08-06-19-36-21.bpo-44756.1Ngzon.rst
new file mode 100644
index 00000000000000..ca2e1b9b53b752
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2021-08-06-19-36-21.bpo-44756.1Ngzon.rst
@@ -0,0 +1,3 @@
+Reverted automated virtual environment creation on ``make html`` when
+building documentation. It turned out to be disruptive for downstream
+distributors.


From webhook-mailer at python.org  Fri Aug  6 14:22:56 2021
From: webhook-mailer at python.org (ambv)
Date: Fri, 06 Aug 2021 18:22:56 -0000
Subject: [Python-checkins] Upgrade bundled pip and setuptools (#27625)
Message-ID: <mailman.924.1628274177.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/738ac00a08cb6a9d104ec85ccb1a44c2399d6baa
commit: 738ac00a08cb6a9d104ec85ccb1a44c2399d6baa
branch: main
author: Tzu-ping Chung <uranusjr at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-06T20:22:48+02:00
summary:

Upgrade bundled pip and setuptools (#27625)

pip is now 21.2.3
setuptools is now 57.4.0

files:
A Lib/ensurepip/_bundled/pip-21.2.3-py3-none-any.whl
A Lib/ensurepip/_bundled/setuptools-57.4.0-py3-none-any.whl
A Misc/NEWS.d/next/Library/2021-08-06-19-15-52.bpo-44581.oFDBTB.rst
D Lib/ensurepip/_bundled/pip-21.1.3-py3-none-any.whl
D Lib/ensurepip/_bundled/setuptools-56.0.0-py3-none-any.whl
M Lib/ensurepip/__init__.py

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 28e12537e9fff4..651f876e24bc8b 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -10,8 +10,8 @@
 
 __all__ = ["version", "bootstrap"]
 _PACKAGE_NAMES = ('setuptools', 'pip')
-_SETUPTOOLS_VERSION = "56.0.0"
-_PIP_VERSION = "21.1.3"
+_SETUPTOOLS_VERSION = "57.4.0"
+_PIP_VERSION = "21.2.3"
 _PROJECTS = [
     ("setuptools", _SETUPTOOLS_VERSION, "py3"),
     ("pip", _PIP_VERSION, "py3"),
diff --git a/Lib/ensurepip/_bundled/pip-21.1.3-py3-none-any.whl b/Lib/ensurepip/_bundled/pip-21.1.3-py3-none-any.whl
deleted file mode 100644
index d96a40a9291fb2..00000000000000
Binary files a/Lib/ensurepip/_bundled/pip-21.1.3-py3-none-any.whl and /dev/null differ
diff --git a/Lib/ensurepip/_bundled/pip-21.2.3-py3-none-any.whl b/Lib/ensurepip/_bundled/pip-21.2.3-py3-none-any.whl
new file mode 100644
index 00000000000000..d417df63d9ec19
Binary files /dev/null and b/Lib/ensurepip/_bundled/pip-21.2.3-py3-none-any.whl differ
diff --git a/Lib/ensurepip/_bundled/setuptools-56.0.0-py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-57.4.0-py3-none-any.whl
similarity index 65%
rename from Lib/ensurepip/_bundled/setuptools-56.0.0-py3-none-any.whl
rename to Lib/ensurepip/_bundled/setuptools-57.4.0-py3-none-any.whl
index 264ef10e826679..af8f8ba21003b1 100644
Binary files a/Lib/ensurepip/_bundled/setuptools-56.0.0-py3-none-any.whl and b/Lib/ensurepip/_bundled/setuptools-57.4.0-py3-none-any.whl differ
diff --git a/Misc/NEWS.d/next/Library/2021-08-06-19-15-52.bpo-44581.oFDBTB.rst b/Misc/NEWS.d/next/Library/2021-08-06-19-15-52.bpo-44581.oFDBTB.rst
new file mode 100644
index 00000000000000..99f08065b9d2f0
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-06-19-15-52.bpo-44581.oFDBTB.rst
@@ -0,0 +1 @@
+Upgrade bundled pip to 21.2.3 and setuptools to 57.4.0


From webhook-mailer at python.org  Fri Aug  6 14:28:57 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Fri, 06 Aug 2021 18:28:57 -0000
Subject: [Python-checkins] bpo-44839: Raise more specific errors in sqlite3
 (GH-27613)
Message-ID: <mailman.925.1628274538.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/7d747f26e6cac9f6891d475f3443441ce947697b
commit: 7d747f26e6cac9f6891d475f3443441ce947697b
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-06T21:28:47+03:00
summary:

bpo-44839: Raise more specific errors in sqlite3 (GH-27613)

MemoryError raised in user-defined functions will now preserve
its type. OverflowError will now be converted to DataError.
Previously both were converted to OperationalError.

files:
A Misc/NEWS.d/next/Library/2021-08-05-14-59-39.bpo-44839.MURNL9.rst
M Lib/sqlite3/test/userfunctions.py
M Modules/_sqlite/connection.c

diff --git a/Lib/sqlite3/test/userfunctions.py b/Lib/sqlite3/test/userfunctions.py
index b3da3c425b8035..9681dbdde2b092 100644
--- a/Lib/sqlite3/test/userfunctions.py
+++ b/Lib/sqlite3/test/userfunctions.py
@@ -23,12 +23,16 @@
 
 import contextlib
 import functools
+import gc
 import io
+import sys
 import unittest
 import unittest.mock
-import gc
 import sqlite3 as sqlite
 
+from test.support import bigmemtest
+
+
 def with_tracebacks(strings):
     """Convenience decorator for testing callback tracebacks."""
     strings.append('Traceback')
@@ -69,6 +73,10 @@ def func_returnlonglong():
     return 1<<31
 def func_raiseexception():
     5/0
+def func_memoryerror():
+    raise MemoryError
+def func_overflowerror():
+    raise OverflowError
 
 def func_isstring(v):
     return type(v) is str
@@ -187,6 +195,8 @@ def setUp(self):
         self.con.create_function("returnblob", 0, func_returnblob)
         self.con.create_function("returnlonglong", 0, func_returnlonglong)
         self.con.create_function("raiseexception", 0, func_raiseexception)
+        self.con.create_function("memoryerror", 0, func_memoryerror)
+        self.con.create_function("overflowerror", 0, func_overflowerror)
 
         self.con.create_function("isstring", 1, func_isstring)
         self.con.create_function("isint", 1, func_isint)
@@ -279,6 +289,20 @@ def test_func_exception(self):
             cur.fetchone()
         self.assertEqual(str(cm.exception), 'user-defined function raised exception')
 
+    @with_tracebacks(['func_memoryerror', 'MemoryError'])
+    def test_func_memory_error(self):
+        cur = self.con.cursor()
+        with self.assertRaises(MemoryError):
+            cur.execute("select memoryerror()")
+            cur.fetchone()
+
+    @with_tracebacks(['func_overflowerror', 'OverflowError'])
+    def test_func_overflow_error(self):
+        cur = self.con.cursor()
+        with self.assertRaises(sqlite.DataError):
+            cur.execute("select overflowerror()")
+            cur.fetchone()
+
     def test_param_string(self):
         cur = self.con.cursor()
         for text in ["foo", str()]:
@@ -384,6 +408,25 @@ def md5sum(t):
         del x,y
         gc.collect()
 
+    @unittest.skipUnless(sys.maxsize > 2**32, 'requires 64bit platform')
+    @bigmemtest(size=2**31, memuse=3, dry_run=False)
+    def test_large_text(self, size):
+        cur = self.con.cursor()
+        for size in 2**31-1, 2**31:
+            self.con.create_function("largetext", 0, lambda size=size: "b" * size)
+            with self.assertRaises(sqlite.DataError):
+                cur.execute("select largetext()")
+
+    @unittest.skipUnless(sys.maxsize > 2**32, 'requires 64bit platform')
+    @bigmemtest(size=2**31, memuse=2, dry_run=False)
+    def test_large_blob(self, size):
+        cur = self.con.cursor()
+        for size in 2**31-1, 2**31:
+            self.con.create_function("largeblob", 0, lambda size=size: b"b" * size)
+            with self.assertRaises(sqlite.DataError):
+                cur.execute("select largeblob()")
+
+
 class AggregateTests(unittest.TestCase):
     def setUp(self):
         self.con = sqlite.connect(":memory:")
diff --git a/Misc/NEWS.d/next/Library/2021-08-05-14-59-39.bpo-44839.MURNL9.rst b/Misc/NEWS.d/next/Library/2021-08-05-14-59-39.bpo-44839.MURNL9.rst
new file mode 100644
index 00000000000000..62ad62c5d48d54
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-05-14-59-39.bpo-44839.MURNL9.rst
@@ -0,0 +1,4 @@
+:class:`MemoryError` raised in user-defined functions will now produce a
+``MemoryError`` in :mod:`sqlite3`. :class:`OverflowError` will now be converted
+to :class:`~sqlite3.DataError`. Previously
+:class:`~sqlite3.OperationalError` was produced in these cases.
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index aae6c66d63faba..0dab3e85160e82 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -619,6 +619,29 @@ _pysqlite_build_py_params(sqlite3_context *context, int argc,
     return NULL;
 }
 
+// Checks the Python exception and sets the appropriate SQLite error code.
+static void
+set_sqlite_error(sqlite3_context *context, const char *msg)
+{
+    assert(PyErr_Occurred());
+    if (PyErr_ExceptionMatches(PyExc_MemoryError)) {
+        sqlite3_result_error_nomem(context);
+    }
+    else if (PyErr_ExceptionMatches(PyExc_OverflowError)) {
+        sqlite3_result_error_toobig(context);
+    }
+    else {
+        sqlite3_result_error(context, msg, -1);
+    }
+    pysqlite_state *state = pysqlite_get_state(NULL);
+    if (state->enable_callback_tracebacks) {
+        PyErr_Print();
+    }
+    else {
+        PyErr_Clear();
+    }
+}
+
 static void
 _pysqlite_func_callback(sqlite3_context *context, int argc, sqlite3_value **argv)
 {
@@ -645,14 +668,7 @@ _pysqlite_func_callback(sqlite3_context *context, int argc, sqlite3_value **argv
         Py_DECREF(py_retval);
     }
     if (!ok) {
-        pysqlite_state *state = pysqlite_get_state(NULL);
-        if (state->enable_callback_tracebacks) {
-            PyErr_Print();
-        }
-        else {
-            PyErr_Clear();
-        }
-        sqlite3_result_error(context, "user-defined function raised exception", -1);
+        set_sqlite_error(context, "user-defined function raised exception");
     }
 
     PyGILState_Release(threadstate);
@@ -676,18 +692,9 @@ static void _pysqlite_step_callback(sqlite3_context *context, int argc, sqlite3_
 
     if (*aggregate_instance == NULL) {
         *aggregate_instance = _PyObject_CallNoArg(aggregate_class);
-
-        if (PyErr_Occurred()) {
-            *aggregate_instance = 0;
-
-            pysqlite_state *state = pysqlite_get_state(NULL);
-            if (state->enable_callback_tracebacks) {
-                PyErr_Print();
-            }
-            else {
-                PyErr_Clear();
-            }
-            sqlite3_result_error(context, "user-defined aggregate's '__init__' method raised error", -1);
+        if (!*aggregate_instance) {
+            set_sqlite_error(context,
+                    "user-defined aggregate's '__init__' method raised error");
             goto error;
         }
     }
@@ -706,14 +713,8 @@ static void _pysqlite_step_callback(sqlite3_context *context, int argc, sqlite3_
     Py_DECREF(args);
 
     if (!function_result) {
-        pysqlite_state *state = pysqlite_get_state(NULL);
-        if (state->enable_callback_tracebacks) {
-            PyErr_Print();
-        }
-        else {
-            PyErr_Clear();
-        }
-        sqlite3_result_error(context, "user-defined aggregate's 'step' method raised error", -1);
+        set_sqlite_error(context,
+                "user-defined aggregate's 'step' method raised error");
     }
 
 error:
@@ -761,14 +762,8 @@ _pysqlite_final_callback(sqlite3_context *context)
         Py_DECREF(function_result);
     }
     if (!ok) {
-        pysqlite_state *state = pysqlite_get_state(NULL);
-        if (state->enable_callback_tracebacks) {
-            PyErr_Print();
-        }
-        else {
-            PyErr_Clear();
-        }
-        sqlite3_result_error(context, "user-defined aggregate's 'finalize' method raised error", -1);
+        set_sqlite_error(context,
+                "user-defined aggregate's 'finalize' method raised error");
     }
 
     /* Restore the exception (if any) of the last call to step(),


From webhook-mailer at python.org  Fri Aug  6 14:42:36 2021
From: webhook-mailer at python.org (ambv)
Date: Fri, 06 Aug 2021 18:42:36 -0000
Subject: [Python-checkins] bpo-44756: [docs] revert automated virtual
 environment creation on `make html` (GH-27635) (GH-27636)
Message-ID: <mailman.926.1628275358.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/91f6d386691c060dfaa870d74b370e9c10eb8cd8
commit: 91f6d386691c060dfaa870d74b370e9c10eb8cd8
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-06T20:42:27+02:00
summary:

bpo-44756: [docs] revert automated virtual environment creation on `make html` (GH-27635) (GH-27636)

It turned out to be disruptive for downstream distributors.
(cherry picked from commit 55fa87b1ef46bbb9db7612b2dc2dd7fb039d9bc3)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Misc/NEWS.d/next/Documentation/2021-08-06-19-36-21.bpo-44756.1Ngzon.rst
M Doc/Makefile
M Doc/README.rst

diff --git a/Doc/Makefile b/Doc/Makefile
index 18ca07a9446cd1..57763fc0e103d7 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -45,7 +45,7 @@ help:
 	@echo "  check      to run a check for frequent markup errors"
 	@echo "  serve      to serve the documentation on the localhost (8000)"
 
-build: venv
+build:
 	-mkdir -p build
 # Look first for a Misc/NEWS file (building from a source release tarball
 # or old repo) and use that, otherwise look for a Misc/NEWS.d directory
@@ -145,7 +145,8 @@ clean-venv:
 
 venv:
 	@if [ -d $(VENVDIR) ] ; then \
-		echo "venv already exists"; \
+		echo "venv already exists."; \
+		echo "To recreate it, remove it first with \`make clean-venv'."; \
 	else \
 		$(PYTHON) -m venv $(VENVDIR); \
 		$(VENVDIR)/bin/python3 -m pip install -U pip setuptools; \
diff --git a/Doc/README.rst b/Doc/README.rst
index 20c0432ba1d350..7e8a27b4066d87 100644
--- a/Doc/README.rst
+++ b/Doc/README.rst
@@ -29,13 +29,20 @@ Using make
 ----------
 
 To get started on UNIX, you can create a virtual environment and build
-documentation with the command::
+documentation with the commands::
 
+  make venv
   make html
 
 The virtual environment in the ``venv`` directory will contain all the tools
-necessary to build the documentation.  You can also configure where the virtual
-environment directory will be with the ``VENVDIR`` variable.
+necessary to build the documentation downloaded and installed from PyPI.
+If you'd like to create the virtual environment in a different location,
+you can specify it using the ``VENVDIR`` variable.
+
+You can also skip creating the virtual environment altogether, in which case
+the Makefile will look for instances of ``sphinxbuild`` and ``blurb``
+installed on your process ``PATH`` (configurable with the ``SPHINXBUILD`` and
+``BLURB`` variables).
 
 On Windows, we try to emulate the Makefile as closely as possible with a
 ``make.bat`` file. If you need to specify the Python interpreter to use,
diff --git a/Misc/NEWS.d/next/Documentation/2021-08-06-19-36-21.bpo-44756.1Ngzon.rst b/Misc/NEWS.d/next/Documentation/2021-08-06-19-36-21.bpo-44756.1Ngzon.rst
new file mode 100644
index 00000000000000..ca2e1b9b53b752
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2021-08-06-19-36-21.bpo-44756.1Ngzon.rst
@@ -0,0 +1,3 @@
+Reverted automated virtual environment creation on ``make html`` when
+building documentation. It turned out to be disruptive for downstream
+distributors.


From webhook-mailer at python.org  Fri Aug  6 15:16:02 2021
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 06 Aug 2021 19:16:02 -0000
Subject: [Python-checkins] bpo-44756: [docs] revert automated virtual
 environment creation on `make html` (GH-27635)
Message-ID: <mailman.927.1628277364.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/1e9c9ca570ffe92dc6a60825c2f9c91865129b8f
commit: 1e9c9ca570ffe92dc6a60825c2f9c91865129b8f
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-06T12:15:54-07:00
summary:

bpo-44756: [docs] revert automated virtual environment creation on `make html` (GH-27635)


It turned out to be disruptive for downstream distributors.
(cherry picked from commit 55fa87b1ef46bbb9db7612b2dc2dd7fb039d9bc3)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Misc/NEWS.d/next/Documentation/2021-08-06-19-36-21.bpo-44756.1Ngzon.rst
M Doc/Makefile
M Doc/README.rst

diff --git a/Doc/Makefile b/Doc/Makefile
index ac02bbca971b5b..24528a1c4f3269 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -45,7 +45,7 @@ help:
 	@echo "  check      to run a check for frequent markup errors"
 	@echo "  serve      to serve the documentation on the localhost (8000)"
 
-build: venv
+build:
 	-mkdir -p build
 # Look first for a Misc/NEWS file (building from a source release tarball
 # or old repo) and use that, otherwise look for a Misc/NEWS.d directory
@@ -145,7 +145,8 @@ clean-venv:
 
 venv:
 	@if [ -d $(VENVDIR) ] ; then \
-		echo "venv already exists"; \
+		echo "venv already exists."; \
+		echo "To recreate it, remove it first with \`make clean-venv'."; \
 	else \
 		$(PYTHON) -m venv $(VENVDIR); \
 		$(VENVDIR)/bin/python3 -m pip install -U pip setuptools; \
diff --git a/Doc/README.rst b/Doc/README.rst
index 20c0432ba1d350..7e8a27b4066d87 100644
--- a/Doc/README.rst
+++ b/Doc/README.rst
@@ -29,13 +29,20 @@ Using make
 ----------
 
 To get started on UNIX, you can create a virtual environment and build
-documentation with the command::
+documentation with the commands::
 
+  make venv
   make html
 
 The virtual environment in the ``venv`` directory will contain all the tools
-necessary to build the documentation.  You can also configure where the virtual
-environment directory will be with the ``VENVDIR`` variable.
+necessary to build the documentation downloaded and installed from PyPI.
+If you'd like to create the virtual environment in a different location,
+you can specify it using the ``VENVDIR`` variable.
+
+You can also skip creating the virtual environment altogether, in which case
+the Makefile will look for instances of ``sphinxbuild`` and ``blurb``
+installed on your process ``PATH`` (configurable with the ``SPHINXBUILD`` and
+``BLURB`` variables).
 
 On Windows, we try to emulate the Makefile as closely as possible with a
 ``make.bat`` file. If you need to specify the Python interpreter to use,
diff --git a/Misc/NEWS.d/next/Documentation/2021-08-06-19-36-21.bpo-44756.1Ngzon.rst b/Misc/NEWS.d/next/Documentation/2021-08-06-19-36-21.bpo-44756.1Ngzon.rst
new file mode 100644
index 00000000000000..ca2e1b9b53b752
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2021-08-06-19-36-21.bpo-44756.1Ngzon.rst
@@ -0,0 +1,3 @@
+Reverted automated virtual environment creation on ``make html`` when
+building documentation. It turned out to be disruptive for downstream
+distributors.


From webhook-mailer at python.org  Fri Aug  6 15:33:40 2021
From: webhook-mailer at python.org (rhettinger)
Date: Fri, 06 Aug 2021 19:33:40 -0000
Subject: [Python-checkins] bpo-44605: Teach @total_ordering() to work with
 metaclasses (GH-27633)
Message-ID: <mailman.928.1628278421.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/1f7d64608b5c7f4c3d96b01b33e18ebf9dec8490
commit: 1f7d64608b5c7f4c3d96b01b33e18ebf9dec8490
branch: main
author: Raymond Hettinger <rhettinger at users.noreply.github.com>
committer: rhettinger <rhettinger at users.noreply.github.com>
date: 2021-08-06T14:33:30-05:00
summary:

bpo-44605: Teach @total_ordering() to work with metaclasses (GH-27633)

files:
A Misc/NEWS.d/next/Library/2021-08-06-09-43-50.bpo-44605.q4YSBZ.rst
M Lib/functools.py
M Lib/test/test_functools.py

diff --git a/Lib/functools.py b/Lib/functools.py
index 357c1dfd909fa..77ec852805c10 100644
--- a/Lib/functools.py
+++ b/Lib/functools.py
@@ -88,84 +88,84 @@ def wraps(wrapped,
 
 def _gt_from_lt(self, other, NotImplemented=NotImplemented):
     'Return a > b.  Computed by @total_ordering from (not a < b) and (a != b).'
-    op_result = self.__lt__(other)
+    op_result = type(self).__lt__(self, other)
     if op_result is NotImplemented:
         return op_result
     return not op_result and self != other
 
 def _le_from_lt(self, other, NotImplemented=NotImplemented):
     'Return a <= b.  Computed by @total_ordering from (a < b) or (a == b).'
-    op_result = self.__lt__(other)
+    op_result = type(self).__lt__(self, other)
     if op_result is NotImplemented:
         return op_result
     return op_result or self == other
 
 def _ge_from_lt(self, other, NotImplemented=NotImplemented):
     'Return a >= b.  Computed by @total_ordering from (not a < b).'
-    op_result = self.__lt__(other)
+    op_result = type(self).__lt__(self, other)
     if op_result is NotImplemented:
         return op_result
     return not op_result
 
 def _ge_from_le(self, other, NotImplemented=NotImplemented):
     'Return a >= b.  Computed by @total_ordering from (not a <= b) or (a == b).'
-    op_result = self.__le__(other)
+    op_result = type(self).__le__(self, other)
     if op_result is NotImplemented:
         return op_result
     return not op_result or self == other
 
 def _lt_from_le(self, other, NotImplemented=NotImplemented):
     'Return a < b.  Computed by @total_ordering from (a <= b) and (a != b).'
-    op_result = self.__le__(other)
+    op_result = type(self).__le__(self, other)
     if op_result is NotImplemented:
         return op_result
     return op_result and self != other
 
 def _gt_from_le(self, other, NotImplemented=NotImplemented):
     'Return a > b.  Computed by @total_ordering from (not a <= b).'
-    op_result = self.__le__(other)
+    op_result = type(self).__le__(self, other)
     if op_result is NotImplemented:
         return op_result
     return not op_result
 
 def _lt_from_gt(self, other, NotImplemented=NotImplemented):
     'Return a < b.  Computed by @total_ordering from (not a > b) and (a != b).'
-    op_result = self.__gt__(other)
+    op_result = type(self).__gt__(self, other)
     if op_result is NotImplemented:
         return op_result
     return not op_result and self != other
 
 def _ge_from_gt(self, other, NotImplemented=NotImplemented):
     'Return a >= b.  Computed by @total_ordering from (a > b) or (a == b).'
-    op_result = self.__gt__(other)
+    op_result = type(self).__gt__(self, other)
     if op_result is NotImplemented:
         return op_result
     return op_result or self == other
 
 def _le_from_gt(self, other, NotImplemented=NotImplemented):
     'Return a <= b.  Computed by @total_ordering from (not a > b).'
-    op_result = self.__gt__(other)
+    op_result = type(self).__gt__(self, other)
     if op_result is NotImplemented:
         return op_result
     return not op_result
 
 def _le_from_ge(self, other, NotImplemented=NotImplemented):
     'Return a <= b.  Computed by @total_ordering from (not a >= b) or (a == b).'
-    op_result = self.__ge__(other)
+    op_result = type(self).__ge__(self, other)
     if op_result is NotImplemented:
         return op_result
     return not op_result or self == other
 
 def _gt_from_ge(self, other, NotImplemented=NotImplemented):
     'Return a > b.  Computed by @total_ordering from (a >= b) and (a != b).'
-    op_result = self.__ge__(other)
+    op_result = type(self).__ge__(self, other)
     if op_result is NotImplemented:
         return op_result
     return op_result and self != other
 
 def _lt_from_ge(self, other, NotImplemented=NotImplemented):
     'Return a < b.  Computed by @total_ordering from (not a >= b).'
-    op_result = self.__ge__(other)
+    op_result = type(self).__ge__(self, other)
     if op_result is NotImplemented:
         return op_result
     return not op_result
diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py
index 78a8a5fcc0fea..fbf5578872e6b 100644
--- a/Lib/test/test_functools.py
+++ b/Lib/test/test_functools.py
@@ -1163,6 +1163,34 @@ def test_pickle(self):
                     method_copy = pickle.loads(pickle.dumps(method, proto))
                     self.assertIs(method_copy, method)
 
+
+    def test_total_ordering_for_metaclasses_issue_44605(self):
+
+        @functools.total_ordering
+        class SortableMeta(type):
+            def __new__(cls, name, bases, ns):
+                return super().__new__(cls, name, bases, ns)
+
+            def __lt__(self, other):
+                if not isinstance(other, SortableMeta):
+                    pass
+                return self.__name__ < other.__name__
+
+            def __eq__(self, other):
+                if not isinstance(other, SortableMeta):
+                    pass
+                return self.__name__ == other.__name__
+
+        class B(metaclass=SortableMeta):
+            pass
+
+        class A(metaclass=SortableMeta):
+            pass
+
+        self.assertTrue(A < B)
+        self.assertFalse(A > B)
+
+
 @functools.total_ordering
 class Orderable_LT:
     def __init__(self, value):
diff --git a/Misc/NEWS.d/next/Library/2021-08-06-09-43-50.bpo-44605.q4YSBZ.rst b/Misc/NEWS.d/next/Library/2021-08-06-09-43-50.bpo-44605.q4YSBZ.rst
new file mode 100644
index 0000000000000..93783923e15b3
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-06-09-43-50.bpo-44605.q4YSBZ.rst
@@ -0,0 +1 @@
+The @functools.total_ordering() decorator now works with metaclasses.


From webhook-mailer at python.org  Fri Aug  6 15:58:24 2021
From: webhook-mailer at python.org (rhettinger)
Date: Fri, 06 Aug 2021 19:58:24 -0000
Subject: [Python-checkins] bpo-44605: Teach @total_ordering() to work with
 metaclasses (GH-27633) (GH-27641)
Message-ID: <mailman.929.1628279906.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/fde84170d06f74afd6f95d5b18cf3f733018191a
commit: fde84170d06f74afd6f95d5b18cf3f733018191a
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: rhettinger <rhettinger at users.noreply.github.com>
date: 2021-08-06T14:57:52-05:00
summary:

bpo-44605: Teach @total_ordering() to work with metaclasses (GH-27633) (GH-27641)

files:
A Misc/NEWS.d/next/Library/2021-08-06-09-43-50.bpo-44605.q4YSBZ.rst
M Lib/functools.py
M Lib/test/test_functools.py

diff --git a/Lib/functools.py b/Lib/functools.py
index 8506ed3827f29..97744a869563d 100644
--- a/Lib/functools.py
+++ b/Lib/functools.py
@@ -88,84 +88,84 @@ def wraps(wrapped,
 
 def _gt_from_lt(self, other, NotImplemented=NotImplemented):
     'Return a > b.  Computed by @total_ordering from (not a < b) and (a != b).'
-    op_result = self.__lt__(other)
+    op_result = type(self).__lt__(self, other)
     if op_result is NotImplemented:
         return op_result
     return not op_result and self != other
 
 def _le_from_lt(self, other, NotImplemented=NotImplemented):
     'Return a <= b.  Computed by @total_ordering from (a < b) or (a == b).'
-    op_result = self.__lt__(other)
+    op_result = type(self).__lt__(self, other)
     if op_result is NotImplemented:
         return op_result
     return op_result or self == other
 
 def _ge_from_lt(self, other, NotImplemented=NotImplemented):
     'Return a >= b.  Computed by @total_ordering from (not a < b).'
-    op_result = self.__lt__(other)
+    op_result = type(self).__lt__(self, other)
     if op_result is NotImplemented:
         return op_result
     return not op_result
 
 def _ge_from_le(self, other, NotImplemented=NotImplemented):
     'Return a >= b.  Computed by @total_ordering from (not a <= b) or (a == b).'
-    op_result = self.__le__(other)
+    op_result = type(self).__le__(self, other)
     if op_result is NotImplemented:
         return op_result
     return not op_result or self == other
 
 def _lt_from_le(self, other, NotImplemented=NotImplemented):
     'Return a < b.  Computed by @total_ordering from (a <= b) and (a != b).'
-    op_result = self.__le__(other)
+    op_result = type(self).__le__(self, other)
     if op_result is NotImplemented:
         return op_result
     return op_result and self != other
 
 def _gt_from_le(self, other, NotImplemented=NotImplemented):
     'Return a > b.  Computed by @total_ordering from (not a <= b).'
-    op_result = self.__le__(other)
+    op_result = type(self).__le__(self, other)
     if op_result is NotImplemented:
         return op_result
     return not op_result
 
 def _lt_from_gt(self, other, NotImplemented=NotImplemented):
     'Return a < b.  Computed by @total_ordering from (not a > b) and (a != b).'
-    op_result = self.__gt__(other)
+    op_result = type(self).__gt__(self, other)
     if op_result is NotImplemented:
         return op_result
     return not op_result and self != other
 
 def _ge_from_gt(self, other, NotImplemented=NotImplemented):
     'Return a >= b.  Computed by @total_ordering from (a > b) or (a == b).'
-    op_result = self.__gt__(other)
+    op_result = type(self).__gt__(self, other)
     if op_result is NotImplemented:
         return op_result
     return op_result or self == other
 
 def _le_from_gt(self, other, NotImplemented=NotImplemented):
     'Return a <= b.  Computed by @total_ordering from (not a > b).'
-    op_result = self.__gt__(other)
+    op_result = type(self).__gt__(self, other)
     if op_result is NotImplemented:
         return op_result
     return not op_result
 
 def _le_from_ge(self, other, NotImplemented=NotImplemented):
     'Return a <= b.  Computed by @total_ordering from (not a >= b) or (a == b).'
-    op_result = self.__ge__(other)
+    op_result = type(self).__ge__(self, other)
     if op_result is NotImplemented:
         return op_result
     return not op_result or self == other
 
 def _gt_from_ge(self, other, NotImplemented=NotImplemented):
     'Return a > b.  Computed by @total_ordering from (a >= b) and (a != b).'
-    op_result = self.__ge__(other)
+    op_result = type(self).__ge__(self, other)
     if op_result is NotImplemented:
         return op_result
     return op_result and self != other
 
 def _lt_from_ge(self, other, NotImplemented=NotImplemented):
     'Return a < b.  Computed by @total_ordering from (not a >= b).'
-    op_result = self.__ge__(other)
+    op_result = type(self).__ge__(self, other)
     if op_result is NotImplemented:
         return op_result
     return not op_result
diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py
index 11e8aa356d333..ffe2456a2a9fc 100644
--- a/Lib/test/test_functools.py
+++ b/Lib/test/test_functools.py
@@ -1153,6 +1153,34 @@ def test_pickle(self):
                     method_copy = pickle.loads(pickle.dumps(method, proto))
                     self.assertIs(method_copy, method)
 
+
+    def test_total_ordering_for_metaclasses_issue_44605(self):
+
+        @functools.total_ordering
+        class SortableMeta(type):
+            def __new__(cls, name, bases, ns):
+                return super().__new__(cls, name, bases, ns)
+
+            def __lt__(self, other):
+                if not isinstance(other, SortableMeta):
+                    pass
+                return self.__name__ < other.__name__
+
+            def __eq__(self, other):
+                if not isinstance(other, SortableMeta):
+                    pass
+                return self.__name__ == other.__name__
+
+        class B(metaclass=SortableMeta):
+            pass
+
+        class A(metaclass=SortableMeta):
+            pass
+
+        self.assertTrue(A < B)
+        self.assertFalse(A > B)
+
+
 @functools.total_ordering
 class Orderable_LT:
     def __init__(self, value):
diff --git a/Misc/NEWS.d/next/Library/2021-08-06-09-43-50.bpo-44605.q4YSBZ.rst b/Misc/NEWS.d/next/Library/2021-08-06-09-43-50.bpo-44605.q4YSBZ.rst
new file mode 100644
index 0000000000000..93783923e15b3
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-06-09-43-50.bpo-44605.q4YSBZ.rst
@@ -0,0 +1 @@
+The @functools.total_ordering() decorator now works with metaclasses.


From webhook-mailer at python.org  Fri Aug  6 16:05:24 2021
From: webhook-mailer at python.org (ambv)
Date: Fri, 06 Aug 2021 20:05:24 -0000
Subject: [Python-checkins] bpo-27752: improve documentation of csv.Dialect
 (GH-26795)
Message-ID: <mailman.930.1628280325.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/0ffdced3b64ba5886fcde64266a31a15712da284
commit: 0ffdced3b64ba5886fcde64266a31a15712da284
branch: main
author: Jack DeVries <58614260+jdevries3133 at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-06T22:05:16+02:00
summary:

bpo-27752: improve documentation of csv.Dialect (GH-26795)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Misc/NEWS.d/next/Documentation/2021-06-18-18-04-53.bpo-27752.NEByNk.rst
M Doc/library/csv.rst

diff --git a/Doc/library/csv.rst b/Doc/library/csv.rst
index cb03f8da20235..899ce0225ce7f 100644
--- a/Doc/library/csv.rst
+++ b/Doc/library/csv.rst
@@ -94,8 +94,8 @@ The :mod:`csv` module defines the following functions:
    :class:`Dialect` class or one of the strings returned by the
    :func:`list_dialects` function.  The other optional *fmtparams* keyword arguments
    can be given to override individual formatting parameters in the current
-   dialect.  For full details about the dialect and formatting parameters, see
-   section :ref:`csv-fmt-params`. To make it
+   dialect.  For full details about dialects and formatting parameters, see
+   the :ref:`csv-fmt-params` section. To make it
    as easy as possible to interface with modules which implement the DB API, the
    value :const:`None` is written as the empty string.  While this isn't a
    reversible transformation, it makes it easier to dump SQL NULL data values to
@@ -117,7 +117,7 @@ The :mod:`csv` module defines the following functions:
    Associate *dialect* with *name*.  *name* must be a string. The
    dialect can be specified either by passing a sub-class of :class:`Dialect`, or
    by *fmtparams* keyword arguments, or both, with keyword arguments overriding
-   parameters of the dialect. For full details about the dialect and formatting
+   parameters of the dialect. For full details about dialects and formatting
    parameters, see section :ref:`csv-fmt-params`.
 
 
@@ -225,9 +225,21 @@ The :mod:`csv` module defines the following classes:
 
 .. class:: Dialect
 
-   The :class:`Dialect` class is a container class relied on primarily for its
-   attributes, which are used to define the parameters for a specific
-   :class:`reader` or :class:`writer` instance.
+   The :class:`Dialect` class is a container class whose attributes contain
+   information for how to handle doublequotes, whitespace, delimiters, etc.
+   Due to the lack of a strict CSV specification, different applications
+   produce subtly different CSV data.  :class:`Dialect` instances define how
+   :class:`reader` and :class:`writer` instances behave.
+
+   All available :class:`Dialect` names are returned by :func:`list_dialects`,
+   and they can be registered with specific :class:`reader` and :class:`writer`
+   classes through their initializer (``__init__``) functions like this::
+
+       import csv
+
+       with open('students.csv', 'w', newline='') as csvfile:
+           writer = csv.writer(csvfile, dialect='unix')
+                                        ^^^^^^^^^^^^^^
 
 
 .. class:: excel()
@@ -419,8 +431,8 @@ Reader objects (:class:`DictReader` instances and objects returned by the
 
    Return the next row of the reader's iterable object as a list (if the object
    was returned from :func:`reader`) or a dict (if it is a :class:`DictReader`
-   instance), parsed according to the current dialect.  Usually you should call
-   this as ``next(reader)``.
+   instance), parsed according to the current :class:`Dialect`.  Usually you
+   should call this as ``next(reader)``.
 
 
 Reader objects have the following public attributes:
@@ -460,9 +472,9 @@ read CSV files (assuming they support complex numbers at all).
 
 .. method:: csvwriter.writerow(row)
 
-   Write the *row* parameter to the writer's file object, formatted according to
-   the current dialect. Return the return value of the call to the *write* method
-   of the underlying file object.
+   Write the *row* parameter to the writer's file object, formatted according
+   to the current :class:`Dialect`. Return the return value of the call to the
+   *write* method of the underlying file object.
 
    .. versionchanged:: 3.5
       Added support of arbitrary iterables.
diff --git a/Misc/NEWS.d/next/Documentation/2021-06-18-18-04-53.bpo-27752.NEByNk.rst b/Misc/NEWS.d/next/Documentation/2021-06-18-18-04-53.bpo-27752.NEByNk.rst
new file mode 100644
index 0000000000000..ccb7767a6b693
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2021-06-18-18-04-53.bpo-27752.NEByNk.rst
@@ -0,0 +1 @@
+Documentation of csv.Dialect is more descriptive.


From webhook-mailer at python.org  Fri Aug  6 16:11:52 2021
From: webhook-mailer at python.org (rhettinger)
Date: Fri, 06 Aug 2021 20:11:52 -0000
Subject: [Python-checkins] bpo-44605: Teach @total_ordering() to work with
 metaclasses (GH-27633) (GH-27640)
Message-ID: <mailman.931.1628280714.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/66dd1a0e645f26b074547dccc92448169cb32410
commit: 66dd1a0e645f26b074547dccc92448169cb32410
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: rhettinger <rhettinger at users.noreply.github.com>
date: 2021-08-06T15:11:44-05:00
summary:

bpo-44605: Teach @total_ordering() to work with metaclasses (GH-27633) (GH-27640)

files:
A Misc/NEWS.d/next/Library/2021-08-06-09-43-50.bpo-44605.q4YSBZ.rst
M Lib/functools.py
M Lib/test/test_functools.py

diff --git a/Lib/functools.py b/Lib/functools.py
index 357c1dfd909fa..77ec852805c10 100644
--- a/Lib/functools.py
+++ b/Lib/functools.py
@@ -88,84 +88,84 @@ def wraps(wrapped,
 
 def _gt_from_lt(self, other, NotImplemented=NotImplemented):
     'Return a > b.  Computed by @total_ordering from (not a < b) and (a != b).'
-    op_result = self.__lt__(other)
+    op_result = type(self).__lt__(self, other)
     if op_result is NotImplemented:
         return op_result
     return not op_result and self != other
 
 def _le_from_lt(self, other, NotImplemented=NotImplemented):
     'Return a <= b.  Computed by @total_ordering from (a < b) or (a == b).'
-    op_result = self.__lt__(other)
+    op_result = type(self).__lt__(self, other)
     if op_result is NotImplemented:
         return op_result
     return op_result or self == other
 
 def _ge_from_lt(self, other, NotImplemented=NotImplemented):
     'Return a >= b.  Computed by @total_ordering from (not a < b).'
-    op_result = self.__lt__(other)
+    op_result = type(self).__lt__(self, other)
     if op_result is NotImplemented:
         return op_result
     return not op_result
 
 def _ge_from_le(self, other, NotImplemented=NotImplemented):
     'Return a >= b.  Computed by @total_ordering from (not a <= b) or (a == b).'
-    op_result = self.__le__(other)
+    op_result = type(self).__le__(self, other)
     if op_result is NotImplemented:
         return op_result
     return not op_result or self == other
 
 def _lt_from_le(self, other, NotImplemented=NotImplemented):
     'Return a < b.  Computed by @total_ordering from (a <= b) and (a != b).'
-    op_result = self.__le__(other)
+    op_result = type(self).__le__(self, other)
     if op_result is NotImplemented:
         return op_result
     return op_result and self != other
 
 def _gt_from_le(self, other, NotImplemented=NotImplemented):
     'Return a > b.  Computed by @total_ordering from (not a <= b).'
-    op_result = self.__le__(other)
+    op_result = type(self).__le__(self, other)
     if op_result is NotImplemented:
         return op_result
     return not op_result
 
 def _lt_from_gt(self, other, NotImplemented=NotImplemented):
     'Return a < b.  Computed by @total_ordering from (not a > b) and (a != b).'
-    op_result = self.__gt__(other)
+    op_result = type(self).__gt__(self, other)
     if op_result is NotImplemented:
         return op_result
     return not op_result and self != other
 
 def _ge_from_gt(self, other, NotImplemented=NotImplemented):
     'Return a >= b.  Computed by @total_ordering from (a > b) or (a == b).'
-    op_result = self.__gt__(other)
+    op_result = type(self).__gt__(self, other)
     if op_result is NotImplemented:
         return op_result
     return op_result or self == other
 
 def _le_from_gt(self, other, NotImplemented=NotImplemented):
     'Return a <= b.  Computed by @total_ordering from (not a > b).'
-    op_result = self.__gt__(other)
+    op_result = type(self).__gt__(self, other)
     if op_result is NotImplemented:
         return op_result
     return not op_result
 
 def _le_from_ge(self, other, NotImplemented=NotImplemented):
     'Return a <= b.  Computed by @total_ordering from (not a >= b) or (a == b).'
-    op_result = self.__ge__(other)
+    op_result = type(self).__ge__(self, other)
     if op_result is NotImplemented:
         return op_result
     return not op_result or self == other
 
 def _gt_from_ge(self, other, NotImplemented=NotImplemented):
     'Return a > b.  Computed by @total_ordering from (a >= b) and (a != b).'
-    op_result = self.__ge__(other)
+    op_result = type(self).__ge__(self, other)
     if op_result is NotImplemented:
         return op_result
     return op_result and self != other
 
 def _lt_from_ge(self, other, NotImplemented=NotImplemented):
     'Return a < b.  Computed by @total_ordering from (not a >= b).'
-    op_result = self.__ge__(other)
+    op_result = type(self).__ge__(self, other)
     if op_result is NotImplemented:
         return op_result
     return not op_result
diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py
index 78a8a5fcc0fea..fbf5578872e6b 100644
--- a/Lib/test/test_functools.py
+++ b/Lib/test/test_functools.py
@@ -1163,6 +1163,34 @@ def test_pickle(self):
                     method_copy = pickle.loads(pickle.dumps(method, proto))
                     self.assertIs(method_copy, method)
 
+
+    def test_total_ordering_for_metaclasses_issue_44605(self):
+
+        @functools.total_ordering
+        class SortableMeta(type):
+            def __new__(cls, name, bases, ns):
+                return super().__new__(cls, name, bases, ns)
+
+            def __lt__(self, other):
+                if not isinstance(other, SortableMeta):
+                    pass
+                return self.__name__ < other.__name__
+
+            def __eq__(self, other):
+                if not isinstance(other, SortableMeta):
+                    pass
+                return self.__name__ == other.__name__
+
+        class B(metaclass=SortableMeta):
+            pass
+
+        class A(metaclass=SortableMeta):
+            pass
+
+        self.assertTrue(A < B)
+        self.assertFalse(A > B)
+
+
 @functools.total_ordering
 class Orderable_LT:
     def __init__(self, value):
diff --git a/Misc/NEWS.d/next/Library/2021-08-06-09-43-50.bpo-44605.q4YSBZ.rst b/Misc/NEWS.d/next/Library/2021-08-06-09-43-50.bpo-44605.q4YSBZ.rst
new file mode 100644
index 0000000000000..93783923e15b3
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-06-09-43-50.bpo-44605.q4YSBZ.rst
@@ -0,0 +1 @@
+The @functools.total_ordering() decorator now works with metaclasses.


From webhook-mailer at python.org  Fri Aug  6 16:31:59 2021
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 06 Aug 2021 20:31:59 -0000
Subject: [Python-checkins] bpo-27752: improve documentation of csv.Dialect
 (GH-26795)
Message-ID: <mailman.932.1628281920.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/2fd1f21db46b165cf603cf4524b4d14ab41ed1cc
commit: 2fd1f21db46b165cf603cf4524b4d14ab41ed1cc
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-06T13:31:49-07:00
summary:

bpo-27752: improve documentation of csv.Dialect (GH-26795)


Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 0ffdced3b64ba5886fcde64266a31a15712da284)

Co-authored-by: Jack DeVries <58614260+jdevries3133 at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Documentation/2021-06-18-18-04-53.bpo-27752.NEByNk.rst
M Doc/library/csv.rst

diff --git a/Doc/library/csv.rst b/Doc/library/csv.rst
index cb03f8da20235..899ce0225ce7f 100644
--- a/Doc/library/csv.rst
+++ b/Doc/library/csv.rst
@@ -94,8 +94,8 @@ The :mod:`csv` module defines the following functions:
    :class:`Dialect` class or one of the strings returned by the
    :func:`list_dialects` function.  The other optional *fmtparams* keyword arguments
    can be given to override individual formatting parameters in the current
-   dialect.  For full details about the dialect and formatting parameters, see
-   section :ref:`csv-fmt-params`. To make it
+   dialect.  For full details about dialects and formatting parameters, see
+   the :ref:`csv-fmt-params` section. To make it
    as easy as possible to interface with modules which implement the DB API, the
    value :const:`None` is written as the empty string.  While this isn't a
    reversible transformation, it makes it easier to dump SQL NULL data values to
@@ -117,7 +117,7 @@ The :mod:`csv` module defines the following functions:
    Associate *dialect* with *name*.  *name* must be a string. The
    dialect can be specified either by passing a sub-class of :class:`Dialect`, or
    by *fmtparams* keyword arguments, or both, with keyword arguments overriding
-   parameters of the dialect. For full details about the dialect and formatting
+   parameters of the dialect. For full details about dialects and formatting
    parameters, see section :ref:`csv-fmt-params`.
 
 
@@ -225,9 +225,21 @@ The :mod:`csv` module defines the following classes:
 
 .. class:: Dialect
 
-   The :class:`Dialect` class is a container class relied on primarily for its
-   attributes, which are used to define the parameters for a specific
-   :class:`reader` or :class:`writer` instance.
+   The :class:`Dialect` class is a container class whose attributes contain
+   information for how to handle doublequotes, whitespace, delimiters, etc.
+   Due to the lack of a strict CSV specification, different applications
+   produce subtly different CSV data.  :class:`Dialect` instances define how
+   :class:`reader` and :class:`writer` instances behave.
+
+   All available :class:`Dialect` names are returned by :func:`list_dialects`,
+   and they can be registered with specific :class:`reader` and :class:`writer`
+   classes through their initializer (``__init__``) functions like this::
+
+       import csv
+
+       with open('students.csv', 'w', newline='') as csvfile:
+           writer = csv.writer(csvfile, dialect='unix')
+                                        ^^^^^^^^^^^^^^
 
 
 .. class:: excel()
@@ -419,8 +431,8 @@ Reader objects (:class:`DictReader` instances and objects returned by the
 
    Return the next row of the reader's iterable object as a list (if the object
    was returned from :func:`reader`) or a dict (if it is a :class:`DictReader`
-   instance), parsed according to the current dialect.  Usually you should call
-   this as ``next(reader)``.
+   instance), parsed according to the current :class:`Dialect`.  Usually you
+   should call this as ``next(reader)``.
 
 
 Reader objects have the following public attributes:
@@ -460,9 +472,9 @@ read CSV files (assuming they support complex numbers at all).
 
 .. method:: csvwriter.writerow(row)
 
-   Write the *row* parameter to the writer's file object, formatted according to
-   the current dialect. Return the return value of the call to the *write* method
-   of the underlying file object.
+   Write the *row* parameter to the writer's file object, formatted according
+   to the current :class:`Dialect`. Return the return value of the call to the
+   *write* method of the underlying file object.
 
    .. versionchanged:: 3.5
       Added support of arbitrary iterables.
diff --git a/Misc/NEWS.d/next/Documentation/2021-06-18-18-04-53.bpo-27752.NEByNk.rst b/Misc/NEWS.d/next/Documentation/2021-06-18-18-04-53.bpo-27752.NEByNk.rst
new file mode 100644
index 0000000000000..ccb7767a6b693
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2021-06-18-18-04-53.bpo-27752.NEByNk.rst
@@ -0,0 +1 @@
+Documentation of csv.Dialect is more descriptive.


From webhook-mailer at python.org  Fri Aug  6 16:33:30 2021
From: webhook-mailer at python.org (ambv)
Date: Fri, 06 Aug 2021 20:33:30 -0000
Subject: [Python-checkins] bpo-27752: improve documentation of csv.Dialect
 (GH-26795) (GH-27644)
Message-ID: <mailman.933.1628282011.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/62bce24e32a9c754a23e758a32a7e0ca49602fc5
commit: 62bce24e32a9c754a23e758a32a7e0ca49602fc5
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-06T22:33:21+02:00
summary:

bpo-27752: improve documentation of csv.Dialect (GH-26795) (GH-27644)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 0ffdced3b64ba5886fcde64266a31a15712da284)

Co-authored-by: Jack DeVries <58614260+jdevries3133 at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Documentation/2021-06-18-18-04-53.bpo-27752.NEByNk.rst
M Doc/library/csv.rst

diff --git a/Doc/library/csv.rst b/Doc/library/csv.rst
index 7a72c26d5bade..275ee10e93d31 100644
--- a/Doc/library/csv.rst
+++ b/Doc/library/csv.rst
@@ -94,8 +94,8 @@ The :mod:`csv` module defines the following functions:
    :class:`Dialect` class or one of the strings returned by the
    :func:`list_dialects` function.  The other optional *fmtparams* keyword arguments
    can be given to override individual formatting parameters in the current
-   dialect.  For full details about the dialect and formatting parameters, see
-   section :ref:`csv-fmt-params`. To make it
+   dialect.  For full details about dialects and formatting parameters, see
+   the :ref:`csv-fmt-params` section. To make it
    as easy as possible to interface with modules which implement the DB API, the
    value :const:`None` is written as the empty string.  While this isn't a
    reversible transformation, it makes it easier to dump SQL NULL data values to
@@ -117,7 +117,7 @@ The :mod:`csv` module defines the following functions:
    Associate *dialect* with *name*.  *name* must be a string. The
    dialect can be specified either by passing a sub-class of :class:`Dialect`, or
    by *fmtparams* keyword arguments, or both, with keyword arguments overriding
-   parameters of the dialect. For full details about the dialect and formatting
+   parameters of the dialect. For full details about dialects and formatting
    parameters, see section :ref:`csv-fmt-params`.
 
 
@@ -225,9 +225,21 @@ The :mod:`csv` module defines the following classes:
 
 .. class:: Dialect
 
-   The :class:`Dialect` class is a container class relied on primarily for its
-   attributes, which are used to define the parameters for a specific
-   :class:`reader` or :class:`writer` instance.
+   The :class:`Dialect` class is a container class whose attributes contain
+   information for how to handle doublequotes, whitespace, delimiters, etc.
+   Due to the lack of a strict CSV specification, different applications
+   produce subtly different CSV data.  :class:`Dialect` instances define how
+   :class:`reader` and :class:`writer` instances behave.
+
+   All available :class:`Dialect` names are returned by :func:`list_dialects`,
+   and they can be registered with specific :class:`reader` and :class:`writer`
+   classes through their initializer (``__init__``) functions like this::
+
+       import csv
+
+       with open('students.csv', 'w', newline='') as csvfile:
+           writer = csv.writer(csvfile, dialect='unix')
+                                        ^^^^^^^^^^^^^^
 
 
 .. class:: excel()
@@ -405,8 +417,8 @@ Reader objects (:class:`DictReader` instances and objects returned by the
 
    Return the next row of the reader's iterable object as a list (if the object
    was returned from :func:`reader`) or a dict (if it is a :class:`DictReader`
-   instance), parsed according to the current dialect.  Usually you should call
-   this as ``next(reader)``.
+   instance), parsed according to the current :class:`Dialect`.  Usually you
+   should call this as ``next(reader)``.
 
 
 Reader objects have the following public attributes:
@@ -446,9 +458,9 @@ read CSV files (assuming they support complex numbers at all).
 
 .. method:: csvwriter.writerow(row)
 
-   Write the *row* parameter to the writer's file object, formatted according to
-   the current dialect. Return the return value of the call to the *write* method
-   of the underlying file object.
+   Write the *row* parameter to the writer's file object, formatted according
+   to the current :class:`Dialect`. Return the return value of the call to the
+   *write* method of the underlying file object.
 
    .. versionchanged:: 3.5
       Added support of arbitrary iterables.
diff --git a/Misc/NEWS.d/next/Documentation/2021-06-18-18-04-53.bpo-27752.NEByNk.rst b/Misc/NEWS.d/next/Documentation/2021-06-18-18-04-53.bpo-27752.NEByNk.rst
new file mode 100644
index 0000000000000..ccb7767a6b693
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2021-06-18-18-04-53.bpo-27752.NEByNk.rst
@@ -0,0 +1 @@
+Documentation of csv.Dialect is more descriptive.


From webhook-mailer at python.org  Fri Aug  6 16:44:24 2021
From: webhook-mailer at python.org (ambv)
Date: Fri, 06 Aug 2021 20:44:24 -0000
Subject: [Python-checkins] bpo-41576: document BaseException in favor of
 bare except (GH-21917)
Message-ID: <mailman.934.1628282665.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/e9a6f1b78bf57d9f3f99547bd007d7cfc9724cfb
commit: e9a6f1b78bf57d9f3f99547bd007d7cfc9724cfb
branch: main
author: Thomas Grainger <tagrain at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-06T22:44:15+02:00
summary:

bpo-41576: document BaseException in favor of bare except (GH-21917)

files:
A Misc/NEWS.d/next/Documentation/2020-08-21-22-59-37.bpo-41576.7a6CQR.rst
M Doc/tutorial/errors.rst

diff --git a/Doc/tutorial/errors.rst b/Doc/tutorial/errors.rst
index 27e39dfe257716..e7a45a302c65a7 100644
--- a/Doc/tutorial/errors.rst
+++ b/Doc/tutorial/errors.rst
@@ -147,10 +147,10 @@ For example, the following code will print B, C, D in that order::
 Note that if the *except clauses* were reversed (with ``except B`` first), it
 would have printed B, B, B --- the first matching *except clause* is triggered.
 
-The last *except clause* may omit the exception name(s), to serve as a wildcard.
-Use this with extreme caution, since it is easy to mask a real programming error
-in this way!  It can also be used to print an error message and then re-raise
-the exception (allowing a caller to handle the exception as well)::
+All exceptions inherit from :exc:`BaseException`, and so it can be used to serve
+as a wildcard. Use this with extreme caution, since it is easy to mask a real
+programming error in this way!  It can also be used to print an error message and
+then re-raise the exception (allowing a caller to handle the exception as well)::
 
    import sys
 
@@ -162,10 +162,13 @@ the exception (allowing a caller to handle the exception as well)::
        print("OS error: {0}".format(err))
    except ValueError:
        print("Could not convert data to an integer.")
-   except:
-       print("Unexpected error:", sys.exc_info()[0])
+   except BaseException as err:
+       print(f"Unexpected {err=}, {type(err)=}")
        raise
 
+Alternatively the last except clause may omit the exception name(s), however the exception
+value must then be retrieved from ``sys.exc_info()[1]``.
+
 The :keyword:`try` ... :keyword:`except` statement has an optional *else
 clause*, which, when present, must follow all *except clauses*.  It is useful
 for code that must be executed if the *try clause* does not raise an exception.
@@ -493,5 +496,3 @@ used in a way that ensures they are always cleaned up promptly and correctly. ::
 After the statement is executed, the file *f* is always closed, even if a
 problem was encountered while processing the lines. Objects which, like files,
 provide predefined clean-up actions will indicate this in their documentation.
-
-
diff --git a/Misc/NEWS.d/next/Documentation/2020-08-21-22-59-37.bpo-41576.7a6CQR.rst b/Misc/NEWS.d/next/Documentation/2020-08-21-22-59-37.bpo-41576.7a6CQR.rst
new file mode 100644
index 00000000000000..f74ef62ca47ab2
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2020-08-21-22-59-37.bpo-41576.7a6CQR.rst
@@ -0,0 +1 @@
+document BaseException in favor of bare except
\ No newline at end of file


From webhook-mailer at python.org  Fri Aug  6 17:02:25 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Fri, 06 Aug 2021 21:02:25 -0000
Subject: [Python-checkins] [3.9] bpo-44822: Don't truncate `str`s with
 embedded NULL chars returned by `sqlite3` UDF callbacks (GH-27588).
 (GH-27639)
Message-ID: <mailman.935.1628283746.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/c352412123140e79dcce6188d17e3e6dbc3f4144
commit: c352412123140e79dcce6188d17e3e6dbc3f4144
branch: 3.9
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-07T00:02:06+03:00
summary:

[3.9] bpo-44822: Don't truncate `str`s with embedded NULL chars returned by `sqlite3` UDF callbacks (GH-27588). (GH-27639)

(cherry picked from commit 8f010dc920e1f6dc6a357e7cc1460a7a567c05c6)

files:
A Misc/NEWS.d/next/Library/2021-08-04-12-29-00.bpo-44822.zePNXA.rst
M Lib/sqlite3/test/userfunctions.py
M Modules/_sqlite/connection.c

diff --git a/Lib/sqlite3/test/userfunctions.py b/Lib/sqlite3/test/userfunctions.py
index a1c29d482366e..1bceefe8e69d9 100644
--- a/Lib/sqlite3/test/userfunctions.py
+++ b/Lib/sqlite3/test/userfunctions.py
@@ -27,6 +27,8 @@
 
 def func_returntext():
     return "foo"
+def func_returntextwithnull():
+    return "1\x002"
 def func_returnunicode():
     return "bar"
 def func_returnint():
@@ -137,11 +139,21 @@ def step(self, val):
     def finalize(self):
         return self.val
 
+class AggrText:
+    def __init__(self):
+        self.txt = ""
+    def step(self, txt):
+        self.txt = self.txt + txt
+    def finalize(self):
+        return self.txt
+
+
 class FunctionTests(unittest.TestCase):
     def setUp(self):
         self.con = sqlite.connect(":memory:")
 
         self.con.create_function("returntext", 0, func_returntext)
+        self.con.create_function("returntextwithnull", 0, func_returntextwithnull)
         self.con.create_function("returnunicode", 0, func_returnunicode)
         self.con.create_function("returnint", 0, func_returnint)
         self.con.create_function("returnfloat", 0, func_returnfloat)
@@ -185,6 +197,12 @@ def CheckFuncReturnText(self):
         self.assertEqual(type(val), str)
         self.assertEqual(val, "foo")
 
+    def CheckFuncReturnTextWithNullChar(self):
+        cur = self.con.cursor()
+        res = cur.execute("select returntextwithnull()").fetchone()[0]
+        self.assertEqual(type(res), str)
+        self.assertEqual(res, "1\x002")
+
     def CheckFuncReturnUnicode(self):
         cur = self.con.cursor()
         cur.execute("select returnunicode()")
@@ -343,6 +361,7 @@ def setUp(self):
         self.con.create_aggregate("checkType", 2, AggrCheckType)
         self.con.create_aggregate("checkTypes", -1, AggrCheckTypes)
         self.con.create_aggregate("mysum", 1, AggrSum)
+        self.con.create_aggregate("aggtxt", 1, AggrText)
 
     def tearDown(self):
         #self.cur.close()
@@ -431,6 +450,15 @@ def CheckAggrCheckAggrSum(self):
         val = cur.fetchone()[0]
         self.assertEqual(val, 60)
 
+    def CheckAggrText(self):
+        cur = self.con.cursor()
+        for txt in ["foo", "1\x002"]:
+            with self.subTest(txt=txt):
+                cur.execute("select aggtxt(?) from test", (txt,))
+                val = cur.fetchone()[0]
+                self.assertEqual(val, txt)
+
+
 class AuthorizerTests(unittest.TestCase):
     @staticmethod
     def authorizer_cb(action, arg1, arg2, dbname, source):
diff --git a/Misc/NEWS.d/next/Library/2021-08-04-12-29-00.bpo-44822.zePNXA.rst b/Misc/NEWS.d/next/Library/2021-08-04-12-29-00.bpo-44822.zePNXA.rst
new file mode 100644
index 0000000000000..d078142886d2e
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-04-12-29-00.bpo-44822.zePNXA.rst
@@ -0,0 +1,3 @@
+:mod:`sqlite3` user-defined functions and aggregators returning
+:class:`strings <str>` with embedded NUL characters are no longer
+truncated. Patch by Erlend E. Aasland.
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index 986a82918b5fe..4806a12789cd1 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -515,10 +515,17 @@ _pysqlite_set_result(sqlite3_context* context, PyObject* py_val)
     } else if (PyFloat_Check(py_val)) {
         sqlite3_result_double(context, PyFloat_AsDouble(py_val));
     } else if (PyUnicode_Check(py_val)) {
-        const char *str = PyUnicode_AsUTF8(py_val);
-        if (str == NULL)
+        Py_ssize_t sz;
+        const char *str = PyUnicode_AsUTF8AndSize(py_val, &sz);
+        if (str == NULL) {
             return -1;
-        sqlite3_result_text(context, str, -1, SQLITE_TRANSIENT);
+        }
+        if (sz > INT_MAX) {
+            PyErr_SetString(PyExc_OverflowError,
+                            "string is longer than INT_MAX bytes");
+            return -1;
+        }
+        sqlite3_result_text(context, str, (int)sz, SQLITE_TRANSIENT);
     } else if (PyObject_CheckBuffer(py_val)) {
         Py_buffer view;
         if (PyObject_GetBuffer(py_val, &view, PyBUF_SIMPLE) != 0) {


From webhook-mailer at python.org  Fri Aug  6 17:14:44 2021
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 06 Aug 2021 21:14:44 -0000
Subject: [Python-checkins] bpo-41576: document BaseException in favor of
 bare except (GH-21917)
Message-ID: <mailman.936.1628284485.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/699ee016af5736ffc80f68359617611a22b72943
commit: 699ee016af5736ffc80f68359617611a22b72943
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-06T14:14:40-07:00
summary:

bpo-41576: document BaseException in favor of bare except (GH-21917)

(cherry picked from commit e9a6f1b78bf57d9f3f99547bd007d7cfc9724cfb)

Co-authored-by: Thomas Grainger <tagrain at gmail.com>

files:
A Misc/NEWS.d/next/Documentation/2020-08-21-22-59-37.bpo-41576.7a6CQR.rst
M Doc/tutorial/errors.rst

diff --git a/Doc/tutorial/errors.rst b/Doc/tutorial/errors.rst
index 27e39dfe257716..e7a45a302c65a7 100644
--- a/Doc/tutorial/errors.rst
+++ b/Doc/tutorial/errors.rst
@@ -147,10 +147,10 @@ For example, the following code will print B, C, D in that order::
 Note that if the *except clauses* were reversed (with ``except B`` first), it
 would have printed B, B, B --- the first matching *except clause* is triggered.
 
-The last *except clause* may omit the exception name(s), to serve as a wildcard.
-Use this with extreme caution, since it is easy to mask a real programming error
-in this way!  It can also be used to print an error message and then re-raise
-the exception (allowing a caller to handle the exception as well)::
+All exceptions inherit from :exc:`BaseException`, and so it can be used to serve
+as a wildcard. Use this with extreme caution, since it is easy to mask a real
+programming error in this way!  It can also be used to print an error message and
+then re-raise the exception (allowing a caller to handle the exception as well)::
 
    import sys
 
@@ -162,10 +162,13 @@ the exception (allowing a caller to handle the exception as well)::
        print("OS error: {0}".format(err))
    except ValueError:
        print("Could not convert data to an integer.")
-   except:
-       print("Unexpected error:", sys.exc_info()[0])
+   except BaseException as err:
+       print(f"Unexpected {err=}, {type(err)=}")
        raise
 
+Alternatively the last except clause may omit the exception name(s), however the exception
+value must then be retrieved from ``sys.exc_info()[1]``.
+
 The :keyword:`try` ... :keyword:`except` statement has an optional *else
 clause*, which, when present, must follow all *except clauses*.  It is useful
 for code that must be executed if the *try clause* does not raise an exception.
@@ -493,5 +496,3 @@ used in a way that ensures they are always cleaned up promptly and correctly. ::
 After the statement is executed, the file *f* is always closed, even if a
 problem was encountered while processing the lines. Objects which, like files,
 provide predefined clean-up actions will indicate this in their documentation.
-
-
diff --git a/Misc/NEWS.d/next/Documentation/2020-08-21-22-59-37.bpo-41576.7a6CQR.rst b/Misc/NEWS.d/next/Documentation/2020-08-21-22-59-37.bpo-41576.7a6CQR.rst
new file mode 100644
index 00000000000000..f74ef62ca47ab2
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2020-08-21-22-59-37.bpo-41576.7a6CQR.rst
@@ -0,0 +1 @@
+document BaseException in favor of bare except
\ No newline at end of file


From webhook-mailer at python.org  Fri Aug  6 17:35:23 2021
From: webhook-mailer at python.org (ambv)
Date: Fri, 06 Aug 2021 21:35:23 -0000
Subject: [Python-checkins] bpo-42971: Add errno.EQFULL (macOS) (GH-24419)
Message-ID: <mailman.937.1628285724.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/17c23167942498296f0bdfffe52e72d53d66d693
commit: 17c23167942498296f0bdfffe52e72d53d66d693
branch: main
author: Ronald Oussoren <ronaldoussoren at mac.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-06T23:35:13+02:00
summary:

bpo-42971: Add errno.EQFULL (macOS) (GH-24419)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Misc/NEWS.d/next/Library/2021-02-02-20-11-14.bpo-42971.OpVoFu.rst
M Doc/library/errno.rst
M Modules/errnomodule.c

diff --git a/Doc/library/errno.rst b/Doc/library/errno.rst
index 1cbd51c582c0c..93bdb6ca9b8e3 100644
--- a/Doc/library/errno.rst
+++ b/Doc/library/errno.rst
@@ -637,3 +637,8 @@ defined by the module.  The specific list of defined symbols is available as
 
    Quota exceeded
 
+.. data:: EQFULL
+
+   Interface output queue is full
+
+   .. versionadded:: 3.11
diff --git a/Misc/NEWS.d/next/Library/2021-02-02-20-11-14.bpo-42971.OpVoFu.rst b/Misc/NEWS.d/next/Library/2021-02-02-20-11-14.bpo-42971.OpVoFu.rst
new file mode 100644
index 0000000000000..97c8d2d79aa40
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-02-02-20-11-14.bpo-42971.OpVoFu.rst
@@ -0,0 +1,2 @@
+Add definition of ``errno.EQFULL`` for platforms that define this constant
+(such as macOS).
diff --git a/Modules/errnomodule.c b/Modules/errnomodule.c
index d99bed45bd6a2..bf6766e02349c 100644
--- a/Modules/errnomodule.c
+++ b/Modules/errnomodule.c
@@ -920,6 +920,9 @@ errno_exec(PyObject *module)
 #ifdef ESHLIBVERS
     add_errcode("ESHLIBVERS", ESHLIBVERS, "Shared library version mismatch");
 #endif
+#ifdef EQFULL
+    add_errcode("EQFULL", EQFULL, "Interface output queue is full");
+#endif
 
     Py_DECREF(error_dict);
     return 0;


From webhook-mailer at python.org  Sat Aug  7 06:10:43 2021
From: webhook-mailer at python.org (ambv)
Date: Sat, 07 Aug 2021 10:10:43 -0000
Subject: [Python-checkins] bpo-44856: Possible reference leak in error paths
 of update_bases() and __build_class__ (GH-27647)
Message-ID: <mailman.938.1628331044.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/a40675c659cd8c0699f85ee9ac31660f93f8c2f5
commit: a40675c659cd8c0699f85ee9ac31660f93f8c2f5
branch: main
author: Pablo Galindo Salgado <Pablogsal at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-07T12:10:14+02:00
summary:

bpo-44856: Possible reference leak in error paths of update_bases() and __build_class__ (GH-27647)

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-07-01-26-12.bpo-44856.9rk3li.rst
M Python/bltinmodule.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-07-01-26-12.bpo-44856.9rk3li.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-07-01-26-12.bpo-44856.9rk3li.rst
new file mode 100644
index 0000000000000..1111d01b726fa
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-07-01-26-12.bpo-44856.9rk3li.rst	
@@ -0,0 +1 @@
+Fix reference leaks in the error paths of ``update_bases()`` and ``__build_class__``. Patch by Pablo Galindo.
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index bfe21ad6d0c4c..761dc08d1d641 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -72,6 +72,7 @@ update_bases(PyObject *bases, PyObject *const *args, Py_ssize_t nargs)
             /* If this is a first successful replacement, create new_bases list and
                copy previously encountered bases. */
             if (!(new_bases = PyList_New(i))) {
+                Py_DECREF(new_base);
                 goto error;
             }
             for (j = 0; j < i; j++) {
@@ -82,6 +83,7 @@ update_bases(PyObject *bases, PyObject *const *args, Py_ssize_t nargs)
         }
         j = PyList_GET_SIZE(new_bases);
         if (PyList_SetSlice(new_bases, j, j, new_base) < 0) {
+            Py_DECREF(new_base);
             goto error;
         }
         Py_DECREF(new_base);
@@ -103,8 +105,9 @@ static PyObject *
 builtin___build_class__(PyObject *self, PyObject *const *args, Py_ssize_t nargs,
                         PyObject *kwnames)
 {
-    PyObject *func, *name, *bases, *mkw, *meta, *winner, *prep, *ns, *orig_bases;
-    PyObject *cls = NULL, *cell = NULL;
+    PyObject *func, *name, *winner, *prep;
+    PyObject *cls = NULL, *cell = NULL, *ns = NULL, *meta = NULL, *orig_bases = NULL;
+    PyObject *mkw = NULL, *bases = NULL;
     int isclass = 0;   /* initialize to prevent gcc warning */
 
     if (nargs < 2) {
@@ -141,26 +144,20 @@ builtin___build_class__(PyObject *self, PyObject *const *args, Py_ssize_t nargs,
     else {
         mkw = _PyStack_AsDict(args + nargs, kwnames);
         if (mkw == NULL) {
-            Py_DECREF(bases);
-            return NULL;
+            goto error;
         }
 
         meta = _PyDict_GetItemIdWithError(mkw, &PyId_metaclass);
         if (meta != NULL) {
             Py_INCREF(meta);
             if (_PyDict_DelItemId(mkw, &PyId_metaclass) < 0) {
-                Py_DECREF(meta);
-                Py_DECREF(mkw);
-                Py_DECREF(bases);
-                return NULL;
+                goto error;
             }
             /* metaclass is explicitly given, check if it's indeed a class */
             isclass = PyType_Check(meta);
         }
         else if (PyErr_Occurred()) {
-            Py_DECREF(mkw);
-            Py_DECREF(bases);
-            return NULL;
+            goto error;
         }
     }
     if (meta == NULL) {
@@ -183,10 +180,7 @@ builtin___build_class__(PyObject *self, PyObject *const *args, Py_ssize_t nargs,
         winner = (PyObject *)_PyType_CalculateMetaclass((PyTypeObject *)meta,
                                                         bases);
         if (winner == NULL) {
-            Py_DECREF(meta);
-            Py_XDECREF(mkw);
-            Py_DECREF(bases);
-            return NULL;
+            goto error;
         }
         if (winner != meta) {
             Py_DECREF(meta);
@@ -208,10 +202,7 @@ builtin___build_class__(PyObject *self, PyObject *const *args, Py_ssize_t nargs,
         Py_DECREF(prep);
     }
     if (ns == NULL) {
-        Py_DECREF(meta);
-        Py_XDECREF(mkw);
-        Py_DECREF(bases);
-        return NULL;
+        goto error;
     }
     if (!PyMapping_Check(ns)) {
         PyErr_Format(PyExc_TypeError,
@@ -252,13 +243,13 @@ builtin___build_class__(PyObject *self, PyObject *const *args, Py_ssize_t nargs,
     }
 error:
     Py_XDECREF(cell);
-    Py_DECREF(ns);
-    Py_DECREF(meta);
+    Py_XDECREF(ns);
+    Py_XDECREF(meta);
     Py_XDECREF(mkw);
-    Py_DECREF(bases);
     if (bases != orig_bases) {
         Py_DECREF(orig_bases);
     }
+    Py_DECREF(bases);
     return cls;
 }
 


From webhook-mailer at python.org  Sat Aug  7 07:17:44 2021
From: webhook-mailer at python.org (ambv)
Date: Sat, 07 Aug 2021 11:17:44 -0000
Subject: [Python-checkins] bpo-44856: Possible reference leak in error paths
 of update_bases() and __build_class__ (GH-27647) (GH-27652)
Message-ID: <mailman.939.1628335065.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/0a423096e8d8bbe22c0fb0904f7520387a8d4247
commit: 0a423096e8d8bbe22c0fb0904f7520387a8d4247
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-07T13:17:16+02:00
summary:

bpo-44856: Possible reference leak in error paths of update_bases() and __build_class__ (GH-27647) (GH-27652)

(cherry picked from commit a40675c659cd8c0699f85ee9ac31660f93f8c2f5)

Co-authored-by: Pablo Galindo Salgado <Pablogsal at gmail.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-07-01-26-12.bpo-44856.9rk3li.rst
M Python/bltinmodule.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-07-01-26-12.bpo-44856.9rk3li.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-07-01-26-12.bpo-44856.9rk3li.rst
new file mode 100644
index 00000000000000..1111d01b726fa2
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-07-01-26-12.bpo-44856.9rk3li.rst	
@@ -0,0 +1 @@
+Fix reference leaks in the error paths of ``update_bases()`` and ``__build_class__``. Patch by Pablo Galindo.
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 3767f552bb17aa..4c0129c5c8ae43 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -71,6 +71,7 @@ update_bases(PyObject *bases, PyObject *const *args, Py_ssize_t nargs)
             /* If this is a first successful replacement, create new_bases list and
                copy previously encountered bases. */
             if (!(new_bases = PyList_New(i))) {
+                Py_DECREF(new_base);
                 goto error;
             }
             for (j = 0; j < i; j++) {
@@ -81,6 +82,7 @@ update_bases(PyObject *bases, PyObject *const *args, Py_ssize_t nargs)
         }
         j = PyList_GET_SIZE(new_bases);
         if (PyList_SetSlice(new_bases, j, j, new_base) < 0) {
+            Py_DECREF(new_base);
             goto error;
         }
         Py_DECREF(new_base);
@@ -102,8 +104,9 @@ static PyObject *
 builtin___build_class__(PyObject *self, PyObject *const *args, Py_ssize_t nargs,
                         PyObject *kwnames)
 {
-    PyObject *func, *name, *bases, *mkw, *meta, *winner, *prep, *ns, *orig_bases;
-    PyObject *cls = NULL, *cell = NULL;
+    PyObject *func, *name, *winner, *prep;
+    PyObject *cls = NULL, *cell = NULL, *ns = NULL, *meta = NULL, *orig_bases = NULL;
+    PyObject *mkw = NULL, *bases = NULL;
     int isclass = 0;   /* initialize to prevent gcc warning */
 
     if (nargs < 2) {
@@ -140,26 +143,20 @@ builtin___build_class__(PyObject *self, PyObject *const *args, Py_ssize_t nargs,
     else {
         mkw = _PyStack_AsDict(args + nargs, kwnames);
         if (mkw == NULL) {
-            Py_DECREF(bases);
-            return NULL;
+            goto error;
         }
 
         meta = _PyDict_GetItemIdWithError(mkw, &PyId_metaclass);
         if (meta != NULL) {
             Py_INCREF(meta);
             if (_PyDict_DelItemId(mkw, &PyId_metaclass) < 0) {
-                Py_DECREF(meta);
-                Py_DECREF(mkw);
-                Py_DECREF(bases);
-                return NULL;
+                goto error;
             }
             /* metaclass is explicitly given, check if it's indeed a class */
             isclass = PyType_Check(meta);
         }
         else if (PyErr_Occurred()) {
-            Py_DECREF(mkw);
-            Py_DECREF(bases);
-            return NULL;
+            goto error;
         }
     }
     if (meta == NULL) {
@@ -182,10 +179,7 @@ builtin___build_class__(PyObject *self, PyObject *const *args, Py_ssize_t nargs,
         winner = (PyObject *)_PyType_CalculateMetaclass((PyTypeObject *)meta,
                                                         bases);
         if (winner == NULL) {
-            Py_DECREF(meta);
-            Py_XDECREF(mkw);
-            Py_DECREF(bases);
-            return NULL;
+            goto error;
         }
         if (winner != meta) {
             Py_DECREF(meta);
@@ -207,10 +201,7 @@ builtin___build_class__(PyObject *self, PyObject *const *args, Py_ssize_t nargs,
         Py_DECREF(prep);
     }
     if (ns == NULL) {
-        Py_DECREF(meta);
-        Py_XDECREF(mkw);
-        Py_DECREF(bases);
-        return NULL;
+        goto error;
     }
     if (!PyMapping_Check(ns)) {
         PyErr_Format(PyExc_TypeError,
@@ -251,13 +242,13 @@ builtin___build_class__(PyObject *self, PyObject *const *args, Py_ssize_t nargs,
     }
 error:
     Py_XDECREF(cell);
-    Py_DECREF(ns);
-    Py_DECREF(meta);
+    Py_XDECREF(ns);
+    Py_XDECREF(meta);
     Py_XDECREF(mkw);
-    Py_DECREF(bases);
     if (bases != orig_bases) {
         Py_DECREF(orig_bases);
     }
+    Py_DECREF(bases);
     return cls;
 }
 


From webhook-mailer at python.org  Sat Aug  7 07:17:45 2021
From: webhook-mailer at python.org (ambv)
Date: Sat, 07 Aug 2021 11:17:45 -0000
Subject: [Python-checkins] bpo-44856: Possible reference leak in error paths
 of update_bases() and __build_class__ (GH-27647) (GH-27651)
Message-ID: <mailman.940.1628335067.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/ed718e9b07df06ea1abbe7b34c649e9d610adf86
commit: ed718e9b07df06ea1abbe7b34c649e9d610adf86
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-07T13:17:41+02:00
summary:

bpo-44856: Possible reference leak in error paths of update_bases() and __build_class__ (GH-27647) (GH-27651)

(cherry picked from commit a40675c659cd8c0699f85ee9ac31660f93f8c2f5)

Co-authored-by: Pablo Galindo Salgado <Pablogsal at gmail.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-07-01-26-12.bpo-44856.9rk3li.rst
M Python/bltinmodule.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-07-01-26-12.bpo-44856.9rk3li.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-07-01-26-12.bpo-44856.9rk3li.rst
new file mode 100644
index 00000000000000..1111d01b726fa2
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-07-01-26-12.bpo-44856.9rk3li.rst	
@@ -0,0 +1 @@
+Fix reference leaks in the error paths of ``update_bases()`` and ``__build_class__``. Patch by Pablo Galindo.
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 614012df9b12a2..21c70f9a6c7bd0 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -71,6 +71,7 @@ update_bases(PyObject *bases, PyObject *const *args, Py_ssize_t nargs)
             /* If this is a first successful replacement, create new_bases list and
                copy previously encountered bases. */
             if (!(new_bases = PyList_New(i))) {
+                Py_DECREF(new_base);
                 goto error;
             }
             for (j = 0; j < i; j++) {
@@ -81,6 +82,7 @@ update_bases(PyObject *bases, PyObject *const *args, Py_ssize_t nargs)
         }
         j = PyList_GET_SIZE(new_bases);
         if (PyList_SetSlice(new_bases, j, j, new_base) < 0) {
+            Py_DECREF(new_base);
             goto error;
         }
         Py_DECREF(new_base);
@@ -102,8 +104,9 @@ static PyObject *
 builtin___build_class__(PyObject *self, PyObject *const *args, Py_ssize_t nargs,
                         PyObject *kwnames)
 {
-    PyObject *func, *name, *bases, *mkw, *meta, *winner, *prep, *ns, *orig_bases;
-    PyObject *cls = NULL, *cell = NULL;
+    PyObject *func, *name, *winner, *prep;
+    PyObject *cls = NULL, *cell = NULL, *ns = NULL, *meta = NULL, *orig_bases = NULL;
+    PyObject *mkw = NULL, *bases = NULL;
     int isclass = 0;   /* initialize to prevent gcc warning */
 
     if (nargs < 2) {
@@ -140,26 +143,20 @@ builtin___build_class__(PyObject *self, PyObject *const *args, Py_ssize_t nargs,
     else {
         mkw = _PyStack_AsDict(args + nargs, kwnames);
         if (mkw == NULL) {
-            Py_DECREF(bases);
-            return NULL;
+            goto error;
         }
 
         meta = _PyDict_GetItemIdWithError(mkw, &PyId_metaclass);
         if (meta != NULL) {
             Py_INCREF(meta);
             if (_PyDict_DelItemId(mkw, &PyId_metaclass) < 0) {
-                Py_DECREF(meta);
-                Py_DECREF(mkw);
-                Py_DECREF(bases);
-                return NULL;
+                goto error;
             }
             /* metaclass is explicitly given, check if it's indeed a class */
             isclass = PyType_Check(meta);
         }
         else if (PyErr_Occurred()) {
-            Py_DECREF(mkw);
-            Py_DECREF(bases);
-            return NULL;
+            goto error;
         }
     }
     if (meta == NULL) {
@@ -182,10 +179,7 @@ builtin___build_class__(PyObject *self, PyObject *const *args, Py_ssize_t nargs,
         winner = (PyObject *)_PyType_CalculateMetaclass((PyTypeObject *)meta,
                                                         bases);
         if (winner == NULL) {
-            Py_DECREF(meta);
-            Py_XDECREF(mkw);
-            Py_DECREF(bases);
-            return NULL;
+            goto error;
         }
         if (winner != meta) {
             Py_DECREF(meta);
@@ -207,10 +201,7 @@ builtin___build_class__(PyObject *self, PyObject *const *args, Py_ssize_t nargs,
         Py_DECREF(prep);
     }
     if (ns == NULL) {
-        Py_DECREF(meta);
-        Py_XDECREF(mkw);
-        Py_DECREF(bases);
-        return NULL;
+        goto error;
     }
     if (!PyMapping_Check(ns)) {
         PyErr_Format(PyExc_TypeError,
@@ -251,13 +242,13 @@ builtin___build_class__(PyObject *self, PyObject *const *args, Py_ssize_t nargs,
     }
 error:
     Py_XDECREF(cell);
-    Py_DECREF(ns);
-    Py_DECREF(meta);
+    Py_XDECREF(ns);
+    Py_XDECREF(meta);
     Py_XDECREF(mkw);
-    Py_DECREF(bases);
     if (bases != orig_bases) {
         Py_DECREF(orig_bases);
     }
+    Py_DECREF(bases);
     return cls;
 }
 


From webhook-mailer at python.org  Sat Aug  7 10:03:23 2021
From: webhook-mailer at python.org (miss-islington)
Date: Sat, 07 Aug 2021 14:03:23 -0000
Subject: [Python-checkins] bpo-44856: Possible reference leak in error paths
 of update_bases() and __build_class__ (GH-27647)
Message-ID: <mailman.941.1628345004.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/ac8f72cd3ffa24f53c558911947c42316865683c
commit: ac8f72cd3ffa24f53c558911947c42316865683c
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-07T07:03:17-07:00
summary:

bpo-44856: Possible reference leak in error paths of update_bases() and __build_class__ (GH-27647)

(cherry picked from commit a40675c659cd8c0699f85ee9ac31660f93f8c2f5)

Co-authored-by: Pablo Galindo Salgado <Pablogsal at gmail.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-07-01-26-12.bpo-44856.9rk3li.rst
M Python/bltinmodule.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-07-01-26-12.bpo-44856.9rk3li.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-07-01-26-12.bpo-44856.9rk3li.rst
new file mode 100644
index 0000000000000..1111d01b726fa
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-07-01-26-12.bpo-44856.9rk3li.rst	
@@ -0,0 +1 @@
+Fix reference leaks in the error paths of ``update_bases()`` and ``__build_class__``. Patch by Pablo Galindo.
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 66a74cbdef610..130c5f055b931 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -72,6 +72,7 @@ update_bases(PyObject *bases, PyObject *const *args, Py_ssize_t nargs)
             /* If this is a first successful replacement, create new_bases list and
                copy previously encountered bases. */
             if (!(new_bases = PyList_New(i))) {
+                Py_DECREF(new_base);
                 goto error;
             }
             for (j = 0; j < i; j++) {
@@ -82,6 +83,7 @@ update_bases(PyObject *bases, PyObject *const *args, Py_ssize_t nargs)
         }
         j = PyList_GET_SIZE(new_bases);
         if (PyList_SetSlice(new_bases, j, j, new_base) < 0) {
+            Py_DECREF(new_base);
             goto error;
         }
         Py_DECREF(new_base);
@@ -103,8 +105,9 @@ static PyObject *
 builtin___build_class__(PyObject *self, PyObject *const *args, Py_ssize_t nargs,
                         PyObject *kwnames)
 {
-    PyObject *func, *name, *bases, *mkw, *meta, *winner, *prep, *ns, *orig_bases;
-    PyObject *cls = NULL, *cell = NULL;
+    PyObject *func, *name, *winner, *prep;
+    PyObject *cls = NULL, *cell = NULL, *ns = NULL, *meta = NULL, *orig_bases = NULL;
+    PyObject *mkw = NULL, *bases = NULL;
     int isclass = 0;   /* initialize to prevent gcc warning */
 
     if (nargs < 2) {
@@ -141,26 +144,20 @@ builtin___build_class__(PyObject *self, PyObject *const *args, Py_ssize_t nargs,
     else {
         mkw = _PyStack_AsDict(args + nargs, kwnames);
         if (mkw == NULL) {
-            Py_DECREF(bases);
-            return NULL;
+            goto error;
         }
 
         meta = _PyDict_GetItemIdWithError(mkw, &PyId_metaclass);
         if (meta != NULL) {
             Py_INCREF(meta);
             if (_PyDict_DelItemId(mkw, &PyId_metaclass) < 0) {
-                Py_DECREF(meta);
-                Py_DECREF(mkw);
-                Py_DECREF(bases);
-                return NULL;
+                goto error;
             }
             /* metaclass is explicitly given, check if it's indeed a class */
             isclass = PyType_Check(meta);
         }
         else if (PyErr_Occurred()) {
-            Py_DECREF(mkw);
-            Py_DECREF(bases);
-            return NULL;
+            goto error;
         }
     }
     if (meta == NULL) {
@@ -183,10 +180,7 @@ builtin___build_class__(PyObject *self, PyObject *const *args, Py_ssize_t nargs,
         winner = (PyObject *)_PyType_CalculateMetaclass((PyTypeObject *)meta,
                                                         bases);
         if (winner == NULL) {
-            Py_DECREF(meta);
-            Py_XDECREF(mkw);
-            Py_DECREF(bases);
-            return NULL;
+            goto error;
         }
         if (winner != meta) {
             Py_DECREF(meta);
@@ -208,10 +202,7 @@ builtin___build_class__(PyObject *self, PyObject *const *args, Py_ssize_t nargs,
         Py_DECREF(prep);
     }
     if (ns == NULL) {
-        Py_DECREF(meta);
-        Py_XDECREF(mkw);
-        Py_DECREF(bases);
-        return NULL;
+        goto error;
     }
     if (!PyMapping_Check(ns)) {
         PyErr_Format(PyExc_TypeError,
@@ -252,13 +243,13 @@ builtin___build_class__(PyObject *self, PyObject *const *args, Py_ssize_t nargs,
     }
 error:
     Py_XDECREF(cell);
-    Py_DECREF(ns);
-    Py_DECREF(meta);
+    Py_XDECREF(ns);
+    Py_XDECREF(meta);
     Py_XDECREF(mkw);
-    Py_DECREF(bases);
     if (bases != orig_bases) {
         Py_DECREF(orig_bases);
     }
+    Py_DECREF(bases);
     return cls;
 }
 


From webhook-mailer at python.org  Sat Aug  7 12:38:59 2021
From: webhook-mailer at python.org (miss-islington)
Date: Sat, 07 Aug 2021 16:38:59 -0000
Subject: [Python-checkins] Upgrade bundled pip and setuptools (GH-27625)
Message-ID: <mailman.942.1628354340.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/7d6a0fe5b8001b63d452af5364422e40d06ac755
commit: 7d6a0fe5b8001b63d452af5364422e40d06ac755
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-07T09:38:40-07:00
summary:

Upgrade bundled pip and setuptools (GH-27625)


pip is now 21.2.3
setuptools is now 57.4.0
(cherry picked from commit 738ac00a08cb6a9d104ec85ccb1a44c2399d6baa)

Co-authored-by: Tzu-ping Chung <uranusjr at gmail.com>

files:
A Lib/ensurepip/_bundled/pip-21.2.3-py3-none-any.whl
A Lib/ensurepip/_bundled/setuptools-57.4.0-py3-none-any.whl
A Misc/NEWS.d/next/Library/2021-08-06-19-15-52.bpo-44581.oFDBTB.rst
D Lib/ensurepip/_bundled/pip-21.1.3-py3-none-any.whl
D Lib/ensurepip/_bundled/setuptools-56.0.0-py3-none-any.whl
M Lib/ensurepip/__init__.py

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 45c0981abbddbf..f28ab11ed40082 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -11,8 +11,8 @@
 
 __all__ = ["version", "bootstrap"]
 _PACKAGE_NAMES = ('setuptools', 'pip')
-_SETUPTOOLS_VERSION = "56.0.0"
-_PIP_VERSION = "21.1.3"
+_SETUPTOOLS_VERSION = "57.4.0"
+_PIP_VERSION = "21.2.3"
 _PROJECTS = [
     ("setuptools", _SETUPTOOLS_VERSION, "py3"),
     ("pip", _PIP_VERSION, "py3"),
diff --git a/Lib/ensurepip/_bundled/pip-21.1.3-py3-none-any.whl b/Lib/ensurepip/_bundled/pip-21.1.3-py3-none-any.whl
deleted file mode 100644
index d96a40a9291fb2..00000000000000
Binary files a/Lib/ensurepip/_bundled/pip-21.1.3-py3-none-any.whl and /dev/null differ
diff --git a/Lib/ensurepip/_bundled/pip-21.2.3-py3-none-any.whl b/Lib/ensurepip/_bundled/pip-21.2.3-py3-none-any.whl
new file mode 100644
index 00000000000000..d417df63d9ec19
Binary files /dev/null and b/Lib/ensurepip/_bundled/pip-21.2.3-py3-none-any.whl differ
diff --git a/Lib/ensurepip/_bundled/setuptools-56.0.0-py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-57.4.0-py3-none-any.whl
similarity index 65%
rename from Lib/ensurepip/_bundled/setuptools-56.0.0-py3-none-any.whl
rename to Lib/ensurepip/_bundled/setuptools-57.4.0-py3-none-any.whl
index 264ef10e826679..af8f8ba21003b1 100644
Binary files a/Lib/ensurepip/_bundled/setuptools-56.0.0-py3-none-any.whl and b/Lib/ensurepip/_bundled/setuptools-57.4.0-py3-none-any.whl differ
diff --git a/Misc/NEWS.d/next/Library/2021-08-06-19-15-52.bpo-44581.oFDBTB.rst b/Misc/NEWS.d/next/Library/2021-08-06-19-15-52.bpo-44581.oFDBTB.rst
new file mode 100644
index 00000000000000..99f08065b9d2f0
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-06-19-15-52.bpo-44581.oFDBTB.rst
@@ -0,0 +1 @@
+Upgrade bundled pip to 21.2.3 and setuptools to 57.4.0


From webhook-mailer at python.org  Sat Aug  7 23:18:14 2021
From: webhook-mailer at python.org (orsenthil)
Date: Sun, 08 Aug 2021 03:18:14 -0000
Subject: [Python-checkins] bpo-44830 - Remove the broken Broken Mozilla
 devguide link. (GH-27664)
Message-ID: <mailman.943.1628392695.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/ebecffdb6d5fffa4249f9a813f1fc1915926feb5
commit: ebecffdb6d5fffa4249f9a813f1fc1915926feb5
branch: main
author: Senthil Kumaran <senthil at python.org>
committer: orsenthil <senthilx at amazon.com>
date: 2021-08-07T20:18:10-07:00
summary:

bpo-44830 - Remove the broken Broken Mozilla devguide link. (GH-27664)

files:
M Doc/bugs.rst

diff --git a/Doc/bugs.rst b/Doc/bugs.rst
index 8ffc8b14c53e4..82819792a1ad8 100644
--- a/Doc/bugs.rst
+++ b/Doc/bugs.rst
@@ -80,10 +80,6 @@ taken on the bug.
       Article which goes into some detail about how to create a useful bug report.
       This describes what kind of information is useful and why it is useful.
 
-   `Bug Report Writing Guidelines <https://developer.mozilla.org/en-US/docs/Mozilla/QA/Bug_writing_guidelines>`_
-      Information about writing a good bug report.  Some of this is specific to the
-      Mozilla project, but describes general good practices.
-
 .. _contributing-to-python:
 
 Getting started contributing to Python yourself


From webhook-mailer at python.org  Sat Aug  7 23:44:16 2021
From: webhook-mailer at python.org (orsenthil)
Date: Sun, 08 Aug 2021 03:44:16 -0000
Subject: [Python-checkins] bpo-44830 - Remove the broken Broken Mozilla
 devguide link. (GH-27664) (GH-27665)
Message-ID: <mailman.944.1628394257.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/6a6bcf16370beff2e0d1a034661654d5c335b5ee
commit: 6a6bcf16370beff2e0d1a034661654d5c335b5ee
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: orsenthil <senthilx at amazon.com>
date: 2021-08-07T20:44:08-07:00
summary:

bpo-44830 - Remove the broken Broken Mozilla devguide link. (GH-27664) (GH-27665)

(cherry picked from commit ebecffdb6d5fffa4249f9a813f1fc1915926feb5)

Co-authored-by: Senthil Kumaran <senthil at python.org>

Co-authored-by: Senthil Kumaran <senthil at python.org>

files:
M Doc/bugs.rst

diff --git a/Doc/bugs.rst b/Doc/bugs.rst
index a17f04d26fa40..ee914920f10f0 100644
--- a/Doc/bugs.rst
+++ b/Doc/bugs.rst
@@ -80,10 +80,6 @@ taken on the bug.
       Article which goes into some detail about how to create a useful bug report.
       This describes what kind of information is useful and why it is useful.
 
-   `Bug Report Writing Guidelines <https://developer.mozilla.org/en-US/docs/Mozilla/QA/Bug_writing_guidelines>`_
-      Information about writing a good bug report.  Some of this is specific to the
-      Mozilla project, but describes general good practices.
-
 .. _contributing-to-python:
 
 Getting started contributing to Python yourself


From webhook-mailer at python.org  Sun Aug  8 01:50:01 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Sun, 08 Aug 2021 05:50:01 -0000
Subject: [Python-checkins] bpo-44859: Improve error handling in sqlite3 and
 and raise more accurate exceptions. (GH-27654)
Message-ID: <mailman.945.1628401802.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/0eec6276fdcdde5221370d92b50ea95851760c72
commit: 0eec6276fdcdde5221370d92b50ea95851760c72
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-08T08:49:44+03:00
summary:

bpo-44859: Improve error handling in sqlite3 and and raise more accurate exceptions. (GH-27654)

* MemoryError is now raised instead of sqlite3.Warning when
  memory is not enough for encoding a statement to UTF-8
  in Connection.__call__() and Cursor.execute().
* UnicodEncodeError is now raised instead of sqlite3.Warning when
  the statement contains surrogate characters
  in Connection.__call__() and Cursor.execute().
* TypeError is now raised instead of ValueError for non-string
  script argument in Cursor.executescript().
* ValueError is now raised for script containing the null
  character instead of truncating it in Cursor.executescript().
* Correctly handle exceptions raised when getting boolean value
  of the result of the progress handler.
* Add many tests covering different corner cases.

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at innova.no>

files:
A Misc/NEWS.d/next/Library/2021-08-07-17-28-56.bpo-44859.CCopjk.rst
M Lib/sqlite3/test/dbapi.py
M Lib/sqlite3/test/hooks.py
M Lib/sqlite3/test/regression.py
M Lib/sqlite3/test/types.py
M Lib/sqlite3/test/userfunctions.py
M Modules/_sqlite/clinic/cursor.c.h
M Modules/_sqlite/connection.c
M Modules/_sqlite/cursor.c
M Modules/_sqlite/statement.c

diff --git a/Lib/sqlite3/test/dbapi.py b/Lib/sqlite3/test/dbapi.py
index 408f9945f2c970..5d7e5bba05bc45 100644
--- a/Lib/sqlite3/test/dbapi.py
+++ b/Lib/sqlite3/test/dbapi.py
@@ -26,7 +26,7 @@
 import threading
 import unittest
 
-from test.support import check_disallow_instantiation, threading_helper
+from test.support import check_disallow_instantiation, threading_helper, bigmemtest
 from test.support.os_helper import TESTFN, unlink
 
 
@@ -758,9 +758,35 @@ def test_script_error_normal(self):
     def test_cursor_executescript_as_bytes(self):
         con = sqlite.connect(":memory:")
         cur = con.cursor()
-        with self.assertRaises(ValueError) as cm:
+        with self.assertRaises(TypeError):
             cur.executescript(b"create table test(foo); insert into test(foo) values (5);")
-        self.assertEqual(str(cm.exception), 'script argument must be unicode.')
+
+    def test_cursor_executescript_with_null_characters(self):
+        con = sqlite.connect(":memory:")
+        cur = con.cursor()
+        with self.assertRaises(ValueError):
+            cur.executescript("""
+                create table a(i);\0
+                insert into a(i) values (5);
+                """)
+
+    def test_cursor_executescript_with_surrogates(self):
+        con = sqlite.connect(":memory:")
+        cur = con.cursor()
+        with self.assertRaises(UnicodeEncodeError):
+            cur.executescript("""
+                create table a(s);
+                insert into a(s) values ('\ud8ff');
+                """)
+
+    @unittest.skipUnless(sys.maxsize > 2**32, 'requires 64bit platform')
+    @bigmemtest(size=2**31, memuse=3, dry_run=False)
+    def test_cursor_executescript_too_large_script(self, maxsize):
+        con = sqlite.connect(":memory:")
+        cur = con.cursor()
+        for size in 2**31-1, 2**31:
+            with self.assertRaises(sqlite.DataError):
+                cur.executescript("create table a(s);".ljust(size))
 
     def test_connection_execute(self):
         con = sqlite.connect(":memory:")
@@ -969,6 +995,7 @@ def suite():
         CursorTests,
         ExtensionTests,
         ModuleTests,
+        OpenTests,
         SqliteOnConflictTests,
         ThreadTests,
         UninitialisedConnectionTests,
diff --git a/Lib/sqlite3/test/hooks.py b/Lib/sqlite3/test/hooks.py
index 1be6d380abd20a..43e3810d13df18 100644
--- a/Lib/sqlite3/test/hooks.py
+++ b/Lib/sqlite3/test/hooks.py
@@ -24,7 +24,7 @@
 import sqlite3 as sqlite
 
 from test.support.os_helper import TESTFN, unlink
-
+from .userfunctions import with_tracebacks
 
 class CollationTests(unittest.TestCase):
     def test_create_collation_not_string(self):
@@ -145,7 +145,6 @@ def progress():
             """)
         self.assertTrue(progress_calls)
 
-
     def test_opcode_count(self):
         """
         Test that the opcode argument is respected.
@@ -198,6 +197,32 @@ def progress():
         con.execute("select 1 union select 2 union select 3").fetchall()
         self.assertEqual(action, 0, "progress handler was not cleared")
 
+    @with_tracebacks(['bad_progress', 'ZeroDivisionError'])
+    def test_error_in_progress_handler(self):
+        con = sqlite.connect(":memory:")
+        def bad_progress():
+            1 / 0
+        con.set_progress_handler(bad_progress, 1)
+        with self.assertRaises(sqlite.OperationalError):
+            con.execute("""
+                create table foo(a, b)
+                """)
+
+    @with_tracebacks(['__bool__', 'ZeroDivisionError'])
+    def test_error_in_progress_handler_result(self):
+        con = sqlite.connect(":memory:")
+        class BadBool:
+            def __bool__(self):
+                1 / 0
+        def bad_progress():
+            return BadBool()
+        con.set_progress_handler(bad_progress, 1)
+        with self.assertRaises(sqlite.OperationalError):
+            con.execute("""
+                create table foo(a, b)
+                """)
+
+
 class TraceCallbackTests(unittest.TestCase):
     def test_trace_callback_used(self):
         """
diff --git a/Lib/sqlite3/test/regression.py b/Lib/sqlite3/test/regression.py
index 6c093d7c2c36e0..ddf36e71819445 100644
--- a/Lib/sqlite3/test/regression.py
+++ b/Lib/sqlite3/test/regression.py
@@ -21,6 +21,7 @@
 # 3. This notice may not be removed or altered from any source distribution.
 
 import datetime
+import sys
 import unittest
 import sqlite3 as sqlite
 import weakref
@@ -273,7 +274,7 @@ def test_connection_call(self):
         Call a connection with a non-string SQL request: check error handling
         of the statement constructor.
         """
-        self.assertRaises(TypeError, self.con, 1)
+        self.assertRaises(TypeError, self.con, b"select 1")
 
     def test_collation(self):
         def collation_cb(a, b):
@@ -344,6 +345,26 @@ def test_null_character(self):
         self.assertRaises(ValueError, cur.execute, " \0select 2")
         self.assertRaises(ValueError, cur.execute, "select 2\0")
 
+    def test_surrogates(self):
+        con = sqlite.connect(":memory:")
+        self.assertRaises(UnicodeEncodeError, con, "select '\ud8ff'")
+        self.assertRaises(UnicodeEncodeError, con, "select '\udcff'")
+        cur = con.cursor()
+        self.assertRaises(UnicodeEncodeError, cur.execute, "select '\ud8ff'")
+        self.assertRaises(UnicodeEncodeError, cur.execute, "select '\udcff'")
+
+    @unittest.skipUnless(sys.maxsize > 2**32, 'requires 64bit platform')
+    @support.bigmemtest(size=2**31, memuse=4, dry_run=False)
+    def test_large_sql(self, maxsize):
+        # Test two cases: size+1 > INT_MAX and size+1 <= INT_MAX.
+        for size in (2**31, 2**31-2):
+            con = sqlite.connect(":memory:")
+            sql = "select 1".ljust(size)
+            self.assertRaises(sqlite.DataError, con, sql)
+            cur = con.cursor()
+            self.assertRaises(sqlite.DataError, cur.execute, sql)
+            del sql
+
     def test_commit_cursor_reset(self):
         """
         Connection.commit() did reset cursors, which made sqlite3
diff --git a/Lib/sqlite3/test/types.py b/Lib/sqlite3/test/types.py
index 4f0e4f6d268392..b8926ffee22e87 100644
--- a/Lib/sqlite3/test/types.py
+++ b/Lib/sqlite3/test/types.py
@@ -23,11 +23,14 @@
 import datetime
 import unittest
 import sqlite3 as sqlite
+import sys
 try:
     import zlib
 except ImportError:
     zlib = None
 
+from test import support
+
 
 class SqliteTypeTests(unittest.TestCase):
     def setUp(self):
@@ -45,6 +48,12 @@ def test_string(self):
         row = self.cur.fetchone()
         self.assertEqual(row[0], "?sterreich")
 
+    def test_string_with_null_character(self):
+        self.cur.execute("insert into test(s) values (?)", ("a\0b",))
+        self.cur.execute("select s from test")
+        row = self.cur.fetchone()
+        self.assertEqual(row[0], "a\0b")
+
     def test_small_int(self):
         self.cur.execute("insert into test(i) values (?)", (42,))
         self.cur.execute("select i from test")
@@ -52,7 +61,7 @@ def test_small_int(self):
         self.assertEqual(row[0], 42)
 
     def test_large_int(self):
-        num = 2**40
+        num = 123456789123456789
         self.cur.execute("insert into test(i) values (?)", (num,))
         self.cur.execute("select i from test")
         row = self.cur.fetchone()
@@ -78,6 +87,45 @@ def test_unicode_execute(self):
         row = self.cur.fetchone()
         self.assertEqual(row[0], "?sterreich")
 
+    def test_too_large_int(self):
+        for value in 2**63, -2**63-1, 2**64:
+            with self.assertRaises(OverflowError):
+                self.cur.execute("insert into test(i) values (?)", (value,))
+        self.cur.execute("select i from test")
+        row = self.cur.fetchone()
+        self.assertIsNone(row)
+
+    def test_string_with_surrogates(self):
+        for value in 0xd8ff, 0xdcff:
+            with self.assertRaises(UnicodeEncodeError):
+                self.cur.execute("insert into test(s) values (?)", (chr(value),))
+        self.cur.execute("select s from test")
+        row = self.cur.fetchone()
+        self.assertIsNone(row)
+
+    @unittest.skipUnless(sys.maxsize > 2**32, 'requires 64bit platform')
+    @support.bigmemtest(size=2**31, memuse=4, dry_run=False)
+    def test_too_large_string(self, maxsize):
+        with self.assertRaises(sqlite.InterfaceError):
+            self.cur.execute("insert into test(s) values (?)", ('x'*(2**31-1),))
+        with self.assertRaises(OverflowError):
+            self.cur.execute("insert into test(s) values (?)", ('x'*(2**31),))
+        self.cur.execute("select 1 from test")
+        row = self.cur.fetchone()
+        self.assertIsNone(row)
+
+    @unittest.skipUnless(sys.maxsize > 2**32, 'requires 64bit platform')
+    @support.bigmemtest(size=2**31, memuse=3, dry_run=False)
+    def test_too_large_blob(self, maxsize):
+        with self.assertRaises(sqlite.InterfaceError):
+            self.cur.execute("insert into test(s) values (?)", (b'x'*(2**31-1),))
+        with self.assertRaises(OverflowError):
+            self.cur.execute("insert into test(s) values (?)", (b'x'*(2**31),))
+        self.cur.execute("select 1 from test")
+        row = self.cur.fetchone()
+        self.assertIsNone(row)
+
+
 class DeclTypesTests(unittest.TestCase):
     class Foo:
         def __init__(self, _val):
@@ -163,7 +211,7 @@ def test_small_int(self):
 
     def test_large_int(self):
         # default
-        num = 2**40
+        num = 123456789123456789
         self.cur.execute("insert into test(i) values (?)", (num,))
         self.cur.execute("select i from test")
         row = self.cur.fetchone()
diff --git a/Lib/sqlite3/test/userfunctions.py b/Lib/sqlite3/test/userfunctions.py
index 9681dbdde2b092..b4d5181777ebdf 100644
--- a/Lib/sqlite3/test/userfunctions.py
+++ b/Lib/sqlite3/test/userfunctions.py
@@ -33,28 +33,37 @@
 from test.support import bigmemtest
 
 
-def with_tracebacks(strings):
+def with_tracebacks(strings, traceback=True):
     """Convenience decorator for testing callback tracebacks."""
-    strings.append('Traceback')
+    if traceback:
+        strings.append('Traceback')
 
     def decorator(func):
         @functools.wraps(func)
         def wrapper(self, *args, **kwargs):
             # First, run the test with traceback enabled.
-            sqlite.enable_callback_tracebacks(True)
-            buf = io.StringIO()
-            with contextlib.redirect_stderr(buf):
+            with check_tracebacks(self, strings):
                 func(self, *args, **kwargs)
-            tb = buf.getvalue()
-            for s in strings:
-                self.assertIn(s, tb)
 
             # Then run the test with traceback disabled.
-            sqlite.enable_callback_tracebacks(False)
             func(self, *args, **kwargs)
         return wrapper
     return decorator
 
+ at contextlib.contextmanager
+def check_tracebacks(self, strings):
+    """Convenience context manager for testing callback tracebacks."""
+    sqlite.enable_callback_tracebacks(True)
+    try:
+        buf = io.StringIO()
+        with contextlib.redirect_stderr(buf):
+            yield
+        tb = buf.getvalue()
+        for s in strings:
+            self.assertIn(s, tb)
+    finally:
+        sqlite.enable_callback_tracebacks(False)
+
 def func_returntext():
     return "foo"
 def func_returntextwithnull():
@@ -408,9 +417,26 @@ def md5sum(t):
         del x,y
         gc.collect()
 
+    def test_func_return_too_large_int(self):
+        cur = self.con.cursor()
+        for value in 2**63, -2**63-1, 2**64:
+            self.con.create_function("largeint", 0, lambda value=value: value)
+            with check_tracebacks(self, ['OverflowError']):
+                with self.assertRaises(sqlite.DataError):
+                    cur.execute("select largeint()")
+
+    def test_func_return_text_with_surrogates(self):
+        cur = self.con.cursor()
+        self.con.create_function("pychr", 1, chr)
+        for value in 0xd8ff, 0xdcff:
+            with check_tracebacks(self,
+                    ['UnicodeEncodeError', 'surrogates not allowed']):
+                with self.assertRaises(sqlite.OperationalError):
+                    cur.execute("select pychr(?)", (value,))
+
     @unittest.skipUnless(sys.maxsize > 2**32, 'requires 64bit platform')
     @bigmemtest(size=2**31, memuse=3, dry_run=False)
-    def test_large_text(self, size):
+    def test_func_return_too_large_text(self, size):
         cur = self.con.cursor()
         for size in 2**31-1, 2**31:
             self.con.create_function("largetext", 0, lambda size=size: "b" * size)
@@ -419,7 +445,7 @@ def test_large_text(self, size):
 
     @unittest.skipUnless(sys.maxsize > 2**32, 'requires 64bit platform')
     @bigmemtest(size=2**31, memuse=2, dry_run=False)
-    def test_large_blob(self, size):
+    def test_func_return_too_large_blob(self, size):
         cur = self.con.cursor()
         for size in 2**31-1, 2**31:
             self.con.create_function("largeblob", 0, lambda size=size: b"b" * size)
diff --git a/Misc/NEWS.d/next/Library/2021-08-07-17-28-56.bpo-44859.CCopjk.rst b/Misc/NEWS.d/next/Library/2021-08-07-17-28-56.bpo-44859.CCopjk.rst
new file mode 100644
index 00000000000000..ec9f774d66b8c4
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-07-17-28-56.bpo-44859.CCopjk.rst
@@ -0,0 +1,8 @@
+Improve error handling in :mod:`sqlite3` and raise more accurate exceptions.
+
+* :exc:`MemoryError` is now raised instead of :exc:`sqlite3.Warning` when memory is not enough for encoding a statement to UTF-8 in ``Connection.__call__()`` and ``Cursor.execute()``.
+* :exc:`UnicodEncodeError` is now raised instead of :exc:`sqlite3.Warning` when the statement contains surrogate characters in ``Connection.__call__()`` and ``Cursor.execute()``.
+* :exc:`TypeError` is now raised instead of :exc:`ValueError` for non-string script argument in ``Cursor.executescript()``.
+* :exc:`ValueError` is now raised for script containing the null character instead of truncating it in ``Cursor.executescript()``.
+* Correctly handle exceptions raised when getting boolean value of the result of the progress handler.
+* Add many tests covering different corner cases.
diff --git a/Modules/_sqlite/clinic/cursor.c.h b/Modules/_sqlite/clinic/cursor.c.h
index d2c453b38b4b9e..07e15870146cf7 100644
--- a/Modules/_sqlite/clinic/cursor.c.h
+++ b/Modules/_sqlite/clinic/cursor.c.h
@@ -119,6 +119,35 @@ PyDoc_STRVAR(pysqlite_cursor_executescript__doc__,
 #define PYSQLITE_CURSOR_EXECUTESCRIPT_METHODDEF    \
     {"executescript", (PyCFunction)pysqlite_cursor_executescript, METH_O, pysqlite_cursor_executescript__doc__},
 
+static PyObject *
+pysqlite_cursor_executescript_impl(pysqlite_Cursor *self,
+                                   const char *sql_script);
+
+static PyObject *
+pysqlite_cursor_executescript(pysqlite_Cursor *self, PyObject *arg)
+{
+    PyObject *return_value = NULL;
+    const char *sql_script;
+
+    if (!PyUnicode_Check(arg)) {
+        _PyArg_BadArgument("executescript", "argument", "str", arg);
+        goto exit;
+    }
+    Py_ssize_t sql_script_length;
+    sql_script = PyUnicode_AsUTF8AndSize(arg, &sql_script_length);
+    if (sql_script == NULL) {
+        goto exit;
+    }
+    if (strlen(sql_script) != (size_t)sql_script_length) {
+        PyErr_SetString(PyExc_ValueError, "embedded null character");
+        goto exit;
+    }
+    return_value = pysqlite_cursor_executescript_impl(self, sql_script);
+
+exit:
+    return return_value;
+}
+
 PyDoc_STRVAR(pysqlite_cursor_fetchone__doc__,
 "fetchone($self, /)\n"
 "--\n"
@@ -270,4 +299,4 @@ pysqlite_cursor_close(pysqlite_Cursor *self, PyTypeObject *cls, PyObject *const
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=7b216aba2439f5cf input=a9049054013a1b77]*/
+/*[clinic end generated code: output=ace31a7481aa3f41 input=a9049054013a1b77]*/
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index 0dab3e85160e82..67160c4c449aa1 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -997,6 +997,14 @@ static int _progress_handler(void* user_arg)
     ret = _PyObject_CallNoArg((PyObject*)user_arg);
 
     if (!ret) {
+        /* abort query if error occurred */
+        rc = -1;
+    }
+    else {
+        rc = PyObject_IsTrue(ret);
+        Py_DECREF(ret);
+    }
+    if (rc < 0) {
         pysqlite_state *state = pysqlite_get_state(NULL);
         if (state->enable_callback_tracebacks) {
             PyErr_Print();
@@ -1004,12 +1012,6 @@ static int _progress_handler(void* user_arg)
         else {
             PyErr_Clear();
         }
-
-        /* abort query if error occurred */
-        rc = 1;
-    } else {
-        rc = (int)PyObject_IsTrue(ret);
-        Py_DECREF(ret);
     }
 
     PyGILState_Release(gilstate);
diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
index 2f4494690f9557..7308f3062da4b9 100644
--- a/Modules/_sqlite/cursor.c
+++ b/Modules/_sqlite/cursor.c
@@ -728,21 +728,21 @@ pysqlite_cursor_executemany_impl(pysqlite_Cursor *self, PyObject *sql,
 /*[clinic input]
 _sqlite3.Cursor.executescript as pysqlite_cursor_executescript
 
-    sql_script as script_obj: object
+    sql_script: str
     /
 
 Executes multiple SQL statements at once. Non-standard.
 [clinic start generated code]*/
 
 static PyObject *
-pysqlite_cursor_executescript(pysqlite_Cursor *self, PyObject *script_obj)
-/*[clinic end generated code: output=115a8132b0f200fe input=ba3ec59df205e362]*/
+pysqlite_cursor_executescript_impl(pysqlite_Cursor *self,
+                                   const char *sql_script)
+/*[clinic end generated code: output=8fd726dde1c65164 input=1ac0693dc8db02a8]*/
 {
     _Py_IDENTIFIER(commit);
-    const char* script_cstr;
     sqlite3_stmt* statement;
     int rc;
-    Py_ssize_t sql_len;
+    size_t sql_len;
     PyObject* result;
 
     if (!check_cursor(self)) {
@@ -751,21 +751,12 @@ pysqlite_cursor_executescript(pysqlite_Cursor *self, PyObject *script_obj)
 
     self->reset = 0;
 
-    if (PyUnicode_Check(script_obj)) {
-        script_cstr = PyUnicode_AsUTF8AndSize(script_obj, &sql_len);
-        if (!script_cstr) {
-            return NULL;
-        }
-
-        int max_length = sqlite3_limit(self->connection->db,
-                                       SQLITE_LIMIT_LENGTH, -1);
-        if (sql_len >= max_length) {
-            PyErr_SetString(self->connection->DataError,
-                            "query string is too large");
-            return NULL;
-        }
-    } else {
-        PyErr_SetString(PyExc_ValueError, "script argument must be unicode.");
+    sql_len = strlen(sql_script);
+    int max_length = sqlite3_limit(self->connection->db,
+                                   SQLITE_LIMIT_LENGTH, -1);
+    if (sql_len >= (unsigned)max_length) {
+        PyErr_SetString(self->connection->DataError,
+                        "query string is too large");
         return NULL;
     }
 
@@ -782,7 +773,7 @@ pysqlite_cursor_executescript(pysqlite_Cursor *self, PyObject *script_obj)
 
         Py_BEGIN_ALLOW_THREADS
         rc = sqlite3_prepare_v2(self->connection->db,
-                                script_cstr,
+                                sql_script,
                                 (int)sql_len + 1,
                                 &statement,
                                 &tail);
@@ -816,8 +807,8 @@ pysqlite_cursor_executescript(pysqlite_Cursor *self, PyObject *script_obj)
         if (*tail == (char)0) {
             break;
         }
-        sql_len -= (tail - script_cstr);
-        script_cstr = tail;
+        sql_len -= (tail - sql_script);
+        sql_script = tail;
     }
 
 error:
diff --git a/Modules/_sqlite/statement.c b/Modules/_sqlite/statement.c
index 983df2d50c975d..2d5c72d13b7edb 100644
--- a/Modules/_sqlite/statement.c
+++ b/Modules/_sqlite/statement.c
@@ -56,9 +56,6 @@ pysqlite_statement_create(pysqlite_Connection *connection, PyObject *sql)
     Py_ssize_t size;
     const char *sql_cstr = PyUnicode_AsUTF8AndSize(sql, &size);
     if (sql_cstr == NULL) {
-        PyErr_Format(connection->Warning,
-                     "SQL is of wrong type ('%s'). Must be string.",
-                     Py_TYPE(sql)->tp_name);
         return NULL;
     }
 


From webhook-mailer at python.org  Sun Aug  8 14:04:15 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Sun, 08 Aug 2021 18:04:15 -0000
Subject: [Python-checkins] bpo-42053: Remove misleading check in os.fwalk()
 (GH-27669)
Message-ID: <mailman.946.1628445857.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/2b496e79293a8b80e8ba0e514e186b3b1467b64b
commit: 2b496e79293a8b80e8ba0e514e186b3b1467b64b
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-08T21:04:02+03:00
summary:

bpo-42053: Remove misleading check in os.fwalk() (GH-27669)

os.fwalk() does not support integer as the first argument,
and never supported.

files:
M Lib/os.py

diff --git a/Lib/os.py b/Lib/os.py
index 8cc70a11e9bc8..ab7ef3c17798b 100644
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -461,8 +461,7 @@ def fwalk(top=".", topdown=True, onerror=None, *, follow_symlinks=False, dir_fd=
                 dirs.remove('CVS')  # don't visit CVS directories
         """
         sys.audit("os.fwalk", top, topdown, onerror, follow_symlinks, dir_fd)
-        if not isinstance(top, int) or not hasattr(top, '__index__'):
-            top = fspath(top)
+        top = fspath(top)
         # Note: To guard against symlink races, we use the standard
         # lstat()/open()/fstat() trick.
         if not follow_symlinks:


From webhook-mailer at python.org  Mon Aug  9 05:19:30 2021
From: webhook-mailer at python.org (markshannon)
Date: Mon, 09 Aug 2021 09:19:30 -0000
Subject: [Python-checkins] bpo-44840: Compiler: Move duplication of exit
 blocks with no line numbers to after CFG optimization. (GH-27656)
Message-ID: <mailman.947.1628500772.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/b854557b49083d8625a433eb36aacb0c87d67c52
commit: b854557b49083d8625a433eb36aacb0c87d67c52
branch: main
author: Mark Shannon <mark at hotpy.org>
committer: markshannon <mark at hotpy.org>
date: 2021-08-09T10:18:59+01:00
summary:

bpo-44840: Compiler: Move duplication of exit blocks with no line numbers to after CFG optimization. (GH-27656)

files:
M Lib/test/test_dis.py
M Lib/test/test_sys_settrace.py
M Python/compile.c
M Python/importlib.h
M Python/importlib_external.h
M Python/importlib_zipimport.h

diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
index 546932cc9c99f..d708c78bf9960 100644
--- a/Lib/test/test_dis.py
+++ b/Lib/test/test_dis.py
@@ -294,7 +294,7 @@ def bug42562():
 
 %3d          16 DUP_TOP
              18 LOAD_GLOBAL              0 (Exception)
-             20 JUMP_IF_NOT_EXC_MATCH    28 (to 56)
+             20 JUMP_IF_NOT_EXC_MATCH    27 (to 54)
              22 POP_TOP
              24 STORE_FAST               0 (e)
              26 POP_TOP
@@ -313,15 +313,14 @@ def bug42562():
              48 STORE_FAST               0 (e)
              50 DELETE_FAST              0 (e)
              52 RERAISE                  1
-        >>   54 POP_EXCEPT_AND_RERAISE
 
-%3d     >>   56 RERAISE                  0
+%3d     >>   54 RERAISE                  0
+        >>   56 POP_EXCEPT_AND_RERAISE
 ExceptionTable:
   2 to 8 -> 14 [0]
-  14 to 26 -> 54 [3] lasti
+  14 to 26 -> 56 [3] lasti
   28 to 32 -> 46 [3] lasti
-  46 to 52 -> 54 [3] lasti
-  56 to 56 -> 54 [3] lasti
+  46 to 54 -> 56 [3] lasti
 """ % (TRACEBACK_CODE.co_firstlineno + 1,
        TRACEBACK_CODE.co_firstlineno + 2,
        TRACEBACK_CODE.co_firstlineno + 5,
@@ -1088,11 +1087,11 @@ def _prepare_test_cases():
   Instruction(opname='LOAD_CONST', opcode=100, arg=7, argval=0, argrepr='0', offset=108, starts_line=None, is_jump_target=False, positions=None),
   Instruction(opname='BINARY_TRUE_DIVIDE', opcode=27, arg=None, argval=None, argrepr='', offset=110, starts_line=None, is_jump_target=False, positions=None),
   Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=112, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='JUMP_FORWARD', opcode=110, arg=14, argval=144, argrepr='to 144', offset=114, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='JUMP_FORWARD', opcode=110, arg=15, argval=146, argrepr='to 146', offset=114, starts_line=None, is_jump_target=False, positions=None),
   Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=116, starts_line=None, is_jump_target=False, positions=None),
   Instruction(opname='DUP_TOP', opcode=4, arg=None, argval=None, argrepr='', offset=118, starts_line=22, is_jump_target=False, positions=None),
   Instruction(opname='LOAD_GLOBAL', opcode=116, arg=2, argval='ZeroDivisionError', argrepr='ZeroDivisionError', offset=120, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='JUMP_IF_NOT_EXC_MATCH', opcode=121, arg=124, argval=248, argrepr='to 248', offset=122, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='JUMP_IF_NOT_EXC_MATCH', opcode=121, arg=71, argval=142, argrepr='to 142', offset=122, starts_line=None, is_jump_target=False, positions=None),
   Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=124, starts_line=None, is_jump_target=False, positions=None),
   Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=126, starts_line=None, is_jump_target=False, positions=None),
   Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=128, starts_line=None, is_jump_target=False, positions=None),
@@ -1101,61 +1100,61 @@ def _prepare_test_cases():
   Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=134, starts_line=None, is_jump_target=False, positions=None),
   Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=136, starts_line=None, is_jump_target=False, positions=None),
   Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=138, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='JUMP_FORWARD', opcode=110, arg=46, argval=234, argrepr='to 234', offset=140, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='POP_EXCEPT_AND_RERAISE', opcode=37, arg=None, argval=None, argrepr='', offset=142, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=144, starts_line=25, is_jump_target=True, positions=None),
-  Instruction(opname='BEFORE_WITH', opcode=53, arg=None, argval=None, argrepr='', offset=146, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='STORE_FAST', opcode=125, arg=1, argval='dodgy', argrepr='dodgy', offset=148, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=150, starts_line=26, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=100, arg=9, argval='Never reach this', argrepr="'Never reach this'", offset=152, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=154, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=156, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=158, starts_line=25, is_jump_target=False, positions=None),
-  Instruction(opname='DUP_TOP', opcode=4, arg=None, argval=None, argrepr='', offset=160, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='JUMP_FORWARD', opcode=110, arg=33, argval=208, argrepr='to 208', offset=140, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=142, starts_line=22, is_jump_target=True, positions=None),
+  Instruction(opname='POP_EXCEPT_AND_RERAISE', opcode=37, arg=None, argval=None, argrepr='', offset=144, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=146, starts_line=25, is_jump_target=True, positions=None),
+  Instruction(opname='BEFORE_WITH', opcode=53, arg=None, argval=None, argrepr='', offset=148, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='STORE_FAST', opcode=125, arg=1, argval='dodgy', argrepr='dodgy', offset=150, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=152, starts_line=26, is_jump_target=False, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=100, arg=9, argval='Never reach this', argrepr="'Never reach this'", offset=154, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=156, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=158, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=160, starts_line=25, is_jump_target=False, positions=None),
   Instruction(opname='DUP_TOP', opcode=4, arg=None, argval=None, argrepr='', offset=162, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='CALL_FUNCTION', opcode=131, arg=3, argval=3, argrepr='', offset=164, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=166, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='JUMP_FORWARD', opcode=110, arg=25, argval=220, argrepr='to 220', offset=168, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=170, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='WITH_EXCEPT_START', opcode=49, arg=None, argval=None, argrepr='', offset=172, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='POP_JUMP_IF_TRUE', opcode=115, arg=90, argval=180, argrepr='to 180', offset=174, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='RERAISE', opcode=119, arg=4, argval=4, argrepr='', offset=176, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='POP_EXCEPT_AND_RERAISE', opcode=37, arg=None, argval=None, argrepr='', offset=178, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=180, starts_line=None, is_jump_target=True, positions=None),
-  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=182, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='DUP_TOP', opcode=4, arg=None, argval=None, argrepr='', offset=164, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='CALL_FUNCTION', opcode=131, arg=3, argval=3, argrepr='', offset=166, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=168, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='JUMP_FORWARD', opcode=110, arg=25, argval=222, argrepr='to 222', offset=170, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=172, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='WITH_EXCEPT_START', opcode=49, arg=None, argval=None, argrepr='', offset=174, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='POP_JUMP_IF_TRUE', opcode=115, arg=91, argval=182, argrepr='to 182', offset=176, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='RERAISE', opcode=119, arg=4, argval=4, argrepr='', offset=178, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='POP_EXCEPT_AND_RERAISE', opcode=37, arg=None, argval=None, argrepr='', offset=180, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=182, starts_line=None, is_jump_target=True, positions=None),
   Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=184, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=186, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=188, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=186, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=188, starts_line=None, is_jump_target=False, positions=None),
   Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=190, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='NOP', opcode=9, arg=None, argval=None, argrepr='', offset=192, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=194, starts_line=28, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=196, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=198, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=200, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=202, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=204, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=206, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=208, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=210, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=212, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=214, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=216, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='POP_EXCEPT_AND_RERAISE', opcode=37, arg=None, argval=None, argrepr='', offset=218, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='NOP', opcode=9, arg=None, argval=None, argrepr='', offset=220, starts_line=25, is_jump_target=True, positions=None),
-  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=222, starts_line=28, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=224, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=226, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=228, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=230, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=232, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='NOP', opcode=9, arg=None, argval=None, argrepr='', offset=234, starts_line=23, is_jump_target=True, positions=None),
-  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=236, starts_line=28, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=238, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=240, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=242, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=244, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=246, starts_line=None, is_jump_target=False, positions=None),
-  Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=248, starts_line=22, is_jump_target=True, positions=None),
+  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=192, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='NOP', opcode=9, arg=None, argval=None, argrepr='', offset=194, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=196, starts_line=28, is_jump_target=False, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=198, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=200, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=202, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=204, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=206, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='NOP', opcode=9, arg=None, argval=None, argrepr='', offset=208, starts_line=23, is_jump_target=True, positions=None),
+  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=210, starts_line=28, is_jump_target=False, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=212, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=214, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=216, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=218, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=220, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='NOP', opcode=9, arg=None, argval=None, argrepr='', offset=222, starts_line=25, is_jump_target=True, positions=None),
+  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=224, starts_line=28, is_jump_target=False, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=226, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=228, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=230, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=232, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=234, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=236, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=238, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=240, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=242, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=244, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=246, starts_line=None, is_jump_target=False, positions=None),
+  Instruction(opname='POP_EXCEPT_AND_RERAISE', opcode=37, arg=None, argval=None, argrepr='', offset=248, starts_line=None, is_jump_target=False, positions=None),
 ]
 
 # One last piece of inspect fodder to check the default line number handling
diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py
index 8b6631879fb33..3fe0bb7f460b9 100644
--- a/Lib/test/test_sys_settrace.py
+++ b/Lib/test/test_sys_settrace.py
@@ -894,6 +894,29 @@ def func():
              (4, 'line'),
              (4, 'return')])
 
+    def test_nested_ifs_with_and(self):
+
+        def func():
+            if A:
+                if B:
+                    if C:
+                        if D:
+                            return False
+                else:
+                    return False
+            elif E and F:
+                return True
+
+        A = B = True
+        C = False
+
+        self.run_and_compare(func,
+            [(0, 'call'),
+             (1, 'line'),
+             (2, 'line'),
+             (3, 'line'),
+             (3, 'return')])
+
     def test_nested_try_if(self):
 
         def func():
diff --git a/Python/compile.c b/Python/compile.c
index 7fb8abf7749bb..d65f7a849a5b7 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -890,7 +890,7 @@ compiler_copy_block(struct compiler *c, basicblock *block)
      * a block can only have one fallthrough predecessor.
      */
     assert(block->b_nofallthrough);
-    basicblock *result = compiler_next_block(c);
+    basicblock *result = compiler_new_block(c);
     if (result == NULL) {
         return NULL;
     }
@@ -7567,8 +7567,9 @@ normalize_basic_block(basicblock *bb);
 static int
 optimize_cfg(struct compiler *c, struct assembler *a, PyObject *consts);
 
+/* Duplicates exit BBs, so that line numbers can be propagated to them */
 static int
-ensure_exits_have_lineno(struct compiler *c);
+duplicate_exits_without_lineno(struct compiler *c);
 
 static int
 extend_block(basicblock *bb);
@@ -7710,10 +7711,10 @@ guarantee_lineno_for_exits(struct assembler *a, int firstlineno) {
         }
         struct instr *last = &b->b_instr[b->b_iused-1];
         if (last->i_lineno < 0) {
-            if (last->i_opcode == RETURN_VALUE)
-            {
+            if (last->i_opcode == RETURN_VALUE) {
                 for (int i = 0; i < b->b_iused; i++) {
                     assert(b->b_instr[i].i_lineno < 0);
+
                     b->b_instr[i].i_lineno = lineno;
                 }
             }
@@ -7769,6 +7770,9 @@ fix_cell_offsets(struct compiler *c, basicblock *entryblock, int *fixedmap)
     return numdropped;
 }
 
+static void
+propagate_line_numbers(struct assembler *a);
+
 static PyCodeObject *
 assemble(struct compiler *c, int addNone)
 {
@@ -7801,10 +7805,6 @@ assemble(struct compiler *c, int addNone)
         }
     }
 
-    if (ensure_exits_have_lineno(c)) {
-        return NULL;
-    }
-
     nblocks = 0;
     entryblock = NULL;
     for (b = c->u->u_blocks; b != NULL; b = b->b_list) {
@@ -7861,8 +7861,11 @@ assemble(struct compiler *c, int addNone)
     if (optimize_cfg(c, &a, consts)) {
         goto error;
     }
+    if (duplicate_exits_without_lineno(c)) {
+        return NULL;
+    }
+    propagate_line_numbers(&a);
     guarantee_lineno_for_exits(&a, c->u->u_firstlineno);
-
     int maxdepth = stackdepth(c);
     if (maxdepth < 0) {
         goto error;
@@ -8365,6 +8368,7 @@ clean_basic_block(basicblock *bb) {
                     }
                 }
             }
+
         }
         if (dest != src) {
             bb->b_instr[dest] = bb->b_instr[src];
@@ -8479,7 +8483,7 @@ eliminate_empty_basic_blocks(basicblock *entry) {
  * but has no impact on the generated line number events.
  */
 static void
-propogate_line_numbers(struct assembler *a) {
+propagate_line_numbers(struct assembler *a) {
     for (basicblock *b = a->a_entry; b != NULL; b = b->b_next) {
         if (b->b_iused == 0) {
             continue;
@@ -8544,6 +8548,11 @@ optimize_cfg(struct compiler *c, struct assembler *a, PyObject *consts)
         clean_basic_block(b);
         assert(b->b_predecessors == 0);
     }
+    for (basicblock *b = c->u->u_blocks; b != NULL; b = b->b_list) {
+        if (extend_block(b)) {
+            return -1;
+        }
+    }
     if (mark_reachable(a)) {
         return -1;
     }
@@ -8581,7 +8590,6 @@ optimize_cfg(struct compiler *c, struct assembler *a, PyObject *consts)
     if (maybe_empty_blocks) {
         eliminate_empty_basic_blocks(a->a_entry);
     }
-    propogate_line_numbers(a);
     return 0;
 }
 
@@ -8600,7 +8608,7 @@ is_exit_without_lineno(basicblock *b) {
  * copy the line number from the sole predecessor block.
  */
 static int
-ensure_exits_have_lineno(struct compiler *c)
+duplicate_exits_without_lineno(struct compiler *c)
 {
     basicblock *entry = NULL;
     /* Copy all exit blocks without line number that are targets of a jump.
@@ -8616,20 +8624,21 @@ ensure_exits_have_lineno(struct compiler *c)
                     continue;
             }
             basicblock *target = b->b_instr[b->b_iused-1].i_target;
-            if (is_exit_without_lineno(target)) {
+            if (is_exit_without_lineno(target) && target->b_predecessors > 1) {
                 basicblock *new_target = compiler_copy_block(c, target);
                 if (new_target == NULL) {
                     return -1;
                 }
                 COPY_INSTR_LOC(b->b_instr[b->b_iused-1], new_target->b_instr[0]);
                 b->b_instr[b->b_iused-1].i_target = new_target;
+                target->b_predecessors--;
+                new_target->b_predecessors = 1;
+                new_target->b_next = target->b_next;
+                target->b_next = new_target;
             }
         }
     }
     assert(entry != NULL);
-    if (is_exit_without_lineno(entry)) {
-        entry->b_instr[0].i_lineno = c->u->u_firstlineno;
-    }
     /* Eliminate empty blocks */
     for (basicblock *b = c->u->u_blocks; b != NULL; b = b->b_list) {
         while (b->b_next && b->b_next->b_iused == 0) {
diff --git a/Python/importlib.h b/Python/importlib.h
index ce3945ecf8470..b62cc9db17916 100644
--- a/Python/importlib.h
+++ b/Python/importlib.h
@@ -49,9 +49,9 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     115,105,111,110,32,111,102,32,116,104,105,115,32,109,111,100,
     117,108,101,46,10,10,99,1,0,0,0,0,0,0,0,0,
     0,0,0,8,0,0,0,3,0,0,0,115,40,0,0,0,
-    9,0,124,0,106,0,83,0,35,0,4,0,116,1,121,19,
+    9,0,124,0,106,0,83,0,35,0,4,0,116,1,121,18,
     1,0,1,0,1,0,116,2,124,0,131,1,106,0,6,0,
-    89,0,83,0,37,0,119,0,169,1,78,41,3,218,12,95,
+    89,0,83,0,119,0,37,0,169,1,78,41,3,218,12,95,
     95,113,117,97,108,110,97,109,101,95,95,218,14,65,116,116,
     114,105,98,117,116,101,69,114,114,111,114,218,4,116,121,112,
     101,41,1,218,3,111,98,106,115,1,0,0,0,32,250,29,
@@ -59,213 +59,213 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     98,46,95,98,111,111,116,115,116,114,97,112,62,218,12,95,
     111,98,106,101,99,116,95,110,97,109,101,114,6,0,0,0,
     23,0,0,0,115,14,0,0,0,2,1,6,1,2,128,12,
-    1,14,1,2,128,2,255,115,16,0,0,0,2,4,6,254,
-    2,128,2,2,2,255,22,1,2,128,2,0,115,40,0,0,
-    0,5,38,16,19,16,32,9,32,0,0,5,38,12,26,5,
-    38,5,38,5,38,5,38,16,20,21,24,16,25,16,38,9,
-    38,9,38,9,38,0,0,5,38,115,12,0,0,0,129,2,
-    4,0,132,12,18,7,147,1,18,7,78,99,2,0,0,0,
-    0,0,0,0,0,0,0,0,7,0,0,0,3,0,0,0,
-    115,56,0,0,0,100,1,68,0,93,16,125,2,116,0,124,
-    1,124,2,131,2,114,18,116,1,124,0,124,2,116,2,124,
-    1,124,2,131,2,131,3,1,0,113,2,124,0,106,3,160,
-    4,124,1,106,3,161,1,1,0,100,2,83,0,41,3,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,
-    41,4,218,10,95,95,109,111,100,117,108,101,95,95,218,8,
-    95,95,110,97,109,101,95,95,114,1,0,0,0,218,7,95,
-    95,100,111,99,95,95,78,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,115,3,0,0,0,
-    32,32,32,114,5,0,0,0,218,5,95,119,114,97,112,114,
-    16,0,0,0,40,0,0,0,115,10,0,0,0,8,2,10,
-    1,18,1,2,128,18,1,115,14,0,0,0,2,2,4,2,
-    2,254,8,1,20,1,2,128,18,1,115,56,0,0,0,20,
-    73,5,57,5,57,9,16,12,19,20,23,25,32,12,33,9,
-    57,13,20,21,24,26,33,35,42,43,46,48,55,35,56,13,
-    57,13,57,0,0,5,8,5,17,5,38,25,28,25,37,5,
-    38,5,38,5,38,5,38,243,0,0,0,0,99,1,0,0,
-    0,0,0,0,0,0,0,0,0,2,0,0,0,3,0,0,
-    0,115,12,0,0,0,116,0,116,1,131,1,124,0,131,1,
-    83,0,114,0,0,0,0,41,2,114,3,0,0,0,218,3,
-    115,121,115,169,1,218,4,110,97,109,101,115,1,0,0,0,
-    32,114,5,0,0,0,218,11,95,110,101,119,95,109,111,100,
-    117,108,101,114,21,0,0,0,48,0,0,0,243,2,0,0,
-    0,12,1,114,22,0,0,0,115,12,0,0,0,12,16,17,
-    20,12,21,22,26,12,27,5,27,114,17,0,0,0,99,0,
-    0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,
-    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,8,0,0,0,114,7,
-    0,0,0,114,1,0,0,0,169,0,114,17,0,0,0,114,
-    5,0,0,0,114,23,0,0,0,114,23,0,0,0,61,0,
-    0,0,115,4,0,0,0,8,0,4,1,115,4,0,0,0,
-    8,195,4,62,115,12,0,0,0,1,1,1,1,1,1,1,
-    1,5,9,5,9,114,17,0,0,0,114,23,0,0,0,99,
-    0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,
-    0,0,0,0,115,46,0,0,0,101,0,90,1,100,0,90,
-    2,100,1,90,3,100,2,132,0,90,4,100,3,132,0,90,
-    5,100,4,132,0,90,6,100,5,132,0,90,7,100,6,132,
-    0,90,8,100,7,83,0,41,8,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,0,0,0,0,2,0,
-    0,0,3,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,169,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,20,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,169,2,218,4,115,101,108,102,114,
-    20,0,0,0,115,2,0,0,0,32,32,114,5,0,0,0,
-    218,8,95,95,105,110,105,116,95,95,122,20,95,77,111,100,
-    117,108,101,76,111,99,107,46,95,95,105,110,105,116,95,95,
-    71,0,0,0,243,12,0,0,0,10,1,10,1,6,1,6,
-    1,6,1,10,1,114,37,0,0,0,115,48,0,0,0,21,
-    28,21,44,21,44,9,13,9,18,23,30,23,46,23,46,9,
-    13,9,20,21,25,9,13,9,18,22,26,9,13,9,19,22,
-    23,9,13,9,19,24,25,9,13,9,21,9,21,9,21,114,
-    17,0,0,0,99,1,0,0,0,0,0,0,0,0,0,0,
-    0,3,0,0,0,3,0,0,0,115,86,0,0,0,116,0,
-    160,1,161,0,125,1,124,0,106,2,125,2,116,3,131,0,
-    125,3,9,0,116,4,160,5,124,2,161,1,125,4,124,4,
-    100,0,117,0,114,22,100,2,83,0,124,4,106,2,125,2,
-    124,2,124,1,107,2,114,31,100,1,83,0,124,2,124,3,
-    118,0,114,37,100,2,83,0,124,3,160,6,124,2,161,1,
-    1,0,113,11,41,3,78,84,70,41,7,114,28,0,0,0,
-    218,9,103,101,116,95,105,100,101,110,116,114,31,0,0,0,
-    218,3,115,101,116,218,12,95,98,108,111,99,107,105,110,103,
-    95,111,110,218,3,103,101,116,218,3,97,100,100,41,5,114,
-    35,0,0,0,90,2,109,101,218,3,116,105,100,90,4,115,
-    101,101,110,114,29,0,0,0,115,5,0,0,0,32,32,32,
-    32,32,114,5,0,0,0,218,12,104,97,115,95,100,101,97,
-    100,108,111,99,107,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,79,
-    0,0,0,115,28,0,0,0,8,2,6,1,6,1,2,1,
-    10,1,8,1,4,1,6,1,8,1,4,1,8,1,4,6,
-    10,1,2,242,115,28,0,0,0,8,2,6,1,6,1,2,
-    1,10,1,6,1,6,1,6,1,6,1,6,1,6,1,6,
-    6,10,1,2,242,115,86,0,0,0,14,21,14,33,14,33,
-    9,11,15,19,15,25,9,12,16,19,16,21,9,13,15,19,
-    20,32,20,41,37,40,20,41,13,17,16,20,24,28,16,28,
-    13,29,24,29,24,29,19,23,19,29,13,16,16,19,23,25,
-    16,25,13,28,24,28,24,28,16,19,23,27,16,27,13,29,
-    24,29,24,29,13,17,13,26,22,25,13,26,13,26,15,19,
-    114,17,0,0,0,99,1,0,0,0,0,0,0,0,0,0,
-    0,0,9,0,0,0,3,0,0,0,115,204,0,0,0,116,
-    0,160,1,161,0,125,1,124,0,116,2,124,1,60,0,9,
-    0,9,0,124,0,106,3,53,0,1,0,124,0,106,4,100,
-    2,107,2,115,24,124,0,106,5,124,1,107,2,114,45,124,
-    1,124,0,95,5,124,0,4,0,106,4,100,3,55,0,2,
-    0,95,4,9,0,100,4,4,0,4,0,131,3,1,0,116,
-    2,124,1,61,0,100,1,83,0,124,0,160,6,161,0,114,
-    55,116,7,100,5,124,0,22,0,131,1,130,1,124,0,106,
-    8,160,9,100,6,161,1,114,68,124,0,4,0,106,10,100,
-    3,55,0,2,0,95,10,100,4,4,0,4,0,131,3,1,
-    0,110,11,35,0,49,0,115,79,119,4,37,0,1,0,1,
-    0,1,0,89,0,1,0,1,0,124,0,106,8,160,9,161,
-    0,1,0,124,0,106,8,160,11,161,0,1,0,113,10,35,
-    0,116,2,124,1,61,0,119,0,37,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,84,114,27,0,0,0,233,1,
-    0,0,0,78,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,41,12,
-    114,28,0,0,0,114,38,0,0,0,114,40,0,0,0,114,
-    29,0,0,0,114,32,0,0,0,114,31,0,0,0,114,44,
-    0,0,0,114,23,0,0,0,114,30,0,0,0,218,7,97,
-    99,113,117,105,114,101,114,33,0,0,0,218,7,114,101,108,
-    101,97,115,101,169,2,114,35,0,0,0,114,43,0,0,0,
-    115,2,0,0,0,32,32,114,5,0,0,0,114,46,0,0,
-    0,122,19,95,77,111,100,117,108,101,76,111,99,107,46,97,
-    99,113,117,105,114,101,100,0,0,0,115,46,0,0,0,8,
-    6,8,1,2,1,2,1,8,1,20,1,6,1,14,1,2,
-    1,10,252,10,13,8,248,12,1,12,1,14,1,20,248,2,
-    128,12,0,10,10,10,1,2,244,2,128,10,14,115,52,0,
-    0,0,8,6,8,1,2,16,2,242,4,1,4,8,8,249,
-    2,3,8,253,2,3,6,254,14,1,2,1,10,4,10,5,
-    6,248,14,1,10,1,36,1,2,128,12,0,10,2,10,1,
-    2,244,2,128,10,14,115,204,0,0,0,15,22,15,34,15,
-    34,9,12,29,33,9,21,22,25,9,26,9,34,19,23,22,
-    26,22,31,17,42,17,42,24,28,24,34,38,39,24,39,21,
-    36,43,47,43,53,57,60,43,60,21,36,38,41,25,29,25,
-    35,25,29,25,35,25,35,39,40,25,40,25,35,25,35,32,
-    36,17,42,17,42,17,42,17,42,17,42,17,29,30,33,17,
-    34,17,34,17,34,24,28,24,43,24,43,21,79,31,45,46,
-    71,74,78,46,78,31,79,25,79,24,28,24,35,24,50,44,
-    49,24,50,21,42,25,29,25,37,25,37,41,42,25,42,25,
-    37,25,37,17,42,17,42,17,42,17,42,17,42,17,42,17,
-    42,17,42,17,42,17,42,0,0,17,42,17,42,17,42,17,
-    42,17,42,17,42,17,21,17,28,17,38,17,38,17,38,17,
-    21,17,28,17,38,17,38,17,38,19,23,0,0,17,29,30,
-    33,17,34,13,34,13,34,115,56,0,0,0,137,4,65,32,
-    0,141,22,65,10,3,163,5,65,32,0,173,23,65,10,3,
-    193,4,6,65,32,0,193,10,4,65,14,11,193,14,1,65,
-    32,0,193,15,3,65,14,11,193,18,14,65,32,0,193,32,
-    5,65,37,7,99,1,0,0,0,0,0,0,0,0,0,0,
-    0,9,0,0,0,3,0,0,0,115,182,0,0,0,116,0,
-    160,1,161,0,125,1,124,0,106,2,53,0,1,0,124,0,
-    106,3,124,1,107,3,114,17,116,4,100,1,131,1,130,1,
-    124,0,106,5,100,2,107,4,115,24,74,0,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,83,100,0,124,0,95,3,124,0,106,6,
-    114,75,124,0,4,0,106,6,100,3,56,0,2,0,95,6,
-    124,0,106,7,160,8,161,0,1,0,9,0,100,0,4,0,
-    4,0,131,3,1,0,100,0,83,0,35,0,49,0,115,67,
-    119,4,37,0,1,0,1,0,1,0,89,0,1,0,1,0,
-    100,0,83,0,9,0,100,0,4,0,4,0,131,3,1,0,
-    100,0,83,0,9,0,100,0,4,0,4,0,131,3,1,0,
-    100,0,83,0,41,4,78,250,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,27,0,0,0,114,45,0,
-    0,0,41,9,114,28,0,0,0,114,38,0,0,0,114,29,
-    0,0,0,114,31,0,0,0,218,12,82,117,110,116,105,109,
-    101,69,114,114,111,114,114,32,0,0,0,114,33,0,0,0,
-    114,30,0,0,0,114,47,0,0,0,114,48,0,0,0,115,
-    2,0,0,0,32,32,114,5,0,0,0,114,47,0,0,0,
-    122,19,95,77,111,100,117,108,101,76,111,99,107,46,114,101,
-    108,101,97,115,101,125,0,0,0,115,36,0,0,0,8,1,
-    8,1,10,1,8,1,14,1,14,1,10,1,6,1,6,1,
-    14,1,12,1,22,247,2,128,16,0,2,7,14,249,2,5,
-    14,251,115,32,0,0,0,8,1,4,1,4,9,8,248,10,
-    1,14,1,14,1,8,1,2,4,6,253,4,1,2,2,14,
-    255,34,1,2,128,48,0,115,182,0,0,0,15,22,15,34,
-    15,34,9,12,14,18,14,23,9,42,9,42,16,20,16,26,
-    30,33,16,33,13,70,23,35,36,69,23,70,17,70,20,24,
-    20,30,33,34,20,34,13,34,13,34,13,34,13,17,13,23,
-    13,23,27,28,13,28,13,23,13,23,16,20,16,26,30,31,
-    16,31,13,42,30,34,17,21,17,27,20,24,20,32,17,42,
-    21,25,21,33,21,33,37,38,21,38,21,33,21,33,21,25,
-    21,32,21,42,21,42,21,42,21,42,9,42,9,42,9,42,
+    1,14,1,2,255,2,128,115,14,0,0,0,2,4,6,254,
+    2,128,2,2,2,255,24,1,2,128,115,40,0,0,0,5,
+    38,16,19,16,32,9,32,0,0,5,38,12,26,5,38,5,
+    38,5,38,5,38,16,20,21,24,16,25,16,38,9,38,9,
+    38,9,38,5,38,0,0,115,12,0,0,0,129,2,4,0,
+    132,12,19,7,146,1,19,7,78,99,2,0,0,0,0,0,
+    0,0,0,0,0,0,7,0,0,0,3,0,0,0,115,56,
+    0,0,0,100,1,68,0,93,16,125,2,116,0,124,1,124,
+    2,131,2,114,18,116,1,124,0,124,2,116,2,124,1,124,
+    2,131,2,131,3,1,0,113,2,124,0,106,3,160,4,124,
+    1,106,3,161,1,1,0,100,2,83,0,41,3,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,41,4,
+    218,10,95,95,109,111,100,117,108,101,95,95,218,8,95,95,
+    110,97,109,101,95,95,114,1,0,0,0,218,7,95,95,100,
+    111,99,95,95,78,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,115,3,0,0,0,32,32,
+    32,114,5,0,0,0,218,5,95,119,114,97,112,114,16,0,
+    0,0,40,0,0,0,115,10,0,0,0,8,2,10,1,18,
+    1,2,128,18,1,115,14,0,0,0,2,2,4,2,2,254,
+    8,1,20,1,2,128,18,1,115,56,0,0,0,20,73,5,
+    57,5,57,9,16,12,19,20,23,25,32,12,33,9,57,13,
+    20,21,24,26,33,35,42,43,46,48,55,35,56,13,57,13,
+    57,0,0,5,8,5,17,5,38,25,28,25,37,5,38,5,
+    38,5,38,5,38,243,0,0,0,0,99,1,0,0,0,0,
+    0,0,0,0,0,0,0,2,0,0,0,3,0,0,0,115,
+    12,0,0,0,116,0,116,1,131,1,124,0,131,1,83,0,
+    114,0,0,0,0,41,2,114,3,0,0,0,218,3,115,121,
+    115,169,1,218,4,110,97,109,101,115,1,0,0,0,32,114,
+    5,0,0,0,218,11,95,110,101,119,95,109,111,100,117,108,
+    101,114,21,0,0,0,48,0,0,0,243,2,0,0,0,12,
+    1,114,22,0,0,0,115,12,0,0,0,12,16,17,20,12,
+    21,22,26,12,27,5,27,114,17,0,0,0,99,0,0,0,
+    0,0,0,0,0,0,0,0,0,1,0,0,0,0,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,8,0,0,0,114,7,0,0,
+    0,114,1,0,0,0,169,0,114,17,0,0,0,114,5,0,
+    0,0,114,23,0,0,0,114,23,0,0,0,61,0,0,0,
+    115,4,0,0,0,8,0,4,1,115,4,0,0,0,8,195,
+    4,62,115,12,0,0,0,1,1,1,1,1,1,1,1,5,
+    9,5,9,114,17,0,0,0,114,23,0,0,0,99,0,0,
+    0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,
+    0,0,115,46,0,0,0,101,0,90,1,100,0,90,2,100,
+    1,90,3,100,2,132,0,90,4,100,3,132,0,90,5,100,
+    4,132,0,90,6,100,5,132,0,90,7,100,6,132,0,90,
+    8,100,7,83,0,41,8,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,0,0,0,0,2,0,0,0,
+    3,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,169,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,20,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,169,2,218,4,115,101,108,102,114,20,0,
+    0,0,115,2,0,0,0,32,32,114,5,0,0,0,218,8,
+    95,95,105,110,105,116,95,95,122,20,95,77,111,100,117,108,
+    101,76,111,99,107,46,95,95,105,110,105,116,95,95,71,0,
+    0,0,243,12,0,0,0,10,1,10,1,6,1,6,1,6,
+    1,10,1,114,37,0,0,0,115,48,0,0,0,21,28,21,
+    44,21,44,9,13,9,18,23,30,23,46,23,46,9,13,9,
+    20,21,25,9,13,9,18,22,26,9,13,9,19,22,23,9,
+    13,9,19,24,25,9,13,9,21,9,21,9,21,114,17,0,
+    0,0,99,1,0,0,0,0,0,0,0,0,0,0,0,3,
+    0,0,0,3,0,0,0,115,86,0,0,0,116,0,160,1,
+    161,0,125,1,124,0,106,2,125,2,116,3,131,0,125,3,
+    9,0,116,4,160,5,124,2,161,1,125,4,124,4,100,0,
+    117,0,114,22,100,2,83,0,124,4,106,2,125,2,124,2,
+    124,1,107,2,114,31,100,1,83,0,124,2,124,3,118,0,
+    114,37,100,2,83,0,124,3,160,6,124,2,161,1,1,0,
+    113,11,41,3,78,84,70,41,7,114,28,0,0,0,218,9,
+    103,101,116,95,105,100,101,110,116,114,31,0,0,0,218,3,
+    115,101,116,218,12,95,98,108,111,99,107,105,110,103,95,111,
+    110,218,3,103,101,116,218,3,97,100,100,41,5,114,35,0,
+    0,0,90,2,109,101,218,3,116,105,100,90,4,115,101,101,
+    110,114,29,0,0,0,115,5,0,0,0,32,32,32,32,32,
+    114,5,0,0,0,218,12,104,97,115,95,100,101,97,100,108,
+    111,99,107,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,79,0,0,
+    0,115,28,0,0,0,8,2,6,1,6,1,2,1,10,1,
+    8,1,4,1,6,1,8,1,4,1,8,1,4,6,10,1,
+    2,242,115,28,0,0,0,8,2,6,1,6,1,2,1,10,
+    1,6,1,6,1,6,1,6,1,6,1,6,1,6,6,10,
+    1,2,242,115,86,0,0,0,14,21,14,33,14,33,9,11,
+    15,19,15,25,9,12,16,19,16,21,9,13,15,19,20,32,
+    20,41,37,40,20,41,13,17,16,20,24,28,16,28,13,29,
+    24,29,24,29,19,23,19,29,13,16,16,19,23,25,16,25,
+    13,28,24,28,24,28,16,19,23,27,16,27,13,29,24,29,
+    24,29,13,17,13,26,22,25,13,26,13,26,15,19,114,17,
+    0,0,0,99,1,0,0,0,0,0,0,0,0,0,0,0,
+    9,0,0,0,3,0,0,0,115,204,0,0,0,116,0,160,
+    1,161,0,125,1,124,0,116,2,124,1,60,0,9,0,9,
+    0,124,0,106,3,53,0,1,0,124,0,106,4,100,2,107,
+    2,115,24,124,0,106,5,124,1,107,2,114,45,124,1,124,
+    0,95,5,124,0,4,0,106,4,100,3,55,0,2,0,95,
+    4,9,0,100,4,4,0,4,0,131,3,1,0,116,2,124,
+    1,61,0,100,1,83,0,124,0,160,6,161,0,114,55,116,
+    7,100,5,124,0,22,0,131,1,130,1,124,0,106,8,160,
+    9,100,6,161,1,114,68,124,0,4,0,106,10,100,3,55,
+    0,2,0,95,10,100,4,4,0,4,0,131,3,1,0,110,
+    11,35,0,49,0,115,79,119,4,37,0,1,0,1,0,1,
+    0,89,0,1,0,1,0,124,0,106,8,160,9,161,0,1,
+    0,124,0,106,8,160,11,161,0,1,0,113,10,35,0,116,
+    2,124,1,61,0,119,0,37,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,84,114,27,0,0,0,233,1,0,0,
+    0,78,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,41,12,114,28,
+    0,0,0,114,38,0,0,0,114,40,0,0,0,114,29,0,
+    0,0,114,32,0,0,0,114,31,0,0,0,114,44,0,0,
+    0,114,23,0,0,0,114,30,0,0,0,218,7,97,99,113,
+    117,105,114,101,114,33,0,0,0,218,7,114,101,108,101,97,
+    115,101,169,2,114,35,0,0,0,114,43,0,0,0,115,2,
+    0,0,0,32,32,114,5,0,0,0,114,46,0,0,0,122,
+    19,95,77,111,100,117,108,101,76,111,99,107,46,97,99,113,
+    117,105,114,101,100,0,0,0,115,46,0,0,0,8,6,8,
+    1,2,1,2,1,8,1,20,1,6,1,14,1,2,1,10,
+    252,10,13,8,248,12,1,12,1,14,1,20,248,2,128,12,
+    0,10,10,10,1,2,244,2,128,10,14,115,52,0,0,0,
+    8,6,8,1,2,16,2,242,4,1,4,8,8,249,2,3,
+    8,253,2,3,6,254,14,1,2,1,10,4,10,5,6,248,
+    14,1,10,1,36,1,2,128,12,0,10,2,10,1,2,244,
+    2,128,10,14,115,204,0,0,0,15,22,15,34,15,34,9,
+    12,29,33,9,21,22,25,9,26,9,34,19,23,22,26,22,
+    31,17,42,17,42,24,28,24,34,38,39,24,39,21,36,43,
+    47,43,53,57,60,43,60,21,36,38,41,25,29,25,35,25,
+    29,25,35,25,35,39,40,25,40,25,35,25,35,32,36,17,
+    42,17,42,17,42,17,42,17,42,17,29,30,33,17,34,17,
+    34,17,34,24,28,24,43,24,43,21,79,31,45,46,71,74,
+    78,46,78,31,79,25,79,24,28,24,35,24,50,44,49,24,
+    50,21,42,25,29,25,37,25,37,41,42,25,42,25,37,25,
+    37,17,42,17,42,17,42,17,42,17,42,17,42,17,42,17,
+    42,17,42,17,42,0,0,17,42,17,42,17,42,17,42,17,
+    42,17,42,17,21,17,28,17,38,17,38,17,38,17,21,17,
+    28,17,38,17,38,17,38,19,23,0,0,17,29,30,33,17,
+    34,13,34,13,34,115,56,0,0,0,137,4,65,32,0,141,
+    22,65,10,3,163,5,65,32,0,173,23,65,10,3,193,4,
+    6,65,32,0,193,10,4,65,14,11,193,14,1,65,32,0,
+    193,15,3,65,14,11,193,18,14,65,32,0,193,32,5,65,
+    37,7,99,1,0,0,0,0,0,0,0,0,0,0,0,9,
+    0,0,0,3,0,0,0,115,182,0,0,0,116,0,160,1,
+    161,0,125,1,124,0,106,2,53,0,1,0,124,0,106,3,
+    124,1,107,3,114,17,116,4,100,1,131,1,130,1,124,0,
+    106,5,100,2,107,4,115,24,74,0,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,62,100,0,124,0,95,3,124,0,106,6,114,70,
+    124,0,4,0,106,6,100,3,56,0,2,0,95,6,124,0,
+    106,7,160,8,161,0,1,0,9,0,100,0,4,0,4,0,
+    131,3,1,0,100,0,83,0,9,0,100,0,4,0,4,0,
+    131,3,1,0,100,0,83,0,9,0,100,0,4,0,4,0,
+    131,3,1,0,100,0,83,0,35,0,49,0,115,83,119,4,
+    37,0,1,0,1,0,1,0,89,0,1,0,1,0,100,0,
+    83,0,41,4,78,250,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,27,0,0,0,114,45,0,0,0,
+    41,9,114,28,0,0,0,114,38,0,0,0,114,29,0,0,
+    0,114,31,0,0,0,218,12,82,117,110,116,105,109,101,69,
+    114,114,111,114,114,32,0,0,0,114,33,0,0,0,114,30,
+    0,0,0,114,47,0,0,0,114,48,0,0,0,115,2,0,
+    0,0,32,32,114,5,0,0,0,114,47,0,0,0,122,19,
+    95,77,111,100,117,108,101,76,111,99,107,46,114,101,108,101,
+    97,115,101,125,0,0,0,115,36,0,0,0,8,1,8,1,
+    10,1,8,1,14,1,14,1,10,1,6,1,6,1,14,1,
+    12,1,14,247,2,5,14,251,2,7,22,249,2,128,16,0,
+    115,32,0,0,0,8,1,4,1,4,9,8,248,10,1,14,
+    1,14,1,8,1,2,4,6,253,4,1,2,2,14,255,66,
+    1,2,128,16,0,115,182,0,0,0,15,22,15,34,15,34,
+    9,12,14,18,14,23,9,42,9,42,16,20,16,26,30,33,
+    16,33,13,70,23,35,36,69,23,70,17,70,20,24,20,30,
+    33,34,20,34,13,34,13,34,13,34,13,17,13,23,13,23,
+    27,28,13,28,13,23,13,23,16,20,16,26,30,31,16,31,
+    13,42,30,34,17,21,17,27,20,24,20,32,17,42,21,25,
+    21,33,21,33,37,38,21,38,21,33,21,33,21,25,21,32,
+    21,42,21,42,21,42,21,42,9,42,9,42,9,42,9,42,
+    9,42,9,42,9,42,13,42,9,42,9,42,9,42,9,42,
+    9,42,9,42,9,42,17,42,9,42,9,42,9,42,9,42,
+    9,42,9,42,9,42,9,42,9,42,9,42,9,42,0,0,
     9,42,9,42,9,42,9,42,9,42,9,42,9,42,9,42,
-    0,0,9,42,9,42,9,42,9,42,9,42,9,42,9,42,
-    9,42,17,42,9,42,9,42,9,42,9,42,9,42,9,42,
-    9,42,13,42,9,42,9,42,9,42,9,42,9,42,9,42,
-    9,42,115,15,0,0,0,135,47,62,3,190,4,65,2,11,
-    193,3,3,65,2,11,99,1,0,0,0,0,0,0,0,0,
+    115,17,0,0,0,135,47,65,14,3,193,14,4,65,18,11,
+    193,19,3,65,18,11,99,1,0,0,0,0,0,0,0,0,
     0,0,0,5,0,0,0,3,0,0,0,243,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,
@@ -400,15 +400,15 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     5,29,5,29,114,17,0,0,0,114,61,0,0,0,99,1,
     0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,3,
     0,0,0,115,152,0,0,0,116,0,160,1,161,0,1,0,
-    9,0,9,0,116,2,124,0,25,0,131,0,125,1,110,12,
-    35,0,4,0,116,3,121,75,1,0,1,0,1,0,100,1,
-    125,1,89,0,110,1,37,0,124,1,100,1,117,0,114,68,
-    116,4,100,1,117,0,114,37,116,5,124,0,131,1,125,1,
-    110,4,116,6,124,0,131,1,125,1,124,0,102,1,100,2,
-    132,1,125,2,116,7,160,8,124,1,124,2,161,2,116,2,
-    124,0,60,0,9,0,116,0,160,9,161,0,1,0,124,1,
+    9,0,9,0,116,2,124,0,25,0,131,0,125,1,110,13,
+    35,0,4,0,116,3,121,23,1,0,1,0,1,0,100,1,
+    125,1,89,0,110,2,119,0,37,0,124,1,100,1,117,0,
+    114,62,116,4,100,1,117,0,114,38,116,5,124,0,131,1,
+    125,1,110,4,116,6,124,0,131,1,125,1,124,0,102,1,
+    100,2,132,1,125,2,116,7,160,8,124,1,124,2,161,2,
+    116,2,124,0,60,0,9,0,116,0,160,9,161,0,1,0,
+    124,1,83,0,9,0,116,0,160,9,161,0,1,0,124,1,
     83,0,35,0,116,0,160,9,161,0,1,0,119,0,37,0,
-    9,0,116,0,160,9,161,0,1,0,124,1,83,0,119,0,
     41,3,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,
@@ -421,10 +421,10 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     99,2,0,0,0,0,0,0,0,0,0,0,0,8,0,0,
     0,19,0,0,0,115,72,0,0,0,116,0,160,1,161,0,
     1,0,9,0,116,2,160,3,124,1,161,1,124,0,117,0,
-    114,29,116,2,124,1,61,0,9,0,116,0,160,4,161,0,
-    1,0,100,0,83,0,35,0,116,0,160,4,161,0,1,0,
-    119,0,37,0,9,0,116,0,160,4,161,0,1,0,100,0,
-    83,0,114,0,0,0,0,41,5,218,4,95,105,109,112,218,
+    114,22,116,2,124,1,61,0,9,0,116,0,160,4,161,0,
+    1,0,100,0,83,0,9,0,116,0,160,4,161,0,1,0,
+    100,0,83,0,35,0,116,0,160,4,161,0,1,0,119,0,
+    37,0,114,0,0,0,0,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,41,0,0,
     0,218,12,114,101,108,101,97,115,101,95,108,111,99,107,41,
@@ -432,15 +432,15 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     32,32,114,5,0,0,0,218,2,99,98,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,198,0,0,0,115,20,0,
-    0,0,8,1,2,1,14,4,8,1,12,2,2,128,10,0,
-    2,128,2,253,12,3,115,20,0,0,0,8,1,2,8,12,
-    253,10,1,12,2,2,128,10,0,2,128,2,254,12,2,115,
+    0,0,8,1,2,1,14,4,8,1,12,2,2,253,12,3,
+    2,128,10,0,2,128,115,20,0,0,0,8,1,2,8,12,
+    253,10,1,12,2,2,254,12,2,2,128,10,0,2,128,115,
     72,0,0,0,17,21,17,36,17,36,17,36,17,40,24,37,
     24,47,42,46,24,47,51,54,24,54,21,48,29,42,43,47,
     29,48,29,48,21,25,21,40,21,40,21,40,21,40,21,40,
-    0,0,21,25,21,40,21,40,21,40,21,40,0,0,21,48,
-    21,25,21,40,21,40,21,40,21,40,21,40,115,8,0,0,
-    0,133,10,22,0,150,6,28,7,41,10,114,70,0,0,0,
+    21,48,21,25,21,40,21,40,21,40,21,40,21,40,0,0,
+    21,25,21,40,21,40,21,40,21,40,0,0,115,8,0,0,
+    0,133,10,29,0,157,6,35,7,41,10,114,70,0,0,0,
     114,71,0,0,0,114,72,0,0,0,218,8,75,101,121,69,
     114,114,111,114,114,28,0,0,0,114,58,0,0,0,114,25,
     0,0,0,218,8,95,119,101,97,107,114,101,102,114,74,0,
@@ -448,2130 +448,2127 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     0,0,0,114,75,0,0,0,115,3,0,0,0,32,32,32,
     114,5,0,0,0,114,64,0,0,0,114,64,0,0,0,179,
     0,0,0,115,46,0,0,0,8,6,2,1,2,1,12,1,
-    2,128,12,1,8,1,2,128,8,2,8,1,10,1,8,2,
-    10,2,18,11,8,2,4,2,2,128,10,254,2,128,2,237,
-    8,19,4,2,2,232,115,54,0,0,0,8,6,2,26,2,
-    235,12,254,2,128,2,2,2,255,16,1,2,128,6,2,2,
+    2,128,12,1,8,1,2,255,2,128,8,3,8,1,10,1,
+    8,2,10,2,18,11,8,2,4,2,2,235,8,19,4,2,
+    2,128,10,254,2,128,115,52,0,0,0,8,6,2,26,2,
+    235,12,254,2,128,2,2,2,255,18,1,2,128,6,2,2,
     17,6,240,2,3,10,254,8,2,2,2,8,9,18,2,8,
-    2,4,2,2,128,10,254,2,128,2,254,8,2,4,2,2,
-    233,115,152,0,0,0,5,9,5,24,5,24,5,24,5,28,
-    9,24,20,33,34,38,20,39,20,41,13,17,13,17,0,0,
-    9,24,16,24,9,24,9,24,9,24,9,24,20,24,13,17,
-    13,17,13,17,0,0,12,16,20,24,12,24,9,57,16,23,
+    2,4,2,2,252,8,2,4,2,2,128,10,254,2,128,115,
+    152,0,0,0,5,9,5,24,5,24,5,24,5,28,9,24,
+    20,33,34,38,20,39,20,41,13,17,13,17,0,0,9,24,
+    16,24,9,24,9,24,9,24,9,24,20,24,13,17,13,17,
+    13,17,9,24,0,0,12,16,20,24,12,24,9,57,16,23,
     27,31,16,31,13,41,24,40,41,45,24,46,17,21,17,21,
     24,35,36,40,24,41,17,21,30,34,13,40,13,40,13,40,
     13,40,35,43,35,57,48,52,54,56,35,57,13,26,27,31,
     13,32,13,32,9,13,9,28,9,28,9,28,12,16,5,16,
-    0,0,9,13,9,28,9,28,9,28,9,28,0,0,9,57,
-    9,13,9,28,9,28,9,28,12,16,5,16,9,24,115,26,
-    0,0,0,134,5,12,0,139,1,61,0,140,9,23,7,149,
-    33,61,0,189,6,65,3,7,193,11,1,23,7,99,1,0,
-    0,0,0,0,0,0,0,0,0,0,8,0,0,0,3,0,
-    0,0,115,56,0,0,0,116,0,124,0,131,1,125,1,9,
-    0,124,1,160,1,161,0,1,0,110,11,35,0,4,0,116,
-    2,121,27,1,0,1,0,1,0,89,0,100,1,83,0,37,
-    0,124,1,160,3,161,0,1,0,100,1,83,0,119,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,64,0,0,0,114,46,0,0,0,114,23,0,
-    0,0,114,47,0,0,0,41,2,114,20,0,0,0,114,29,
-    0,0,0,115,2,0,0,0,32,32,114,5,0,0,0,218,
-    19,95,108,111,99,107,95,117,110,108,111,99,107,95,109,111,
-    100,117,108,101,114,78,0,0,0,216,0,0,0,115,18,0,
-    0,0,8,6,2,1,10,1,2,128,12,1,6,3,2,128,
-    12,2,2,251,115,20,0,0,0,8,6,2,8,10,250,2,
-    128,2,4,2,253,14,3,2,128,12,2,2,254,115,56,0,
-    0,0,12,28,29,33,12,34,5,9,5,23,9,13,9,23,
-    9,23,9,23,9,23,0,0,5,13,12,26,5,13,5,13,
-    5,13,5,13,9,13,9,13,9,13,0,0,9,13,9,23,
-    9,23,9,23,9,23,9,23,5,13,115,12,0,0,0,133,
-    4,10,0,138,7,20,7,155,1,20,7,99,1,0,0,0,
-    0,0,0,0,0,0,0,0,4,0,0,0,15,0,0,0,
-    115,14,0,0,0,124,0,124,1,105,0,124,2,164,1,142,
-    1,83,0,41,2,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,78,114,24,0,0,0,41,3,
-    218,1,102,114,67,0,0,0,90,4,107,119,100,115,115,3,
-    0,0,0,32,32,32,114,5,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,114,80,0,0,0,233,0,0,0,243,
-    2,0,0,0,14,8,114,81,0,0,0,115,14,0,0,0,
-    12,13,15,19,12,28,23,27,12,28,12,28,5,28,114,17,
-    0,0,0,114,45,0,0,0,41,1,218,9,118,101,114,98,
-    111,115,105,116,121,99,1,0,0,0,0,0,0,0,1,0,
-    0,0,4,0,0,0,7,0,0,0,115,58,0,0,0,116,
-    0,106,1,106,2,124,1,107,5,114,27,124,0,160,3,100,
-    1,161,1,115,15,100,2,124,0,23,0,125,0,116,4,124,
-    0,106,5,124,2,142,0,116,0,106,6,100,3,141,2,1,
-    0,100,4,83,0,100,4,83,0,41,5,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,41,2,250,1,35,122,
-    7,105,109,112,111,114,116,32,122,2,35,32,41,1,90,4,
-    102,105,108,101,78,41,7,114,18,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,
-    53,0,0,0,218,6,115,116,100,101,114,114,41,3,218,7,
-    109,101,115,115,97,103,101,114,82,0,0,0,114,67,0,0,
-    0,115,3,0,0,0,32,32,32,114,5,0,0,0,218,16,
-    95,118,101,114,98,111,115,101,95,109,101,115,115,97,103,101,
-    114,90,0,0,0,244,0,0,0,115,10,0,0,0,12,2,
-    10,1,8,1,24,1,4,253,115,10,0,0,0,10,2,2,
-    3,8,254,10,1,28,1,115,58,0,0,0,8,11,8,17,
-    8,25,29,38,8,38,5,54,16,23,16,52,35,51,16,52,
-    9,37,23,27,30,37,23,37,13,20,9,14,15,22,15,29,
-    31,35,15,36,43,46,43,53,9,54,9,54,9,54,9,54,
-    9,54,5,54,5,54,114,17,0,0,0,99,1,0,0,0,
-    0,0,0,0,0,0,0,0,3,0,0,0,3,0,0,0,
-    243,26,0,0,0,135,0,136,0,102,1,100,1,132,8,125,
-    1,116,0,124,1,137,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,0,0,0,
-    0,4,0,0,0,19,0,0,0,115,38,0,0,0,124,1,
-    116,0,106,1,118,1,114,14,116,2,100,1,160,3,124,1,
-    161,1,124,1,100,2,141,2,130,1,137,2,124,0,124,1,
-    131,2,83,0,41,3,78,250,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,114,19,0,0,0,41,4,114,18,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,53,0,0,0,169,3,114,35,0,0,
-    0,218,8,102,117,108,108,110,97,109,101,218,3,102,120,110,
-    115,3,0,0,0,32,32,128,114,5,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,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,254,0,
-    0,0,243,10,0,0,0,10,1,10,1,2,1,6,255,10,
-    2,243,10,0,0,0,8,1,2,2,10,255,8,1,10,1,
-    115,38,0,0,0,12,20,28,31,28,52,12,52,9,45,19,
-    30,31,62,31,79,70,78,31,79,36,44,19,45,19,45,13,
-    45,16,19,20,24,26,34,16,35,9,35,114,17,0,0,0,
-    78,169,1,114,16,0,0,0,41,2,114,97,0,0,0,114,
-    98,0,0,0,115,2,0,0,0,96,32,114,5,0,0,0,
-    218,17,95,114,101,113,117,105,114,101,115,95,98,117,105,108,
-    116,105,110,114,102,0,0,0,252,0,0,0,243,8,0,0,
-    0,2,128,10,2,10,5,4,1,243,8,0,0,0,2,128,
-    10,6,10,1,4,1,115,26,0,0,0,0,0,5,35,5,
-    35,5,35,5,35,5,35,5,10,11,36,38,41,5,42,5,
-    42,12,37,5,37,114,17,0,0,0,99,1,0,0,0,0,
-    0,0,0,0,0,0,0,3,0,0,0,3,0,0,0,114,
-    91,0,0,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,
+    9,57,9,13,9,28,9,28,9,28,12,16,5,16,0,0,
+    9,13,9,28,9,28,9,28,9,28,0,0,115,33,0,0,
+    0,134,5,12,0,139,1,65,5,0,140,9,24,7,149,2,
+    65,5,0,151,1,24,7,152,31,65,5,0,193,5,6,65,
+    11,7,99,1,0,0,0,0,0,0,0,0,0,0,0,8,
+    0,0,0,3,0,0,0,115,56,0,0,0,116,0,124,0,
+    131,1,125,1,9,0,124,1,160,1,161,0,1,0,110,12,
+    35,0,4,0,116,2,121,20,1,0,1,0,1,0,89,0,
+    100,1,83,0,119,0,37,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,64,0,0,0,114,46,0,
+    0,0,114,23,0,0,0,114,47,0,0,0,41,2,114,20,
+    0,0,0,114,29,0,0,0,115,2,0,0,0,32,32,114,
+    5,0,0,0,218,19,95,108,111,99,107,95,117,110,108,111,
+    99,107,95,109,111,100,117,108,101,114,78,0,0,0,216,0,
+    0,0,115,18,0,0,0,8,6,2,1,10,1,2,128,12,
+    1,6,3,2,253,2,128,12,5,115,18,0,0,0,8,6,
+    2,8,10,250,2,128,2,4,2,253,16,3,2,128,12,2,
+    115,56,0,0,0,12,28,29,33,12,34,5,9,5,23,9,
+    13,9,23,9,23,9,23,9,23,0,0,5,13,12,26,5,
+    13,5,13,5,13,5,13,9,13,9,13,9,13,5,13,0,
+    0,9,13,9,23,9,23,9,23,9,23,9,23,115,12,0,
+    0,0,133,4,10,0,138,7,21,7,148,1,21,7,99,1,
+    0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,15,
+    0,0,0,115,14,0,0,0,124,0,124,1,105,0,124,2,
+    164,1,142,1,83,0,41,2,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,78,114,24,0,0,
+    0,41,3,218,1,102,114,67,0,0,0,90,4,107,119,100,
+    115,115,3,0,0,0,32,32,32,114,5,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,114,80,0,0,0,233,0,
+    0,0,243,2,0,0,0,14,8,114,81,0,0,0,115,14,
+    0,0,0,12,13,15,19,12,28,23,27,12,28,12,28,5,
+    28,114,17,0,0,0,114,45,0,0,0,41,1,218,9,118,
+    101,114,98,111,115,105,116,121,99,1,0,0,0,0,0,0,
+    0,1,0,0,0,4,0,0,0,7,0,0,0,115,58,0,
+    0,0,116,0,106,1,106,2,124,1,107,5,114,27,124,0,
+    160,3,100,1,161,1,115,15,100,2,124,0,23,0,125,0,
+    116,4,124,0,106,5,124,2,142,0,116,0,106,6,100,3,
+    141,2,1,0,100,4,83,0,100,4,83,0,41,5,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,41,2,250,
+    1,35,122,7,105,109,112,111,114,116,32,122,2,35,32,41,
+    1,90,4,102,105,108,101,78,41,7,114,18,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,53,0,0,0,218,6,115,116,100,101,114,114,41,
+    3,218,7,109,101,115,115,97,103,101,114,82,0,0,0,114,
+    67,0,0,0,115,3,0,0,0,32,32,32,114,5,0,0,
+    0,218,16,95,118,101,114,98,111,115,101,95,109,101,115,115,
+    97,103,101,114,90,0,0,0,244,0,0,0,115,10,0,0,
+    0,12,2,10,1,8,1,24,1,4,253,115,10,0,0,0,
+    10,2,2,3,8,254,10,1,28,1,115,58,0,0,0,8,
+    11,8,17,8,25,29,38,8,38,5,54,16,23,16,52,35,
+    51,16,52,9,37,23,27,30,37,23,37,13,20,9,14,15,
+    22,15,29,31,35,15,36,43,46,43,53,9,54,9,54,9,
+    54,9,54,9,54,5,54,5,54,114,17,0,0,0,99,1,
+    0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,3,
+    0,0,0,243,26,0,0,0,135,0,136,0,102,1,100,1,
+    132,8,125,1,116,0,124,1,137,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,
     0,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,14,116,2,100,1,160,
+    0,124,1,116,0,106,1,118,1,114,14,116,2,100,1,160,
     3,124,1,161,1,124,1,100,2,141,2,130,1,137,2,124,
-    0,124,1,131,2,83,0,169,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,114,19,0,0,0,41,4,114,70,
-    0,0,0,218,9,105,115,95,102,114,111,122,101,110,114,94,
-    0,0,0,114,53,0,0,0,114,95,0,0,0,115,3,0,
-    0,0,32,32,128,114,5,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,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,9,1,0,0,114,99,0,0,
-    0,114,100,0,0,0,115,38,0,0,0,16,20,16,40,31,
-    39,16,40,9,45,19,30,31,60,31,77,68,76,31,77,36,
-    44,19,45,19,45,13,45,16,19,20,24,26,34,16,35,9,
-    35,114,17,0,0,0,78,114,101,0,0,0,41,2,114,97,
-    0,0,0,114,107,0,0,0,115,2,0,0,0,96,32,114,
-    5,0,0,0,218,16,95,114,101,113,117,105,114,101,115,95,
-    102,114,111,122,101,110,114,108,0,0,0,7,1,0,0,114,
-    103,0,0,0,114,104,0,0,0,115,26,0,0,0,0,0,
-    5,35,5,35,5,35,5,35,5,35,5,10,11,35,37,40,
-    5,41,5,41,12,36,5,36,114,17,0,0,0,99,2,0,
-    0,0,0,0,0,0,0,0,0,0,4,0,0,0,3,0,
-    0,0,115,74,0,0,0,100,1,125,2,116,0,160,1,124,
-    2,116,2,161,2,1,0,116,3,124,1,124,0,131,2,125,
-    3,124,1,116,4,106,5,118,0,114,33,116,4,106,5,124,
-    1,25,0,125,4,116,6,124,3,124,4,131,2,1,0,116,
-    4,106,5,124,1,25,0,83,0,116,7,124,3,131,1,83,
-    0,41,3,122,130,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,40,41,32,105,110,115,116,101,97,100,
-    46,10,10,32,32,32,32,122,103,116,104,101,32,108,111,97,
-    100,95,109,111,100,117,108,101,40,41,32,109,101,116,104,111,
-    100,32,105,115,32,100,101,112,114,101,99,97,116,101,100,32,
-    97,110,100,32,115,108,97,116,101,100,32,102,111,114,32,114,
-    101,109,111,118,97,108,32,105,110,32,80,121,116,104,111,110,
-    32,51,46,49,50,59,32,117,115,101,32,101,120,101,99,95,
-    109,111,100,117,108,101,40,41,32,105,110,115,116,101,97,100,
-    78,41,8,218,9,95,119,97,114,110,105,110,103,115,218,4,
-    119,97,114,110,218,18,68,101,112,114,101,99,97,116,105,111,
-    110,87,97,114,110,105,110,103,218,16,115,112,101,99,95,102,
-    114,111,109,95,108,111,97,100,101,114,114,18,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,5,114,35,0,0,0,114,96,0,
-    0,0,218,3,109,115,103,218,4,115,112,101,99,218,6,109,
-    111,100,117,108,101,115,5,0,0,0,32,32,32,32,32,114,
-    5,0,0,0,218,17,95,108,111,97,100,95,109,111,100,117,
-    108,101,95,115,104,105,109,114,119,0,0,0,19,1,0,0,
-    115,16,0,0,0,4,6,12,2,10,1,10,1,10,1,10,
-    1,10,1,8,2,115,20,0,0,0,2,7,2,255,12,2,
-    10,1,8,1,2,5,10,252,10,1,10,1,8,2,115,74,
-    0,0,0,12,51,5,8,5,14,5,44,20,23,25,43,5,
-    44,5,44,12,28,29,37,39,43,12,44,5,9,8,16,20,
-    23,20,31,8,31,5,27,18,21,18,29,30,38,18,39,9,
-    15,9,14,15,19,21,27,9,28,9,28,16,19,16,27,28,
-    36,16,37,9,37,16,21,22,26,16,27,9,27,114,17,0,
-    0,0,99,1,0,0,0,0,0,0,0,0,0,0,0,8,
-    0,0,0,3,0,0,0,115,194,0,0,0,116,0,124,0,
-    100,1,100,2,131,3,125,1,116,0,124,0,100,3,100,2,
-    131,3,4,0,125,2,114,18,116,1,124,2,131,1,83,0,
-    116,2,124,1,100,4,131,2,114,39,9,0,124,1,160,3,
-    124,0,161,1,83,0,35,0,4,0,116,4,121,96,1,0,
-    1,0,1,0,89,0,110,1,37,0,9,0,124,0,106,5,
-    125,3,110,12,35,0,4,0,116,6,121,95,1,0,1,0,
-    1,0,100,5,125,3,89,0,110,1,37,0,9,0,124,0,
-    106,7,125,4,110,27,35,0,4,0,116,6,121,94,1,0,
-    1,0,1,0,124,1,100,2,117,0,114,79,100,6,160,8,
-    124,3,161,1,6,0,89,0,83,0,100,7,160,8,124,3,
-    124,1,161,2,6,0,89,0,83,0,37,0,100,8,160,8,
-    124,3,124,4,161,2,83,0,119,0,119,0,119,0,41,9,
-    122,44,84,104,101,32,105,109,112,108,101,109,101,110,116,97,
-    116,105,111,110,32,111,102,32,77,111,100,117,108,101,84,121,
-    112,101,46,95,95,114,101,112,114,95,95,40,41,46,218,10,
-    95,95,108,111,97,100,101,114,95,95,78,218,8,95,95,115,
-    112,101,99,95,95,218,11,109,111,100,117,108,101,95,114,101,
-    112,114,250,1,63,250,13,60,109,111,100,117,108,101,32,123,
-    33,114,125,62,250,20,60,109,111,100,117,108,101,32,123,33,
-    114,125,32,40,123,33,114,125,41,62,250,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,9,114,12,0,0,0,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,10,0,0,0,114,122,0,0,0,218,9,69,120,
-    99,101,112,116,105,111,110,114,8,0,0,0,114,2,0,0,
-    0,218,8,95,95,102,105,108,101,95,95,114,53,0,0,0,
-    41,5,114,118,0,0,0,218,6,108,111,97,100,101,114,114,
-    117,0,0,0,114,20,0,0,0,218,8,102,105,108,101,110,
-    97,109,101,115,5,0,0,0,32,32,32,32,32,114,5,0,
-    0,0,218,12,95,109,111,100,117,108,101,95,114,101,112,114,
-    114,132,0,0,0,38,1,0,0,115,56,0,0,0,12,2,
-    16,1,8,1,10,1,2,1,10,1,2,128,12,1,4,1,
-    2,128,2,2,8,1,2,128,12,1,8,1,2,128,2,1,
-    8,1,2,128,12,1,8,1,14,1,16,2,2,128,12,2,
-    2,250,2,252,2,251,115,68,0,0,0,12,2,14,1,2,
-    6,8,251,8,1,4,4,10,254,2,128,2,2,2,255,12,
-    1,2,128,2,5,8,254,2,128,2,2,2,255,16,1,2,
-    128,2,9,8,249,2,128,2,5,2,252,8,4,6,253,2,
-    3,14,254,16,2,2,128,12,2,2,254,2,249,2,251,115,
-    194,0,0,0,14,21,22,28,30,42,44,48,14,49,5,11,
-    16,23,24,30,32,42,44,48,16,49,8,49,8,12,5,17,
-    16,38,39,43,16,44,9,44,10,17,18,24,26,39,10,40,
-    5,17,9,17,20,26,20,46,39,45,20,46,13,46,0,0,
-    9,17,16,25,9,17,9,17,9,17,9,17,13,17,13,17,
-    0,0,5,19,16,22,16,31,9,13,9,13,0,0,5,19,
-    12,26,5,19,5,19,5,19,5,19,16,19,9,13,9,13,
-    9,13,0,0,5,64,20,26,20,35,9,17,9,17,0,0,
-    5,63,12,26,5,63,5,63,5,63,5,63,12,18,22,26,
-    12,26,9,63,20,35,20,48,43,47,20,48,13,48,13,48,
-    13,48,20,42,20,63,50,54,56,62,20,63,13,63,13,63,
-    13,63,0,0,16,41,16,64,49,53,55,63,16,64,9,64,
-    5,63,5,19,9,17,115,47,0,0,0,152,4,29,0,157,
-    7,38,7,168,3,44,0,172,9,55,7,185,3,61,0,189,
-    16,65,23,7,193,15,6,65,23,7,193,30,1,65,23,7,
-    193,31,1,55,7,193,32,1,38,7,99,0,0,0,0,0,
-    0,0,0,0,0,0,0,4,0,0,0,0,0,0,0,115,
-    98,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,132,2,90,4,
-    100,5,132,0,90,5,100,6,132,0,90,6,101,7,100,7,
-    132,0,131,1,90,8,101,8,106,9,100,8,132,0,131,1,
-    90,8,101,7,100,9,132,0,131,1,90,10,101,7,100,10,
-    132,0,131,1,90,11,101,11,106,9,100,11,132,0,131,1,
-    90,11,100,2,83,0,41,12,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,0,0,0,0,3,0,0,0,2,0,0,0,3,
-    0,0,0,115,60,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,16,103,0,110,1,100,0,124,0,95,4,103,0,
-    124,0,95,5,100,1,124,0,95,6,100,0,124,0,95,7,
-    100,0,83,0,41,2,78,70,41,8,114,20,0,0,0,114,
-    130,0,0,0,114,134,0,0,0,114,135,0,0,0,218,26,
+    0,124,1,131,2,83,0,41,3,78,250,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,114,19,0,0,0,41,4,
+    114,18,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,53,0,0,0,169,3,114,
+    35,0,0,0,218,8,102,117,108,108,110,97,109,101,218,3,
+    102,120,110,115,3,0,0,0,32,32,128,114,5,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,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,254,0,0,0,243,10,0,0,0,10,1,10,1,2,1,
+    6,255,10,2,243,10,0,0,0,8,1,2,2,10,255,8,
+    1,10,1,115,38,0,0,0,12,20,28,31,28,52,12,52,
+    9,45,19,30,31,62,31,79,70,78,31,79,36,44,19,45,
+    19,45,13,45,16,19,20,24,26,34,16,35,9,35,114,17,
+    0,0,0,78,169,1,114,16,0,0,0,41,2,114,97,0,
+    0,0,114,98,0,0,0,115,2,0,0,0,96,32,114,5,
+    0,0,0,218,17,95,114,101,113,117,105,114,101,115,95,98,
+    117,105,108,116,105,110,114,102,0,0,0,252,0,0,0,243,
+    8,0,0,0,2,128,10,2,10,5,4,1,243,8,0,0,
+    0,2,128,10,6,10,1,4,1,115,26,0,0,0,0,0,
+    5,35,5,35,5,35,5,35,5,35,5,10,11,36,38,41,
+    5,42,5,42,12,37,5,37,114,17,0,0,0,99,1,0,
+    0,0,0,0,0,0,0,0,0,0,3,0,0,0,3,0,
+    0,0,114,91,0,0,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,0,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,14,116,2,
+    100,1,160,3,124,1,161,1,124,1,100,2,141,2,130,1,
+    137,2,124,0,124,1,131,2,83,0,169,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,114,19,0,0,0,41,
+    4,114,70,0,0,0,218,9,105,115,95,102,114,111,122,101,
+    110,114,94,0,0,0,114,53,0,0,0,114,95,0,0,0,
+    115,3,0,0,0,32,32,128,114,5,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,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,9,1,0,0,114,
+    99,0,0,0,114,100,0,0,0,115,38,0,0,0,16,20,
+    16,40,31,39,16,40,9,45,19,30,31,60,31,77,68,76,
+    31,77,36,44,19,45,19,45,13,45,16,19,20,24,26,34,
+    16,35,9,35,114,17,0,0,0,78,114,101,0,0,0,41,
+    2,114,97,0,0,0,114,107,0,0,0,115,2,0,0,0,
+    96,32,114,5,0,0,0,218,16,95,114,101,113,117,105,114,
+    101,115,95,102,114,111,122,101,110,114,108,0,0,0,7,1,
+    0,0,114,103,0,0,0,114,104,0,0,0,115,26,0,0,
+    0,0,0,5,35,5,35,5,35,5,35,5,35,5,10,11,
+    35,37,40,5,41,5,41,12,36,5,36,114,17,0,0,0,
+    99,2,0,0,0,0,0,0,0,0,0,0,0,4,0,0,
+    0,3,0,0,0,115,74,0,0,0,100,1,125,2,116,0,
+    160,1,124,2,116,2,161,2,1,0,116,3,124,1,124,0,
+    131,2,125,3,124,1,116,4,106,5,118,0,114,33,116,4,
+    106,5,124,1,25,0,125,4,116,6,124,3,124,4,131,2,
+    1,0,116,4,106,5,124,1,25,0,83,0,116,7,124,3,
+    131,1,83,0,41,3,122,130,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,40,41,32,105,110,115,116,
+    101,97,100,46,10,10,32,32,32,32,122,103,116,104,101,32,
+    108,111,97,100,95,109,111,100,117,108,101,40,41,32,109,101,
+    116,104,111,100,32,105,115,32,100,101,112,114,101,99,97,116,
+    101,100,32,97,110,100,32,115,108,97,116,101,100,32,102,111,
+    114,32,114,101,109,111,118,97,108,32,105,110,32,80,121,116,
+    104,111,110,32,51,46,49,50,59,32,117,115,101,32,101,120,
+    101,99,95,109,111,100,117,108,101,40,41,32,105,110,115,116,
+    101,97,100,78,41,8,218,9,95,119,97,114,110,105,110,103,
+    115,218,4,119,97,114,110,218,18,68,101,112,114,101,99,97,
+    116,105,111,110,87,97,114,110,105,110,103,218,16,115,112,101,
+    99,95,102,114,111,109,95,108,111,97,100,101,114,114,18,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,5,114,35,0,0,0,
+    114,96,0,0,0,218,3,109,115,103,218,4,115,112,101,99,
+    218,6,109,111,100,117,108,101,115,5,0,0,0,32,32,32,
+    32,32,114,5,0,0,0,218,17,95,108,111,97,100,95,109,
+    111,100,117,108,101,95,115,104,105,109,114,119,0,0,0,19,
+    1,0,0,115,16,0,0,0,4,6,12,2,10,1,10,1,
+    10,1,10,1,10,1,8,2,115,20,0,0,0,2,7,2,
+    255,12,2,10,1,8,1,2,5,10,252,10,1,10,1,8,
+    2,115,74,0,0,0,12,51,5,8,5,14,5,44,20,23,
+    25,43,5,44,5,44,12,28,29,37,39,43,12,44,5,9,
+    8,16,20,23,20,31,8,31,5,27,18,21,18,29,30,38,
+    18,39,9,15,9,14,15,19,21,27,9,28,9,28,16,19,
+    16,27,28,36,16,37,9,37,16,21,22,26,16,27,9,27,
+    114,17,0,0,0,99,1,0,0,0,0,0,0,0,0,0,
+    0,0,8,0,0,0,3,0,0,0,115,194,0,0,0,116,
+    0,124,0,100,1,100,2,131,3,125,1,116,0,124,0,100,
+    3,100,2,131,3,4,0,125,2,114,18,116,1,124,2,131,
+    1,83,0,116,2,124,1,100,4,131,2,114,40,9,0,124,
+    1,160,3,124,0,161,1,83,0,35,0,4,0,116,4,121,
+    38,1,0,1,0,1,0,89,0,110,2,119,0,37,0,9,
+    0,124,0,106,5,125,3,110,13,35,0,4,0,116,6,121,
+    56,1,0,1,0,1,0,100,5,125,3,89,0,110,2,119,
+    0,37,0,9,0,124,0,106,7,125,4,110,28,35,0,4,
+    0,116,6,121,89,1,0,1,0,1,0,124,1,100,2,117,
+    0,114,81,100,6,160,8,124,3,161,1,6,0,89,0,83,
+    0,100,7,160,8,124,3,124,1,161,2,6,0,89,0,83,
+    0,119,0,37,0,100,8,160,8,124,3,124,4,161,2,83,
+    0,41,9,122,44,84,104,101,32,105,109,112,108,101,109,101,
+    110,116,97,116,105,111,110,32,111,102,32,77,111,100,117,108,
+    101,84,121,112,101,46,95,95,114,101,112,114,95,95,40,41,
+    46,218,10,95,95,108,111,97,100,101,114,95,95,78,218,8,
+    95,95,115,112,101,99,95,95,218,11,109,111,100,117,108,101,
+    95,114,101,112,114,250,1,63,250,13,60,109,111,100,117,108,
+    101,32,123,33,114,125,62,250,20,60,109,111,100,117,108,101,
+    32,123,33,114,125,32,40,123,33,114,125,41,62,250,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,9,114,12,0,0,0,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,10,0,0,0,114,122,0,0,0,218,
+    9,69,120,99,101,112,116,105,111,110,114,8,0,0,0,114,
+    2,0,0,0,218,8,95,95,102,105,108,101,95,95,114,53,
+    0,0,0,41,5,114,118,0,0,0,218,6,108,111,97,100,
+    101,114,114,117,0,0,0,114,20,0,0,0,218,8,102,105,
+    108,101,110,97,109,101,115,5,0,0,0,32,32,32,32,32,
+    114,5,0,0,0,218,12,95,109,111,100,117,108,101,95,114,
+    101,112,114,114,132,0,0,0,38,1,0,0,115,56,0,0,
+    0,12,2,16,1,8,1,10,1,2,1,10,1,2,128,12,
+    1,4,1,2,255,2,128,2,3,8,1,2,128,12,1,8,
+    1,2,255,2,128,2,2,8,1,2,128,12,1,8,1,14,
+    1,16,2,2,252,2,128,12,6,115,62,0,0,0,12,2,
+    14,1,2,6,8,251,8,1,4,4,10,254,2,128,2,2,
+    2,255,14,1,2,128,2,5,8,254,2,128,2,2,2,255,
+    18,1,2,128,2,9,8,249,2,128,2,5,2,252,8,4,
+    6,253,2,3,14,254,18,2,2,128,12,2,115,194,0,0,
+    0,14,21,22,28,30,42,44,48,14,49,5,11,16,23,24,
+    30,32,42,44,48,16,49,8,49,8,12,5,17,16,38,39,
+    43,16,44,9,44,10,17,18,24,26,39,10,40,5,17,9,
+    17,20,26,20,46,39,45,20,46,13,46,0,0,9,17,16,
+    25,9,17,9,17,9,17,9,17,13,17,13,17,9,17,0,
+    0,5,19,16,22,16,31,9,13,9,13,0,0,5,19,12,
+    26,5,19,5,19,5,19,5,19,16,19,9,13,9,13,9,
+    13,5,19,0,0,5,64,20,26,20,35,9,17,9,17,0,
+    0,5,63,12,26,5,63,5,63,5,63,5,63,12,18,22,
+    26,12,26,9,63,20,35,20,48,43,47,20,48,13,48,13,
+    48,13,48,20,42,20,63,50,54,56,62,20,63,13,63,13,
+    63,13,63,5,63,0,0,16,41,16,64,49,53,55,63,16,
+    64,9,64,115,45,0,0,0,152,4,29,0,157,7,39,7,
+    166,1,39,7,169,3,45,0,173,9,57,7,184,1,57,7,
+    187,3,63,0,191,16,65,26,7,193,17,6,65,26,7,193,
+    25,1,65,26,7,99,0,0,0,0,0,0,0,0,0,0,
+    0,0,4,0,0,0,0,0,0,0,115,98,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,132,2,90,4,100,5,132,0,90,
+    5,100,6,132,0,90,6,101,7,100,7,132,0,131,1,90,
+    8,101,8,106,9,100,8,132,0,131,1,90,8,101,7,100,
+    9,132,0,131,1,90,10,101,7,100,10,132,0,131,1,90,
+    11,101,11,106,9,100,11,132,0,131,1,90,11,100,2,83,
+    0,41,12,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,0,0,
+    0,0,3,0,0,0,2,0,0,0,3,0,0,0,115,60,
+    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,16,103,
+    0,110,1,100,0,124,0,95,4,103,0,124,0,95,5,100,
+    1,124,0,95,6,100,0,124,0,95,7,100,0,83,0,41,
+    2,78,70,41,8,114,20,0,0,0,114,130,0,0,0,114,
+    134,0,0,0,114,135,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,25,95,117,110,105,110,105,116,105,97,
+    108,105,122,101,100,95,115,117,98,109,111,100,117,108,101,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,35,0,0,0,114,
+    20,0,0,0,114,130,0,0,0,114,134,0,0,0,114,135,
+    0,0,0,114,136,0,0,0,115,6,0,0,0,32,32,32,
+    32,32,32,114,5,0,0,0,114,36,0,0,0,122,19,77,
+    111,100,117,108,101,83,112,101,99,46,95,95,105,110,105,116,
+    95,95,101,1,0,0,243,16,0,0,0,6,2,6,1,6,
+    1,6,1,14,1,6,1,6,3,10,1,114,141,0,0,0,
+    115,60,0,0,0,21,25,9,13,9,18,23,29,9,13,9,
+    20,23,29,9,13,9,20,29,41,9,13,9,26,49,59,43,
+    69,43,45,43,45,65,69,9,13,9,40,42,44,9,13,9,
+    39,30,35,9,13,9,27,24,28,9,13,9,21,9,21,9,
+    21,114,17,0,0,0,99,1,0,0,0,0,0,0,0,0,
+    0,0,0,6,0,0,0,3,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,117,1,
+    114,26,124,1,160,4,100,3,160,0,124,0,106,3,161,1,
+    161,1,1,0,124,0,106,5,100,0,117,1,114,40,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,218,25,95,117,110,105,
-    110,105,116,105,97,108,105,122,101,100,95,115,117,98,109,111,
-    100,117,108,101,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,
-    35,0,0,0,114,20,0,0,0,114,130,0,0,0,114,134,
-    0,0,0,114,135,0,0,0,114,136,0,0,0,115,6,0,
-    0,0,32,32,32,32,32,32,114,5,0,0,0,114,36,0,
-    0,0,122,19,77,111,100,117,108,101,83,112,101,99,46,95,
-    95,105,110,105,116,95,95,101,1,0,0,243,16,0,0,0,
-    6,2,6,1,6,1,6,1,14,1,6,1,6,3,10,1,
-    114,141,0,0,0,115,60,0,0,0,21,25,9,13,9,18,
-    23,29,9,13,9,20,23,29,9,13,9,20,29,41,9,13,
-    9,26,49,59,43,69,43,45,43,45,65,69,9,13,9,40,
-    42,44,9,13,9,39,30,35,9,13,9,27,24,28,9,13,
-    9,21,9,21,9,21,114,17,0,0,0,99,1,0,0,0,
-    0,0,0,0,0,0,0,0,6,0,0,0,3,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,117,1,114,26,124,1,160,4,100,3,160,0,124,
-    0,106,3,161,1,161,1,1,0,124,0,106,5,100,0,117,
-    1,114,40,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,53,0,0,0,114,20,0,0,0,114,130,0,0,0,114,
-    134,0,0,0,218,6,97,112,112,101,110,100,114,137,0,0,
-    0,218,9,95,95,99,108,97,115,115,95,95,114,8,0,0,
-    0,218,4,106,111,105,110,41,2,114,35,0,0,0,114,67,
-    0,0,0,115,2,0,0,0,32,32,114,5,0,0,0,114,
-    56,0,0,0,122,19,77,111,100,117,108,101,83,112,101,99,
-    46,95,95,114,101,112,114,95,95,114,1,0,0,115,20,0,
-    0,0,10,1,10,1,4,255,10,2,18,1,10,1,6,1,
-    8,1,4,255,22,2,115,24,0,0,0,10,1,12,1,2,
-    255,8,2,20,1,8,1,2,2,2,255,2,1,2,255,12,
-    1,22,1,115,102,0,0,0,17,28,17,46,36,40,36,45,
-    17,46,17,30,17,50,38,42,38,49,17,50,16,51,9,13,
-    12,16,12,23,31,35,12,35,9,59,13,17,13,59,25,38,
-    25,58,46,50,46,57,25,58,13,59,13,59,12,16,12,43,
-    51,55,12,55,9,66,13,17,13,66,25,56,25,65,33,37,
-    33,64,25,65,13,66,13,66,16,24,16,73,32,36,32,46,
-    32,55,57,61,57,72,67,71,57,72,16,73,9,73,114,17,
-    0,0,0,99,2,0,0,0,0,0,0,0,0,0,0,0,
-    8,0,0,0,3,0,0,0,115,104,0,0,0,124,0,106,
-    0,125,2,9,0,124,0,106,1,124,1,106,1,107,2,111,
-    38,124,0,106,2,124,1,106,2,107,2,111,38,124,0,106,
-    3,124,1,106,3,107,2,111,38,124,2,124,1,106,0,107,
-    2,111,38,124,0,106,4,124,1,106,4,107,2,111,38,124,
-    0,106,5,124,1,106,5,107,2,83,0,35,0,4,0,116,
-    6,121,51,1,0,1,0,1,0,116,7,6,0,89,0,83,
-    0,37,0,119,0,114,0,0,0,0,41,8,114,137,0,0,
-    0,114,20,0,0,0,114,130,0,0,0,114,134,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,2,0,0,0,218,14,78,111,116,
-    73,109,112,108,101,109,101,110,116,101,100,41,3,114,35,0,
-    0,0,90,5,111,116,104,101,114,90,4,115,109,115,108,115,
-    3,0,0,0,32,32,32,114,5,0,0,0,218,6,95,95,
-    101,113,95,95,122,17,77,111,100,117,108,101,83,112,101,99,
-    46,95,95,101,113,95,95,124,1,0,0,115,36,0,0,0,
-    6,1,2,1,12,1,10,1,2,255,10,2,2,254,8,3,
-    2,253,10,4,2,252,10,5,2,251,2,128,12,6,8,1,
-    2,128,2,255,115,36,0,0,0,6,1,2,9,10,249,2,
-    5,10,252,2,4,10,253,2,3,8,254,2,2,10,255,14,
-    1,2,128,2,2,2,255,16,1,2,128,2,0,115,104,0,
-    0,0,16,20,16,47,9,13,9,34,21,25,21,30,34,39,
-    34,44,21,44,21,60,21,25,21,32,36,41,36,48,21,48,
-    21,60,21,25,21,32,36,41,36,48,21,48,21,60,21,25,
-    29,34,29,61,21,61,21,60,21,25,21,32,36,41,36,48,
-    21,48,21,60,21,25,21,38,42,47,42,60,21,60,13,61,
-    0,0,9,34,16,30,9,34,9,34,9,34,9,34,20,34,
-    13,34,13,34,13,34,0,0,9,34,115,12,0,0,0,132,
-    34,39,0,167,9,50,7,179,1,50,7,99,1,0,0,0,
-    0,0,0,0,0,0,0,0,3,0,0,0,3,0,0,0,
-    115,58,0,0,0,124,0,106,0,100,0,117,0,114,26,124,
-    0,106,1,100,0,117,1,114,26,124,0,106,2,114,26,116,
-    3,100,0,117,0,114,19,116,4,130,1,116,3,160,5,124,
-    0,106,1,161,1,124,0,95,0,124,0,106,0,83,0,114,
-    0,0,0,0,41,6,114,140,0,0,0,114,134,0,0,0,
-    114,139,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,114,55,0,0,
-    0,115,1,0,0,0,32,114,5,0,0,0,114,145,0,0,
-    0,122,17,77,111,100,117,108,101,83,112,101,99,46,99,97,
-    99,104,101,100,136,1,0,0,115,12,0,0,0,10,2,16,
-    1,8,1,4,1,14,1,6,1,115,20,0,0,0,8,2,
-    2,4,8,253,2,3,4,253,2,3,6,254,6,1,14,1,
-    6,1,115,58,0,0,0,12,16,12,24,28,32,12,32,9,
-    76,16,20,16,27,35,39,16,39,13,76,44,48,44,62,13,
-    76,20,39,43,47,20,47,17,46,27,46,21,46,32,51,32,
-    76,64,68,64,75,32,76,17,21,17,29,16,20,16,28,9,
-    28,114,17,0,0,0,99,2,0,0,0,0,0,0,0,0,
-    0,0,0,2,0,0,0,3,0,0,0,115,10,0,0,0,
-    124,1,124,0,95,0,100,0,83,0,114,0,0,0,0,41,
-    1,114,140,0,0,0,41,2,114,35,0,0,0,114,145,0,
-    0,0,115,2,0,0,0,32,32,114,5,0,0,0,114,145,
-    0,0,0,122,17,77,111,100,117,108,101,83,112,101,99,46,
-    99,97,99,104,101,100,145,1,0,0,243,2,0,0,0,10,
-    2,114,151,0,0,0,115,10,0,0,0,24,30,9,13,9,
-    21,9,21,9,21,114,17,0,0,0,99,1,0,0,0,0,
-    0,0,0,0,0,0,0,3,0,0,0,3,0,0,0,115,
-    32,0,0,0,124,0,106,0,100,1,117,0,114,13,124,0,
-    106,1,160,2,100,2,161,1,100,3,25,0,83,0,124,0,
-    106,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,27,0,0,
-    0,41,3,114,137,0,0,0,114,20,0,0,0,218,10,114,
-    112,97,114,116,105,116,105,111,110,114,55,0,0,0,115,1,
-    0,0,0,32,114,5,0,0,0,218,6,112,97,114,101,110,
-    116,122,17,77,111,100,117,108,101,83,112,101,99,46,112,97,
-    114,101,110,116,149,1,0,0,115,6,0,0,0,10,3,16,
-    1,6,2,115,8,0,0,0,8,3,2,3,16,254,6,2,
-    115,32,0,0,0,12,16,12,43,47,51,12,51,9,29,20,
-    24,20,29,20,45,41,44,20,45,46,47,20,48,13,48,20,
-    24,20,29,13,29,114,17,0,0,0,99,1,0,0,0,0,
-    0,0,0,0,0,0,0,1,0,0,0,3,0,0,0,115,
-    6,0,0,0,124,0,106,0,83,0,114,0,0,0,0,41,
-    1,114,139,0,0,0,114,55,0,0,0,115,1,0,0,0,
-    32,114,5,0,0,0,114,146,0,0,0,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,157,1,0,0,243,2,0,0,0,6,2,114,
-    155,0,0,0,115,6,0,0,0,16,20,16,34,9,34,114,
-    17,0,0,0,99,2,0,0,0,0,0,0,0,0,0,0,
-    0,2,0,0,0,3,0,0,0,115,14,0,0,0,116,0,
-    124,1,131,1,124,0,95,1,100,0,83,0,114,0,0,0,
-    0,41,2,218,4,98,111,111,108,114,139,0,0,0,41,2,
-    114,35,0,0,0,218,5,118,97,108,117,101,115,2,0,0,
-    0,32,32,114,5,0,0,0,114,146,0,0,0,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,161,1,0,0,243,2,0,0,0,14,
-    2,114,158,0,0,0,115,14,0,0,0,30,34,35,40,30,
-    41,9,13,9,27,9,27,9,27,114,17,0,0,0,41,12,
-    114,8,0,0,0,114,7,0,0,0,114,1,0,0,0,114,
-    9,0,0,0,114,36,0,0,0,114,56,0,0,0,114,148,
-    0,0,0,218,8,112,114,111,112,101,114,116,121,114,145,0,
-    0,0,218,6,115,101,116,116,101,114,114,154,0,0,0,114,
-    146,0,0,0,114,24,0,0,0,114,17,0,0,0,114,5,
-    0,0,0,114,133,0,0,0,114,133,0,0,0,64,1,0,
-    0,115,34,0,0,0,8,0,4,1,4,36,2,1,10,255,
-    6,13,6,10,2,12,8,1,4,8,8,1,2,3,8,1,
-    2,7,8,1,4,3,12,1,115,52,0,0,0,0,129,0,
-    129,8,190,0,127,0,127,2,101,0,129,0,129,2,155,0,
-    127,0,127,4,103,2,1,10,10,6,10,6,12,2,2,8,
-    7,4,2,8,2,2,2,8,6,2,2,8,2,4,2,12,
-    2,115,98,0,0,0,1,1,1,1,1,1,1,1,5,8,
-    1,1,48,52,67,71,29,33,5,28,5,28,5,28,5,28,
-    5,28,5,73,5,73,5,73,5,34,5,34,5,34,6,14,
-    5,28,5,28,5,28,5,28,6,12,6,19,5,30,5,30,
-    5,30,5,30,6,14,5,29,5,29,5,29,5,29,6,14,
-    5,34,5,34,5,34,5,34,6,18,6,25,5,41,5,41,
-    5,41,5,41,5,41,5,41,114,17,0,0,0,114,133,0,
-    0,0,169,2,114,134,0,0,0,114,136,0,0,0,99,2,
-    0,0,0,0,0,0,0,2,0,0,0,8,0,0,0,3,
-    0,0,0,115,152,0,0,0,116,0,124,1,100,1,131,2,
-    114,37,116,1,100,2,117,0,114,11,116,2,130,1,116,1,
-    106,3,125,4,124,3,100,2,117,0,114,24,124,4,124,0,
-    124,1,100,3,141,2,83,0,124,3,114,28,103,0,110,1,
-    100,2,125,5,124,4,124,0,124,1,124,5,100,4,141,3,
-    83,0,124,3,100,2,117,0,114,67,116,0,124,1,100,5,
-    131,2,114,65,9,0,124,1,160,4,124,0,161,1,125,3,
-    110,14,35,0,4,0,116,5,121,75,1,0,1,0,1,0,
-    100,2,125,3,89,0,110,3,37,0,100,6,125,3,116,6,
-    124,0,124,1,124,2,124,3,100,7,141,4,83,0,119,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,130,0,0,0,41,
-    2,114,130,0,0,0,114,137,0,0,0,114,136,0,0,0,
-    70,114,161,0,0,0,41,7,114,10,0,0,0,114,149,0,
-    0,0,114,150,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,136,0,0,0,114,94,0,0,0,114,133,0,0,0,41,
-    6,114,20,0,0,0,114,130,0,0,0,114,134,0,0,0,
-    114,136,0,0,0,114,162,0,0,0,90,6,115,101,97,114,
-    99,104,115,6,0,0,0,32,32,32,32,32,32,114,5,0,
-    0,0,114,112,0,0,0,114,112,0,0,0,166,1,0,0,
-    115,42,0,0,0,10,2,8,1,4,1,6,1,8,2,12,
-    1,12,1,6,1,2,1,6,255,8,3,10,1,2,1,12,
-    1,2,128,12,1,8,1,2,128,4,3,16,2,2,250,115,
-    48,0,0,0,8,2,2,9,6,248,6,1,6,1,6,2,
-    14,1,12,1,6,1,8,1,6,2,2,8,8,249,2,7,
-    2,253,12,254,2,128,2,2,2,255,16,1,2,128,4,3,
-    16,2,2,251,115,152,0,0,0,8,15,16,22,24,38,8,
-    39,5,74,12,31,35,39,12,39,9,38,19,38,13,38,35,
-    54,35,78,9,32,12,22,26,30,12,30,9,64,20,43,44,
-    48,57,63,20,64,20,64,13,64,24,34,18,44,18,20,18,
-    20,40,44,9,15,16,39,40,44,53,59,67,73,16,74,16,
-    74,9,74,8,18,22,26,8,26,5,31,12,19,20,26,28,
-    40,12,41,9,31,13,34,30,36,30,53,48,52,30,53,17,
-    27,17,27,0,0,13,34,20,31,13,34,13,34,13,34,13,
-    34,30,34,17,27,17,27,17,27,0,0,26,31,13,23,12,
-    22,23,27,29,35,44,50,63,73,12,74,12,74,5,74,13,
-    34,115,15,0,0,0,175,5,53,0,181,9,65,0,7,193,
-    11,1,65,0,7,99,3,0,0,0,0,0,0,0,0,0,
-    0,0,8,0,0,0,3,0,0,0,115,50,1,0,0,9,
-    0,124,0,106,0,125,3,110,10,35,0,4,0,116,1,121,
-    152,1,0,1,0,1,0,89,0,110,7,37,0,124,3,100,
-    0,117,1,114,21,124,3,83,0,124,0,106,2,125,4,124,
-    1,100,0,117,0,114,43,9,0,124,0,106,3,125,1,110,
-    10,35,0,4,0,116,1,121,151,1,0,1,0,1,0,89,
-    0,110,1,37,0,9,0,124,0,106,4,125,5,110,12,35,
-    0,4,0,116,1,121,150,1,0,1,0,1,0,100,0,125,
-    5,89,0,110,1,37,0,124,2,100,0,117,0,114,87,124,
-    5,100,0,117,0,114,85,9,0,124,1,106,5,125,2,110,
-    14,35,0,4,0,116,1,121,149,1,0,1,0,1,0,100,
-    0,125,2,89,0,110,3,37,0,124,5,125,2,9,0,124,
-    0,106,6,125,6,110,12,35,0,4,0,116,1,121,148,1,
-    0,1,0,1,0,100,0,125,6,89,0,110,1,37,0,9,
-    0,116,7,124,0,106,8,131,1,125,7,110,12,35,0,4,
-    0,116,1,121,147,1,0,1,0,1,0,100,0,125,7,89,
-    0,110,1,37,0,116,9,124,4,124,1,124,2,100,1,141,
-    3,125,3,124,5,100,0,117,0,114,136,100,2,110,1,100,
-    3,124,3,95,10,124,6,124,3,95,11,124,7,124,3,95,
-    12,124,3,83,0,119,0,119,0,119,0,119,0,119,0,119,
-    0,41,4,78,169,1,114,134,0,0,0,70,84,41,13,114,
-    121,0,0,0,114,2,0,0,0,114,8,0,0,0,114,120,
-    0,0,0,114,129,0,0,0,218,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,133,0,
-    0,0,114,139,0,0,0,114,145,0,0,0,114,137,0,0,
-    0,41,8,114,118,0,0,0,114,130,0,0,0,114,134,0,
-    0,0,114,117,0,0,0,114,20,0,0,0,90,8,108,111,
-    99,97,116,105,111,110,114,145,0,0,0,114,137,0,0,0,
-    115,8,0,0,0,32,32,32,32,32,32,32,32,114,5,0,
-    0,0,218,17,95,115,112,101,99,95,102,114,111,109,95,109,
-    111,100,117,108,101,114,168,0,0,0,192,1,0,0,115,108,
-    0,0,0,2,2,8,1,2,128,12,1,4,1,2,128,8,
-    2,4,1,6,2,8,1,2,1,8,1,2,128,12,1,4,
-    2,2,128,2,1,8,1,2,128,12,1,8,1,2,128,8,
-    1,8,1,2,1,8,1,2,128,12,1,8,1,2,128,4,
-    2,2,1,8,1,2,128,12,1,8,1,2,128,2,1,12,
-    1,2,128,12,1,8,1,2,128,14,2,18,1,6,1,6,
-    1,4,1,2,249,2,252,2,250,2,250,2,251,2,246,115,
-    124,0,0,0,2,8,8,251,2,128,2,2,2,255,12,1,
-    2,128,6,2,6,1,6,2,6,1,4,5,8,253,2,128,
-    2,3,2,254,12,2,2,128,2,4,8,254,2,128,2,2,
-    2,255,16,1,2,128,6,1,2,7,6,250,2,6,2,254,
-    8,254,2,128,2,2,2,255,16,1,2,128,4,2,2,4,
-    8,254,2,128,2,2,2,255,16,1,2,128,2,4,12,254,
-    2,128,2,2,2,255,16,1,2,128,14,2,18,1,6,1,
-    6,1,4,1,2,250,2,252,2,250,2,250,2,252,2,245,
-    115,50,1,0,0,5,24,16,22,16,31,9,13,9,13,0,
-    0,5,13,12,26,5,13,5,13,5,13,5,13,9,13,9,
-    13,0,0,12,16,24,28,12,28,9,24,20,24,13,24,12,
-    18,12,27,5,9,8,14,18,22,8,22,5,17,9,17,22,
-    28,22,39,13,19,13,19,0,0,9,17,16,30,9,17,9,
-    17,9,17,9,17,13,17,13,17,0,0,5,24,20,26,20,
-    35,9,17,9,17,0,0,5,24,12,26,5,24,5,24,5,
-    24,5,24,20,24,9,17,9,17,9,17,0,0,8,14,18,
-    22,8,22,5,30,12,20,24,28,12,28,9,30,13,30,26,
-    32,26,40,17,23,17,23,0,0,13,30,20,34,13,30,13,
-    30,13,30,13,30,26,30,17,23,17,23,17,23,0,0,22,
-    30,13,19,5,22,18,24,18,35,9,15,9,15,0,0,5,
-    22,12,26,5,22,5,22,5,22,5,22,18,22,9,15,9,
-    15,9,15,0,0,5,42,38,42,43,49,43,58,38,59,9,
-    35,9,35,0,0,5,42,12,26,5,42,5,42,5,42,5,
-    42,38,42,9,35,9,35,9,35,0,0,12,22,23,27,29,
-    35,44,50,12,51,12,51,5,9,35,43,47,51,35,51,26,
-    61,26,31,26,31,57,61,5,9,5,23,19,25,5,9,5,
-    16,39,65,5,9,5,36,12,16,5,16,5,42,5,22,13,
-    30,5,24,9,17,5,13,115,93,0,0,0,129,3,5,0,
-    133,7,14,7,157,3,33,0,161,7,42,7,172,3,48,0,
-    176,9,59,7,193,5,3,65,9,0,193,9,9,65,20,7,
-    193,24,3,65,28,0,193,28,9,65,39,7,193,41,5,65,
-    47,0,193,47,9,65,58,7,194,19,1,65,58,7,194,20,
-    1,65,39,7,194,21,1,65,20,7,194,22,1,59,7,194,
-    23,1,42,7,194,24,1,14,7,70,169,1,218,8,111,118,
-    101,114,114,105,100,101,99,2,0,0,0,0,0,0,0,1,
-    0,0,0,8,0,0,0,3,0,0,0,115,204,1,0,0,
-    124,2,115,10,116,0,124,1,100,1,100,0,131,3,100,0,
-    117,0,114,26,9,0,124,0,106,1,124,1,95,2,110,10,
-    35,0,4,0,116,3,121,229,1,0,1,0,1,0,89,0,
-    110,1,37,0,124,2,115,36,116,0,124,1,100,2,100,0,
-    131,3,100,0,117,0,114,87,124,0,106,4,125,3,124,3,
-    100,0,117,0,114,72,124,0,106,5,100,0,117,1,114,72,
-    116,6,100,0,117,0,114,54,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,124,3,124,0,95,4,100,0,124,1,95,11,
-    9,0,124,3,124,1,95,12,110,10,35,0,4,0,116,3,
-    121,228,1,0,1,0,1,0,89,0,110,1,37,0,124,2,
-    115,97,116,0,124,1,100,3,100,0,131,3,100,0,117,0,
-    114,113,9,0,124,0,106,13,124,1,95,14,110,10,35,0,
-    4,0,116,3,121,227,1,0,1,0,1,0,89,0,110,1,
-    37,0,9,0,124,0,124,1,95,15,110,10,35,0,4,0,
-    116,3,121,226,1,0,1,0,1,0,89,0,110,1,37,0,
-    124,2,115,138,116,0,124,1,100,4,100,0,131,3,100,0,
-    117,0,114,159,124,0,106,5,100,0,117,1,114,159,9,0,
-    124,0,106,5,124,1,95,16,110,10,35,0,4,0,116,3,
-    121,225,1,0,1,0,1,0,89,0,110,1,37,0,124,0,
-    106,17,114,221,124,2,115,172,116,0,124,1,100,5,100,0,
-    131,3,100,0,117,0,114,188,9,0,124,0,106,18,124,1,
-    95,11,110,10,35,0,4,0,116,3,121,224,1,0,1,0,
-    1,0,89,0,110,1,37,0,124,2,115,198,116,0,124,1,
-    100,6,100,0,131,3,100,0,117,0,114,221,124,0,106,19,
-    100,0,117,1,114,221,9,0,124,0,106,19,124,1,95,20,
-    124,1,83,0,35,0,4,0,116,3,121,223,1,0,1,0,
-    1,0,89,0,124,1,83,0,37,0,124,1,83,0,119,0,
-    119,0,119,0,119,0,119,0,119,0,119,0,41,7,78,114,
-    8,0,0,0,114,120,0,0,0,218,11,95,95,112,97,99,
-    107,97,103,101,95,95,114,167,0,0,0,114,129,0,0,0,
-    114,165,0,0,0,41,21,114,12,0,0,0,114,20,0,0,
-    0,114,8,0,0,0,114,2,0,0,0,114,130,0,0,0,
-    114,137,0,0,0,114,149,0,0,0,114,150,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,129,0,0,0,114,120,0,0,0,114,154,0,0,0,
-    114,171,0,0,0,114,121,0,0,0,114,167,0,0,0,114,
-    146,0,0,0,114,134,0,0,0,114,145,0,0,0,114,165,
-    0,0,0,41,5,114,117,0,0,0,114,118,0,0,0,114,
-    170,0,0,0,114,130,0,0,0,114,172,0,0,0,115,5,
-    0,0,0,32,32,32,32,32,114,5,0,0,0,218,18,95,
-    105,110,105,116,95,109,111,100,117,108,101,95,97,116,116,114,
-    115,114,174,0,0,0,237,1,0,0,115,142,0,0,0,20,
-    4,2,1,10,1,2,128,12,1,4,1,2,128,20,2,6,
-    1,8,1,10,2,8,1,4,1,6,1,10,2,8,1,6,
-    1,6,11,2,1,8,1,2,128,12,1,4,1,2,128,20,
-    2,2,1,10,1,2,128,12,1,4,1,2,128,2,2,8,
-    1,2,128,12,1,4,1,2,128,20,2,10,1,2,1,10,
-    1,2,128,12,1,4,1,2,128,6,2,20,1,2,1,10,
-    1,2,128,12,1,4,1,2,128,20,2,10,1,2,1,8,
-    1,4,3,2,128,12,254,2,1,4,1,2,128,4,0,2,
-    254,2,249,2,249,2,249,2,251,2,250,2,228,115,192,0,
-    0,0,2,4,2,4,14,252,4,4,10,254,2,128,2,2,
-    2,255,12,1,2,128,2,2,2,26,14,230,2,26,6,231,
-    6,1,2,20,8,238,2,18,6,239,6,1,6,1,10,2,
-    8,1,6,1,6,11,2,4,8,254,2,128,2,2,2,255,
-    12,1,2,128,2,2,2,4,14,252,4,4,10,254,2,128,
-    2,2,2,255,12,1,2,128,2,5,8,254,2,128,2,2,
-    2,255,12,1,2,128,2,2,2,5,14,251,2,5,8,252,
-    4,4,10,254,2,128,2,2,2,255,12,1,2,128,4,2,
-    2,12,2,245,2,4,14,252,4,4,10,254,2,128,2,2,
-    2,255,12,1,2,128,2,2,2,5,14,251,2,5,8,252,
-    4,4,8,254,4,3,2,128,2,255,2,255,10,1,4,1,
-    2,128,4,0,2,255,2,249,2,249,2,249,2,251,2,250,
-    2,228,115,204,1,0,0,9,17,5,17,21,28,29,35,37,
-    47,49,53,21,54,58,62,21,62,5,17,9,17,31,35,31,
-    40,13,19,13,28,13,28,0,0,9,17,16,30,9,17,9,
-    17,9,17,9,17,13,17,13,17,0,0,8,16,5,17,20,
-    27,28,34,36,48,50,54,20,55,59,63,20,63,5,17,18,
-    22,18,29,9,15,12,18,22,26,12,26,9,39,16,20,16,
-    47,55,59,16,59,13,39,20,39,43,47,20,47,17,46,27,
-    46,21,46,36,55,36,72,17,33,26,42,26,68,51,67,26,
-    68,17,23,32,36,32,63,17,23,17,29,31,37,17,21,17,
-    28,35,39,17,23,17,32,9,17,33,39,13,19,13,30,13,
-    30,0,0,9,17,16,30,9,17,9,17,9,17,9,17,13,
-    17,13,17,0,0,8,16,5,17,20,27,28,34,36,49,51,
+    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,53,0,0,0,
+    114,20,0,0,0,114,130,0,0,0,114,134,0,0,0,218,
+    6,97,112,112,101,110,100,114,137,0,0,0,218,9,95,95,
+    99,108,97,115,115,95,95,114,8,0,0,0,218,4,106,111,
+    105,110,41,2,114,35,0,0,0,114,67,0,0,0,115,2,
+    0,0,0,32,32,114,5,0,0,0,114,56,0,0,0,122,
+    19,77,111,100,117,108,101,83,112,101,99,46,95,95,114,101,
+    112,114,95,95,114,1,0,0,115,20,0,0,0,10,1,10,
+    1,4,255,10,2,18,1,10,1,6,1,8,1,4,255,22,
+    2,115,24,0,0,0,10,1,12,1,2,255,8,2,20,1,
+    8,1,2,2,2,255,2,1,2,255,12,1,22,1,115,102,
+    0,0,0,17,28,17,46,36,40,36,45,17,46,17,30,17,
+    50,38,42,38,49,17,50,16,51,9,13,12,16,12,23,31,
+    35,12,35,9,59,13,17,13,59,25,38,25,58,46,50,46,
+    57,25,58,13,59,13,59,12,16,12,43,51,55,12,55,9,
+    66,13,17,13,66,25,56,25,65,33,37,33,64,25,65,13,
+    66,13,66,16,24,16,73,32,36,32,46,32,55,57,61,57,
+    72,67,71,57,72,16,73,9,73,114,17,0,0,0,99,2,
+    0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,3,
+    0,0,0,115,104,0,0,0,124,0,106,0,125,2,9,0,
+    124,0,106,1,124,1,106,1,107,2,111,38,124,0,106,2,
+    124,1,106,2,107,2,111,38,124,0,106,3,124,1,106,3,
+    107,2,111,38,124,2,124,1,106,0,107,2,111,38,124,0,
+    106,4,124,1,106,4,107,2,111,38,124,0,106,5,124,1,
+    106,5,107,2,83,0,35,0,4,0,116,6,121,50,1,0,
+    1,0,1,0,116,7,6,0,89,0,83,0,119,0,37,0,
+    114,0,0,0,0,41,8,114,137,0,0,0,114,20,0,0,
+    0,114,130,0,0,0,114,134,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,2,0,0,0,218,14,78,111,116,73,109,112,108,101,
+    109,101,110,116,101,100,41,3,114,35,0,0,0,90,5,111,
+    116,104,101,114,90,4,115,109,115,108,115,3,0,0,0,32,
+    32,32,114,5,0,0,0,218,6,95,95,101,113,95,95,122,
+    17,77,111,100,117,108,101,83,112,101,99,46,95,95,101,113,
+    95,95,124,1,0,0,115,36,0,0,0,6,1,2,1,12,
+    1,10,1,2,255,10,2,2,254,8,3,2,253,10,4,2,
+    252,10,5,2,251,2,128,12,6,8,1,2,255,2,128,115,
+    34,0,0,0,6,1,2,9,10,249,2,5,10,252,2,4,
+    10,253,2,3,8,254,2,2,10,255,14,1,2,128,2,2,
+    2,255,18,1,2,128,115,104,0,0,0,16,20,16,47,9,
+    13,9,34,21,25,21,30,34,39,34,44,21,44,21,60,21,
+    25,21,32,36,41,36,48,21,48,21,60,21,25,21,32,36,
+    41,36,48,21,48,21,60,21,25,29,34,29,61,21,61,21,
+    60,21,25,21,32,36,41,36,48,21,48,21,60,21,25,21,
+    38,42,47,42,60,21,60,13,61,0,0,9,34,16,30,9,
+    34,9,34,9,34,9,34,20,34,13,34,13,34,13,34,9,
+    34,0,0,115,12,0,0,0,132,34,39,0,167,9,51,7,
+    178,1,51,7,99,1,0,0,0,0,0,0,0,0,0,0,
+    0,3,0,0,0,3,0,0,0,115,58,0,0,0,124,0,
+    106,0,100,0,117,0,114,26,124,0,106,1,100,0,117,1,
+    114,26,124,0,106,2,114,26,116,3,100,0,117,0,114,19,
+    116,4,130,1,116,3,160,5,124,0,106,1,161,1,124,0,
+    95,0,124,0,106,0,83,0,114,0,0,0,0,41,6,114,
+    140,0,0,0,114,134,0,0,0,114,139,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,114,55,0,0,0,115,1,0,0,0,32,
+    114,5,0,0,0,114,145,0,0,0,122,17,77,111,100,117,
+    108,101,83,112,101,99,46,99,97,99,104,101,100,136,1,0,
+    0,115,12,0,0,0,10,2,16,1,8,1,4,1,14,1,
+    6,1,115,20,0,0,0,8,2,2,4,8,253,2,3,4,
+    253,2,3,6,254,6,1,14,1,6,1,115,58,0,0,0,
+    12,16,12,24,28,32,12,32,9,76,16,20,16,27,35,39,
+    16,39,13,76,44,48,44,62,13,76,20,39,43,47,20,47,
+    17,46,27,46,21,46,32,51,32,76,64,68,64,75,32,76,
+    17,21,17,29,16,20,16,28,9,28,114,17,0,0,0,99,
+    2,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,
+    3,0,0,0,115,10,0,0,0,124,1,124,0,95,0,100,
+    0,83,0,114,0,0,0,0,41,1,114,140,0,0,0,41,
+    2,114,35,0,0,0,114,145,0,0,0,115,2,0,0,0,
+    32,32,114,5,0,0,0,114,145,0,0,0,122,17,77,111,
+    100,117,108,101,83,112,101,99,46,99,97,99,104,101,100,145,
+    1,0,0,243,2,0,0,0,10,2,114,151,0,0,0,115,
+    10,0,0,0,24,30,9,13,9,21,9,21,9,21,114,17,
+    0,0,0,99,1,0,0,0,0,0,0,0,0,0,0,0,
+    3,0,0,0,3,0,0,0,115,32,0,0,0,124,0,106,
+    0,100,1,117,0,114,13,124,0,106,1,160,2,100,2,161,
+    1,100,3,25,0,83,0,124,0,106,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,27,0,0,0,41,3,114,137,0,0,
+    0,114,20,0,0,0,218,10,114,112,97,114,116,105,116,105,
+    111,110,114,55,0,0,0,115,1,0,0,0,32,114,5,0,
+    0,0,218,6,112,97,114,101,110,116,122,17,77,111,100,117,
+    108,101,83,112,101,99,46,112,97,114,101,110,116,149,1,0,
+    0,115,6,0,0,0,10,3,16,1,6,2,115,8,0,0,
+    0,8,3,2,3,16,254,6,2,115,32,0,0,0,12,16,
+    12,43,47,51,12,51,9,29,20,24,20,29,20,45,41,44,
+    20,45,46,47,20,48,13,48,20,24,20,29,13,29,114,17,
+    0,0,0,99,1,0,0,0,0,0,0,0,0,0,0,0,
+    1,0,0,0,3,0,0,0,115,6,0,0,0,124,0,106,
+    0,83,0,114,0,0,0,0,41,1,114,139,0,0,0,114,
+    55,0,0,0,115,1,0,0,0,32,114,5,0,0,0,114,
+    146,0,0,0,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,157,1,0,
+    0,243,2,0,0,0,6,2,114,155,0,0,0,115,6,0,
+    0,0,16,20,16,34,9,34,114,17,0,0,0,99,2,0,
+    0,0,0,0,0,0,0,0,0,0,2,0,0,0,3,0,
+    0,0,115,14,0,0,0,116,0,124,1,131,1,124,0,95,
+    1,100,0,83,0,114,0,0,0,0,41,2,218,4,98,111,
+    111,108,114,139,0,0,0,41,2,114,35,0,0,0,218,5,
+    118,97,108,117,101,115,2,0,0,0,32,32,114,5,0,0,
+    0,114,146,0,0,0,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,161,
+    1,0,0,243,2,0,0,0,14,2,114,158,0,0,0,115,
+    14,0,0,0,30,34,35,40,30,41,9,13,9,27,9,27,
+    9,27,114,17,0,0,0,41,12,114,8,0,0,0,114,7,
+    0,0,0,114,1,0,0,0,114,9,0,0,0,114,36,0,
+    0,0,114,56,0,0,0,114,148,0,0,0,218,8,112,114,
+    111,112,101,114,116,121,114,145,0,0,0,218,6,115,101,116,
+    116,101,114,114,154,0,0,0,114,146,0,0,0,114,24,0,
+    0,0,114,17,0,0,0,114,5,0,0,0,114,133,0,0,
+    0,114,133,0,0,0,64,1,0,0,115,34,0,0,0,8,
+    0,4,1,4,36,2,1,10,255,6,13,6,10,2,12,8,
+    1,4,8,8,1,2,3,8,1,2,7,8,1,4,3,12,
+    1,115,52,0,0,0,0,129,0,129,8,190,0,127,0,127,
+    2,101,0,129,0,129,2,155,0,127,0,127,4,103,2,1,
+    10,10,6,10,6,12,2,2,8,7,4,2,8,2,2,2,
+    8,6,2,2,8,2,4,2,12,2,115,98,0,0,0,1,
+    1,1,1,1,1,1,1,5,8,1,1,48,52,67,71,29,
+    33,5,28,5,28,5,28,5,28,5,28,5,73,5,73,5,
+    73,5,34,5,34,5,34,6,14,5,28,5,28,5,28,5,
+    28,6,12,6,19,5,30,5,30,5,30,5,30,6,14,5,
+    29,5,29,5,29,5,29,6,14,5,34,5,34,5,34,5,
+    34,6,18,6,25,5,41,5,41,5,41,5,41,5,41,5,
+    41,114,17,0,0,0,114,133,0,0,0,169,2,114,134,0,
+    0,0,114,136,0,0,0,99,2,0,0,0,0,0,0,0,
+    2,0,0,0,8,0,0,0,3,0,0,0,115,152,0,0,
+    0,116,0,124,1,100,1,131,2,114,37,116,1,100,2,117,
+    0,114,11,116,2,130,1,116,1,106,3,125,4,124,3,100,
+    2,117,0,114,24,124,4,124,0,124,1,100,3,141,2,83,
+    0,124,3,114,28,103,0,110,1,100,2,125,5,124,4,124,
+    0,124,1,124,5,100,4,141,3,83,0,124,3,100,2,117,
+    0,114,68,116,0,124,1,100,5,131,2,114,66,9,0,124,
+    1,160,4,124,0,161,1,125,3,110,15,35,0,4,0,116,
+    5,121,64,1,0,1,0,1,0,100,2,125,3,89,0,110,
+    4,119,0,37,0,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,130,0,0,0,41,2,114,130,0,0,0,114,
+    137,0,0,0,114,136,0,0,0,70,114,161,0,0,0,41,
+    7,114,10,0,0,0,114,149,0,0,0,114,150,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,136,0,0,0,114,94,
+    0,0,0,114,133,0,0,0,41,6,114,20,0,0,0,114,
+    130,0,0,0,114,134,0,0,0,114,136,0,0,0,114,162,
+    0,0,0,90,6,115,101,97,114,99,104,115,6,0,0,0,
+    32,32,32,32,32,32,114,5,0,0,0,114,112,0,0,0,
+    114,112,0,0,0,166,1,0,0,115,42,0,0,0,10,2,
+    8,1,4,1,6,1,8,2,12,1,12,1,6,1,2,1,
+    6,255,8,3,10,1,2,1,12,1,2,128,12,1,8,1,
+    2,255,2,128,4,4,16,2,115,46,0,0,0,8,2,2,
+    9,6,248,6,1,6,1,6,2,14,1,12,1,6,1,8,
+    1,6,2,2,8,8,249,2,7,2,253,12,254,2,128,2,
+    2,2,255,18,1,2,128,4,3,16,2,115,152,0,0,0,
+    8,15,16,22,24,38,8,39,5,74,12,31,35,39,12,39,
+    9,38,19,38,13,38,35,54,35,78,9,32,12,22,26,30,
+    12,30,9,64,20,43,44,48,57,63,20,64,20,64,13,64,
+    24,34,18,44,18,20,18,20,40,44,9,15,16,39,40,44,
+    53,59,67,73,16,74,16,74,9,74,8,18,22,26,8,26,
+    5,31,12,19,20,26,28,40,12,41,9,31,13,34,30,36,
+    30,53,48,52,30,53,17,27,17,27,0,0,13,34,20,31,
+    13,34,13,34,13,34,13,34,30,34,17,27,17,27,17,27,
+    13,34,0,0,26,31,13,23,12,22,23,27,29,35,44,50,
+    63,73,12,74,12,74,5,74,115,15,0,0,0,175,5,53,
+    0,181,9,65,1,7,193,0,1,65,1,7,99,3,0,0,
+    0,0,0,0,0,0,0,0,0,8,0,0,0,3,0,0,
+    0,115,50,1,0,0,9,0,124,0,106,0,125,3,110,11,
+    35,0,4,0,116,1,121,14,1,0,1,0,1,0,89,0,
+    110,8,119,0,37,0,124,3,100,0,117,1,114,22,124,3,
+    83,0,124,0,106,2,125,4,124,1,100,0,117,0,114,45,
+    9,0,124,0,106,3,125,1,110,11,35,0,4,0,116,1,
+    121,43,1,0,1,0,1,0,89,0,110,2,119,0,37,0,
+    9,0,124,0,106,4,125,5,110,13,35,0,4,0,116,1,
+    121,61,1,0,1,0,1,0,100,0,125,5,89,0,110,2,
+    119,0,37,0,124,2,100,0,117,0,114,91,124,5,100,0,
+    117,0,114,89,9,0,124,1,106,5,125,2,110,15,35,0,
+    4,0,116,1,121,87,1,0,1,0,1,0,100,0,125,2,
+    89,0,110,4,119,0,37,0,124,5,125,2,9,0,124,0,
+    106,6,125,6,110,13,35,0,4,0,116,1,121,107,1,0,
+    1,0,1,0,100,0,125,6,89,0,110,2,119,0,37,0,
+    9,0,116,7,124,0,106,8,131,1,125,7,110,13,35,0,
+    4,0,116,1,121,127,1,0,1,0,1,0,100,0,125,7,
+    89,0,110,2,119,0,37,0,116,9,124,4,124,1,124,2,
+    100,1,141,3,125,3,124,5,100,0,117,0,114,142,100,2,
+    110,1,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,169,1,114,134,0,
+    0,0,70,84,41,13,114,121,0,0,0,114,2,0,0,0,
+    114,8,0,0,0,114,120,0,0,0,114,129,0,0,0,218,
+    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,133,0,0,0,114,139,0,0,0,114,145,
+    0,0,0,114,137,0,0,0,41,8,114,118,0,0,0,114,
+    130,0,0,0,114,134,0,0,0,114,117,0,0,0,114,20,
+    0,0,0,90,8,108,111,99,97,116,105,111,110,114,145,0,
+    0,0,114,137,0,0,0,115,8,0,0,0,32,32,32,32,
+    32,32,32,32,114,5,0,0,0,218,17,95,115,112,101,99,
+    95,102,114,111,109,95,109,111,100,117,108,101,114,168,0,0,
+    0,192,1,0,0,115,108,0,0,0,2,2,8,1,2,128,
+    12,1,4,1,2,255,2,128,8,3,4,1,6,2,8,1,
+    2,1,8,1,2,128,12,1,4,2,2,254,2,128,2,3,
+    8,1,2,128,12,1,8,1,2,255,2,128,8,2,8,1,
+    2,1,8,1,2,128,12,1,8,1,2,255,2,128,4,3,
+    2,1,8,1,2,128,12,1,8,1,2,255,2,128,2,2,
+    12,1,2,128,12,1,8,1,2,255,2,128,14,3,18,1,
+    6,1,6,1,4,1,115,112,0,0,0,2,8,8,251,2,
+    128,2,2,2,255,14,1,2,128,6,2,6,1,6,2,6,
+    1,4,5,8,253,2,128,2,3,2,254,14,2,2,128,2,
+    4,8,254,2,128,2,2,2,255,18,1,2,128,6,1,2,
+    7,6,250,2,6,2,254,8,254,2,128,2,2,2,255,18,
+    1,2,128,4,2,2,4,8,254,2,128,2,2,2,255,18,
+    1,2,128,2,4,12,254,2,128,2,2,2,255,18,1,2,
+    128,14,2,18,1,6,1,6,1,4,1,115,50,1,0,0,
+    5,24,16,22,16,31,9,13,9,13,0,0,5,13,12,26,
+    5,13,5,13,5,13,5,13,9,13,9,13,5,13,0,0,
+    12,16,24,28,12,28,9,24,20,24,13,24,12,18,12,27,
+    5,9,8,14,18,22,8,22,5,17,9,17,22,28,22,39,
+    13,19,13,19,0,0,9,17,16,30,9,17,9,17,9,17,
+    9,17,13,17,13,17,9,17,0,0,5,24,20,26,20,35,
+    9,17,9,17,0,0,5,24,12,26,5,24,5,24,5,24,
+    5,24,20,24,9,17,9,17,9,17,5,24,0,0,8,14,
+    18,22,8,22,5,30,12,20,24,28,12,28,9,30,13,30,
+    26,32,26,40,17,23,17,23,0,0,13,30,20,34,13,30,
+    13,30,13,30,13,30,26,30,17,23,17,23,17,23,13,30,
+    0,0,22,30,13,19,5,22,18,24,18,35,9,15,9,15,
+    0,0,5,22,12,26,5,22,5,22,5,22,5,22,18,22,
+    9,15,9,15,9,15,5,22,0,0,5,42,38,42,43,49,
+    43,58,38,59,9,35,9,35,0,0,5,42,12,26,5,42,
+    5,42,5,42,5,42,38,42,9,35,9,35,9,35,5,42,
+    0,0,12,22,23,27,29,35,44,50,12,51,12,51,5,9,
+    35,43,47,51,35,51,26,61,26,31,26,31,57,61,5,9,
+    5,23,19,25,5,9,5,16,39,65,5,9,5,36,12,16,
+    5,16,115,90,0,0,0,129,3,5,0,133,7,15,7,142,
+    1,15,7,158,3,34,0,162,7,44,7,171,1,44,7,174,
+    3,50,0,178,9,62,7,189,1,62,7,193,8,3,65,12,
+    0,193,12,9,65,24,7,193,23,1,65,24,7,193,28,3,
+    65,32,0,193,32,9,65,44,7,193,43,1,65,44,7,193,
+    46,5,65,52,0,193,52,9,66,0,7,193,63,1,66,0,
+    7,70,169,1,218,8,111,118,101,114,114,105,100,101,99,2,
+    0,0,0,0,0,0,0,1,0,0,0,8,0,0,0,3,
+    0,0,0,115,204,1,0,0,124,2,115,10,116,0,124,1,
+    100,1,100,0,131,3,100,0,117,0,114,27,9,0,124,0,
+    106,1,124,1,95,2,110,11,35,0,4,0,116,3,121,25,
+    1,0,1,0,1,0,89,0,110,2,119,0,37,0,124,2,
+    115,37,116,0,124,1,100,2,100,0,131,3,100,0,117,0,
+    114,89,124,0,106,4,125,3,124,3,100,0,117,0,114,73,
+    124,0,106,5,100,0,117,1,114,73,116,6,100,0,117,0,
+    114,55,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,124,3,
+    124,0,95,4,100,0,124,1,95,11,9,0,124,3,124,1,
+    95,12,110,11,35,0,4,0,116,3,121,87,1,0,1,0,
+    1,0,89,0,110,2,119,0,37,0,124,2,115,99,116,0,
+    124,1,100,3,100,0,131,3,100,0,117,0,114,116,9,0,
+    124,0,106,13,124,1,95,14,110,11,35,0,4,0,116,3,
+    121,114,1,0,1,0,1,0,89,0,110,2,119,0,37,0,
+    9,0,124,0,124,1,95,15,110,11,35,0,4,0,116,3,
+    121,130,1,0,1,0,1,0,89,0,110,2,119,0,37,0,
+    124,2,115,142,116,0,124,1,100,4,100,0,131,3,100,0,
+    117,0,114,164,124,0,106,5,100,0,117,1,114,164,9,0,
+    124,0,106,5,124,1,95,16,110,11,35,0,4,0,116,3,
+    121,162,1,0,1,0,1,0,89,0,110,2,119,0,37,0,
+    124,0,106,17,114,228,124,2,115,177,116,0,124,1,100,5,
+    100,0,131,3,100,0,117,0,114,194,9,0,124,0,106,18,
+    124,1,95,11,110,11,35,0,4,0,116,3,121,192,1,0,
+    1,0,1,0,89,0,110,2,119,0,37,0,124,2,115,204,
+    116,0,124,1,100,6,100,0,131,3,100,0,117,0,114,228,
+    124,0,106,19,100,0,117,1,114,228,9,0,124,0,106,19,
+    124,1,95,20,124,1,83,0,35,0,4,0,116,3,121,226,
+    1,0,1,0,1,0,89,0,124,1,83,0,119,0,37,0,
+    124,1,83,0,41,7,78,114,8,0,0,0,114,120,0,0,
+    0,218,11,95,95,112,97,99,107,97,103,101,95,95,114,167,
+    0,0,0,114,129,0,0,0,114,165,0,0,0,41,21,114,
+    12,0,0,0,114,20,0,0,0,114,8,0,0,0,114,2,
+    0,0,0,114,130,0,0,0,114,137,0,0,0,114,149,0,
+    0,0,114,150,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,129,0,0,0,114,120,
+    0,0,0,114,154,0,0,0,114,171,0,0,0,114,121,0,
+    0,0,114,167,0,0,0,114,146,0,0,0,114,134,0,0,
+    0,114,145,0,0,0,114,165,0,0,0,41,5,114,117,0,
+    0,0,114,118,0,0,0,114,170,0,0,0,114,130,0,0,
+    0,114,172,0,0,0,115,5,0,0,0,32,32,32,32,32,
+    114,5,0,0,0,218,18,95,105,110,105,116,95,109,111,100,
+    117,108,101,95,97,116,116,114,115,114,174,0,0,0,237,1,
+    0,0,115,142,0,0,0,20,4,2,1,10,1,2,128,12,
+    1,4,1,2,255,2,128,20,3,6,1,8,1,10,2,8,
+    1,4,1,6,1,10,2,8,1,6,1,6,11,2,1,8,
+    1,2,128,12,1,4,1,2,255,2,128,20,3,2,1,10,
+    1,2,128,12,1,4,1,2,255,2,128,2,3,8,1,2,
+    128,12,1,4,1,2,255,2,128,20,3,10,1,2,1,10,
+    1,2,128,12,1,4,1,2,255,2,128,6,3,20,1,2,
+    1,10,1,2,128,12,1,4,1,2,255,2,128,20,3,10,
+    1,2,1,8,1,4,3,2,128,12,254,2,1,4,1,2,
+    254,2,128,4,2,115,180,0,0,0,2,4,2,4,14,252,
+    4,4,10,254,2,128,2,2,2,255,14,1,2,128,2,2,
+    2,26,14,230,2,26,6,231,6,1,2,20,8,238,2,18,
+    6,239,6,1,6,1,10,2,8,1,6,1,6,11,2,4,
+    8,254,2,128,2,2,2,255,14,1,2,128,2,2,2,4,
+    14,252,4,4,10,254,2,128,2,2,2,255,14,1,2,128,
+    2,5,8,254,2,128,2,2,2,255,14,1,2,128,2,2,
+    2,5,14,251,2,5,8,252,4,4,10,254,2,128,2,2,
+    2,255,14,1,2,128,4,2,2,12,2,245,2,4,14,252,
+    4,4,10,254,2,128,2,2,2,255,14,1,2,128,2,2,
+    2,5,14,251,2,5,8,252,4,4,8,254,4,3,2,128,
+    2,255,2,255,10,1,4,1,2,255,2,128,4,1,115,204,
+    1,0,0,9,17,5,17,21,28,29,35,37,47,49,53,21,
+    54,58,62,21,62,5,17,9,17,31,35,31,40,13,19,13,
+    28,13,28,0,0,9,17,16,30,9,17,9,17,9,17,9,
+    17,13,17,13,17,9,17,0,0,8,16,5,17,20,27,28,
+    34,36,48,50,54,20,55,59,63,20,63,5,17,18,22,18,
+    29,9,15,12,18,22,26,12,26,9,39,16,20,16,47,55,
+    59,16,59,13,39,20,39,43,47,20,47,17,46,27,46,21,
+    46,36,55,36,72,17,33,26,42,26,68,51,67,26,68,17,
+    23,32,36,32,63,17,23,17,29,31,37,17,21,17,28,35,
+    39,17,23,17,32,9,17,33,39,13,19,13,30,13,30,0,
+    0,9,17,16,30,9,17,9,17,9,17,9,17,13,17,13,
+    17,9,17,0,0,8,16,5,17,20,27,28,34,36,49,51,
     55,20,56,60,64,20,64,5,17,9,17,34,38,34,45,13,
     19,13,31,13,31,0,0,9,17,16,30,9,17,9,17,9,
-    17,9,17,13,17,13,17,0,0,5,13,27,31,9,15,9,
-    24,9,24,0,0,5,13,12,26,5,13,5,13,5,13,5,
-    13,9,13,9,13,0,0,8,16,5,21,20,27,28,34,36,
-    46,48,52,20,53,57,61,20,61,5,21,12,16,12,43,51,
-    55,12,55,9,21,13,21,35,39,35,66,17,23,17,32,17,
+    17,9,17,13,17,13,17,9,17,0,0,5,13,27,31,9,
+    15,9,24,9,24,0,0,5,13,12,26,5,13,5,13,5,
+    13,5,13,9,13,9,13,5,13,0,0,8,16,5,21,20,
+    27,28,34,36,46,48,52,20,53,57,61,20,61,5,21,12,
+    16,12,43,51,55,12,55,9,21,13,21,35,39,35,66,17,
+    23,17,32,17,32,0,0,13,21,20,34,13,21,13,21,13,
+    21,13,21,17,21,17,21,13,21,0,0,8,12,8,25,5,
+    25,12,20,9,21,24,31,32,38,40,50,52,56,24,57,61,
+    65,24,65,9,21,13,21,35,39,35,46,17,23,17,32,17,
     32,0,0,13,21,20,34,13,21,13,21,13,21,13,21,17,
-    21,17,21,0,0,8,12,8,25,5,25,12,20,9,21,24,
-    31,32,38,40,50,52,56,24,57,61,65,24,65,9,21,13,
-    21,35,39,35,46,17,23,17,32,17,32,0,0,13,21,20,
-    34,13,21,13,21,13,21,13,21,17,21,17,21,0,0,12,
-    20,9,25,24,31,32,38,40,52,54,58,24,59,63,67,24,
-    67,9,25,16,20,16,27,35,39,16,39,13,25,17,25,41,
-    45,41,52,21,27,21,38,12,18,5,18,0,0,17,25,24,
-    38,17,25,17,25,17,25,17,25,21,25,12,18,5,18,0,
-    0,12,18,5,18,17,25,13,21,13,21,5,13,9,17,9,
-    17,9,17,115,121,0,0,0,139,4,16,0,144,7,25,7,
-    193,9,3,65,13,0,193,13,7,65,22,7,193,34,4,65,
-    39,0,193,39,7,65,48,7,193,50,3,65,54,0,193,54,
-    7,65,63,7,194,16,4,66,21,0,194,21,7,66,30,7,
-    194,45,4,66,50,0,194,50,7,66,59,7,195,12,4,67,
-    18,0,195,18,7,67,28,7,195,31,1,67,28,7,195,32,
-    1,66,59,7,195,33,1,66,30,7,195,34,1,65,63,7,
-    195,35,1,65,48,7,195,36,1,65,22,7,195,37,1,25,
-    7,99,1,0,0,0,0,0,0,0,0,0,0,0,3,0,
-    0,0,3,0,0,0,115,82,0,0,0,100,1,125,1,116,
-    0,124,0,106,1,100,2,131,2,114,15,124,0,106,1,160,
-    2,124,0,161,1,125,1,110,10,116,0,124,0,106,1,100,
-    3,131,2,114,25,116,3,100,4,131,1,130,1,124,1,100,
-    1,117,0,114,34,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,
-    10,0,0,0,114,130,0,0,0,114,175,0,0,0,114,94,
-    0,0,0,114,21,0,0,0,114,20,0,0,0,114,174,0,
-    0,0,169,2,114,117,0,0,0,114,118,0,0,0,115,2,
-    0,0,0,32,32,114,5,0,0,0,218,16,109,111,100,117,
-    108,101,95,102,114,111,109,95,115,112,101,99,114,178,0,0,
-    0,53,2,0,0,115,18,0,0,0,4,3,12,1,14,3,
-    12,1,8,1,8,2,10,1,10,1,4,1,115,24,0,0,
-    0,4,3,10,1,2,6,14,253,10,1,2,2,2,255,6,
-    1,6,1,12,1,10,1,4,1,115,82,0,0,0,14,18,
-    5,11,8,15,16,20,16,27,29,44,8,45,5,62,18,22,
-    18,29,18,49,44,48,18,49,9,15,9,15,10,17,18,22,
-    18,29,31,44,10,45,5,62,15,26,27,61,15,62,9,62,
-    8,14,18,22,8,22,5,40,18,29,30,34,30,39,18,40,
-    9,15,5,23,24,28,30,36,5,37,5,37,12,18,5,18,
-    114,17,0,0,0,99,1,0,0,0,0,0,0,0,0,0,
-    0,0,4,0,0,0,3,0,0,0,115,100,0,0,0,124,
-    0,106,0,100,1,117,0,114,7,100,2,110,2,124,0,106,
-    0,125,1,124,0,106,1,100,1,117,0,114,32,124,0,106,
-    2,100,1,117,0,114,25,100,3,160,3,124,1,161,1,83,
-    0,100,4,160,3,124,1,124,0,106,2,161,2,83,0,124,
-    0,106,4,114,42,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,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,123,
-    0,0,0,114,124,0,0,0,114,125,0,0,0,114,126,0,
-    0,0,250,18,60,109,111,100,117,108,101,32,123,33,114,125,
-    32,40,123,125,41,62,41,5,114,20,0,0,0,114,134,0,
-    0,0,114,130,0,0,0,114,53,0,0,0,114,146,0,0,
-    0,41,2,114,117,0,0,0,114,20,0,0,0,115,2,0,
-    0,0,32,32,114,5,0,0,0,114,127,0,0,0,114,127,
-    0,0,0,70,2,0,0,115,16,0,0,0,20,3,10,1,
-    10,1,10,1,14,2,6,2,14,1,16,2,115,22,0,0,
-    0,20,3,8,1,2,9,8,248,2,3,10,254,14,2,4,
-    2,2,3,14,254,16,2,115,100,0,0,0,19,23,19,28,
-    32,36,19,36,12,51,12,15,12,15,42,46,42,51,5,9,
-    8,12,8,19,23,27,8,27,5,71,12,16,12,23,27,31,
-    12,31,9,68,20,35,20,48,43,47,20,48,13,48,20,42,
-    20,68,50,54,56,60,56,67,20,68,13,68,12,16,12,29,
-    9,71,20,45,20,71,53,57,59,63,59,70,20,71,13,71,
-    20,40,20,71,48,52,48,57,59,63,59,70,20,71,13,71,
-    114,17,0,0,0,99,2,0,0,0,0,0,0,0,0,0,
-    0,0,10,0,0,0,3,0,0,0,115,32,1,0,0,124,
-    0,106,0,125,2,116,1,124,2,131,1,53,0,1,0,116,
-    2,106,3,160,4,124,2,161,1,124,1,117,1,114,27,100,
-    1,160,5,124,2,161,1,125,3,116,6,124,3,124,2,100,
-    2,141,2,130,1,9,0,124,0,106,7,100,3,117,0,114,
-    53,124,0,106,8,100,3,117,0,114,45,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,110,40,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,87,116,11,124,0,106,7,131,1,155,0,100,8,157,
-    2,125,3,116,12,160,13,124,3,116,14,161,2,1,0,124,
-    0,106,7,160,15,124,2,161,1,1,0,110,6,124,0,106,
-    7,160,16,124,1,161,1,1,0,116,2,106,3,160,17,124,
-    0,106,0,161,1,125,1,124,1,116,2,106,3,124,0,106,
-    0,60,0,110,29,35,0,116,2,106,3,160,17,124,0,106,
-    0,161,1,125,1,124,1,116,2,106,3,124,0,106,0,60,
-    0,119,0,37,0,35,0,49,0,115,128,119,4,37,0,1,
-    0,1,0,1,0,89,0,1,0,1,0,124,1,83,0,9,
-    0,100,3,4,0,4,0,131,3,1,0,124,1,83,0,41,
-    9,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,114,19,0,0,0,78,250,
-    14,109,105,115,115,105,110,103,32,108,111,97,100,101,114,84,
-    114,169,0,0,0,114,176,0,0,0,250,55,46,101,120,101,
-    99,95,109,111,100,117,108,101,40,41,32,110,111,116,32,102,
-    111,117,110,100,59,32,102,97,108,108,105,110,103,32,98,97,
-    99,107,32,116,111,32,108,111,97,100,95,109,111,100,117,108,
-    101,40,41,41,18,114,20,0,0,0,114,61,0,0,0,114,
-    18,0,0,0,114,113,0,0,0,114,41,0,0,0,114,53,
-    0,0,0,114,94,0,0,0,114,130,0,0,0,114,137,0,
-    0,0,114,174,0,0,0,114,10,0,0,0,114,6,0,0,
-    0,114,109,0,0,0,114,110,0,0,0,218,13,73,109,112,
-    111,114,116,87,97,114,110,105,110,103,218,11,108,111,97,100,
-    95,109,111,100,117,108,101,114,176,0,0,0,218,3,112,111,
-    112,41,4,114,117,0,0,0,114,118,0,0,0,114,20,0,
-    0,0,114,116,0,0,0,115,4,0,0,0,32,32,32,32,
-    114,5,0,0,0,114,114,0,0,0,114,114,0,0,0,87,
-    2,0,0,115,56,0,0,0,6,2,10,1,16,1,10,1,
-    12,1,2,1,10,1,10,1,14,1,16,2,14,2,12,1,
-    16,1,12,2,14,1,12,2,14,4,14,1,2,128,14,255,
-    16,1,8,233,2,128,12,0,4,24,2,255,10,233,4,24,
-    115,64,0,0,0,6,2,6,1,4,23,14,234,2,2,10,
-    255,12,1,2,20,8,238,2,13,8,244,16,1,16,2,14,
-    2,10,1,2,6,8,251,6,1,2,255,12,2,14,1,12,
-    2,14,4,14,1,2,128,14,255,24,1,2,128,12,0,4,
-    1,12,255,4,1,115,32,1,0,0,12,16,12,21,5,9,
-    10,28,29,33,10,34,5,44,5,44,12,15,12,23,12,33,
-    28,32,12,33,41,47,12,47,9,46,19,51,19,64,59,63,
-    19,64,13,16,19,30,31,34,41,45,19,46,19,46,13,46,
-    9,44,16,20,16,27,31,35,16,35,13,52,20,24,20,51,
-    55,59,20,59,17,72,27,38,39,55,62,66,62,71,27,72,
-    27,72,21,72,17,35,36,40,42,48,59,63,17,64,17,64,
-    17,64,17,64,17,35,36,40,42,48,59,63,17,64,17,64,
-    17,64,24,31,32,36,32,43,45,58,24,59,17,52,31,43,
-    44,48,44,55,31,56,28,59,28,59,28,59,21,24,21,30,
-    21,55,36,39,41,54,21,55,21,55,21,25,21,32,21,50,
-    45,49,21,50,21,50,21,50,21,25,21,32,21,52,45,51,
-    21,52,21,52,22,25,22,33,22,48,38,42,38,47,22,48,
-    13,19,38,44,13,16,13,24,25,29,25,34,13,35,13,35,
-    0,0,22,25,22,33,22,48,38,42,38,47,22,48,13,19,
-    38,44,13,16,13,24,25,29,25,34,13,35,13,44,13,44,
-    5,44,5,44,5,44,5,44,0,0,5,44,5,44,5,44,
-    5,44,5,44,5,44,12,18,5,18,13,35,5,44,5,44,
-    5,44,5,44,5,44,12,18,5,18,115,41,0,0,0,135,
-    20,65,59,3,156,65,1,65,43,2,193,29,14,65,59,3,
-    193,43,15,65,58,9,193,58,1,65,59,3,193,59,4,65,
-    63,11,194,0,3,65,63,11,99,1,0,0,0,0,0,0,
-    0,0,0,0,0,8,0,0,0,3,0,0,0,115,22,1,
-    0,0,9,0,124,0,106,0,160,1,124,0,106,2,161,1,
-    1,0,110,25,35,0,1,0,1,0,1,0,124,0,106,2,
-    116,3,106,4,118,0,114,32,116,3,106,4,160,5,124,0,
-    106,2,161,1,125,1,124,1,116,3,106,4,124,0,106,2,
-    60,0,130,0,37,0,116,3,106,4,160,5,124,0,106,2,
-    161,1,125,1,124,1,116,3,106,4,124,0,106,2,60,0,
-    116,6,124,1,100,1,100,0,131,3,100,0,117,0,114,71,
-    9,0,124,0,106,0,124,1,95,7,110,10,35,0,4,0,
-    116,8,121,138,1,0,1,0,1,0,89,0,110,1,37,0,
-    116,6,124,1,100,2,100,0,131,3,100,0,117,0,114,109,
-    9,0,124,1,106,9,124,1,95,10,116,11,124,1,100,3,
-    131,2,115,98,124,0,106,2,160,12,100,4,161,1,100,5,
-    25,0,124,1,95,10,110,10,35,0,4,0,116,8,121,137,
-    1,0,1,0,1,0,89,0,110,1,37,0,116,6,124,1,
-    100,6,100,0,131,3,100,0,117,0,114,134,9,0,124,0,
-    124,1,95,13,124,1,83,0,35,0,4,0,116,8,121,136,
-    1,0,1,0,1,0,89,0,124,1,83,0,37,0,124,1,
-    83,0,119,0,119,0,119,0,41,7,78,114,120,0,0,0,
-    114,171,0,0,0,114,167,0,0,0,114,152,0,0,0,114,
-    27,0,0,0,114,121,0,0,0,41,14,114,130,0,0,0,
-    114,183,0,0,0,114,20,0,0,0,114,18,0,0,0,114,
-    113,0,0,0,114,184,0,0,0,114,12,0,0,0,114,120,
-    0,0,0,114,2,0,0,0,114,8,0,0,0,114,171,0,
-    0,0,114,10,0,0,0,114,153,0,0,0,114,121,0,0,
-    0,114,177,0,0,0,115,2,0,0,0,32,32,114,5,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,114,185,0,
-    0,0,117,2,0,0,115,80,0,0,0,2,3,16,1,2,
-    128,6,1,12,1,14,1,12,1,2,1,2,128,14,3,12,
-    1,16,1,2,1,10,1,2,128,12,1,4,1,2,128,16,
-    1,2,1,8,4,10,1,18,1,4,128,12,1,4,1,2,
-    128,16,1,2,1,6,1,4,3,2,128,12,254,2,1,4,
-    1,2,128,4,0,2,254,2,251,2,246,115,88,0,0,0,
-    2,9,16,251,2,128,6,5,10,253,2,2,14,255,12,1,
-    2,1,2,128,14,3,12,1,14,1,4,4,10,254,2,128,
-    2,2,2,255,12,1,2,128,14,1,4,9,8,252,8,1,
-    20,1,4,128,2,2,2,255,12,1,2,128,14,1,4,4,
-    6,254,4,3,2,128,2,255,2,255,10,1,4,1,2,128,
-    4,0,2,255,2,251,2,246,115,22,1,0,0,5,14,9,
-    13,9,20,9,43,33,37,33,42,9,43,9,43,9,43,0,
-    0,5,14,5,14,5,14,12,16,12,21,25,28,25,36,12,
-    36,9,44,22,25,22,33,22,48,38,42,38,47,22,48,13,
-    19,38,44,13,16,13,24,25,29,25,34,13,35,9,14,0,
-    0,14,17,14,25,14,40,30,34,30,39,14,40,5,11,30,
-    36,5,8,5,16,17,21,17,26,5,27,8,15,16,22,24,
-    36,38,42,8,43,47,51,8,51,5,17,9,17,33,37,33,
-    44,13,19,13,30,13,30,0,0,9,17,16,30,9,17,9,
-    17,9,17,9,17,13,17,13,17,0,0,8,15,16,22,24,
-    37,39,43,8,44,48,52,8,52,5,17,9,17,34,40,34,
-    49,13,19,13,31,20,27,28,34,36,46,20,47,13,66,38,
-    42,38,47,38,63,59,62,38,63,64,65,38,66,17,23,17,
-    35,0,0,0,0,9,17,16,30,9,17,9,17,9,17,9,
-    17,13,17,13,17,0,0,8,15,16,22,24,34,36,40,8,
-    41,45,49,8,49,5,17,9,17,31,35,13,19,13,28,12,
-    18,5,18,0,0,9,17,16,30,9,17,9,17,9,17,9,
-    17,13,17,12,18,5,18,0,0,12,18,5,18,9,17,9,
-    17,9,17,115,59,0,0,0,129,7,9,0,137,24,33,7,
-    184,4,61,0,189,7,65,6,7,193,16,18,65,35,0,193,
-    35,7,65,44,7,193,54,3,65,59,0,193,59,7,66,5,
-    7,194,8,1,66,5,7,194,9,1,65,44,7,194,10,1,
-    65,6,7,99,1,0,0,0,0,0,0,0,0,0,0,0,
-    11,0,0,0,3,0,0,0,115,248,0,0,0,124,0,106,
-    0,100,0,117,1,114,29,116,1,124,0,106,0,100,1,131,
-    2,115,29,116,2,124,0,106,0,131,1,155,0,100,2,157,
-    2,125,1,116,3,160,4,124,1,116,5,161,2,1,0,116,
-    6,124,0,131,1,83,0,116,7,124,0,131,1,125,2,100,
-    3,124,0,95,8,9,0,124,2,116,9,106,10,124,0,106,
-    11,60,0,9,0,124,0,106,0,100,0,117,0,114,62,124,
-    0,106,12,100,0,117,0,114,61,116,13,100,4,124,0,106,
-    11,100,5,141,2,130,1,110,6,124,0,106,0,160,14,124,
-    2,161,1,1,0,110,22,35,0,1,0,1,0,1,0,9,
-    0,116,9,106,10,124,0,106,11,61,0,130,0,35,0,4,
-    0,116,15,121,123,1,0,1,0,1,0,89,0,130,0,37,
-    0,37,0,116,9,106,10,160,16,124,0,106,11,161,1,125,
-    2,124,2,116,9,106,10,124,0,106,11,60,0,116,17,100,
-    6,124,0,106,11,124,0,106,0,131,3,1,0,100,7,124,
-    0,95,8,124,2,83,0,35,0,100,7,124,0,95,8,119,
-    0,37,0,119,0,41,8,78,114,176,0,0,0,114,181,0,
-    0,0,84,114,180,0,0,0,114,19,0,0,0,122,18,105,
-    109,112,111,114,116,32,123,33,114,125,32,35,32,123,33,114,
-    125,70,41,18,114,130,0,0,0,114,10,0,0,0,114,6,
-    0,0,0,114,109,0,0,0,114,110,0,0,0,114,182,0,
-    0,0,114,185,0,0,0,114,178,0,0,0,90,13,95,105,
-    110,105,116,105,97,108,105,122,105,110,103,114,18,0,0,0,
-    114,113,0,0,0,114,20,0,0,0,114,137,0,0,0,114,
-    94,0,0,0,114,176,0,0,0,114,76,0,0,0,114,184,
-    0,0,0,114,90,0,0,0,41,3,114,117,0,0,0,114,
-    116,0,0,0,114,118,0,0,0,115,3,0,0,0,32,32,
-    32,114,5,0,0,0,218,14,95,108,111,97,100,95,117,110,
-    108,111,99,107,101,100,114,186,0,0,0,153,2,0,0,115,
-    66,0,0,0,10,2,12,2,16,1,12,2,8,1,8,2,
-    6,5,2,1,12,1,2,1,10,1,10,1,14,1,2,255,
-    12,4,4,128,6,1,2,1,10,1,2,3,2,128,12,254,
-    2,1,2,1,4,128,14,5,12,1,16,1,6,2,4,2,
-    2,128,10,254,2,245,115,76,0,0,0,8,2,2,6,10,
-    252,2,4,8,253,6,1,2,255,12,2,8,1,8,2,6,
-    5,2,24,12,234,2,13,8,245,2,5,8,252,18,1,12,
-    3,4,128,6,6,2,255,10,254,2,3,2,128,2,255,2,
-    255,10,1,2,1,4,128,14,5,12,1,16,1,6,2,4,
-    2,2,128,10,254,2,246,115,248,0,0,0,8,12,8,19,
-    27,31,8,31,5,51,16,23,24,28,24,35,37,50,16,51,
-    9,51,23,35,36,40,36,47,23,48,20,52,20,52,20,52,
-    13,16,13,22,13,47,28,31,33,46,13,47,13,47,20,45,
-    46,50,20,51,13,51,14,30,31,35,14,36,5,11,26,30,
-    5,9,5,23,5,35,34,40,9,12,9,20,21,25,21,30,
-    9,31,9,18,16,20,16,27,31,35,16,35,13,48,20,24,
-    20,51,55,59,20,59,17,72,27,38,39,55,62,66,62,71,
-    27,72,27,72,21,72,17,72,17,21,17,28,17,48,41,47,
-    17,48,17,48,0,0,0,0,9,18,9,18,9,18,13,21,
-    21,24,21,32,33,37,33,42,21,43,13,18,0,0,13,21,
-    20,28,13,21,13,21,13,21,13,21,17,21,13,18,0,0,
-    0,0,18,21,18,29,18,44,34,38,34,43,18,44,9,15,
-    34,40,9,12,9,20,21,25,21,30,9,31,9,25,26,46,
-    48,52,48,57,59,63,59,70,9,71,9,71,30,35,9,13,
-    9,27,12,18,5,18,0,0,30,35,9,13,9,27,9,35,
-    9,35,13,21,115,64,0,0,0,165,6,65,53,0,172,24,
-    65,5,0,193,4,1,65,53,0,193,5,4,65,26,7,193,
-    10,5,65,16,6,193,15,1,65,26,7,193,16,7,65,25,
-    13,193,23,3,65,26,7,193,26,22,65,53,0,193,53,5,
-    65,58,7,193,59,1,65,25,13,99,1,0,0,0,0,0,
-    0,0,0,0,0,0,9,0,0,0,3,0,0,0,115,58,
-    0,0,0,116,0,124,0,106,1,131,1,53,0,1,0,116,
-    2,124,0,131,1,2,0,100,1,4,0,4,0,131,3,1,
-    0,83,0,35,0,49,0,115,21,119,4,37,0,1,0,1,
-    0,1,0,89,0,1,0,1,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,61,0,0,0,114,20,0,0,0,114,186,0,
-    0,0,169,1,114,117,0,0,0,115,1,0,0,0,32,114,
-    5,0,0,0,114,115,0,0,0,114,115,0,0,0,198,2,
-    0,0,115,10,0,0,0,12,9,6,1,22,255,2,128,16,
-    0,115,8,0,0,0,8,9,32,1,2,128,16,0,115,58,
-    0,0,0,10,28,29,33,29,38,10,39,5,36,5,36,16,
-    30,31,35,16,36,5,36,5,36,5,36,5,36,5,36,5,
-    36,5,36,5,36,5,36,5,36,5,36,0,0,5,36,5,
-    36,5,36,5,36,5,36,5,36,5,36,5,36,115,12,0,
-    0,0,133,4,16,3,144,4,20,11,149,3,20,11,99,0,
-    0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,
-    0,0,0,115,124,0,0,0,101,0,90,1,100,0,90,2,
-    100,1,90,3,100,2,90,4,101,5,100,3,132,0,131,1,
-    90,6,101,7,100,12,100,5,132,1,131,1,90,8,101,7,
-    100,13,100,6,132,1,131,1,90,9,101,5,100,7,132,0,
-    131,1,90,10,101,5,100,8,132,0,131,1,90,11,101,7,
-    101,12,100,9,132,0,131,1,131,1,90,13,101,7,101,12,
-    100,10,132,0,131,1,131,1,90,14,101,7,101,12,100,11,
-    132,0,131,1,131,1,90,15,101,7,101,16,131,1,90,17,
-    100,4,83,0,41,14,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,122,8,98,117,105,108,116,
-    45,105,110,99,1,0,0,0,0,0,0,0,0,0,0,0,
-    5,0,0,0,3,0,0,0,115,34,0,0,0,116,0,160,
-    1,100,1,116,2,161,2,1,0,100,2,124,0,106,3,155,
-    2,100,3,116,4,106,5,155,0,100,4,157,5,83,0,41,
-    6,250,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,81,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,40,41,32,105,115,32,100,101,112,114,101,99,97,
-    116,101,100,32,97,110,100,32,115,108,97,116,101,100,32,102,
-    111,114,32,114,101,109,111,118,97,108,32,105,110,32,80,121,
-    116,104,111,110,32,51,46,49,50,122,8,60,109,111,100,117,
-    108,101,32,122,2,32,40,122,2,41,62,78,41,6,114,109,
-    0,0,0,114,110,0,0,0,114,111,0,0,0,114,8,0,
-    0,0,114,188,0,0,0,114,164,0,0,0,169,1,114,118,
-    0,0,0,115,1,0,0,0,32,114,5,0,0,0,114,122,
-    0,0,0,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,
-    224,2,0,0,115,8,0,0,0,6,7,2,1,4,255,22,
-    2,115,6,0,0,0,2,7,10,1,22,1,115,34,0,0,
-    0,9,18,9,80,24,59,61,79,9,80,9,80,16,75,17,
-    23,17,32,16,75,16,75,48,63,48,71,16,75,16,75,16,
-    75,9,75,114,17,0,0,0,78,99,4,0,0,0,0,0,
-    0,0,0,0,0,0,5,0,0,0,3,0,0,0,115,42,
-    0,0,0,124,2,100,0,117,1,114,6,100,0,83,0,116,
-    0,160,1,124,1,161,1,114,19,116,2,124,1,124,0,124,
-    0,106,3,100,1,141,3,83,0,100,0,83,0,169,2,78,
-    114,163,0,0,0,41,4,114,70,0,0,0,90,10,105,115,
-    95,98,117,105,108,116,105,110,114,112,0,0,0,114,164,0,
-    0,0,169,4,218,3,99,108,115,114,96,0,0,0,218,4,
-    112,97,116,104,218,6,116,97,114,103,101,116,115,4,0,0,
-    0,32,32,32,32,114,5,0,0,0,218,9,102,105,110,100,
-    95,115,112,101,99,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,
-    235,2,0,0,115,10,0,0,0,8,2,4,1,10,1,16,
-    1,4,2,115,12,0,0,0,6,2,6,1,8,1,2,3,
-    16,254,4,2,115,42,0,0,0,12,16,24,28,12,28,9,
-    24,20,24,20,24,12,16,12,37,28,36,12,37,9,24,20,
-    36,37,45,47,50,59,62,59,70,20,71,20,71,13,71,20,
-    24,20,24,114,17,0,0,0,99,3,0,0,0,0,0,0,
-    0,0,0,0,0,4,0,0,0,3,0,0,0,115,42,0,
-    0,0,116,0,160,1,100,1,116,2,161,2,1,0,124,0,
-    160,3,124,1,124,2,161,2,125,3,124,3,100,2,117,1,
-    114,19,124,3,106,4,83,0,100,2,83,0,41,3,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,122,
-    106,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,40,41,32,105,
-    115,32,100,101,112,114,101,99,97,116,101,100,32,97,110,100,
-    32,115,108,97,116,101,100,32,102,111,114,32,114,101,109,111,
-    118,97,108,32,105,110,32,80,121,116,104,111,110,32,51,46,
-    49,50,59,32,117,115,101,32,102,105,110,100,95,115,112,101,
-    99,40,41,32,105,110,115,116,101,97,100,78,41,5,114,109,
-    0,0,0,114,110,0,0,0,114,111,0,0,0,114,196,0,
-    0,0,114,130,0,0,0,41,4,114,193,0,0,0,114,96,
-    0,0,0,114,194,0,0,0,114,117,0,0,0,115,4,0,
-    0,0,32,32,32,32,114,5,0,0,0,218,11,102,105,110,
-    100,95,109,111,100,117,108,101,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,244,2,0,0,115,10,0,0,0,6,9,
-    2,2,4,254,12,3,18,1,115,12,0,0,0,2,9,2,
-    2,2,255,6,1,12,1,18,1,115,42,0,0,0,9,18,
-    9,43,24,84,24,42,9,43,9,43,16,19,16,45,30,38,
-    40,44,16,45,9,13,31,35,43,47,31,47,16,57,16,20,
-    16,27,9,57,53,57,9,57,114,17,0,0,0,99,1,0,
-    0,0,0,0,0,0,0,0,0,0,4,0,0,0,3,0,
-    0,0,115,46,0,0,0,124,0,106,0,116,1,106,2,118,
-    1,114,17,116,3,100,1,160,4,124,0,106,0,161,1,124,
-    0,106,0,100,2,141,2,130,1,116,5,116,6,106,7,124,
-    0,131,2,83,0,41,4,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,114,92,0,0,0,114,19,0,0,0,78,41,8,114,20,
-    0,0,0,114,18,0,0,0,114,93,0,0,0,114,94,0,
-    0,0,114,53,0,0,0,114,80,0,0,0,114,70,0,0,
-    0,90,14,99,114,101,97,116,101,95,98,117,105,108,116,105,
-    110,114,187,0,0,0,115,1,0,0,0,32,114,5,0,0,
-    0,114,175,0,0,0,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,3,3,0,0,115,10,0,0,0,12,3,
-    12,1,4,1,6,255,12,2,115,10,0,0,0,10,3,2,
-    2,12,255,10,1,12,1,115,46,0,0,0,12,16,12,21,
-    29,32,29,53,12,53,9,46,19,30,31,62,31,80,70,74,
-    70,79,31,80,36,40,36,45,19,46,19,46,13,46,16,41,
-    42,46,42,61,63,67,16,68,9,68,114,17,0,0,0,99,
-    1,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,
-    3,0,0,0,115,16,0,0,0,116,0,116,1,106,2,124,
-    0,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,80,0,0,0,114,70,0,0,0,
-    90,12,101,120,101,99,95,98,117,105,108,116,105,110,114,190,
-    0,0,0,115,1,0,0,0,32,114,5,0,0,0,114,176,
-    0,0,0,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,
-    11,3,0,0,243,2,0,0,0,16,3,114,198,0,0,0,
-    115,16,0,0,0,9,34,35,39,35,52,54,60,9,61,9,
-    61,9,61,9,61,114,17,0,0,0,99,2,0,0,0,0,
-    0,0,0,0,0,0,0,1,0,0,0,3,0,0,0,243,
-    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,24,0,0,0,169,2,114,193,0,
-    0,0,114,96,0,0,0,115,2,0,0,0,32,32,114,5,
-    0,0,0,218,8,103,101,116,95,99,111,100,101,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,16,3,0,0,243,2,0,0,0,
-    4,4,114,202,0,0,0,115,4,0,0,0,16,20,16,20,
-    114,17,0,0,0,99,2,0,0,0,0,0,0,0,0,0,
-    0,0,1,0,0,0,3,0,0,0,114,199,0,0,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,24,0,0,
-    0,114,200,0,0,0,115,2,0,0,0,32,32,114,5,0,
-    0,0,218,10,103,101,116,95,115,111,117,114,99,101,122,26,
+    21,17,21,13,21,0,0,12,20,9,25,24,31,32,38,40,
+    52,54,58,24,59,63,67,24,67,9,25,16,20,16,27,35,
+    39,16,39,13,25,17,25,41,45,41,52,21,27,21,38,12,
+    18,5,18,0,0,17,25,24,38,17,25,17,25,17,25,17,
+    25,21,25,12,18,5,18,17,25,0,0,12,18,5,18,115,
+    120,0,0,0,139,4,16,0,144,7,26,7,153,1,26,7,
+    193,10,3,65,14,0,193,14,7,65,24,7,193,23,1,65,
+    24,7,193,36,4,65,41,0,193,41,7,65,51,7,193,50,
+    1,65,51,7,193,53,3,65,57,0,193,57,7,66,3,7,
+    194,2,1,66,3,7,194,20,4,66,25,0,194,25,7,66,
+    35,7,194,34,1,66,35,7,194,50,4,66,55,0,194,55,
+    7,67,1,7,195,0,1,67,1,7,195,18,4,67,24,0,
+    195,24,7,67,35,7,195,34,1,67,35,7,99,1,0,0,
+    0,0,0,0,0,0,0,0,0,3,0,0,0,3,0,0,
+    0,115,82,0,0,0,100,1,125,1,116,0,124,0,106,1,
+    100,2,131,2,114,15,124,0,106,1,160,2,124,0,161,1,
+    125,1,110,10,116,0,124,0,106,1,100,3,131,2,114,25,
+    116,3,100,4,131,1,130,1,124,1,100,1,117,0,114,34,
+    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,10,0,0,0,114,
+    130,0,0,0,114,175,0,0,0,114,94,0,0,0,114,21,
+    0,0,0,114,20,0,0,0,114,174,0,0,0,169,2,114,
+    117,0,0,0,114,118,0,0,0,115,2,0,0,0,32,32,
+    114,5,0,0,0,218,16,109,111,100,117,108,101,95,102,114,
+    111,109,95,115,112,101,99,114,178,0,0,0,53,2,0,0,
+    115,18,0,0,0,4,3,12,1,14,3,12,1,8,1,8,
+    2,10,1,10,1,4,1,115,24,0,0,0,4,3,10,1,
+    2,6,14,253,10,1,2,2,2,255,6,1,6,1,12,1,
+    10,1,4,1,115,82,0,0,0,14,18,5,11,8,15,16,
+    20,16,27,29,44,8,45,5,62,18,22,18,29,18,49,44,
+    48,18,49,9,15,9,15,10,17,18,22,18,29,31,44,10,
+    45,5,62,15,26,27,61,15,62,9,62,8,14,18,22,8,
+    22,5,40,18,29,30,34,30,39,18,40,9,15,5,23,24,
+    28,30,36,5,37,5,37,12,18,5,18,114,17,0,0,0,
+    99,1,0,0,0,0,0,0,0,0,0,0,0,4,0,0,
+    0,3,0,0,0,115,100,0,0,0,124,0,106,0,100,1,
+    117,0,114,7,100,2,110,2,124,0,106,0,125,1,124,0,
+    106,1,100,1,117,0,114,32,124,0,106,2,100,1,117,0,
+    114,25,100,3,160,3,124,1,161,1,83,0,100,4,160,3,
+    124,1,124,0,106,2,161,2,83,0,124,0,106,4,114,42,
+    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,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,123,0,0,0,114,124,
+    0,0,0,114,125,0,0,0,114,126,0,0,0,250,18,60,
+    109,111,100,117,108,101,32,123,33,114,125,32,40,123,125,41,
+    62,41,5,114,20,0,0,0,114,134,0,0,0,114,130,0,
+    0,0,114,53,0,0,0,114,146,0,0,0,41,2,114,117,
+    0,0,0,114,20,0,0,0,115,2,0,0,0,32,32,114,
+    5,0,0,0,114,127,0,0,0,114,127,0,0,0,70,2,
+    0,0,115,16,0,0,0,20,3,10,1,10,1,10,1,14,
+    2,6,2,14,1,16,2,115,22,0,0,0,20,3,8,1,
+    2,9,8,248,2,3,10,254,14,2,4,2,2,3,14,254,
+    16,2,115,100,0,0,0,19,23,19,28,32,36,19,36,12,
+    51,12,15,12,15,42,46,42,51,5,9,8,12,8,19,23,
+    27,8,27,5,71,12,16,12,23,27,31,12,31,9,68,20,
+    35,20,48,43,47,20,48,13,48,20,42,20,68,50,54,56,
+    60,56,67,20,68,13,68,12,16,12,29,9,71,20,45,20,
+    71,53,57,59,63,59,70,20,71,13,71,20,40,20,71,48,
+    52,48,57,59,63,59,70,20,71,13,71,114,17,0,0,0,
+    99,2,0,0,0,0,0,0,0,0,0,0,0,10,0,0,
+    0,3,0,0,0,115,32,1,0,0,124,0,106,0,125,2,
+    116,1,124,2,131,1,53,0,1,0,116,2,106,3,160,4,
+    124,2,161,1,124,1,117,1,114,27,100,1,160,5,124,2,
+    161,1,125,3,116,6,124,3,124,2,100,2,141,2,130,1,
+    9,0,124,0,106,7,100,3,117,0,114,53,124,0,106,8,
+    100,3,117,0,114,45,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,110,40,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,87,116,11,
+    124,0,106,7,131,1,155,0,100,8,157,2,125,3,116,12,
+    160,13,124,3,116,14,161,2,1,0,124,0,106,7,160,15,
+    124,2,161,1,1,0,110,6,124,0,106,7,160,16,124,1,
+    161,1,1,0,116,2,106,3,160,17,124,0,106,0,161,1,
+    125,1,124,1,116,2,106,3,124,0,106,0,60,0,110,16,
+    35,0,116,2,106,3,160,17,124,0,106,0,161,1,125,1,
+    124,1,116,2,106,3,124,0,106,0,60,0,119,0,37,0,
+    9,0,100,3,4,0,4,0,131,3,1,0,124,1,83,0,
+    35,0,49,0,115,136,119,4,37,0,1,0,1,0,1,0,
+    89,0,1,0,1,0,124,1,83,0,41,9,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,114,19,0,0,0,78,250,14,109,105,115,115,
+    105,110,103,32,108,111,97,100,101,114,84,114,169,0,0,0,
+    114,176,0,0,0,250,55,46,101,120,101,99,95,109,111,100,
+    117,108,101,40,41,32,110,111,116,32,102,111,117,110,100,59,
+    32,102,97,108,108,105,110,103,32,98,97,99,107,32,116,111,
+    32,108,111,97,100,95,109,111,100,117,108,101,40,41,41,18,
+    114,20,0,0,0,114,61,0,0,0,114,18,0,0,0,114,
+    113,0,0,0,114,41,0,0,0,114,53,0,0,0,114,94,
+    0,0,0,114,130,0,0,0,114,137,0,0,0,114,174,0,
+    0,0,114,10,0,0,0,114,6,0,0,0,114,109,0,0,
+    0,114,110,0,0,0,218,13,73,109,112,111,114,116,87,97,
+    114,110,105,110,103,218,11,108,111,97,100,95,109,111,100,117,
+    108,101,114,176,0,0,0,218,3,112,111,112,41,4,114,117,
+    0,0,0,114,118,0,0,0,114,20,0,0,0,114,116,0,
+    0,0,115,4,0,0,0,32,32,32,32,114,5,0,0,0,
+    114,114,0,0,0,114,114,0,0,0,87,2,0,0,115,54,
+    0,0,0,6,2,10,1,16,1,10,1,12,1,2,1,10,
+    1,10,1,14,1,16,2,14,2,12,1,16,1,12,2,14,
+    1,12,2,14,4,14,1,2,128,14,255,18,1,10,233,4,
+    24,8,232,2,128,12,0,4,24,115,64,0,0,0,6,2,
+    6,1,4,23,14,234,2,2,10,255,12,1,2,20,8,238,
+    2,13,8,244,16,1,16,2,14,2,10,1,2,6,8,251,
+    6,1,2,255,12,2,14,1,12,2,14,4,14,1,2,128,
+    14,255,28,1,4,1,8,255,2,128,12,0,4,1,115,32,
+    1,0,0,12,16,12,21,5,9,10,28,29,33,10,34,5,
+    44,5,44,12,15,12,23,12,33,28,32,12,33,41,47,12,
+    47,9,46,19,51,19,64,59,63,19,64,13,16,19,30,31,
+    34,41,45,19,46,19,46,13,46,9,44,16,20,16,27,31,
+    35,16,35,13,52,20,24,20,51,55,59,20,59,17,72,27,
+    38,39,55,62,66,62,71,27,72,27,72,21,72,17,35,36,
+    40,42,48,59,63,17,64,17,64,17,64,17,64,17,35,36,
+    40,42,48,59,63,17,64,17,64,17,64,24,31,32,36,32,
+    43,45,58,24,59,17,52,31,43,44,48,44,55,31,56,28,
+    59,28,59,28,59,21,24,21,30,21,55,36,39,41,54,21,
+    55,21,55,21,25,21,32,21,50,45,49,21,50,21,50,21,
+    50,21,25,21,32,21,52,45,51,21,52,21,52,22,25,22,
+    33,22,48,38,42,38,47,22,48,13,19,38,44,13,16,13,
+    24,25,29,25,34,13,35,13,35,0,0,22,25,22,33,22,
+    48,38,42,38,47,22,48,13,19,38,44,13,16,13,24,25,
+    29,25,34,13,35,13,44,13,44,13,35,5,44,5,44,5,
+    44,5,44,5,44,12,18,5,18,5,44,5,44,5,44,5,
+    44,0,0,5,44,5,44,5,44,5,44,5,44,5,44,12,
+    18,5,18,115,41,0,0,0,135,20,66,3,3,156,65,1,
+    65,43,2,193,29,14,66,3,3,193,43,15,65,58,9,193,
+    58,1,66,3,3,194,3,4,66,7,11,194,8,3,66,7,
+    11,99,1,0,0,0,0,0,0,0,0,0,0,0,8,0,
+    0,0,3,0,0,0,115,22,1,0,0,9,0,124,0,106,
+    0,160,1,124,0,106,2,161,1,1,0,110,25,35,0,1,
+    0,1,0,1,0,124,0,106,2,116,3,106,4,118,0,114,
+    32,116,3,106,4,160,5,124,0,106,2,161,1,125,1,124,
+    1,116,3,106,4,124,0,106,2,60,0,130,0,37,0,116,
+    3,106,4,160,5,124,0,106,2,161,1,125,1,124,1,116,
+    3,106,4,124,0,106,2,60,0,116,6,124,1,100,1,100,
+    0,131,3,100,0,117,0,114,72,9,0,124,0,106,0,124,
+    1,95,7,110,11,35,0,4,0,116,8,121,70,1,0,1,
+    0,1,0,89,0,110,2,119,0,37,0,116,6,124,1,100,
+    2,100,0,131,3,100,0,117,0,114,111,9,0,124,1,106,
+    9,124,1,95,10,116,11,124,1,100,3,131,2,115,99,124,
+    0,106,2,160,12,100,4,161,1,100,5,25,0,124,1,95,
+    10,110,11,35,0,4,0,116,8,121,109,1,0,1,0,1,
+    0,89,0,110,2,119,0,37,0,116,6,124,1,100,6,100,
+    0,131,3,100,0,117,0,114,137,9,0,124,0,124,1,95,
+    13,124,1,83,0,35,0,4,0,116,8,121,135,1,0,1,
+    0,1,0,89,0,124,1,83,0,119,0,37,0,124,1,83,
+    0,41,7,78,114,120,0,0,0,114,171,0,0,0,114,167,
+    0,0,0,114,152,0,0,0,114,27,0,0,0,114,121,0,
+    0,0,41,14,114,130,0,0,0,114,183,0,0,0,114,20,
+    0,0,0,114,18,0,0,0,114,113,0,0,0,114,184,0,
+    0,0,114,12,0,0,0,114,120,0,0,0,114,2,0,0,
+    0,114,8,0,0,0,114,171,0,0,0,114,10,0,0,0,
+    114,153,0,0,0,114,121,0,0,0,114,177,0,0,0,115,
+    2,0,0,0,32,32,114,5,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,114,185,0,0,0,117,2,0,0,115,
+    80,0,0,0,2,3,16,1,2,128,6,1,12,1,14,1,
+    12,1,2,1,2,128,14,3,12,1,16,1,2,1,10,1,
+    2,128,12,1,4,1,2,255,2,128,16,2,2,1,8,4,
+    10,1,18,1,4,128,12,1,4,1,2,255,2,128,16,2,
+    2,1,6,1,4,3,2,128,12,254,2,1,4,1,2,254,
+    2,128,4,2,115,84,0,0,0,2,9,16,251,2,128,6,
+    5,10,253,2,2,14,255,12,1,2,1,2,128,14,3,12,
+    1,14,1,4,4,10,254,2,128,2,2,2,255,14,1,2,
+    128,14,1,4,9,8,252,8,1,20,1,4,128,2,2,2,
+    255,14,1,2,128,14,1,4,4,6,254,4,3,2,128,2,
+    255,2,255,10,1,4,1,2,255,2,128,4,1,115,22,1,
+    0,0,5,14,9,13,9,20,9,43,33,37,33,42,9,43,
+    9,43,9,43,0,0,5,14,5,14,5,14,12,16,12,21,
+    25,28,25,36,12,36,9,44,22,25,22,33,22,48,38,42,
+    38,47,22,48,13,19,38,44,13,16,13,24,25,29,25,34,
+    13,35,9,14,0,0,14,17,14,25,14,40,30,34,30,39,
+    14,40,5,11,30,36,5,8,5,16,17,21,17,26,5,27,
+    8,15,16,22,24,36,38,42,8,43,47,51,8,51,5,17,
+    9,17,33,37,33,44,13,19,13,30,13,30,0,0,9,17,
+    16,30,9,17,9,17,9,17,9,17,13,17,13,17,9,17,
+    0,0,8,15,16,22,24,37,39,43,8,44,48,52,8,52,
+    5,17,9,17,34,40,34,49,13,19,13,31,20,27,28,34,
+    36,46,20,47,13,66,38,42,38,47,38,63,59,62,38,63,
+    64,65,38,66,17,23,17,35,0,0,0,0,9,17,16,30,
+    9,17,9,17,9,17,9,17,13,17,13,17,9,17,0,0,
+    8,15,16,22,24,34,36,40,8,41,45,49,8,49,5,17,
+    9,17,31,35,13,19,13,28,12,18,5,18,0,0,9,17,
+    16,30,9,17,9,17,9,17,9,17,13,17,12,18,5,18,
+    9,17,0,0,12,18,5,18,115,59,0,0,0,129,7,9,
+    0,137,24,33,7,184,4,61,0,189,7,65,7,7,193,6,
+    1,65,7,7,193,17,18,65,36,0,193,36,7,65,46,7,
+    193,45,1,65,46,7,193,56,3,65,61,0,193,61,7,66,
+    8,7,194,7,1,66,8,7,99,1,0,0,0,0,0,0,
+    0,0,0,0,0,11,0,0,0,3,0,0,0,115,248,0,
+    0,0,124,0,106,0,100,0,117,1,114,29,116,1,124,0,
+    106,0,100,1,131,2,115,29,116,2,124,0,106,0,131,1,
+    155,0,100,2,157,2,125,1,116,3,160,4,124,1,116,5,
+    161,2,1,0,116,6,124,0,131,1,83,0,116,7,124,0,
+    131,1,125,2,100,3,124,0,95,8,9,0,124,2,116,9,
+    106,10,124,0,106,11,60,0,9,0,124,0,106,0,100,0,
+    117,0,114,62,124,0,106,12,100,0,117,0,114,61,116,13,
+    100,4,124,0,106,11,100,5,141,2,130,1,110,6,124,0,
+    106,0,160,14,124,2,161,1,1,0,110,23,35,0,1,0,
+    1,0,1,0,9,0,116,9,106,10,124,0,106,11,61,0,
+    130,0,35,0,4,0,116,15,121,89,1,0,1,0,1,0,
+    89,0,130,0,119,0,37,0,37,0,116,9,106,10,160,16,
+    124,0,106,11,161,1,125,2,124,2,116,9,106,10,124,0,
+    106,11,60,0,116,17,100,6,124,0,106,11,124,0,106,0,
+    131,3,1,0,100,7,124,0,95,8,124,2,83,0,35,0,
+    100,7,124,0,95,8,119,0,37,0,41,8,78,114,176,0,
+    0,0,114,181,0,0,0,84,114,180,0,0,0,114,19,0,
+    0,0,122,18,105,109,112,111,114,116,32,123,33,114,125,32,
+    35,32,123,33,114,125,70,41,18,114,130,0,0,0,114,10,
+    0,0,0,114,6,0,0,0,114,109,0,0,0,114,110,0,
+    0,0,114,182,0,0,0,114,185,0,0,0,114,178,0,0,
+    0,90,13,95,105,110,105,116,105,97,108,105,122,105,110,103,
+    114,18,0,0,0,114,113,0,0,0,114,20,0,0,0,114,
+    137,0,0,0,114,94,0,0,0,114,176,0,0,0,114,76,
+    0,0,0,114,184,0,0,0,114,90,0,0,0,41,3,114,
+    117,0,0,0,114,116,0,0,0,114,118,0,0,0,115,3,
+    0,0,0,32,32,32,114,5,0,0,0,218,14,95,108,111,
+    97,100,95,117,110,108,111,99,107,101,100,114,186,0,0,0,
+    153,2,0,0,115,66,0,0,0,10,2,12,2,16,1,12,
+    2,8,1,8,2,6,5,2,1,12,1,2,1,10,1,10,
+    1,14,1,2,255,12,4,4,128,6,1,2,1,10,1,2,
+    3,2,128,12,254,2,1,2,1,2,254,4,128,14,7,12,
+    1,16,1,6,2,4,2,2,128,10,254,115,76,0,0,0,
+    8,2,2,6,10,252,2,4,8,253,6,1,2,255,12,2,
+    8,1,8,2,6,5,2,24,12,234,2,13,8,245,2,5,
+    8,252,18,1,12,3,4,128,6,6,2,255,10,254,2,3,
+    2,128,2,255,2,255,10,1,2,1,2,255,4,128,14,6,
+    12,1,16,1,6,2,4,2,2,128,10,254,115,248,0,0,
+    0,8,12,8,19,27,31,8,31,5,51,16,23,24,28,24,
+    35,37,50,16,51,9,51,23,35,36,40,36,47,23,48,20,
+    52,20,52,20,52,13,16,13,22,13,47,28,31,33,46,13,
+    47,13,47,20,45,46,50,20,51,13,51,14,30,31,35,14,
+    36,5,11,26,30,5,9,5,23,5,35,34,40,9,12,9,
+    20,21,25,21,30,9,31,9,18,16,20,16,27,31,35,16,
+    35,13,48,20,24,20,51,55,59,20,59,17,72,27,38,39,
+    55,62,66,62,71,27,72,27,72,21,72,17,72,17,21,17,
+    28,17,48,41,47,17,48,17,48,0,0,0,0,9,18,9,
+    18,9,18,13,21,21,24,21,32,33,37,33,42,21,43,13,
+    18,0,0,13,21,20,28,13,21,13,21,13,21,13,21,17,
+    21,13,18,13,21,0,0,0,0,18,21,18,29,18,44,34,
+    38,34,43,18,44,9,15,34,40,9,12,9,20,21,25,21,
+    30,9,31,9,25,26,46,48,52,48,57,59,63,59,70,9,
+    71,9,71,30,35,9,13,9,27,12,18,5,18,0,0,30,
+    35,9,13,9,27,9,35,9,35,115,70,0,0,0,165,6,
+    65,54,0,172,24,65,5,0,193,4,1,65,54,0,193,5,
+    4,65,27,7,193,10,5,65,16,6,193,15,1,65,27,7,
+    193,16,7,65,26,13,193,23,2,65,27,7,193,25,1,65,
+    26,13,193,26,1,65,27,7,193,27,22,65,54,0,193,54,
+    5,65,59,7,99,1,0,0,0,0,0,0,0,0,0,0,
+    0,9,0,0,0,3,0,0,0,115,58,0,0,0,116,0,
+    124,0,106,1,131,1,53,0,1,0,116,2,124,0,131,1,
+    2,0,100,1,4,0,4,0,131,3,1,0,83,0,35,0,
+    49,0,115,21,119,4,37,0,1,0,1,0,1,0,89,0,
+    1,0,1,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,61,
+    0,0,0,114,20,0,0,0,114,186,0,0,0,169,1,114,
+    117,0,0,0,115,1,0,0,0,32,114,5,0,0,0,114,
+    115,0,0,0,114,115,0,0,0,198,2,0,0,115,10,0,
+    0,0,12,9,6,1,22,255,2,128,16,0,115,8,0,0,
+    0,8,9,32,1,2,128,16,0,115,58,0,0,0,10,28,
+    29,33,29,38,10,39,5,36,5,36,16,30,31,35,16,36,
+    5,36,5,36,5,36,5,36,5,36,5,36,5,36,5,36,
+    5,36,5,36,5,36,0,0,5,36,5,36,5,36,5,36,
+    5,36,5,36,5,36,5,36,115,12,0,0,0,133,4,16,
+    3,144,4,20,11,149,3,20,11,99,0,0,0,0,0,0,
+    0,0,0,0,0,0,3,0,0,0,0,0,0,0,115,124,
+    0,0,0,101,0,90,1,100,0,90,2,100,1,90,3,100,
+    2,90,4,101,5,100,3,132,0,131,1,90,6,101,7,100,
+    12,100,5,132,1,131,1,90,8,101,7,100,13,100,6,132,
+    1,131,1,90,9,101,5,100,7,132,0,131,1,90,10,101,
+    5,100,8,132,0,131,1,90,11,101,7,101,12,100,9,132,
+    0,131,1,131,1,90,13,101,7,101,12,100,10,132,0,131,
+    1,131,1,90,14,101,7,101,12,100,11,132,0,131,1,131,
+    1,90,15,101,7,101,16,131,1,90,17,100,4,83,0,41,
+    14,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,122,8,98,117,105,108,116,45,105,110,99,1,
+    0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,3,
+    0,0,0,115,34,0,0,0,116,0,160,1,100,1,116,2,
+    161,2,1,0,100,2,124,0,106,3,155,2,100,3,116,4,
+    106,5,155,0,100,4,157,5,83,0,41,6,250,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,81,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,40,41,
+    32,105,115,32,100,101,112,114,101,99,97,116,101,100,32,97,
+    110,100,32,115,108,97,116,101,100,32,102,111,114,32,114,101,
+    109,111,118,97,108,32,105,110,32,80,121,116,104,111,110,32,
+    51,46,49,50,122,8,60,109,111,100,117,108,101,32,122,2,
+    32,40,122,2,41,62,78,41,6,114,109,0,0,0,114,110,
+    0,0,0,114,111,0,0,0,114,8,0,0,0,114,188,0,
+    0,0,114,164,0,0,0,169,1,114,118,0,0,0,115,1,
+    0,0,0,32,114,5,0,0,0,114,122,0,0,0,122,27,
     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,22,3,0,0,114,202,
-    0,0,0,114,202,0,0,0,115,4,0,0,0,16,20,16,
-    20,114,17,0,0,0,99,2,0,0,0,0,0,0,0,0,
-    0,0,0,1,0,0,0,3,0,0,0,114,199,0,0,0,
-    41,3,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,78,114,24,0,0,0,114,
-    200,0,0,0,115,2,0,0,0,32,32,114,5,0,0,0,
-    114,136,0,0,0,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,28,3,0,0,114,202,0,0,0,114,202,0,0,0,115,
-    4,0,0,0,16,21,16,21,114,17,0,0,0,169,2,78,
-    78,114,0,0,0,0,41,18,114,8,0,0,0,114,7,0,
-    0,0,114,1,0,0,0,114,9,0,0,0,114,164,0,0,
-    0,218,12,115,116,97,116,105,99,109,101,116,104,111,100,114,
-    122,0,0,0,218,11,99,108,97,115,115,109,101,116,104,111,
-    100,114,196,0,0,0,114,197,0,0,0,114,175,0,0,0,
-    114,176,0,0,0,114,102,0,0,0,114,201,0,0,0,114,
-    203,0,0,0,114,136,0,0,0,114,119,0,0,0,114,183,
-    0,0,0,114,24,0,0,0,114,17,0,0,0,114,5,0,
-    0,0,114,188,0,0,0,114,188,0,0,0,213,2,0,0,
-    115,46,0,0,0,8,0,4,2,4,7,2,2,8,1,2,
-    10,10,1,2,8,10,1,2,14,8,1,2,7,8,1,2,
-    4,2,1,10,1,2,4,2,1,10,1,2,4,2,1,10,
-    1,12,4,115,92,0,0,0,0,129,0,129,0,129,0,129,
-    0,129,8,166,0,127,0,127,0,127,0,127,0,127,2,97,
-    0,129,0,129,0,129,0,129,0,129,2,159,0,127,0,127,
-    0,127,0,127,0,127,4,99,2,2,8,9,2,2,2,1,
-    8,6,2,2,2,1,8,12,2,2,8,6,2,2,8,3,
-    2,2,2,1,10,3,2,2,2,1,10,3,2,2,2,1,
-    10,3,12,2,115,124,0,0,0,1,1,1,1,1,1,1,
-    1,5,8,1,1,15,25,5,12,6,18,5,75,5,75,5,
-    75,5,75,6,17,39,43,5,24,5,24,5,24,5,24,6,
-    17,41,45,5,57,5,57,5,57,5,57,6,18,5,68,5,
-    68,5,68,5,68,6,18,5,61,5,61,5,61,5,61,6,
-    17,6,23,5,20,5,20,5,20,5,20,5,20,6,17,6,
-    23,5,20,5,20,5,20,5,20,5,20,6,17,6,23,5,
-    21,5,21,5,21,5,21,5,21,19,30,31,48,19,49,5,
-    16,5,16,5,16,114,17,0,0,0,114,188,0,0,0,99,
-    0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,
-    0,0,0,0,115,126,0,0,0,101,0,90,1,100,0,90,
-    2,100,1,90,3,100,2,90,4,101,5,100,3,132,0,131,
-    1,90,6,101,7,100,13,100,5,132,1,131,1,90,8,101,
-    7,100,14,100,6,132,1,131,1,90,9,101,5,100,7,132,
-    0,131,1,90,10,101,5,100,8,132,0,131,1,90,11,101,
-    7,100,9,132,0,131,1,90,12,101,7,101,13,100,10,132,
-    0,131,1,131,1,90,14,101,7,101,13,100,11,132,0,131,
-    1,131,1,90,15,101,7,101,13,100,12,132,0,131,1,131,
-    1,90,16,100,4,83,0,41,15,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,90,6,102,114,111,122,101,
-    110,99,1,0,0,0,0,0,0,0,0,0,0,0,4,0,
-    0,0,3,0,0,0,115,28,0,0,0,116,0,160,1,100,
-    1,116,2,161,2,1,0,100,2,160,3,124,0,106,4,116,
-    5,106,6,161,2,83,0,41,4,114,189,0,0,0,122,80,
-    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,40,41,32,105,115,32,
-    100,101,112,114,101,99,97,116,101,100,32,97,110,100,32,115,
-    108,97,116,101,100,32,102,111,114,32,114,101,109,111,118,97,
-    108,32,105,110,32,80,121,116,104,111,110,32,51,46,49,50,
-    114,179,0,0,0,78,41,7,114,109,0,0,0,114,110,0,
-    0,0,114,111,0,0,0,114,53,0,0,0,114,8,0,0,
-    0,114,207,0,0,0,114,164,0,0,0,41,1,218,1,109,
-    115,1,0,0,0,32,114,5,0,0,0,114,122,0,0,0,
-    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,48,3,0,0,
-    115,8,0,0,0,6,7,2,1,4,255,16,2,115,6,0,
-    0,0,2,7,10,1,16,1,115,28,0,0,0,9,18,9,
-    80,24,59,61,79,9,80,9,80,16,36,16,79,44,45,44,
-    54,56,70,56,78,16,79,9,79,114,17,0,0,0,78,99,
-    4,0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,
-    3,0,0,0,115,30,0,0,0,116,0,160,1,124,1,161,
-    1,114,13,116,2,124,1,124,0,124,0,106,3,100,1,141,
-    3,83,0,100,0,83,0,114,191,0,0,0,41,4,114,70,
-    0,0,0,114,106,0,0,0,114,112,0,0,0,114,164,0,
-    0,0,114,192,0,0,0,115,4,0,0,0,32,32,32,32,
-    114,5,0,0,0,114,196,0,0,0,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,59,3,0,0,115,6,0,0,0,10,2,16,
-    1,4,2,115,8,0,0,0,8,2,2,3,16,254,4,2,
-    115,30,0,0,0,12,16,12,36,27,35,12,36,9,24,20,
-    36,37,45,47,50,59,62,59,70,20,71,20,71,13,71,20,
-    24,20,24,114,17,0,0,0,99,3,0,0,0,0,0,0,
-    0,0,0,0,0,4,0,0,0,3,0,0,0,115,30,0,
-    0,0,116,0,160,1,100,1,116,2,161,2,1,0,116,3,
-    160,4,124,1,161,1,114,13,124,0,83,0,100,2,83,0,
-    41,3,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,
+    109,111,100,117,108,101,95,114,101,112,114,224,2,0,0,115,
+    8,0,0,0,6,7,2,1,4,255,22,2,115,6,0,0,
+    0,2,7,10,1,22,1,115,34,0,0,0,9,18,9,80,
+    24,59,61,79,9,80,9,80,16,75,17,23,17,32,16,75,
+    16,75,48,63,48,71,16,75,16,75,16,75,9,75,114,17,
+    0,0,0,78,99,4,0,0,0,0,0,0,0,0,0,0,
+    0,5,0,0,0,3,0,0,0,115,42,0,0,0,124,2,
+    100,0,117,1,114,6,100,0,83,0,116,0,160,1,124,1,
+    161,1,114,19,116,2,124,1,124,0,124,0,106,3,100,1,
+    141,3,83,0,100,0,83,0,169,2,78,114,163,0,0,0,
+    41,4,114,70,0,0,0,90,10,105,115,95,98,117,105,108,
+    116,105,110,114,112,0,0,0,114,164,0,0,0,169,4,218,
+    3,99,108,115,114,96,0,0,0,218,4,112,97,116,104,218,
+    6,116,97,114,103,101,116,115,4,0,0,0,32,32,32,32,
+    114,5,0,0,0,218,9,102,105,110,100,95,115,112,101,99,
+    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,235,2,0,0,115,
+    10,0,0,0,8,2,4,1,10,1,16,1,4,2,115,12,
+    0,0,0,6,2,6,1,8,1,2,3,16,254,4,2,115,
+    42,0,0,0,12,16,24,28,12,28,9,24,20,24,20,24,
+    12,16,12,37,28,36,12,37,9,24,20,36,37,45,47,50,
+    59,62,59,70,20,71,20,71,13,71,20,24,20,24,114,17,
+    0,0,0,99,3,0,0,0,0,0,0,0,0,0,0,0,
+    4,0,0,0,3,0,0,0,115,42,0,0,0,116,0,160,
+    1,100,1,116,2,161,2,1,0,124,0,160,3,124,1,124,
+    2,161,2,125,3,124,3,100,2,117,1,114,19,124,3,106,
+    4,83,0,100,2,83,0,41,3,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,122,106,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,40,41,32,105,115,32,100,101,112,
+    114,101,99,97,116,101,100,32,97,110,100,32,115,108,97,116,
+    101,100,32,102,111,114,32,114,101,109,111,118,97,108,32,105,
+    110,32,80,121,116,104,111,110,32,51,46,49,50,59,32,117,
     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,122,105,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,40,41,32,
-    105,115,32,100,101,112,114,101,99,97,116,101,100,32,97,110,
-    100,32,115,108,97,116,101,100,32,102,111,114,32,114,101,109,
-    111,118,97,108,32,105,110,32,80,121,116,104,111,110,32,51,
-    46,49,50,59,32,117,115,101,32,102,105,110,100,95,115,112,
-    101,99,40,41,32,105,110,115,116,101,97,100,78,41,5,114,
-    109,0,0,0,114,110,0,0,0,114,111,0,0,0,114,70,
-    0,0,0,114,106,0,0,0,41,3,114,193,0,0,0,114,
-    96,0,0,0,114,194,0,0,0,115,3,0,0,0,32,32,
-    32,114,5,0,0,0,114,197,0,0,0,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,66,3,0,0,115,8,0,0,0,
-    6,7,2,2,4,254,18,3,115,10,0,0,0,2,7,2,
-    2,2,255,6,1,18,1,115,30,0,0,0,9,18,9,43,
-    24,84,24,42,9,43,9,43,23,27,23,47,38,46,23,47,
-    16,57,16,19,9,57,53,57,9,57,114,17,0,0,0,99,
-    1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,
-    3,0,0,0,114,199,0,0,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,24,0,0,0,114,187,0,
-    0,0,115,1,0,0,0,32,114,5,0,0,0,114,175,0,
-    0,0,122,28,70,114,111,122,101,110,73,109,112,111,114,116,
+    110,115,116,101,97,100,78,41,5,114,109,0,0,0,114,110,
+    0,0,0,114,111,0,0,0,114,196,0,0,0,114,130,0,
+    0,0,41,4,114,193,0,0,0,114,96,0,0,0,114,194,
+    0,0,0,114,117,0,0,0,115,4,0,0,0,32,32,32,
+    32,114,5,0,0,0,218,11,102,105,110,100,95,109,111,100,
+    117,108,101,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,
+    244,2,0,0,115,10,0,0,0,6,9,2,2,4,254,12,
+    3,18,1,115,12,0,0,0,2,9,2,2,2,255,6,1,
+    12,1,18,1,115,42,0,0,0,9,18,9,43,24,84,24,
+    42,9,43,9,43,16,19,16,45,30,38,40,44,16,45,9,
+    13,31,35,43,47,31,47,16,57,16,20,16,27,9,57,53,
+    57,9,57,114,17,0,0,0,99,1,0,0,0,0,0,0,
+    0,0,0,0,0,4,0,0,0,3,0,0,0,115,46,0,
+    0,0,124,0,106,0,116,1,106,2,118,1,114,17,116,3,
+    100,1,160,4,124,0,106,0,161,1,124,0,106,0,100,2,
+    141,2,130,1,116,5,116,6,106,7,124,0,131,2,83,0,
+    41,4,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,114,92,0,0,
+    0,114,19,0,0,0,78,41,8,114,20,0,0,0,114,18,
+    0,0,0,114,93,0,0,0,114,94,0,0,0,114,53,0,
+    0,0,114,80,0,0,0,114,70,0,0,0,90,14,99,114,
+    101,97,116,101,95,98,117,105,108,116,105,110,114,187,0,0,
+    0,115,1,0,0,0,32,114,5,0,0,0,114,175,0,0,
+    0,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,
-    78,3,0,0,115,2,0,0,0,4,0,115,2,0,0,0,
-    4,128,115,4,0,0,0,0,0,0,0,114,17,0,0,0,
-    99,1,0,0,0,0,0,0,0,0,0,0,0,4,0,0,
-    0,3,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,18,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,114,105,0,0,0,41,
-    10,114,121,0,0,0,114,20,0,0,0,114,70,0,0,0,
-    114,106,0,0,0,114,94,0,0,0,114,53,0,0,0,114,
-    80,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,13,0,
-    0,0,41,3,114,118,0,0,0,114,20,0,0,0,218,4,
-    99,111,100,101,115,3,0,0,0,32,32,32,114,5,0,0,
-    0,114,176,0,0,0,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,82,3,0,0,115,14,0,0,0,8,2,10,1,10,
-    1,2,1,6,255,12,2,16,1,115,14,0,0,0,8,2,
-    8,1,2,2,10,255,8,1,12,1,16,1,115,64,0,0,
-    0,16,22,16,31,16,36,9,13,16,20,16,36,31,35,16,
-    36,9,41,19,30,31,60,31,73,68,72,31,73,36,40,19,
-    41,19,41,13,41,16,41,42,46,42,64,66,70,16,71,9,
-    13,9,13,14,18,20,26,20,35,9,36,9,36,9,36,9,
-    36,114,17,0,0,0,99,2,0,0,0,0,0,0,0,0,
-    0,0,0,3,0,0,0,3,0,0,0,115,10,0,0,0,
-    116,0,124,0,124,1,131,2,83,0,41,2,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,78,41,1,
-    114,119,0,0,0,114,200,0,0,0,115,2,0,0,0,32,
-    32,114,5,0,0,0,114,183,0,0,0,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,91,3,0,0,243,2,0,0,0,
-    10,8,114,212,0,0,0,115,10,0,0,0,16,33,34,37,
-    39,47,16,48,9,48,114,17,0,0,0,99,2,0,0,0,
-    0,0,0,0,0,0,0,0,3,0,0,0,3,0,0,0,
-    243,10,0,0,0,116,0,160,1,124,1,161,1,83,0,41,
-    2,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,
-    78,41,2,114,70,0,0,0,114,209,0,0,0,114,200,0,
-    0,0,115,2,0,0,0,32,32,114,5,0,0,0,114,201,
-    0,0,0,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,101,3,0,0,
-    243,2,0,0,0,10,4,114,214,0,0,0,115,10,0,0,
-    0,16,20,16,48,39,47,16,48,9,48,114,17,0,0,0,
+    3,3,0,0,115,10,0,0,0,12,3,12,1,4,1,6,
+    255,12,2,115,10,0,0,0,10,3,2,2,12,255,10,1,
+    12,1,115,46,0,0,0,12,16,12,21,29,32,29,53,12,
+    53,9,46,19,30,31,62,31,80,70,74,70,79,31,80,36,
+    40,36,45,19,46,19,46,13,46,16,41,42,46,42,61,63,
+    67,16,68,9,68,114,17,0,0,0,99,1,0,0,0,0,
+    0,0,0,0,0,0,0,3,0,0,0,3,0,0,0,115,
+    16,0,0,0,116,0,116,1,106,2,124,0,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,80,0,0,0,114,70,0,0,0,90,12,101,120,101,
+    99,95,98,117,105,108,116,105,110,114,190,0,0,0,115,1,
+    0,0,0,32,114,5,0,0,0,114,176,0,0,0,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,11,3,0,0,243,
+    2,0,0,0,16,3,114,198,0,0,0,115,16,0,0,0,
+    9,34,35,39,35,52,54,60,9,61,9,61,9,61,9,61,
+    114,17,0,0,0,99,2,0,0,0,0,0,0,0,0,0,
+    0,0,1,0,0,0,3,0,0,0,243,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,24,0,0,0,169,2,114,193,0,0,0,114,96,0,
+    0,0,115,2,0,0,0,32,32,114,5,0,0,0,218,8,
+    103,101,116,95,99,111,100,101,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,16,3,0,0,243,2,0,0,0,4,4,114,202,0,
+    0,0,115,4,0,0,0,16,20,16,20,114,17,0,0,0,
     99,2,0,0,0,0,0,0,0,0,0,0,0,1,0,0,
-    0,3,0,0,0,114,199,0,0,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,24,0,0,0,114,200,0,0,0,115,
-    2,0,0,0,32,32,114,5,0,0,0,114,203,0,0,0,
-    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,107,3,0,0,114,
-    202,0,0,0,114,202,0,0,0,115,4,0,0,0,16,20,
-    16,20,114,17,0,0,0,99,2,0,0,0,0,0,0,0,
-    0,0,0,0,3,0,0,0,3,0,0,0,114,213,0,0,
-    0,41,2,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,78,41,2,114,70,0,0,0,90,17,105,115,95,
-    102,114,111,122,101,110,95,112,97,99,107,97,103,101,114,200,
-    0,0,0,115,2,0,0,0,32,32,114,5,0,0,0,114,
-    136,0,0,0,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,113,
-    3,0,0,114,214,0,0,0,114,214,0,0,0,115,10,0,
-    0,0,16,20,16,48,39,47,16,48,9,48,114,17,0,0,
-    0,114,204,0,0,0,114,0,0,0,0,41,17,114,8,0,
-    0,0,114,7,0,0,0,114,1,0,0,0,114,9,0,0,
-    0,114,164,0,0,0,114,205,0,0,0,114,122,0,0,0,
-    114,206,0,0,0,114,196,0,0,0,114,197,0,0,0,114,
-    175,0,0,0,114,176,0,0,0,114,183,0,0,0,114,108,
-    0,0,0,114,201,0,0,0,114,203,0,0,0,114,136,0,
-    0,0,114,24,0,0,0,114,17,0,0,0,114,5,0,0,
-    0,114,207,0,0,0,114,207,0,0,0,37,3,0,0,115,
-    48,0,0,0,8,0,4,2,4,7,2,2,8,1,2,10,
-    10,1,2,6,10,1,2,11,8,1,2,3,8,1,2,8,
-    8,1,2,9,2,1,10,1,2,4,2,1,10,1,2,4,
-    2,1,14,1,115,102,0,0,0,0,129,0,129,0,129,0,
-    129,0,129,0,129,8,213,0,127,0,127,0,127,0,127,0,
-    127,0,127,2,50,0,129,0,129,0,129,0,129,0,129,0,
-    129,2,206,0,127,0,127,0,127,0,127,0,127,0,127,4,
-    52,2,2,8,9,2,2,2,1,8,4,2,2,2,1,8,
-    9,2,2,8,2,2,2,8,7,2,2,8,8,2,2,2,
-    1,10,3,2,2,2,1,10,3,2,2,2,1,14,3,115,
-    126,0,0,0,1,1,1,1,1,1,1,1,5,8,1,1,
-    15,23,5,12,6,18,5,79,5,79,5,79,5,79,6,17,
+    0,3,0,0,0,114,199,0,0,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,24,0,0,0,114,200,0,0,
+    0,115,2,0,0,0,32,32,114,5,0,0,0,218,10,103,
+    101,116,95,115,111,117,114,99,101,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,22,3,0,0,114,202,0,0,0,114,202,
+    0,0,0,115,4,0,0,0,16,20,16,20,114,17,0,0,
+    0,99,2,0,0,0,0,0,0,0,0,0,0,0,1,0,
+    0,0,3,0,0,0,114,199,0,0,0,41,3,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,78,114,24,0,0,0,114,200,0,0,0,115,
+    2,0,0,0,32,32,114,5,0,0,0,114,136,0,0,0,
+    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,28,3,0,0,
+    114,202,0,0,0,114,202,0,0,0,115,4,0,0,0,16,
+    21,16,21,114,17,0,0,0,169,2,78,78,114,0,0,0,
+    0,41,18,114,8,0,0,0,114,7,0,0,0,114,1,0,
+    0,0,114,9,0,0,0,114,164,0,0,0,218,12,115,116,
+    97,116,105,99,109,101,116,104,111,100,114,122,0,0,0,218,
+    11,99,108,97,115,115,109,101,116,104,111,100,114,196,0,0,
+    0,114,197,0,0,0,114,175,0,0,0,114,176,0,0,0,
+    114,102,0,0,0,114,201,0,0,0,114,203,0,0,0,114,
+    136,0,0,0,114,119,0,0,0,114,183,0,0,0,114,24,
+    0,0,0,114,17,0,0,0,114,5,0,0,0,114,188,0,
+    0,0,114,188,0,0,0,213,2,0,0,115,46,0,0,0,
+    8,0,4,2,4,7,2,2,8,1,2,10,10,1,2,8,
+    10,1,2,14,8,1,2,7,8,1,2,4,2,1,10,1,
+    2,4,2,1,10,1,2,4,2,1,10,1,12,4,115,92,
+    0,0,0,0,129,0,129,0,129,0,129,0,129,8,166,0,
+    127,0,127,0,127,0,127,0,127,2,97,0,129,0,129,0,
+    129,0,129,0,129,2,159,0,127,0,127,0,127,0,127,0,
+    127,4,99,2,2,8,9,2,2,2,1,8,6,2,2,2,
+    1,8,12,2,2,8,6,2,2,8,3,2,2,2,1,10,
+    3,2,2,2,1,10,3,2,2,2,1,10,3,12,2,115,
+    124,0,0,0,1,1,1,1,1,1,1,1,5,8,1,1,
+    15,25,5,12,6,18,5,75,5,75,5,75,5,75,6,17,
     39,43,5,24,5,24,5,24,5,24,6,17,41,45,5,57,
-    5,57,5,57,5,57,6,18,5,57,5,57,5,57,5,57,
-    6,18,5,36,5,36,5,36,5,36,6,17,5,48,5,48,
-    5,48,5,48,6,17,6,22,5,48,5,48,5,48,5,48,
-    5,48,6,17,6,22,5,20,5,20,5,20,5,20,5,20,
-    6,17,6,22,5,48,5,48,5,48,5,48,5,48,5,48,
-    5,48,114,17,0,0,0,114,207,0,0,0,99,0,0,0,
-    0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,
-    0,115,28,0,0,0,101,0,90,1,100,0,90,2,100,1,
-    90,3,100,2,132,0,90,4,100,3,132,0,90,5,100,4,
-    83,0,41,5,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,0,0,0,0,2,0,0,0,3,
-    0,0,0,243,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,70,0,0,0,114,71,0,0,0,114,55,0,
-    0,0,115,1,0,0,0,32,114,5,0,0,0,114,65,0,
-    0,0,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,
-    126,3,0,0,243,2,0,0,0,12,2,114,217,0,0,0,
-    115,12,0,0,0,9,13,9,28,9,28,9,28,9,28,9,
-    28,114,17,0,0,0,99,4,0,0,0,0,0,0,0,0,
-    0,0,0,2,0,0,0,3,0,0,0,114,216,0,0,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,70,0,0,0,114,73,0,0,0,41,4,114,
-    35,0,0,0,218,8,101,120,99,95,116,121,112,101,218,9,
-    101,120,99,95,118,97,108,117,101,218,13,101,120,99,95,116,
-    114,97,99,101,98,97,99,107,115,4,0,0,0,32,32,32,
-    32,114,5,0,0,0,114,68,0,0,0,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,130,3,0,0,114,217,0,0,
-    0,114,217,0,0,0,115,12,0,0,0,9,13,9,28,9,
-    28,9,28,9,28,9,28,114,17,0,0,0,78,41,6,114,
-    8,0,0,0,114,7,0,0,0,114,1,0,0,0,114,9,
-    0,0,0,114,65,0,0,0,114,68,0,0,0,114,24,0,
-    0,0,114,17,0,0,0,114,5,0,0,0,114,215,0,0,
-    0,114,215,0,0,0,122,3,0,0,115,8,0,0,0,8,
-    0,4,2,6,2,10,4,115,66,0,0,0,0,129,0,129,
-    0,129,0,129,0,129,0,129,0,129,8,255,0,127,0,127,
-    0,127,0,127,0,127,0,127,0,127,2,3,0,129,0,129,
-    0,129,0,129,0,129,0,129,0,129,2,253,0,127,0,127,
-    0,127,0,127,0,127,0,127,0,127,6,7,10,4,115,28,
-    0,0,0,1,1,1,1,1,1,1,1,5,47,1,1,5,
-    28,5,28,5,28,5,28,5,28,5,28,5,28,5,28,114,
-    17,0,0,0,114,215,0,0,0,99,3,0,0,0,0,0,
-    0,0,0,0,0,0,5,0,0,0,3,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,18,116,
-    2,100,3,131,1,130,1,124,3,100,4,25,0,125,4,124,
-    0,114,30,100,5,160,3,124,4,124,0,161,2,83,0,124,
-    4,83,0,41,7,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,152,0,0,0,114,45,
-    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,27,0,0,0,250,5,123,125,
-    46,123,125,78,41,4,218,6,114,115,112,108,105,116,218,3,
-    108,101,110,114,94,0,0,0,114,53,0,0,0,41,5,114,
-    20,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,
-    115,5,0,0,0,32,32,32,32,32,114,5,0,0,0,218,
-    13,95,114,101,115,111,108,118,101,95,110,97,109,101,114,226,
-    0,0,0,135,3,0,0,115,10,0,0,0,16,2,12,1,
-    8,1,8,1,20,1,115,10,0,0,0,16,2,10,1,10,
-    1,8,1,20,1,115,64,0,0,0,12,19,12,42,27,30,
-    32,37,40,41,32,41,12,42,5,9,8,11,12,16,8,17,
-    20,25,8,25,5,80,15,26,27,79,15,80,9,80,12,16,
-    17,18,12,19,5,9,42,46,12,56,12,19,12,38,27,31,
-    33,37,12,38,5,56,52,56,5,56,114,17,0,0,0,99,
-    3,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,
-    3,0,0,0,115,60,0,0,0,116,0,124,0,131,1,155,
-    0,100,1,157,2,125,3,116,1,160,2,124,3,116,3,161,
-    2,1,0,124,0,160,4,124,1,124,2,161,2,125,4,124,
-    4,100,0,117,0,114,25,100,0,83,0,116,5,124,1,124,
-    4,131,2,83,0,41,2,78,122,53,46,102,105,110,100,95,
-    115,112,101,99,40,41,32,110,111,116,32,102,111,117,110,100,
-    59,32,102,97,108,108,105,110,103,32,98,97,99,107,32,116,
-    111,32,102,105,110,100,95,109,111,100,117,108,101,40,41,41,
-    6,114,6,0,0,0,114,109,0,0,0,114,110,0,0,0,
-    114,182,0,0,0,114,197,0,0,0,114,112,0,0,0,41,
-    5,218,6,102,105,110,100,101,114,114,20,0,0,0,114,194,
-    0,0,0,114,116,0,0,0,114,130,0,0,0,115,5,0,
-    0,0,32,32,32,32,32,114,5,0,0,0,218,17,95,102,
-    105,110,100,95,115,112,101,99,95,108,101,103,97,99,121,114,
-    228,0,0,0,144,3,0,0,115,12,0,0,0,14,1,12,
-    2,12,1,8,1,4,1,10,1,115,16,0,0,0,6,1,
-    6,1,2,255,12,2,12,1,6,1,6,1,10,1,115,60,
-    0,0,0,15,27,28,34,15,35,12,59,12,59,12,59,5,
-    8,5,14,5,39,20,23,25,38,5,39,5,39,14,20,14,
-    44,33,37,39,43,14,44,5,11,8,14,18,22,8,22,5,
-    20,16,20,16,20,12,28,29,33,35,41,12,42,5,42,114,
-    17,0,0,0,99,3,0,0,0,0,0,0,0,0,0,0,
-    0,10,0,0,0,3,0,0,0,115,30,1,0,0,116,0,
-    106,1,125,3,124,3,100,1,117,0,114,11,116,2,100,2,
-    131,1,130,1,124,3,115,19,116,3,160,4,100,3,116,5,
-    161,2,1,0,124,0,116,0,106,6,118,0,125,4,124,3,
-    68,0,93,112,125,5,116,7,131,0,53,0,1,0,9,0,
-    124,5,106,8,125,6,110,27,35,0,4,0,116,9,121,142,
-    1,0,1,0,1,0,116,10,124,5,124,0,124,1,131,3,
-    125,7,124,7,100,1,117,0,114,61,89,0,100,1,4,0,
-    4,0,131,3,1,0,113,26,89,0,110,7,37,0,124,6,
-    124,0,124,1,124,2,131,3,125,7,100,1,4,0,4,0,
-    131,3,1,0,110,11,35,0,49,0,115,81,119,4,37,0,
-    1,0,1,0,1,0,89,0,1,0,1,0,124,7,100,1,
-    117,1,114,138,124,4,115,134,124,0,116,0,106,6,118,0,
-    114,134,116,0,106,6,124,0,25,0,125,8,9,0,124,8,
-    106,11,125,9,110,14,35,0,4,0,116,9,121,141,1,0,
-    1,0,1,0,124,7,6,0,89,0,2,0,1,0,83,0,
-    37,0,124,9,100,1,117,0,114,130,124,7,2,0,1,0,
-    83,0,124,9,2,0,1,0,83,0,124,7,2,0,1,0,
-    83,0,113,26,100,1,83,0,119,0,119,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,18,0,0,0,218,9,109,101,
-    116,97,95,112,97,116,104,114,94,0,0,0,114,109,0,0,
-    0,114,110,0,0,0,114,182,0,0,0,114,113,0,0,0,
-    114,215,0,0,0,114,196,0,0,0,114,2,0,0,0,114,
-    228,0,0,0,114,121,0,0,0,41,10,114,20,0,0,0,
-    114,194,0,0,0,114,195,0,0,0,114,229,0,0,0,90,
-    9,105,115,95,114,101,108,111,97,100,114,227,0,0,0,114,
-    196,0,0,0,114,117,0,0,0,114,118,0,0,0,114,121,
-    0,0,0,115,10,0,0,0,32,32,32,32,32,32,32,32,
-    32,32,114,5,0,0,0,218,10,95,102,105,110,100,95,115,
-    112,101,99,114,230,0,0,0,154,3,0,0,115,78,0,0,
-    0,6,2,8,1,8,2,4,3,12,1,10,5,8,1,8,
-    1,2,1,8,1,2,128,12,1,12,1,8,1,2,1,12,
-    250,4,5,2,128,12,3,20,248,2,128,12,0,8,9,14,
-    2,10,1,2,1,8,1,2,128,12,1,12,4,2,128,8,
-    2,8,1,8,2,8,2,2,239,4,19,2,243,2,244,115,
-    98,0,0,0,6,2,6,1,2,3,2,255,6,1,2,2,
-    14,1,10,5,2,1,4,29,2,227,4,1,6,8,8,250,
-    2,128,2,4,2,253,8,3,12,254,6,1,4,1,12,2,
-    4,254,2,128,32,2,2,128,12,0,6,1,2,17,2,241,
-    2,15,8,241,2,15,10,242,2,12,8,246,2,128,2,5,
-    2,252,20,4,2,128,6,2,2,3,8,254,8,2,10,2,
-    4,2,2,247,2,243,115,30,1,0,0,17,20,17,30,5,
-    14,8,17,21,25,8,25,5,43,15,26,27,42,15,43,9,
-    43,12,21,5,64,9,18,9,64,24,48,50,63,9,64,9,
-    64,17,21,25,28,25,36,17,36,5,14,19,28,5,20,5,
-    20,9,15,14,32,14,34,9,53,9,53,13,53,29,35,29,
-    45,17,26,17,26,0,0,13,29,20,34,13,29,13,29,13,
-    29,13,29,24,41,42,48,50,54,56,60,24,61,17,21,20,
-    24,28,32,20,32,17,29,21,29,9,53,9,53,9,53,9,
-    53,9,53,9,53,17,29,17,29,0,0,24,33,34,38,40,
-    44,46,52,24,53,17,21,9,53,9,53,9,53,9,53,9,
-    53,9,53,9,53,9,53,9,53,9,53,0,0,9,53,9,
-    53,9,53,9,53,9,53,9,53,12,16,24,28,12,28,9,
-    28,20,29,13,28,34,38,42,45,42,53,34,53,13,28,26,
-    29,26,37,38,42,26,43,17,23,17,40,32,38,32,47,21,
-    29,21,29,0,0,17,32,24,38,17,32,17,32,17,32,17,
-    32,28,32,21,32,21,32,21,32,21,32,21,32,0,0,24,
-    32,36,40,24,40,21,40,32,36,25,36,25,36,25,36,32,
-    40,25,40,25,40,25,40,24,28,17,28,17,28,17,28,9,
-    28,16,20,16,20,17,32,13,29,115,63,0,0,0,159,1,
-    65,12,5,161,3,37,4,164,1,65,12,5,165,17,63,11,
-    182,1,65,12,5,189,9,65,12,5,193,12,4,65,16,13,
-    193,17,3,65,16,13,193,40,3,65,44,2,193,44,9,65,
-    57,9,194,13,1,65,57,9,194,14,1,63,11,99,3,0,
-    0,0,0,0,0,0,0,0,0,0,5,0,0,0,3,0,
-    0,0,115,110,0,0,0,116,0,124,0,116,1,131,2,115,
-    14,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,22,116,5,100,3,131,
-    1,130,1,124,2,100,2,107,4,114,41,116,0,124,1,116,
-    1,131,2,115,35,116,2,100,4,131,1,130,1,124,1,115,
-    41,116,6,100,5,131,1,130,1,124,0,115,53,124,2,100,
-    2,107,2,114,51,116,5,100,6,131,1,130,1,100,7,83,
-    0,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,27,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,53,0,0,0,114,
-    3,0,0,0,218,10,86,97,108,117,101,69,114,114,111,114,
-    114,94,0,0,0,169,3,114,20,0,0,0,114,224,0,0,
-    0,114,225,0,0,0,115,3,0,0,0,32,32,32,114,5,
-    0,0,0,218,13,95,115,97,110,105,116,121,95,99,104,101,
-    99,107,114,236,0,0,0,201,3,0,0,115,24,0,0,0,
-    10,2,18,1,8,1,8,1,8,1,10,1,8,1,4,1,
-    8,1,12,2,8,1,8,255,115,34,0,0,0,8,2,20,
-    1,6,1,10,1,6,1,2,5,8,252,2,4,8,253,2,
-    1,2,2,2,255,6,1,2,1,2,1,6,255,18,1,115,
-    110,0,0,0,12,22,23,27,29,32,12,33,5,78,15,24,
-    25,58,25,77,66,70,71,75,66,76,25,77,15,78,9,78,
-    8,13,16,17,8,17,5,47,15,25,26,46,15,47,9,47,
-    8,13,16,17,8,17,5,41,16,26,27,34,36,39,16,40,
-    9,41,19,28,29,62,19,63,13,63,18,25,9,41,19,30,
-    31,40,19,41,13,41,12,16,5,46,21,26,30,31,21,31,
-    5,46,15,25,26,45,15,46,9,46,5,46,5,46,5,46,
-    5,46,114,17,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,0,0,0,0,8,0,0,0,
-    3,0,0,0,115,86,1,0,0,100,0,125,2,124,0,160,
-    0,100,1,161,1,100,2,25,0,125,3,100,0,125,4,124,
-    3,114,76,124,3,116,1,106,2,118,1,114,23,116,3,124,
-    1,124,3,131,2,1,0,124,0,116,1,106,2,118,0,114,
-    33,116,1,106,2,124,0,25,0,83,0,116,1,106,2,124,
-    3,25,0,125,5,9,0,124,5,106,4,125,2,110,23,35,
-    0,4,0,116,5,121,170,1,0,1,0,1,0,116,6,100,
-    3,23,0,160,7,124,0,124,3,161,2,125,6,116,8,124,
-    6,124,0,100,4,141,2,100,0,130,2,37,0,124,5,106,
+    5,57,5,57,5,57,6,18,5,68,5,68,5,68,5,68,
+    6,18,5,61,5,61,5,61,5,61,6,17,6,23,5,20,
+    5,20,5,20,5,20,5,20,6,17,6,23,5,20,5,20,
+    5,20,5,20,5,20,6,17,6,23,5,21,5,21,5,21,
+    5,21,5,21,19,30,31,48,19,49,5,16,5,16,5,16,
+    114,17,0,0,0,114,188,0,0,0,99,0,0,0,0,0,
+    0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,115,
+    126,0,0,0,101,0,90,1,100,0,90,2,100,1,90,3,
+    100,2,90,4,101,5,100,3,132,0,131,1,90,6,101,7,
+    100,13,100,5,132,1,131,1,90,8,101,7,100,14,100,6,
+    132,1,131,1,90,9,101,5,100,7,132,0,131,1,90,10,
+    101,5,100,8,132,0,131,1,90,11,101,7,100,9,132,0,
+    131,1,90,12,101,7,101,13,100,10,132,0,131,1,131,1,
+    90,14,101,7,101,13,100,11,132,0,131,1,131,1,90,15,
+    101,7,101,13,100,12,132,0,131,1,131,1,90,16,100,4,
+    83,0,41,15,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,90,6,102,114,111,122,101,110,99,1,0,0,
+    0,0,0,0,0,0,0,0,0,4,0,0,0,3,0,0,
+    0,115,28,0,0,0,116,0,160,1,100,1,116,2,161,2,
+    1,0,100,2,160,3,124,0,106,4,116,5,106,6,161,2,
+    83,0,41,4,114,189,0,0,0,122,80,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,40,41,32,105,115,32,100,101,112,114,101,
+    99,97,116,101,100,32,97,110,100,32,115,108,97,116,101,100,
+    32,102,111,114,32,114,101,109,111,118,97,108,32,105,110,32,
+    80,121,116,104,111,110,32,51,46,49,50,114,179,0,0,0,
+    78,41,7,114,109,0,0,0,114,110,0,0,0,114,111,0,
+    0,0,114,53,0,0,0,114,8,0,0,0,114,207,0,0,
+    0,114,164,0,0,0,41,1,218,1,109,115,1,0,0,0,
+    32,114,5,0,0,0,114,122,0,0,0,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,48,3,0,0,115,8,0,0,0,
+    6,7,2,1,4,255,16,2,115,6,0,0,0,2,7,10,
+    1,16,1,115,28,0,0,0,9,18,9,80,24,59,61,79,
+    9,80,9,80,16,36,16,79,44,45,44,54,56,70,56,78,
+    16,79,9,79,114,17,0,0,0,78,99,4,0,0,0,0,
+    0,0,0,0,0,0,0,5,0,0,0,3,0,0,0,115,
+    30,0,0,0,116,0,160,1,124,1,161,1,114,13,116,2,
+    124,1,124,0,124,0,106,3,100,1,141,3,83,0,100,0,
+    83,0,114,191,0,0,0,41,4,114,70,0,0,0,114,106,
+    0,0,0,114,112,0,0,0,114,164,0,0,0,114,192,0,
+    0,0,115,4,0,0,0,32,32,32,32,114,5,0,0,0,
+    114,196,0,0,0,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,59,
+    3,0,0,115,6,0,0,0,10,2,16,1,4,2,115,8,
+    0,0,0,8,2,2,3,16,254,4,2,115,30,0,0,0,
+    12,16,12,36,27,35,12,36,9,24,20,36,37,45,47,50,
+    59,62,59,70,20,71,20,71,13,71,20,24,20,24,114,17,
+    0,0,0,99,3,0,0,0,0,0,0,0,0,0,0,0,
+    4,0,0,0,3,0,0,0,115,30,0,0,0,116,0,160,
+    1,100,1,116,2,161,2,1,0,116,3,160,4,124,1,161,
+    1,114,13,124,0,83,0,100,2,83,0,41,3,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,122,105,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,40,41,32,105,115,32,100,101,
+    112,114,101,99,97,116,101,100,32,97,110,100,32,115,108,97,
+    116,101,100,32,102,111,114,32,114,101,109,111,118,97,108,32,
+    105,110,32,80,121,116,104,111,110,32,51,46,49,50,59,32,
+    117,115,101,32,102,105,110,100,95,115,112,101,99,40,41,32,
+    105,110,115,116,101,97,100,78,41,5,114,109,0,0,0,114,
+    110,0,0,0,114,111,0,0,0,114,70,0,0,0,114,106,
+    0,0,0,41,3,114,193,0,0,0,114,96,0,0,0,114,
+    194,0,0,0,115,3,0,0,0,32,32,32,114,5,0,0,
+    0,114,197,0,0,0,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,66,3,0,0,115,8,0,0,0,6,7,2,2,4,
+    254,18,3,115,10,0,0,0,2,7,2,2,2,255,6,1,
+    18,1,115,30,0,0,0,9,18,9,43,24,84,24,42,9,
+    43,9,43,23,27,23,47,38,46,23,47,16,57,16,19,9,
+    57,53,57,9,57,114,17,0,0,0,99,1,0,0,0,0,
+    0,0,0,0,0,0,0,1,0,0,0,3,0,0,0,114,
+    199,0,0,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,24,0,0,0,114,187,0,0,0,115,1,0,
+    0,0,32,114,5,0,0,0,114,175,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,78,3,0,0,115,
+    2,0,0,0,4,0,115,2,0,0,0,4,128,115,4,0,
+    0,0,0,0,0,0,114,17,0,0,0,99,1,0,0,0,
+    0,0,0,0,0,0,0,0,4,0,0,0,3,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,18,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,114,105,0,0,0,41,10,114,121,0,0,
+    0,114,20,0,0,0,114,70,0,0,0,114,106,0,0,0,
+    114,94,0,0,0,114,53,0,0,0,114,80,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,13,0,0,0,41,3,114,
+    118,0,0,0,114,20,0,0,0,218,4,99,111,100,101,115,
+    3,0,0,0,32,32,32,114,5,0,0,0,114,176,0,0,
+    0,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,82,3,0,
+    0,115,14,0,0,0,8,2,10,1,10,1,2,1,6,255,
+    12,2,16,1,115,14,0,0,0,8,2,8,1,2,2,10,
+    255,8,1,12,1,16,1,115,64,0,0,0,16,22,16,31,
+    16,36,9,13,16,20,16,36,31,35,16,36,9,41,19,30,
+    31,60,31,73,68,72,31,73,36,40,19,41,19,41,13,41,
+    16,41,42,46,42,64,66,70,16,71,9,13,9,13,14,18,
+    20,26,20,35,9,36,9,36,9,36,9,36,114,17,0,0,
+    0,99,2,0,0,0,0,0,0,0,0,0,0,0,3,0,
+    0,0,3,0,0,0,115,10,0,0,0,116,0,124,0,124,
+    1,131,2,83,0,41,2,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,78,41,1,114,119,0,0,0,
+    114,200,0,0,0,115,2,0,0,0,32,32,114,5,0,0,
+    0,114,183,0,0,0,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,91,3,0,0,243,2,0,0,0,10,8,114,212,0,
+    0,0,115,10,0,0,0,16,33,34,37,39,47,16,48,9,
+    48,114,17,0,0,0,99,2,0,0,0,0,0,0,0,0,
+    0,0,0,3,0,0,0,3,0,0,0,243,10,0,0,0,
+    116,0,160,1,124,1,161,1,83,0,41,2,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,78,41,2,114,70,
+    0,0,0,114,209,0,0,0,114,200,0,0,0,115,2,0,
+    0,0,32,32,114,5,0,0,0,114,201,0,0,0,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,101,3,0,0,243,2,0,0,0,
+    10,4,114,214,0,0,0,115,10,0,0,0,16,20,16,48,
+    39,47,16,48,9,48,114,17,0,0,0,99,2,0,0,0,
+    0,0,0,0,0,0,0,0,1,0,0,0,3,0,0,0,
+    114,199,0,0,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,24,0,0,0,114,200,0,0,0,115,2,0,0,0,32,
+    32,114,5,0,0,0,114,203,0,0,0,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,107,3,0,0,114,202,0,0,0,114,
+    202,0,0,0,115,4,0,0,0,16,20,16,20,114,17,0,
+    0,0,99,2,0,0,0,0,0,0,0,0,0,0,0,3,
+    0,0,0,3,0,0,0,114,213,0,0,0,41,2,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,78,41,
+    2,114,70,0,0,0,90,17,105,115,95,102,114,111,122,101,
+    110,95,112,97,99,107,97,103,101,114,200,0,0,0,115,2,
+    0,0,0,32,32,114,5,0,0,0,114,136,0,0,0,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,113,3,0,0,114,214,
+    0,0,0,114,214,0,0,0,115,10,0,0,0,16,20,16,
+    48,39,47,16,48,9,48,114,17,0,0,0,114,204,0,0,
+    0,114,0,0,0,0,41,17,114,8,0,0,0,114,7,0,
+    0,0,114,1,0,0,0,114,9,0,0,0,114,164,0,0,
+    0,114,205,0,0,0,114,122,0,0,0,114,206,0,0,0,
+    114,196,0,0,0,114,197,0,0,0,114,175,0,0,0,114,
+    176,0,0,0,114,183,0,0,0,114,108,0,0,0,114,201,
+    0,0,0,114,203,0,0,0,114,136,0,0,0,114,24,0,
+    0,0,114,17,0,0,0,114,5,0,0,0,114,207,0,0,
+    0,114,207,0,0,0,37,3,0,0,115,48,0,0,0,8,
+    0,4,2,4,7,2,2,8,1,2,10,10,1,2,6,10,
+    1,2,11,8,1,2,3,8,1,2,8,8,1,2,9,2,
+    1,10,1,2,4,2,1,10,1,2,4,2,1,14,1,115,
+    102,0,0,0,0,129,0,129,0,129,0,129,0,129,0,129,
+    8,213,0,127,0,127,0,127,0,127,0,127,0,127,2,50,
+    0,129,0,129,0,129,0,129,0,129,0,129,2,206,0,127,
+    0,127,0,127,0,127,0,127,0,127,4,52,2,2,8,9,
+    2,2,2,1,8,4,2,2,2,1,8,9,2,2,8,2,
+    2,2,8,7,2,2,8,8,2,2,2,1,10,3,2,2,
+    2,1,10,3,2,2,2,1,14,3,115,126,0,0,0,1,
+    1,1,1,1,1,1,1,5,8,1,1,15,23,5,12,6,
+    18,5,79,5,79,5,79,5,79,6,17,39,43,5,24,5,
+    24,5,24,5,24,6,17,41,45,5,57,5,57,5,57,5,
+    57,6,18,5,57,5,57,5,57,5,57,6,18,5,36,5,
+    36,5,36,5,36,6,17,5,48,5,48,5,48,5,48,6,
+    17,6,22,5,48,5,48,5,48,5,48,5,48,6,17,6,
+    22,5,20,5,20,5,20,5,20,5,20,6,17,6,22,5,
+    48,5,48,5,48,5,48,5,48,5,48,5,48,114,17,0,
+    0,0,114,207,0,0,0,99,0,0,0,0,0,0,0,0,
+    0,0,0,0,1,0,0,0,0,0,0,0,115,28,0,0,
+    0,101,0,90,1,100,0,90,2,100,1,90,3,100,2,132,
+    0,90,4,100,3,132,0,90,5,100,4,83,0,41,5,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,0,0,0,0,2,0,0,0,3,0,0,0,243,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,70,
+    0,0,0,114,71,0,0,0,114,55,0,0,0,115,1,0,
+    0,0,32,114,5,0,0,0,114,65,0,0,0,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,126,3,0,0,243,
+    2,0,0,0,12,2,114,217,0,0,0,115,12,0,0,0,
+    9,13,9,28,9,28,9,28,9,28,9,28,114,17,0,0,
+    0,99,4,0,0,0,0,0,0,0,0,0,0,0,2,0,
+    0,0,3,0,0,0,114,216,0,0,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,70,
+    0,0,0,114,73,0,0,0,41,4,114,35,0,0,0,218,
+    8,101,120,99,95,116,121,112,101,218,9,101,120,99,95,118,
+    97,108,117,101,218,13,101,120,99,95,116,114,97,99,101,98,
+    97,99,107,115,4,0,0,0,32,32,32,32,114,5,0,0,
+    0,114,68,0,0,0,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,130,3,0,0,114,217,0,0,0,114,217,0,0,
+    0,115,12,0,0,0,9,13,9,28,9,28,9,28,9,28,
+    9,28,114,17,0,0,0,78,41,6,114,8,0,0,0,114,
+    7,0,0,0,114,1,0,0,0,114,9,0,0,0,114,65,
+    0,0,0,114,68,0,0,0,114,24,0,0,0,114,17,0,
+    0,0,114,5,0,0,0,114,215,0,0,0,114,215,0,0,
+    0,122,3,0,0,115,8,0,0,0,8,0,4,2,6,2,
+    10,4,115,66,0,0,0,0,129,0,129,0,129,0,129,0,
+    129,0,129,0,129,8,255,0,127,0,127,0,127,0,127,0,
+    127,0,127,0,127,2,3,0,129,0,129,0,129,0,129,0,
+    129,0,129,0,129,2,253,0,127,0,127,0,127,0,127,0,
+    127,0,127,0,127,6,7,10,4,115,28,0,0,0,1,1,
+    1,1,1,1,1,1,5,47,1,1,5,28,5,28,5,28,
+    5,28,5,28,5,28,5,28,5,28,114,17,0,0,0,114,
+    215,0,0,0,99,3,0,0,0,0,0,0,0,0,0,0,
+    0,5,0,0,0,3,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,18,116,2,100,3,131,1,
+    130,1,124,3,100,4,25,0,125,4,124,0,114,30,100,5,
+    160,3,124,4,124,0,161,2,83,0,124,4,83,0,41,7,
+    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,152,0,0,0,114,45,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,27,0,0,0,250,5,123,125,46,123,125,78,41,
+    4,218,6,114,115,112,108,105,116,218,3,108,101,110,114,94,
+    0,0,0,114,53,0,0,0,41,5,114,20,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,115,5,0,0,0,
+    32,32,32,32,32,114,5,0,0,0,218,13,95,114,101,115,
+    111,108,118,101,95,110,97,109,101,114,226,0,0,0,135,3,
+    0,0,115,10,0,0,0,16,2,12,1,8,1,8,1,20,
+    1,115,10,0,0,0,16,2,10,1,10,1,8,1,20,1,
+    115,64,0,0,0,12,19,12,42,27,30,32,37,40,41,32,
+    41,12,42,5,9,8,11,12,16,8,17,20,25,8,25,5,
+    80,15,26,27,79,15,80,9,80,12,16,17,18,12,19,5,
+    9,42,46,12,56,12,19,12,38,27,31,33,37,12,38,5,
+    56,52,56,5,56,114,17,0,0,0,99,3,0,0,0,0,
+    0,0,0,0,0,0,0,4,0,0,0,3,0,0,0,115,
+    60,0,0,0,116,0,124,0,131,1,155,0,100,1,157,2,
+    125,3,116,1,160,2,124,3,116,3,161,2,1,0,124,0,
+    160,4,124,1,124,2,161,2,125,4,124,4,100,0,117,0,
+    114,25,100,0,83,0,116,5,124,1,124,4,131,2,83,0,
+    41,2,78,122,53,46,102,105,110,100,95,115,112,101,99,40,
+    41,32,110,111,116,32,102,111,117,110,100,59,32,102,97,108,
+    108,105,110,103,32,98,97,99,107,32,116,111,32,102,105,110,
+    100,95,109,111,100,117,108,101,40,41,41,6,114,6,0,0,
+    0,114,109,0,0,0,114,110,0,0,0,114,182,0,0,0,
+    114,197,0,0,0,114,112,0,0,0,41,5,218,6,102,105,
+    110,100,101,114,114,20,0,0,0,114,194,0,0,0,114,116,
+    0,0,0,114,130,0,0,0,115,5,0,0,0,32,32,32,
+    32,32,114,5,0,0,0,218,17,95,102,105,110,100,95,115,
+    112,101,99,95,108,101,103,97,99,121,114,228,0,0,0,144,
+    3,0,0,115,12,0,0,0,14,1,12,2,12,1,8,1,
+    4,1,10,1,115,16,0,0,0,6,1,6,1,2,255,12,
+    2,12,1,6,1,6,1,10,1,115,60,0,0,0,15,27,
+    28,34,15,35,12,59,12,59,12,59,5,8,5,14,5,39,
+    20,23,25,38,5,39,5,39,14,20,14,44,33,37,39,43,
+    14,44,5,11,8,14,18,22,8,22,5,20,16,20,16,20,
+    12,28,29,33,35,41,12,42,5,42,114,17,0,0,0,99,
+    3,0,0,0,0,0,0,0,0,0,0,0,10,0,0,0,
+    3,0,0,0,115,30,1,0,0,116,0,106,1,125,3,124,
+    3,100,1,117,0,114,11,116,2,100,2,131,1,130,1,124,
+    3,115,19,116,3,160,4,100,3,116,5,161,2,1,0,124,
+    0,116,0,106,6,118,0,125,4,124,3,68,0,93,114,125,
+    5,116,7,131,0,53,0,1,0,9,0,124,5,106,8,125,
+    6,110,28,35,0,4,0,116,9,121,63,1,0,1,0,1,
+    0,116,10,124,5,124,0,124,1,131,3,125,7,124,7,100,
+    1,117,0,114,61,89,0,100,1,4,0,4,0,131,3,1,
+    0,113,26,89,0,110,8,119,0,37,0,124,6,124,0,124,
+    1,124,2,131,3,125,7,100,1,4,0,4,0,131,3,1,
+    0,110,11,35,0,49,0,115,82,119,4,37,0,1,0,1,
+    0,1,0,89,0,1,0,1,0,124,7,100,1,117,1,114,
+    140,124,4,115,136,124,0,116,0,106,6,118,0,114,136,116,
+    0,106,6,124,0,25,0,125,8,9,0,124,8,106,11,125,
+    9,110,15,35,0,4,0,116,9,121,122,1,0,1,0,1,
+    0,124,7,6,0,89,0,2,0,1,0,83,0,119,0,37,
+    0,124,9,100,1,117,0,114,132,124,7,2,0,1,0,83,
+    0,124,9,2,0,1,0,83,0,124,7,2,0,1,0,83,
+    0,113,26,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,18,0,0,0,218,9,109,101,116,97,95,112,97,
+    116,104,114,94,0,0,0,114,109,0,0,0,114,110,0,0,
+    0,114,182,0,0,0,114,113,0,0,0,114,215,0,0,0,
+    114,196,0,0,0,114,2,0,0,0,114,228,0,0,0,114,
+    121,0,0,0,41,10,114,20,0,0,0,114,194,0,0,0,
+    114,195,0,0,0,114,229,0,0,0,90,9,105,115,95,114,
+    101,108,111,97,100,114,227,0,0,0,114,196,0,0,0,114,
+    117,0,0,0,114,118,0,0,0,114,121,0,0,0,115,10,
+    0,0,0,32,32,32,32,32,32,32,32,32,32,114,5,0,
+    0,0,218,10,95,102,105,110,100,95,115,112,101,99,114,230,
+    0,0,0,154,3,0,0,115,78,0,0,0,6,2,8,1,
+    8,2,4,3,12,1,10,5,8,1,8,1,2,1,8,1,
+    2,128,12,1,12,1,8,1,2,1,12,250,4,5,2,254,
+    2,128,12,5,20,248,2,128,12,0,8,9,14,2,10,1,
+    2,1,8,1,2,128,12,1,12,4,2,252,2,128,8,6,
+    8,1,8,2,8,2,2,239,4,19,115,94,0,0,0,6,
+    2,6,1,2,3,2,255,6,1,2,2,14,1,10,5,2,
+    1,4,29,2,227,4,1,6,8,8,250,2,128,2,4,2,
+    253,8,3,12,254,6,1,4,1,12,2,6,254,2,128,32,
+    2,2,128,12,0,6,1,2,17,2,241,2,15,8,241,2,
+    15,10,242,2,12,8,246,2,128,2,5,2,252,22,4,2,
+    128,6,2,2,3,8,254,8,2,10,2,4,2,115,30,1,
+    0,0,17,20,17,30,5,14,8,17,21,25,8,25,5,43,
+    15,26,27,42,15,43,9,43,12,21,5,64,9,18,9,64,
+    24,48,50,63,9,64,9,64,17,21,25,28,25,36,17,36,
+    5,14,19,28,5,20,5,20,9,15,14,32,14,34,9,53,
+    9,53,13,53,29,35,29,45,17,26,17,26,0,0,13,29,
+    20,34,13,29,13,29,13,29,13,29,24,41,42,48,50,54,
+    56,60,24,61,17,21,20,24,28,32,20,32,17,29,21,29,
+    9,53,9,53,9,53,9,53,9,53,9,53,17,29,17,29,
+    13,29,0,0,24,33,34,38,40,44,46,52,24,53,17,21,
+    9,53,9,53,9,53,9,53,9,53,9,53,9,53,9,53,
+    9,53,9,53,0,0,9,53,9,53,9,53,9,53,9,53,
+    9,53,12,16,24,28,12,28,9,28,20,29,13,28,34,38,
+    42,45,42,53,34,53,13,28,26,29,26,37,38,42,26,43,
+    17,23,17,40,32,38,32,47,21,29,21,29,0,0,17,32,
+    24,38,17,32,17,32,17,32,17,32,28,32,21,32,21,32,
+    21,32,21,32,21,32,17,32,0,0,24,32,36,40,24,40,
+    21,40,32,36,25,36,25,36,25,36,32,40,25,40,25,40,
+    25,40,24,28,17,28,17,28,17,28,9,28,16,20,16,20,
+    115,70,0,0,0,159,1,65,13,5,161,3,37,4,164,1,
+    65,13,5,165,17,65,0,11,182,1,65,13,5,189,2,65,
+    13,5,191,1,65,0,11,193,0,7,65,13,5,193,13,4,
+    65,17,13,193,18,3,65,17,13,193,41,3,65,45,2,193,
+    45,9,65,59,9,193,58,1,65,59,9,99,3,0,0,0,
+    0,0,0,0,0,0,0,0,5,0,0,0,3,0,0,0,
+    115,110,0,0,0,116,0,124,0,116,1,131,2,115,14,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,22,116,5,100,3,131,1,130,
+    1,124,2,100,2,107,4,114,41,116,0,124,1,116,1,131,
+    2,115,35,116,2,100,4,131,1,130,1,124,1,115,41,116,
+    6,100,5,131,1,130,1,124,0,115,51,124,2,100,2,107,
+    2,114,53,116,5,100,6,131,1,130,1,100,7,83,0,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,27,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,53,0,0,0,114,3,0,
+    0,0,218,10,86,97,108,117,101,69,114,114,111,114,114,94,
+    0,0,0,169,3,114,20,0,0,0,114,224,0,0,0,114,
+    225,0,0,0,115,3,0,0,0,32,32,32,114,5,0,0,
+    0,218,13,95,115,97,110,105,116,121,95,99,104,101,99,107,
+    114,236,0,0,0,201,3,0,0,115,24,0,0,0,10,2,
+    18,1,8,1,8,1,8,1,10,1,8,1,4,1,8,1,
+    12,2,8,1,8,255,115,34,0,0,0,8,2,20,1,6,
+    1,10,1,6,1,2,5,8,252,2,4,8,253,2,1,2,
+    2,2,255,6,1,2,1,2,1,6,255,18,1,115,110,0,
+    0,0,12,22,23,27,29,32,12,33,5,78,15,24,25,58,
+    25,77,66,70,71,75,66,76,25,77,15,78,9,78,8,13,
+    16,17,8,17,5,47,15,25,26,46,15,47,9,47,8,13,
+    16,17,8,17,5,41,16,26,27,34,36,39,16,40,9,41,
+    19,28,29,62,19,63,13,63,18,25,9,41,19,30,31,40,
+    19,41,13,41,12,16,5,46,21,26,30,31,21,31,5,46,
+    15,25,26,45,15,46,9,46,5,46,5,46,5,46,5,46,
+    114,17,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,0,0,0,0,8,0,0,0,3,0,
+    0,0,115,86,1,0,0,100,0,125,2,124,0,160,0,100,
+    1,161,1,100,2,25,0,125,3,100,0,125,4,124,3,114,
+    77,124,3,116,1,106,2,118,1,114,23,116,3,124,1,124,
+    3,131,2,1,0,124,0,116,1,106,2,118,0,114,33,116,
+    1,106,2,124,0,25,0,83,0,116,1,106,2,124,3,25,
+    0,125,5,9,0,124,5,106,4,125,2,110,24,35,0,4,
+    0,116,5,121,65,1,0,1,0,1,0,116,6,100,3,23,
+    0,160,7,124,0,124,3,161,2,125,6,116,8,124,6,124,
+    0,100,4,141,2,100,0,130,2,119,0,37,0,124,5,106,
     9,125,4,124,0,160,0,100,1,161,1,100,5,25,0,125,
     7,116,10,124,0,124,2,131,2,125,8,124,8,100,0,117,
-    0,114,94,116,8,116,6,160,7,124,0,161,1,124,0,100,
-    4,141,2,130,1,124,4,114,102,124,4,106,11,160,12,124,
+    0,114,95,116,8,116,6,160,7,124,0,161,1,124,0,100,
+    4,141,2,130,1,124,4,114,103,124,4,106,11,160,12,124,
     7,161,1,1,0,9,0,116,13,124,8,131,1,125,9,124,
-    4,114,114,124,4,106,11,160,14,161,0,1,0,110,10,35,
-    0,124,4,114,169,124,4,106,11,160,14,161,0,1,0,119,
-    0,37,0,124,3,114,166,116,1,106,2,124,3,25,0,125,
-    5,9,0,116,15,124,5,124,7,124,9,131,3,1,0,124,
-    9,83,0,35,0,4,0,116,5,121,168,1,0,1,0,1,
-    0,100,6,124,3,155,2,100,7,124,7,155,2,157,4,125,
-    6,116,16,160,17,124,6,116,18,161,2,1,0,89,0,124,
-    9,83,0,37,0,124,9,83,0,119,0,119,0,119,0,41,
-    8,78,114,152,0,0,0,114,27,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,114,19,0,0,0,233,2,0,0,0,122,
-    27,67,97,110,110,111,116,32,115,101,116,32,97,110,32,97,
-    116,116,114,105,98,117,116,101,32,111,110,32,122,18,32,102,
-    111,114,32,99,104,105,108,100,32,109,111,100,117,108,101,32,
-    41,19,114,153,0,0,0,114,18,0,0,0,114,113,0,0,
-    0,114,80,0,0,0,114,167,0,0,0,114,2,0,0,0,
-    218,8,95,69,82,82,95,77,83,71,114,53,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,121,0,0,0,114,230,0,0,0,114,138,
-    0,0,0,114,142,0,0,0,114,186,0,0,0,114,184,0,
-    0,0,114,11,0,0,0,114,109,0,0,0,114,110,0,0,
-    0,114,182,0,0,0,41,10,114,20,0,0,0,218,7,105,
-    109,112,111,114,116,95,114,194,0,0,0,114,154,0,0,0,
-    90,11,112,97,114,101,110,116,95,115,112,101,99,90,13,112,
-    97,114,101,110,116,95,109,111,100,117,108,101,114,116,0,0,
-    0,90,5,99,104,105,108,100,114,117,0,0,0,114,118,0,
-    0,0,115,10,0,0,0,32,32,32,32,32,32,32,32,32,
-    32,114,5,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,114,
-    241,0,0,0,220,3,0,0,115,92,0,0,0,4,1,14,
-    1,4,1,4,1,10,1,10,1,10,2,10,1,10,1,2,
-    1,8,1,2,128,12,1,16,1,14,1,2,128,6,1,14,
+    4,114,115,124,4,106,11,160,14,161,0,1,0,110,11,35,
+    0,124,4,114,125,124,4,106,11,160,14,161,0,1,0,119,
+    0,119,0,37,0,124,3,114,169,116,1,106,2,124,3,25,
+    0,125,5,9,0,116,15,124,5,124,7,124,9,131,3,1,
+    0,124,9,83,0,35,0,4,0,116,5,121,167,1,0,1,
+    0,1,0,100,6,124,3,155,2,100,7,124,7,155,2,157,
+    4,125,6,116,16,160,17,124,6,116,18,161,2,1,0,89,
+    0,124,9,83,0,119,0,37,0,124,9,83,0,41,8,78,
+    114,152,0,0,0,114,27,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,114,19,0,0,0,233,2,0,0,0,122,27,67,
+    97,110,110,111,116,32,115,101,116,32,97,110,32,97,116,116,
+    114,105,98,117,116,101,32,111,110,32,122,18,32,102,111,114,
+    32,99,104,105,108,100,32,109,111,100,117,108,101,32,41,19,
+    114,153,0,0,0,114,18,0,0,0,114,113,0,0,0,114,
+    80,0,0,0,114,167,0,0,0,114,2,0,0,0,218,8,
+    95,69,82,82,95,77,83,71,114,53,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,121,0,0,0,114,230,0,0,0,114,138,0,0,
+    0,114,142,0,0,0,114,186,0,0,0,114,184,0,0,0,
+    114,11,0,0,0,114,109,0,0,0,114,110,0,0,0,114,
+    182,0,0,0,41,10,114,20,0,0,0,218,7,105,109,112,
+    111,114,116,95,114,194,0,0,0,114,154,0,0,0,90,11,
+    112,97,114,101,110,116,95,115,112,101,99,90,13,112,97,114,
+    101,110,116,95,109,111,100,117,108,101,114,116,0,0,0,90,
+    5,99,104,105,108,100,114,117,0,0,0,114,118,0,0,0,
+    115,10,0,0,0,32,32,32,32,32,32,32,32,32,32,114,
+    5,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,114,241,0,
+    0,0,220,3,0,0,115,92,0,0,0,4,1,14,1,4,
+    1,4,1,10,1,10,1,10,2,10,1,10,1,2,1,8,
+    1,2,128,12,1,16,1,14,1,2,254,2,128,6,3,14,
     1,10,1,8,1,18,1,4,2,12,3,2,1,8,1,4,
-    2,10,1,4,128,4,255,12,1,2,128,4,1,10,2,2,
-    1,12,1,4,4,2,128,12,253,16,1,14,1,4,1,2,
-    128,4,0,2,253,2,249,2,240,115,106,0,0,0,4,1,
-    14,1,4,1,2,1,2,13,8,244,12,1,8,2,12,1,
-    10,1,2,5,8,253,2,128,2,3,2,254,8,2,16,255,
-    14,1,2,128,6,1,14,1,10,1,6,1,2,11,18,246,
-    2,2,14,3,2,5,8,253,2,2,12,1,4,128,2,255,
-    14,1,2,128,2,1,2,7,10,251,2,5,12,253,4,4,
-    2,128,2,255,2,254,8,2,16,255,14,1,4,1,2,128,
-    4,0,2,255,2,248,2,241,115,86,1,0,0,12,16,5,
-    9,14,18,14,34,30,33,14,34,35,36,14,37,5,11,19,
-    23,5,16,8,14,5,40,12,18,26,29,26,37,12,37,9,
-    55,13,38,39,46,48,54,13,55,13,55,12,16,20,23,20,
-    31,12,31,9,37,20,23,20,31,32,36,20,37,13,37,25,
-    28,25,36,37,43,25,44,9,22,9,64,20,33,20,42,13,
-    17,13,17,0,0,9,64,16,30,9,64,9,64,9,64,9,
-    64,20,28,31,56,20,56,19,78,65,69,71,77,19,78,13,
-    16,19,38,39,42,49,53,19,54,19,54,60,64,13,64,0,
-    0,23,36,23,45,9,20,17,21,17,37,33,36,17,37,38,
-    39,17,40,9,14,12,22,23,27,29,33,12,34,5,9,8,
-    12,16,20,8,20,5,60,15,34,35,43,35,56,51,55,35,
-    56,63,67,15,68,15,68,9,68,12,23,9,64,13,24,13,
-    50,13,64,58,63,13,64,13,64,9,60,22,36,37,41,22,
-    42,13,19,16,27,13,60,17,28,17,54,17,60,17,60,17,
-    60,0,0,0,0,16,27,13,60,17,28,17,54,17,60,17,
-    60,17,60,17,60,0,0,8,14,5,47,25,28,25,36,37,
-    43,25,44,9,22,9,47,13,20,21,34,36,41,43,49,13,
-    50,13,50,12,18,5,18,0,0,9,47,16,30,9,47,9,
-    47,9,47,9,47,19,86,20,26,19,86,19,86,20,25,19,
-    86,19,86,13,16,13,22,13,47,28,31,33,46,13,47,13,
-    47,13,47,12,18,5,18,0,0,12,18,5,18,9,47,13,
-    60,9,64,115,51,0,0,0,167,3,43,0,171,22,65,1,
-    7,193,39,4,65,51,0,193,51,9,65,60,7,194,5,6,
-    66,13,0,194,13,21,66,37,7,194,40,1,66,37,7,194,
-    41,1,65,60,7,194,42,1,65,1,7,99,2,0,0,0,
-    0,0,0,0,0,0,0,0,9,0,0,0,3,0,0,0,
-    115,132,0,0,0,116,0,124,0,131,1,53,0,1,0,116,
-    1,106,2,160,3,124,0,116,4,161,2,125,2,124,2,116,
-    4,117,0,114,27,116,5,124,0,124,1,131,2,2,0,100,
-    1,4,0,4,0,131,3,1,0,83,0,9,0,100,1,4,
-    0,4,0,131,3,1,0,110,11,35,0,49,0,115,39,119,
-    4,37,0,1,0,1,0,1,0,89,0,1,0,1,0,124,
-    2,100,1,117,0,114,60,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,114,19,0,0,0,41,9,114,61,0,0,0,114,18,0,
-    0,0,114,113,0,0,0,114,41,0,0,0,218,14,95,78,
-    69,69,68,83,95,76,79,65,68,73,78,71,114,241,0,0,
-    0,114,53,0,0,0,114,239,0,0,0,114,78,0,0,0,
-    41,4,114,20,0,0,0,114,240,0,0,0,114,118,0,0,
-    0,114,89,0,0,0,115,4,0,0,0,32,32,32,32,114,
-    5,0,0,0,218,14,95,102,105,110,100,95,97,110,100,95,
-    108,111,97,100,114,243,0,0,0,9,4,0,0,115,32,0,
-    0,0,10,2,14,1,8,1,8,1,14,253,2,2,20,254,
-    2,128,12,0,8,5,2,1,6,1,2,255,12,2,8,2,
-    4,1,115,28,0,0,0,6,2,4,3,14,254,6,1,46,
-    1,2,128,12,0,6,2,2,3,8,255,2,255,12,2,8,
-    2,4,1,115,132,0,0,0,10,28,29,33,10,34,5,58,
-    5,58,18,21,18,29,18,55,34,38,40,54,18,55,9,15,
-    12,18,22,36,12,36,9,58,20,43,44,48,50,57,20,58,
-    5,58,5,58,5,58,5,58,5,58,5,58,5,58,9,58,
+    2,10,1,4,128,4,255,12,1,2,255,2,128,4,2,10,
+    2,2,1,12,1,4,4,2,128,12,253,16,1,14,1,4,
+    1,2,253,2,128,4,3,115,102,0,0,0,4,1,14,1,
+    4,1,2,1,2,13,8,244,12,1,8,2,12,1,10,1,
+    2,5,8,253,2,128,2,3,2,254,8,2,16,255,16,1,
+    2,128,6,1,14,1,10,1,6,1,2,11,18,246,2,2,
+    14,3,2,5,8,253,2,2,12,1,4,128,2,255,16,1,
+    2,128,2,1,2,7,10,251,2,5,12,253,4,4,2,128,
+    2,255,2,254,8,2,16,255,14,1,4,1,2,255,2,128,
+    4,1,115,86,1,0,0,12,16,5,9,14,18,14,34,30,
+    33,14,34,35,36,14,37,5,11,19,23,5,16,8,14,5,
+    40,12,18,26,29,26,37,12,37,9,55,13,38,39,46,48,
+    54,13,55,13,55,12,16,20,23,20,31,12,31,9,37,20,
+    23,20,31,32,36,20,37,13,37,25,28,25,36,37,43,25,
+    44,9,22,9,64,20,33,20,42,13,17,13,17,0,0,9,
+    64,16,30,9,64,9,64,9,64,9,64,20,28,31,56,20,
+    56,19,78,65,69,71,77,19,78,13,16,19,38,39,42,49,
+    53,19,54,19,54,60,64,13,64,9,64,0,0,23,36,23,
+    45,9,20,17,21,17,37,33,36,17,37,38,39,17,40,9,
+    14,12,22,23,27,29,33,12,34,5,9,8,12,16,20,8,
+    20,5,60,15,34,35,43,35,56,51,55,35,56,63,67,15,
+    68,15,68,9,68,12,23,9,64,13,24,13,50,13,64,58,
+    63,13,64,13,64,9,60,22,36,37,41,22,42,13,19,16,
+    27,13,60,17,28,17,54,17,60,17,60,17,60,0,0,0,
+    0,16,27,13,60,17,28,17,54,17,60,17,60,17,60,17,
+    60,13,60,0,0,8,14,5,47,25,28,25,36,37,43,25,
+    44,9,22,9,47,13,20,21,34,36,41,43,49,13,50,13,
+    50,12,18,5,18,0,0,9,47,16,30,9,47,9,47,9,
+    47,9,47,19,86,20,26,19,86,19,86,20,25,19,86,19,
+    86,13,16,13,22,13,47,28,31,33,46,13,47,13,47,13,
+    47,12,18,5,18,9,47,0,0,12,18,5,18,115,39,0,
+    0,0,167,3,43,0,171,23,65,2,7,193,40,4,65,52,
+    0,193,52,10,65,62,7,194,7,6,66,15,0,194,15,21,
+    66,40,7,194,39,1,66,40,7,99,2,0,0,0,0,0,
+    0,0,0,0,0,0,9,0,0,0,3,0,0,0,115,132,
+    0,0,0,116,0,124,0,131,1,53,0,1,0,116,1,106,
+    2,160,3,124,0,116,4,161,2,125,2,124,2,116,4,117,
+    0,114,27,116,5,124,0,124,1,131,2,2,0,100,1,4,
+    0,4,0,131,3,1,0,83,0,9,0,100,1,4,0,4,
+    0,131,3,1,0,110,11,35,0,49,0,115,39,119,4,37,
+    0,1,0,1,0,1,0,89,0,1,0,1,0,124,2,100,
+    1,117,0,114,60,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,114,
+    19,0,0,0,41,9,114,61,0,0,0,114,18,0,0,0,
+    114,113,0,0,0,114,41,0,0,0,218,14,95,78,69,69,
+    68,83,95,76,79,65,68,73,78,71,114,241,0,0,0,114,
+    53,0,0,0,114,239,0,0,0,114,78,0,0,0,41,4,
+    114,20,0,0,0,114,240,0,0,0,114,118,0,0,0,114,
+    89,0,0,0,115,4,0,0,0,32,32,32,32,114,5,0,
+    0,0,218,14,95,102,105,110,100,95,97,110,100,95,108,111,
+    97,100,114,243,0,0,0,9,4,0,0,115,32,0,0,0,
+    10,2,14,1,8,1,8,1,14,253,2,2,20,254,2,128,
+    12,0,8,5,2,1,6,1,2,255,12,2,8,2,4,1,
+    115,28,0,0,0,6,2,4,3,14,254,6,1,46,1,2,
+    128,12,0,6,2,2,3,8,255,2,255,12,2,8,2,4,
+    1,115,132,0,0,0,10,28,29,33,10,34,5,58,5,58,
+    18,21,18,29,18,55,34,38,40,54,18,55,9,15,12,18,
+    22,36,12,36,9,58,20,43,44,48,50,57,20,58,5,58,
+    5,58,5,58,5,58,5,58,5,58,5,58,9,58,5,58,
     5,58,5,58,5,58,5,58,5,58,5,58,5,58,5,58,
-    5,58,5,58,0,0,5,58,5,58,5,58,5,58,5,58,
-    5,58,8,14,18,22,8,22,5,54,20,41,20,54,49,53,
-    20,54,9,16,15,34,35,42,49,53,15,54,15,54,9,54,
-    5,24,25,29,5,30,5,30,12,18,5,18,115,12,0,0,
-    0,132,16,34,3,162,4,38,11,167,3,38,11,114,27,0,
-    0,0,99,3,0,0,0,0,0,0,0,0,0,0,0,4,
-    0,0,0,3,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,16,
-    116,1,124,0,124,1,124,2,131,3,125,0,116,2,124,0,
-    116,3,131,2,83,0,41,3,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,
-    27,0,0,0,78,41,4,114,236,0,0,0,114,226,0,0,
-    0,114,243,0,0,0,218,11,95,103,99,100,95,105,109,112,
-    111,114,116,114,235,0,0,0,115,3,0,0,0,32,32,32,
-    114,5,0,0,0,114,244,0,0,0,114,244,0,0,0,25,
-    4,0,0,115,8,0,0,0,12,9,8,1,12,1,10,1,
-    115,8,0,0,0,12,9,6,1,14,1,10,1,115,42,0,
-    0,0,5,18,19,23,25,32,34,39,5,40,5,40,8,13,
-    16,17,8,17,5,51,16,29,30,34,36,43,45,50,16,51,
-    9,13,12,26,27,31,33,44,12,45,5,45,114,17,0,0,
-    0,169,1,218,9,114,101,99,117,114,115,105,118,101,99,3,
-    0,0,0,0,0,0,0,1,0,0,0,9,0,0,0,3,
-    0,0,0,115,216,0,0,0,124,1,68,0,93,102,125,4,
-    116,0,124,4,116,1,131,2,115,32,124,3,114,17,124,0,
-    106,2,100,1,23,0,125,5,110,2,100,2,125,5,116,3,
-    100,3,124,5,155,0,100,4,116,4,124,4,131,1,106,2,
-    155,0,157,4,131,1,130,1,124,4,100,5,107,2,114,53,
-    124,3,115,52,116,5,124,0,100,6,131,2,114,52,116,6,
-    124,0,124,0,106,7,124,2,100,7,100,8,141,4,1,0,
-    113,2,116,5,124,0,124,4,131,2,115,104,100,9,160,8,
-    124,0,106,2,124,4,161,2,125,6,9,0,116,9,124,2,
-    124,6,131,2,1,0,113,2,35,0,4,0,116,10,121,107,
-    1,0,125,7,1,0,124,7,106,11,124,6,107,2,114,98,
-    116,12,106,13,160,14,124,6,116,15,161,2,100,10,117,1,
-    114,98,89,0,100,10,125,7,126,7,113,2,130,0,100,10,
-    125,7,126,7,119,1,37,0,113,2,124,0,83,0,119,0,
-    41,11,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,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,114,245,0,0,0,114,221,0,0,0,
-    78,41,16,114,231,0,0,0,114,232,0,0,0,114,8,0,
-    0,0,114,233,0,0,0,114,3,0,0,0,114,10,0,0,
-    0,218,16,95,104,97,110,100,108,101,95,102,114,111,109,108,
-    105,115,116,114,248,0,0,0,114,53,0,0,0,114,80,0,
-    0,0,114,239,0,0,0,114,20,0,0,0,114,18,0,0,
-    0,114,113,0,0,0,114,41,0,0,0,114,242,0,0,0,
-    41,8,114,118,0,0,0,218,8,102,114,111,109,108,105,115,
-    116,114,240,0,0,0,114,246,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,115,8,0,0,0,32,32,32,32,32,32,
-    32,32,114,5,0,0,0,114,249,0,0,0,114,249,0,0,
-    0,40,4,0,0,115,58,0,0,0,8,10,10,1,4,1,
-    12,1,4,2,10,1,8,1,8,255,8,2,14,1,10,1,
-    2,1,6,255,2,128,10,2,14,1,2,1,12,1,2,128,
-    12,1,10,4,16,1,2,255,10,2,2,1,10,128,2,245,
-    4,12,2,248,115,80,0,0,0,2,10,4,23,2,233,8,
+    5,58,0,0,5,58,5,58,5,58,5,58,5,58,5,58,
+    8,14,18,22,8,22,5,54,20,41,20,54,49,53,20,54,
+    9,16,15,34,35,42,49,53,15,54,15,54,9,54,5,24,
+    25,29,5,30,5,30,12,18,5,18,115,12,0,0,0,132,
+    16,34,3,162,4,38,11,167,3,38,11,114,27,0,0,0,
+    99,3,0,0,0,0,0,0,0,0,0,0,0,4,0,0,
+    0,3,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,16,116,1,
+    124,0,124,1,124,2,131,3,125,0,116,2,124,0,116,3,
+    131,2,83,0,41,3,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,27,0,
+    0,0,78,41,4,114,236,0,0,0,114,226,0,0,0,114,
+    243,0,0,0,218,11,95,103,99,100,95,105,109,112,111,114,
+    116,114,235,0,0,0,115,3,0,0,0,32,32,32,114,5,
+    0,0,0,114,244,0,0,0,114,244,0,0,0,25,4,0,
+    0,115,8,0,0,0,12,9,8,1,12,1,10,1,115,8,
+    0,0,0,12,9,6,1,14,1,10,1,115,42,0,0,0,
+    5,18,19,23,25,32,34,39,5,40,5,40,8,13,16,17,
+    8,17,5,51,16,29,30,34,36,43,45,50,16,51,9,13,
+    12,26,27,31,33,44,12,45,5,45,114,17,0,0,0,169,
+    1,218,9,114,101,99,117,114,115,105,118,101,99,3,0,0,
+    0,0,0,0,0,1,0,0,0,9,0,0,0,3,0,0,
+    0,115,216,0,0,0,124,1,68,0,93,103,125,4,116,0,
+    124,4,116,1,131,2,115,32,124,3,114,17,124,0,106,2,
+    100,1,23,0,125,5,110,2,100,2,125,5,116,3,100,3,
+    124,5,155,0,100,4,116,4,124,4,131,1,106,2,155,0,
+    157,4,131,1,130,1,124,4,100,5,107,2,114,53,124,3,
+    115,52,116,5,124,0,100,6,131,2,114,52,116,6,124,0,
+    124,0,106,7,124,2,100,7,100,8,141,4,1,0,113,2,
+    116,5,124,0,124,4,131,2,115,105,100,9,160,8,124,0,
+    106,2,124,4,161,2,125,6,9,0,116,9,124,2,124,6,
+    131,2,1,0,113,2,35,0,4,0,116,10,121,103,1,0,
+    125,7,1,0,124,7,106,11,124,6,107,2,114,98,116,12,
+    106,13,160,14,124,6,116,15,161,2,100,10,117,1,114,98,
+    89,0,100,10,125,7,126,7,113,2,130,0,100,10,125,7,
+    126,7,119,1,119,0,37,0,113,2,124,0,83,0,41,11,
+    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,
+    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,114,245,0,0,0,114,221,0,0,0,78,41,
+    16,114,231,0,0,0,114,232,0,0,0,114,8,0,0,0,
+    114,233,0,0,0,114,3,0,0,0,114,10,0,0,0,218,
+    16,95,104,97,110,100,108,101,95,102,114,111,109,108,105,115,
+    116,114,248,0,0,0,114,53,0,0,0,114,80,0,0,0,
+    114,239,0,0,0,114,20,0,0,0,114,18,0,0,0,114,
+    113,0,0,0,114,41,0,0,0,114,242,0,0,0,41,8,
+    114,118,0,0,0,218,8,102,114,111,109,108,105,115,116,114,
+    240,0,0,0,114,246,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,115,8,0,0,0,32,32,32,32,32,32,32,32,
+    114,5,0,0,0,114,249,0,0,0,114,249,0,0,0,40,
+    4,0,0,115,60,0,0,0,8,10,10,1,4,1,12,1,
+    4,2,10,1,8,1,8,255,8,2,14,1,10,1,2,1,
+    6,255,2,128,10,2,14,1,2,1,12,1,2,128,12,1,
+    10,4,16,1,2,255,10,2,2,1,8,128,2,249,2,128,
+    2,252,4,12,115,82,0,0,0,2,10,4,23,2,233,8,
     1,2,22,2,235,2,3,12,254,4,2,2,1,2,1,2,
     255,20,1,6,1,2,15,2,242,2,2,8,254,2,2,10,
     255,8,1,2,128,8,1,2,11,14,246,2,10,12,248,2,
     128,2,8,2,249,8,7,8,253,2,2,16,255,12,1,2,
-    1,10,128,2,0,4,1,2,255,115,216,0,0,0,14,22,
-    5,22,5,22,9,10,16,26,27,28,30,33,16,34,9,22,
-    16,25,13,40,25,31,25,40,43,53,25,53,17,22,17,22,
-    25,40,17,22,19,28,29,54,40,45,29,54,29,54,36,40,
-    41,42,36,43,36,52,29,54,29,54,19,55,13,55,14,15,
-    19,22,14,22,9,22,20,29,13,49,34,41,42,48,50,59,
-    34,60,13,49,17,33,34,40,42,48,42,56,58,65,44,48,
-    17,49,17,49,17,49,0,0,18,25,26,32,34,35,18,36,
-    9,22,25,32,25,59,40,46,40,55,57,58,25,59,13,22,
-    13,22,17,42,43,50,52,61,17,62,17,62,17,62,0,0,
-    13,22,20,39,13,22,13,22,13,22,13,22,21,24,21,29,
-    33,42,21,42,17,29,21,24,21,32,21,63,37,46,48,62,
-    21,63,71,75,21,75,17,29,21,29,21,29,21,29,21,29,
-    21,29,17,22,0,0,0,0,0,0,0,0,0,0,9,22,
-    12,18,5,18,13,22,115,36,0,0,0,193,2,5,65,8,
-    2,193,8,7,65,39,9,193,15,14,65,35,9,193,34,1,
-    65,35,9,193,35,4,65,39,9,193,43,1,65,39,9,99,
-    1,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,
-    3,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,117,1,114,41,124,2,100,3,117,1,114,39,124,1,124,
-    2,106,1,107,3,114,39,116,2,160,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,166,3,1,0,124,1,83,0,124,2,100,3,117,
-    1,114,48,124,2,106,1,83,0,116,2,160,3,100,9,116,
-    4,100,7,100,8,166,3,1,0,124,0,100,10,25,0,125,
-    1,100,11,124,0,118,1,114,71,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,171,0,0,0,114,121,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,8,0,0,0,114,
-    167,0,0,0,114,152,0,0,0,114,27,0,0,0,41,6,
-    114,41,0,0,0,114,154,0,0,0,114,109,0,0,0,114,
-    110,0,0,0,114,182,0,0,0,114,153,0,0,0,41,3,
-    218,7,103,108,111,98,97,108,115,114,224,0,0,0,114,117,
-    0,0,0,115,3,0,0,0,32,32,32,114,5,0,0,0,
-    218,17,95,99,97,108,99,95,95,95,112,97,99,107,97,103,
-    101,95,95,114,255,0,0,0,77,4,0,0,115,42,0,0,
-    0,10,7,10,1,8,1,18,1,6,1,2,1,4,255,4,
-    1,6,255,4,2,6,254,4,3,8,1,6,1,6,2,4,
-    2,6,254,8,3,8,1,14,1,4,1,115,48,0,0,0,
-    10,7,10,1,6,1,2,14,6,243,2,3,8,253,2,3,
-    2,254,2,2,18,255,10,1,4,1,6,1,2,8,6,249,
-    2,2,2,2,2,255,10,1,8,1,6,1,16,1,4,1,
-    115,146,0,0,0,15,22,15,41,27,40,15,41,5,12,12,
-    19,12,35,24,34,12,35,5,9,8,15,23,27,8,27,5,
-    49,12,16,24,28,12,28,9,56,33,40,44,48,44,55,33,
-    55,9,56,13,22,13,56,28,63,29,36,28,63,28,63,29,
-    33,29,40,28,63,28,63,28,63,28,41,54,55,13,56,13,
-    56,13,56,16,23,9,23,10,14,22,26,10,26,5,49,16,
-    20,16,27,9,27,9,18,9,52,24,63,24,37,50,51,9,
-    52,9,52,9,52,19,26,27,37,19,38,9,16,12,22,30,
-    37,12,37,9,49,23,30,23,46,42,45,23,46,47,48,23,
-    49,13,20,12,19,5,19,114,17,0,0,0,114,24,0,0,
-    0,99,5,0,0,0,0,0,0,0,0,0,0,0,5,0,
-    0,0,3,0,0,0,115,174,0,0,0,124,4,100,1,107,
-    2,114,9,116,0,124,0,131,1,125,5,110,18,124,1,100,
-    2,117,1,114,15,124,1,110,1,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,74,124,4,100,1,107,2,114,42,116,0,124,
-    0,160,2,100,3,161,1,100,1,25,0,131,1,83,0,124,
-    0,115,46,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,116,
-    7,124,5,100,4,131,2,114,85,116,8,124,5,124,3,116,
-    0,131,3,83,0,124,5,83,0,41,5,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,27,0,0,0,78,114,152,0,
-    0,0,114,167,0,0,0,41,9,114,244,0,0,0,114,255,
-    0,0,0,218,9,112,97,114,116,105,116,105,111,110,114,223,
-    0,0,0,114,18,0,0,0,114,113,0,0,0,114,8,0,
-    0,0,114,10,0,0,0,114,249,0,0,0,41,9,114,20,
-    0,0,0,114,254,0,0,0,218,6,108,111,99,97,108,115,
-    114,250,0,0,0,114,225,0,0,0,114,118,0,0,0,90,
-    8,103,108,111,98,97,108,115,95,114,224,0,0,0,90,7,
-    99,117,116,95,111,102,102,115,9,0,0,0,32,32,32,32,
-    32,32,32,32,32,114,5,0,0,0,218,10,95,95,105,109,
-    112,111,114,116,95,95,114,2,1,0,0,104,4,0,0,115,
-    30,0,0,0,8,11,10,1,16,2,8,1,12,1,4,1,
-    8,3,18,1,4,1,4,1,26,4,30,3,10,1,12,1,
-    4,2,115,40,0,0,0,6,11,2,5,10,252,16,2,8,
-    1,12,1,2,1,2,17,6,242,2,10,18,247,2,1,2,
-    8,4,249,26,4,30,3,8,1,2,3,12,254,4,2,115,
-    174,0,0,0,8,13,17,18,8,18,5,51,18,29,30,34,
-    18,35,9,15,9,15,31,38,46,50,31,50,20,58,20,27,
-    20,27,56,58,9,17,19,36,37,45,19,46,9,16,18,29,
-    30,34,36,43,45,50,18,51,9,15,12,20,5,22,12,17,
-    21,22,12,22,9,79,20,31,32,36,32,51,47,50,32,51,
-    52,53,32,54,20,55,13,55,18,22,9,79,20,26,13,26,
-    23,26,27,31,23,32,35,38,39,43,39,58,54,57,39,58,
-    59,60,39,61,35,62,23,62,13,20,20,23,20,31,32,38,
-    32,47,48,77,49,52,53,59,53,68,49,69,70,77,49,77,
-    48,77,32,78,20,79,13,79,10,17,18,24,26,36,10,37,
-    5,22,16,32,33,39,41,49,51,62,16,63,9,63,16,22,
-    9,22,114,17,0,0,0,99,1,0,0,0,0,0,0,0,
-    0,0,0,0,3,0,0,0,3,0,0,0,115,38,0,0,
-    0,116,0,160,1,124,0,161,1,125,1,124,1,100,0,117,
-    0,114,15,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,188,0,0,0,114,196,0,0,
-    0,114,94,0,0,0,114,186,0,0,0,41,2,114,20,0,
-    0,0,114,117,0,0,0,115,2,0,0,0,32,32,114,5,
-    0,0,0,218,18,95,98,117,105,108,116,105,110,95,102,114,
-    111,109,95,110,97,109,101,114,3,1,0,0,141,4,0,0,
-    115,8,0,0,0,10,1,8,1,12,1,8,1,115,8,0,
-    0,0,10,1,6,1,14,1,8,1,115,38,0,0,0,12,
-    27,12,43,38,42,12,43,5,9,8,12,16,20,8,20,5,
-    62,15,26,27,54,57,61,27,61,15,62,9,62,12,26,27,
-    31,12,32,5,32,114,17,0,0,0,99,2,0,0,0,0,
-    0,0,0,0,0,0,0,5,0,0,0,3,0,0,0,115,
-    166,0,0,0,124,1,97,0,124,0,97,1,116,2,116,1,
-    131,1,125,2,116,1,106,3,160,4,161,0,68,0,93,36,
-    92,2,125,3,125,4,116,5,124,4,124,2,131,2,114,49,
-    124,3,116,1,106,6,118,0,114,30,116,7,125,5,110,9,
-    116,0,160,8,124,3,161,1,114,38,116,9,125,5,110,1,
-    113,13,116,10,124,4,124,5,131,2,125,6,116,11,124,6,
-    124,4,131,2,1,0,113,13,116,1,106,3,116,12,25,0,
-    125,7,100,1,68,0,93,23,125,8,124,8,116,1,106,3,
-    118,1,114,69,116,13,124,8,131,1,125,9,110,5,116,1,
-    106,3,124,8,25,0,125,9,116,14,124,7,124,8,124,9,
-    131,3,1,0,113,57,100,2,83,0,41,3,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,41,3,114,28,0,0,0,114,
-    109,0,0,0,114,77,0,0,0,78,41,15,114,70,0,0,
-    0,114,18,0,0,0,114,3,0,0,0,114,113,0,0,0,
-    218,5,105,116,101,109,115,114,231,0,0,0,114,93,0,0,
-    0,114,188,0,0,0,114,106,0,0,0,114,207,0,0,0,
-    114,168,0,0,0,114,174,0,0,0,114,8,0,0,0,114,
-    3,1,0,0,114,11,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,20,0,0,0,114,118,0,0,0,114,130,0,0,0,
-    114,117,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,
-    115,10,0,0,0,32,32,32,32,32,32,32,32,32,32,114,
-    5,0,0,0,218,6,95,115,101,116,117,112,114,7,1,0,
-    0,148,4,0,0,115,40,0,0,0,4,9,4,1,8,3,
-    18,1,10,1,10,1,6,1,10,1,6,1,2,2,10,1,
-    10,1,2,128,10,3,8,1,10,1,10,1,10,2,14,1,
-    4,251,115,54,0,0,0,4,9,4,1,8,3,8,1,4,
-    9,6,247,8,1,2,8,8,249,2,5,6,252,8,1,2,
-    3,6,254,2,2,10,1,10,1,2,128,10,3,2,1,4,
-    5,2,251,8,1,2,3,10,254,10,2,18,1,115,166,0,
-    0,0,12,23,5,9,11,21,5,8,19,23,24,27,19,28,
-    5,16,25,28,25,36,25,44,25,44,5,45,5,45,9,21,
-    9,13,15,21,12,22,23,29,31,42,12,43,9,45,16,20,
-    24,27,24,48,16,48,13,25,26,41,17,23,17,23,18,22,
-    18,38,33,37,18,38,13,25,26,40,17,23,17,23,17,25,
-    20,37,38,44,46,52,20,53,13,17,13,31,32,36,38,44,
-    13,45,13,45,0,0,19,22,19,30,31,39,19,40,5,16,
-    25,61,5,59,5,59,9,21,12,24,32,35,32,43,12,43,
-    9,55,30,48,49,61,30,62,13,27,13,27,30,33,30,41,
-    42,54,30,55,13,27,9,16,17,28,30,42,44,58,9,59,
-    9,59,9,59,5,59,5,59,114,17,0,0,0,99,2,0,
-    0,0,0,0,0,0,0,0,0,0,3,0,0,0,3,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,7,1,0,0,114,18,0,0,0,114,229,
-    0,0,0,114,142,0,0,0,114,188,0,0,0,114,207,0,
-    0,0,41,2,114,5,1,0,0,114,6,1,0,0,115,2,
-    0,0,0,32,32,114,5,0,0,0,218,8,95,105,110,115,
-    116,97,108,108,114,8,1,0,0,183,4,0,0,243,6,0,
-    0,0,10,2,12,2,16,1,114,9,1,0,0,115,38,0,
-    0,0,5,11,12,22,24,35,5,36,5,36,5,8,5,18,
-    5,42,26,41,5,42,5,42,5,8,5,18,5,41,26,40,
-    5,41,5,41,5,41,5,41,114,17,0,0,0,99,0,0,
-    0,0,0,0,0,0,0,0,0,0,4,0,0,0,3,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,27,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,149,0,0,0,114,8,1,
-    0,0,114,18,0,0,0,114,113,0,0,0,114,8,0,0,
-    0,41,1,114,10,1,0,0,115,1,0,0,0,32,114,5,
-    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,
-    114,11,1,0,0,191,4,0,0,243,6,0,0,0,8,3,
-    4,1,20,1,114,12,1,0,0,115,32,0,0,0,5,38,
-    5,38,5,38,5,38,27,53,5,24,5,31,5,63,41,44,
-    41,52,53,61,41,62,5,63,5,63,5,63,5,63,114,17,
-    0,0,0,114,204,0,0,0,114,0,0,0,0,114,26,0,
-    0,0,41,4,78,78,114,24,0,0,0,114,27,0,0,0,
-    41,54,114,9,0,0,0,114,6,0,0,0,114,28,0,0,
-    0,114,109,0,0,0,114,77,0,0,0,114,149,0,0,0,
-    114,16,0,0,0,114,21,0,0,0,114,72,0,0,0,114,
-    40,0,0,0,114,50,0,0,0,114,23,0,0,0,114,25,
-    0,0,0,114,58,0,0,0,114,61,0,0,0,114,64,0,
-    0,0,114,78,0,0,0,114,80,0,0,0,114,90,0,0,
-    0,114,102,0,0,0,114,108,0,0,0,114,119,0,0,0,
-    114,132,0,0,0,114,133,0,0,0,114,112,0,0,0,114,
-    168,0,0,0,114,174,0,0,0,114,178,0,0,0,114,127,
-    0,0,0,114,114,0,0,0,114,185,0,0,0,114,186,0,
-    0,0,114,115,0,0,0,114,188,0,0,0,114,207,0,0,
-    0,114,215,0,0,0,114,226,0,0,0,114,228,0,0,0,
-    114,230,0,0,0,114,236,0,0,0,90,15,95,69,82,82,
-    95,77,83,71,95,80,82,69,70,73,88,114,238,0,0,0,
-    114,241,0,0,0,218,6,111,98,106,101,99,116,114,242,0,
-    0,0,114,243,0,0,0,114,244,0,0,0,114,249,0,0,
-    0,114,255,0,0,0,114,2,1,0,0,114,3,1,0,0,
-    114,7,1,0,0,114,8,1,0,0,114,11,1,0,0,114,
-    24,0,0,0,114,17,0,0,0,114,5,0,0,0,218,8,
-    60,109,111,100,117,108,101,62,114,14,1,0,0,1,0,0,
-    0,115,104,0,0,0,4,0,6,22,4,9,4,1,4,1,
-    4,3,6,3,6,8,4,8,4,2,14,3,12,4,12,77,
-    12,21,6,16,6,37,6,17,12,11,6,8,6,11,6,12,
-    6,19,12,26,14,102,8,26,12,45,6,72,6,17,6,17,
-    6,30,6,36,6,45,12,15,12,80,12,85,6,13,6,9,
-    8,10,6,47,4,16,8,1,6,2,6,42,6,3,8,16,
-    12,15,6,37,8,27,6,37,6,7,6,35,10,8,115,124,
-    0,0,0,4,7,6,19,4,5,4,1,4,1,4,3,6,
-    8,6,4,4,7,4,2,8,4,2,255,4,1,12,77,12,
-    21,12,14,6,39,6,17,6,11,2,3,10,5,6,11,6,
-    11,6,19,6,27,12,102,4,3,10,23,2,3,6,42,2,
-    3,10,69,6,17,6,16,6,31,6,37,6,43,6,14,12,
-    82,12,83,12,15,6,9,6,10,2,3,6,44,6,16,4,
-    3,8,1,6,41,6,3,6,16,2,3,6,12,2,3,10,
-    34,6,27,2,3,6,34,6,7,6,35,6,8,10,8,115,
-    130,1,0,0,1,4,1,4,1,38,1,38,1,38,11,15,
-    1,8,13,17,1,10,12,16,1,9,23,27,1,20,1,38,
-    1,38,1,38,1,27,1,27,1,27,17,19,1,14,16,18,
-    1,13,1,9,1,9,1,9,1,9,22,34,1,9,1,9,
-    1,69,1,69,1,69,1,69,1,69,1,69,1,74,1,74,
-    1,74,1,74,1,74,1,74,1,29,1,29,1,29,1,29,
-    1,29,1,29,1,16,1,16,1,16,1,23,1,23,1,23,
-    1,28,1,28,1,28,48,49,1,54,1,54,1,54,1,54,
-    1,54,1,37,1,37,1,37,1,36,1,36,1,36,1,27,
-    1,27,1,27,1,64,1,64,1,64,1,41,1,41,1,41,
-    1,41,1,41,1,41,46,50,63,67,1,74,1,74,1,74,
-    1,74,1,74,38,42,1,16,1,16,1,16,50,55,1,18,
-    1,18,1,18,1,18,1,18,1,18,1,18,1,18,1,71,
-    1,71,1,71,1,18,1,18,1,18,1,18,1,18,1,18,
-    1,18,1,18,1,18,1,36,1,36,1,36,1,49,1,49,
-    1,49,1,49,1,49,1,49,1,48,1,48,1,48,1,48,
-    1,48,1,48,1,28,1,28,1,28,1,28,1,28,1,28,
-    1,56,1,56,1,56,1,42,1,42,1,42,35,39,1,20,
-    1,20,1,20,1,46,1,46,1,46,19,37,1,16,12,27,
-    30,36,12,36,1,9,1,18,1,18,1,18,18,24,18,26,
-    1,15,1,18,1,18,1,18,31,35,1,45,1,45,1,45,
-    62,67,1,18,1,18,1,18,1,18,1,18,1,19,1,19,
-    1,19,30,34,1,22,1,22,1,22,1,32,1,32,1,32,
-    1,59,1,59,1,59,1,41,1,41,1,41,1,63,1,63,
-    1,63,1,63,1,63,114,17,0,0,0,
+    1,8,128,2,0,2,128,2,0,4,1,115,216,0,0,0,
+    14,22,5,22,5,22,9,10,16,26,27,28,30,33,16,34,
+    9,22,16,25,13,40,25,31,25,40,43,53,25,53,17,22,
+    17,22,25,40,17,22,19,28,29,54,40,45,29,54,29,54,
+    36,40,41,42,36,43,36,52,29,54,29,54,19,55,13,55,
+    14,15,19,22,14,22,9,22,20,29,13,49,34,41,42,48,
+    50,59,34,60,13,49,17,33,34,40,42,48,42,56,58,65,
+    44,48,17,49,17,49,17,49,0,0,18,25,26,32,34,35,
+    18,36,9,22,25,32,25,59,40,46,40,55,57,58,25,59,
+    13,22,13,22,17,42,43,50,52,61,17,62,17,62,17,62,
+    0,0,13,22,20,39,13,22,13,22,13,22,13,22,21,24,
+    21,29,33,42,21,42,17,29,21,24,21,32,21,63,37,46,
+    48,62,21,63,71,75,21,75,17,29,21,29,21,29,21,29,
+    21,29,21,29,17,22,0,0,0,0,0,0,0,0,13,22,
+    0,0,9,22,12,18,5,18,115,30,0,0,0,193,2,5,
+    65,8,2,193,8,7,65,40,9,193,15,14,65,35,9,193,
+    34,1,65,35,9,193,35,5,65,40,9,99,1,0,0,0,
+    0,0,0,0,0,0,0,0,7,0,0,0,3,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,117,1,114,
+    41,124,2,100,3,117,1,114,39,124,1,124,2,106,1,107,
+    3,114,39,116,2,160,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,166,
+    3,1,0,124,1,83,0,124,2,100,3,117,1,114,48,124,
+    2,106,1,83,0,116,2,160,3,100,9,116,4,100,7,100,
+    8,166,3,1,0,124,0,100,10,25,0,125,1,100,11,124,
+    0,118,1,114,71,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,171,0,0,0,114,121,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,8,0,0,0,114,167,0,0,0,
+    114,152,0,0,0,114,27,0,0,0,41,6,114,41,0,0,
+    0,114,154,0,0,0,114,109,0,0,0,114,110,0,0,0,
+    114,182,0,0,0,114,153,0,0,0,41,3,218,7,103,108,
+    111,98,97,108,115,114,224,0,0,0,114,117,0,0,0,115,
+    3,0,0,0,32,32,32,114,5,0,0,0,218,17,95,99,
+    97,108,99,95,95,95,112,97,99,107,97,103,101,95,95,114,
+    255,0,0,0,77,4,0,0,115,42,0,0,0,10,7,10,
+    1,8,1,18,1,6,1,2,1,4,255,4,1,6,255,4,
+    2,6,254,4,3,8,1,6,1,6,2,4,2,6,254,8,
+    3,8,1,14,1,4,1,115,48,0,0,0,10,7,10,1,
+    6,1,2,14,6,243,2,3,8,253,2,3,2,254,2,2,
+    18,255,10,1,4,1,6,1,2,8,6,249,2,2,2,2,
+    2,255,10,1,8,1,6,1,16,1,4,1,115,146,0,0,
+    0,15,22,15,41,27,40,15,41,5,12,12,19,12,35,24,
+    34,12,35,5,9,8,15,23,27,8,27,5,49,12,16,24,
+    28,12,28,9,56,33,40,44,48,44,55,33,55,9,56,13,
+    22,13,56,28,63,29,36,28,63,28,63,29,33,29,40,28,
+    63,28,63,28,63,28,41,54,55,13,56,13,56,13,56,16,
+    23,9,23,10,14,22,26,10,26,5,49,16,20,16,27,9,
+    27,9,18,9,52,24,63,24,37,50,51,9,52,9,52,9,
+    52,19,26,27,37,19,38,9,16,12,22,30,37,12,37,9,
+    49,23,30,23,46,42,45,23,46,47,48,23,49,13,20,12,
+    19,5,19,114,17,0,0,0,114,24,0,0,0,99,5,0,
+    0,0,0,0,0,0,0,0,0,0,5,0,0,0,3,0,
+    0,0,115,174,0,0,0,124,4,100,1,107,2,114,9,116,
+    0,124,0,131,1,125,5,110,18,124,1,100,2,117,1,114,
+    15,124,1,110,1,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,
+    74,124,4,100,1,107,2,114,42,116,0,124,0,160,2,100,
+    3,161,1,100,1,25,0,131,1,83,0,124,0,115,46,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,116,7,124,5,100,
+    4,131,2,114,85,116,8,124,5,124,3,116,0,131,3,83,
+    0,124,5,83,0,41,5,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,27,0,0,0,78,114,152,0,0,0,114,167,
+    0,0,0,41,9,114,244,0,0,0,114,255,0,0,0,218,
+    9,112,97,114,116,105,116,105,111,110,114,223,0,0,0,114,
+    18,0,0,0,114,113,0,0,0,114,8,0,0,0,114,10,
+    0,0,0,114,249,0,0,0,41,9,114,20,0,0,0,114,
+    254,0,0,0,218,6,108,111,99,97,108,115,114,250,0,0,
+    0,114,225,0,0,0,114,118,0,0,0,90,8,103,108,111,
+    98,97,108,115,95,114,224,0,0,0,90,7,99,117,116,95,
+    111,102,102,115,9,0,0,0,32,32,32,32,32,32,32,32,
+    32,114,5,0,0,0,218,10,95,95,105,109,112,111,114,116,
+    95,95,114,2,1,0,0,104,4,0,0,115,30,0,0,0,
+    8,11,10,1,16,2,8,1,12,1,4,1,8,3,18,1,
+    4,1,4,1,26,4,30,3,10,1,12,1,4,2,115,40,
+    0,0,0,6,11,2,5,10,252,16,2,8,1,12,1,2,
+    1,2,17,6,242,2,10,18,247,2,1,2,8,4,249,26,
+    4,30,3,8,1,2,3,12,254,4,2,115,174,0,0,0,
+    8,13,17,18,8,18,5,51,18,29,30,34,18,35,9,15,
+    9,15,31,38,46,50,31,50,20,58,20,27,20,27,56,58,
+    9,17,19,36,37,45,19,46,9,16,18,29,30,34,36,43,
+    45,50,18,51,9,15,12,20,5,22,12,17,21,22,12,22,
+    9,79,20,31,32,36,32,51,47,50,32,51,52,53,32,54,
+    20,55,13,55,18,22,9,79,20,26,13,26,23,26,27,31,
+    23,32,35,38,39,43,39,58,54,57,39,58,59,60,39,61,
+    35,62,23,62,13,20,20,23,20,31,32,38,32,47,48,77,
+    49,52,53,59,53,68,49,69,70,77,49,77,48,77,32,78,
+    20,79,13,79,10,17,18,24,26,36,10,37,5,22,16,32,
+    33,39,41,49,51,62,16,63,9,63,16,22,9,22,114,17,
+    0,0,0,99,1,0,0,0,0,0,0,0,0,0,0,0,
+    3,0,0,0,3,0,0,0,115,38,0,0,0,116,0,160,
+    1,124,0,161,1,125,1,124,1,100,0,117,0,114,15,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,188,0,0,0,114,196,0,0,0,114,94,0,
+    0,0,114,186,0,0,0,41,2,114,20,0,0,0,114,117,
+    0,0,0,115,2,0,0,0,32,32,114,5,0,0,0,218,
+    18,95,98,117,105,108,116,105,110,95,102,114,111,109,95,110,
+    97,109,101,114,3,1,0,0,141,4,0,0,115,8,0,0,
+    0,10,1,8,1,12,1,8,1,115,8,0,0,0,10,1,
+    6,1,14,1,8,1,115,38,0,0,0,12,27,12,43,38,
+    42,12,43,5,9,8,12,16,20,8,20,5,62,15,26,27,
+    54,57,61,27,61,15,62,9,62,12,26,27,31,12,32,5,
+    32,114,17,0,0,0,99,2,0,0,0,0,0,0,0,0,
+    0,0,0,5,0,0,0,3,0,0,0,115,166,0,0,0,
+    124,1,97,0,124,0,97,1,116,2,116,1,131,1,125,2,
+    116,1,106,3,160,4,161,0,68,0,93,36,92,2,125,3,
+    125,4,116,5,124,4,124,2,131,2,114,49,124,3,116,1,
+    106,6,118,0,114,30,116,7,125,5,110,9,116,0,160,8,
+    124,3,161,1,114,38,116,9,125,5,110,1,113,13,116,10,
+    124,4,124,5,131,2,125,6,116,11,124,6,124,4,131,2,
+    1,0,113,13,116,1,106,3,116,12,25,0,125,7,100,1,
+    68,0,93,23,125,8,124,8,116,1,106,3,118,1,114,69,
+    116,13,124,8,131,1,125,9,110,5,116,1,106,3,124,8,
+    25,0,125,9,116,14,124,7,124,8,124,9,131,3,1,0,
+    113,57,100,2,83,0,41,3,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,41,3,114,28,0,0,0,114,109,0,0,0,
+    114,77,0,0,0,78,41,15,114,70,0,0,0,114,18,0,
+    0,0,114,3,0,0,0,114,113,0,0,0,218,5,105,116,
+    101,109,115,114,231,0,0,0,114,93,0,0,0,114,188,0,
+    0,0,114,106,0,0,0,114,207,0,0,0,114,168,0,0,
+    0,114,174,0,0,0,114,8,0,0,0,114,3,1,0,0,
+    114,11,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,20,0,
+    0,0,114,118,0,0,0,114,130,0,0,0,114,117,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,115,10,0,0,
+    0,32,32,32,32,32,32,32,32,32,32,114,5,0,0,0,
+    218,6,95,115,101,116,117,112,114,7,1,0,0,148,4,0,
+    0,115,40,0,0,0,4,9,4,1,8,3,18,1,10,1,
+    10,1,6,1,10,1,6,1,2,2,10,1,10,1,2,128,
+    10,3,8,1,10,1,10,1,10,2,14,1,4,251,115,54,
+    0,0,0,4,9,4,1,8,3,8,1,4,9,6,247,8,
+    1,2,8,8,249,2,5,6,252,8,1,2,3,6,254,2,
+    2,10,1,10,1,2,128,10,3,2,1,4,5,2,251,8,
+    1,2,3,10,254,10,2,18,1,115,166,0,0,0,12,23,
+    5,9,11,21,5,8,19,23,24,27,19,28,5,16,25,28,
+    25,36,25,44,25,44,5,45,5,45,9,21,9,13,15,21,
+    12,22,23,29,31,42,12,43,9,45,16,20,24,27,24,48,
+    16,48,13,25,26,41,17,23,17,23,18,22,18,38,33,37,
+    18,38,13,25,26,40,17,23,17,23,17,25,20,37,38,44,
+    46,52,20,53,13,17,13,31,32,36,38,44,13,45,13,45,
+    0,0,19,22,19,30,31,39,19,40,5,16,25,61,5,59,
+    5,59,9,21,12,24,32,35,32,43,12,43,9,55,30,48,
+    49,61,30,62,13,27,13,27,30,33,30,41,42,54,30,55,
+    13,27,9,16,17,28,30,42,44,58,9,59,9,59,9,59,
+    5,59,5,59,114,17,0,0,0,99,2,0,0,0,0,0,
+    0,0,0,0,0,0,3,0,0,0,3,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,7,1,0,0,114,18,0,0,0,114,229,0,0,0,114,
+    142,0,0,0,114,188,0,0,0,114,207,0,0,0,41,2,
+    114,5,1,0,0,114,6,1,0,0,115,2,0,0,0,32,
+    32,114,5,0,0,0,218,8,95,105,110,115,116,97,108,108,
+    114,8,1,0,0,183,4,0,0,243,6,0,0,0,10,2,
+    12,2,16,1,114,9,1,0,0,115,38,0,0,0,5,11,
+    12,22,24,35,5,36,5,36,5,8,5,18,5,42,26,41,
+    5,42,5,42,5,8,5,18,5,41,26,40,5,41,5,41,
+    5,41,5,41,114,17,0,0,0,99,0,0,0,0,0,0,
+    0,0,0,0,0,0,4,0,0,0,3,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,27,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,149,0,0,0,114,8,1,0,0,114,18,
+    0,0,0,114,113,0,0,0,114,8,0,0,0,41,1,114,
+    10,1,0,0,115,1,0,0,0,32,114,5,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,114,11,1,0,
+    0,191,4,0,0,243,6,0,0,0,8,3,4,1,20,1,
+    114,12,1,0,0,115,32,0,0,0,5,38,5,38,5,38,
+    5,38,27,53,5,24,5,31,5,63,41,44,41,52,53,61,
+    41,62,5,63,5,63,5,63,5,63,114,17,0,0,0,114,
+    204,0,0,0,114,0,0,0,0,114,26,0,0,0,41,4,
+    78,78,114,24,0,0,0,114,27,0,0,0,41,54,114,9,
+    0,0,0,114,6,0,0,0,114,28,0,0,0,114,109,0,
+    0,0,114,77,0,0,0,114,149,0,0,0,114,16,0,0,
+    0,114,21,0,0,0,114,72,0,0,0,114,40,0,0,0,
+    114,50,0,0,0,114,23,0,0,0,114,25,0,0,0,114,
+    58,0,0,0,114,61,0,0,0,114,64,0,0,0,114,78,
+    0,0,0,114,80,0,0,0,114,90,0,0,0,114,102,0,
+    0,0,114,108,0,0,0,114,119,0,0,0,114,132,0,0,
+    0,114,133,0,0,0,114,112,0,0,0,114,168,0,0,0,
+    114,174,0,0,0,114,178,0,0,0,114,127,0,0,0,114,
+    114,0,0,0,114,185,0,0,0,114,186,0,0,0,114,115,
+    0,0,0,114,188,0,0,0,114,207,0,0,0,114,215,0,
+    0,0,114,226,0,0,0,114,228,0,0,0,114,230,0,0,
+    0,114,236,0,0,0,90,15,95,69,82,82,95,77,83,71,
+    95,80,82,69,70,73,88,114,238,0,0,0,114,241,0,0,
+    0,218,6,111,98,106,101,99,116,114,242,0,0,0,114,243,
+    0,0,0,114,244,0,0,0,114,249,0,0,0,114,255,0,
+    0,0,114,2,1,0,0,114,3,1,0,0,114,7,1,0,
+    0,114,8,1,0,0,114,11,1,0,0,114,24,0,0,0,
+    114,17,0,0,0,114,5,0,0,0,218,8,60,109,111,100,
+    117,108,101,62,114,14,1,0,0,1,0,0,0,115,104,0,
+    0,0,4,0,6,22,4,9,4,1,4,1,4,3,6,3,
+    6,8,4,8,4,2,14,3,12,4,12,77,12,21,6,16,
+    6,37,6,17,12,11,6,8,6,11,6,12,6,19,12,26,
+    14,102,8,26,12,45,6,72,6,17,6,17,6,30,6,36,
+    6,45,12,15,12,80,12,85,6,13,6,9,8,10,6,47,
+    4,16,8,1,6,2,6,42,6,3,8,16,12,15,6,37,
+    8,27,6,37,6,7,6,35,10,8,115,124,0,0,0,4,
+    7,6,19,4,5,4,1,4,1,4,3,6,8,6,4,4,
+    7,4,2,8,4,2,255,4,1,12,77,12,21,12,14,6,
+    39,6,17,6,11,2,3,10,5,6,11,6,11,6,19,6,
+    27,12,102,4,3,10,23,2,3,6,42,2,3,10,69,6,
+    17,6,16,6,31,6,37,6,43,6,14,12,82,12,83,12,
+    15,6,9,6,10,2,3,6,44,6,16,4,3,8,1,6,
+    41,6,3,6,16,2,3,6,12,2,3,10,34,6,27,2,
+    3,6,34,6,7,6,35,6,8,10,8,115,130,1,0,0,
+    1,4,1,4,1,38,1,38,1,38,11,15,1,8,13,17,
+    1,10,12,16,1,9,23,27,1,20,1,38,1,38,1,38,
+    1,27,1,27,1,27,17,19,1,14,16,18,1,13,1,9,
+    1,9,1,9,1,9,22,34,1,9,1,9,1,69,1,69,
+    1,69,1,69,1,69,1,69,1,74,1,74,1,74,1,74,
+    1,74,1,74,1,29,1,29,1,29,1,29,1,29,1,29,
+    1,16,1,16,1,16,1,23,1,23,1,23,1,28,1,28,
+    1,28,48,49,1,54,1,54,1,54,1,54,1,54,1,37,
+    1,37,1,37,1,36,1,36,1,36,1,27,1,27,1,27,
+    1,64,1,64,1,64,1,41,1,41,1,41,1,41,1,41,
+    1,41,46,50,63,67,1,74,1,74,1,74,1,74,1,74,
+    38,42,1,16,1,16,1,16,50,55,1,18,1,18,1,18,
+    1,18,1,18,1,18,1,18,1,18,1,71,1,71,1,71,
+    1,18,1,18,1,18,1,18,1,18,1,18,1,18,1,18,
+    1,18,1,36,1,36,1,36,1,49,1,49,1,49,1,49,
+    1,49,1,49,1,48,1,48,1,48,1,48,1,48,1,48,
+    1,28,1,28,1,28,1,28,1,28,1,28,1,56,1,56,
+    1,56,1,42,1,42,1,42,35,39,1,20,1,20,1,20,
+    1,46,1,46,1,46,19,37,1,16,12,27,30,36,12,36,
+    1,9,1,18,1,18,1,18,18,24,18,26,1,15,1,18,
+    1,18,1,18,31,35,1,45,1,45,1,45,62,67,1,18,
+    1,18,1,18,1,18,1,18,1,19,1,19,1,19,30,34,
+    1,22,1,22,1,22,1,32,1,32,1,32,1,59,1,59,
+    1,59,1,41,1,41,1,41,1,63,1,63,1,63,1,63,
+    1,63,114,17,0,0,0,
 };
diff --git a/Python/importlib_external.h b/Python/importlib_external.h
index 7a05504a769ee..1572d0d4d9bca 100644
--- a/Python/importlib_external.h
+++ b/Python/importlib_external.h
@@ -317,9 +317,9 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
     12,15,12,20,21,25,12,26,5,26,114,10,0,0,0,99,
     2,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,
     3,0,0,0,115,50,0,0,0,9,0,116,0,124,0,131,
-    1,125,2,110,11,35,0,4,0,116,1,121,24,1,0,1,
-    0,1,0,89,0,100,1,83,0,37,0,124,2,106,2,100,
-    2,64,0,124,1,107,2,83,0,119,0,41,4,122,49,84,
+    1,125,2,110,12,35,0,4,0,116,1,121,16,1,0,1,
+    0,1,0,89,0,100,1,83,0,119,0,37,0,124,2,106,
+    2,100,2,64,0,124,1,107,2,83,0,41,4,122,49,84,
     101,115,116,32,119,104,101,116,104,101,114,32,116,104,101,32,
     112,97,116,104,32,105,115,32,116,104,101,32,115,112,101,99,
     105,102,105,101,100,32,109,111,100,101,32,116,121,112,101,46,
@@ -330,608 +330,688 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
     114,7,0,0,0,218,18,95,112,97,116,104,95,105,115,95,
     109,111,100,101,95,116,121,112,101,114,83,0,0,0,150,0,
     0,0,115,16,0,0,0,2,2,10,1,2,128,12,1,6,
-    1,2,128,14,1,2,254,115,18,0,0,0,2,5,10,254,
-    2,128,2,2,2,255,14,1,2,128,14,1,2,255,115,50,
-    0,0,0,5,21,21,31,32,36,21,37,9,18,9,18,0,
-    0,5,21,12,19,5,21,5,21,5,21,5,21,16,21,16,
-    21,16,21,0,0,13,22,13,30,33,41,13,41,46,50,12,
-    50,5,50,5,21,115,12,0,0,0,129,4,6,0,134,7,
-    16,7,152,1,16,7,99,1,0,0,0,0,0,0,0,0,
-    0,0,0,3,0,0,0,3,0,0,0,115,10,0,0,0,
-    116,0,124,0,100,1,131,2,83,0,41,3,122,31,82,101,
-    112,108,97,99,101,109,101,110,116,32,102,111,114,32,111,115,
-    46,112,97,116,104,46,105,115,102,105,108,101,46,105,0,128,
-    0,0,78,41,1,114,83,0,0,0,114,77,0,0,0,115,
-    1,0,0,0,32,114,7,0,0,0,218,12,95,112,97,116,
-    104,95,105,115,102,105,108,101,114,84,0,0,0,159,0,0,
-    0,243,2,0,0,0,10,2,114,85,0,0,0,115,10,0,
-    0,0,12,30,31,35,37,45,12,46,5,46,114,10,0,0,
-    0,99,1,0,0,0,0,0,0,0,0,0,0,0,3,0,
-    0,0,3,0,0,0,115,22,0,0,0,124,0,115,6,116,
-    0,106,1,131,0,125,0,116,2,124,0,100,1,131,2,83,
-    0,41,3,122,30,82,101,112,108,97,99,101,109,101,110,116,
-    32,102,111,114,32,111,115,46,112,97,116,104,46,105,115,100,
-    105,114,46,105,0,64,0,0,78,41,3,114,21,0,0,0,
-    218,6,103,101,116,99,119,100,114,83,0,0,0,114,77,0,
-    0,0,115,1,0,0,0,32,114,7,0,0,0,218,11,95,
-    112,97,116,104,95,105,115,100,105,114,114,87,0,0,0,164,
-    0,0,0,115,6,0,0,0,4,2,8,1,10,1,115,6,
-    0,0,0,2,2,10,1,10,1,115,22,0,0,0,12,16,
-    5,28,16,19,16,26,16,28,9,13,12,30,31,35,37,45,
-    12,46,5,46,114,10,0,0,0,99,1,0,0,0,0,0,
-    0,0,0,0,0,0,4,0,0,0,3,0,0,0,115,62,
-    0,0,0,124,0,115,4,100,1,83,0,116,0,106,1,124,
-    0,131,1,100,2,25,0,160,2,100,3,100,4,161,2,125,
-    1,116,3,124,1,131,1,100,5,107,4,111,30,124,1,160,
-    4,100,6,161,1,112,30,124,1,160,5,100,4,161,1,83,
-    0,41,8,250,30,82,101,112,108,97,99,101,109,101,110,116,
-    32,102,111,114,32,111,115,46,112,97,116,104,46,105,115,97,
-    98,115,46,70,114,0,0,0,0,114,2,0,0,0,114,1,
-    0,0,0,114,3,0,0,0,122,2,92,92,78,41,6,114,
-    21,0,0,0,114,58,0,0,0,218,7,114,101,112,108,97,
-    99,101,114,4,0,0,0,114,29,0,0,0,114,60,0,0,
-    0,41,2,114,67,0,0,0,114,66,0,0,0,115,2,0,
-    0,0,32,32,114,7,0,0,0,218,11,95,112,97,116,104,
-    95,105,115,97,98,115,114,90,0,0,0,172,0,0,0,115,
-    8,0,0,0,4,2,4,1,22,1,32,1,115,8,0,0,
-    0,2,2,6,1,22,1,32,1,115,62,0,0,0,16,20,
-    9,25,20,25,20,25,16,19,16,35,36,40,16,41,42,43,
-    16,44,16,63,53,56,58,62,16,63,9,13,16,19,20,24,
-    16,25,28,29,16,29,16,82,35,39,35,58,51,57,35,58,
-    35,81,62,66,62,81,76,80,62,81,9,82,114,10,0,0,
-    0,99,1,0,0,0,0,0,0,0,0,0,0,0,3,0,
-    0,0,3,0,0,0,115,10,0,0,0,124,0,160,0,116,
-    1,161,1,83,0,41,2,114,88,0,0,0,78,41,2,114,
-    29,0,0,0,114,53,0,0,0,114,77,0,0,0,115,1,
-    0,0,0,32,114,7,0,0,0,114,90,0,0,0,114,90,
-    0,0,0,180,0,0,0,114,85,0,0,0,114,85,0,0,
-    0,115,10,0,0,0,16,20,16,48,32,47,16,48,9,48,
-    114,10,0,0,0,233,182,1,0,0,99,3,0,0,0,0,
-    0,0,0,0,0,0,0,11,0,0,0,3,0,0,0,115,
-    178,0,0,0,100,1,160,0,124,0,116,1,124,0,131,1,
-    161,2,125,3,116,2,106,3,124,3,116,2,106,4,116,2,
-    106,5,66,0,116,2,106,6,66,0,124,2,100,2,64,0,
-    131,3,125,4,9,0,116,7,106,8,124,4,100,3,131,2,
-    53,0,125,5,124,5,160,9,124,1,161,1,1,0,100,4,
-    4,0,4,0,131,3,1,0,110,11,35,0,49,0,115,48,
-    119,4,37,0,1,0,1,0,1,0,89,0,1,0,1,0,
-    116,2,106,10,124,3,124,0,131,2,1,0,100,4,83,0,
-    35,0,4,0,116,11,121,88,1,0,1,0,1,0,9,0,
-    116,2,106,12,124,3,131,1,1,0,130,0,35,0,4,0,
-    116,11,121,87,1,0,1,0,1,0,89,0,130,0,37,0,
-    37,0,119,0,119,0,41,5,122,162,66,101,115,116,45,101,
-    102,102,111,114,116,32,102,117,110,99,116,105,111,110,32,116,
-    111,32,119,114,105,116,101,32,100,97,116,97,32,116,111,32,
-    97,32,112,97,116,104,32,97,116,111,109,105,99,97,108,108,
-    121,46,10,32,32,32,32,66,101,32,112,114,101,112,97,114,
-    101,100,32,116,111,32,104,97,110,100,108,101,32,97,32,70,
-    105,108,101,69,120,105,115,116,115,69,114,114,111,114,32,105,
-    102,32,99,111,110,99,117,114,114,101,110,116,32,119,114,105,
-    116,105,110,103,32,111,102,32,116,104,101,10,32,32,32,32,
-    116,101,109,112,111,114,97,114,121,32,102,105,108,101,32,105,
-    115,32,97,116,116,101,109,112,116,101,100,46,250,5,123,125,
-    46,123,125,114,91,0,0,0,90,2,119,98,78,41,13,218,
-    6,102,111,114,109,97,116,218,2,105,100,114,21,0,0,0,
-    90,4,111,112,101,110,90,6,79,95,69,88,67,76,90,7,
-    79,95,67,82,69,65,84,90,8,79,95,87,82,79,78,76,
-    89,218,3,95,105,111,218,6,70,105,108,101,73,79,218,5,
-    119,114,105,116,101,114,89,0,0,0,114,80,0,0,0,90,
-    6,117,110,108,105,110,107,41,6,114,67,0,0,0,114,44,
-    0,0,0,114,82,0,0,0,90,8,112,97,116,104,95,116,
-    109,112,90,2,102,100,218,4,102,105,108,101,115,6,0,0,
-    0,32,32,32,32,32,32,114,7,0,0,0,218,13,95,119,
-    114,105,116,101,95,97,116,111,109,105,99,114,99,0,0,0,
-    185,0,0,0,115,46,0,0,0,16,5,6,1,22,1,4,
-    255,2,2,14,3,10,1,20,255,2,128,12,0,16,2,2,
-    128,12,1,2,1,10,1,2,3,2,128,12,254,2,1,2,
-    1,4,128,2,254,2,253,115,54,0,0,0,16,5,6,1,
+    1,2,255,2,128,14,2,115,16,0,0,0,2,5,10,254,
+    2,128,2,2,2,255,16,1,2,128,14,1,115,50,0,0,
+    0,5,21,21,31,32,36,21,37,9,18,9,18,0,0,5,
+    21,12,19,5,21,5,21,5,21,5,21,16,21,16,21,16,
+    21,5,21,0,0,13,22,13,30,33,41,13,41,46,50,12,
+    50,5,50,115,12,0,0,0,129,4,6,0,134,7,17,7,
+    144,1,17,7,99,1,0,0,0,0,0,0,0,0,0,0,
+    0,3,0,0,0,3,0,0,0,115,10,0,0,0,116,0,
+    124,0,100,1,131,2,83,0,41,3,122,31,82,101,112,108,
+    97,99,101,109,101,110,116,32,102,111,114,32,111,115,46,112,
+    97,116,104,46,105,115,102,105,108,101,46,105,0,128,0,0,
+    78,41,1,114,83,0,0,0,114,77,0,0,0,115,1,0,
+    0,0,32,114,7,0,0,0,218,12,95,112,97,116,104,95,
+    105,115,102,105,108,101,114,84,0,0,0,159,0,0,0,243,
+    2,0,0,0,10,2,114,85,0,0,0,115,10,0,0,0,
+    12,30,31,35,37,45,12,46,5,46,114,10,0,0,0,99,
+    1,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,
+    3,0,0,0,115,22,0,0,0,124,0,115,6,116,0,106,
+    1,131,0,125,0,116,2,124,0,100,1,131,2,83,0,41,
+    3,122,30,82,101,112,108,97,99,101,109,101,110,116,32,102,
+    111,114,32,111,115,46,112,97,116,104,46,105,115,100,105,114,
+    46,105,0,64,0,0,78,41,3,114,21,0,0,0,218,6,
+    103,101,116,99,119,100,114,83,0,0,0,114,77,0,0,0,
+    115,1,0,0,0,32,114,7,0,0,0,218,11,95,112,97,
+    116,104,95,105,115,100,105,114,114,87,0,0,0,164,0,0,
+    0,115,6,0,0,0,4,2,8,1,10,1,115,6,0,0,
+    0,2,2,10,1,10,1,115,22,0,0,0,12,16,5,28,
+    16,19,16,26,16,28,9,13,12,30,31,35,37,45,12,46,
+    5,46,114,10,0,0,0,99,1,0,0,0,0,0,0,0,
+    0,0,0,0,4,0,0,0,3,0,0,0,115,62,0,0,
+    0,124,0,115,4,100,1,83,0,116,0,106,1,124,0,131,
+    1,100,2,25,0,160,2,100,3,100,4,161,2,125,1,116,
+    3,124,1,131,1,100,5,107,4,111,30,124,1,160,4,100,
+    6,161,1,112,30,124,1,160,5,100,4,161,1,83,0,41,
+    8,250,30,82,101,112,108,97,99,101,109,101,110,116,32,102,
+    111,114,32,111,115,46,112,97,116,104,46,105,115,97,98,115,
+    46,70,114,0,0,0,0,114,2,0,0,0,114,1,0,0,
+    0,114,3,0,0,0,122,2,92,92,78,41,6,114,21,0,
+    0,0,114,58,0,0,0,218,7,114,101,112,108,97,99,101,
+    114,4,0,0,0,114,29,0,0,0,114,60,0,0,0,41,
+    2,114,67,0,0,0,114,66,0,0,0,115,2,0,0,0,
+    32,32,114,7,0,0,0,218,11,95,112,97,116,104,95,105,
+    115,97,98,115,114,90,0,0,0,172,0,0,0,115,8,0,
+    0,0,4,2,4,1,22,1,32,1,115,8,0,0,0,2,
+    2,6,1,22,1,32,1,115,62,0,0,0,16,20,9,25,
+    20,25,20,25,16,19,16,35,36,40,16,41,42,43,16,44,
+    16,63,53,56,58,62,16,63,9,13,16,19,20,24,16,25,
+    28,29,16,29,16,82,35,39,35,58,51,57,35,58,35,81,
+    62,66,62,81,76,80,62,81,9,82,114,10,0,0,0,99,
+    1,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,
+    3,0,0,0,115,10,0,0,0,124,0,160,0,116,1,161,
+    1,83,0,41,2,114,88,0,0,0,78,41,2,114,29,0,
+    0,0,114,53,0,0,0,114,77,0,0,0,115,1,0,0,
+    0,32,114,7,0,0,0,114,90,0,0,0,114,90,0,0,
+    0,180,0,0,0,114,85,0,0,0,114,85,0,0,0,115,
+    10,0,0,0,16,20,16,48,32,47,16,48,9,48,114,10,
+    0,0,0,233,182,1,0,0,99,3,0,0,0,0,0,0,
+    0,0,0,0,0,11,0,0,0,3,0,0,0,115,178,0,
+    0,0,100,1,160,0,124,0,116,1,124,0,131,1,161,2,
+    125,3,116,2,106,3,124,3,116,2,106,4,116,2,106,5,
+    66,0,116,2,106,6,66,0,124,2,100,2,64,0,131,3,
+    125,4,9,0,116,7,106,8,124,4,100,3,131,2,53,0,
+    125,5,124,5,160,9,124,1,161,1,1,0,100,4,4,0,
+    4,0,131,3,1,0,110,11,35,0,49,0,115,48,119,4,
+    37,0,1,0,1,0,1,0,89,0,1,0,1,0,116,2,
+    106,10,124,3,124,0,131,2,1,0,100,4,83,0,35,0,
+    4,0,116,11,121,87,1,0,1,0,1,0,9,0,116,2,
+    106,12,124,3,131,1,1,0,130,0,35,0,4,0,116,11,
+    121,85,1,0,1,0,1,0,89,0,130,0,119,0,37,0,
+    119,0,37,0,41,5,122,162,66,101,115,116,45,101,102,102,
+    111,114,116,32,102,117,110,99,116,105,111,110,32,116,111,32,
+    119,114,105,116,101,32,100,97,116,97,32,116,111,32,97,32,
+    112,97,116,104,32,97,116,111,109,105,99,97,108,108,121,46,
+    10,32,32,32,32,66,101,32,112,114,101,112,97,114,101,100,
+    32,116,111,32,104,97,110,100,108,101,32,97,32,70,105,108,
+    101,69,120,105,115,116,115,69,114,114,111,114,32,105,102,32,
+    99,111,110,99,117,114,114,101,110,116,32,119,114,105,116,105,
+    110,103,32,111,102,32,116,104,101,10,32,32,32,32,116,101,
+    109,112,111,114,97,114,121,32,102,105,108,101,32,105,115,32,
+    97,116,116,101,109,112,116,101,100,46,250,5,123,125,46,123,
+    125,114,91,0,0,0,90,2,119,98,78,41,13,218,6,102,
+    111,114,109,97,116,218,2,105,100,114,21,0,0,0,90,4,
+    111,112,101,110,90,6,79,95,69,88,67,76,90,7,79,95,
+    67,82,69,65,84,90,8,79,95,87,82,79,78,76,89,218,
+    3,95,105,111,218,6,70,105,108,101,73,79,218,5,119,114,
+    105,116,101,114,89,0,0,0,114,80,0,0,0,90,6,117,
+    110,108,105,110,107,41,6,114,67,0,0,0,114,44,0,0,
+    0,114,82,0,0,0,90,8,112,97,116,104,95,116,109,112,
+    90,2,102,100,218,4,102,105,108,101,115,6,0,0,0,32,
+    32,32,32,32,32,114,7,0,0,0,218,13,95,119,114,105,
+    116,101,95,97,116,111,109,105,99,114,99,0,0,0,185,0,
+    0,0,115,48,0,0,0,16,5,6,1,22,1,4,255,2,
+    2,14,3,10,1,20,255,2,128,12,0,16,2,2,128,12,
+    1,2,1,10,1,2,3,2,128,12,254,2,1,2,1,2,
+    254,2,128,2,253,2,128,115,56,0,0,0,16,5,6,1,
     24,1,2,255,2,13,10,248,2,1,2,255,30,1,2,128,
     12,0,16,1,2,128,2,6,2,251,8,5,2,255,10,254,
-    2,3,2,128,2,255,2,255,10,1,2,1,4,128,2,255,
-    2,1,115,178,0,0,0,16,23,16,46,31,35,37,39,40,
-    44,37,45,16,46,5,13,10,13,10,18,19,27,19,22,19,
-    29,32,35,32,43,19,43,46,49,46,58,19,58,60,64,67,
-    72,60,72,10,73,5,7,5,14,14,17,14,24,25,27,29,
-    33,14,34,9,29,38,42,13,17,13,29,24,28,13,29,13,
-    29,9,29,9,29,9,29,9,29,9,29,9,29,9,29,9,
-    29,9,29,9,29,0,0,9,29,9,29,9,29,9,29,9,
-    29,9,29,9,12,9,20,21,29,31,35,9,36,9,36,9,
-    36,9,36,0,0,5,14,12,19,5,14,5,14,5,14,5,
-    14,9,17,13,16,13,23,24,32,13,33,13,33,9,14,0,
-    0,9,17,16,23,9,17,9,17,9,17,9,17,13,17,9,
-    14,0,0,0,0,9,17,5,14,115,69,0,0,0,153,6,
-    62,0,159,6,43,3,165,6,62,0,171,4,47,11,175,1,
-    62,0,176,3,47,11,179,9,62,0,190,7,65,22,7,193,
-    6,5,65,12,6,193,11,1,65,22,7,193,12,7,65,21,
-    13,193,19,3,65,22,7,193,23,1,65,21,13,193,24,1,
-    65,22,7,105,132,13,0,0,114,47,0,0,0,114,35,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,119,122,4,46,112,121,99,41,1,218,
-    12,111,112,116,105,109,105,122,97,116,105,111,110,99,2,0,
-    0,0,0,0,0,0,1,0,0,0,5,0,0,0,3,0,
-    0,0,115,80,1,0,0,124,1,100,1,117,1,114,26,116,
-    0,106,1,100,2,116,2,131,2,1,0,124,2,100,1,117,
-    1,114,20,100,3,125,3,116,3,124,3,131,1,130,1,124,
-    1,114,24,100,4,110,1,100,5,125,2,116,4,106,5,124,
-    0,131,1,125,0,116,6,124,0,131,1,92,2,125,4,125,
-    5,124,5,160,7,100,6,161,1,92,3,125,6,125,7,125,
-    8,116,8,106,9,106,10,125,9,124,9,100,1,117,0,114,
-    57,116,11,100,7,131,1,130,1,100,4,160,12,124,6,114,
-    63,124,6,110,1,124,8,124,7,124,9,103,3,161,1,125,
-    10,124,2,100,1,117,0,114,86,116,8,106,13,106,14,100,
-    8,107,2,114,82,100,4,125,2,110,4,116,8,106,13,106,
-    14,125,2,116,15,124,2,131,1,125,2,124,2,100,4,107,
-    3,114,112,124,2,160,16,161,0,115,105,116,17,100,9,160,
-    18,124,2,161,1,131,1,130,1,100,10,160,18,124,10,116,
-    19,124,2,161,3,125,10,124,10,116,20,100,8,25,0,23,
-    0,125,11,116,8,106,21,100,1,117,1,114,162,116,22,124,
-    4,131,1,115,134,116,23,116,4,106,24,131,0,124,4,131,
-    2,125,4,124,4,100,5,25,0,100,11,107,2,114,152,124,
-    4,100,8,25,0,116,25,118,1,114,152,124,4,100,12,100,
-    1,133,2,25,0,125,4,116,23,116,8,106,21,124,4,160,
-    26,116,25,161,1,124,11,131,3,83,0,116,23,124,4,116,
-    27,124,11,131,3,83,0,41,13,97,254,2,0,0,71,105,
-    118,101,110,32,116,104,101,32,112,97,116,104,32,116,111,32,
-    97,32,46,112,121,32,102,105,108,101,44,32,114,101,116,117,
-    114,110,32,116,104,101,32,112,97,116,104,32,116,111,32,105,
-    116,115,32,46,112,121,99,32,102,105,108,101,46,10,10,32,
-    32,32,32,84,104,101,32,46,112,121,32,102,105,108,101,32,
-    100,111,101,115,32,110,111,116,32,110,101,101,100,32,116,111,
-    32,101,120,105,115,116,59,32,116,104,105,115,32,115,105,109,
-    112,108,121,32,114,101,116,117,114,110,115,32,116,104,101,32,
-    112,97,116,104,32,116,111,32,116,104,101,10,32,32,32,32,
-    46,112,121,99,32,102,105,108,101,32,99,97,108,99,117,108,
-    97,116,101,100,32,97,115,32,105,102,32,116,104,101,32,46,
-    112,121,32,102,105,108,101,32,119,101,114,101,32,105,109,112,
-    111,114,116,101,100,46,10,10,32,32,32,32,84,104,101,32,
-    39,111,112,116,105,109,105,122,97,116,105,111,110,39,32,112,
-    97,114,97,109,101,116,101,114,32,99,111,110,116,114,111,108,
-    115,32,116,104,101,32,112,114,101,115,117,109,101,100,32,111,
-    112,116,105,109,105,122,97,116,105,111,110,32,108,101,118,101,
-    108,32,111,102,10,32,32,32,32,116,104,101,32,98,121,116,
-    101,99,111,100,101,32,102,105,108,101,46,32,73,102,32,39,
-    111,112,116,105,109,105,122,97,116,105,111,110,39,32,105,115,
-    32,110,111,116,32,78,111,110,101,44,32,116,104,101,32,115,
-    116,114,105,110,103,32,114,101,112,114,101,115,101,110,116,97,
-    116,105,111,110,10,32,32,32,32,111,102,32,116,104,101,32,
-    97,114,103,117,109,101,110,116,32,105,115,32,116,97,107,101,
-    110,32,97,110,100,32,118,101,114,105,102,105,101,100,32,116,
-    111,32,98,101,32,97,108,112,104,97,110,117,109,101,114,105,
-    99,32,40,101,108,115,101,32,86,97,108,117,101,69,114,114,
-    111,114,10,32,32,32,32,105,115,32,114,97,105,115,101,100,
-    41,46,10,10,32,32,32,32,84,104,101,32,100,101,98,117,
-    103,95,111,118,101,114,114,105,100,101,32,112,97,114,97,109,
-    101,116,101,114,32,105,115,32,100,101,112,114,101,99,97,116,
-    101,100,46,32,73,102,32,100,101,98,117,103,95,111,118,101,
-    114,114,105,100,101,32,105,115,32,110,111,116,32,78,111,110,
-    101,44,10,32,32,32,32,97,32,84,114,117,101,32,118,97,
-    108,117,101,32,105,115,32,116,104,101,32,115,97,109,101,32,
-    97,115,32,115,101,116,116,105,110,103,32,39,111,112,116,105,
-    109,105,122,97,116,105,111,110,39,32,116,111,32,116,104,101,
-    32,101,109,112,116,121,32,115,116,114,105,110,103,10,32,32,
-    32,32,119,104,105,108,101,32,97,32,70,97,108,115,101,32,
-    118,97,108,117,101,32,105,115,32,101,113,117,105,118,97,108,
-    101,110,116,32,116,111,32,115,101,116,116,105,110,103,32,39,
-    111,112,116,105,109,105,122,97,116,105,111,110,39,32,116,111,
-    32,39,49,39,46,10,10,32,32,32,32,73,102,32,115,121,
-    115,46,105,109,112,108,101,109,101,110,116,97,116,105,111,110,
-    46,99,97,99,104,101,95,116,97,103,32,105,115,32,78,111,
-    110,101,32,116,104,101,110,32,78,111,116,73,109,112,108,101,
-    109,101,110,116,101,100,69,114,114,111,114,32,105,115,32,114,
-    97,105,115,101,100,46,10,10,32,32,32,32,78,122,70,116,
-    104,101,32,100,101,98,117,103,95,111,118,101,114,114,105,100,
-    101,32,112,97,114,97,109,101,116,101,114,32,105,115,32,100,
-    101,112,114,101,99,97,116,101,100,59,32,117,115,101,32,39,
-    111,112,116,105,109,105,122,97,116,105,111,110,39,32,105,110,
-    115,116,101,97,100,122,50,100,101,98,117,103,95,111,118,101,
-    114,114,105,100,101,32,111,114,32,111,112,116,105,109,105,122,
-    97,116,105,111,110,32,109,117,115,116,32,98,101,32,115,101,
-    116,32,116,111,32,78,111,110,101,114,11,0,0,0,114,3,
-    0,0,0,218,1,46,250,36,115,121,115,46,105,109,112,108,
-    101,109,101,110,116,97,116,105,111,110,46,99,97,99,104,101,
-    95,116,97,103,32,105,115,32,78,111,110,101,114,0,0,0,
-    0,122,24,123,33,114,125,32,105,115,32,110,111,116,32,97,
-    108,112,104,97,110,117,109,101,114,105,99,122,7,123,125,46,
-    123,125,123,125,114,12,0,0,0,114,47,0,0,0,41,28,
-    218,9,95,119,97,114,110,105,110,103,115,218,4,119,97,114,
-    110,218,18,68,101,112,114,101,99,97,116,105,111,110,87,97,
-    114,110,105,110,103,218,9,84,121,112,101,69,114,114,111,114,
-    114,21,0,0,0,218,6,102,115,112,97,116,104,114,76,0,
-    0,0,218,10,114,112,97,114,116,105,116,105,111,110,114,18,
-    0,0,0,218,14,105,109,112,108,101,109,101,110,116,97,116,
-    105,111,110,218,9,99,97,99,104,101,95,116,97,103,218,19,
-    78,111,116,73,109,112,108,101,109,101,110,116,101,100,69,114,
-    114,111,114,114,64,0,0,0,114,19,0,0,0,218,8,111,
-    112,116,105,109,105,122,101,218,3,115,116,114,218,7,105,115,
-    97,108,110,117,109,218,10,86,97,108,117,101,69,114,114,111,
-    114,114,93,0,0,0,218,4,95,79,80,84,218,17,66,89,
-    84,69,67,79,68,69,95,83,85,70,70,73,88,69,83,218,
-    14,112,121,99,97,99,104,101,95,112,114,101,102,105,120,114,
-    90,0,0,0,114,69,0,0,0,114,86,0,0,0,114,53,
-    0,0,0,218,6,108,115,116,114,105,112,218,8,95,80,89,
-    67,65,67,72,69,41,12,114,67,0,0,0,90,14,100,101,
-    98,117,103,95,111,118,101,114,114,105,100,101,114,100,0,0,
-    0,218,7,109,101,115,115,97,103,101,218,4,104,101,97,100,
-    114,68,0,0,0,90,4,98,97,115,101,114,6,0,0,0,
-    218,4,114,101,115,116,90,3,116,97,103,90,15,97,108,109,
-    111,115,116,95,102,105,108,101,110,97,109,101,218,8,102,105,
-    108,101,110,97,109,101,115,12,0,0,0,32,32,32,32,32,
-    32,32,32,32,32,32,32,114,7,0,0,0,218,17,99,97,
-    99,104,101,95,102,114,111,109,95,115,111,117,114,99,101,114,
-    125,0,0,0,135,1,0,0,115,72,0,0,0,8,18,6,
-    1,2,1,4,255,8,2,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,
-    1,8,2,8,1,8,1,8,1,14,1,14,1,12,1,10,
-    1,8,9,14,1,24,5,12,1,2,4,4,1,8,1,2,
-    1,4,253,12,5,115,86,0,0,0,6,18,2,6,4,251,
-    8,1,6,1,2,2,4,255,8,1,12,1,10,1,12,1,
-    16,1,8,1,6,1,10,1,24,1,6,1,2,4,10,253,
-    2,3,6,254,8,2,8,1,6,1,2,3,6,254,16,1,
-    14,1,12,1,8,1,2,24,6,241,16,1,10,5,2,1,
-    10,255,14,1,2,4,4,1,8,1,2,1,4,1,12,1,
-    115,80,1,0,0,8,22,30,34,8,34,5,51,9,18,9,
-    23,24,48,50,68,9,69,9,69,12,24,32,36,12,36,9,
-    37,23,75,13,20,19,28,29,36,19,37,13,37,30,44,24,
-    51,24,26,24,26,50,51,9,21,12,15,12,22,23,27,12,
-    28,5,9,18,29,30,34,18,35,5,15,5,9,11,15,23,
-    27,23,43,39,42,23,43,5,20,5,9,11,14,16,20,11,
-    14,11,29,11,39,5,8,8,11,15,19,8,19,5,74,15,
-    34,35,73,15,74,9,74,23,25,23,68,41,45,33,55,33,
-    37,33,37,51,55,58,61,63,66,31,67,23,68,5,20,8,
-    20,24,28,8,28,5,46,12,15,12,21,12,30,34,35,12,
-    35,9,46,28,30,13,25,13,25,28,31,28,37,28,46,13,
-    25,20,23,24,36,20,37,5,17,8,20,24,26,8,26,5,
-    80,16,28,16,38,16,38,9,78,19,29,30,56,30,77,64,
-    76,30,77,19,78,13,78,27,36,27,80,44,59,61,65,67,
-    79,27,80,9,24,16,31,34,51,52,53,34,54,16,54,5,
-    13,8,11,8,26,34,38,8,38,5,10,16,27,28,32,16,
-    33,9,50,20,30,31,34,31,41,31,43,45,49,20,50,13,
-    17,12,16,17,18,12,19,23,26,12,26,9,28,31,35,36,
-    37,31,38,46,61,31,61,9,28,20,24,25,26,25,27,25,
-    27,20,28,13,17,16,26,13,16,13,31,13,17,13,41,25,
-    40,13,41,13,21,16,10,9,10,12,22,23,27,29,37,39,
-    47,12,48,5,48,114,10,0,0,0,99,1,0,0,0,0,
-    0,0,0,0,0,0,0,5,0,0,0,3,0,0,0,115,
-    40,1,0,0,116,0,106,1,106,2,100,1,117,0,114,10,
-    116,3,100,2,131,1,130,1,116,4,106,5,124,0,131,1,
-    125,0,116,6,124,0,131,1,92,2,125,1,125,2,100,3,
-    125,3,116,0,106,7,100,1,117,1,114,51,116,0,106,7,
-    160,8,116,9,161,1,125,4,124,1,160,10,124,4,116,11,
-    23,0,161,1,114,51,124,1,116,12,124,4,131,1,100,1,
-    133,2,25,0,125,1,100,4,125,3,124,3,115,72,116,6,
-    124,1,131,1,92,2,125,1,125,5,124,5,116,13,107,3,
-    114,72,116,14,116,13,155,0,100,5,124,0,155,2,157,3,
-    131,1,130,1,124,2,160,15,100,6,161,1,125,6,124,6,
-    100,7,118,1,114,88,116,14,100,8,124,2,155,2,157,2,
-    131,1,130,1,124,6,100,9,107,2,114,132,124,2,160,16,
-    100,6,100,10,161,2,100,11,25,0,125,7,124,7,160,10,
-    116,17,161,1,115,112,116,14,100,12,116,17,155,2,157,2,
-    131,1,130,1,124,7,116,12,116,17,131,1,100,1,133,2,
-    25,0,125,8,124,8,160,18,161,0,115,132,116,14,100,13,
-    124,7,155,2,100,14,157,3,131,1,130,1,124,2,160,19,
-    100,6,161,1,100,15,25,0,125,9,116,20,124,1,124,9,
-    116,21,100,15,25,0,23,0,131,2,83,0,41,16,97,110,
-    1,0,0,71,105,118,101,110,32,116,104,101,32,112,97,116,
-    104,32,116,111,32,97,32,46,112,121,99,46,32,102,105,108,
-    101,44,32,114,101,116,117,114,110,32,116,104,101,32,112,97,
-    116,104,32,116,111,32,105,116,115,32,46,112,121,32,102,105,
-    108,101,46,10,10,32,32,32,32,84,104,101,32,46,112,121,
-    99,32,102,105,108,101,32,100,111,101,115,32,110,111,116,32,
-    110,101,101,100,32,116,111,32,101,120,105,115,116,59,32,116,
-    104,105,115,32,115,105,109,112,108,121,32,114,101,116,117,114,
-    110,115,32,116,104,101,32,112,97,116,104,32,116,111,10,32,
-    32,32,32,116,104,101,32,46,112,121,32,102,105,108,101,32,
-    99,97,108,99,117,108,97,116,101,100,32,116,111,32,99,111,
-    114,114,101,115,112,111,110,100,32,116,111,32,116,104,101,32,
-    46,112,121,99,32,102,105,108,101,46,32,32,73,102,32,112,
-    97,116,104,32,100,111,101,115,10,32,32,32,32,110,111,116,
-    32,99,111,110,102,111,114,109,32,116,111,32,80,69,80,32,
-    51,49,52,55,47,52,56,56,32,102,111,114,109,97,116,44,
-    32,86,97,108,117,101,69,114,114,111,114,32,119,105,108,108,
-    32,98,101,32,114,97,105,115,101,100,46,32,73,102,10,32,
-    32,32,32,115,121,115,46,105,109,112,108,101,109,101,110,116,
-    97,116,105,111,110,46,99,97,99,104,101,95,116,97,103,32,
-    105,115,32,78,111,110,101,32,116,104,101,110,32,78,111,116,
-    73,109,112,108,101,109,101,110,116,101,100,69,114,114,111,114,
-    32,105,115,32,114,97,105,115,101,100,46,10,10,32,32,32,
-    32,78,114,102,0,0,0,70,84,122,31,32,110,111,116,32,
-    98,111,116,116,111,109,45,108,101,118,101,108,32,100,105,114,
-    101,99,116,111,114,121,32,105,110,32,114,101,0,0,0,62,
-    2,0,0,0,114,47,0,0,0,233,3,0,0,0,122,29,
-    101,120,112,101,99,116,101,100,32,111,110,108,121,32,50,32,
-    111,114,32,51,32,100,111,116,115,32,105,110,32,114,126,0,
-    0,0,114,47,0,0,0,233,254,255,255,255,122,53,111,112,
-    116,105,109,105,122,97,116,105,111,110,32,112,111,114,116,105,
-    111,110,32,111,102,32,102,105,108,101,110,97,109,101,32,100,
-    111,101,115,32,110,111,116,32,115,116,97,114,116,32,119,105,
-    116,104,32,122,19,111,112,116,105,109,105,122,97,116,105,111,
-    110,32,108,101,118,101,108,32,122,29,32,105,115,32,110,111,
-    116,32,97,110,32,97,108,112,104,97,110,117,109,101,114,105,
-    99,32,118,97,108,117,101,114,0,0,0,0,41,22,114,18,
-    0,0,0,114,109,0,0,0,114,110,0,0,0,114,111,0,
-    0,0,114,21,0,0,0,114,107,0,0,0,114,76,0,0,
-    0,114,118,0,0,0,114,52,0,0,0,114,53,0,0,0,
-    114,29,0,0,0,114,61,0,0,0,114,4,0,0,0,114,
-    120,0,0,0,114,115,0,0,0,218,5,99,111,117,110,116,
-    218,6,114,115,112,108,105,116,114,116,0,0,0,114,114,0,
-    0,0,218,9,112,97,114,116,105,116,105,111,110,114,69,0,
-    0,0,218,15,83,79,85,82,67,69,95,83,85,70,70,73,
-    88,69,83,41,10,114,67,0,0,0,114,122,0,0,0,90,
-    16,112,121,99,97,99,104,101,95,102,105,108,101,110,97,109,
-    101,90,23,102,111,117,110,100,95,105,110,95,112,121,99,97,
-    99,104,101,95,112,114,101,102,105,120,90,13,115,116,114,105,
-    112,112,101,100,95,112,97,116,104,90,7,112,121,99,97,99,
-    104,101,90,9,100,111,116,95,99,111,117,110,116,114,100,0,
-    0,0,90,9,111,112,116,95,108,101,118,101,108,90,13,98,
-    97,115,101,95,102,105,108,101,110,97,109,101,115,10,0,0,
-    0,32,32,32,32,32,32,32,32,32,32,114,7,0,0,0,
-    218,17,115,111,117,114,99,101,95,102,114,111,109,95,99,97,
-    99,104,101,114,132,0,0,0,206,1,0,0,115,60,0,0,
-    0,12,9,8,1,10,1,12,1,4,1,10,1,12,1,14,
-    1,16,1,4,1,4,1,12,1,8,1,8,1,2,1,8,
-    255,10,2,8,1,14,1,8,1,16,1,10,1,4,1,2,
-    1,8,255,16,2,8,1,16,1,14,2,18,1,115,78,0,
-    0,0,10,9,10,1,10,1,12,1,4,1,8,1,2,4,
-    12,253,12,1,2,2,16,255,4,1,2,1,2,4,12,253,
-    6,1,2,2,4,255,14,1,10,1,6,1,2,10,14,247,
-    6,1,2,8,16,249,8,1,2,2,2,255,12,1,16,1,
-    6,1,2,2,2,255,2,1,2,255,10,1,14,1,18,1,
-    115,40,1,0,0,8,11,8,26,8,36,40,44,8,44,5,
-    74,15,34,35,73,15,74,9,74,12,15,12,22,23,27,12,
-    28,5,9,30,41,42,46,30,47,5,27,5,9,11,27,31,
-    36,5,28,8,11,8,26,34,38,8,38,5,43,25,28,25,
-    43,25,67,51,66,25,67,9,22,12,16,12,53,28,41,44,
-    52,28,52,12,53,9,43,20,24,25,28,29,42,25,43,25,
-    44,25,44,20,45,13,17,39,43,13,36,12,35,5,42,25,
-    36,37,41,25,42,9,22,9,13,15,22,12,19,23,31,12,
-    31,9,42,19,29,33,41,30,41,30,41,31,35,30,41,30,
-    41,19,42,13,42,17,33,17,44,40,43,17,44,5,14,8,
-    17,25,31,8,31,5,51,15,25,26,78,27,43,26,78,26,
-    78,15,79,9,79,10,19,23,24,10,24,5,51,24,40,24,
-    55,48,51,53,54,24,55,56,58,24,59,9,21,16,28,16,
-    45,40,44,16,45,9,47,19,29,30,46,31,35,30,46,30,
-    46,19,47,13,47,21,33,34,37,38,42,34,43,34,44,34,
-    44,21,45,9,18,16,25,16,35,16,35,9,51,19,29,30,
-    50,31,43,30,50,30,50,30,50,19,51,13,51,21,37,21,
-    52,48,51,21,52,53,54,21,55,5,18,12,22,23,27,29,
-    42,45,60,61,62,45,63,29,63,12,64,5,64,114,10,0,
-    0,0,99,1,0,0,0,0,0,0,0,0,0,0,0,9,
-    0,0,0,3,0,0,0,115,126,0,0,0,116,0,124,0,
-    131,1,100,1,107,2,114,8,100,2,83,0,124,0,160,1,
-    100,3,161,1,92,3,125,1,125,2,125,3,124,1,114,28,
-    124,3,160,2,161,0,100,4,100,5,133,2,25,0,100,6,
-    107,3,114,30,124,0,83,0,9,0,116,3,124,0,131,1,
-    125,4,110,18,35,0,4,0,116,4,116,5,102,2,121,62,
-    1,0,1,0,1,0,124,0,100,2,100,5,133,2,25,0,
-    125,4,89,0,110,1,37,0,116,6,124,4,131,1,114,60,
-    124,4,83,0,124,0,83,0,119,0,41,7,122,188,67,111,
-    110,118,101,114,116,32,97,32,98,121,116,101,99,111,100,101,
-    32,102,105,108,101,32,112,97,116,104,32,116,111,32,97,32,
-    115,111,117,114,99,101,32,112,97,116,104,32,40,105,102,32,
-    112,111,115,115,105,98,108,101,41,46,10,10,32,32,32,32,
-    84,104,105,115,32,102,117,110,99,116,105,111,110,32,101,120,
-    105,115,116,115,32,112,117,114,101,108,121,32,102,111,114,32,
-    98,97,99,107,119,97,114,100,115,45,99,111,109,112,97,116,
-    105,98,105,108,105,116,121,32,102,111,114,10,32,32,32,32,
-    80,121,73,109,112,111,114,116,95,69,120,101,99,67,111,100,
-    101,77,111,100,117,108,101,87,105,116,104,70,105,108,101,110,
-    97,109,101,115,40,41,32,105,110,32,116,104,101,32,67,32,
-    65,80,73,46,10,10,32,32,32,32,114,0,0,0,0,78,
-    114,101,0,0,0,233,253,255,255,255,233,255,255,255,255,90,
-    2,112,121,41,7,114,4,0,0,0,114,108,0,0,0,218,
-    5,108,111,119,101,114,114,132,0,0,0,114,111,0,0,0,
-    114,115,0,0,0,114,84,0,0,0,41,5,218,13,98,121,
-    116,101,99,111,100,101,95,112,97,116,104,114,123,0,0,0,
-    218,1,95,90,9,101,120,116,101,110,115,105,111,110,218,11,
-    115,111,117,114,99,101,95,112,97,116,104,115,5,0,0,0,
-    32,32,32,32,32,114,7,0,0,0,218,15,95,103,101,116,
-    95,115,111,117,114,99,101,102,105,108,101,114,139,0,0,0,
-    246,1,0,0,115,26,0,0,0,12,7,4,1,16,1,24,
-    1,4,1,2,1,10,1,2,128,16,1,16,1,2,128,16,
-    1,2,254,115,32,0,0,0,10,7,6,1,16,1,2,1,
-    2,1,18,255,6,1,2,4,10,254,2,128,2,2,6,255,
-    24,1,2,128,16,1,2,255,115,126,0,0,0,8,11,12,
+    2,3,2,128,2,255,2,255,10,1,2,1,2,255,2,128,
+    2,1,2,128,115,178,0,0,0,16,23,16,46,31,35,37,
+    39,40,44,37,45,16,46,5,13,10,13,10,18,19,27,19,
+    22,19,29,32,35,32,43,19,43,46,49,46,58,19,58,60,
+    64,67,72,60,72,10,73,5,7,5,14,14,17,14,24,25,
+    27,29,33,14,34,9,29,38,42,13,17,13,29,24,28,13,
+    29,13,29,9,29,9,29,9,29,9,29,9,29,9,29,9,
+    29,9,29,9,29,9,29,0,0,9,29,9,29,9,29,9,
+    29,9,29,9,29,9,12,9,20,21,29,31,35,9,36,9,
+    36,9,36,9,36,0,0,5,14,12,19,5,14,5,14,5,
+    14,5,14,9,17,13,16,13,23,24,32,13,33,13,33,9,
+    14,0,0,9,17,16,23,9,17,9,17,9,17,9,17,13,
+    17,9,14,9,17,0,0,5,14,0,0,115,69,0,0,0,
+    153,6,62,0,159,6,43,3,165,6,62,0,171,4,47,11,
+    175,1,62,0,176,3,47,11,179,9,62,0,190,7,65,24,
+    7,193,6,5,65,12,6,193,11,1,65,24,7,193,12,7,
+    65,22,13,193,19,2,65,24,7,193,21,1,65,22,13,193,
+    22,2,65,24,7,105,132,13,0,0,114,47,0,0,0,114,
+    35,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,119,122,4,46,112,121,99,41,
+    1,218,12,111,112,116,105,109,105,122,97,116,105,111,110,99,
+    2,0,0,0,0,0,0,0,1,0,0,0,5,0,0,0,
+    3,0,0,0,115,80,1,0,0,124,1,100,1,117,1,114,
+    26,116,0,106,1,100,2,116,2,131,2,1,0,124,2,100,
+    1,117,1,114,20,100,3,125,3,116,3,124,3,131,1,130,
+    1,124,1,114,24,100,4,110,1,100,5,125,2,116,4,106,
+    5,124,0,131,1,125,0,116,6,124,0,131,1,92,2,125,
+    4,125,5,124,5,160,7,100,6,161,1,92,3,125,6,125,
+    7,125,8,116,8,106,9,106,10,125,9,124,9,100,1,117,
+    0,114,57,116,11,100,7,131,1,130,1,100,4,160,12,124,
+    6,114,63,124,6,110,1,124,8,124,7,124,9,103,3,161,
+    1,125,10,124,2,100,1,117,0,114,86,116,8,106,13,106,
+    14,100,8,107,2,114,82,100,4,125,2,110,4,116,8,106,
+    13,106,14,125,2,116,15,124,2,131,1,125,2,124,2,100,
+    4,107,3,114,112,124,2,160,16,161,0,115,105,116,17,100,
+    9,160,18,124,2,161,1,131,1,130,1,100,10,160,18,124,
+    10,116,19,124,2,161,3,125,10,124,10,116,20,100,8,25,
+    0,23,0,125,11,116,8,106,21,100,1,117,1,114,162,116,
+    22,124,4,131,1,115,134,116,23,116,4,106,24,131,0,124,
+    4,131,2,125,4,124,4,100,5,25,0,100,11,107,2,114,
+    152,124,4,100,8,25,0,116,25,118,1,114,152,124,4,100,
+    12,100,1,133,2,25,0,125,4,116,23,116,8,106,21,124,
+    4,160,26,116,25,161,1,124,11,131,3,83,0,116,23,124,
+    4,116,27,124,11,131,3,83,0,41,13,97,254,2,0,0,
+    71,105,118,101,110,32,116,104,101,32,112,97,116,104,32,116,
+    111,32,97,32,46,112,121,32,102,105,108,101,44,32,114,101,
+    116,117,114,110,32,116,104,101,32,112,97,116,104,32,116,111,
+    32,105,116,115,32,46,112,121,99,32,102,105,108,101,46,10,
+    10,32,32,32,32,84,104,101,32,46,112,121,32,102,105,108,
+    101,32,100,111,101,115,32,110,111,116,32,110,101,101,100,32,
+    116,111,32,101,120,105,115,116,59,32,116,104,105,115,32,115,
+    105,109,112,108,121,32,114,101,116,117,114,110,115,32,116,104,
+    101,32,112,97,116,104,32,116,111,32,116,104,101,10,32,32,
+    32,32,46,112,121,99,32,102,105,108,101,32,99,97,108,99,
+    117,108,97,116,101,100,32,97,115,32,105,102,32,116,104,101,
+    32,46,112,121,32,102,105,108,101,32,119,101,114,101,32,105,
+    109,112,111,114,116,101,100,46,10,10,32,32,32,32,84,104,
+    101,32,39,111,112,116,105,109,105,122,97,116,105,111,110,39,
+    32,112,97,114,97,109,101,116,101,114,32,99,111,110,116,114,
+    111,108,115,32,116,104,101,32,112,114,101,115,117,109,101,100,
+    32,111,112,116,105,109,105,122,97,116,105,111,110,32,108,101,
+    118,101,108,32,111,102,10,32,32,32,32,116,104,101,32,98,
+    121,116,101,99,111,100,101,32,102,105,108,101,46,32,73,102,
+    32,39,111,112,116,105,109,105,122,97,116,105,111,110,39,32,
+    105,115,32,110,111,116,32,78,111,110,101,44,32,116,104,101,
+    32,115,116,114,105,110,103,32,114,101,112,114,101,115,101,110,
+    116,97,116,105,111,110,10,32,32,32,32,111,102,32,116,104,
+    101,32,97,114,103,117,109,101,110,116,32,105,115,32,116,97,
+    107,101,110,32,97,110,100,32,118,101,114,105,102,105,101,100,
+    32,116,111,32,98,101,32,97,108,112,104,97,110,117,109,101,
+    114,105,99,32,40,101,108,115,101,32,86,97,108,117,101,69,
+    114,114,111,114,10,32,32,32,32,105,115,32,114,97,105,115,
+    101,100,41,46,10,10,32,32,32,32,84,104,101,32,100,101,
+    98,117,103,95,111,118,101,114,114,105,100,101,32,112,97,114,
+    97,109,101,116,101,114,32,105,115,32,100,101,112,114,101,99,
+    97,116,101,100,46,32,73,102,32,100,101,98,117,103,95,111,
+    118,101,114,114,105,100,101,32,105,115,32,110,111,116,32,78,
+    111,110,101,44,10,32,32,32,32,97,32,84,114,117,101,32,
+    118,97,108,117,101,32,105,115,32,116,104,101,32,115,97,109,
+    101,32,97,115,32,115,101,116,116,105,110,103,32,39,111,112,
+    116,105,109,105,122,97,116,105,111,110,39,32,116,111,32,116,
+    104,101,32,101,109,112,116,121,32,115,116,114,105,110,103,10,
+    32,32,32,32,119,104,105,108,101,32,97,32,70,97,108,115,
+    101,32,118,97,108,117,101,32,105,115,32,101,113,117,105,118,
+    97,108,101,110,116,32,116,111,32,115,101,116,116,105,110,103,
+    32,39,111,112,116,105,109,105,122,97,116,105,111,110,39,32,
+    116,111,32,39,49,39,46,10,10,32,32,32,32,73,102,32,
+    115,121,115,46,105,109,112,108,101,109,101,110,116,97,116,105,
+    111,110,46,99,97,99,104,101,95,116,97,103,32,105,115,32,
+    78,111,110,101,32,116,104,101,110,32,78,111,116,73,109,112,
+    108,101,109,101,110,116,101,100,69,114,114,111,114,32,105,115,
+    32,114,97,105,115,101,100,46,10,10,32,32,32,32,78,122,
+    70,116,104,101,32,100,101,98,117,103,95,111,118,101,114,114,
+    105,100,101,32,112,97,114,97,109,101,116,101,114,32,105,115,
+    32,100,101,112,114,101,99,97,116,101,100,59,32,117,115,101,
+    32,39,111,112,116,105,109,105,122,97,116,105,111,110,39,32,
+    105,110,115,116,101,97,100,122,50,100,101,98,117,103,95,111,
+    118,101,114,114,105,100,101,32,111,114,32,111,112,116,105,109,
+    105,122,97,116,105,111,110,32,109,117,115,116,32,98,101,32,
+    115,101,116,32,116,111,32,78,111,110,101,114,11,0,0,0,
+    114,3,0,0,0,218,1,46,250,36,115,121,115,46,105,109,
+    112,108,101,109,101,110,116,97,116,105,111,110,46,99,97,99,
+    104,101,95,116,97,103,32,105,115,32,78,111,110,101,114,0,
+    0,0,0,122,24,123,33,114,125,32,105,115,32,110,111,116,
+    32,97,108,112,104,97,110,117,109,101,114,105,99,122,7,123,
+    125,46,123,125,123,125,114,12,0,0,0,114,47,0,0,0,
+    41,28,218,9,95,119,97,114,110,105,110,103,115,218,4,119,
+    97,114,110,218,18,68,101,112,114,101,99,97,116,105,111,110,
+    87,97,114,110,105,110,103,218,9,84,121,112,101,69,114,114,
+    111,114,114,21,0,0,0,218,6,102,115,112,97,116,104,114,
+    76,0,0,0,218,10,114,112,97,114,116,105,116,105,111,110,
+    114,18,0,0,0,218,14,105,109,112,108,101,109,101,110,116,
+    97,116,105,111,110,218,9,99,97,99,104,101,95,116,97,103,
+    218,19,78,111,116,73,109,112,108,101,109,101,110,116,101,100,
+    69,114,114,111,114,114,64,0,0,0,114,19,0,0,0,218,
+    8,111,112,116,105,109,105,122,101,218,3,115,116,114,218,7,
+    105,115,97,108,110,117,109,218,10,86,97,108,117,101,69,114,
+    114,111,114,114,93,0,0,0,218,4,95,79,80,84,218,17,
+    66,89,84,69,67,79,68,69,95,83,85,70,70,73,88,69,
+    83,218,14,112,121,99,97,99,104,101,95,112,114,101,102,105,
+    120,114,90,0,0,0,114,69,0,0,0,114,86,0,0,0,
+    114,53,0,0,0,218,6,108,115,116,114,105,112,218,8,95,
+    80,89,67,65,67,72,69,41,12,114,67,0,0,0,90,14,
+    100,101,98,117,103,95,111,118,101,114,114,105,100,101,114,100,
+    0,0,0,218,7,109,101,115,115,97,103,101,218,4,104,101,
+    97,100,114,68,0,0,0,90,4,98,97,115,101,114,6,0,
+    0,0,218,4,114,101,115,116,90,3,116,97,103,90,15,97,
+    108,109,111,115,116,95,102,105,108,101,110,97,109,101,218,8,
+    102,105,108,101,110,97,109,101,115,12,0,0,0,32,32,32,
+    32,32,32,32,32,32,32,32,32,114,7,0,0,0,218,17,
+    99,97,99,104,101,95,102,114,111,109,95,115,111,117,114,99,
+    101,114,125,0,0,0,135,1,0,0,115,72,0,0,0,8,
+    18,6,1,2,1,4,255,8,2,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,1,8,2,8,1,8,1,8,1,14,1,14,1,12,
+    1,10,1,8,9,14,1,24,5,12,1,2,4,4,1,8,
+    1,2,1,4,253,12,5,115,86,0,0,0,6,18,2,6,
+    4,251,8,1,6,1,2,2,4,255,8,1,12,1,10,1,
+    12,1,16,1,8,1,6,1,10,1,24,1,6,1,2,4,
+    10,253,2,3,6,254,8,2,8,1,6,1,2,3,6,254,
+    16,1,14,1,12,1,8,1,2,24,6,241,16,1,10,5,
+    2,1,10,255,14,1,2,4,4,1,8,1,2,1,4,1,
+    12,1,115,80,1,0,0,8,22,30,34,8,34,5,51,9,
+    18,9,23,24,48,50,68,9,69,9,69,12,24,32,36,12,
+    36,9,37,23,75,13,20,19,28,29,36,19,37,13,37,30,
+    44,24,51,24,26,24,26,50,51,9,21,12,15,12,22,23,
+    27,12,28,5,9,18,29,30,34,18,35,5,15,5,9,11,
+    15,23,27,23,43,39,42,23,43,5,20,5,9,11,14,16,
+    20,11,14,11,29,11,39,5,8,8,11,15,19,8,19,5,
+    74,15,34,35,73,15,74,9,74,23,25,23,68,41,45,33,
+    55,33,37,33,37,51,55,58,61,63,66,31,67,23,68,5,
+    20,8,20,24,28,8,28,5,46,12,15,12,21,12,30,34,
+    35,12,35,9,46,28,30,13,25,13,25,28,31,28,37,28,
+    46,13,25,20,23,24,36,20,37,5,17,8,20,24,26,8,
+    26,5,80,16,28,16,38,16,38,9,78,19,29,30,56,30,
+    77,64,76,30,77,19,78,13,78,27,36,27,80,44,59,61,
+    65,67,79,27,80,9,24,16,31,34,51,52,53,34,54,16,
+    54,5,13,8,11,8,26,34,38,8,38,5,10,16,27,28,
+    32,16,33,9,50,20,30,31,34,31,41,31,43,45,49,20,
+    50,13,17,12,16,17,18,12,19,23,26,12,26,9,28,31,
+    35,36,37,31,38,46,61,31,61,9,28,20,24,25,26,25,
+    27,25,27,20,28,13,17,16,26,13,16,13,31,13,17,13,
+    41,25,40,13,41,13,21,16,10,9,10,12,22,23,27,29,
+    37,39,47,12,48,5,48,114,10,0,0,0,99,1,0,0,
+    0,0,0,0,0,0,0,0,0,5,0,0,0,3,0,0,
+    0,115,40,1,0,0,116,0,106,1,106,2,100,1,117,0,
+    114,10,116,3,100,2,131,1,130,1,116,4,106,5,124,0,
+    131,1,125,0,116,6,124,0,131,1,92,2,125,1,125,2,
+    100,3,125,3,116,0,106,7,100,1,117,1,114,51,116,0,
+    106,7,160,8,116,9,161,1,125,4,124,1,160,10,124,4,
+    116,11,23,0,161,1,114,51,124,1,116,12,124,4,131,1,
+    100,1,133,2,25,0,125,1,100,4,125,3,124,3,115,72,
+    116,6,124,1,131,1,92,2,125,1,125,5,124,5,116,13,
+    107,3,114,72,116,14,116,13,155,0,100,5,124,0,155,2,
+    157,3,131,1,130,1,124,2,160,15,100,6,161,1,125,6,
+    124,6,100,7,118,1,114,88,116,14,100,8,124,2,155,2,
+    157,2,131,1,130,1,124,6,100,9,107,2,114,132,124,2,
+    160,16,100,6,100,10,161,2,100,11,25,0,125,7,124,7,
+    160,10,116,17,161,1,115,112,116,14,100,12,116,17,155,2,
+    157,2,131,1,130,1,124,7,116,12,116,17,131,1,100,1,
+    133,2,25,0,125,8,124,8,160,18,161,0,115,132,116,14,
+    100,13,124,7,155,2,100,14,157,3,131,1,130,1,124,2,
+    160,19,100,6,161,1,100,15,25,0,125,9,116,20,124,1,
+    124,9,116,21,100,15,25,0,23,0,131,2,83,0,41,16,
+    97,110,1,0,0,71,105,118,101,110,32,116,104,101,32,112,
+    97,116,104,32,116,111,32,97,32,46,112,121,99,46,32,102,
+    105,108,101,44,32,114,101,116,117,114,110,32,116,104,101,32,
+    112,97,116,104,32,116,111,32,105,116,115,32,46,112,121,32,
+    102,105,108,101,46,10,10,32,32,32,32,84,104,101,32,46,
+    112,121,99,32,102,105,108,101,32,100,111,101,115,32,110,111,
+    116,32,110,101,101,100,32,116,111,32,101,120,105,115,116,59,
+    32,116,104,105,115,32,115,105,109,112,108,121,32,114,101,116,
+    117,114,110,115,32,116,104,101,32,112,97,116,104,32,116,111,
+    10,32,32,32,32,116,104,101,32,46,112,121,32,102,105,108,
+    101,32,99,97,108,99,117,108,97,116,101,100,32,116,111,32,
+    99,111,114,114,101,115,112,111,110,100,32,116,111,32,116,104,
+    101,32,46,112,121,99,32,102,105,108,101,46,32,32,73,102,
+    32,112,97,116,104,32,100,111,101,115,10,32,32,32,32,110,
+    111,116,32,99,111,110,102,111,114,109,32,116,111,32,80,69,
+    80,32,51,49,52,55,47,52,56,56,32,102,111,114,109,97,
+    116,44,32,86,97,108,117,101,69,114,114,111,114,32,119,105,
+    108,108,32,98,101,32,114,97,105,115,101,100,46,32,73,102,
+    10,32,32,32,32,115,121,115,46,105,109,112,108,101,109,101,
+    110,116,97,116,105,111,110,46,99,97,99,104,101,95,116,97,
+    103,32,105,115,32,78,111,110,101,32,116,104,101,110,32,78,
+    111,116,73,109,112,108,101,109,101,110,116,101,100,69,114,114,
+    111,114,32,105,115,32,114,97,105,115,101,100,46,10,10,32,
+    32,32,32,78,114,102,0,0,0,70,84,122,31,32,110,111,
+    116,32,98,111,116,116,111,109,45,108,101,118,101,108,32,100,
+    105,114,101,99,116,111,114,121,32,105,110,32,114,101,0,0,
+    0,62,2,0,0,0,114,47,0,0,0,233,3,0,0,0,
+    122,29,101,120,112,101,99,116,101,100,32,111,110,108,121,32,
+    50,32,111,114,32,51,32,100,111,116,115,32,105,110,32,114,
+    126,0,0,0,114,47,0,0,0,233,254,255,255,255,122,53,
+    111,112,116,105,109,105,122,97,116,105,111,110,32,112,111,114,
+    116,105,111,110,32,111,102,32,102,105,108,101,110,97,109,101,
+    32,100,111,101,115,32,110,111,116,32,115,116,97,114,116,32,
+    119,105,116,104,32,122,19,111,112,116,105,109,105,122,97,116,
+    105,111,110,32,108,101,118,101,108,32,122,29,32,105,115,32,
+    110,111,116,32,97,110,32,97,108,112,104,97,110,117,109,101,
+    114,105,99,32,118,97,108,117,101,114,0,0,0,0,41,22,
+    114,18,0,0,0,114,109,0,0,0,114,110,0,0,0,114,
+    111,0,0,0,114,21,0,0,0,114,107,0,0,0,114,76,
+    0,0,0,114,118,0,0,0,114,52,0,0,0,114,53,0,
+    0,0,114,29,0,0,0,114,61,0,0,0,114,4,0,0,
+    0,114,120,0,0,0,114,115,0,0,0,218,5,99,111,117,
+    110,116,218,6,114,115,112,108,105,116,114,116,0,0,0,114,
+    114,0,0,0,218,9,112,97,114,116,105,116,105,111,110,114,
+    69,0,0,0,218,15,83,79,85,82,67,69,95,83,85,70,
+    70,73,88,69,83,41,10,114,67,0,0,0,114,122,0,0,
+    0,90,16,112,121,99,97,99,104,101,95,102,105,108,101,110,
+    97,109,101,90,23,102,111,117,110,100,95,105,110,95,112,121,
+    99,97,99,104,101,95,112,114,101,102,105,120,90,13,115,116,
+    114,105,112,112,101,100,95,112,97,116,104,90,7,112,121,99,
+    97,99,104,101,90,9,100,111,116,95,99,111,117,110,116,114,
+    100,0,0,0,90,9,111,112,116,95,108,101,118,101,108,90,
+    13,98,97,115,101,95,102,105,108,101,110,97,109,101,115,10,
+    0,0,0,32,32,32,32,32,32,32,32,32,32,114,7,0,
+    0,0,218,17,115,111,117,114,99,101,95,102,114,111,109,95,
+    99,97,99,104,101,114,132,0,0,0,206,1,0,0,115,60,
+    0,0,0,12,9,8,1,10,1,12,1,4,1,10,1,12,
+    1,14,1,16,1,4,1,4,1,12,1,8,1,8,1,2,
+    1,8,255,10,2,8,1,14,1,8,1,16,1,10,1,4,
+    1,2,1,8,255,16,2,8,1,16,1,14,2,18,1,115,
+    78,0,0,0,10,9,10,1,10,1,12,1,4,1,8,1,
+    2,4,12,253,12,1,2,2,16,255,4,1,2,1,2,4,
+    12,253,6,1,2,2,4,255,14,1,10,1,6,1,2,10,
+    14,247,6,1,2,8,16,249,8,1,2,2,2,255,12,1,
+    16,1,6,1,2,2,2,255,2,1,2,255,10,1,14,1,
+    18,1,115,40,1,0,0,8,11,8,26,8,36,40,44,8,
+    44,5,74,15,34,35,73,15,74,9,74,12,15,12,22,23,
+    27,12,28,5,9,30,41,42,46,30,47,5,27,5,9,11,
+    27,31,36,5,28,8,11,8,26,34,38,8,38,5,43,25,
+    28,25,43,25,67,51,66,25,67,9,22,12,16,12,53,28,
+    41,44,52,28,52,12,53,9,43,20,24,25,28,29,42,25,
+    43,25,44,25,44,20,45,13,17,39,43,13,36,12,35,5,
+    42,25,36,37,41,25,42,9,22,9,13,15,22,12,19,23,
+    31,12,31,9,42,19,29,33,41,30,41,30,41,31,35,30,
+    41,30,41,19,42,13,42,17,33,17,44,40,43,17,44,5,
+    14,8,17,25,31,8,31,5,51,15,25,26,78,27,43,26,
+    78,26,78,15,79,9,79,10,19,23,24,10,24,5,51,24,
+    40,24,55,48,51,53,54,24,55,56,58,24,59,9,21,16,
+    28,16,45,40,44,16,45,9,47,19,29,30,46,31,35,30,
+    46,30,46,19,47,13,47,21,33,34,37,38,42,34,43,34,
+    44,34,44,21,45,9,18,16,25,16,35,16,35,9,51,19,
+    29,30,50,31,43,30,50,30,50,30,50,19,51,13,51,21,
+    37,21,52,48,51,21,52,53,54,21,55,5,18,12,22,23,
+    27,29,42,45,60,61,62,45,63,29,63,12,64,5,64,114,
+    10,0,0,0,99,1,0,0,0,0,0,0,0,0,0,0,
+    0,9,0,0,0,3,0,0,0,115,126,0,0,0,116,0,
+    124,0,131,1,100,1,107,2,114,8,100,2,83,0,124,0,
+    160,1,100,3,161,1,92,3,125,1,125,2,125,3,124,1,
+    114,28,124,3,160,2,161,0,100,4,100,5,133,2,25,0,
+    100,6,107,3,114,30,124,0,83,0,9,0,116,3,124,0,
+    131,1,125,4,110,19,35,0,4,0,116,4,116,5,102,2,
+    121,53,1,0,1,0,1,0,124,0,100,2,100,5,133,2,
+    25,0,125,4,89,0,110,2,119,0,37,0,116,6,124,4,
+    131,1,114,61,124,4,83,0,124,0,83,0,41,7,122,188,
+    67,111,110,118,101,114,116,32,97,32,98,121,116,101,99,111,
+    100,101,32,102,105,108,101,32,112,97,116,104,32,116,111,32,
+    97,32,115,111,117,114,99,101,32,112,97,116,104,32,40,105,
+    102,32,112,111,115,115,105,98,108,101,41,46,10,10,32,32,
+    32,32,84,104,105,115,32,102,117,110,99,116,105,111,110,32,
+    101,120,105,115,116,115,32,112,117,114,101,108,121,32,102,111,
+    114,32,98,97,99,107,119,97,114,100,115,45,99,111,109,112,
+    97,116,105,98,105,108,105,116,121,32,102,111,114,10,32,32,
+    32,32,80,121,73,109,112,111,114,116,95,69,120,101,99,67,
+    111,100,101,77,111,100,117,108,101,87,105,116,104,70,105,108,
+    101,110,97,109,101,115,40,41,32,105,110,32,116,104,101,32,
+    67,32,65,80,73,46,10,10,32,32,32,32,114,0,0,0,
+    0,78,114,101,0,0,0,233,253,255,255,255,233,255,255,255,
+    255,90,2,112,121,41,7,114,4,0,0,0,114,108,0,0,
+    0,218,5,108,111,119,101,114,114,132,0,0,0,114,111,0,
+    0,0,114,115,0,0,0,114,84,0,0,0,41,5,218,13,
+    98,121,116,101,99,111,100,101,95,112,97,116,104,114,123,0,
+    0,0,218,1,95,90,9,101,120,116,101,110,115,105,111,110,
+    218,11,115,111,117,114,99,101,95,112,97,116,104,115,5,0,
+    0,0,32,32,32,32,32,114,7,0,0,0,218,15,95,103,
+    101,116,95,115,111,117,114,99,101,102,105,108,101,114,139,0,
+    0,0,246,1,0,0,115,26,0,0,0,12,7,4,1,16,
+    1,24,1,4,1,2,1,10,1,2,128,16,1,16,1,2,
+    255,2,128,16,2,115,30,0,0,0,10,7,6,1,16,1,
+    2,1,2,1,18,255,6,1,2,4,10,254,2,128,2,2,
+    6,255,26,1,2,128,16,1,115,126,0,0,0,8,11,12,
     25,8,26,30,31,8,31,5,20,16,20,16,20,26,39,26,
     55,51,54,26,55,5,23,5,9,11,12,14,23,12,16,5,
     29,20,29,20,37,20,37,38,40,41,43,38,43,20,44,48,
     52,20,52,5,29,16,29,9,29,5,41,23,40,41,54,23,
     55,9,20,9,20,0,0,5,41,13,32,34,44,12,45,5,
     41,5,41,5,41,5,41,23,36,37,40,38,40,37,40,23,
-    41,9,20,9,20,9,20,0,0,27,39,40,51,27,52,12,
-    71,12,23,5,71,58,71,5,71,5,41,115,12,0,0,0,
-    159,4,36,0,164,15,53,7,190,1,53,7,99,1,0,0,
+    41,9,20,9,20,9,20,5,41,0,0,27,39,40,51,27,
+    52,12,71,12,23,5,71,58,71,5,71,115,12,0,0,0,
+    159,4,36,0,164,15,54,7,181,1,54,7,99,1,0,0,
     0,0,0,0,0,0,0,0,0,8,0,0,0,3,0,0,
-    0,115,72,0,0,0,124,0,160,0,116,1,116,2,131,1,
-    161,1,114,22,9,0,116,3,124,0,131,1,83,0,35,0,
-    4,0,116,4,121,35,1,0,1,0,1,0,89,0,110,12,
-    37,0,124,0,160,0,116,1,116,5,131,1,161,1,114,31,
-    124,0,83,0,100,0,83,0,100,0,83,0,119,0,114,71,
-    0,0,0,41,6,114,60,0,0,0,218,5,116,117,112,108,
-    101,114,131,0,0,0,114,125,0,0,0,114,111,0,0,0,
-    114,117,0,0,0,41,1,114,124,0,0,0,115,1,0,0,
-    0,32,114,7,0,0,0,218,11,95,103,101,116,95,99,97,
-    99,104,101,100,114,141,0,0,0,9,2,0,0,115,24,0,
-    0,0,14,1,2,1,8,1,2,128,12,1,4,1,2,128,
-    14,1,4,1,4,2,4,252,2,255,115,28,0,0,0,12,
-    1,2,8,2,252,8,254,2,128,2,2,2,255,12,1,2,
-    128,12,1,2,3,4,254,4,2,6,252,115,72,0,0,0,
-    8,16,8,49,26,31,32,47,26,48,8,49,5,20,9,17,
-    20,37,38,46,20,47,13,47,0,0,9,17,16,35,9,17,
-    9,17,9,17,9,17,13,17,13,17,0,0,10,18,10,53,
-    28,33,34,51,28,52,10,53,5,20,16,24,9,24,16,20,
-    16,20,13,17,13,17,9,17,115,12,0,0,0,136,3,12,
-    0,140,7,21,7,163,1,21,7,99,1,0,0,0,0,0,
-    0,0,0,0,0,0,8,0,0,0,3,0,0,0,115,52,
-    0,0,0,9,0,116,0,124,0,131,1,106,1,125,1,110,
-    12,35,0,4,0,116,2,121,25,1,0,1,0,1,0,100,
-    1,125,1,89,0,110,1,37,0,124,1,100,2,79,0,125,
-    1,124,1,83,0,119,0,41,4,122,51,67,97,108,99,117,
-    108,97,116,101,32,116,104,101,32,109,111,100,101,32,112,101,
-    114,109,105,115,115,105,111,110,115,32,102,111,114,32,97,32,
-    98,121,116,101,99,111,100,101,32,102,105,108,101,46,114,91,
-    0,0,0,233,128,0,0,0,78,41,3,114,78,0,0,0,
-    114,81,0,0,0,114,80,0,0,0,41,2,114,67,0,0,
-    0,114,82,0,0,0,115,2,0,0,0,32,32,114,7,0,
-    0,0,218,10,95,99,97,108,99,95,109,111,100,101,114,143,
-    0,0,0,21,2,0,0,115,18,0,0,0,2,2,12,1,
-    2,128,12,1,8,1,2,128,8,3,4,1,2,251,115,20,
-    0,0,0,2,5,12,254,2,128,2,2,2,255,16,1,2,
-    128,8,3,4,1,2,252,115,52,0,0,0,5,21,16,26,
-    27,31,16,32,16,40,9,13,9,13,0,0,5,21,12,19,
-    5,21,5,21,5,21,5,21,16,21,9,13,9,13,9,13,
-    0,0,5,9,13,18,5,18,5,9,12,16,5,16,5,21,
-    115,12,0,0,0,129,5,7,0,135,9,18,7,153,1,18,
-    7,99,1,0,0,0,0,0,0,0,0,0,0,0,3,0,
-    0,0,3,0,0,0,115,50,0,0,0,135,0,100,4,136,
-    0,102,1,100,2,132,9,125,1,116,0,100,1,117,1,114,
-    15,116,0,106,1,125,2,110,3,100,3,132,0,125,2,124,
-    2,124,1,137,0,131,2,1,0,124,1,83,0,41,5,122,
-    252,68,101,99,111,114,97,116,111,114,32,116,111,32,118,101,
-    114,105,102,121,32,116,104,97,116,32,116,104,101,32,109,111,
-    100,117,108,101,32,98,101,105,110,103,32,114,101,113,117,101,
-    115,116,101,100,32,109,97,116,99,104,101,115,32,116,104,101,
-    32,111,110,101,32,116,104,101,10,32,32,32,32,108,111,97,
-    100,101,114,32,99,97,110,32,104,97,110,100,108,101,46,10,
-    10,32,32,32,32,84,104,101,32,102,105,114,115,116,32,97,
-    114,103,117,109,101,110,116,32,40,115,101,108,102,41,32,109,
-    117,115,116,32,100,101,102,105,110,101,32,95,110,97,109,101,
-    32,119,104,105,99,104,32,116,104,101,32,115,101,99,111,110,
-    100,32,97,114,103,117,109,101,110,116,32,105,115,10,32,32,
-    32,32,99,111,109,112,97,114,101,100,32,97,103,97,105,110,
-    115,116,46,32,73,102,32,116,104,101,32,99,111,109,112,97,
-    114,105,115,111,110,32,102,97,105,108,115,32,116,104,101,110,
-    32,73,109,112,111,114,116,69,114,114,111,114,32,105,115,32,
-    114,97,105,115,101,100,46,10,10,32,32,32,32,78,99,2,
-    0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,31,
-    0,0,0,115,76,0,0,0,124,1,100,0,117,0,114,8,
-    124,0,106,0,125,1,110,18,124,0,106,0,124,1,107,3,
-    114,26,116,1,100,1,124,0,106,0,155,1,100,2,124,1,
-    155,1,157,4,124,1,100,3,141,2,130,1,137,4,124,0,
-    124,1,103,2,124,2,162,1,82,0,105,0,124,3,164,1,
-    142,1,83,0,41,4,78,122,11,108,111,97,100,101,114,32,
-    102,111,114,32,122,15,32,99,97,110,110,111,116,32,104,97,
-    110,100,108,101,32,169,1,218,4,110,97,109,101,41,2,114,
-    145,0,0,0,218,11,73,109,112,111,114,116,69,114,114,111,
-    114,41,5,218,4,115,101,108,102,114,145,0,0,0,218,4,
-    97,114,103,115,218,6,107,119,97,114,103,115,218,6,109,101,
-    116,104,111,100,115,5,0,0,0,32,32,32,32,128,114,7,
-    0,0,0,218,19,95,99,104,101,99,107,95,110,97,109,101,
-    95,119,114,97,112,112,101,114,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,114,41,2,0,0,115,18,0,0,0,8,1,8,1,10,
-    1,4,1,12,1,2,255,2,1,6,255,24,2,115,16,0,
-    0,0,6,1,2,4,8,253,8,1,2,2,4,255,22,1,
-    24,1,115,76,0,0,0,12,16,20,24,12,24,9,62,20,
-    24,20,29,13,17,13,17,14,18,14,23,27,31,14,31,9,
-    62,19,30,19,30,34,38,34,43,34,43,34,43,45,49,45,
-    49,31,50,57,61,19,62,19,62,13,62,16,22,23,27,29,
-    33,16,51,36,40,16,51,16,51,16,51,44,50,16,51,16,
-    51,9,51,114,10,0,0,0,99,2,0,0,0,0,0,0,
-    0,0,0,0,0,7,0,0,0,19,0,0,0,115,56,0,
-    0,0,100,1,68,0,93,16,125,2,116,0,124,1,124,2,
-    131,2,114,18,116,1,124,0,124,2,116,2,124,1,124,2,
-    131,2,131,3,1,0,113,2,124,0,106,3,160,4,124,1,
-    106,3,161,1,1,0,100,0,83,0,41,2,78,41,4,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,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,114,89,0,0,0,115,3,0,0,
-    0,32,32,32,114,7,0,0,0,218,5,95,119,114,97,112,
-    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,54,2,0,0,
-    115,10,0,0,0,8,1,10,1,18,1,2,128,18,1,115,
-    14,0,0,0,2,1,4,2,2,254,8,1,20,1,2,128,
-    18,1,115,56,0,0,0,28,81,13,65,13,65,17,24,20,
-    27,28,31,33,40,20,41,17,65,21,28,29,32,34,41,43,
-    50,51,54,56,63,43,64,21,65,21,65,0,0,13,16,13,
-    25,13,46,33,36,33,45,13,46,13,46,13,46,13,46,114,
-    10,0,0,0,114,71,0,0,0,41,2,218,10,95,98,111,
-    111,116,115,116,114,97,112,114,161,0,0,0,41,3,114,150,
-    0,0,0,114,151,0,0,0,114,161,0,0,0,115,3,0,
-    0,0,96,32,32,114,7,0,0,0,218,11,95,99,104,101,
-    99,107,95,110,97,109,101,114,163,0,0,0,33,2,0,0,
-    115,14,0,0,0,2,128,12,8,8,10,8,1,6,2,10,
-    6,4,1,115,18,0,0,0,2,128,2,8,10,6,6,4,
-    2,7,8,250,6,6,10,2,4,1,115,50,0,0,0,0,
-    0,40,44,5,51,5,51,5,51,5,51,5,51,8,18,26,
-    30,8,30,5,46,17,27,17,33,9,14,9,14,9,46,9,
-    46,9,46,5,10,11,30,32,38,5,39,5,39,12,31,5,
-    31,114,10,0,0,0,99,2,0,0,0,0,0,0,0,0,
-    0,0,0,5,0,0,0,3,0,0,0,115,72,0,0,0,
-    116,0,106,1,100,1,116,2,131,2,1,0,124,0,160,3,
-    124,1,161,1,92,2,125,2,125,3,124,2,100,2,117,0,
-    114,34,116,4,124,3,131,1,114,34,100,3,125,4,116,0,
-    106,1,124,4,160,5,124,3,100,4,25,0,161,1,116,6,
-    131,2,1,0,124,2,83,0,41,5,122,155,84,114,121,32,
-    116,111,32,102,105,110,100,32,97,32,108,111,97,100,101,114,
-    32,102,111,114,32,116,104,101,32,115,112,101,99,105,102,105,
-    101,100,32,109,111,100,117,108,101,32,98,121,32,100,101,108,
-    101,103,97,116,105,110,103,32,116,111,10,32,32,32,32,115,
-    101,108,102,46,102,105,110,100,95,108,111,97,100,101,114,40,
-    41,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,32,105,110,32,102,97,118,111,114,32,111,102,32,102,105,
-    110,100,101,114,46,102,105,110,100,95,115,112,101,99,40,41,
-    46,10,10,32,32,32,32,122,90,102,105,110,100,95,109,111,
-    100,117,108,101,40,41,32,105,115,32,100,101,112,114,101,99,
-    97,116,101,100,32,97,110,100,32,115,108,97,116,101,100,32,
-    102,111,114,32,114,101,109,111,118,97,108,32,105,110,32,80,
-    121,116,104,111,110,32,51,46,49,50,59,32,117,115,101,32,
-    102,105,110,100,95,115,112,101,99,40,41,32,105,110,115,116,
-    101,97,100,78,122,44,78,111,116,32,105,109,112,111,114,116,
-    105,110,103,32,100,105,114,101,99,116,111,114,121,32,123,125,
-    58,32,109,105,115,115,105,110,103,32,95,95,105,110,105,116,
-    95,95,114,0,0,0,0,41,7,114,103,0,0,0,114,104,
-    0,0,0,114,105,0,0,0,218,11,102,105,110,100,95,108,
-    111,97,100,101,114,114,4,0,0,0,114,93,0,0,0,218,
-    13,73,109,112,111,114,116,87,97,114,110,105,110,103,41,5,
-    114,147,0,0,0,218,8,102,117,108,108,110,97,109,101,218,
-    6,108,111,97,100,101,114,218,8,112,111,114,116,105,111,110,
-    115,218,3,109,115,103,115,5,0,0,0,32,32,32,32,32,
-    114,7,0,0,0,218,17,95,102,105,110,100,95,109,111,100,
-    117,108,101,95,115,104,105,109,114,170,0,0,0,64,2,0,
-    0,115,16,0,0,0,6,7,2,2,4,254,14,6,16,1,
-    4,1,22,1,4,1,115,22,0,0,0,4,7,2,1,6,
-    1,14,4,6,1,2,2,6,254,2,2,4,255,22,1,4,
-    1,115,72,0,0,0,5,14,5,19,20,80,20,38,5,39,
-    5,39,24,28,24,50,41,49,24,50,5,21,5,11,13,21,
-    8,14,18,22,8,22,5,63,27,30,31,39,27,40,5,63,
-    15,61,9,12,9,18,9,23,24,27,24,47,35,43,44,45,
-    35,46,24,47,49,62,9,63,9,63,12,18,5,18,114,10,
-    0,0,0,99,3,0,0,0,0,0,0,0,0,0,0,0,
-    4,0,0,0,3,0,0,0,115,166,0,0,0,124,0,100,
-    1,100,2,133,2,25,0,125,3,124,3,116,0,107,3,114,
-    32,100,3,124,1,155,2,100,4,124,3,155,2,157,4,125,
-    4,116,1,160,2,100,5,124,4,161,2,1,0,116,3,124,
-    4,102,1,105,0,124,2,164,1,142,1,130,1,116,4,124,
-    0,131,1,100,6,107,0,114,53,100,7,124,1,155,2,157,
-    2,125,4,116,1,160,2,100,5,124,4,161,2,1,0,116,
-    5,124,4,131,1,130,1,116,6,124,0,100,2,100,8,133,
-    2,25,0,131,1,125,5,124,5,100,9,64,0,114,81,100,
-    10,124,5,155,2,100,11,124,1,155,2,157,4,125,4,116,
-    3,124,4,102,1,105,0,124,2,164,1,142,1,130,1,124,
-    5,83,0,41,12,97,84,2,0,0,80,101,114,102,111,114,
-    109,32,98,97,115,105,99,32,118,97,108,105,100,105,116,121,
-    32,99,104,101,99,107,105,110,103,32,111,102,32,97,32,112,
-    121,99,32,104,101,97,100,101,114,32,97,110,100,32,114,101,
-    116,117,114,110,32,116,104,101,32,102,108,97,103,115,32,102,
-    105,101,108,100,44,10,32,32,32,32,119,104,105,99,104,32,
-    100,101,116,101,114,109,105,110,101,115,32,104,111,119,32,116,
-    104,101,32,112,121,99,32,115,104,111,117,108,100,32,98,101,
-    32,102,117,114,116,104,101,114,32,118,97,108,105,100,97,116,
-    101,100,32,97,103,97,105,110,115,116,32,116,104,101,32,115,
-    111,117,114,99,101,46,10,10,32,32,32,32,42,100,97,116,
-    97,42,32,105,115,32,116,104,101,32,99,111,110,116,101,110,
-    116,115,32,111,102,32,116,104,101,32,112,121,99,32,102,105,
-    108,101,46,32,40,79,110,108,121,32,116,104,101,32,102,105,
-    114,115,116,32,49,54,32,98,121,116,101,115,32,97,114,101,
-    10,32,32,32,32,114,101,113,117,105,114,101,100,44,32,116,
-    104,111,117,103,104,46,41,10,10,32,32,32,32,42,110,97,
+    0,115,70,0,0,0,124,0,160,0,116,1,116,2,131,1,
+    161,1,114,24,9,0,116,3,124,0,131,1,83,0,35,0,
+    4,0,116,4,121,22,1,0,1,0,1,0,89,0,100,0,
+    83,0,119,0,37,0,124,0,160,0,116,1,116,5,131,1,
+    161,1,114,33,124,0,83,0,100,0,83,0,114,71,0,0,
+    0,41,6,114,60,0,0,0,218,5,116,117,112,108,101,114,
+    131,0,0,0,114,125,0,0,0,114,111,0,0,0,114,117,
+    0,0,0,41,1,114,124,0,0,0,115,1,0,0,0,32,
+    114,7,0,0,0,218,11,95,103,101,116,95,99,97,99,104,
+    101,100,114,141,0,0,0,9,2,0,0,115,22,0,0,0,
+    14,1,2,1,8,1,2,128,12,1,6,1,2,255,2,128,
+    14,2,4,1,4,2,115,26,0,0,0,12,1,2,8,2,
+    252,8,254,2,128,2,2,2,255,16,1,2,128,12,1,2,
+    3,4,254,4,2,115,70,0,0,0,8,16,8,49,26,31,
+    32,47,26,48,8,49,5,20,9,17,20,37,38,46,20,47,
+    13,47,0,0,9,17,16,35,9,17,9,17,9,17,9,17,
+    13,17,13,17,13,17,9,17,0,0,10,18,10,53,28,33,
+    34,51,28,52,10,53,5,20,16,24,9,24,16,20,16,20,
+    115,12,0,0,0,136,3,12,0,140,7,23,7,150,1,23,
+    7,99,1,0,0,0,0,0,0,0,0,0,0,0,8,0,
+    0,0,3,0,0,0,115,52,0,0,0,9,0,116,0,124,
+    0,131,1,106,1,125,1,110,13,35,0,4,0,116,2,121,
+    18,1,0,1,0,1,0,100,1,125,1,89,0,110,2,119,
+    0,37,0,124,1,100,2,79,0,125,1,124,1,83,0,41,
+    4,122,51,67,97,108,99,117,108,97,116,101,32,116,104,101,
+    32,109,111,100,101,32,112,101,114,109,105,115,115,105,111,110,
+    115,32,102,111,114,32,97,32,98,121,116,101,99,111,100,101,
+    32,102,105,108,101,46,114,91,0,0,0,233,128,0,0,0,
+    78,41,3,114,78,0,0,0,114,81,0,0,0,114,80,0,
+    0,0,41,2,114,67,0,0,0,114,82,0,0,0,115,2,
+    0,0,0,32,32,114,7,0,0,0,218,10,95,99,97,108,
+    99,95,109,111,100,101,114,143,0,0,0,21,2,0,0,115,
+    18,0,0,0,2,2,12,1,2,128,12,1,8,1,2,255,
+    2,128,8,4,4,1,115,18,0,0,0,2,5,12,254,2,
+    128,2,2,2,255,18,1,2,128,8,3,4,1,115,52,0,
+    0,0,5,21,16,26,27,31,16,32,16,40,9,13,9,13,
+    0,0,5,21,12,19,5,21,5,21,5,21,5,21,16,21,
+    9,13,9,13,9,13,5,21,0,0,5,9,13,18,5,18,
+    5,9,12,16,5,16,115,12,0,0,0,129,5,7,0,135,
+    9,19,7,146,1,19,7,99,1,0,0,0,0,0,0,0,
+    0,0,0,0,3,0,0,0,3,0,0,0,115,50,0,0,
+    0,135,0,100,4,136,0,102,1,100,2,132,9,125,1,116,
+    0,100,1,117,1,114,15,116,0,106,1,125,2,110,3,100,
+    3,132,0,125,2,124,2,124,1,137,0,131,2,1,0,124,
+    1,83,0,41,5,122,252,68,101,99,111,114,97,116,111,114,
+    32,116,111,32,118,101,114,105,102,121,32,116,104,97,116,32,
+    116,104,101,32,109,111,100,117,108,101,32,98,101,105,110,103,
+    32,114,101,113,117,101,115,116,101,100,32,109,97,116,99,104,
+    101,115,32,116,104,101,32,111,110,101,32,116,104,101,10,32,
+    32,32,32,108,111,97,100,101,114,32,99,97,110,32,104,97,
+    110,100,108,101,46,10,10,32,32,32,32,84,104,101,32,102,
+    105,114,115,116,32,97,114,103,117,109,101,110,116,32,40,115,
+    101,108,102,41,32,109,117,115,116,32,100,101,102,105,110,101,
+    32,95,110,97,109,101,32,119,104,105,99,104,32,116,104,101,
+    32,115,101,99,111,110,100,32,97,114,103,117,109,101,110,116,
+    32,105,115,10,32,32,32,32,99,111,109,112,97,114,101,100,
+    32,97,103,97,105,110,115,116,46,32,73,102,32,116,104,101,
+    32,99,111,109,112,97,114,105,115,111,110,32,102,97,105,108,
+    115,32,116,104,101,110,32,73,109,112,111,114,116,69,114,114,
+    111,114,32,105,115,32,114,97,105,115,101,100,46,10,10,32,
+    32,32,32,78,99,2,0,0,0,0,0,0,0,0,0,0,
+    0,5,0,0,0,31,0,0,0,115,76,0,0,0,124,1,
+    100,0,117,0,114,8,124,0,106,0,125,1,110,18,124,0,
+    106,0,124,1,107,3,114,26,116,1,100,1,124,0,106,0,
+    155,1,100,2,124,1,155,1,157,4,124,1,100,3,141,2,
+    130,1,137,4,124,0,124,1,103,2,124,2,162,1,82,0,
+    105,0,124,3,164,1,142,1,83,0,41,4,78,122,11,108,
+    111,97,100,101,114,32,102,111,114,32,122,15,32,99,97,110,
+    110,111,116,32,104,97,110,100,108,101,32,169,1,218,4,110,
+    97,109,101,41,2,114,145,0,0,0,218,11,73,109,112,111,
+    114,116,69,114,114,111,114,41,5,218,4,115,101,108,102,114,
+    145,0,0,0,218,4,97,114,103,115,218,6,107,119,97,114,
+    103,115,218,6,109,101,116,104,111,100,115,5,0,0,0,32,
+    32,32,32,128,114,7,0,0,0,218,19,95,99,104,101,99,
+    107,95,110,97,109,101,95,119,114,97,112,112,101,114,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,114,41,2,0,0,115,18,0,0,
+    0,8,1,8,1,10,1,4,1,12,1,2,255,2,1,6,
+    255,24,2,115,16,0,0,0,6,1,2,4,8,253,8,1,
+    2,2,4,255,22,1,24,1,115,76,0,0,0,12,16,20,
+    24,12,24,9,62,20,24,20,29,13,17,13,17,14,18,14,
+    23,27,31,14,31,9,62,19,30,19,30,34,38,34,43,34,
+    43,34,43,45,49,45,49,31,50,57,61,19,62,19,62,13,
+    62,16,22,23,27,29,33,16,51,36,40,16,51,16,51,16,
+    51,44,50,16,51,16,51,9,51,114,10,0,0,0,99,2,
+    0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,19,
+    0,0,0,115,56,0,0,0,100,1,68,0,93,16,125,2,
+    116,0,124,1,124,2,131,2,114,18,116,1,124,0,124,2,
+    116,2,124,1,124,2,131,2,131,3,1,0,113,2,124,0,
+    106,3,160,4,124,1,106,3,161,1,1,0,100,0,83,0,
+    41,2,78,41,4,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,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,114,89,0,
+    0,0,115,3,0,0,0,32,32,32,114,7,0,0,0,218,
+    5,95,119,114,97,112,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,54,2,0,0,115,10,0,0,0,8,1,10,1,18,
+    1,2,128,18,1,115,14,0,0,0,2,1,4,2,2,254,
+    8,1,20,1,2,128,18,1,115,56,0,0,0,28,81,13,
+    65,13,65,17,24,20,27,28,31,33,40,20,41,17,65,21,
+    28,29,32,34,41,43,50,51,54,56,63,43,64,21,65,21,
+    65,0,0,13,16,13,25,13,46,33,36,33,45,13,46,13,
+    46,13,46,13,46,114,10,0,0,0,114,71,0,0,0,41,
+    2,218,10,95,98,111,111,116,115,116,114,97,112,114,161,0,
+    0,0,41,3,114,150,0,0,0,114,151,0,0,0,114,161,
+    0,0,0,115,3,0,0,0,96,32,32,114,7,0,0,0,
+    218,11,95,99,104,101,99,107,95,110,97,109,101,114,163,0,
+    0,0,33,2,0,0,115,14,0,0,0,2,128,12,8,8,
+    10,8,1,6,2,10,6,4,1,115,18,0,0,0,2,128,
+    2,8,10,6,6,4,2,7,8,250,6,6,10,2,4,1,
+    115,50,0,0,0,0,0,40,44,5,51,5,51,5,51,5,
+    51,5,51,8,18,26,30,8,30,5,46,17,27,17,33,9,
+    14,9,14,9,46,9,46,9,46,5,10,11,30,32,38,5,
+    39,5,39,12,31,5,31,114,10,0,0,0,99,2,0,0,
+    0,0,0,0,0,0,0,0,0,5,0,0,0,3,0,0,
+    0,115,72,0,0,0,116,0,106,1,100,1,116,2,131,2,
+    1,0,124,0,160,3,124,1,161,1,92,2,125,2,125,3,
+    124,2,100,2,117,0,114,34,116,4,124,3,131,1,114,34,
+    100,3,125,4,116,0,106,1,124,4,160,5,124,3,100,4,
+    25,0,161,1,116,6,131,2,1,0,124,2,83,0,41,5,
+    122,155,84,114,121,32,116,111,32,102,105,110,100,32,97,32,
+    108,111,97,100,101,114,32,102,111,114,32,116,104,101,32,115,
+    112,101,99,105,102,105,101,100,32,109,111,100,117,108,101,32,
+    98,121,32,100,101,108,101,103,97,116,105,110,103,32,116,111,
+    10,32,32,32,32,115,101,108,102,46,102,105,110,100,95,108,
+    111,97,100,101,114,40,41,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,32,105,110,32,102,97,118,111,114,
+    32,111,102,32,102,105,110,100,101,114,46,102,105,110,100,95,
+    115,112,101,99,40,41,46,10,10,32,32,32,32,122,90,102,
+    105,110,100,95,109,111,100,117,108,101,40,41,32,105,115,32,
+    100,101,112,114,101,99,97,116,101,100,32,97,110,100,32,115,
+    108,97,116,101,100,32,102,111,114,32,114,101,109,111,118,97,
+    108,32,105,110,32,80,121,116,104,111,110,32,51,46,49,50,
+    59,32,117,115,101,32,102,105,110,100,95,115,112,101,99,40,
+    41,32,105,110,115,116,101,97,100,78,122,44,78,111,116,32,
+    105,109,112,111,114,116,105,110,103,32,100,105,114,101,99,116,
+    111,114,121,32,123,125,58,32,109,105,115,115,105,110,103,32,
+    95,95,105,110,105,116,95,95,114,0,0,0,0,41,7,114,
+    103,0,0,0,114,104,0,0,0,114,105,0,0,0,218,11,
+    102,105,110,100,95,108,111,97,100,101,114,114,4,0,0,0,
+    114,93,0,0,0,218,13,73,109,112,111,114,116,87,97,114,
+    110,105,110,103,41,5,114,147,0,0,0,218,8,102,117,108,
+    108,110,97,109,101,218,6,108,111,97,100,101,114,218,8,112,
+    111,114,116,105,111,110,115,218,3,109,115,103,115,5,0,0,
+    0,32,32,32,32,32,114,7,0,0,0,218,17,95,102,105,
+    110,100,95,109,111,100,117,108,101,95,115,104,105,109,114,170,
+    0,0,0,64,2,0,0,115,16,0,0,0,6,7,2,2,
+    4,254,14,6,16,1,4,1,22,1,4,1,115,22,0,0,
+    0,4,7,2,1,6,1,14,4,6,1,2,2,6,254,2,
+    2,4,255,22,1,4,1,115,72,0,0,0,5,14,5,19,
+    20,80,20,38,5,39,5,39,24,28,24,50,41,49,24,50,
+    5,21,5,11,13,21,8,14,18,22,8,22,5,63,27,30,
+    31,39,27,40,5,63,15,61,9,12,9,18,9,23,24,27,
+    24,47,35,43,44,45,35,46,24,47,49,62,9,63,9,63,
+    12,18,5,18,114,10,0,0,0,99,3,0,0,0,0,0,
+    0,0,0,0,0,0,4,0,0,0,3,0,0,0,115,166,
+    0,0,0,124,0,100,1,100,2,133,2,25,0,125,3,124,
+    3,116,0,107,3,114,32,100,3,124,1,155,2,100,4,124,
+    3,155,2,157,4,125,4,116,1,160,2,100,5,124,4,161,
+    2,1,0,116,3,124,4,102,1,105,0,124,2,164,1,142,
+    1,130,1,116,4,124,0,131,1,100,6,107,0,114,53,100,
+    7,124,1,155,2,157,2,125,4,116,1,160,2,100,5,124,
+    4,161,2,1,0,116,5,124,4,131,1,130,1,116,6,124,
+    0,100,2,100,8,133,2,25,0,131,1,125,5,124,5,100,
+    9,64,0,114,81,100,10,124,5,155,2,100,11,124,1,155,
+    2,157,4,125,4,116,3,124,4,102,1,105,0,124,2,164,
+    1,142,1,130,1,124,5,83,0,41,12,97,84,2,0,0,
+    80,101,114,102,111,114,109,32,98,97,115,105,99,32,118,97,
+    108,105,100,105,116,121,32,99,104,101,99,107,105,110,103,32,
+    111,102,32,97,32,112,121,99,32,104,101,97,100,101,114,32,
+    97,110,100,32,114,101,116,117,114,110,32,116,104,101,32,102,
+    108,97,103,115,32,102,105,101,108,100,44,10,32,32,32,32,
+    119,104,105,99,104,32,100,101,116,101,114,109,105,110,101,115,
+    32,104,111,119,32,116,104,101,32,112,121,99,32,115,104,111,
+    117,108,100,32,98,101,32,102,117,114,116,104,101,114,32,118,
+    97,108,105,100,97,116,101,100,32,97,103,97,105,110,115,116,
+    32,116,104,101,32,115,111,117,114,99,101,46,10,10,32,32,
+    32,32,42,100,97,116,97,42,32,105,115,32,116,104,101,32,
+    99,111,110,116,101,110,116,115,32,111,102,32,116,104,101,32,
+    112,121,99,32,102,105,108,101,46,32,40,79,110,108,121,32,
+    116,104,101,32,102,105,114,115,116,32,49,54,32,98,121,116,
+    101,115,32,97,114,101,10,32,32,32,32,114,101,113,117,105,
+    114,101,100,44,32,116,104,111,117,103,104,46,41,10,10,32,
+    32,32,32,42,110,97,109,101,42,32,105,115,32,116,104,101,
+    32,110,97,109,101,32,111,102,32,116,104,101,32,109,111,100,
+    117,108,101,32,98,101,105,110,103,32,105,109,112,111,114,116,
+    101,100,46,32,73,116,32,105,115,32,117,115,101,100,32,102,
+    111,114,32,108,111,103,103,105,110,103,46,10,10,32,32,32,
+    32,42,101,120,99,95,100,101,116,97,105,108,115,42,32,105,
+    115,32,97,32,100,105,99,116,105,111,110,97,114,121,32,112,
+    97,115,115,101,100,32,116,111,32,73,109,112,111,114,116,69,
+    114,114,111,114,32,105,102,32,105,116,32,114,97,105,115,101,
+    100,32,102,111,114,10,32,32,32,32,105,109,112,114,111,118,
+    101,100,32,100,101,98,117,103,103,105,110,103,46,10,10,32,
+    32,32,32,73,109,112,111,114,116,69,114,114,111,114,32,105,
+    115,32,114,97,105,115,101,100,32,119,104,101,110,32,116,104,
+    101,32,109,97,103,105,99,32,110,117,109,98,101,114,32,105,
+    115,32,105,110,99,111,114,114,101,99,116,32,111,114,32,119,
+    104,101,110,32,116,104,101,32,102,108,97,103,115,10,32,32,
+    32,32,102,105,101,108,100,32,105,115,32,105,110,118,97,108,
+    105,100,46,32,69,79,70,69,114,114,111,114,32,105,115,32,
+    114,97,105,115,101,100,32,119,104,101,110,32,116,104,101,32,
+    100,97,116,97,32,105,115,32,102,111,117,110,100,32,116,111,
+    32,98,101,32,116,114,117,110,99,97,116,101,100,46,10,10,
+    32,32,32,32,78,114,34,0,0,0,122,20,98,97,100,32,
+    109,97,103,105,99,32,110,117,109,98,101,114,32,105,110,32,
+    122,2,58,32,250,2,123,125,233,16,0,0,0,122,40,114,
+    101,97,99,104,101,100,32,69,79,70,32,119,104,105,108,101,
+    32,114,101,97,100,105,110,103,32,112,121,99,32,104,101,97,
+    100,101,114,32,111,102,32,233,8,0,0,0,233,252,255,255,
+    255,122,14,105,110,118,97,108,105,100,32,102,108,97,103,115,
+    32,122,4,32,105,110,32,41,7,218,12,77,65,71,73,67,
+    95,78,85,77,66,69,82,114,162,0,0,0,218,16,95,118,
+    101,114,98,111,115,101,95,109,101,115,115,97,103,101,114,146,
+    0,0,0,114,4,0,0,0,218,8,69,79,70,69,114,114,
+    111,114,114,45,0,0,0,41,6,114,44,0,0,0,114,145,
+    0,0,0,218,11,101,120,99,95,100,101,116,97,105,108,115,
+    90,5,109,97,103,105,99,114,121,0,0,0,114,19,0,0,
+    0,115,6,0,0,0,32,32,32,32,32,32,114,7,0,0,
+    0,218,13,95,99,108,97,115,115,105,102,121,95,112,121,99,
+    114,179,0,0,0,84,2,0,0,115,28,0,0,0,12,16,
+    8,1,16,1,12,1,16,1,12,1,10,1,12,1,8,1,
+    16,1,8,2,16,1,16,1,4,1,115,34,0,0,0,12,
+    16,6,1,2,3,16,254,12,1,16,1,10,1,2,3,10,
+    254,12,1,8,1,16,1,6,2,2,2,16,255,16,1,4,
+    1,115,166,0,0,0,13,17,18,20,19,20,18,20,13,21,
+    5,10,8,13,17,29,8,29,5,50,19,61,20,24,19,61,
+    19,61,20,25,19,61,19,61,9,16,9,19,9,51,37,41,
+    43,50,9,51,9,51,15,26,27,34,15,50,15,50,38,49,
+    15,50,15,50,9,50,8,11,12,16,8,17,20,22,8,22,
+    5,32,19,70,20,24,19,70,19,70,9,16,9,19,9,51,
+    37,41,43,50,9,51,9,51,15,23,24,31,15,32,9,32,
+    13,27,28,32,33,34,35,36,33,36,28,37,13,38,5,10,
+    8,13,16,21,8,21,5,50,19,57,20,25,19,57,19,57,
+    20,24,19,57,19,57,9,16,15,26,27,34,15,50,15,50,
+    38,49,15,50,15,50,9,50,12,17,5,17,114,10,0,0,
+    0,99,5,0,0,0,0,0,0,0,0,0,0,0,4,0,
+    0,0,3,0,0,0,115,124,0,0,0,116,0,124,0,100,
+    1,100,2,133,2,25,0,131,1,124,1,100,3,64,0,107,
+    3,114,31,100,4,124,3,155,2,157,2,125,5,116,1,160,
+    2,100,5,124,5,161,2,1,0,116,3,124,5,102,1,105,
+    0,124,4,164,1,142,1,130,1,124,2,100,6,117,1,114,
+    58,116,0,124,0,100,2,100,7,133,2,25,0,131,1,124,
+    2,100,3,64,0,107,3,114,60,116,3,100,4,124,3,155,
+    2,157,2,102,1,105,0,124,4,164,1,142,1,130,1,100,
+    6,83,0,100,6,83,0,41,8,97,7,2,0,0,86,97,
+    108,105,100,97,116,101,32,97,32,112,121,99,32,97,103,97,
+    105,110,115,116,32,116,104,101,32,115,111,117,114,99,101,32,
+    108,97,115,116,45,109,111,100,105,102,105,101,100,32,116,105,
+    109,101,46,10,10,32,32,32,32,42,100,97,116,97,42,32,
+    105,115,32,116,104,101,32,99,111,110,116,101,110,116,115,32,
+    111,102,32,116,104,101,32,112,121,99,32,102,105,108,101,46,
+    32,40,79,110,108,121,32,116,104,101,32,102,105,114,115,116,
+    32,49,54,32,98,121,116,101,115,32,97,114,101,10,32,32,
+    32,32,114,101,113,117,105,114,101,100,46,41,10,10,32,32,
+    32,32,42,115,111,117,114,99,101,95,109,116,105,109,101,42,
+    32,105,115,32,116,104,101,32,108,97,115,116,32,109,111,100,
+    105,102,105,101,100,32,116,105,109,101,115,116,97,109,112,32,
+    111,102,32,116,104,101,32,115,111,117,114,99,101,32,102,105,
+    108,101,46,10,10,32,32,32,32,42,115,111,117,114,99,101,
+    95,115,105,122,101,42,32,105,115,32,78,111,110,101,32,111,
+    114,32,116,104,101,32,115,105,122,101,32,111,102,32,116,104,
+    101,32,115,111,117,114,99,101,32,102,105,108,101,32,105,110,
+    32,98,121,116,101,115,46,10,10,32,32,32,32,42,110,97,
     109,101,42,32,105,115,32,116,104,101,32,110,97,109,101,32,
     111,102,32,116,104,101,32,109,111,100,117,108,101,32,98,101,
     105,110,103,32,105,109,112,111,114,116,101,100,46,32,73,116,
@@ -942,845 +1022,763 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
     116,111,32,73,109,112,111,114,116,69,114,114,111,114,32,105,
     102,32,105,116,32,114,97,105,115,101,100,32,102,111,114,10,
     32,32,32,32,105,109,112,114,111,118,101,100,32,100,101,98,
-    117,103,103,105,110,103,46,10,10,32,32,32,32,73,109,112,
+    117,103,103,105,110,103,46,10,10,32,32,32,32,65,110,32,
+    73,109,112,111,114,116,69,114,114,111,114,32,105,115,32,114,
+    97,105,115,101,100,32,105,102,32,116,104,101,32,98,121,116,
+    101,99,111,100,101,32,105,115,32,115,116,97,108,101,46,10,
+    10,32,32,32,32,114,173,0,0,0,233,12,0,0,0,114,
+    33,0,0,0,122,22,98,121,116,101,99,111,100,101,32,105,
+    115,32,115,116,97,108,101,32,102,111,114,32,114,171,0,0,
+    0,78,114,172,0,0,0,41,4,114,45,0,0,0,114,162,
+    0,0,0,114,176,0,0,0,114,146,0,0,0,41,6,114,
+    44,0,0,0,218,12,115,111,117,114,99,101,95,109,116,105,
+    109,101,218,11,115,111,117,114,99,101,95,115,105,122,101,114,
+    145,0,0,0,114,178,0,0,0,114,121,0,0,0,115,6,
+    0,0,0,32,32,32,32,32,32,114,7,0,0,0,218,23,
+    95,118,97,108,105,100,97,116,101,95,116,105,109,101,115,116,
+    97,109,112,95,112,121,99,114,183,0,0,0,117,2,0,0,
+    115,18,0,0,0,24,19,10,1,12,1,16,1,8,1,22,
+    1,2,255,22,2,8,254,115,18,0,0,0,22,19,2,3,
+    10,254,12,1,16,1,6,1,2,2,22,255,32,1,115,124,
+    0,0,0,8,22,23,27,28,29,30,32,28,32,23,33,8,
+    34,39,51,54,64,39,64,8,65,5,50,19,52,20,24,19,
+    52,19,52,9,16,9,19,9,51,37,41,43,50,9,51,9,
+    51,15,26,27,34,15,50,15,50,38,49,15,50,15,50,9,
+    50,9,20,28,32,9,32,5,76,9,23,24,28,29,31,32,
+    34,29,34,24,35,9,36,41,52,55,65,41,65,9,66,5,
+    76,15,26,27,60,28,32,27,60,27,60,15,76,15,76,64,
+    75,15,76,15,76,9,76,5,76,5,76,5,76,5,76,114,
+    10,0,0,0,99,4,0,0,0,0,0,0,0,0,0,0,
+    0,4,0,0,0,3,0,0,0,115,42,0,0,0,124,0,
+    100,1,100,2,133,2,25,0,124,1,107,3,114,19,116,0,
+    100,3,124,2,155,2,157,2,102,1,105,0,124,3,164,1,
+    142,1,130,1,100,4,83,0,41,5,97,243,1,0,0,86,
+    97,108,105,100,97,116,101,32,97,32,104,97,115,104,45,98,
+    97,115,101,100,32,112,121,99,32,98,121,32,99,104,101,99,
+    107,105,110,103,32,116,104,101,32,114,101,97,108,32,115,111,
+    117,114,99,101,32,104,97,115,104,32,97,103,97,105,110,115,
+    116,32,116,104,101,32,111,110,101,32,105,110,10,32,32,32,
+    32,116,104,101,32,112,121,99,32,104,101,97,100,101,114,46,
+    10,10,32,32,32,32,42,100,97,116,97,42,32,105,115,32,
+    116,104,101,32,99,111,110,116,101,110,116,115,32,111,102,32,
+    116,104,101,32,112,121,99,32,102,105,108,101,46,32,40,79,
+    110,108,121,32,116,104,101,32,102,105,114,115,116,32,49,54,
+    32,98,121,116,101,115,32,97,114,101,10,32,32,32,32,114,
+    101,113,117,105,114,101,100,46,41,10,10,32,32,32,32,42,
+    115,111,117,114,99,101,95,104,97,115,104,42,32,105,115,32,
+    116,104,101,32,105,109,112,111,114,116,108,105,98,46,117,116,
+    105,108,46,115,111,117,114,99,101,95,104,97,115,104,40,41,
+    32,111,102,32,116,104,101,32,115,111,117,114,99,101,32,102,
+    105,108,101,46,10,10,32,32,32,32,42,110,97,109,101,42,
+    32,105,115,32,116,104,101,32,110,97,109,101,32,111,102,32,
+    116,104,101,32,109,111,100,117,108,101,32,98,101,105,110,103,
+    32,105,109,112,111,114,116,101,100,46,32,73,116,32,105,115,
+    32,117,115,101,100,32,102,111,114,32,108,111,103,103,105,110,
+    103,46,10,10,32,32,32,32,42,101,120,99,95,100,101,116,
+    97,105,108,115,42,32,105,115,32,97,32,100,105,99,116,105,
+    111,110,97,114,121,32,112,97,115,115,101,100,32,116,111,32,
+    73,109,112,111,114,116,69,114,114,111,114,32,105,102,32,105,
+    116,32,114,97,105,115,101,100,32,102,111,114,10,32,32,32,
+    32,105,109,112,114,111,118,101,100,32,100,101,98,117,103,103,
+    105,110,103,46,10,10,32,32,32,32,65,110,32,73,109,112,
     111,114,116,69,114,114,111,114,32,105,115,32,114,97,105,115,
-    101,100,32,119,104,101,110,32,116,104,101,32,109,97,103,105,
-    99,32,110,117,109,98,101,114,32,105,115,32,105,110,99,111,
-    114,114,101,99,116,32,111,114,32,119,104,101,110,32,116,104,
-    101,32,102,108,97,103,115,10,32,32,32,32,102,105,101,108,
-    100,32,105,115,32,105,110,118,97,108,105,100,46,32,69,79,
-    70,69,114,114,111,114,32,105,115,32,114,97,105,115,101,100,
-    32,119,104,101,110,32,116,104,101,32,100,97,116,97,32,105,
-    115,32,102,111,117,110,100,32,116,111,32,98,101,32,116,114,
-    117,110,99,97,116,101,100,46,10,10,32,32,32,32,78,114,
-    34,0,0,0,122,20,98,97,100,32,109,97,103,105,99,32,
-    110,117,109,98,101,114,32,105,110,32,122,2,58,32,250,2,
-    123,125,233,16,0,0,0,122,40,114,101,97,99,104,101,100,
-    32,69,79,70,32,119,104,105,108,101,32,114,101,97,100,105,
-    110,103,32,112,121,99,32,104,101,97,100,101,114,32,111,102,
-    32,233,8,0,0,0,233,252,255,255,255,122,14,105,110,118,
-    97,108,105,100,32,102,108,97,103,115,32,122,4,32,105,110,
-    32,41,7,218,12,77,65,71,73,67,95,78,85,77,66,69,
-    82,114,162,0,0,0,218,16,95,118,101,114,98,111,115,101,
-    95,109,101,115,115,97,103,101,114,146,0,0,0,114,4,0,
-    0,0,218,8,69,79,70,69,114,114,111,114,114,45,0,0,
-    0,41,6,114,44,0,0,0,114,145,0,0,0,218,11,101,
-    120,99,95,100,101,116,97,105,108,115,90,5,109,97,103,105,
-    99,114,121,0,0,0,114,19,0,0,0,115,6,0,0,0,
-    32,32,32,32,32,32,114,7,0,0,0,218,13,95,99,108,
-    97,115,115,105,102,121,95,112,121,99,114,179,0,0,0,84,
-    2,0,0,115,28,0,0,0,12,16,8,1,16,1,12,1,
-    16,1,12,1,10,1,12,1,8,1,16,1,8,2,16,1,
-    16,1,4,1,115,34,0,0,0,12,16,6,1,2,3,16,
-    254,12,1,16,1,10,1,2,3,10,254,12,1,8,1,16,
-    1,6,2,2,2,16,255,16,1,4,1,115,166,0,0,0,
-    13,17,18,20,19,20,18,20,13,21,5,10,8,13,17,29,
-    8,29,5,50,19,61,20,24,19,61,19,61,20,25,19,61,
-    19,61,9,16,9,19,9,51,37,41,43,50,9,51,9,51,
-    15,26,27,34,15,50,15,50,38,49,15,50,15,50,9,50,
-    8,11,12,16,8,17,20,22,8,22,5,32,19,70,20,24,
-    19,70,19,70,9,16,9,19,9,51,37,41,43,50,9,51,
-    9,51,15,23,24,31,15,32,9,32,13,27,28,32,33,34,
-    35,36,33,36,28,37,13,38,5,10,8,13,16,21,8,21,
-    5,50,19,57,20,25,19,57,19,57,20,24,19,57,19,57,
-    9,16,15,26,27,34,15,50,15,50,38,49,15,50,15,50,
-    9,50,12,17,5,17,114,10,0,0,0,99,5,0,0,0,
-    0,0,0,0,0,0,0,0,4,0,0,0,3,0,0,0,
-    115,124,0,0,0,116,0,124,0,100,1,100,2,133,2,25,
-    0,131,1,124,1,100,3,64,0,107,3,114,31,100,4,124,
-    3,155,2,157,2,125,5,116,1,160,2,100,5,124,5,161,
-    2,1,0,116,3,124,5,102,1,105,0,124,4,164,1,142,
-    1,130,1,124,2,100,6,117,1,114,60,116,0,124,0,100,
-    2,100,7,133,2,25,0,131,1,124,2,100,3,64,0,107,
-    3,114,58,116,3,100,4,124,3,155,2,157,2,102,1,105,
-    0,124,4,164,1,142,1,130,1,100,6,83,0,100,6,83,
-    0,41,8,97,7,2,0,0,86,97,108,105,100,97,116,101,
-    32,97,32,112,121,99,32,97,103,97,105,110,115,116,32,116,
-    104,101,32,115,111,117,114,99,101,32,108,97,115,116,45,109,
-    111,100,105,102,105,101,100,32,116,105,109,101,46,10,10,32,
-    32,32,32,42,100,97,116,97,42,32,105,115,32,116,104,101,
-    32,99,111,110,116,101,110,116,115,32,111,102,32,116,104,101,
-    32,112,121,99,32,102,105,108,101,46,32,40,79,110,108,121,
-    32,116,104,101,32,102,105,114,115,116,32,49,54,32,98,121,
-    116,101,115,32,97,114,101,10,32,32,32,32,114,101,113,117,
-    105,114,101,100,46,41,10,10,32,32,32,32,42,115,111,117,
-    114,99,101,95,109,116,105,109,101,42,32,105,115,32,116,104,
-    101,32,108,97,115,116,32,109,111,100,105,102,105,101,100,32,
-    116,105,109,101,115,116,97,109,112,32,111,102,32,116,104,101,
-    32,115,111,117,114,99,101,32,102,105,108,101,46,10,10,32,
-    32,32,32,42,115,111,117,114,99,101,95,115,105,122,101,42,
-    32,105,115,32,78,111,110,101,32,111,114,32,116,104,101,32,
-    115,105,122,101,32,111,102,32,116,104,101,32,115,111,117,114,
-    99,101,32,102,105,108,101,32,105,110,32,98,121,116,101,115,
-    46,10,10,32,32,32,32,42,110,97,109,101,42,32,105,115,
-    32,116,104,101,32,110,97,109,101,32,111,102,32,116,104,101,
-    32,109,111,100,117,108,101,32,98,101,105,110,103,32,105,109,
-    112,111,114,116,101,100,46,32,73,116,32,105,115,32,117,115,
-    101,100,32,102,111,114,32,108,111,103,103,105,110,103,46,10,
-    10,32,32,32,32,42,101,120,99,95,100,101,116,97,105,108,
-    115,42,32,105,115,32,97,32,100,105,99,116,105,111,110,97,
-    114,121,32,112,97,115,115,101,100,32,116,111,32,73,109,112,
-    111,114,116,69,114,114,111,114,32,105,102,32,105,116,32,114,
-    97,105,115,101,100,32,102,111,114,10,32,32,32,32,105,109,
-    112,114,111,118,101,100,32,100,101,98,117,103,103,105,110,103,
-    46,10,10,32,32,32,32,65,110,32,73,109,112,111,114,116,
-    69,114,114,111,114,32,105,115,32,114,97,105,115,101,100,32,
-    105,102,32,116,104,101,32,98,121,116,101,99,111,100,101,32,
-    105,115,32,115,116,97,108,101,46,10,10,32,32,32,32,114,
-    173,0,0,0,233,12,0,0,0,114,33,0,0,0,122,22,
-    98,121,116,101,99,111,100,101,32,105,115,32,115,116,97,108,
-    101,32,102,111,114,32,114,171,0,0,0,78,114,172,0,0,
-    0,41,4,114,45,0,0,0,114,162,0,0,0,114,176,0,
-    0,0,114,146,0,0,0,41,6,114,44,0,0,0,218,12,
-    115,111,117,114,99,101,95,109,116,105,109,101,218,11,115,111,
-    117,114,99,101,95,115,105,122,101,114,145,0,0,0,114,178,
-    0,0,0,114,121,0,0,0,115,6,0,0,0,32,32,32,
-    32,32,32,114,7,0,0,0,218,23,95,118,97,108,105,100,
-    97,116,101,95,116,105,109,101,115,116,97,109,112,95,112,121,
-    99,114,183,0,0,0,117,2,0,0,115,18,0,0,0,24,
-    19,10,1,12,1,16,1,8,1,22,1,2,255,22,2,8,
-    254,115,18,0,0,0,22,19,2,3,10,254,12,1,16,1,
-    6,1,2,2,22,255,32,1,115,124,0,0,0,8,22,23,
-    27,28,29,30,32,28,32,23,33,8,34,39,51,54,64,39,
-    64,8,65,5,50,19,52,20,24,19,52,19,52,9,16,9,
-    19,9,51,37,41,43,50,9,51,9,51,15,26,27,34,15,
-    50,15,50,38,49,15,50,15,50,9,50,9,20,28,32,9,
-    32,5,76,9,23,24,28,29,31,32,34,29,34,24,35,9,
-    36,41,52,55,65,41,65,9,66,5,76,15,26,27,60,28,
-    32,27,60,27,60,15,76,15,76,64,75,15,76,15,76,9,
-    76,5,76,5,76,5,76,5,76,114,10,0,0,0,99,4,
-    0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,3,
-    0,0,0,115,42,0,0,0,124,0,100,1,100,2,133,2,
-    25,0,124,1,107,3,114,19,116,0,100,3,124,2,155,2,
-    157,2,102,1,105,0,124,3,164,1,142,1,130,1,100,4,
-    83,0,41,5,97,243,1,0,0,86,97,108,105,100,97,116,
-    101,32,97,32,104,97,115,104,45,98,97,115,101,100,32,112,
-    121,99,32,98,121,32,99,104,101,99,107,105,110,103,32,116,
-    104,101,32,114,101,97,108,32,115,111,117,114,99,101,32,104,
-    97,115,104,32,97,103,97,105,110,115,116,32,116,104,101,32,
-    111,110,101,32,105,110,10,32,32,32,32,116,104,101,32,112,
-    121,99,32,104,101,97,100,101,114,46,10,10,32,32,32,32,
-    42,100,97,116,97,42,32,105,115,32,116,104,101,32,99,111,
-    110,116,101,110,116,115,32,111,102,32,116,104,101,32,112,121,
-    99,32,102,105,108,101,46,32,40,79,110,108,121,32,116,104,
-    101,32,102,105,114,115,116,32,49,54,32,98,121,116,101,115,
-    32,97,114,101,10,32,32,32,32,114,101,113,117,105,114,101,
-    100,46,41,10,10,32,32,32,32,42,115,111,117,114,99,101,
-    95,104,97,115,104,42,32,105,115,32,116,104,101,32,105,109,
-    112,111,114,116,108,105,98,46,117,116,105,108,46,115,111,117,
-    114,99,101,95,104,97,115,104,40,41,32,111,102,32,116,104,
-    101,32,115,111,117,114,99,101,32,102,105,108,101,46,10,10,
-    32,32,32,32,42,110,97,109,101,42,32,105,115,32,116,104,
-    101,32,110,97,109,101,32,111,102,32,116,104,101,32,109,111,
-    100,117,108,101,32,98,101,105,110,103,32,105,109,112,111,114,
-    116,101,100,46,32,73,116,32,105,115,32,117,115,101,100,32,
-    102,111,114,32,108,111,103,103,105,110,103,46,10,10,32,32,
-    32,32,42,101,120,99,95,100,101,116,97,105,108,115,42,32,
-    105,115,32,97,32,100,105,99,116,105,111,110,97,114,121,32,
-    112,97,115,115,101,100,32,116,111,32,73,109,112,111,114,116,
-    69,114,114,111,114,32,105,102,32,105,116,32,114,97,105,115,
-    101,100,32,102,111,114,10,32,32,32,32,105,109,112,114,111,
-    118,101,100,32,100,101,98,117,103,103,105,110,103,46,10,10,
-    32,32,32,32,65,110,32,73,109,112,111,114,116,69,114,114,
-    111,114,32,105,115,32,114,97,105,115,101,100,32,105,102,32,
-    116,104,101,32,98,121,116,101,99,111,100,101,32,105,115,32,
-    115,116,97,108,101,46,10,10,32,32,32,32,114,173,0,0,
-    0,114,172,0,0,0,122,46,104,97,115,104,32,105,110,32,
-    98,121,116,101,99,111,100,101,32,100,111,101,115,110,39,116,
-    32,109,97,116,99,104,32,104,97,115,104,32,111,102,32,115,
-    111,117,114,99,101,32,78,41,1,114,146,0,0,0,41,4,
-    114,44,0,0,0,218,11,115,111,117,114,99,101,95,104,97,
-    115,104,114,145,0,0,0,114,178,0,0,0,115,4,0,0,
-    0,32,32,32,32,114,7,0,0,0,218,18,95,118,97,108,
-    105,100,97,116,101,95,104,97,115,104,95,112,121,99,114,185,
-    0,0,0,145,2,0,0,115,14,0,0,0,16,17,2,1,
-    8,1,4,255,2,2,6,254,4,255,115,14,0,0,0,14,
-    17,2,4,2,253,8,1,4,2,2,255,10,1,115,42,0,
-    0,0,8,12,13,14,15,17,13,17,8,18,22,33,8,33,
-    5,10,15,26,13,71,14,18,13,71,13,71,15,10,15,10,
-    15,26,15,10,15,10,9,10,5,10,5,10,114,10,0,0,
-    0,99,4,0,0,0,0,0,0,0,0,0,0,0,5,0,
-    0,0,3,0,0,0,115,76,0,0,0,116,0,106,1,124,
-    0,131,1,125,4,116,2,124,4,116,3,131,2,114,28,116,
-    4,160,5,100,1,124,2,161,2,1,0,124,3,100,2,117,
-    1,114,26,116,6,106,7,124,4,124,3,131,2,1,0,124,
-    4,83,0,116,8,100,3,160,9,124,2,161,1,124,1,124,
-    2,100,4,141,3,130,1,41,5,122,35,67,111,109,112,105,
-    108,101,32,98,121,116,101,99,111,100,101,32,97,115,32,102,
-    111,117,110,100,32,105,110,32,97,32,112,121,99,46,122,21,
-    99,111,100,101,32,111,98,106,101,99,116,32,102,114,111,109,
-    32,123,33,114,125,78,122,23,78,111,110,45,99,111,100,101,
-    32,111,98,106,101,99,116,32,105,110,32,123,33,114,125,169,
-    2,114,145,0,0,0,114,67,0,0,0,41,10,218,7,109,
-    97,114,115,104,97,108,90,5,108,111,97,100,115,218,10,105,
-    115,105,110,115,116,97,110,99,101,218,10,95,99,111,100,101,
-    95,116,121,112,101,114,162,0,0,0,114,176,0,0,0,218,
-    4,95,105,109,112,90,16,95,102,105,120,95,99,111,95,102,
-    105,108,101,110,97,109,101,114,146,0,0,0,114,93,0,0,
-    0,41,5,114,44,0,0,0,114,145,0,0,0,114,136,0,
-    0,0,114,138,0,0,0,218,4,99,111,100,101,115,5,0,
-    0,0,32,32,32,32,32,114,7,0,0,0,218,17,95,99,
-    111,109,112,105,108,101,95,98,121,116,101,99,111,100,101,114,
-    192,0,0,0,169,2,0,0,115,18,0,0,0,10,2,10,
-    1,12,1,8,1,12,1,4,1,10,2,4,1,6,255,115,
-    18,0,0,0,10,2,8,1,2,7,12,250,6,1,14,1,
-    4,1,10,2,10,1,115,76,0,0,0,12,19,12,25,26,
-    30,12,31,5,9,8,18,19,23,25,35,8,36,5,57,9,
-    19,9,76,37,60,62,75,9,76,9,76,12,23,31,35,12,
-    35,9,53,13,17,13,34,35,39,41,52,13,53,13,53,16,
-    20,9,20,15,26,27,52,27,74,60,73,27,74,32,36,43,
-    56,15,57,15,57,9,57,114,10,0,0,0,99,3,0,0,
-    0,0,0,0,0,0,0,0,0,4,0,0,0,3,0,0,
-    0,115,70,0,0,0,116,0,116,1,131,1,125,3,124,3,
-    160,2,116,3,100,1,131,1,161,1,1,0,124,3,160,2,
-    116,3,124,1,131,1,161,1,1,0,124,3,160,2,116,3,
-    124,2,131,1,161,1,1,0,124,3,160,2,116,4,106,5,
-    124,0,131,1,161,1,1,0,124,3,83,0,41,3,122,43,
-    80,114,111,100,117,99,101,32,116,104,101,32,100,97,116,97,
-    32,102,111,114,32,97,32,116,105,109,101,115,116,97,109,112,
-    45,98,97,115,101,100,32,112,121,99,46,114,0,0,0,0,
-    78,41,6,218,9,98,121,116,101,97,114,114,97,121,114,175,
-    0,0,0,218,6,101,120,116,101,110,100,114,39,0,0,0,
-    114,187,0,0,0,218,5,100,117,109,112,115,41,4,114,191,
-    0,0,0,218,5,109,116,105,109,101,114,182,0,0,0,114,
-    44,0,0,0,115,4,0,0,0,32,32,32,32,114,7,0,
-    0,0,218,22,95,99,111,100,101,95,116,111,95,116,105,109,
-    101,115,116,97,109,112,95,112,121,99,114,197,0,0,0,182,
-    2,0,0,243,12,0,0,0,8,2,14,1,14,1,14,1,
-    16,1,4,1,114,198,0,0,0,115,70,0,0,0,12,21,
-    22,34,12,35,5,9,5,9,5,33,17,29,30,31,17,32,
-    5,33,5,33,5,9,5,37,17,29,30,35,17,36,5,37,
-    5,37,5,9,5,43,17,29,30,41,17,42,5,43,5,43,
-    5,9,5,37,17,24,17,30,31,35,17,36,5,37,5,37,
-    12,16,5,16,114,10,0,0,0,84,99,3,0,0,0,0,
-    0,0,0,0,0,0,0,4,0,0,0,3,0,0,0,115,
-    80,0,0,0,116,0,116,1,131,1,125,3,100,1,124,2,
-    100,1,62,0,66,0,125,4,124,3,160,2,116,3,124,4,
-    131,1,161,1,1,0,116,4,124,1,131,1,100,2,107,2,
-    115,25,74,0,130,1,124,3,160,2,124,1,161,1,1,0,
-    124,3,160,2,116,5,106,6,124,0,131,1,161,1,1,0,
-    124,3,83,0,41,4,122,38,80,114,111,100,117,99,101,32,
-    116,104,101,32,100,97,116,97,32,102,111,114,32,97,32,104,
-    97,115,104,45,98,97,115,101,100,32,112,121,99,46,114,3,
-    0,0,0,114,173,0,0,0,78,41,7,114,193,0,0,0,
-    114,175,0,0,0,114,194,0,0,0,114,39,0,0,0,114,
-    4,0,0,0,114,187,0,0,0,114,195,0,0,0,41,5,
-    114,191,0,0,0,114,184,0,0,0,90,7,99,104,101,99,
-    107,101,100,114,44,0,0,0,114,19,0,0,0,115,5,0,
-    0,0,32,32,32,32,32,114,7,0,0,0,218,17,95,99,
-    111,100,101,95,116,111,95,104,97,115,104,95,112,121,99,114,
-    199,0,0,0,192,2,0,0,243,14,0,0,0,8,2,12,
-    1,14,1,16,1,10,1,16,1,4,1,114,200,0,0,0,
-    115,80,0,0,0,12,21,22,34,12,35,5,9,13,16,19,
-    26,30,31,19,31,13,31,5,10,5,9,5,37,17,29,30,
-    35,17,36,5,37,5,37,12,15,16,27,12,28,32,33,12,
-    33,5,33,5,33,5,33,5,9,5,29,17,28,5,29,5,
-    29,5,9,5,37,17,24,17,30,31,35,17,36,5,37,5,
-    37,12,16,5,16,114,10,0,0,0,99,1,0,0,0,0,
-    0,0,0,0,0,0,0,6,0,0,0,3,0,0,0,115,
-    62,0,0,0,100,1,100,2,108,0,125,1,116,1,106,2,
-    124,0,131,1,106,3,125,2,124,1,160,4,124,2,161,1,
-    125,3,116,1,106,5,100,2,100,3,131,2,125,4,124,4,
-    160,6,124,0,160,6,124,3,100,1,25,0,161,1,161,1,
-    83,0,41,4,122,121,68,101,99,111,100,101,32,98,121,116,
-    101,115,32,114,101,112,114,101,115,101,110,116,105,110,103,32,
-    115,111,117,114,99,101,32,99,111,100,101,32,97,110,100,32,
-    114,101,116,117,114,110,32,116,104,101,32,115,116,114,105,110,
-    103,46,10,10,32,32,32,32,85,110,105,118,101,114,115,97,
-    108,32,110,101,119,108,105,110,101,32,115,117,112,112,111,114,
-    116,32,105,115,32,117,115,101,100,32,105,110,32,116,104,101,
-    32,100,101,99,111,100,105,110,103,46,10,32,32,32,32,114,
-    0,0,0,0,78,84,41,7,218,8,116,111,107,101,110,105,
-    122,101,114,95,0,0,0,90,7,66,121,116,101,115,73,79,
-    90,8,114,101,97,100,108,105,110,101,90,15,100,101,116,101,
-    99,116,95,101,110,99,111,100,105,110,103,90,25,73,110,99,
-    114,101,109,101,110,116,97,108,78,101,119,108,105,110,101,68,
-    101,99,111,100,101,114,218,6,100,101,99,111,100,101,41,5,
-    218,12,115,111,117,114,99,101,95,98,121,116,101,115,114,201,
-    0,0,0,90,21,115,111,117,114,99,101,95,98,121,116,101,
-    115,95,114,101,97,100,108,105,110,101,218,8,101,110,99,111,
-    100,105,110,103,90,15,110,101,119,108,105,110,101,95,100,101,
-    99,111,100,101,114,115,5,0,0,0,32,32,32,32,32,114,
-    7,0,0,0,218,13,100,101,99,111,100,101,95,115,111,117,
-    114,99,101,114,205,0,0,0,203,2,0,0,243,10,0,0,
-    0,8,5,12,1,10,1,12,1,20,1,114,206,0,0,0,
-    115,62,0,0,0,5,20,5,20,5,20,5,20,29,32,29,
-    40,41,53,29,54,29,63,5,26,16,24,16,63,41,62,16,
-    63,5,13,23,26,23,52,53,57,59,63,23,64,5,20,12,
-    27,12,68,35,47,35,67,55,63,64,65,55,66,35,67,12,
-    68,5,68,114,10,0,0,0,169,2,114,167,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,99,2,0,0,0,
-    0,0,0,0,2,0,0,0,8,0,0,0,3,0,0,0,
-    115,60,1,0,0,124,1,100,1,117,0,114,29,100,2,125,
-    1,116,0,124,2,100,3,131,2,114,28,9,0,124,2,160,
-    1,124,0,161,1,125,1,110,39,35,0,4,0,116,2,121,
-    157,1,0,1,0,1,0,89,0,110,30,37,0,110,28,116,
-    3,106,4,124,1,131,1,125,1,116,5,124,1,131,1,115,
-    57,9,0,116,6,116,3,106,7,131,0,124,1,131,2,125,
-    1,110,10,35,0,4,0,116,8,121,156,1,0,1,0,1,
-    0,89,0,110,1,37,0,116,9,160,10,124,0,124,2,124,
-    1,100,4,166,3,125,4,100,5,124,4,95,11,124,2,100,
-    1,117,0,114,99,116,12,131,0,68,0,93,21,92,2,125,
-    5,125,6,124,1,160,13,116,14,124,6,131,1,161,1,114,
-    96,124,5,124,0,124,1,131,2,125,2,124,2,124,4,95,
-    15,1,0,113,99,113,75,100,1,83,0,124,3,116,16,117,
-    0,114,131,116,0,124,2,100,6,131,2,114,130,9,0,124,
-    2,160,17,124,0,161,1,125,7,110,10,35,0,4,0,116,
-    2,121,155,1,0,1,0,1,0,89,0,110,10,37,0,124,
-    7,114,130,103,0,124,4,95,18,110,3,124,3,124,4,95,
-    18,124,4,106,18,103,0,107,2,114,153,124,1,114,153,116,
-    19,124,1,131,1,100,7,25,0,125,8,124,4,106,18,160,
-    20,124,8,161,1,1,0,124,4,83,0,119,0,119,0,119,
-    0,41,8,97,61,1,0,0,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,97,32,102,105,108,101,32,108,111,99,
-    97,116,105,111,110,46,10,10,32,32,32,32,84,111,32,105,
-    110,100,105,99,97,116,101,32,116,104,97,116,32,116,104,101,
-    32,109,111,100,117,108,101,32,105,115,32,97,32,112,97,99,
-    107,97,103,101,44,32,115,101,116,10,32,32,32,32,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,32,116,111,32,97,32,108,105,
-    115,116,32,111,102,32,100,105,114,101,99,116,111,114,121,32,
-    112,97,116,104,115,46,32,32,65,110,10,32,32,32,32,101,
-    109,112,116,121,32,108,105,115,116,32,105,115,32,115,117,102,
-    102,105,99,105,101,110,116,44,32,116,104,111,117,103,104,32,
-    105,116,115,32,110,111,116,32,111,116,104,101,114,119,105,115,
-    101,32,117,115,101,102,117,108,32,116,111,32,116,104,101,10,
-    32,32,32,32,105,109,112,111,114,116,32,115,121,115,116,101,
-    109,46,10,10,32,32,32,32,84,104,101,32,108,111,97,100,
-    101,114,32,109,117,115,116,32,116,97,107,101,32,97,32,115,
-    112,101,99,32,97,115,32,105,116,115,32,111,110,108,121,32,
-    95,95,105,110,105,116,95,95,40,41,32,97,114,103,46,10,
-    10,32,32,32,32,78,122,9,60,117,110,107,110,111,119,110,
-    62,218,12,103,101,116,95,102,105,108,101,110,97,109,101,169,
-    1,218,6,111,114,105,103,105,110,84,218,10,105,115,95,112,
-    97,99,107,97,103,101,114,0,0,0,0,41,21,114,156,0,
-    0,0,114,209,0,0,0,114,146,0,0,0,114,21,0,0,
-    0,114,107,0,0,0,114,90,0,0,0,114,69,0,0,0,
-    114,86,0,0,0,114,80,0,0,0,114,162,0,0,0,218,
-    10,77,111,100,117,108,101,83,112,101,99,90,13,95,115,101,
-    116,95,102,105,108,101,97,116,116,114,218,27,95,103,101,116,
-    95,115,117,112,112,111,114,116,101,100,95,102,105,108,101,95,
-    108,111,97,100,101,114,115,114,60,0,0,0,114,140,0,0,
-    0,114,167,0,0,0,218,9,95,80,79,80,85,76,65,84,
-    69,114,212,0,0,0,114,208,0,0,0,114,76,0,0,0,
-    114,63,0,0,0,41,9,114,145,0,0,0,90,8,108,111,
-    99,97,116,105,111,110,114,167,0,0,0,114,208,0,0,0,
-    218,4,115,112,101,99,218,12,108,111,97,100,101,114,95,99,
-    108,97,115,115,218,8,115,117,102,102,105,120,101,115,114,212,
-    0,0,0,90,7,100,105,114,110,97,109,101,115,9,0,0,
-    0,32,32,32,32,32,32,32,32,32,114,7,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,219,0,0,0,220,2,0,
-    0,115,96,0,0,0,8,12,4,4,10,1,2,2,12,1,
-    2,128,12,1,4,1,2,128,2,251,10,7,8,1,2,1,
-    16,1,2,128,12,1,4,1,2,128,16,8,6,1,8,3,
-    14,1,14,1,10,1,6,1,4,1,2,253,4,5,8,3,
-    10,2,2,1,12,1,2,128,12,1,4,1,2,128,4,2,
-    6,1,2,128,6,2,10,1,4,1,12,1,12,1,4,2,
-    2,244,2,228,2,249,115,116,0,0,0,6,12,2,17,4,
-    243,8,1,4,5,12,254,2,128,2,2,2,255,12,1,2,
-    128,2,0,10,2,6,1,4,4,16,254,2,128,2,2,2,
-    255,12,1,2,128,16,8,6,1,6,3,2,7,4,250,4,
-    6,6,250,12,1,2,3,10,254,6,1,6,1,4,2,6,
-    3,2,11,8,247,4,7,12,251,2,128,2,2,2,255,12,
-    1,2,128,2,2,8,1,2,128,6,2,8,1,2,3,2,
-    254,2,2,12,255,12,1,4,2,2,245,2,228,2,249,115,
+    101,100,32,105,102,32,116,104,101,32,98,121,116,101,99,111,
+    100,101,32,105,115,32,115,116,97,108,101,46,10,10,32,32,
+    32,32,114,173,0,0,0,114,172,0,0,0,122,46,104,97,
+    115,104,32,105,110,32,98,121,116,101,99,111,100,101,32,100,
+    111,101,115,110,39,116,32,109,97,116,99,104,32,104,97,115,
+    104,32,111,102,32,115,111,117,114,99,101,32,78,41,1,114,
+    146,0,0,0,41,4,114,44,0,0,0,218,11,115,111,117,
+    114,99,101,95,104,97,115,104,114,145,0,0,0,114,178,0,
+    0,0,115,4,0,0,0,32,32,32,32,114,7,0,0,0,
+    218,18,95,118,97,108,105,100,97,116,101,95,104,97,115,104,
+    95,112,121,99,114,185,0,0,0,145,2,0,0,115,14,0,
+    0,0,16,17,2,1,8,1,4,255,2,2,6,254,4,255,
+    115,14,0,0,0,14,17,2,4,2,253,8,1,4,2,2,
+    255,10,1,115,42,0,0,0,8,12,13,14,15,17,13,17,
+    8,18,22,33,8,33,5,10,15,26,13,71,14,18,13,71,
+    13,71,15,10,15,10,15,26,15,10,15,10,9,10,5,10,
+    5,10,114,10,0,0,0,99,4,0,0,0,0,0,0,0,
+    0,0,0,0,5,0,0,0,3,0,0,0,115,76,0,0,
+    0,116,0,106,1,124,0,131,1,125,4,116,2,124,4,116,
+    3,131,2,114,28,116,4,160,5,100,1,124,2,161,2,1,
+    0,124,3,100,2,117,1,114,26,116,6,106,7,124,4,124,
+    3,131,2,1,0,124,4,83,0,116,8,100,3,160,9,124,
+    2,161,1,124,1,124,2,100,4,141,3,130,1,41,5,122,
+    35,67,111,109,112,105,108,101,32,98,121,116,101,99,111,100,
+    101,32,97,115,32,102,111,117,110,100,32,105,110,32,97,32,
+    112,121,99,46,122,21,99,111,100,101,32,111,98,106,101,99,
+    116,32,102,114,111,109,32,123,33,114,125,78,122,23,78,111,
+    110,45,99,111,100,101,32,111,98,106,101,99,116,32,105,110,
+    32,123,33,114,125,169,2,114,145,0,0,0,114,67,0,0,
+    0,41,10,218,7,109,97,114,115,104,97,108,90,5,108,111,
+    97,100,115,218,10,105,115,105,110,115,116,97,110,99,101,218,
+    10,95,99,111,100,101,95,116,121,112,101,114,162,0,0,0,
+    114,176,0,0,0,218,4,95,105,109,112,90,16,95,102,105,
+    120,95,99,111,95,102,105,108,101,110,97,109,101,114,146,0,
+    0,0,114,93,0,0,0,41,5,114,44,0,0,0,114,145,
+    0,0,0,114,136,0,0,0,114,138,0,0,0,218,4,99,
+    111,100,101,115,5,0,0,0,32,32,32,32,32,114,7,0,
+    0,0,218,17,95,99,111,109,112,105,108,101,95,98,121,116,
+    101,99,111,100,101,114,192,0,0,0,169,2,0,0,115,18,
+    0,0,0,10,2,10,1,12,1,8,1,12,1,4,1,10,
+    2,4,1,6,255,115,18,0,0,0,10,2,8,1,2,7,
+    12,250,6,1,14,1,4,1,10,2,10,1,115,76,0,0,
+    0,12,19,12,25,26,30,12,31,5,9,8,18,19,23,25,
+    35,8,36,5,57,9,19,9,76,37,60,62,75,9,76,9,
+    76,12,23,31,35,12,35,9,53,13,17,13,34,35,39,41,
+    52,13,53,13,53,16,20,9,20,15,26,27,52,27,74,60,
+    73,27,74,32,36,43,56,15,57,15,57,9,57,114,10,0,
+    0,0,99,3,0,0,0,0,0,0,0,0,0,0,0,4,
+    0,0,0,3,0,0,0,115,70,0,0,0,116,0,116,1,
+    131,1,125,3,124,3,160,2,116,3,100,1,131,1,161,1,
+    1,0,124,3,160,2,116,3,124,1,131,1,161,1,1,0,
+    124,3,160,2,116,3,124,2,131,1,161,1,1,0,124,3,
+    160,2,116,4,106,5,124,0,131,1,161,1,1,0,124,3,
+    83,0,41,3,122,43,80,114,111,100,117,99,101,32,116,104,
+    101,32,100,97,116,97,32,102,111,114,32,97,32,116,105,109,
+    101,115,116,97,109,112,45,98,97,115,101,100,32,112,121,99,
+    46,114,0,0,0,0,78,41,6,218,9,98,121,116,101,97,
+    114,114,97,121,114,175,0,0,0,218,6,101,120,116,101,110,
+    100,114,39,0,0,0,114,187,0,0,0,218,5,100,117,109,
+    112,115,41,4,114,191,0,0,0,218,5,109,116,105,109,101,
+    114,182,0,0,0,114,44,0,0,0,115,4,0,0,0,32,
+    32,32,32,114,7,0,0,0,218,22,95,99,111,100,101,95,
+    116,111,95,116,105,109,101,115,116,97,109,112,95,112,121,99,
+    114,197,0,0,0,182,2,0,0,243,12,0,0,0,8,2,
+    14,1,14,1,14,1,16,1,4,1,114,198,0,0,0,115,
+    70,0,0,0,12,21,22,34,12,35,5,9,5,9,5,33,
+    17,29,30,31,17,32,5,33,5,33,5,9,5,37,17,29,
+    30,35,17,36,5,37,5,37,5,9,5,43,17,29,30,41,
+    17,42,5,43,5,43,5,9,5,37,17,24,17,30,31,35,
+    17,36,5,37,5,37,12,16,5,16,114,10,0,0,0,84,
+    99,3,0,0,0,0,0,0,0,0,0,0,0,4,0,0,
+    0,3,0,0,0,115,80,0,0,0,116,0,116,1,131,1,
+    125,3,100,1,124,2,100,1,62,0,66,0,125,4,124,3,
+    160,2,116,3,124,4,131,1,161,1,1,0,116,4,124,1,
+    131,1,100,2,107,2,115,25,74,0,130,1,124,3,160,2,
+    124,1,161,1,1,0,124,3,160,2,116,5,106,6,124,0,
+    131,1,161,1,1,0,124,3,83,0,41,4,122,38,80,114,
+    111,100,117,99,101,32,116,104,101,32,100,97,116,97,32,102,
+    111,114,32,97,32,104,97,115,104,45,98,97,115,101,100,32,
+    112,121,99,46,114,3,0,0,0,114,173,0,0,0,78,41,
+    7,114,193,0,0,0,114,175,0,0,0,114,194,0,0,0,
+    114,39,0,0,0,114,4,0,0,0,114,187,0,0,0,114,
+    195,0,0,0,41,5,114,191,0,0,0,114,184,0,0,0,
+    90,7,99,104,101,99,107,101,100,114,44,0,0,0,114,19,
+    0,0,0,115,5,0,0,0,32,32,32,32,32,114,7,0,
+    0,0,218,17,95,99,111,100,101,95,116,111,95,104,97,115,
+    104,95,112,121,99,114,199,0,0,0,192,2,0,0,243,14,
+    0,0,0,8,2,12,1,14,1,16,1,10,1,16,1,4,
+    1,114,200,0,0,0,115,80,0,0,0,12,21,22,34,12,
+    35,5,9,13,16,19,26,30,31,19,31,13,31,5,10,5,
+    9,5,37,17,29,30,35,17,36,5,37,5,37,12,15,16,
+    27,12,28,32,33,12,33,5,33,5,33,5,33,5,9,5,
+    29,17,28,5,29,5,29,5,9,5,37,17,24,17,30,31,
+    35,17,36,5,37,5,37,12,16,5,16,114,10,0,0,0,
+    99,1,0,0,0,0,0,0,0,0,0,0,0,6,0,0,
+    0,3,0,0,0,115,62,0,0,0,100,1,100,2,108,0,
+    125,1,116,1,106,2,124,0,131,1,106,3,125,2,124,1,
+    160,4,124,2,161,1,125,3,116,1,106,5,100,2,100,3,
+    131,2,125,4,124,4,160,6,124,0,160,6,124,3,100,1,
+    25,0,161,1,161,1,83,0,41,4,122,121,68,101,99,111,
+    100,101,32,98,121,116,101,115,32,114,101,112,114,101,115,101,
+    110,116,105,110,103,32,115,111,117,114,99,101,32,99,111,100,
+    101,32,97,110,100,32,114,101,116,117,114,110,32,116,104,101,
+    32,115,116,114,105,110,103,46,10,10,32,32,32,32,85,110,
+    105,118,101,114,115,97,108,32,110,101,119,108,105,110,101,32,
+    115,117,112,112,111,114,116,32,105,115,32,117,115,101,100,32,
+    105,110,32,116,104,101,32,100,101,99,111,100,105,110,103,46,
+    10,32,32,32,32,114,0,0,0,0,78,84,41,7,218,8,
+    116,111,107,101,110,105,122,101,114,95,0,0,0,90,7,66,
+    121,116,101,115,73,79,90,8,114,101,97,100,108,105,110,101,
+    90,15,100,101,116,101,99,116,95,101,110,99,111,100,105,110,
+    103,90,25,73,110,99,114,101,109,101,110,116,97,108,78,101,
+    119,108,105,110,101,68,101,99,111,100,101,114,218,6,100,101,
+    99,111,100,101,41,5,218,12,115,111,117,114,99,101,95,98,
+    121,116,101,115,114,201,0,0,0,90,21,115,111,117,114,99,
+    101,95,98,121,116,101,115,95,114,101,97,100,108,105,110,101,
+    218,8,101,110,99,111,100,105,110,103,90,15,110,101,119,108,
+    105,110,101,95,100,101,99,111,100,101,114,115,5,0,0,0,
+    32,32,32,32,32,114,7,0,0,0,218,13,100,101,99,111,
+    100,101,95,115,111,117,114,99,101,114,205,0,0,0,203,2,
+    0,0,243,10,0,0,0,8,5,12,1,10,1,12,1,20,
+    1,114,206,0,0,0,115,62,0,0,0,5,20,5,20,5,
+    20,5,20,29,32,29,40,41,53,29,54,29,63,5,26,16,
+    24,16,63,41,62,16,63,5,13,23,26,23,52,53,57,59,
+    63,23,64,5,20,12,27,12,68,35,47,35,67,55,63,64,
+    65,55,66,35,67,12,68,5,68,114,10,0,0,0,169,2,
+    114,167,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,99,2,0,0,0,0,0,0,0,2,0,0,0,8,0,
+    0,0,3,0,0,0,115,60,1,0,0,124,1,100,1,117,
+    0,114,30,100,2,125,1,116,0,124,2,100,3,131,2,114,
+    29,9,0,124,2,160,1,124,0,161,1,125,1,110,41,35,
+    0,4,0,116,2,121,27,1,0,1,0,1,0,89,0,110,
+    32,119,0,37,0,110,29,116,3,106,4,124,1,131,1,125,
+    1,116,5,124,1,131,1,115,59,9,0,116,6,116,3,106,
+    7,131,0,124,1,131,2,125,1,110,11,35,0,4,0,116,
+    8,121,57,1,0,1,0,1,0,89,0,110,2,119,0,37,
+    0,116,9,160,10,124,0,124,2,124,1,100,4,166,3,125,
+    4,100,5,124,4,95,11,124,2,100,1,117,0,114,101,116,
+    12,131,0,68,0,93,21,92,2,125,5,125,6,124,1,160,
+    13,116,14,124,6,131,1,161,1,114,98,124,5,124,0,124,
+    1,131,2,125,2,124,2,124,4,95,15,1,0,113,101,113,
+    77,100,1,83,0,124,3,116,16,117,0,114,134,116,0,124,
+    2,100,6,131,2,114,133,9,0,124,2,160,17,124,0,161,
+    1,125,7,110,11,35,0,4,0,116,2,121,126,1,0,1,
+    0,1,0,89,0,110,11,119,0,37,0,124,7,114,133,103,
+    0,124,4,95,18,110,3,124,3,124,4,95,18,124,4,106,
+    18,103,0,107,2,114,156,124,1,114,156,116,19,124,1,131,
+    1,100,7,25,0,125,8,124,4,106,18,160,20,124,8,161,
+    1,1,0,124,4,83,0,41,8,97,61,1,0,0,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,97,32,102,105,
+    108,101,32,108,111,99,97,116,105,111,110,46,10,10,32,32,
+    32,32,84,111,32,105,110,100,105,99,97,116,101,32,116,104,
+    97,116,32,116,104,101,32,109,111,100,117,108,101,32,105,115,
+    32,97,32,112,97,99,107,97,103,101,44,32,115,101,116,10,
+    32,32,32,32,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,32,116,
+    111,32,97,32,108,105,115,116,32,111,102,32,100,105,114,101,
+    99,116,111,114,121,32,112,97,116,104,115,46,32,32,65,110,
+    10,32,32,32,32,101,109,112,116,121,32,108,105,115,116,32,
+    105,115,32,115,117,102,102,105,99,105,101,110,116,44,32,116,
+    104,111,117,103,104,32,105,116,115,32,110,111,116,32,111,116,
+    104,101,114,119,105,115,101,32,117,115,101,102,117,108,32,116,
+    111,32,116,104,101,10,32,32,32,32,105,109,112,111,114,116,
+    32,115,121,115,116,101,109,46,10,10,32,32,32,32,84,104,
+    101,32,108,111,97,100,101,114,32,109,117,115,116,32,116,97,
+    107,101,32,97,32,115,112,101,99,32,97,115,32,105,116,115,
+    32,111,110,108,121,32,95,95,105,110,105,116,95,95,40,41,
+    32,97,114,103,46,10,10,32,32,32,32,78,122,9,60,117,
+    110,107,110,111,119,110,62,218,12,103,101,116,95,102,105,108,
+    101,110,97,109,101,169,1,218,6,111,114,105,103,105,110,84,
+    218,10,105,115,95,112,97,99,107,97,103,101,114,0,0,0,
+    0,41,21,114,156,0,0,0,114,209,0,0,0,114,146,0,
+    0,0,114,21,0,0,0,114,107,0,0,0,114,90,0,0,
+    0,114,69,0,0,0,114,86,0,0,0,114,80,0,0,0,
+    114,162,0,0,0,218,10,77,111,100,117,108,101,83,112,101,
+    99,90,13,95,115,101,116,95,102,105,108,101,97,116,116,114,
+    218,27,95,103,101,116,95,115,117,112,112,111,114,116,101,100,
+    95,102,105,108,101,95,108,111,97,100,101,114,115,114,60,0,
+    0,0,114,140,0,0,0,114,167,0,0,0,218,9,95,80,
+    79,80,85,76,65,84,69,114,212,0,0,0,114,208,0,0,
+    0,114,76,0,0,0,114,63,0,0,0,41,9,114,145,0,
+    0,0,90,8,108,111,99,97,116,105,111,110,114,167,0,0,
+    0,114,208,0,0,0,218,4,115,112,101,99,218,12,108,111,
+    97,100,101,114,95,99,108,97,115,115,218,8,115,117,102,102,
+    105,120,101,115,114,212,0,0,0,90,7,100,105,114,110,97,
+    109,101,115,9,0,0,0,32,32,32,32,32,32,32,32,32,
+    114,7,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,219,
+    0,0,0,220,2,0,0,115,96,0,0,0,8,12,4,4,
+    10,1,2,2,12,1,2,128,12,1,4,1,2,255,2,128,
+    2,252,10,7,8,1,2,1,16,1,2,128,12,1,4,1,
+    2,255,2,128,16,9,6,1,8,3,14,1,14,1,10,1,
+    6,1,4,1,2,253,4,5,8,3,10,2,2,1,12,1,
+    2,128,12,1,4,1,2,255,2,128,4,3,6,1,2,128,
+    6,2,10,1,4,1,12,1,12,1,4,2,115,110,0,0,
+    0,6,12,2,17,4,243,8,1,4,5,12,254,2,128,2,
+    2,2,255,14,1,2,128,2,0,10,2,6,1,4,4,16,
+    254,2,128,2,2,2,255,14,1,2,128,16,8,6,1,6,
+    3,2,7,4,250,4,6,6,250,12,1,2,3,10,254,6,
+    1,6,1,4,2,6,3,2,11,8,247,4,7,12,251,2,
+    128,2,2,2,255,14,1,2,128,2,2,8,1,2,128,6,
+    2,8,1,2,3,2,254,2,2,12,255,12,1,4,2,115,
     60,1,0,0,8,16,20,24,8,24,5,21,20,31,9,17,
     12,19,20,26,28,42,12,43,9,21,13,21,28,34,28,53,
     48,52,28,53,17,25,17,25,0,0,13,21,20,31,13,21,
-    13,21,13,21,13,21,17,21,17,21,0,0,9,21,20,23,
-    20,30,31,39,20,40,9,17,16,27,28,36,16,37,9,21,
-    13,21,28,38,39,42,39,49,39,51,53,61,28,62,17,25,
-    17,25,0,0,13,21,20,27,13,21,13,21,13,21,13,21,
-    17,21,17,21,0,0,12,22,12,64,34,38,40,46,55,63,
-    12,64,12,64,5,9,26,30,5,9,5,23,8,14,18,22,
-    8,22,5,24,39,66,39,68,9,24,9,24,13,35,13,25,
-    27,35,16,24,16,50,34,39,40,48,34,49,16,50,13,22,
-    26,38,39,43,45,53,26,54,17,23,31,37,17,21,17,28,
-    17,22,17,22,13,22,20,24,20,24,8,34,38,47,8,47,
-    5,69,12,19,20,26,28,40,12,41,9,57,13,57,30,36,
-    30,53,48,52,30,53,17,27,17,27,0,0,13,21,20,31,
-    13,21,13,21,13,21,13,21,17,21,17,21,0,0,20,30,
-    17,57,55,57,21,25,21,52,0,0,43,69,9,13,9,40,
-    8,12,8,39,43,45,8,45,5,60,12,20,9,60,23,34,
-    35,43,23,44,45,46,23,47,13,20,13,17,13,44,13,60,
-    52,59,13,60,13,60,12,16,5,16,13,21,13,21,13,21,
-    115,44,0,0,0,140,5,18,0,146,7,27,7,167,7,47,
-    0,175,7,56,7,193,45,5,65,51,0,193,51,7,65,60,
-    7,194,27,1,65,60,7,194,28,1,56,7,194,29,1,27,
-    7,99,0,0,0,0,0,0,0,0,0,0,0,0,3,0,
-    0,0,0,0,0,0,115,80,0,0,0,101,0,90,1,100,
-    0,90,2,100,1,90,3,100,2,90,4,100,3,90,5,101,
-    6,111,15,100,4,101,7,118,0,90,8,101,9,100,5,132,
-    0,131,1,90,10,101,11,100,6,132,0,131,1,90,12,101,
-    11,100,10,100,8,132,1,131,1,90,13,101,11,100,11,100,
-    9,132,1,131,1,90,14,100,7,83,0,41,12,218,21,87,
-    105,110,100,111,119,115,82,101,103,105,115,116,114,121,70,105,
-    110,100,101,114,122,62,77,101,116,97,32,112,97,116,104,32,
-    102,105,110,100,101,114,32,102,111,114,32,109,111,100,117,108,
-    101,115,32,100,101,99,108,97,114,101,100,32,105,110,32,116,
-    104,101,32,87,105,110,100,111,119,115,32,114,101,103,105,115,
-    116,114,121,46,122,59,83,111,102,116,119,97,114,101,92,80,
-    121,116,104,111,110,92,80,121,116,104,111,110,67,111,114,101,
-    92,123,115,121,115,95,118,101,114,115,105,111,110,125,92,77,
-    111,100,117,108,101,115,92,123,102,117,108,108,110,97,109,101,
-    125,122,65,83,111,102,116,119,97,114,101,92,80,121,116,104,
-    111,110,92,80,121,116,104,111,110,67,111,114,101,92,123,115,
-    121,115,95,118,101,114,115,105,111,110,125,92,77,111,100,117,
-    108,101,115,92,123,102,117,108,108,110,97,109,101,125,92,68,
-    101,98,117,103,122,6,95,100,46,112,121,100,99,1,0,0,
-    0,0,0,0,0,0,0,0,0,8,0,0,0,3,0,0,
-    0,115,52,0,0,0,9,0,116,0,106,1,116,0,106,2,
-    124,0,131,2,83,0,35,0,4,0,116,3,121,25,1,0,
-    1,0,1,0,116,0,106,1,116,0,106,4,124,0,131,2,
-    6,0,89,0,83,0,37,0,119,0,114,71,0,0,0,41,
-    5,218,6,119,105,110,114,101,103,90,7,79,112,101,110,75,
-    101,121,90,17,72,75,69,89,95,67,85,82,82,69,78,84,
-    95,85,83,69,82,114,80,0,0,0,90,18,72,75,69,89,
-    95,76,79,67,65,76,95,77,65,67,72,73,78,69,114,22,
-    0,0,0,115,1,0,0,0,32,114,7,0,0,0,218,14,
-    95,111,112,101,110,95,114,101,103,105,115,116,114,121,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,49,3,0,0,115,14,0,0,0,2,2,14,
-    1,2,128,12,1,18,1,2,128,2,255,115,16,0,0,0,
-    2,5,14,254,2,128,2,2,2,255,26,1,2,128,2,0,
-    115,52,0,0,0,9,66,20,26,20,34,35,41,35,59,61,
-    64,20,65,13,65,0,0,9,66,16,23,9,66,9,66,9,
-    66,9,66,20,26,20,34,35,41,35,60,62,65,20,66,13,
-    66,13,66,13,66,0,0,9,66,115,12,0,0,0,129,6,
-    8,0,136,14,24,7,153,1,24,7,99,2,0,0,0,0,
-    0,0,0,0,0,0,0,9,0,0,0,3,0,0,0,115,
-    140,0,0,0,124,0,106,0,114,7,124,0,106,1,125,2,
-    110,3,124,0,106,2,125,2,124,2,160,3,124,1,100,1,
-    116,4,106,5,100,0,100,2,133,2,25,0,22,0,100,3,
-    166,2,125,3,9,0,124,0,160,6,124,3,161,1,53,0,
-    125,4,116,7,106,8,124,4,100,4,131,2,125,5,100,0,
-    4,0,4,0,131,3,1,0,124,5,83,0,35,0,49,0,
-    115,49,119,4,37,0,1,0,1,0,1,0,89,0,1,0,
-    1,0,9,0,124,5,83,0,35,0,4,0,116,9,121,69,
-    1,0,1,0,1,0,89,0,100,0,83,0,37,0,119,0,
-    41,5,78,122,5,37,100,46,37,100,114,47,0,0,0,41,
-    2,114,166,0,0,0,90,11,115,121,115,95,118,101,114,115,
-    105,111,110,114,11,0,0,0,41,10,218,11,68,69,66,85,
-    71,95,66,85,73,76,68,218,18,82,69,71,73,83,84,82,
-    89,95,75,69,89,95,68,69,66,85,71,218,12,82,69,71,
-    73,83,84,82,89,95,75,69,89,114,93,0,0,0,114,18,
-    0,0,0,218,12,118,101,114,115,105,111,110,95,105,110,102,
-    111,114,222,0,0,0,114,221,0,0,0,90,10,81,117,101,
-    114,121,86,97,108,117,101,114,80,0,0,0,41,6,218,3,
-    99,108,115,114,166,0,0,0,90,12,114,101,103,105,115,116,
-    114,121,95,107,101,121,114,23,0,0,0,90,4,104,107,101,
-    121,218,8,102,105,108,101,112,97,116,104,115,6,0,0,0,
-    32,32,32,32,32,32,114,7,0,0,0,218,16,95,115,101,
-    97,114,99,104,95,114,101,103,105,115,116,114,121,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,114,99,104,95,114,101,103,
-    105,115,116,114,121,56,3,0,0,115,40,0,0,0,6,2,
-    8,1,6,2,6,1,16,1,6,255,2,2,12,1,12,1,
-    10,255,4,4,8,252,2,128,14,0,4,4,2,128,12,254,
-    6,1,2,128,2,255,115,50,0,0,0,4,2,2,3,8,
-    254,6,2,2,1,2,1,2,255,20,1,2,255,2,6,8,
-    253,2,1,2,255,22,1,4,3,8,253,2,128,14,0,4,
-    3,2,128,2,255,2,255,14,1,2,128,2,0,115,140,0,
-    0,0,12,15,12,27,9,44,28,31,28,50,13,25,13,25,
-    28,31,28,44,13,25,15,27,15,78,44,52,47,54,57,60,
-    57,73,74,76,75,76,74,76,57,77,47,77,15,78,15,78,
-    9,12,9,24,18,21,18,41,37,40,18,41,13,55,45,49,
-    28,34,28,45,46,50,52,54,28,55,17,25,13,55,13,55,
-    13,55,13,55,13,55,16,24,9,24,13,55,13,55,13,55,
-    13,55,0,0,13,55,13,55,13,55,13,55,13,55,13,55,
-    13,55,16,24,9,24,0,0,9,24,16,23,9,24,9,24,
-    9,24,9,24,20,24,20,24,20,24,0,0,9,24,115,39,
-    0,0,0,153,5,58,0,158,7,44,3,165,5,58,0,172,
-    4,48,11,176,1,58,0,177,3,48,11,180,3,58,0,186,
-    7,65,4,7,193,5,1,65,4,7,78,99,4,0,0,0,
-    0,0,0,0,0,0,0,0,8,0,0,0,3,0,0,0,
-    115,122,0,0,0,124,0,160,0,124,1,161,1,125,4,124,
-    4,100,0,117,0,114,11,100,0,83,0,9,0,116,1,124,
-    4,131,1,1,0,110,11,35,0,4,0,116,2,121,60,1,
-    0,1,0,1,0,89,0,100,0,83,0,37,0,116,3,131,
-    0,68,0,93,26,92,2,125,5,125,6,124,4,160,4,116,
-    5,124,6,131,1,161,1,114,57,116,6,160,7,124,1,124,
-    5,124,1,124,4,131,2,124,4,100,1,166,3,125,7,124,
-    7,2,0,1,0,83,0,113,31,100,0,83,0,119,0,41,
-    2,78,114,210,0,0,0,41,8,114,229,0,0,0,114,78,
-    0,0,0,114,80,0,0,0,114,214,0,0,0,114,60,0,
-    0,0,114,140,0,0,0,114,162,0,0,0,218,16,115,112,
-    101,99,95,102,114,111,109,95,108,111,97,100,101,114,41,8,
-    114,227,0,0,0,114,166,0,0,0,114,67,0,0,0,218,
-    6,116,97,114,103,101,116,114,228,0,0,0,114,167,0,0,
-    0,114,218,0,0,0,114,216,0,0,0,115,8,0,0,0,
-    32,32,32,32,32,32,32,32,114,7,0,0,0,218,9,102,
-    105,110,100,95,115,112,101,99,122,31,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,115,112,101,99,71,3,0,0,115,38,0,
-    0,0,10,2,8,1,4,1,2,1,10,1,2,128,12,1,
-    6,1,2,128,14,1,14,1,6,1,8,1,2,1,6,254,
-    8,3,2,252,4,255,2,254,115,46,0,0,0,10,2,6,
-    1,6,1,2,4,10,254,2,128,2,2,2,255,14,1,2,
-    128,4,1,4,5,6,251,12,1,2,4,2,253,2,2,2,
-    254,8,1,6,1,2,254,14,3,2,250,115,122,0,0,0,
-    20,23,20,50,41,49,20,50,9,17,12,20,24,28,12,28,
-    9,24,20,24,20,24,9,24,13,23,24,32,13,33,13,33,
-    13,33,0,0,9,24,16,23,9,24,9,24,9,24,9,24,
-    20,24,20,24,20,24,0,0,33,60,33,62,9,28,9,28,
-    13,29,13,19,21,29,16,24,16,50,34,39,40,48,34,49,
-    16,50,13,28,24,34,24,68,52,60,52,58,59,67,69,77,
-    52,78,59,67,24,68,24,68,17,21,24,28,17,28,17,28,
-    17,28,13,28,9,28,9,28,9,24,115,12,0,0,0,140,
-    4,17,0,145,7,27,7,188,1,27,7,99,3,0,0,0,
-    0,0,0,0,0,0,0,0,4,0,0,0,3,0,0,0,
-    115,42,0,0,0,116,0,106,1,100,1,116,2,131,2,1,
-    0,124,0,160,3,124,1,124,2,161,2,125,3,124,3,100,
-    2,117,1,114,19,124,3,106,4,83,0,100,2,83,0,41,
-    3,122,106,70,105,110,100,32,109,111,100,117,108,101,32,110,
-    97,109,101,100,32,105,110,32,116,104,101,32,114,101,103,105,
-    115,116,114,121,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,122,112,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,
-    40,41,32,105,115,32,100,101,112,114,101,99,97,116,101,100,
-    32,97,110,100,32,115,108,97,116,101,100,32,102,111,114,32,
-    114,101,109,111,118,97,108,32,105,110,32,80,121,116,104,111,
-    110,32,51,46,49,50,59,32,117,115,101,32,102,105,110,100,
-    95,115,112,101,99,40,41,32,105,110,115,116,101,97,100,78,
-    169,5,114,103,0,0,0,114,104,0,0,0,114,105,0,0,
-    0,114,232,0,0,0,114,167,0,0,0,169,4,114,227,0,
-    0,0,114,166,0,0,0,114,67,0,0,0,114,216,0,0,
-    0,115,4,0,0,0,32,32,32,32,114,7,0,0,0,218,
-    11,102,105,110,100,95,109,111,100,117,108,101,122,33,87,105,
+    13,21,13,21,13,21,17,21,17,21,13,21,0,0,9,21,
+    20,23,20,30,31,39,20,40,9,17,16,27,28,36,16,37,
+    9,21,13,21,28,38,39,42,39,49,39,51,53,61,28,62,
+    17,25,17,25,0,0,13,21,20,27,13,21,13,21,13,21,
+    13,21,17,21,17,21,13,21,0,0,12,22,12,64,34,38,
+    40,46,55,63,12,64,12,64,5,9,26,30,5,9,5,23,
+    8,14,18,22,8,22,5,24,39,66,39,68,9,24,9,24,
+    13,35,13,25,27,35,16,24,16,50,34,39,40,48,34,49,
+    16,50,13,22,26,38,39,43,45,53,26,54,17,23,31,37,
+    17,21,17,28,17,22,17,22,13,22,20,24,20,24,8,34,
+    38,47,8,47,5,69,12,19,20,26,28,40,12,41,9,57,
+    13,57,30,36,30,53,48,52,30,53,17,27,17,27,0,0,
+    13,21,20,31,13,21,13,21,13,21,13,21,17,21,17,21,
+    13,21,0,0,20,30,17,57,55,57,21,25,21,52,0,0,
+    43,69,9,13,9,40,8,12,8,39,43,45,8,45,5,60,
+    12,20,9,60,23,34,35,43,23,44,45,46,23,47,13,20,
+    13,17,13,44,13,60,52,59,13,60,13,60,12,16,5,16,
+    115,42,0,0,0,140,5,18,0,146,7,28,7,155,1,28,
+    7,168,7,48,0,176,7,58,7,185,1,58,7,193,47,5,
+    65,53,0,193,53,7,65,63,7,193,62,1,65,63,7,99,
+    0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,
+    0,0,0,0,115,80,0,0,0,101,0,90,1,100,0,90,
+    2,100,1,90,3,100,2,90,4,100,3,90,5,101,6,111,
+    15,100,4,101,7,118,0,90,8,101,9,100,5,132,0,131,
+    1,90,10,101,11,100,6,132,0,131,1,90,12,101,11,100,
+    10,100,8,132,1,131,1,90,13,101,11,100,11,100,9,132,
+    1,131,1,90,14,100,7,83,0,41,12,218,21,87,105,110,
+    100,111,119,115,82,101,103,105,115,116,114,121,70,105,110,100,
+    101,114,122,62,77,101,116,97,32,112,97,116,104,32,102,105,
+    110,100,101,114,32,102,111,114,32,109,111,100,117,108,101,115,
+    32,100,101,99,108,97,114,101,100,32,105,110,32,116,104,101,
+    32,87,105,110,100,111,119,115,32,114,101,103,105,115,116,114,
+    121,46,122,59,83,111,102,116,119,97,114,101,92,80,121,116,
+    104,111,110,92,80,121,116,104,111,110,67,111,114,101,92,123,
+    115,121,115,95,118,101,114,115,105,111,110,125,92,77,111,100,
+    117,108,101,115,92,123,102,117,108,108,110,97,109,101,125,122,
+    65,83,111,102,116,119,97,114,101,92,80,121,116,104,111,110,
+    92,80,121,116,104,111,110,67,111,114,101,92,123,115,121,115,
+    95,118,101,114,115,105,111,110,125,92,77,111,100,117,108,101,
+    115,92,123,102,117,108,108,110,97,109,101,125,92,68,101,98,
+    117,103,122,6,95,100,46,112,121,100,99,1,0,0,0,0,
+    0,0,0,0,0,0,0,8,0,0,0,3,0,0,0,115,
+    52,0,0,0,9,0,116,0,106,1,116,0,106,2,124,0,
+    131,2,83,0,35,0,4,0,116,3,121,24,1,0,1,0,
+    1,0,116,0,106,1,116,0,106,4,124,0,131,2,6,0,
+    89,0,83,0,119,0,37,0,114,71,0,0,0,41,5,218,
+    6,119,105,110,114,101,103,90,7,79,112,101,110,75,101,121,
+    90,17,72,75,69,89,95,67,85,82,82,69,78,84,95,85,
+    83,69,82,114,80,0,0,0,90,18,72,75,69,89,95,76,
+    79,67,65,76,95,77,65,67,72,73,78,69,114,22,0,0,
+    0,115,1,0,0,0,32,114,7,0,0,0,218,14,95,111,
+    112,101,110,95,114,101,103,105,115,116,114,121,122,36,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,87,
-    3,0,0,115,14,0,0,0,6,7,2,2,4,254,12,3,
-    8,1,6,1,4,2,115,16,0,0,0,4,7,2,1,6,
-    1,12,1,6,1,2,3,6,254,4,2,115,42,0,0,0,
-    9,18,9,23,24,84,24,42,9,43,9,43,16,19,16,45,
-    30,38,40,44,16,45,9,13,12,16,24,28,12,28,9,24,
-    20,24,20,31,13,31,20,24,20,24,114,10,0,0,0,169,
-    2,78,78,114,71,0,0,0,41,15,114,153,0,0,0,114,
-    152,0,0,0,114,154,0,0,0,114,155,0,0,0,114,225,
-    0,0,0,114,224,0,0,0,218,11,95,77,83,95,87,73,
-    78,68,79,87,83,218,18,69,88,84,69,78,83,73,79,78,
-    95,83,85,70,70,73,88,69,83,114,223,0,0,0,218,12,
-    115,116,97,116,105,99,109,101,116,104,111,100,114,222,0,0,
-    0,218,11,99,108,97,115,115,109,101,116,104,111,100,114,229,
-    0,0,0,114,232,0,0,0,114,235,0,0,0,114,13,0,
-    0,0,114,10,0,0,0,114,7,0,0,0,114,220,0,0,
-    0,114,220,0,0,0,37,3,0,0,115,30,0,0,0,8,
-    0,4,2,2,3,2,255,2,4,2,255,12,3,2,2,8,
-    1,2,6,8,1,2,14,10,1,2,15,14,1,115,84,0,
-    0,0,0,129,0,129,0,129,0,129,0,129,0,129,8,213,
-    0,127,0,127,0,127,0,127,0,127,0,127,2,45,0,129,
-    0,129,0,129,0,129,0,129,0,129,2,211,0,127,0,127,
-    0,127,0,127,0,127,0,127,2,49,2,254,2,5,2,254,
-    12,3,2,2,8,5,2,2,8,13,2,2,2,1,8,13,
-    2,2,2,1,12,13,115,80,0,0,0,1,1,1,1,1,
-    1,1,1,5,73,1,1,9,32,5,17,9,39,5,23,20,
-    31,20,66,36,44,48,66,36,66,5,16,6,18,5,66,5,
-    66,5,66,5,66,6,17,5,24,5,24,5,24,5,24,6,
-    17,39,43,5,28,5,28,5,28,5,28,6,17,41,45,5,
-    24,5,24,5,24,5,24,5,24,5,24,114,10,0,0,0,
-    114,220,0,0,0,99,0,0,0,0,0,0,0,0,0,0,
-    0,0,1,0,0,0,0,0,0,0,115,40,0,0,0,101,
-    0,90,1,100,0,90,2,100,1,90,3,100,2,132,0,90,
-    4,100,3,132,0,90,5,100,4,132,0,90,6,100,5,132,
-    0,90,7,100,6,83,0,41,7,218,13,95,76,111,97,100,
-    101,114,66,97,115,105,99,115,122,83,66,97,115,101,32,99,
-    108,97,115,115,32,111,102,32,99,111,109,109,111,110,32,99,
-    111,100,101,32,110,101,101,100,101,100,32,98,121,32,98,111,
-    116,104,32,83,111,117,114,99,101,76,111,97,100,101,114,32,
-    97,110,100,10,32,32,32,32,83,111,117,114,99,101,108,101,
-    115,115,70,105,108,101,76,111,97,100,101,114,46,99,2,0,
-    0,0,0,0,0,0,0,0,0,0,4,0,0,0,3,0,
-    0,0,115,64,0,0,0,116,0,124,0,160,1,124,1,161,
-    1,131,1,100,1,25,0,125,2,124,2,160,2,100,2,100,
-    1,161,2,100,3,25,0,125,3,124,1,160,3,100,2,161,
-    1,100,4,25,0,125,4,124,3,100,5,107,2,111,31,124,
-    4,100,5,107,3,83,0,41,7,122,141,67,111,110,99,114,
-    101,116,101,32,105,109,112,108,101,109,101,110,116,97,116,105,
-    111,110,32,111,102,32,73,110,115,112,101,99,116,76,111,97,
-    100,101,114,46,105,115,95,112,97,99,107,97,103,101,32,98,
-    121,32,99,104,101,99,107,105,110,103,32,105,102,10,32,32,
-    32,32,32,32,32,32,116,104,101,32,112,97,116,104,32,114,
-    101,116,117,114,110,101,100,32,98,121,32,103,101,116,95,102,
-    105,108,101,110,97,109,101,32,104,97,115,32,97,32,102,105,
-    108,101,110,97,109,101,32,111,102,32,39,95,95,105,110,105,
-    116,95,95,46,112,121,39,46,114,3,0,0,0,114,101,0,
-    0,0,114,0,0,0,0,114,47,0,0,0,218,8,95,95,
-    105,110,105,116,95,95,78,41,4,114,76,0,0,0,114,209,
-    0,0,0,114,129,0,0,0,114,108,0,0,0,41,5,114,
-    147,0,0,0,114,166,0,0,0,114,124,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,115,5,0,0,0,32,32,32,
-    32,32,114,7,0,0,0,114,212,0,0,0,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,109,3,0,0,243,8,0,0,0,18,
-    3,16,1,14,1,16,1,114,243,0,0,0,115,64,0,0,
-    0,20,31,32,36,32,59,50,58,32,59,20,60,61,62,20,
-    63,9,17,25,33,25,48,41,44,46,47,25,48,49,50,25,
-    51,9,22,21,29,21,45,41,44,21,45,46,47,21,48,9,
-    18,16,29,33,43,16,43,16,71,48,57,61,71,48,71,9,
-    71,114,10,0,0,0,99,2,0,0,0,0,0,0,0,0,
-    0,0,0,1,0,0,0,3,0,0,0,114,26,0,0,0,
-    169,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,
-    13,0,0,0,169,2,114,147,0,0,0,114,216,0,0,0,
-    115,2,0,0,0,32,32,114,7,0,0,0,218,13,99,114,
-    101,97,116,101,95,109,111,100,117,108,101,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,117,3,0,0,243,2,0,0,
-    0,4,0,243,2,0,0,0,4,128,115,4,0,0,0,0,
-    0,0,0,114,10,0,0,0,99,2,0,0,0,0,0,0,
-    0,0,0,0,0,5,0,0,0,3,0,0,0,115,56,0,
-    0,0,124,0,160,0,124,1,106,1,161,1,125,2,124,2,
-    100,1,117,0,114,18,116,2,100,2,160,3,124,1,106,1,
-    161,1,131,1,130,1,116,4,160,5,116,6,124,2,124,1,
-    106,7,161,3,1,0,100,1,83,0,41,3,122,19,69,120,
-    101,99,117,116,101,32,116,104,101,32,109,111,100,117,108,101,
-    46,78,122,52,99,97,110,110,111,116,32,108,111,97,100,32,
-    109,111,100,117,108,101,32,123,33,114,125,32,119,104,101,110,
-    32,103,101,116,95,99,111,100,101,40,41,32,114,101,116,117,
-    114,110,115,32,78,111,110,101,41,8,218,8,103,101,116,95,
-    99,111,100,101,114,153,0,0,0,114,146,0,0,0,114,93,
-    0,0,0,114,162,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,218,4,101,120,101,99,114,159,0,0,0,41,3,
-    114,147,0,0,0,218,6,109,111,100,117,108,101,114,191,0,
-    0,0,115,3,0,0,0,32,32,32,114,7,0,0,0,218,
-    11,101,120,101,99,95,109,111,100,117,108,101,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,120,3,0,0,115,12,0,0,0,
-    12,2,8,1,4,1,8,1,4,255,20,2,115,12,0,0,
-    0,12,2,6,1,2,2,2,255,14,1,20,1,115,56,0,
-    0,0,16,20,16,46,30,36,30,45,16,46,9,13,12,16,
-    20,24,12,24,9,70,19,30,31,45,31,69,53,59,53,68,
-    31,69,19,70,13,70,9,19,9,74,46,50,52,56,58,64,
-    58,73,9,74,9,74,9,74,9,74,114,10,0,0,0,99,
-    2,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,
-    3,0,0,0,115,12,0,0,0,116,0,160,1,124,0,124,
-    1,161,2,83,0,41,2,122,26,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,78,41,2,114,162,0,0,0,218,17,95,108,111,
-    97,100,95,109,111,100,117,108,101,95,115,104,105,109,169,2,
-    114,147,0,0,0,114,166,0,0,0,115,2,0,0,0,32,
-    32,114,7,0,0,0,218,11,108,111,97,100,95,109,111,100,
-    117,108,101,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,128,3,
-    0,0,243,2,0,0,0,12,3,114,1,1,0,0,115,12,
-    0,0,0,16,26,16,60,45,49,51,59,16,60,9,60,114,
-    10,0,0,0,78,41,8,114,153,0,0,0,114,152,0,0,
-    0,114,154,0,0,0,114,155,0,0,0,114,212,0,0,0,
-    114,246,0,0,0,114,253,0,0,0,114,0,1,0,0,114,
-    13,0,0,0,114,10,0,0,0,114,7,0,0,0,114,241,
-    0,0,0,114,241,0,0,0,104,3,0,0,115,12,0,0,
-    0,8,0,4,2,6,3,6,8,6,3,10,8,115,62,0,
-    0,0,0,129,0,129,0,129,0,129,0,129,0,129,8,146,
-    0,127,0,127,0,127,0,127,0,127,0,127,2,113,0,129,
-    0,129,0,129,0,129,0,129,0,129,2,143,0,127,0,127,
-    0,127,0,127,0,127,0,127,6,121,6,3,6,8,10,5,
-    115,40,0,0,0,1,1,1,1,1,1,1,1,5,29,1,
-    1,5,71,5,71,5,71,5,57,5,57,5,57,5,74,5,
-    74,5,74,5,60,5,60,5,60,5,60,5,60,114,10,0,
-    0,0,114,241,0,0,0,99,0,0,0,0,0,0,0,0,
-    0,0,0,0,2,0,0,0,0,0,0,0,115,60,0,0,
-    0,101,0,90,1,100,0,90,2,100,1,132,0,90,3,100,
-    2,132,0,90,4,100,3,132,0,90,5,100,4,132,0,90,
-    6,100,5,132,0,90,7,100,6,100,7,156,1,100,8,132,
-    2,90,8,100,9,132,0,90,9,100,10,83,0,41,11,218,
-    12,83,111,117,114,99,101,76,111,97,100,101,114,99,2,0,
-    0,0,0,0,0,0,0,0,0,0,1,0,0,0,3,0,
-    0,0,115,4,0,0,0,116,0,130,1,41,2,122,165,79,
-    112,116,105,111,110,97,108,32,109,101,116,104,111,100,32,116,
-    104,97,116,32,114,101,116,117,114,110,115,32,116,104,101,32,
-    109,111,100,105,102,105,99,97,116,105,111,110,32,116,105,109,
-    101,32,40,97,110,32,105,110,116,41,32,102,111,114,32,116,
-    104,101,10,32,32,32,32,32,32,32,32,115,112,101,99,105,
-    102,105,101,100,32,112,97,116,104,32,40,97,32,115,116,114,
-    41,46,10,10,32,32,32,32,32,32,32,32,82,97,105,115,
-    101,115,32,79,83,69,114,114,111,114,32,119,104,101,110,32,
-    116,104,101,32,112,97,116,104,32,99,97,110,110,111,116,32,
-    98,101,32,104,97,110,100,108,101,100,46,10,32,32,32,32,
-    32,32,32,32,78,41,1,114,80,0,0,0,169,2,114,147,
-    0,0,0,114,67,0,0,0,115,2,0,0,0,32,32,114,
-    7,0,0,0,218,10,112,97,116,104,95,109,116,105,109,101,
-    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,136,3,0,0,243,2,0,
-    0,0,4,6,114,5,1,0,0,115,4,0,0,0,15,22,
-    9,22,114,10,0,0,0,99,2,0,0,0,0,0,0,0,
-    0,0,0,0,4,0,0,0,3,0,0,0,115,14,0,0,
-    0,100,1,124,0,160,0,124,1,161,1,105,1,83,0,41,
-    3,97,158,1,0,0,79,112,116,105,111,110,97,108,32,109,
-    101,116,104,111,100,32,114,101,116,117,114,110,105,110,103,32,
-    97,32,109,101,116,97,100,97,116,97,32,100,105,99,116,32,
-    102,111,114,32,116,104,101,32,115,112,101,99,105,102,105,101,
-    100,10,32,32,32,32,32,32,32,32,112,97,116,104,32,40,
-    97,32,115,116,114,41,46,10,10,32,32,32,32,32,32,32,
-    32,80,111,115,115,105,98,108,101,32,107,101,121,115,58,10,
-    32,32,32,32,32,32,32,32,45,32,39,109,116,105,109,101,
-    39,32,40,109,97,110,100,97,116,111,114,121,41,32,105,115,
-    32,116,104,101,32,110,117,109,101,114,105,99,32,116,105,109,
-    101,115,116,97,109,112,32,111,102,32,108,97,115,116,32,115,
-    111,117,114,99,101,10,32,32,32,32,32,32,32,32,32,32,
-    99,111,100,101,32,109,111,100,105,102,105,99,97,116,105,111,
-    110,59,10,32,32,32,32,32,32,32,32,45,32,39,115,105,
-    122,101,39,32,40,111,112,116,105,111,110,97,108,41,32,105,
-    115,32,116,104,101,32,115,105,122,101,32,105,110,32,98,121,
-    116,101,115,32,111,102,32,116,104,101,32,115,111,117,114,99,
-    101,32,99,111,100,101,46,10,10,32,32,32,32,32,32,32,
-    32,73,109,112,108,101,109,101,110,116,105,110,103,32,116,104,
-    105,115,32,109,101,116,104,111,100,32,97,108,108,111,119,115,
-    32,116,104,101,32,108,111,97,100,101,114,32,116,111,32,114,
-    101,97,100,32,98,121,116,101,99,111,100,101,32,102,105,108,
-    101,115,46,10,32,32,32,32,32,32,32,32,82,97,105,115,
-    101,115,32,79,83,69,114,114,111,114,32,119,104,101,110,32,
-    116,104,101,32,112,97,116,104,32,99,97,110,110,111,116,32,
-    98,101,32,104,97,110,100,108,101,100,46,10,32,32,32,32,
-    32,32,32,32,114,196,0,0,0,78,41,1,114,4,1,0,
-    0,114,3,1,0,0,115,2,0,0,0,32,32,114,7,0,
-    0,0,218,10,112,97,116,104,95,115,116,97,116,115,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,144,3,0,0,243,2,0,0,0,
-    14,12,114,7,1,0,0,115,14,0,0,0,17,24,26,30,
-    26,47,42,46,26,47,16,48,9,48,114,10,0,0,0,99,
-    4,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,
-    3,0,0,0,115,12,0,0,0,124,0,160,0,124,2,124,
-    3,161,2,83,0,41,2,122,228,79,112,116,105,111,110,97,
-    108,32,109,101,116,104,111,100,32,119,104,105,99,104,32,119,
-    114,105,116,101,115,32,100,97,116,97,32,40,98,121,116,101,
-    115,41,32,116,111,32,97,32,102,105,108,101,32,112,97,116,
+    100,101,114,46,95,111,112,101,110,95,114,101,103,105,115,116,
+    114,121,49,3,0,0,115,14,0,0,0,2,2,14,1,2,
+    128,12,1,18,1,2,255,2,128,115,14,0,0,0,2,5,
+    14,254,2,128,2,2,2,255,28,1,2,128,115,52,0,0,
+    0,9,66,20,26,20,34,35,41,35,59,61,64,20,65,13,
+    65,0,0,9,66,16,23,9,66,9,66,9,66,9,66,20,
+    26,20,34,35,41,35,60,62,65,20,66,13,66,13,66,13,
+    66,9,66,0,0,115,12,0,0,0,129,6,8,0,136,14,
+    25,7,152,1,25,7,99,2,0,0,0,0,0,0,0,0,
+    0,0,0,9,0,0,0,3,0,0,0,115,140,0,0,0,
+    124,0,106,0,114,7,124,0,106,1,125,2,110,3,124,0,
+    106,2,125,2,124,2,160,3,124,1,100,1,116,4,106,5,
+    100,0,100,2,133,2,25,0,22,0,100,3,166,2,125,3,
+    9,0,124,0,160,6,124,3,161,1,53,0,125,4,116,7,
+    106,8,124,4,100,4,131,2,125,5,100,0,4,0,4,0,
+    131,3,1,0,124,5,83,0,35,0,49,0,115,49,119,4,
+    37,0,1,0,1,0,1,0,89,0,1,0,1,0,9,0,
+    124,5,83,0,35,0,4,0,116,9,121,68,1,0,1,0,
+    1,0,89,0,100,0,83,0,119,0,37,0,41,5,78,122,
+    5,37,100,46,37,100,114,47,0,0,0,41,2,114,166,0,
+    0,0,90,11,115,121,115,95,118,101,114,115,105,111,110,114,
+    11,0,0,0,41,10,218,11,68,69,66,85,71,95,66,85,
+    73,76,68,218,18,82,69,71,73,83,84,82,89,95,75,69,
+    89,95,68,69,66,85,71,218,12,82,69,71,73,83,84,82,
+    89,95,75,69,89,114,93,0,0,0,114,18,0,0,0,218,
+    12,118,101,114,115,105,111,110,95,105,110,102,111,114,222,0,
+    0,0,114,221,0,0,0,90,10,81,117,101,114,121,86,97,
+    108,117,101,114,80,0,0,0,41,6,218,3,99,108,115,114,
+    166,0,0,0,90,12,114,101,103,105,115,116,114,121,95,107,
+    101,121,114,23,0,0,0,90,4,104,107,101,121,218,8,102,
+    105,108,101,112,97,116,104,115,6,0,0,0,32,32,32,32,
+    32,32,114,7,0,0,0,218,16,95,115,101,97,114,99,104,
+    95,114,101,103,105,115,116,114,121,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,114,99,104,95,114,101,103,105,115,116,114,
+    121,56,3,0,0,115,40,0,0,0,6,2,8,1,6,2,
+    6,1,16,1,6,255,2,2,12,1,12,1,10,255,4,4,
+    8,252,2,128,14,0,4,4,2,128,12,254,6,1,2,255,
+    2,128,115,48,0,0,0,4,2,2,3,8,254,6,2,2,
+    1,2,1,2,255,20,1,2,255,2,6,8,253,2,1,2,
+    255,22,1,4,3,8,253,2,128,14,0,4,3,2,128,2,
+    255,2,255,16,1,2,128,115,140,0,0,0,12,15,12,27,
+    9,44,28,31,28,50,13,25,13,25,28,31,28,44,13,25,
+    15,27,15,78,44,52,47,54,57,60,57,73,74,76,75,76,
+    74,76,57,77,47,77,15,78,15,78,9,12,9,24,18,21,
+    18,41,37,40,18,41,13,55,45,49,28,34,28,45,46,50,
+    52,54,28,55,17,25,13,55,13,55,13,55,13,55,13,55,
+    16,24,9,24,13,55,13,55,13,55,13,55,0,0,13,55,
+    13,55,13,55,13,55,13,55,13,55,13,55,16,24,9,24,
+    0,0,9,24,16,23,9,24,9,24,9,24,9,24,20,24,
+    20,24,20,24,9,24,0,0,115,39,0,0,0,153,5,58,
+    0,158,7,44,3,165,5,58,0,172,4,48,11,176,1,58,
+    0,177,3,48,11,180,3,58,0,186,7,65,5,7,193,4,
+    1,65,5,7,78,99,4,0,0,0,0,0,0,0,0,0,
+    0,0,8,0,0,0,3,0,0,0,115,122,0,0,0,124,
+    0,160,0,124,1,161,1,125,4,124,4,100,0,117,0,114,
+    11,100,0,83,0,9,0,116,1,124,4,131,1,1,0,110,
+    12,35,0,4,0,116,2,121,27,1,0,1,0,1,0,89,
+    0,100,0,83,0,119,0,37,0,116,3,131,0,68,0,93,
+    26,92,2,125,5,125,6,124,4,160,4,116,5,124,6,131,
+    1,161,1,114,58,116,6,160,7,124,1,124,5,124,1,124,
+    4,131,2,124,4,100,1,166,3,125,7,124,7,2,0,1,
+    0,83,0,113,32,100,0,83,0,41,2,78,114,210,0,0,
+    0,41,8,114,229,0,0,0,114,78,0,0,0,114,80,0,
+    0,0,114,214,0,0,0,114,60,0,0,0,114,140,0,0,
+    0,114,162,0,0,0,218,16,115,112,101,99,95,102,114,111,
+    109,95,108,111,97,100,101,114,41,8,114,227,0,0,0,114,
+    166,0,0,0,114,67,0,0,0,218,6,116,97,114,103,101,
+    116,114,228,0,0,0,114,167,0,0,0,114,218,0,0,0,
+    114,216,0,0,0,115,8,0,0,0,32,32,32,32,32,32,
+    32,32,114,7,0,0,0,218,9,102,105,110,100,95,115,112,
+    101,99,122,31,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,115,
+    112,101,99,71,3,0,0,115,38,0,0,0,10,2,8,1,
+    4,1,2,1,10,1,2,128,12,1,6,1,2,255,2,128,
+    14,2,14,1,6,1,8,1,2,1,6,254,8,3,2,252,
+    4,255,115,44,0,0,0,10,2,6,1,6,1,2,4,10,
+    254,2,128,2,2,2,255,16,1,2,128,4,1,4,5,6,
+    251,12,1,2,4,2,253,2,2,2,254,8,1,6,1,2,
+    254,14,3,115,122,0,0,0,20,23,20,50,41,49,20,50,
+    9,17,12,20,24,28,12,28,9,24,20,24,20,24,9,24,
+    13,23,24,32,13,33,13,33,13,33,0,0,9,24,16,23,
+    9,24,9,24,9,24,9,24,20,24,20,24,20,24,9,24,
+    0,0,33,60,33,62,9,28,9,28,13,29,13,19,21,29,
+    16,24,16,50,34,39,40,48,34,49,16,50,13,28,24,34,
+    24,68,52,60,52,58,59,67,69,77,52,78,59,67,24,68,
+    24,68,17,21,24,28,17,28,17,28,17,28,13,28,9,28,
+    9,28,115,12,0,0,0,140,4,17,0,145,7,28,7,155,
+    1,28,7,99,3,0,0,0,0,0,0,0,0,0,0,0,
+    4,0,0,0,3,0,0,0,115,42,0,0,0,116,0,106,
+    1,100,1,116,2,131,2,1,0,124,0,160,3,124,1,124,
+    2,161,2,125,3,124,3,100,2,117,1,114,19,124,3,106,
+    4,83,0,100,2,83,0,41,3,122,106,70,105,110,100,32,
+    109,111,100,117,108,101,32,110,97,109,101,100,32,105,110,32,
+    116,104,101,32,114,101,103,105,115,116,114,121,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,122,112,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,40,41,32,105,115,32,100,101,
+    112,114,101,99,97,116,101,100,32,97,110,100,32,115,108,97,
+    116,101,100,32,102,111,114,32,114,101,109,111,118,97,108,32,
+    105,110,32,80,121,116,104,111,110,32,51,46,49,50,59,32,
+    117,115,101,32,102,105,110,100,95,115,112,101,99,40,41,32,
+    105,110,115,116,101,97,100,78,169,5,114,103,0,0,0,114,
+    104,0,0,0,114,105,0,0,0,114,232,0,0,0,114,167,
+    0,0,0,169,4,114,227,0,0,0,114,166,0,0,0,114,
+    67,0,0,0,114,216,0,0,0,115,4,0,0,0,32,32,
+    32,32,114,7,0,0,0,218,11,102,105,110,100,95,109,111,
+    100,117,108,101,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,87,3,0,0,115,14,0,0,0,
+    6,7,2,2,4,254,12,3,8,1,6,1,4,2,115,16,
+    0,0,0,4,7,2,1,6,1,12,1,6,1,2,3,6,
+    254,4,2,115,42,0,0,0,9,18,9,23,24,84,24,42,
+    9,43,9,43,16,19,16,45,30,38,40,44,16,45,9,13,
+    12,16,24,28,12,28,9,24,20,24,20,31,13,31,20,24,
+    20,24,114,10,0,0,0,169,2,78,78,114,71,0,0,0,
+    41,15,114,153,0,0,0,114,152,0,0,0,114,154,0,0,
+    0,114,155,0,0,0,114,225,0,0,0,114,224,0,0,0,
+    218,11,95,77,83,95,87,73,78,68,79,87,83,218,18,69,
+    88,84,69,78,83,73,79,78,95,83,85,70,70,73,88,69,
+    83,114,223,0,0,0,218,12,115,116,97,116,105,99,109,101,
+    116,104,111,100,114,222,0,0,0,218,11,99,108,97,115,115,
+    109,101,116,104,111,100,114,229,0,0,0,114,232,0,0,0,
+    114,235,0,0,0,114,13,0,0,0,114,10,0,0,0,114,
+    7,0,0,0,114,220,0,0,0,114,220,0,0,0,37,3,
+    0,0,115,30,0,0,0,8,0,4,2,2,3,2,255,2,
+    4,2,255,12,3,2,2,8,1,2,6,8,1,2,14,10,
+    1,2,15,14,1,115,84,0,0,0,0,129,0,129,0,129,
+    0,129,0,129,0,129,8,213,0,127,0,127,0,127,0,127,
+    0,127,0,127,2,45,0,129,0,129,0,129,0,129,0,129,
+    0,129,2,211,0,127,0,127,0,127,0,127,0,127,0,127,
+    2,49,2,254,2,5,2,254,12,3,2,2,8,5,2,2,
+    8,13,2,2,2,1,8,13,2,2,2,1,12,13,115,80,
+    0,0,0,1,1,1,1,1,1,1,1,5,73,1,1,9,
+    32,5,17,9,39,5,23,20,31,20,66,36,44,48,66,36,
+    66,5,16,6,18,5,66,5,66,5,66,5,66,6,17,5,
+    24,5,24,5,24,5,24,6,17,39,43,5,28,5,28,5,
+    28,5,28,6,17,41,45,5,24,5,24,5,24,5,24,5,
+    24,5,24,114,10,0,0,0,114,220,0,0,0,99,0,0,
+    0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,
+    0,0,115,40,0,0,0,101,0,90,1,100,0,90,2,100,
+    1,90,3,100,2,132,0,90,4,100,3,132,0,90,5,100,
+    4,132,0,90,6,100,5,132,0,90,7,100,6,83,0,41,
+    7,218,13,95,76,111,97,100,101,114,66,97,115,105,99,115,
+    122,83,66,97,115,101,32,99,108,97,115,115,32,111,102,32,
+    99,111,109,109,111,110,32,99,111,100,101,32,110,101,101,100,
+    101,100,32,98,121,32,98,111,116,104,32,83,111,117,114,99,
+    101,76,111,97,100,101,114,32,97,110,100,10,32,32,32,32,
+    83,111,117,114,99,101,108,101,115,115,70,105,108,101,76,111,
+    97,100,101,114,46,99,2,0,0,0,0,0,0,0,0,0,
+    0,0,4,0,0,0,3,0,0,0,115,64,0,0,0,116,
+    0,124,0,160,1,124,1,161,1,131,1,100,1,25,0,125,
+    2,124,2,160,2,100,2,100,1,161,2,100,3,25,0,125,
+    3,124,1,160,3,100,2,161,1,100,4,25,0,125,4,124,
+    3,100,5,107,2,111,31,124,4,100,5,107,3,83,0,41,
+    7,122,141,67,111,110,99,114,101,116,101,32,105,109,112,108,
+    101,109,101,110,116,97,116,105,111,110,32,111,102,32,73,110,
+    115,112,101,99,116,76,111,97,100,101,114,46,105,115,95,112,
+    97,99,107,97,103,101,32,98,121,32,99,104,101,99,107,105,
+    110,103,32,105,102,10,32,32,32,32,32,32,32,32,116,104,
+    101,32,112,97,116,104,32,114,101,116,117,114,110,101,100,32,
+    98,121,32,103,101,116,95,102,105,108,101,110,97,109,101,32,
+    104,97,115,32,97,32,102,105,108,101,110,97,109,101,32,111,
+    102,32,39,95,95,105,110,105,116,95,95,46,112,121,39,46,
+    114,3,0,0,0,114,101,0,0,0,114,0,0,0,0,114,
+    47,0,0,0,218,8,95,95,105,110,105,116,95,95,78,41,
+    4,114,76,0,0,0,114,209,0,0,0,114,129,0,0,0,
+    114,108,0,0,0,41,5,114,147,0,0,0,114,166,0,0,
+    0,114,124,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,
+    115,5,0,0,0,32,32,32,32,32,114,7,0,0,0,114,
+    212,0,0,0,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,109,3,
+    0,0,243,8,0,0,0,18,3,16,1,14,1,16,1,114,
+    243,0,0,0,115,64,0,0,0,20,31,32,36,32,59,50,
+    58,32,59,20,60,61,62,20,63,9,17,25,33,25,48,41,
+    44,46,47,25,48,49,50,25,51,9,22,21,29,21,45,41,
+    44,21,45,46,47,21,48,9,18,16,29,33,43,16,43,16,
+    71,48,57,61,71,48,71,9,71,114,10,0,0,0,99,2,
+    0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,3,
+    0,0,0,114,26,0,0,0,169,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,13,0,0,0,169,2,114,147,
+    0,0,0,114,216,0,0,0,115,2,0,0,0,32,32,114,
+    7,0,0,0,218,13,99,114,101,97,116,101,95,109,111,100,
+    117,108,101,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,
+    117,3,0,0,243,2,0,0,0,4,0,243,2,0,0,0,
+    4,128,115,4,0,0,0,0,0,0,0,114,10,0,0,0,
+    99,2,0,0,0,0,0,0,0,0,0,0,0,5,0,0,
+    0,3,0,0,0,115,56,0,0,0,124,0,160,0,124,1,
+    106,1,161,1,125,2,124,2,100,1,117,0,114,18,116,2,
+    100,2,160,3,124,1,106,1,161,1,131,1,130,1,116,4,
+    160,5,116,6,124,2,124,1,106,7,161,3,1,0,100,1,
+    83,0,41,3,122,19,69,120,101,99,117,116,101,32,116,104,
+    101,32,109,111,100,117,108,101,46,78,122,52,99,97,110,110,
+    111,116,32,108,111,97,100,32,109,111,100,117,108,101,32,123,
+    33,114,125,32,119,104,101,110,32,103,101,116,95,99,111,100,
+    101,40,41,32,114,101,116,117,114,110,115,32,78,111,110,101,
+    41,8,218,8,103,101,116,95,99,111,100,101,114,153,0,0,
+    0,114,146,0,0,0,114,93,0,0,0,114,162,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,218,4,101,120,101,
+    99,114,159,0,0,0,41,3,114,147,0,0,0,218,6,109,
+    111,100,117,108,101,114,191,0,0,0,115,3,0,0,0,32,
+    32,32,114,7,0,0,0,218,11,101,120,101,99,95,109,111,
+    100,117,108,101,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,120,
+    3,0,0,115,12,0,0,0,12,2,8,1,4,1,8,1,
+    4,255,20,2,115,12,0,0,0,12,2,6,1,2,2,2,
+    255,14,1,20,1,115,56,0,0,0,16,20,16,46,30,36,
+    30,45,16,46,9,13,12,16,20,24,12,24,9,70,19,30,
+    31,45,31,69,53,59,53,68,31,69,19,70,13,70,9,19,
+    9,74,46,50,52,56,58,64,58,73,9,74,9,74,9,74,
+    9,74,114,10,0,0,0,99,2,0,0,0,0,0,0,0,
+    0,0,0,0,4,0,0,0,3,0,0,0,115,12,0,0,
+    0,116,0,160,1,124,0,124,1,161,2,83,0,41,2,122,
+    26,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,78,41,2,114,162,
+    0,0,0,218,17,95,108,111,97,100,95,109,111,100,117,108,
+    101,95,115,104,105,109,169,2,114,147,0,0,0,114,166,0,
+    0,0,115,2,0,0,0,32,32,114,7,0,0,0,218,11,
+    108,111,97,100,95,109,111,100,117,108,101,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,128,3,0,0,243,2,0,0,0,12,
+    3,114,1,1,0,0,115,12,0,0,0,16,26,16,60,45,
+    49,51,59,16,60,9,60,114,10,0,0,0,78,41,8,114,
+    153,0,0,0,114,152,0,0,0,114,154,0,0,0,114,155,
+    0,0,0,114,212,0,0,0,114,246,0,0,0,114,253,0,
+    0,0,114,0,1,0,0,114,13,0,0,0,114,10,0,0,
+    0,114,7,0,0,0,114,241,0,0,0,114,241,0,0,0,
+    104,3,0,0,115,12,0,0,0,8,0,4,2,6,3,6,
+    8,6,3,10,8,115,62,0,0,0,0,129,0,129,0,129,
+    0,129,0,129,0,129,8,146,0,127,0,127,0,127,0,127,
+    0,127,0,127,2,113,0,129,0,129,0,129,0,129,0,129,
+    0,129,2,143,0,127,0,127,0,127,0,127,0,127,0,127,
+    6,121,6,3,6,8,10,5,115,40,0,0,0,1,1,1,
+    1,1,1,1,1,5,29,1,1,5,71,5,71,5,71,5,
+    57,5,57,5,57,5,74,5,74,5,74,5,60,5,60,5,
+    60,5,60,5,60,114,10,0,0,0,114,241,0,0,0,99,
+    0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,
+    0,0,0,0,115,60,0,0,0,101,0,90,1,100,0,90,
+    2,100,1,132,0,90,3,100,2,132,0,90,4,100,3,132,
+    0,90,5,100,4,132,0,90,6,100,5,132,0,90,7,100,
+    6,100,7,156,1,100,8,132,2,90,8,100,9,132,0,90,
+    9,100,10,83,0,41,11,218,12,83,111,117,114,99,101,76,
+    111,97,100,101,114,99,2,0,0,0,0,0,0,0,0,0,
+    0,0,1,0,0,0,3,0,0,0,115,4,0,0,0,116,
+    0,130,1,41,2,122,165,79,112,116,105,111,110,97,108,32,
+    109,101,116,104,111,100,32,116,104,97,116,32,114,101,116,117,
+    114,110,115,32,116,104,101,32,109,111,100,105,102,105,99,97,
+    116,105,111,110,32,116,105,109,101,32,40,97,110,32,105,110,
+    116,41,32,102,111,114,32,116,104,101,10,32,32,32,32,32,
+    32,32,32,115,112,101,99,105,102,105,101,100,32,112,97,116,
     104,32,40,97,32,115,116,114,41,46,10,10,32,32,32,32,
-    32,32,32,32,73,109,112,108,101,109,101,110,116,105,110,103,
-    32,116,104,105,115,32,109,101,116,104,111,100,32,97,108,108,
-    111,119,115,32,102,111,114,32,116,104,101,32,119,114,105,116,
-    105,110,103,32,111,102,32,98,121,116,101,99,111,100,101,32,
-    102,105,108,101,115,46,10,10,32,32,32,32,32,32,32,32,
-    84,104,101,32,115,111,117,114,99,101,32,112,97,116,104,32,
-    105,115,32,110,101,101,100,101,100,32,105,110,32,111,114,100,
-    101,114,32,116,111,32,99,111,114,114,101,99,116,108,121,32,
-    116,114,97,110,115,102,101,114,32,112,101,114,109,105,115,115,
-    105,111,110,115,10,32,32,32,32,32,32,32,32,78,41,1,
-    218,8,115,101,116,95,100,97,116,97,41,4,114,147,0,0,
-    0,114,138,0,0,0,90,10,99,97,99,104,101,95,112,97,
-    116,104,114,44,0,0,0,115,4,0,0,0,32,32,32,32,
-    114,7,0,0,0,218,15,95,99,97,99,104,101,95,98,121,
-    116,101,99,111,100,101,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,158,3,0,0,243,2,0,0,0,12,8,114,
-    10,1,0,0,115,12,0,0,0,16,20,16,47,30,40,42,
-    46,16,47,9,47,114,10,0,0,0,99,3,0,0,0,0,
-    0,0,0,0,0,0,0,1,0,0,0,3,0,0,0,114,
-    26,0,0,0,41,2,122,150,79,112,116,105,111,110,97,108,
-    32,109,101,116,104,111,100,32,119,104,105,99,104,32,119,114,
-    105,116,101,115,32,100,97,116,97,32,40,98,121,116,101,115,
-    41,32,116,111,32,97,32,102,105,108,101,32,112,97,116,104,
-    32,40,97,32,115,116,114,41,46,10,10,32,32,32,32,32,
-    32,32,32,73,109,112,108,101,109,101,110,116,105,110,103,32,
-    116,104,105,115,32,109,101,116,104,111,100,32,97,108,108,111,
-    119,115,32,102,111,114,32,116,104,101,32,119,114,105,116,105,
-    110,103,32,111,102,32,98,121,116,101,99,111,100,101,32,102,
-    105,108,101,115,46,10,32,32,32,32,32,32,32,32,78,114,
-    13,0,0,0,41,3,114,147,0,0,0,114,67,0,0,0,
-    114,44,0,0,0,115,3,0,0,0,32,32,32,114,7,0,
-    0,0,114,8,1,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,168,3,
-    0,0,114,247,0,0,0,114,248,0,0,0,115,4,0,0,
-    0,0,0,0,0,114,10,0,0,0,99,2,0,0,0,0,
-    0,0,0,0,0,0,0,8,0,0,0,3,0,0,0,115,
-    70,0,0,0,124,0,160,0,124,1,161,1,125,2,9,0,
-    124,0,160,1,124,2,161,1,125,3,116,4,124,3,131,1,
-    83,0,35,0,4,0,116,2,121,34,1,0,125,4,1,0,
-    116,3,100,1,124,1,100,2,141,2,124,4,130,2,100,3,
-    125,4,126,4,119,1,37,0,119,0,41,4,122,52,67,111,
-    110,99,114,101,116,101,32,105,109,112,108,101,109,101,110,116,
-    97,116,105,111,110,32,111,102,32,73,110,115,112,101,99,116,
-    76,111,97,100,101,114,46,103,101,116,95,115,111,117,114,99,
-    101,46,122,39,115,111,117,114,99,101,32,110,111,116,32,97,
-    118,97,105,108,97,98,108,101,32,116,104,114,111,117,103,104,
-    32,103,101,116,95,100,97,116,97,40,41,114,144,0,0,0,
-    78,41,5,114,209,0,0,0,218,8,103,101,116,95,100,97,
-    116,97,114,80,0,0,0,114,146,0,0,0,114,205,0,0,
-    0,41,5,114,147,0,0,0,114,166,0,0,0,114,67,0,
-    0,0,114,203,0,0,0,218,3,101,120,99,115,5,0,0,
-    0,32,32,32,32,32,114,7,0,0,0,218,10,103,101,116,
-    95,115,111,117,114,99,101,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,
-    175,3,0,0,115,26,0,0,0,10,2,2,1,10,1,8,
-    4,2,128,12,253,4,1,2,1,4,255,2,1,2,255,10,
-    128,2,255,115,24,0,0,0,10,2,2,5,10,253,8,4,
-    2,128,2,255,2,254,8,2,4,255,10,1,10,128,2,0,
-    115,70,0,0,0,16,20,16,43,34,42,16,43,9,13,9,
-    54,28,32,28,47,42,46,28,47,13,25,16,29,30,42,16,
-    43,9,43,0,0,9,54,16,23,9,54,9,54,9,54,9,
-    54,19,30,31,72,36,44,19,45,19,45,51,54,13,54,0,
-    0,0,0,0,0,0,0,0,0,9,54,115,20,0,0,0,
-    134,5,15,0,143,7,33,7,150,7,29,7,157,4,33,7,
-    162,1,33,7,114,134,0,0,0,41,1,218,9,95,111,112,
-    116,105,109,105,122,101,99,3,0,0,0,0,0,0,0,1,
-    0,0,0,9,0,0,0,3,0,0,0,115,22,0,0,0,
-    116,0,160,1,116,2,124,1,124,2,100,1,100,2,124,3,
-    100,3,166,6,83,0,41,5,122,130,82,101,116,117,114,110,
-    32,116,104,101,32,99,111,100,101,32,111,98,106,101,99,116,
-    32,99,111,109,112,105,108,101,100,32,102,114,111,109,32,115,
-    111,117,114,99,101,46,10,10,32,32,32,32,32,32,32,32,
-    84,104,101,32,39,100,97,116,97,39,32,97,114,103,117,109,
-    101,110,116,32,99,97,110,32,98,101,32,97,110,121,32,111,
-    98,106,101,99,116,32,116,121,112,101,32,116,104,97,116,32,
-    99,111,109,112,105,108,101,40,41,32,115,117,112,112,111,114,
-    116,115,46,10,32,32,32,32,32,32,32,32,114,251,0,0,
-    0,84,41,2,218,12,100,111,110,116,95,105,110,104,101,114,
-    105,116,114,112,0,0,0,78,41,3,114,162,0,0,0,114,
-    250,0,0,0,218,7,99,111,109,112,105,108,101,41,4,114,
-    147,0,0,0,114,44,0,0,0,114,67,0,0,0,114,14,
-    1,0,0,115,4,0,0,0,32,32,32,32,114,7,0,0,
-    0,218,14,115,111,117,114,99,101,95,116,111,95,99,111,100,
-    101,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,185,3,
-    0,0,115,6,0,0,0,12,5,4,1,6,255,115,8,0,
-    0,0,2,5,2,1,8,255,10,1,115,22,0,0,0,16,
-    26,16,79,53,60,62,66,68,72,74,80,54,58,69,78,16,
-    79,16,79,9,79,114,10,0,0,0,99,2,0,0,0,0,
-    0,0,0,0,0,0,0,9,0,0,0,3,0,0,0,115,
-    28,2,0,0,124,0,160,0,124,1,161,1,125,2,100,1,
-    125,3,100,1,125,4,100,1,125,5,100,2,125,6,100,3,
-    125,7,9,0,116,1,124,2,131,1,125,8,110,13,35,0,
-    4,0,116,2,144,1,121,13,1,0,1,0,1,0,100,1,
-    125,8,89,0,110,147,37,0,9,0,124,0,160,3,124,2,
-    161,1,125,9,110,11,35,0,4,0,116,4,144,1,121,12,
-    1,0,1,0,1,0,89,0,110,129,37,0,116,5,124,9,
-    100,4,25,0,131,1,125,3,9,0,124,0,160,6,124,8,
-    161,1,125,10,110,11,35,0,4,0,116,4,144,1,121,11,
-    1,0,1,0,1,0,89,0,110,105,37,0,124,1,124,8,
-    100,5,156,2,125,11,9,0,116,7,124,10,124,1,124,11,
-    131,3,125,12,116,8,124,10,131,1,100,6,100,1,133,2,
-    25,0,125,13,124,12,100,7,64,0,100,8,107,3,125,6,
-    124,6,114,141,124,12,100,9,64,0,100,8,107,3,125,7,
-    116,9,106,10,100,10,107,3,114,140,124,7,115,122,116,9,
-    106,10,100,11,107,2,114,140,124,0,160,6,124,2,161,1,
-    125,4,116,9,106,11,116,12,124,4,131,2,125,5,116,13,
-    124,10,124,5,124,1,124,11,131,4,1,0,110,10,116,14,
-    124,10,124,3,124,9,100,12,25,0,124,1,124,11,131,5,
-    1,0,110,13,35,0,4,0,116,15,116,16,102,2,144,1,
-    121,10,1,0,1,0,1,0,89,0,110,16,37,0,116,17,
-    160,18,100,13,124,8,124,2,161,3,1,0,116,19,124,13,
-    124,1,124,8,124,2,100,14,141,4,83,0,124,4,100,1,
-    117,0,114,189,124,0,160,6,124,2,161,1,125,4,124,0,
-    160,20,124,4,124,2,161,2,125,14,116,17,160,18,100,15,
-    124,2,161,2,1,0,116,21,106,22,144,1,115,7,124,8,
-    100,1,117,1,144,1,114,7,124,3,100,1,117,1,144,1,
-    114,7,124,6,114,233,124,5,100,1,117,0,114,226,116,9,
-    106,11,124,4,131,1,125,5,116,23,124,14,124,5,124,7,
-    131,3,125,10,110,8,116,24,124,14,124,3,116,25,124,4,
-    131,1,131,3,125,10,9,0,124,0,160,26,124,2,124,8,
-    124,10,161,3,1,0,124,14,83,0,35,0,4,0,116,2,
-    144,1,121,9,1,0,1,0,1,0,89,0,124,14,83,0,
-    37,0,124,14,83,0,119,0,119,0,119,0,119,0,119,0,
+    32,32,32,32,82,97,105,115,101,115,32,79,83,69,114,114,
+    111,114,32,119,104,101,110,32,116,104,101,32,112,97,116,104,
+    32,99,97,110,110,111,116,32,98,101,32,104,97,110,100,108,
+    101,100,46,10,32,32,32,32,32,32,32,32,78,41,1,114,
+    80,0,0,0,169,2,114,147,0,0,0,114,67,0,0,0,
+    115,2,0,0,0,32,32,114,7,0,0,0,218,10,112,97,
+    116,104,95,109,116,105,109,101,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,136,3,0,0,243,2,0,0,0,4,6,114,5,1,0,
+    0,115,4,0,0,0,15,22,9,22,114,10,0,0,0,99,
+    2,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,
+    3,0,0,0,115,14,0,0,0,100,1,124,0,160,0,124,
+    1,161,1,105,1,83,0,41,3,97,158,1,0,0,79,112,
+    116,105,111,110,97,108,32,109,101,116,104,111,100,32,114,101,
+    116,117,114,110,105,110,103,32,97,32,109,101,116,97,100,97,
+    116,97,32,100,105,99,116,32,102,111,114,32,116,104,101,32,
+    115,112,101,99,105,102,105,101,100,10,32,32,32,32,32,32,
+    32,32,112,97,116,104,32,40,97,32,115,116,114,41,46,10,
+    10,32,32,32,32,32,32,32,32,80,111,115,115,105,98,108,
+    101,32,107,101,121,115,58,10,32,32,32,32,32,32,32,32,
+    45,32,39,109,116,105,109,101,39,32,40,109,97,110,100,97,
+    116,111,114,121,41,32,105,115,32,116,104,101,32,110,117,109,
+    101,114,105,99,32,116,105,109,101,115,116,97,109,112,32,111,
+    102,32,108,97,115,116,32,115,111,117,114,99,101,10,32,32,
+    32,32,32,32,32,32,32,32,99,111,100,101,32,109,111,100,
+    105,102,105,99,97,116,105,111,110,59,10,32,32,32,32,32,
+    32,32,32,45,32,39,115,105,122,101,39,32,40,111,112,116,
+    105,111,110,97,108,41,32,105,115,32,116,104,101,32,115,105,
+    122,101,32,105,110,32,98,121,116,101,115,32,111,102,32,116,
+    104,101,32,115,111,117,114,99,101,32,99,111,100,101,46,10,
+    10,32,32,32,32,32,32,32,32,73,109,112,108,101,109,101,
+    110,116,105,110,103,32,116,104,105,115,32,109,101,116,104,111,
+    100,32,97,108,108,111,119,115,32,116,104,101,32,108,111,97,
+    100,101,114,32,116,111,32,114,101,97,100,32,98,121,116,101,
+    99,111,100,101,32,102,105,108,101,115,46,10,32,32,32,32,
+    32,32,32,32,82,97,105,115,101,115,32,79,83,69,114,114,
+    111,114,32,119,104,101,110,32,116,104,101,32,112,97,116,104,
+    32,99,97,110,110,111,116,32,98,101,32,104,97,110,100,108,
+    101,100,46,10,32,32,32,32,32,32,32,32,114,196,0,0,
+    0,78,41,1,114,4,1,0,0,114,3,1,0,0,115,2,
+    0,0,0,32,32,114,7,0,0,0,218,10,112,97,116,104,
+    95,115,116,97,116,115,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,144,
+    3,0,0,243,2,0,0,0,14,12,114,7,1,0,0,115,
+    14,0,0,0,17,24,26,30,26,47,42,46,26,47,16,48,
+    9,48,114,10,0,0,0,99,4,0,0,0,0,0,0,0,
+    0,0,0,0,4,0,0,0,3,0,0,0,115,12,0,0,
+    0,124,0,160,0,124,2,124,3,161,2,83,0,41,2,122,
+    228,79,112,116,105,111,110,97,108,32,109,101,116,104,111,100,
+    32,119,104,105,99,104,32,119,114,105,116,101,115,32,100,97,
+    116,97,32,40,98,121,116,101,115,41,32,116,111,32,97,32,
+    102,105,108,101,32,112,97,116,104,32,40,97,32,115,116,114,
+    41,46,10,10,32,32,32,32,32,32,32,32,73,109,112,108,
+    101,109,101,110,116,105,110,103,32,116,104,105,115,32,109,101,
+    116,104,111,100,32,97,108,108,111,119,115,32,102,111,114,32,
+    116,104,101,32,119,114,105,116,105,110,103,32,111,102,32,98,
+    121,116,101,99,111,100,101,32,102,105,108,101,115,46,10,10,
+    32,32,32,32,32,32,32,32,84,104,101,32,115,111,117,114,
+    99,101,32,112,97,116,104,32,105,115,32,110,101,101,100,101,
+    100,32,105,110,32,111,114,100,101,114,32,116,111,32,99,111,
+    114,114,101,99,116,108,121,32,116,114,97,110,115,102,101,114,
+    32,112,101,114,109,105,115,115,105,111,110,115,10,32,32,32,
+    32,32,32,32,32,78,41,1,218,8,115,101,116,95,100,97,
+    116,97,41,4,114,147,0,0,0,114,138,0,0,0,90,10,
+    99,97,99,104,101,95,112,97,116,104,114,44,0,0,0,115,
+    4,0,0,0,32,32,32,32,114,7,0,0,0,218,15,95,
+    99,97,99,104,101,95,98,121,116,101,99,111,100,101,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,158,3,0,0,
+    243,2,0,0,0,12,8,114,10,1,0,0,115,12,0,0,
+    0,16,20,16,47,30,40,42,46,16,47,9,47,114,10,0,
+    0,0,99,3,0,0,0,0,0,0,0,0,0,0,0,1,
+    0,0,0,3,0,0,0,114,26,0,0,0,41,2,122,150,
+    79,112,116,105,111,110,97,108,32,109,101,116,104,111,100,32,
+    119,104,105,99,104,32,119,114,105,116,101,115,32,100,97,116,
+    97,32,40,98,121,116,101,115,41,32,116,111,32,97,32,102,
+    105,108,101,32,112,97,116,104,32,40,97,32,115,116,114,41,
+    46,10,10,32,32,32,32,32,32,32,32,73,109,112,108,101,
+    109,101,110,116,105,110,103,32,116,104,105,115,32,109,101,116,
+    104,111,100,32,97,108,108,111,119,115,32,102,111,114,32,116,
+    104,101,32,119,114,105,116,105,110,103,32,111,102,32,98,121,
+    116,101,99,111,100,101,32,102,105,108,101,115,46,10,32,32,
+    32,32,32,32,32,32,78,114,13,0,0,0,41,3,114,147,
+    0,0,0,114,67,0,0,0,114,44,0,0,0,115,3,0,
+    0,0,32,32,32,114,7,0,0,0,114,8,1,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,168,3,0,0,114,247,0,0,0,114,
+    248,0,0,0,115,4,0,0,0,0,0,0,0,114,10,0,
+    0,0,99,2,0,0,0,0,0,0,0,0,0,0,0,8,
+    0,0,0,3,0,0,0,115,70,0,0,0,124,0,160,0,
+    124,1,161,1,125,2,9,0,124,0,160,1,124,2,161,1,
+    125,3,116,4,124,3,131,1,83,0,35,0,4,0,116,2,
+    121,33,1,0,125,4,1,0,116,3,100,1,124,1,100,2,
+    141,2,124,4,130,2,100,3,125,4,126,4,119,1,119,0,
+    37,0,41,4,122,52,67,111,110,99,114,101,116,101,32,105,
+    109,112,108,101,109,101,110,116,97,116,105,111,110,32,111,102,
+    32,73,110,115,112,101,99,116,76,111,97,100,101,114,46,103,
+    101,116,95,115,111,117,114,99,101,46,122,39,115,111,117,114,
+    99,101,32,110,111,116,32,97,118,97,105,108,97,98,108,101,
+    32,116,104,114,111,117,103,104,32,103,101,116,95,100,97,116,
+    97,40,41,114,144,0,0,0,78,41,5,114,209,0,0,0,
+    218,8,103,101,116,95,100,97,116,97,114,80,0,0,0,114,
+    146,0,0,0,114,205,0,0,0,41,5,114,147,0,0,0,
+    114,166,0,0,0,114,67,0,0,0,114,203,0,0,0,218,
+    3,101,120,99,115,5,0,0,0,32,32,32,32,32,114,7,
+    0,0,0,218,10,103,101,116,95,115,111,117,114,99,101,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,175,3,0,0,115,28,0,0,
+    0,10,2,2,1,10,1,8,4,2,128,12,253,4,1,2,
+    1,4,255,2,1,2,255,8,128,2,255,2,128,115,26,0,
+    0,0,10,2,2,5,10,253,8,4,2,128,2,255,2,254,
+    8,2,4,255,10,1,8,128,2,0,2,128,115,70,0,0,
+    0,16,20,16,43,34,42,16,43,9,13,9,54,28,32,28,
+    47,42,46,28,47,13,25,16,29,30,42,16,43,9,43,0,
+    0,9,54,16,23,9,54,9,54,9,54,9,54,19,30,31,
+    72,36,44,19,45,19,45,51,54,13,54,0,0,0,0,0,
+    0,0,0,9,54,0,0,115,16,0,0,0,134,5,15,0,
+    143,7,34,7,150,7,29,7,157,5,34,7,114,134,0,0,
+    0,41,1,218,9,95,111,112,116,105,109,105,122,101,99,3,
+    0,0,0,0,0,0,0,1,0,0,0,9,0,0,0,3,
+    0,0,0,115,22,0,0,0,116,0,160,1,116,2,124,1,
+    124,2,100,1,100,2,124,3,100,3,166,6,83,0,41,5,
+    122,130,82,101,116,117,114,110,32,116,104,101,32,99,111,100,
+    101,32,111,98,106,101,99,116,32,99,111,109,112,105,108,101,
+    100,32,102,114,111,109,32,115,111,117,114,99,101,46,10,10,
+    32,32,32,32,32,32,32,32,84,104,101,32,39,100,97,116,
+    97,39,32,97,114,103,117,109,101,110,116,32,99,97,110,32,
+    98,101,32,97,110,121,32,111,98,106,101,99,116,32,116,121,
+    112,101,32,116,104,97,116,32,99,111,109,112,105,108,101,40,
+    41,32,115,117,112,112,111,114,116,115,46,10,32,32,32,32,
+    32,32,32,32,114,251,0,0,0,84,41,2,218,12,100,111,
+    110,116,95,105,110,104,101,114,105,116,114,112,0,0,0,78,
+    41,3,114,162,0,0,0,114,250,0,0,0,218,7,99,111,
+    109,112,105,108,101,41,4,114,147,0,0,0,114,44,0,0,
+    0,114,67,0,0,0,114,14,1,0,0,115,4,0,0,0,
+    32,32,32,32,114,7,0,0,0,218,14,115,111,117,114,99,
+    101,95,116,111,95,99,111,100,101,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,185,3,0,0,115,6,0,0,0,12,
+    5,4,1,6,255,115,8,0,0,0,2,5,2,1,8,255,
+    10,1,115,22,0,0,0,16,26,16,79,53,60,62,66,68,
+    72,74,80,54,58,69,78,16,79,16,79,9,79,114,10,0,
+    0,0,99,2,0,0,0,0,0,0,0,0,0,0,0,9,
+    0,0,0,3,0,0,0,115,20,2,0,0,124,0,160,0,
+    124,1,161,1,125,2,100,1,125,3,100,1,125,4,100,1,
+    125,5,100,2,125,6,100,3,125,7,9,0,116,1,124,2,
+    131,1,125,8,110,13,35,0,4,0,116,2,121,32,1,0,
+    1,0,1,0,100,1,125,8,89,0,110,148,119,0,37,0,
+    9,0,124,0,160,3,124,2,161,1,125,9,110,11,35,0,
+    4,0,116,4,121,50,1,0,1,0,1,0,89,0,110,130,
+    119,0,37,0,116,5,124,9,100,4,25,0,131,1,125,3,
+    9,0,124,0,160,6,124,8,161,1,125,10,110,11,35,0,
+    4,0,116,4,121,74,1,0,1,0,1,0,89,0,110,106,
+    119,0,37,0,124,1,124,8,100,5,156,2,125,11,9,0,
+    116,7,124,10,124,1,124,11,131,3,125,12,116,8,124,10,
+    131,1,100,6,100,1,133,2,25,0,125,13,124,12,100,7,
+    64,0,100,8,107,3,125,6,124,6,114,141,124,12,100,9,
+    64,0,100,8,107,3,125,7,116,9,106,10,100,10,107,3,
+    114,140,124,7,115,122,116,9,106,10,100,11,107,2,114,140,
+    124,0,160,6,124,2,161,1,125,4,116,9,106,11,116,12,
+    124,4,131,2,125,5,116,13,124,10,124,5,124,1,124,11,
+    131,4,1,0,110,10,116,14,124,10,124,3,124,9,100,12,
+    25,0,124,1,124,11,131,5,1,0,110,13,35,0,4,0,
+    116,15,116,16,102,2,121,163,1,0,1,0,1,0,89,0,
+    110,17,119,0,37,0,116,17,160,18,100,13,124,8,124,2,
+    161,3,1,0,116,19,124,13,124,1,124,8,124,2,100,14,
+    141,4,83,0,124,4,100,1,117,0,114,189,124,0,160,6,
+    124,2,161,1,125,4,124,0,160,20,124,4,124,2,161,2,
+    125,14,116,17,160,18,100,15,124,2,161,2,1,0,116,21,
+    106,22,144,1,115,8,124,8,100,1,117,1,144,1,114,8,
+    124,3,100,1,117,1,144,1,114,8,124,6,114,233,124,5,
+    100,1,117,0,114,226,116,9,106,11,124,4,131,1,125,5,
+    116,23,124,14,124,5,124,7,131,3,125,10,110,8,116,24,
+    124,14,124,3,116,25,124,4,131,1,131,3,125,10,9,0,
+    124,0,160,26,124,2,124,8,124,10,161,3,1,0,124,14,
+    83,0,35,0,4,0,116,2,144,1,121,6,1,0,1,0,
+    1,0,89,0,124,14,83,0,119,0,37,0,124,14,83,0,
     41,16,122,190,67,111,110,99,114,101,116,101,32,105,109,112,
     108,101,109,101,110,116,97,116,105,111,110,32,111,102,32,73,
     110,115,112,101,99,116,76,111,97,100,101,114,46,103,101,116,
@@ -1823,18 +1821,18 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
     0,114,249,0,0,0,122,21,83,111,117,114,99,101,76,111,
     97,100,101,114,46,103,101,116,95,99,111,100,101,193,3,0,
     0,115,188,0,0,0,10,7,4,1,4,1,4,1,4,1,
-    4,1,2,1,10,1,2,128,14,1,8,1,2,128,2,2,
-    12,1,2,128,14,1,4,1,2,128,12,2,2,1,12,1,
-    2,128,14,1,4,1,2,128,2,3,2,1,6,254,2,4,
-    12,1,16,1,12,1,4,1,12,1,10,1,2,1,2,255,
-    8,2,2,254,10,3,4,1,2,1,2,1,4,254,8,4,
-    2,1,4,255,2,128,2,3,2,1,2,1,6,1,2,1,
-    2,1,4,251,4,128,18,7,4,1,2,128,8,2,2,1,
-    4,255,6,2,2,1,2,1,6,254,8,3,10,1,12,1,
-    12,1,18,1,6,1,4,255,4,2,8,1,10,1,14,1,
-    6,2,6,1,4,255,2,2,14,1,4,3,2,128,14,254,
-    2,1,4,1,2,128,4,0,2,254,2,233,2,225,2,250,
-    2,251,115,212,0,0,0,10,7,4,1,4,1,4,1,4,
+    4,1,2,1,10,1,2,128,12,1,8,1,2,255,2,128,
+    2,3,12,1,2,128,12,1,4,1,2,255,2,128,12,3,
+    2,1,12,1,2,128,12,1,4,1,2,255,2,128,2,4,
+    2,1,6,254,2,4,12,1,16,1,12,1,4,1,12,1,
+    10,1,2,1,2,255,8,2,2,254,10,3,4,1,2,1,
+    2,1,4,254,8,4,2,1,4,255,2,128,2,3,2,1,
+    2,1,6,1,2,1,2,1,4,251,4,128,16,7,4,1,
+    2,255,2,128,8,3,2,1,4,255,6,2,2,1,2,1,
+    6,254,8,3,10,1,12,1,12,1,18,1,6,1,4,255,
+    4,2,8,1,10,1,14,1,6,2,6,1,4,255,2,2,
+    14,1,4,3,2,128,14,254,2,1,4,1,2,254,2,128,
+    4,2,115,204,0,0,0,10,7,4,1,4,1,4,1,4,
     1,4,1,2,52,10,206,2,128,2,2,2,255,18,1,2,
     128,2,48,12,211,2,128,2,2,2,255,14,1,2,128,12,
     2,2,41,12,217,2,128,2,2,2,255,14,1,2,128,2,
@@ -1846,1764 +1844,1761 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
     255,6,1,6,1,2,1,8,1,6,1,12,1,12,1,12,
     1,4,1,4,12,6,244,4,12,6,245,4,11,2,246,2,
     6,6,251,12,1,14,1,6,2,8,1,2,255,2,5,14,
-    254,4,3,2,128,2,255,2,255,12,1,4,1,2,128,4,
-    0,2,255,2,233,2,225,2,250,2,251,115,28,2,0,0,
-    23,27,23,50,41,49,23,50,9,20,24,28,9,21,24,28,
-    9,21,23,27,9,20,22,27,9,19,24,28,9,21,9,74,
-    29,46,47,58,29,59,13,26,13,26,0,0,9,33,16,35,
-    9,33,9,33,9,33,9,33,9,33,29,33,13,26,13,26,
-    13,26,0,0,13,74,22,26,22,50,38,49,22,50,17,19,
-    17,19,0,0,13,21,20,27,13,21,13,21,13,21,13,21,
-    13,21,17,21,17,21,0,0,32,35,36,38,39,46,36,47,
-    32,48,17,29,17,74,28,32,28,56,42,55,28,56,21,25,
-    21,25,0,0,17,25,24,31,17,25,17,25,17,25,17,25,
-    17,25,21,25,21,25,0,0,33,41,33,46,35,22,35,22,
-    21,32,21,74,33,46,47,51,53,61,63,74,33,75,25,30,
-    38,48,49,53,38,54,55,57,55,58,55,58,38,59,25,35,
-    38,43,46,49,38,49,53,54,38,54,25,35,28,38,25,30,
-    44,49,52,56,44,56,60,61,44,61,29,41,33,37,33,59,
-    63,70,33,70,29,64,34,46,29,64,34,38,34,60,64,72,
-    34,72,29,64,48,52,48,74,62,73,48,74,33,45,47,51,
-    47,63,37,54,37,49,47,34,33,44,33,51,52,56,58,69,
-    71,79,52,63,33,64,33,64,0,0,29,52,33,37,33,45,
-    33,35,36,42,33,43,33,41,33,44,29,30,29,30,0,0,
-    0,0,21,29,29,40,42,50,28,51,21,29,21,29,21,29,
-    21,29,21,29,25,29,25,29,0,0,25,35,25,65,53,68,
-    70,83,53,64,25,65,25,65,32,49,50,60,67,75,64,77,
-    62,73,32,74,32,74,25,74,12,24,28,32,12,32,9,54,
-    28,32,28,54,42,53,28,54,13,25,23,27,23,69,43,55,
-    57,68,23,69,9,20,9,19,9,72,37,58,60,71,9,72,
-    9,72,17,20,17,40,9,21,9,21,45,58,66,70,45,70,
-    9,21,9,21,17,29,37,41,17,41,9,21,9,21,16,26,
-    13,65,20,31,35,39,20,39,17,65,35,39,35,51,52,64,
-    35,65,21,32,24,41,42,53,55,66,68,80,24,81,17,21,
-    17,21,24,46,47,58,60,72,47,50,51,63,47,64,24,65,
-    17,21,13,21,17,21,17,71,38,49,51,64,66,70,17,71,
-    17,71,16,27,9,27,0,0,13,21,20,39,13,21,13,21,
-    13,21,13,21,13,21,17,21,16,27,9,27,0,0,16,27,
-    9,27,13,21,21,29,17,25,13,21,9,33,115,80,0,0,
-    0,144,4,21,0,149,10,33,7,163,5,41,0,169,8,51,
-    7,187,5,65,1,0,193,1,8,65,11,7,193,18,65,5,
-    66,24,0,194,24,10,66,36,7,195,50,7,67,59,0,195,
-    59,8,68,6,7,196,9,1,68,6,7,196,10,1,66,36,
-    7,196,11,1,65,11,7,196,12,1,51,7,196,13,1,33,
-    7,78,41,10,114,153,0,0,0,114,152,0,0,0,114,154,
-    0,0,0,114,4,1,0,0,114,6,1,0,0,114,9,1,
-    0,0,114,8,1,0,0,114,13,1,0,0,114,17,1,0,
-    0,114,249,0,0,0,114,13,0,0,0,114,10,0,0,0,
-    114,7,0,0,0,114,2,1,0,0,114,2,1,0,0,134,
-    3,0,0,115,16,0,0,0,8,0,6,2,6,8,6,14,
-    6,10,6,7,12,10,10,8,115,46,0,0,0,0,129,0,
-    129,0,129,0,129,0,129,0,129,0,129,8,243,0,127,0,
-    127,0,127,0,127,0,127,0,127,0,127,6,21,6,14,6,
-    10,6,6,6,11,2,2,10,6,10,84,115,60,0,0,0,
-    1,1,1,1,1,1,1,1,5,22,5,22,5,22,5,48,
-    5,48,5,48,5,47,5,47,5,47,5,12,5,12,5,12,
-    5,43,5,43,5,43,55,57,5,79,5,79,5,79,5,79,
-    5,79,5,27,5,27,5,27,5,27,5,27,114,10,0,0,
-    0,114,2,1,0,0,99,0,0,0,0,0,0,0,0,0,
-    0,0,0,3,0,0,0,0,0,0,0,115,80,0,0,0,
-    135,0,101,0,90,1,100,0,90,2,100,1,90,3,100,2,
-    132,0,90,4,100,3,132,0,90,5,100,4,132,0,90,6,
-    101,7,136,0,102,1,100,5,132,8,131,1,90,8,101,7,
-    100,6,132,0,131,1,90,9,100,7,132,0,90,10,101,7,
-    100,8,132,0,131,1,90,11,136,0,4,0,90,12,83,0,
-    41,9,218,10,70,105,108,101,76,111,97,100,101,114,122,103,
-    66,97,115,101,32,102,105,108,101,32,108,111,97,100,101,114,
-    32,99,108,97,115,115,32,119,104,105,99,104,32,105,109,112,
-    108,101,109,101,110,116,115,32,116,104,101,32,108,111,97,100,
-    101,114,32,112,114,111,116,111,99,111,108,32,109,101,116,104,
-    111,100,115,32,116,104,97,116,10,32,32,32,32,114,101,113,
-    117,105,114,101,32,102,105,108,101,32,115,121,115,116,101,109,
-    32,117,115,97,103,101,46,99,3,0,0,0,0,0,0,0,
-    0,0,0,0,2,0,0,0,3,0,0,0,115,16,0,0,
-    0,124,1,124,0,95,0,124,2,124,0,95,1,100,1,83,
-    0,41,2,122,75,67,97,99,104,101,32,116,104,101,32,109,
-    111,100,117,108,101,32,110,97,109,101,32,97,110,100,32,116,
-    104,101,32,112,97,116,104,32,116,111,32,116,104,101,32,102,
-    105,108,101,32,102,111,117,110,100,32,98,121,32,116,104,101,
-    10,32,32,32,32,32,32,32,32,102,105,110,100,101,114,46,
-    78,114,186,0,0,0,41,3,114,147,0,0,0,114,166,0,
-    0,0,114,67,0,0,0,115,3,0,0,0,32,32,32,114,
-    7,0,0,0,114,242,0,0,0,122,19,70,105,108,101,76,
-    111,97,100,101,114,46,95,95,105,110,105,116,95,95,27,4,
-    0,0,243,4,0,0,0,6,3,10,1,114,24,1,0,0,
-    115,16,0,0,0,21,29,9,13,9,18,21,25,9,13,9,
-    18,9,18,9,18,114,10,0,0,0,99,2,0,0,0,0,
-    0,0,0,0,0,0,0,2,0,0,0,3,0,0,0,243,
-    24,0,0,0,124,0,106,0,124,1,106,0,107,2,111,11,
-    124,0,106,1,124,1,106,1,107,2,83,0,114,71,0,0,
-    0,169,2,218,9,95,95,99,108,97,115,115,95,95,114,159,
-    0,0,0,169,2,114,147,0,0,0,90,5,111,116,104,101,
-    114,115,2,0,0,0,32,32,114,7,0,0,0,218,6,95,
-    95,101,113,95,95,122,17,70,105,108,101,76,111,97,100,101,
-    114,46,95,95,101,113,95,95,33,4,0,0,243,6,0,0,
-    0,12,1,10,1,2,255,243,4,0,0,0,10,1,14,1,
-    115,24,0,0,0,17,21,17,31,35,40,35,50,17,50,17,
-    48,17,21,17,30,34,39,34,48,17,48,9,49,114,10,0,
-    0,0,99,1,0,0,0,0,0,0,0,0,0,0,0,3,
-    0,0,0,3,0,0,0,243,20,0,0,0,116,0,124,0,
-    106,1,131,1,116,0,124,0,106,2,131,1,65,0,83,0,
-    114,71,0,0,0,169,3,218,4,104,97,115,104,114,145,0,
-    0,0,114,67,0,0,0,169,1,114,147,0,0,0,115,1,
-    0,0,0,32,114,7,0,0,0,218,8,95,95,104,97,115,
-    104,95,95,122,19,70,105,108,101,76,111,97,100,101,114,46,
-    95,95,104,97,115,104,95,95,37,4,0,0,243,2,0,0,
-    0,20,1,114,37,1,0,0,115,20,0,0,0,16,20,21,
-    25,21,30,16,31,34,38,39,43,39,48,34,49,16,49,9,
-    49,114,10,0,0,0,99,2,0,0,0,0,0,0,0,0,
-    0,0,0,3,0,0,0,3,0,0,0,115,16,0,0,0,
-    116,0,116,1,124,0,131,2,160,2,124,1,161,1,83,0,
-    41,2,122,100,76,111,97,100,32,97,32,109,111,100,117,108,
-    101,32,102,114,111,109,32,97,32,102,105,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,78,41,3,218,5,115,117,112,
-    101,114,114,23,1,0,0,114,0,1,0,0,41,3,114,147,
-    0,0,0,114,166,0,0,0,114,27,1,0,0,115,3,0,
-    0,0,32,32,128,114,7,0,0,0,114,0,1,0,0,122,
-    22,70,105,108,101,76,111,97,100,101,114,46,108,111,97,100,
-    95,109,111,100,117,108,101,40,4,0,0,243,2,0,0,0,
-    16,10,114,39,1,0,0,115,16,0,0,0,16,21,22,32,
-    34,38,16,39,16,61,52,60,16,61,9,61,114,10,0,0,
-    0,99,2,0,0,0,0,0,0,0,0,0,0,0,1,0,
-    0,0,3,0,0,0,243,6,0,0,0,124,0,106,0,83,
-    0,169,2,122,58,82,101,116,117,114,110,32,116,104,101,32,
-    112,97,116,104,32,116,111,32,116,104,101,32,115,111,117,114,
-    99,101,32,102,105,108,101,32,97,115,32,102,111,117,110,100,
-    32,98,121,32,116,104,101,32,102,105,110,100,101,114,46,78,
-    114,77,0,0,0,114,255,0,0,0,115,2,0,0,0,32,
-    32,114,7,0,0,0,114,209,0,0,0,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,52,4,0,0,243,2,0,0,0,6,3,114,
-    42,1,0,0,115,6,0,0,0,16,20,16,25,9,25,114,
+    254,4,3,2,128,2,255,2,255,12,1,4,1,2,255,2,
+    128,4,1,115,20,2,0,0,23,27,23,50,41,49,23,50,
+    9,20,24,28,9,21,24,28,9,21,23,27,9,20,22,27,
+    9,19,24,28,9,21,9,74,29,46,47,58,29,59,13,26,
+    13,26,0,0,9,33,16,35,9,33,9,33,9,33,9,33,
+    29,33,13,26,13,26,13,26,9,33,0,0,13,74,22,26,
+    22,50,38,49,22,50,17,19,17,19,0,0,13,21,20,27,
+    13,21,13,21,13,21,13,21,17,21,17,21,13,21,0,0,
+    32,35,36,38,39,46,36,47,32,48,17,29,17,74,28,32,
+    28,56,42,55,28,56,21,25,21,25,0,0,17,25,24,31,
+    17,25,17,25,17,25,17,25,21,25,21,25,17,25,0,0,
+    33,41,33,46,35,22,35,22,21,32,21,74,33,46,47,51,
+    53,61,63,74,33,75,25,30,38,48,49,53,38,54,55,57,
+    55,58,55,58,38,59,25,35,38,43,46,49,38,49,53,54,
+    38,54,25,35,28,38,25,30,44,49,52,56,44,56,60,61,
+    44,61,29,41,33,37,33,59,63,70,33,70,29,64,34,46,
+    29,64,34,38,34,60,64,72,34,72,29,64,48,52,48,74,
+    62,73,48,74,33,45,47,51,47,63,37,54,37,49,47,34,
+    33,44,33,51,52,56,58,69,71,79,52,63,33,64,33,64,
+    0,0,29,52,33,37,33,45,33,35,36,42,33,43,33,41,
+    33,44,29,30,29,30,0,0,0,0,21,29,29,40,42,50,
+    28,51,21,29,21,29,21,29,21,29,25,29,25,29,21,29,
+    0,0,25,35,25,65,53,68,70,83,53,64,25,65,25,65,
+    32,49,50,60,67,75,64,77,62,73,32,74,32,74,25,74,
+    12,24,28,32,12,32,9,54,28,32,28,54,42,53,28,54,
+    13,25,23,27,23,69,43,55,57,68,23,69,9,20,9,19,
+    9,72,37,58,60,71,9,72,9,72,17,20,17,40,9,21,
+    9,21,45,58,66,70,45,70,9,21,9,21,17,29,37,41,
+    17,41,9,21,9,21,16,26,13,65,20,31,35,39,20,39,
+    17,65,35,39,35,51,52,64,35,65,21,32,24,41,42,53,
+    55,66,68,80,24,81,17,21,17,21,24,46,47,58,60,72,
+    47,50,51,63,47,64,24,65,17,21,13,21,17,21,17,71,
+    38,49,51,64,66,70,17,71,17,71,16,27,9,27,0,0,
+    13,21,20,39,13,21,13,21,13,21,13,21,13,21,17,21,
+    16,27,9,27,13,21,0,0,16,27,9,27,115,78,0,0,
+    0,144,4,21,0,149,9,33,7,160,1,33,7,163,5,41,
+    0,169,7,51,7,178,1,51,7,187,5,65,1,0,193,1,
+    7,65,11,7,193,10,1,65,11,7,193,18,65,5,66,24,
+    0,194,24,9,66,36,7,194,35,1,66,36,7,195,50,7,
+    67,59,0,195,59,8,68,7,7,196,6,1,68,7,7,78,
+    41,10,114,153,0,0,0,114,152,0,0,0,114,154,0,0,
+    0,114,4,1,0,0,114,6,1,0,0,114,9,1,0,0,
+    114,8,1,0,0,114,13,1,0,0,114,17,1,0,0,114,
+    249,0,0,0,114,13,0,0,0,114,10,0,0,0,114,7,
+    0,0,0,114,2,1,0,0,114,2,1,0,0,134,3,0,
+    0,115,16,0,0,0,8,0,6,2,6,8,6,14,6,10,
+    6,7,12,10,10,8,115,46,0,0,0,0,129,0,129,0,
+    129,0,129,0,129,0,129,0,129,8,243,0,127,0,127,0,
+    127,0,127,0,127,0,127,0,127,6,21,6,14,6,10,6,
+    6,6,11,2,2,10,6,10,84,115,60,0,0,0,1,1,
+    1,1,1,1,1,1,5,22,5,22,5,22,5,48,5,48,
+    5,48,5,47,5,47,5,47,5,12,5,12,5,12,5,43,
+    5,43,5,43,55,57,5,79,5,79,5,79,5,79,5,79,
+    5,27,5,27,5,27,5,27,5,27,114,10,0,0,0,114,
+    2,1,0,0,99,0,0,0,0,0,0,0,0,0,0,0,
+    0,3,0,0,0,0,0,0,0,115,80,0,0,0,135,0,
+    101,0,90,1,100,0,90,2,100,1,90,3,100,2,132,0,
+    90,4,100,3,132,0,90,5,100,4,132,0,90,6,101,7,
+    136,0,102,1,100,5,132,8,131,1,90,8,101,7,100,6,
+    132,0,131,1,90,9,100,7,132,0,90,10,101,7,100,8,
+    132,0,131,1,90,11,136,0,4,0,90,12,83,0,41,9,
+    218,10,70,105,108,101,76,111,97,100,101,114,122,103,66,97,
+    115,101,32,102,105,108,101,32,108,111,97,100,101,114,32,99,
+    108,97,115,115,32,119,104,105,99,104,32,105,109,112,108,101,
+    109,101,110,116,115,32,116,104,101,32,108,111,97,100,101,114,
+    32,112,114,111,116,111,99,111,108,32,109,101,116,104,111,100,
+    115,32,116,104,97,116,10,32,32,32,32,114,101,113,117,105,
+    114,101,32,102,105,108,101,32,115,121,115,116,101,109,32,117,
+    115,97,103,101,46,99,3,0,0,0,0,0,0,0,0,0,
+    0,0,2,0,0,0,3,0,0,0,115,16,0,0,0,124,
+    1,124,0,95,0,124,2,124,0,95,1,100,1,83,0,41,
+    2,122,75,67,97,99,104,101,32,116,104,101,32,109,111,100,
+    117,108,101,32,110,97,109,101,32,97,110,100,32,116,104,101,
+    32,112,97,116,104,32,116,111,32,116,104,101,32,102,105,108,
+    101,32,102,111,117,110,100,32,98,121,32,116,104,101,10,32,
+    32,32,32,32,32,32,32,102,105,110,100,101,114,46,78,114,
+    186,0,0,0,41,3,114,147,0,0,0,114,166,0,0,0,
+    114,67,0,0,0,115,3,0,0,0,32,32,32,114,7,0,
+    0,0,114,242,0,0,0,122,19,70,105,108,101,76,111,97,
+    100,101,114,46,95,95,105,110,105,116,95,95,27,4,0,0,
+    243,4,0,0,0,6,3,10,1,114,24,1,0,0,115,16,
+    0,0,0,21,29,9,13,9,18,21,25,9,13,9,18,9,
+    18,9,18,114,10,0,0,0,99,2,0,0,0,0,0,0,
+    0,0,0,0,0,2,0,0,0,3,0,0,0,243,24,0,
+    0,0,124,0,106,0,124,1,106,0,107,2,111,11,124,0,
+    106,1,124,1,106,1,107,2,83,0,114,71,0,0,0,169,
+    2,218,9,95,95,99,108,97,115,115,95,95,114,159,0,0,
+    0,169,2,114,147,0,0,0,90,5,111,116,104,101,114,115,
+    2,0,0,0,32,32,114,7,0,0,0,218,6,95,95,101,
+    113,95,95,122,17,70,105,108,101,76,111,97,100,101,114,46,
+    95,95,101,113,95,95,33,4,0,0,243,6,0,0,0,12,
+    1,10,1,2,255,243,4,0,0,0,10,1,14,1,115,24,
+    0,0,0,17,21,17,31,35,40,35,50,17,50,17,48,17,
+    21,17,30,34,39,34,48,17,48,9,49,114,10,0,0,0,
+    99,1,0,0,0,0,0,0,0,0,0,0,0,3,0,0,
+    0,3,0,0,0,243,20,0,0,0,116,0,124,0,106,1,
+    131,1,116,0,124,0,106,2,131,1,65,0,83,0,114,71,
+    0,0,0,169,3,218,4,104,97,115,104,114,145,0,0,0,
+    114,67,0,0,0,169,1,114,147,0,0,0,115,1,0,0,
+    0,32,114,7,0,0,0,218,8,95,95,104,97,115,104,95,
+    95,122,19,70,105,108,101,76,111,97,100,101,114,46,95,95,
+    104,97,115,104,95,95,37,4,0,0,243,2,0,0,0,20,
+    1,114,37,1,0,0,115,20,0,0,0,16,20,21,25,21,
+    30,16,31,34,38,39,43,39,48,34,49,16,49,9,49,114,
     10,0,0,0,99,2,0,0,0,0,0,0,0,0,0,0,
-    0,9,0,0,0,3,0,0,0,115,136,0,0,0,116,0,
-    124,0,116,1,116,2,102,2,131,2,114,38,116,3,106,4,
-    116,5,124,1,131,1,131,1,53,0,125,2,124,2,160,6,
-    161,0,2,0,100,1,4,0,4,0,131,3,1,0,83,0,
-    35,0,49,0,115,30,119,4,37,0,1,0,1,0,1,0,
-    89,0,1,0,1,0,100,1,83,0,116,3,106,7,124,1,
-    100,2,131,2,53,0,125,2,124,2,160,6,161,0,2,0,
-    100,1,4,0,4,0,131,3,1,0,83,0,35,0,49,0,
-    115,60,119,4,37,0,1,0,1,0,1,0,89,0,1,0,
-    1,0,100,1,83,0,41,3,122,39,82,101,116,117,114,110,
-    32,116,104,101,32,100,97,116,97,32,102,114,111,109,32,112,
-    97,116,104,32,97,115,32,114,97,119,32,98,121,116,101,115,
-    46,78,218,1,114,41,8,114,188,0,0,0,114,2,1,0,
-    0,218,19,69,120,116,101,110,115,105,111,110,70,105,108,101,
-    76,111,97,100,101,114,114,95,0,0,0,90,9,111,112,101,
-    110,95,99,111,100,101,114,113,0,0,0,90,4,114,101,97,
-    100,114,96,0,0,0,41,3,114,147,0,0,0,114,67,0,
-    0,0,114,98,0,0,0,115,3,0,0,0,32,32,32,114,
-    7,0,0,0,114,11,1,0,0,122,19,70,105,108,101,76,
-    111,97,100,101,114,46,103,101,116,95,100,97,116,97,57,4,
-    0,0,115,22,0,0,0,14,2,16,1,6,1,22,255,2,
-    128,16,0,14,3,6,1,22,255,2,128,16,0,115,28,0,
-    0,0,12,2,2,5,12,252,2,1,2,255,28,1,2,128,
-    16,0,10,2,2,1,2,255,28,1,2,128,16,0,115,136,
-    0,0,0,12,22,23,27,30,42,44,63,29,64,12,65,9,
-    35,18,21,18,31,32,35,36,40,32,41,18,42,13,35,46,
-    50,24,28,24,35,24,35,13,35,13,35,13,35,13,35,13,
-    35,13,35,13,35,13,35,13,35,13,35,13,35,0,0,13,
-    35,13,35,13,35,13,35,13,35,13,35,13,35,13,35,18,
-    21,18,28,29,33,35,38,18,39,13,35,43,47,24,28,24,
-    35,24,35,13,35,13,35,13,35,13,35,13,35,13,35,13,
-    35,13,35,13,35,13,35,13,35,0,0,13,35,13,35,13,
-    35,13,35,13,35,13,35,13,35,13,35,115,24,0,0,0,
-    142,4,25,3,153,4,29,11,158,3,29,11,172,4,55,3,
-    183,4,59,11,188,3,59,11,99,2,0,0,0,0,0,0,
-    0,0,0,0,0,2,0,0,0,3,0,0,0,115,20,0,
-    0,0,100,1,100,2,108,0,109,1,125,2,1,0,124,2,
-    124,0,131,1,83,0,41,3,78,114,0,0,0,0,41,1,
-    218,10,70,105,108,101,82,101,97,100,101,114,41,2,218,17,
-    105,109,112,111,114,116,108,105,98,46,114,101,97,100,101,114,
-    115,114,45,1,0,0,41,3,114,147,0,0,0,114,252,0,
-    0,0,114,45,1,0,0,115,3,0,0,0,32,32,32,114,
-    7,0,0,0,218,19,103,101,116,95,114,101,115,111,117,114,
-    99,101,95,114,101,97,100,101,114,122,30,70,105,108,101,76,
-    111,97,100,101,114,46,103,101,116,95,114,101,115,111,117,114,
-    99,101,95,114,101,97,100,101,114,66,4,0,0,243,4,0,
-    0,0,12,2,8,1,114,48,1,0,0,115,20,0,0,0,
-    9,49,9,49,9,49,9,49,9,49,9,49,16,26,27,31,
-    16,32,9,32,114,10,0,0,0,41,13,114,153,0,0,0,
-    114,152,0,0,0,114,154,0,0,0,114,155,0,0,0,114,
-    242,0,0,0,114,29,1,0,0,114,36,1,0,0,114,163,
-    0,0,0,114,0,1,0,0,114,209,0,0,0,114,11,1,
-    0,0,114,47,1,0,0,90,13,95,95,99,108,97,115,115,
-    99,101,108,108,95,95,41,1,114,27,1,0,0,115,1,0,
-    0,0,64,114,7,0,0,0,114,23,1,0,0,114,23,1,
-    0,0,22,4,0,0,115,24,0,0,0,10,128,4,2,6,
-    3,6,6,6,4,2,3,12,1,2,11,8,1,6,4,2,
-    9,16,1,115,92,0,0,0,2,128,0,129,0,129,0,129,
-    0,129,0,129,0,129,0,129,0,129,8,226,0,127,0,127,
-    0,127,0,127,0,127,0,127,0,127,0,127,2,33,0,129,
-    0,129,0,129,0,129,0,129,0,129,0,129,0,129,2,223,
-    0,127,0,127,0,127,0,127,0,127,0,127,0,127,0,127,
-    6,39,6,4,6,3,2,2,12,10,2,2,8,3,6,9,
-    2,2,16,3,115,80,0,0,0,0,0,1,1,1,1,1,
-    1,1,1,5,34,1,1,5,25,5,25,5,25,5,49,5,
-    49,5,49,5,49,5,49,5,49,6,17,5,61,5,61,5,
-    61,5,61,5,61,5,61,6,17,5,25,5,25,5,25,5,
-    25,5,35,5,35,5,35,6,17,5,32,5,32,5,32,5,
-    32,5,32,5,32,5,32,5,32,114,10,0,0,0,114,23,
-    1,0,0,99,0,0,0,0,0,0,0,0,0,0,0,0,
-    2,0,0,0,0,0,0,0,115,40,0,0,0,101,0,90,
-    1,100,0,90,2,100,1,90,3,100,2,132,0,90,4,100,
-    3,132,0,90,5,100,4,100,5,156,1,100,6,132,2,90,
-    6,100,7,83,0,41,8,218,16,83,111,117,114,99,101,70,
-    105,108,101,76,111,97,100,101,114,122,62,67,111,110,99,114,
-    101,116,101,32,105,109,112,108,101,109,101,110,116,97,116,105,
-    111,110,32,111,102,32,83,111,117,114,99,101,76,111,97,100,
-    101,114,32,117,115,105,110,103,32,116,104,101,32,102,105,108,
-    101,32,115,121,115,116,101,109,46,99,2,0,0,0,0,0,
-    0,0,0,0,0,0,3,0,0,0,3,0,0,0,115,22,
-    0,0,0,116,0,124,1,131,1,125,2,124,2,106,1,124,
-    2,106,2,100,1,156,2,83,0,41,3,122,33,82,101,116,
-    117,114,110,32,116,104,101,32,109,101,116,97,100,97,116,97,
-    32,102,111,114,32,116,104,101,32,112,97,116,104,46,41,2,
-    114,196,0,0,0,114,18,1,0,0,78,41,3,114,78,0,
-    0,0,218,8,115,116,95,109,116,105,109,101,90,7,115,116,
-    95,115,105,122,101,41,3,114,147,0,0,0,114,67,0,0,
-    0,114,22,1,0,0,115,3,0,0,0,32,32,32,114,7,
-    0,0,0,114,6,1,0,0,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,76,4,0,0,243,4,0,0,0,8,2,
-    14,1,114,51,1,0,0,115,22,0,0,0,14,24,25,29,
-    14,30,9,11,26,28,26,37,47,49,47,57,16,58,16,58,
-    9,58,114,10,0,0,0,99,4,0,0,0,0,0,0,0,
-    0,0,0,0,6,0,0,0,3,0,0,0,115,24,0,0,
-    0,116,0,124,1,131,1,125,4,124,0,160,1,124,2,124,
-    3,124,4,100,1,166,3,83,0,41,2,78,169,1,218,5,
-    95,109,111,100,101,41,2,114,143,0,0,0,114,8,1,0,
-    0,41,5,114,147,0,0,0,114,138,0,0,0,114,136,0,
-    0,0,114,44,0,0,0,114,82,0,0,0,115,5,0,0,
-    0,32,32,32,32,32,114,7,0,0,0,114,9,1,0,0,
-    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,81,4,0,0,243,4,0,0,0,8,2,16,1,114,
-    54,1,0,0,115,24,0,0,0,16,26,27,38,16,39,9,
-    13,16,20,16,62,30,43,45,49,57,61,16,62,16,62,9,
-    62,114,10,0,0,0,114,91,0,0,0,114,52,1,0,0,
-    99,3,0,0,0,0,0,0,0,1,0,0,0,9,0,0,
-    0,3,0,0,0,115,250,0,0,0,116,0,124,1,131,1,
-    92,2,125,4,125,5,103,0,125,6,124,4,114,31,116,1,
-    124,4,131,1,115,31,116,0,124,4,131,1,92,2,125,4,
-    125,7,124,6,160,2,124,7,161,1,1,0,124,4,114,31,
-    116,1,124,4,131,1,114,14,116,3,124,6,131,1,68,0,
-    93,47,125,7,116,4,124,4,124,7,131,2,125,4,9,0,
-    116,5,106,6,124,4,131,1,1,0,113,35,35,0,4,0,
-    116,7,121,58,1,0,1,0,1,0,89,0,113,35,4,0,
-    116,8,121,124,1,0,125,8,1,0,116,9,160,10,100,1,
-    124,4,124,8,161,3,1,0,89,0,100,2,125,8,126,8,
-    1,0,100,2,83,0,100,2,125,8,126,8,119,1,37,0,
+    0,3,0,0,0,3,0,0,0,115,16,0,0,0,116,0,
+    116,1,124,0,131,2,160,2,124,1,161,1,83,0,41,2,
+    122,100,76,111,97,100,32,97,32,109,111,100,117,108,101,32,
+    102,114,111,109,32,97,32,102,105,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,78,41,3,218,5,115,117,112,101,114,
+    114,23,1,0,0,114,0,1,0,0,41,3,114,147,0,0,
+    0,114,166,0,0,0,114,27,1,0,0,115,3,0,0,0,
+    32,32,128,114,7,0,0,0,114,0,1,0,0,122,22,70,
+    105,108,101,76,111,97,100,101,114,46,108,111,97,100,95,109,
+    111,100,117,108,101,40,4,0,0,243,2,0,0,0,16,10,
+    114,39,1,0,0,115,16,0,0,0,16,21,22,32,34,38,
+    16,39,16,61,52,60,16,61,9,61,114,10,0,0,0,99,
+    2,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,
+    3,0,0,0,243,6,0,0,0,124,0,106,0,83,0,169,
+    2,122,58,82,101,116,117,114,110,32,116,104,101,32,112,97,
+    116,104,32,116,111,32,116,104,101,32,115,111,117,114,99,101,
+    32,102,105,108,101,32,97,115,32,102,111,117,110,100,32,98,
+    121,32,116,104,101,32,102,105,110,100,101,114,46,78,114,77,
+    0,0,0,114,255,0,0,0,115,2,0,0,0,32,32,114,
+    7,0,0,0,114,209,0,0,0,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,52,4,0,0,243,2,0,0,0,6,3,114,42,1,
+    0,0,115,6,0,0,0,16,20,16,25,9,25,114,10,0,
+    0,0,99,2,0,0,0,0,0,0,0,0,0,0,0,9,
+    0,0,0,3,0,0,0,115,136,0,0,0,116,0,124,0,
+    116,1,116,2,102,2,131,2,114,38,116,3,106,4,116,5,
+    124,1,131,1,131,1,53,0,125,2,124,2,160,6,161,0,
+    2,0,100,1,4,0,4,0,131,3,1,0,83,0,35,0,
+    49,0,115,30,119,4,37,0,1,0,1,0,1,0,89,0,
+    1,0,1,0,100,1,83,0,116,3,106,7,124,1,100,2,
+    131,2,53,0,125,2,124,2,160,6,161,0,2,0,100,1,
+    4,0,4,0,131,3,1,0,83,0,35,0,49,0,115,60,
+    119,4,37,0,1,0,1,0,1,0,89,0,1,0,1,0,
+    100,1,83,0,41,3,122,39,82,101,116,117,114,110,32,116,
+    104,101,32,100,97,116,97,32,102,114,111,109,32,112,97,116,
+    104,32,97,115,32,114,97,119,32,98,121,116,101,115,46,78,
+    218,1,114,41,8,114,188,0,0,0,114,2,1,0,0,218,
+    19,69,120,116,101,110,115,105,111,110,70,105,108,101,76,111,
+    97,100,101,114,114,95,0,0,0,90,9,111,112,101,110,95,
+    99,111,100,101,114,113,0,0,0,90,4,114,101,97,100,114,
+    96,0,0,0,41,3,114,147,0,0,0,114,67,0,0,0,
+    114,98,0,0,0,115,3,0,0,0,32,32,32,114,7,0,
+    0,0,114,11,1,0,0,122,19,70,105,108,101,76,111,97,
+    100,101,114,46,103,101,116,95,100,97,116,97,57,4,0,0,
+    115,22,0,0,0,14,2,16,1,6,1,22,255,2,128,16,
+    0,14,3,6,1,22,255,2,128,16,0,115,28,0,0,0,
+    12,2,2,5,12,252,2,1,2,255,28,1,2,128,16,0,
+    10,2,2,1,2,255,28,1,2,128,16,0,115,136,0,0,
+    0,12,22,23,27,30,42,44,63,29,64,12,65,9,35,18,
+    21,18,31,32,35,36,40,32,41,18,42,13,35,46,50,24,
+    28,24,35,24,35,13,35,13,35,13,35,13,35,13,35,13,
+    35,13,35,13,35,13,35,13,35,13,35,0,0,13,35,13,
+    35,13,35,13,35,13,35,13,35,13,35,13,35,18,21,18,
+    28,29,33,35,38,18,39,13,35,43,47,24,28,24,35,24,
+    35,13,35,13,35,13,35,13,35,13,35,13,35,13,35,13,
+    35,13,35,13,35,13,35,0,0,13,35,13,35,13,35,13,
+    35,13,35,13,35,13,35,13,35,115,24,0,0,0,142,4,
+    25,3,153,4,29,11,158,3,29,11,172,4,55,3,183,4,
+    59,11,188,3,59,11,99,2,0,0,0,0,0,0,0,0,
+    0,0,0,2,0,0,0,3,0,0,0,115,20,0,0,0,
+    100,1,100,2,108,0,109,1,125,2,1,0,124,2,124,0,
+    131,1,83,0,41,3,78,114,0,0,0,0,41,1,218,10,
+    70,105,108,101,82,101,97,100,101,114,41,2,218,17,105,109,
+    112,111,114,116,108,105,98,46,114,101,97,100,101,114,115,114,
+    45,1,0,0,41,3,114,147,0,0,0,114,252,0,0,0,
+    114,45,1,0,0,115,3,0,0,0,32,32,32,114,7,0,
+    0,0,218,19,103,101,116,95,114,101,115,111,117,114,99,101,
+    95,114,101,97,100,101,114,122,30,70,105,108,101,76,111,97,
+    100,101,114,46,103,101,116,95,114,101,115,111,117,114,99,101,
+    95,114,101,97,100,101,114,66,4,0,0,243,4,0,0,0,
+    12,2,8,1,114,48,1,0,0,115,20,0,0,0,9,49,
+    9,49,9,49,9,49,9,49,9,49,16,26,27,31,16,32,
+    9,32,114,10,0,0,0,41,13,114,153,0,0,0,114,152,
+    0,0,0,114,154,0,0,0,114,155,0,0,0,114,242,0,
+    0,0,114,29,1,0,0,114,36,1,0,0,114,163,0,0,
+    0,114,0,1,0,0,114,209,0,0,0,114,11,1,0,0,
+    114,47,1,0,0,90,13,95,95,99,108,97,115,115,99,101,
+    108,108,95,95,41,1,114,27,1,0,0,115,1,0,0,0,
+    64,114,7,0,0,0,114,23,1,0,0,114,23,1,0,0,
+    22,4,0,0,115,24,0,0,0,10,128,4,2,6,3,6,
+    6,6,4,2,3,12,1,2,11,8,1,6,4,2,9,16,
+    1,115,92,0,0,0,2,128,0,129,0,129,0,129,0,129,
+    0,129,0,129,0,129,0,129,8,226,0,127,0,127,0,127,
+    0,127,0,127,0,127,0,127,0,127,2,33,0,129,0,129,
+    0,129,0,129,0,129,0,129,0,129,0,129,2,223,0,127,
+    0,127,0,127,0,127,0,127,0,127,0,127,0,127,6,39,
+    6,4,6,3,2,2,12,10,2,2,8,3,6,9,2,2,
+    16,3,115,80,0,0,0,0,0,1,1,1,1,1,1,1,
+    1,5,34,1,1,5,25,5,25,5,25,5,49,5,49,5,
+    49,5,49,5,49,5,49,6,17,5,61,5,61,5,61,5,
+    61,5,61,5,61,6,17,5,25,5,25,5,25,5,25,5,
+    35,5,35,5,35,6,17,5,32,5,32,5,32,5,32,5,
+    32,5,32,5,32,5,32,114,10,0,0,0,114,23,1,0,
+    0,99,0,0,0,0,0,0,0,0,0,0,0,0,2,0,
+    0,0,0,0,0,0,115,40,0,0,0,101,0,90,1,100,
+    0,90,2,100,1,90,3,100,2,132,0,90,4,100,3,132,
+    0,90,5,100,4,100,5,156,1,100,6,132,2,90,6,100,
+    7,83,0,41,8,218,16,83,111,117,114,99,101,70,105,108,
+    101,76,111,97,100,101,114,122,62,67,111,110,99,114,101,116,
+    101,32,105,109,112,108,101,109,101,110,116,97,116,105,111,110,
+    32,111,102,32,83,111,117,114,99,101,76,111,97,100,101,114,
+    32,117,115,105,110,103,32,116,104,101,32,102,105,108,101,32,
+    115,121,115,116,101,109,46,99,2,0,0,0,0,0,0,0,
+    0,0,0,0,3,0,0,0,3,0,0,0,115,22,0,0,
+    0,116,0,124,1,131,1,125,2,124,2,106,1,124,2,106,
+    2,100,1,156,2,83,0,41,3,122,33,82,101,116,117,114,
+    110,32,116,104,101,32,109,101,116,97,100,97,116,97,32,102,
+    111,114,32,116,104,101,32,112,97,116,104,46,41,2,114,196,
+    0,0,0,114,18,1,0,0,78,41,3,114,78,0,0,0,
+    218,8,115,116,95,109,116,105,109,101,90,7,115,116,95,115,
+    105,122,101,41,3,114,147,0,0,0,114,67,0,0,0,114,
+    22,1,0,0,115,3,0,0,0,32,32,32,114,7,0,0,
+    0,114,6,1,0,0,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,76,4,0,0,243,4,0,0,0,8,2,14,1,
+    114,51,1,0,0,115,22,0,0,0,14,24,25,29,14,30,
+    9,11,26,28,26,37,47,49,47,57,16,58,16,58,9,58,
+    114,10,0,0,0,99,4,0,0,0,0,0,0,0,0,0,
+    0,0,6,0,0,0,3,0,0,0,115,24,0,0,0,116,
+    0,124,1,131,1,125,4,124,0,160,1,124,2,124,3,124,
+    4,100,1,166,3,83,0,41,2,78,169,1,218,5,95,109,
+    111,100,101,41,2,114,143,0,0,0,114,8,1,0,0,41,
+    5,114,147,0,0,0,114,138,0,0,0,114,136,0,0,0,
+    114,44,0,0,0,114,82,0,0,0,115,5,0,0,0,32,
+    32,32,32,32,114,7,0,0,0,114,9,1,0,0,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,
+    81,4,0,0,243,4,0,0,0,8,2,16,1,114,54,1,
+    0,0,115,24,0,0,0,16,26,27,38,16,39,9,13,16,
+    20,16,62,30,43,45,49,57,61,16,62,16,62,9,62,114,
+    10,0,0,0,114,91,0,0,0,114,52,1,0,0,99,3,
+    0,0,0,0,0,0,0,1,0,0,0,9,0,0,0,3,
+    0,0,0,115,250,0,0,0,116,0,124,1,131,1,92,2,
+    125,4,125,5,103,0,125,6,124,4,114,31,116,1,124,4,
+    131,1,115,31,116,0,124,4,131,1,92,2,125,4,125,7,
+    124,6,160,2,124,7,161,1,1,0,124,4,114,31,116,1,
+    124,4,131,1,114,14,116,3,124,6,131,1,68,0,93,48,
+    125,7,116,4,124,4,124,7,131,2,125,4,9,0,116,5,
+    106,6,124,4,131,1,1,0,113,35,35,0,4,0,116,7,
+    121,58,1,0,1,0,1,0,89,0,113,35,4,0,116,8,
+    121,82,1,0,125,8,1,0,116,9,160,10,100,1,124,4,
+    124,8,161,3,1,0,89,0,100,2,125,8,126,8,1,0,
+    100,2,83,0,100,2,125,8,126,8,119,1,119,0,37,0,
     9,0,116,11,124,1,124,2,124,3,131,3,1,0,116,9,
     160,10,100,3,124,1,161,2,1,0,100,2,83,0,35,0,
     4,0,116,8,121,123,1,0,125,8,1,0,116,9,160,10,
     100,1,124,1,124,8,161,3,1,0,89,0,100,2,125,8,
-    126,8,100,2,83,0,100,2,125,8,126,8,119,1,37,0,
-    119,0,119,0,41,4,122,27,87,114,105,116,101,32,98,121,
-    116,101,115,32,100,97,116,97,32,116,111,32,97,32,102,105,
-    108,101,46,122,27,99,111,117,108,100,32,110,111,116,32,99,
-    114,101,97,116,101,32,123,33,114,125,58,32,123,33,114,125,
-    78,122,12,99,114,101,97,116,101,100,32,123,33,114,125,41,
-    12,114,76,0,0,0,114,87,0,0,0,114,63,0,0,0,
-    218,8,114,101,118,101,114,115,101,100,114,69,0,0,0,114,
-    21,0,0,0,90,5,109,107,100,105,114,218,15,70,105,108,
-    101,69,120,105,115,116,115,69,114,114,111,114,114,80,0,0,
-    0,114,162,0,0,0,114,176,0,0,0,114,99,0,0,0,
-    41,9,114,147,0,0,0,114,67,0,0,0,114,44,0,0,
-    0,114,53,1,0,0,218,6,112,97,114,101,110,116,114,124,
-    0,0,0,114,65,0,0,0,114,70,0,0,0,114,12,1,
-    0,0,115,9,0,0,0,32,32,32,32,32,32,32,32,32,
-    114,7,0,0,0,114,8,1,0,0,122,25,83,111,117,114,
-    99,101,70,105,108,101,76,111,97,100,101,114,46,115,101,116,
-    95,100,97,116,97,86,4,0,0,115,60,0,0,0,12,2,
-    4,1,12,2,12,1,10,1,12,254,12,4,10,1,2,1,
-    12,1,2,128,12,1,4,2,12,1,6,3,4,1,4,255,
-    14,2,10,128,2,1,12,1,16,1,2,128,12,1,8,2,
-    2,1,16,255,10,128,2,254,2,247,115,90,0,0,0,12,
-    2,4,1,2,2,2,2,6,254,2,2,12,255,10,1,2,
-    254,2,2,6,254,2,2,6,2,4,12,2,244,10,1,2,
-    11,12,247,2,128,2,3,2,254,12,2,2,6,2,251,8,
-    5,2,254,2,1,2,255,8,1,14,1,10,128,2,7,12,
-    251,16,1,2,128,2,4,2,253,8,3,2,255,2,1,4,
-    255,18,1,10,128,2,0,2,249,115,250,0,0,0,28,39,
-    40,44,28,45,9,25,9,15,17,25,22,24,9,19,15,21,
-    9,36,30,41,42,48,30,49,9,36,28,39,40,46,28,47,
-    13,25,13,19,21,25,13,23,13,36,31,35,13,36,13,36,
-    15,21,9,36,30,41,42,48,30,49,9,36,21,29,30,40,
-    21,41,9,23,9,23,13,17,22,32,33,39,41,45,22,46,
-    13,19,13,23,17,20,17,26,27,33,17,34,17,34,17,34,
-    0,0,13,25,20,35,13,25,13,25,13,25,13,25,17,25,
-    17,25,13,23,20,27,13,23,13,23,13,23,13,23,17,27,
-    17,57,45,74,45,51,53,56,17,57,17,57,17,23,17,23,
-    17,23,17,23,17,23,17,23,17,23,0,0,0,0,0,0,
-    0,0,0,0,9,45,13,26,27,31,33,37,39,44,13,45,
-    13,45,13,23,13,62,41,55,57,61,13,62,13,62,13,62,
-    13,62,0,0,9,45,16,23,9,45,9,45,9,45,9,45,
-    13,23,13,45,41,70,72,76,41,44,13,45,13,45,13,45,
-    13,45,13,45,13,45,13,45,13,45,0,0,0,0,0,0,
-    0,0,0,0,9,45,13,23,115,62,0,0,0,171,5,49,
-    2,177,7,65,18,9,186,6,65,18,9,193,0,7,65,14,
-    9,193,14,4,65,18,9,193,20,12,65,34,0,193,34,7,
-    65,58,7,193,41,7,65,54,7,193,54,4,65,58,7,193,
-    59,1,65,58,7,193,60,1,65,18,9,78,41,7,114,153,
-    0,0,0,114,152,0,0,0,114,154,0,0,0,114,155,0,
-    0,0,114,6,1,0,0,114,9,1,0,0,114,8,1,0,
-    0,114,13,0,0,0,114,10,0,0,0,114,7,0,0,0,
-    114,49,1,0,0,114,49,1,0,0,72,4,0,0,115,10,
-    0,0,0,8,0,4,2,6,2,6,5,16,5,115,78,0,
-    0,0,0,129,0,129,0,129,0,129,0,129,0,129,0,129,
-    0,129,8,176,0,127,0,127,0,127,0,127,0,127,0,127,
-    0,127,0,127,2,82,0,129,0,129,0,129,0,129,0,129,
-    0,129,0,129,0,129,2,174,0,127,0,127,0,127,0,127,
-    0,127,0,127,0,127,0,127,6,87,6,5,2,2,14,28,
-    115,40,0,0,0,1,1,1,1,1,1,1,1,5,73,1,
-    1,5,58,5,58,5,58,5,62,5,62,5,62,45,50,5,
-    45,5,45,5,45,5,45,5,45,5,45,5,45,114,10,0,
-    0,0,114,49,1,0,0,99,0,0,0,0,0,0,0,0,
-    0,0,0,0,1,0,0,0,0,0,0,0,115,28,0,0,
-    0,101,0,90,1,100,0,90,2,100,1,90,3,100,2,132,
-    0,90,4,100,3,132,0,90,5,100,4,83,0,41,5,218,
-    20,83,111,117,114,99,101,108,101,115,115,70,105,108,101,76,
-    111,97,100,101,114,122,45,76,111,97,100,101,114,32,119,104,
-    105,99,104,32,104,97,110,100,108,101,115,32,115,111,117,114,
-    99,101,108,101,115,115,32,102,105,108,101,32,105,109,112,111,
-    114,116,115,46,99,2,0,0,0,0,0,0,0,0,0,0,
-    0,5,0,0,0,3,0,0,0,115,68,0,0,0,124,0,
-    160,0,124,1,161,1,125,2,124,0,160,1,124,2,161,1,
-    125,3,124,1,124,2,100,1,156,2,125,4,116,2,124,3,
-    124,1,124,4,131,3,1,0,116,3,116,4,124,3,131,1,
-    100,2,100,0,133,2,25,0,124,1,124,2,100,3,141,3,
-    83,0,41,4,78,114,186,0,0,0,114,172,0,0,0,41,
-    2,114,145,0,0,0,114,136,0,0,0,41,5,114,209,0,
-    0,0,114,11,1,0,0,114,179,0,0,0,114,192,0,0,
-    0,114,19,1,0,0,41,5,114,147,0,0,0,114,166,0,
-    0,0,114,67,0,0,0,114,44,0,0,0,114,178,0,0,
-    0,115,5,0,0,0,32,32,32,32,32,114,7,0,0,0,
-    114,249,0,0,0,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,121,4,0,0,115,22,0,0,0,10,1,10,
-    1,2,4,2,1,6,254,12,4,2,1,14,1,2,1,2,
-    1,6,253,115,24,0,0,0,10,1,10,1,2,4,2,1,
-    4,1,2,253,12,4,2,1,14,1,2,1,2,1,6,1,
-    115,68,0,0,0,16,20,16,43,34,42,16,43,9,13,16,
-    20,16,35,30,34,16,35,9,13,21,29,21,25,23,10,23,
-    10,9,20,9,22,23,27,29,37,39,50,9,51,9,51,16,
-    33,13,23,24,28,13,29,30,32,30,33,30,33,13,34,18,
-    26,27,31,16,10,16,10,9,10,114,10,0,0,0,99,2,
-    0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,3,
-    0,0,0,114,26,0,0,0,41,2,122,39,82,101,116,117,
-    114,110,32,78,111,110,101,32,97,115,32,116,104,101,114,101,
-    32,105,115,32,110,111,32,115,111,117,114,99,101,32,99,111,
-    100,101,46,78,114,13,0,0,0,114,255,0,0,0,115,2,
-    0,0,0,32,32,114,7,0,0,0,114,13,1,0,0,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,
-    137,4,0,0,114,27,0,0,0,114,27,0,0,0,115,4,
-    0,0,0,16,20,16,20,114,10,0,0,0,78,41,6,114,
-    153,0,0,0,114,152,0,0,0,114,154,0,0,0,114,155,
-    0,0,0,114,249,0,0,0,114,13,1,0,0,114,13,0,
-    0,0,114,10,0,0,0,114,7,0,0,0,114,58,1,0,
-    0,114,58,1,0,0,117,4,0,0,115,8,0,0,0,8,
-    0,4,2,6,2,10,16,115,76,0,0,0,0,129,0,129,
-    0,129,0,129,0,129,0,129,0,129,0,129,8,131,0,127,
-    0,127,0,127,0,127,0,127,0,127,0,127,0,127,2,127,
+    126,8,100,2,83,0,100,2,125,8,126,8,119,1,119,0,
+    37,0,41,4,122,27,87,114,105,116,101,32,98,121,116,101,
+    115,32,100,97,116,97,32,116,111,32,97,32,102,105,108,101,
+    46,122,27,99,111,117,108,100,32,110,111,116,32,99,114,101,
+    97,116,101,32,123,33,114,125,58,32,123,33,114,125,78,122,
+    12,99,114,101,97,116,101,100,32,123,33,114,125,41,12,114,
+    76,0,0,0,114,87,0,0,0,114,63,0,0,0,218,8,
+    114,101,118,101,114,115,101,100,114,69,0,0,0,114,21,0,
+    0,0,90,5,109,107,100,105,114,218,15,70,105,108,101,69,
+    120,105,115,116,115,69,114,114,111,114,114,80,0,0,0,114,
+    162,0,0,0,114,176,0,0,0,114,99,0,0,0,41,9,
+    114,147,0,0,0,114,67,0,0,0,114,44,0,0,0,114,
+    53,1,0,0,218,6,112,97,114,101,110,116,114,124,0,0,
+    0,114,65,0,0,0,114,70,0,0,0,114,12,1,0,0,
+    115,9,0,0,0,32,32,32,32,32,32,32,32,32,114,7,
+    0,0,0,114,8,1,0,0,122,25,83,111,117,114,99,101,
+    70,105,108,101,76,111,97,100,101,114,46,115,101,116,95,100,
+    97,116,97,86,4,0,0,115,64,0,0,0,12,2,4,1,
+    12,2,12,1,10,1,12,254,12,4,10,1,2,1,12,1,
+    2,128,12,1,4,2,12,1,6,3,4,1,4,255,14,2,
+    8,128,2,251,2,128,2,6,12,1,16,1,2,128,12,1,
+    8,2,2,1,16,255,8,128,2,254,2,128,115,94,0,0,
+    0,12,2,4,1,2,2,2,2,6,254,2,2,12,255,10,
+    1,2,254,2,2,6,254,2,2,6,2,4,12,2,244,10,
+    1,2,11,12,247,2,128,2,3,2,254,12,2,2,6,2,
+    251,8,5,2,254,2,1,2,255,8,1,14,1,8,128,2,
+    0,2,128,2,7,12,251,16,1,2,128,2,4,2,253,8,
+    3,2,255,2,1,4,255,18,1,8,128,2,0,2,128,115,
+    250,0,0,0,28,39,40,44,28,45,9,25,9,15,17,25,
+    22,24,9,19,15,21,9,36,30,41,42,48,30,49,9,36,
+    28,39,40,46,28,47,13,25,13,19,21,25,13,23,13,36,
+    31,35,13,36,13,36,15,21,9,36,30,41,42,48,30,49,
+    9,36,21,29,30,40,21,41,9,23,9,23,13,17,22,32,
+    33,39,41,45,22,46,13,19,13,23,17,20,17,26,27,33,
+    17,34,17,34,17,34,0,0,13,25,20,35,13,25,13,25,
+    13,25,13,25,17,25,17,25,13,23,20,27,13,23,13,23,
+    13,23,13,23,17,27,17,57,45,74,45,51,53,56,17,57,
+    17,57,17,23,17,23,17,23,17,23,17,23,17,23,17,23,
+    0,0,0,0,0,0,0,0,13,23,0,0,9,45,13,26,
+    27,31,33,37,39,44,13,45,13,45,13,23,13,62,41,55,
+    57,61,13,62,13,62,13,62,13,62,0,0,9,45,16,23,
+    9,45,9,45,9,45,9,45,13,23,13,45,41,70,72,76,
+    41,44,13,45,13,45,13,45,13,45,13,45,13,45,13,45,
+    13,45,0,0,0,0,0,0,0,0,9,45,0,0,115,50,
+    0,0,0,171,5,49,2,177,7,65,19,9,186,6,65,19,
+    9,193,0,7,65,14,9,193,14,5,65,19,9,193,21,12,
+    65,35,0,193,35,7,65,60,7,193,42,7,65,55,7,193,
+    55,5,65,60,7,78,41,7,114,153,0,0,0,114,152,0,
+    0,0,114,154,0,0,0,114,155,0,0,0,114,6,1,0,
+    0,114,9,1,0,0,114,8,1,0,0,114,13,0,0,0,
+    114,10,0,0,0,114,7,0,0,0,114,49,1,0,0,114,
+    49,1,0,0,72,4,0,0,115,10,0,0,0,8,0,4,
+    2,6,2,6,5,16,5,115,78,0,0,0,0,129,0,129,
+    0,129,0,129,0,129,0,129,0,129,0,129,8,176,0,127,
+    0,127,0,127,0,127,0,127,0,127,0,127,0,127,2,82,
     0,129,0,129,0,129,0,129,0,129,0,129,0,129,0,129,
-    2,129,0,127,0,127,0,127,0,127,0,127,0,127,0,127,
-    0,127,0,127,6,16,10,4,115,28,0,0,0,1,1,1,
-    1,1,1,1,1,5,56,1,1,5,10,5,10,5,10,5,
-    20,5,20,5,20,5,20,5,20,114,10,0,0,0,114,58,
-    1,0,0,99,0,0,0,0,0,0,0,0,0,0,0,0,
-    2,0,0,0,0,0,0,0,115,74,0,0,0,101,0,90,
-    1,100,0,90,2,100,1,90,3,100,2,132,0,90,4,100,
-    3,132,0,90,5,100,4,132,0,90,6,100,5,132,0,90,
-    7,100,6,132,0,90,8,100,7,132,0,90,9,100,8,132,
-    0,90,10,100,9,132,0,90,11,101,12,100,10,132,0,131,
-    1,90,13,100,11,83,0,41,12,114,44,1,0,0,122,93,
-    76,111,97,100,101,114,32,102,111,114,32,101,120,116,101,110,
-    115,105,111,110,32,109,111,100,117,108,101,115,46,10,10,32,
-    32,32,32,84,104,101,32,99,111,110,115,116,114,117,99,116,
-    111,114,32,105,115,32,100,101,115,105,103,110,101,100,32,116,
-    111,32,119,111,114,107,32,119,105,116,104,32,70,105,108,101,
-    70,105,110,100,101,114,46,10,10,32,32,32,32,99,3,0,
-    0,0,0,0,0,0,0,0,0,0,2,0,0,0,3,0,
-    0,0,115,16,0,0,0,124,1,124,0,95,0,124,2,124,
-    0,95,1,100,0,83,0,114,71,0,0,0,114,186,0,0,
-    0,41,3,114,147,0,0,0,114,145,0,0,0,114,67,0,
-    0,0,115,3,0,0,0,32,32,32,114,7,0,0,0,114,
-    242,0,0,0,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,150,4,0,0,243,4,0,0,0,6,1,10,1,114,
-    59,1,0,0,115,16,0,0,0,21,25,9,13,9,18,21,
-    25,9,13,9,18,9,18,9,18,114,10,0,0,0,99,2,
-    0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,3,
-    0,0,0,114,25,1,0,0,114,71,0,0,0,114,26,1,
-    0,0,114,28,1,0,0,115,2,0,0,0,32,32,114,7,
-    0,0,0,114,29,1,0,0,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,154,4,0,0,114,30,1,0,0,114,31,1,
-    0,0,115,24,0,0,0,17,21,17,31,35,40,35,50,17,
-    50,17,48,17,21,17,30,34,39,34,48,17,48,9,49,114,
-    10,0,0,0,99,1,0,0,0,0,0,0,0,0,0,0,
-    0,3,0,0,0,3,0,0,0,114,32,1,0,0,114,71,
-    0,0,0,114,33,1,0,0,114,35,1,0,0,115,1,0,
-    0,0,32,114,7,0,0,0,114,36,1,0,0,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,158,4,0,0,114,
-    37,1,0,0,114,37,1,0,0,115,20,0,0,0,16,20,
-    21,25,21,30,16,31,34,38,39,43,39,48,34,49,16,49,
-    9,49,114,10,0,0,0,99,2,0,0,0,0,0,0,0,
-    0,0,0,0,5,0,0,0,3,0,0,0,115,36,0,0,
-    0,116,0,160,1,116,2,106,3,124,1,161,2,125,2,116,
-    0,160,4,100,1,124,1,106,5,124,0,106,6,161,3,1,
-    0,124,2,83,0,41,3,122,40,67,114,101,97,116,101,32,
-    97,110,32,117,110,105,110,105,116,105,97,108,105,122,101,100,
-    32,101,120,116,101,110,115,105,111,110,32,109,111,100,117,108,
-    101,122,38,101,120,116,101,110,115,105,111,110,32,109,111,100,
-    117,108,101,32,123,33,114,125,32,108,111,97,100,101,100,32,
-    102,114,111,109,32,123,33,114,125,78,41,7,114,162,0,0,
-    0,114,250,0,0,0,114,190,0,0,0,90,14,99,114,101,
-    97,116,101,95,100,121,110,97,109,105,99,114,176,0,0,0,
-    114,145,0,0,0,114,67,0,0,0,41,3,114,147,0,0,
-    0,114,216,0,0,0,114,252,0,0,0,115,3,0,0,0,
-    32,32,32,114,7,0,0,0,114,246,0,0,0,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,
-    161,4,0,0,115,14,0,0,0,4,2,6,1,4,255,6,
-    2,8,1,4,255,4,2,115,16,0,0,0,2,2,10,1,
-    2,255,2,2,2,1,2,255,12,1,4,1,115,36,0,0,
-    0,18,28,18,39,13,17,13,32,34,38,18,39,9,15,9,
-    19,9,47,37,77,26,30,26,35,37,41,37,46,9,47,9,
-    47,16,22,9,22,114,10,0,0,0,99,2,0,0,0,0,
-    0,0,0,0,0,0,0,5,0,0,0,3,0,0,0,115,
-    36,0,0,0,116,0,160,1,116,2,106,3,124,1,161,2,
-    1,0,116,0,160,4,100,1,124,0,106,5,124,0,106,6,
-    161,3,1,0,100,2,83,0,41,3,122,30,73,110,105,116,
-    105,97,108,105,122,101,32,97,110,32,101,120,116,101,110,115,
-    105,111,110,32,109,111,100,117,108,101,122,40,101,120,116,101,
-    110,115,105,111,110,32,109,111,100,117,108,101,32,123,33,114,
-    125,32,101,120,101,99,117,116,101,100,32,102,114,111,109,32,
-    123,33,114,125,78,41,7,114,162,0,0,0,114,250,0,0,
-    0,114,190,0,0,0,90,12,101,120,101,99,95,100,121,110,
-    97,109,105,99,114,176,0,0,0,114,145,0,0,0,114,67,
-    0,0,0,169,2,114,147,0,0,0,114,252,0,0,0,115,
-    2,0,0,0,32,32,114,7,0,0,0,114,253,0,0,0,
-    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,169,4,0,0,115,8,0,0,0,14,2,6,1,8,1,
-    8,255,115,10,0,0,0,14,2,2,1,2,1,2,255,16,
-    1,115,36,0,0,0,9,19,9,72,46,50,46,63,65,71,
-    9,72,9,72,9,19,9,47,37,79,26,30,26,35,37,41,
-    37,46,9,47,9,47,9,47,9,47,114,10,0,0,0,99,
-    2,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,
-    3,0,0,0,115,36,0,0,0,135,2,116,0,124,0,106,
-    1,131,1,100,1,25,0,138,2,116,2,136,2,102,1,100,
-    2,132,8,116,3,68,0,131,1,131,1,83,0,41,4,122,
-    49,82,101,116,117,114,110,32,84,114,117,101,32,105,102,32,
-    116,104,101,32,101,120,116,101,110,115,105,111,110,32,109,111,
-    100,117,108,101,32,105,115,32,97,32,112,97,99,107,97,103,
-    101,46,114,3,0,0,0,99,1,0,0,0,0,0,0,0,
-    0,0,0,0,4,0,0,0,51,0,0,0,115,28,0,0,
-    0,129,0,124,0,93,9,125,1,137,2,100,0,124,1,23,
-    0,107,2,86,0,1,0,113,2,100,1,83,0,41,2,114,
-    242,0,0,0,78,114,13,0,0,0,41,3,114,5,0,0,
-    0,218,6,115,117,102,102,105,120,218,9,102,105,108,101,95,
-    110,97,109,101,115,3,0,0,0,32,32,128,114,7,0,0,
-    0,114,8,0,0,0,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,
-    60,103,101,110,101,120,112,114,62,178,4,0,0,115,8,0,
-    0,0,2,128,4,0,2,1,20,255,115,8,0,0,0,2,
-    128,6,1,10,255,10,1,115,28,0,0,0,0,0,19,53,
-    19,53,24,30,20,29,33,43,46,52,33,52,20,52,19,53,
-    19,53,19,53,19,53,19,53,114,10,0,0,0,78,41,4,
-    114,76,0,0,0,114,67,0,0,0,218,3,97,110,121,114,
-    238,0,0,0,41,3,114,147,0,0,0,114,166,0,0,0,
-    114,62,1,0,0,115,3,0,0,0,32,32,64,114,7,0,
-    0,0,114,212,0,0,0,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,175,4,0,0,115,10,0,0,0,
-    2,128,14,2,10,1,2,1,8,255,115,8,0,0,0,2,
-    128,14,2,2,1,18,1,115,36,0,0,0,0,0,21,32,
-    33,37,33,42,21,43,44,45,21,46,9,18,16,19,19,53,
-    19,53,19,53,19,53,34,52,19,53,19,53,16,53,9,53,
-    114,10,0,0,0,99,2,0,0,0,0,0,0,0,0,0,
-    0,0,1,0,0,0,3,0,0,0,114,26,0,0,0,41,
-    2,122,63,82,101,116,117,114,110,32,78,111,110,101,32,97,
-    115,32,97,110,32,101,120,116,101,110,115,105,111,110,32,109,
-    111,100,117,108,101,32,99,97,110,110,111,116,32,99,114,101,
-    97,116,101,32,97,32,99,111,100,101,32,111,98,106,101,99,
-    116,46,78,114,13,0,0,0,114,255,0,0,0,115,2,0,
-    0,0,32,32,114,7,0,0,0,114,249,0,0,0,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,181,4,0,0,
-    114,27,0,0,0,114,27,0,0,0,115,4,0,0,0,16,
-    20,16,20,114,10,0,0,0,99,2,0,0,0,0,0,0,
+    2,174,0,127,0,127,0,127,0,127,0,127,0,127,0,127,
+    0,127,6,87,6,5,2,2,14,28,115,40,0,0,0,1,
+    1,1,1,1,1,1,1,5,73,1,1,5,58,5,58,5,
+    58,5,62,5,62,5,62,45,50,5,45,5,45,5,45,5,
+    45,5,45,5,45,5,45,114,10,0,0,0,114,49,1,0,
+    0,99,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
+    0,0,0,0,0,0,115,28,0,0,0,101,0,90,1,100,
+    0,90,2,100,1,90,3,100,2,132,0,90,4,100,3,132,
+    0,90,5,100,4,83,0,41,5,218,20,83,111,117,114,99,
+    101,108,101,115,115,70,105,108,101,76,111,97,100,101,114,122,
+    45,76,111,97,100,101,114,32,119,104,105,99,104,32,104,97,
+    110,100,108,101,115,32,115,111,117,114,99,101,108,101,115,115,
+    32,102,105,108,101,32,105,109,112,111,114,116,115,46,99,2,
+    0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,3,
+    0,0,0,115,68,0,0,0,124,0,160,0,124,1,161,1,
+    125,2,124,0,160,1,124,2,161,1,125,3,124,1,124,2,
+    100,1,156,2,125,4,116,2,124,3,124,1,124,4,131,3,
+    1,0,116,3,116,4,124,3,131,1,100,2,100,0,133,2,
+    25,0,124,1,124,2,100,3,141,3,83,0,41,4,78,114,
+    186,0,0,0,114,172,0,0,0,41,2,114,145,0,0,0,
+    114,136,0,0,0,41,5,114,209,0,0,0,114,11,1,0,
+    0,114,179,0,0,0,114,192,0,0,0,114,19,1,0,0,
+    41,5,114,147,0,0,0,114,166,0,0,0,114,67,0,0,
+    0,114,44,0,0,0,114,178,0,0,0,115,5,0,0,0,
+    32,32,32,32,32,114,7,0,0,0,114,249,0,0,0,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,121,4,
+    0,0,115,22,0,0,0,10,1,10,1,2,4,2,1,6,
+    254,12,4,2,1,14,1,2,1,2,1,6,253,115,24,0,
+    0,0,10,1,10,1,2,4,2,1,4,1,2,253,12,4,
+    2,1,14,1,2,1,2,1,6,1,115,68,0,0,0,16,
+    20,16,43,34,42,16,43,9,13,16,20,16,35,30,34,16,
+    35,9,13,21,29,21,25,23,10,23,10,9,20,9,22,23,
+    27,29,37,39,50,9,51,9,51,16,33,13,23,24,28,13,
+    29,30,32,30,33,30,33,13,34,18,26,27,31,16,10,16,
+    10,9,10,114,10,0,0,0,99,2,0,0,0,0,0,0,
     0,0,0,0,0,1,0,0,0,3,0,0,0,114,26,0,
-    0,0,41,2,122,53,82,101,116,117,114,110,32,78,111,110,
-    101,32,97,115,32,101,120,116,101,110,115,105,111,110,32,109,
-    111,100,117,108,101,115,32,104,97,118,101,32,110,111,32,115,
-    111,117,114,99,101,32,99,111,100,101,46,78,114,13,0,0,
+    0,0,41,2,122,39,82,101,116,117,114,110,32,78,111,110,
+    101,32,97,115,32,116,104,101,114,101,32,105,115,32,110,111,
+    32,115,111,117,114,99,101,32,99,111,100,101,46,78,114,13,
+    0,0,0,114,255,0,0,0,115,2,0,0,0,32,32,114,
+    7,0,0,0,114,13,1,0,0,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,137,4,0,0,114,27,
+    0,0,0,114,27,0,0,0,115,4,0,0,0,16,20,16,
+    20,114,10,0,0,0,78,41,6,114,153,0,0,0,114,152,
+    0,0,0,114,154,0,0,0,114,155,0,0,0,114,249,0,
+    0,0,114,13,1,0,0,114,13,0,0,0,114,10,0,0,
+    0,114,7,0,0,0,114,58,1,0,0,114,58,1,0,0,
+    117,4,0,0,115,8,0,0,0,8,0,4,2,6,2,10,
+    16,115,76,0,0,0,0,129,0,129,0,129,0,129,0,129,
+    0,129,0,129,0,129,8,131,0,127,0,127,0,127,0,127,
+    0,127,0,127,0,127,0,127,2,127,0,129,0,129,0,129,
+    0,129,0,129,0,129,0,129,0,129,2,129,0,127,0,127,
+    0,127,0,127,0,127,0,127,0,127,0,127,0,127,6,16,
+    10,4,115,28,0,0,0,1,1,1,1,1,1,1,1,5,
+    56,1,1,5,10,5,10,5,10,5,20,5,20,5,20,5,
+    20,5,20,114,10,0,0,0,114,58,1,0,0,99,0,0,
+    0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,
+    0,0,115,74,0,0,0,101,0,90,1,100,0,90,2,100,
+    1,90,3,100,2,132,0,90,4,100,3,132,0,90,5,100,
+    4,132,0,90,6,100,5,132,0,90,7,100,6,132,0,90,
+    8,100,7,132,0,90,9,100,8,132,0,90,10,100,9,132,
+    0,90,11,101,12,100,10,132,0,131,1,90,13,100,11,83,
+    0,41,12,114,44,1,0,0,122,93,76,111,97,100,101,114,
+    32,102,111,114,32,101,120,116,101,110,115,105,111,110,32,109,
+    111,100,117,108,101,115,46,10,10,32,32,32,32,84,104,101,
+    32,99,111,110,115,116,114,117,99,116,111,114,32,105,115,32,
+    100,101,115,105,103,110,101,100,32,116,111,32,119,111,114,107,
+    32,119,105,116,104,32,70,105,108,101,70,105,110,100,101,114,
+    46,10,10,32,32,32,32,99,3,0,0,0,0,0,0,0,
+    0,0,0,0,2,0,0,0,3,0,0,0,115,16,0,0,
+    0,124,1,124,0,95,0,124,2,124,0,95,1,100,0,83,
+    0,114,71,0,0,0,114,186,0,0,0,41,3,114,147,0,
+    0,0,114,145,0,0,0,114,67,0,0,0,115,3,0,0,
+    0,32,32,32,114,7,0,0,0,114,242,0,0,0,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,150,4,0,0,
+    243,4,0,0,0,6,1,10,1,114,59,1,0,0,115,16,
+    0,0,0,21,25,9,13,9,18,21,25,9,13,9,18,9,
+    18,9,18,114,10,0,0,0,99,2,0,0,0,0,0,0,
+    0,0,0,0,0,2,0,0,0,3,0,0,0,114,25,1,
+    0,0,114,71,0,0,0,114,26,1,0,0,114,28,1,0,
+    0,115,2,0,0,0,32,32,114,7,0,0,0,114,29,1,
+    0,0,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,154,4,
+    0,0,114,30,1,0,0,114,31,1,0,0,115,24,0,0,
+    0,17,21,17,31,35,40,35,50,17,50,17,48,17,21,17,
+    30,34,39,34,48,17,48,9,49,114,10,0,0,0,99,1,
+    0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,3,
+    0,0,0,114,32,1,0,0,114,71,0,0,0,114,33,1,
+    0,0,114,35,1,0,0,115,1,0,0,0,32,114,7,0,
+    0,0,114,36,1,0,0,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,158,4,0,0,114,37,1,0,0,114,37,
+    1,0,0,115,20,0,0,0,16,20,21,25,21,30,16,31,
+    34,38,39,43,39,48,34,49,16,49,9,49,114,10,0,0,
+    0,99,2,0,0,0,0,0,0,0,0,0,0,0,5,0,
+    0,0,3,0,0,0,115,36,0,0,0,116,0,160,1,116,
+    2,106,3,124,1,161,2,125,2,116,0,160,4,100,1,124,
+    1,106,5,124,0,106,6,161,3,1,0,124,2,83,0,41,
+    3,122,40,67,114,101,97,116,101,32,97,110,32,117,110,105,
+    110,105,116,105,97,108,105,122,101,100,32,101,120,116,101,110,
+    115,105,111,110,32,109,111,100,117,108,101,122,38,101,120,116,
+    101,110,115,105,111,110,32,109,111,100,117,108,101,32,123,33,
+    114,125,32,108,111,97,100,101,100,32,102,114,111,109,32,123,
+    33,114,125,78,41,7,114,162,0,0,0,114,250,0,0,0,
+    114,190,0,0,0,90,14,99,114,101,97,116,101,95,100,121,
+    110,97,109,105,99,114,176,0,0,0,114,145,0,0,0,114,
+    67,0,0,0,41,3,114,147,0,0,0,114,216,0,0,0,
+    114,252,0,0,0,115,3,0,0,0,32,32,32,114,7,0,
+    0,0,114,246,0,0,0,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,161,4,0,0,115,14,
+    0,0,0,4,2,6,1,4,255,6,2,8,1,4,255,4,
+    2,115,16,0,0,0,2,2,10,1,2,255,2,2,2,1,
+    2,255,12,1,4,1,115,36,0,0,0,18,28,18,39,13,
+    17,13,32,34,38,18,39,9,15,9,19,9,47,37,77,26,
+    30,26,35,37,41,37,46,9,47,9,47,16,22,9,22,114,
+    10,0,0,0,99,2,0,0,0,0,0,0,0,0,0,0,
+    0,5,0,0,0,3,0,0,0,115,36,0,0,0,116,0,
+    160,1,116,2,106,3,124,1,161,2,1,0,116,0,160,4,
+    100,1,124,0,106,5,124,0,106,6,161,3,1,0,100,2,
+    83,0,41,3,122,30,73,110,105,116,105,97,108,105,122,101,
+    32,97,110,32,101,120,116,101,110,115,105,111,110,32,109,111,
+    100,117,108,101,122,40,101,120,116,101,110,115,105,111,110,32,
+    109,111,100,117,108,101,32,123,33,114,125,32,101,120,101,99,
+    117,116,101,100,32,102,114,111,109,32,123,33,114,125,78,41,
+    7,114,162,0,0,0,114,250,0,0,0,114,190,0,0,0,
+    90,12,101,120,101,99,95,100,121,110,97,109,105,99,114,176,
+    0,0,0,114,145,0,0,0,114,67,0,0,0,169,2,114,
+    147,0,0,0,114,252,0,0,0,115,2,0,0,0,32,32,
+    114,7,0,0,0,114,253,0,0,0,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,169,4,0,0,115,
+    8,0,0,0,14,2,6,1,8,1,8,255,115,10,0,0,
+    0,14,2,2,1,2,1,2,255,16,1,115,36,0,0,0,
+    9,19,9,72,46,50,46,63,65,71,9,72,9,72,9,19,
+    9,47,37,79,26,30,26,35,37,41,37,46,9,47,9,47,
+    9,47,9,47,114,10,0,0,0,99,2,0,0,0,0,0,
+    0,0,0,0,0,0,3,0,0,0,3,0,0,0,115,36,
+    0,0,0,135,2,116,0,124,0,106,1,131,1,100,1,25,
+    0,138,2,116,2,136,2,102,1,100,2,132,8,116,3,68,
+    0,131,1,131,1,83,0,41,4,122,49,82,101,116,117,114,
+    110,32,84,114,117,101,32,105,102,32,116,104,101,32,101,120,
+    116,101,110,115,105,111,110,32,109,111,100,117,108,101,32,105,
+    115,32,97,32,112,97,99,107,97,103,101,46,114,3,0,0,
+    0,99,1,0,0,0,0,0,0,0,0,0,0,0,4,0,
+    0,0,51,0,0,0,115,28,0,0,0,129,0,124,0,93,
+    9,125,1,137,2,100,0,124,1,23,0,107,2,86,0,1,
+    0,113,2,100,1,83,0,41,2,114,242,0,0,0,78,114,
+    13,0,0,0,41,3,114,5,0,0,0,218,6,115,117,102,
+    102,105,120,218,9,102,105,108,101,95,110,97,109,101,115,3,
+    0,0,0,32,32,128,114,7,0,0,0,114,8,0,0,0,
+    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,60,103,101,110,101,120,
+    112,114,62,178,4,0,0,115,8,0,0,0,2,128,4,0,
+    2,1,20,255,115,8,0,0,0,2,128,6,1,10,255,10,
+    1,115,28,0,0,0,0,0,19,53,19,53,24,30,20,29,
+    33,43,46,52,33,52,20,52,19,53,19,53,19,53,19,53,
+    19,53,114,10,0,0,0,78,41,4,114,76,0,0,0,114,
+    67,0,0,0,218,3,97,110,121,114,238,0,0,0,41,3,
+    114,147,0,0,0,114,166,0,0,0,114,62,1,0,0,115,
+    3,0,0,0,32,32,64,114,7,0,0,0,114,212,0,0,
+    0,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,175,4,0,0,115,10,0,0,0,2,128,14,2,10,1,
+    2,1,8,255,115,8,0,0,0,2,128,14,2,2,1,18,
+    1,115,36,0,0,0,0,0,21,32,33,37,33,42,21,43,
+    44,45,21,46,9,18,16,19,19,53,19,53,19,53,19,53,
+    34,52,19,53,19,53,16,53,9,53,114,10,0,0,0,99,
+    2,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,
+    3,0,0,0,114,26,0,0,0,41,2,122,63,82,101,116,
+    117,114,110,32,78,111,110,101,32,97,115,32,97,110,32,101,
+    120,116,101,110,115,105,111,110,32,109,111,100,117,108,101,32,
+    99,97,110,110,111,116,32,99,114,101,97,116,101,32,97,32,
+    99,111,100,101,32,111,98,106,101,99,116,46,78,114,13,0,
+    0,0,114,255,0,0,0,115,2,0,0,0,32,32,114,7,
+    0,0,0,114,249,0,0,0,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,181,4,0,0,114,27,0,0,0,114,
+    27,0,0,0,115,4,0,0,0,16,20,16,20,114,10,0,
+    0,0,99,2,0,0,0,0,0,0,0,0,0,0,0,1,
+    0,0,0,3,0,0,0,114,26,0,0,0,41,2,122,53,
+    82,101,116,117,114,110,32,78,111,110,101,32,97,115,32,101,
+    120,116,101,110,115,105,111,110,32,109,111,100,117,108,101,115,
+    32,104,97,118,101,32,110,111,32,115,111,117,114,99,101,32,
+    99,111,100,101,46,78,114,13,0,0,0,114,255,0,0,0,
+    115,2,0,0,0,32,32,114,7,0,0,0,114,13,1,0,
+    0,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,185,4,0,0,114,27,0,0,0,114,27,0,0,0,115,
+    4,0,0,0,16,20,16,20,114,10,0,0,0,99,2,0,
+    0,0,0,0,0,0,0,0,0,0,1,0,0,0,3,0,
+    0,0,114,40,1,0,0,114,41,1,0,0,114,77,0,0,
     0,114,255,0,0,0,115,2,0,0,0,32,32,114,7,0,
-    0,0,114,13,1,0,0,122,30,69,120,116,101,110,115,105,
+    0,0,114,209,0,0,0,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,115,111,117,114,99,101,185,4,0,0,114,27,0,0,0,
-    114,27,0,0,0,115,4,0,0,0,16,20,16,20,114,10,
-    0,0,0,99,2,0,0,0,0,0,0,0,0,0,0,0,
-    1,0,0,0,3,0,0,0,114,40,1,0,0,114,41,1,
-    0,0,114,77,0,0,0,114,255,0,0,0,115,2,0,0,
-    0,32,32,114,7,0,0,0,114,209,0,0,0,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,189,
-    4,0,0,114,42,1,0,0,114,42,1,0,0,115,6,0,
-    0,0,16,20,16,25,9,25,114,10,0,0,0,78,41,14,
-    114,153,0,0,0,114,152,0,0,0,114,154,0,0,0,114,
-    155,0,0,0,114,242,0,0,0,114,29,1,0,0,114,36,
-    1,0,0,114,246,0,0,0,114,253,0,0,0,114,212,0,
-    0,0,114,249,0,0,0,114,13,1,0,0,114,163,0,0,
-    0,114,209,0,0,0,114,13,0,0,0,114,10,0,0,0,
-    114,7,0,0,0,114,44,1,0,0,114,44,1,0,0,142,
-    4,0,0,115,24,0,0,0,8,0,4,2,6,6,6,4,
-    6,4,6,3,6,8,6,6,6,6,6,4,2,4,12,1,
-    115,98,0,0,0,0,129,0,129,0,129,0,129,0,129,0,
-    129,0,129,0,129,0,129,8,233,0,127,0,127,0,127,0,
-    127,0,127,0,127,0,127,0,127,0,127,2,29,0,129,0,
-    129,0,129,0,129,0,129,0,129,0,129,0,129,0,129,2,
-    227,0,127,0,127,0,127,0,127,0,127,0,127,0,127,0,
-    127,0,127,6,33,6,4,6,3,6,8,6,6,6,6,6,
-    4,6,4,2,2,12,3,115,74,0,0,0,1,1,1,1,
-    1,1,1,1,5,8,1,1,5,25,5,25,5,25,5,49,
-    5,49,5,49,5,49,5,49,5,49,5,22,5,22,5,22,
-    5,47,5,47,5,47,5,53,5,53,5,53,5,20,5,20,
-    5,20,5,20,5,20,5,20,6,17,5,25,5,25,5,25,
-    5,25,5,25,5,25,114,10,0,0,0,114,44,1,0,0,
-    99,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,
-    0,0,0,0,0,115,82,0,0,0,101,0,90,1,100,0,
-    90,2,100,1,90,3,100,2,132,0,90,4,100,3,132,0,
-    90,5,100,4,132,0,90,6,100,5,132,0,90,7,100,6,
-    132,0,90,8,100,7,132,0,90,9,100,8,132,0,90,10,
-    100,9,132,0,90,11,100,10,132,0,90,12,100,11,132,0,
-    90,13,100,12,132,0,90,14,100,13,83,0,41,14,218,14,
-    95,78,97,109,101,115,112,97,99,101,80,97,116,104,97,38,
-    1,0,0,82,101,112,114,101,115,101,110,116,115,32,97,32,
-    110,97,109,101,115,112,97,99,101,32,112,97,99,107,97,103,
-    101,39,115,32,112,97,116,104,46,32,32,73,116,32,117,115,
-    101,115,32,116,104,101,32,109,111,100,117,108,101,32,110,97,
-    109,101,10,32,32,32,32,116,111,32,102,105,110,100,32,105,
-    116,115,32,112,97,114,101,110,116,32,109,111,100,117,108,101,
-    44,32,97,110,100,32,102,114,111,109,32,116,104,101,114,101,
-    32,105,116,32,108,111,111,107,115,32,117,112,32,116,104,101,
-    32,112,97,114,101,110,116,39,115,10,32,32,32,32,95,95,
-    112,97,116,104,95,95,46,32,32,87,104,101,110,32,116,104,
-    105,115,32,99,104,97,110,103,101,115,44,32,116,104,101,32,
-    109,111,100,117,108,101,39,115,32,111,119,110,32,112,97,116,
-    104,32,105,115,32,114,101,99,111,109,112,117,116,101,100,44,
-    10,32,32,32,32,117,115,105,110,103,32,112,97,116,104,95,
-    102,105,110,100,101,114,46,32,32,70,111,114,32,116,111,112,
-    45,108,101,118,101,108,32,109,111,100,117,108,101,115,44,32,
-    116,104,101,32,112,97,114,101,110,116,32,109,111,100,117,108,
-    101,39,115,32,112,97,116,104,10,32,32,32,32,105,115,32,
-    115,121,115,46,112,97,116,104,46,99,4,0,0,0,0,0,
-    0,0,0,0,0,0,3,0,0,0,3,0,0,0,115,36,
-    0,0,0,124,1,124,0,95,0,124,2,124,0,95,1,116,
-    2,124,0,160,3,161,0,131,1,124,0,95,4,124,3,124,
-    0,95,5,100,0,83,0,114,71,0,0,0,41,6,218,5,
-    95,110,97,109,101,218,5,95,112,97,116,104,114,140,0,0,
-    0,218,16,95,103,101,116,95,112,97,114,101,110,116,95,112,
-    97,116,104,218,17,95,108,97,115,116,95,112,97,114,101,110,
-    116,95,112,97,116,104,218,12,95,112,97,116,104,95,102,105,
-    110,100,101,114,169,4,114,147,0,0,0,114,145,0,0,0,
-    114,67,0,0,0,90,11,112,97,116,104,95,102,105,110,100,
-    101,114,115,4,0,0,0,32,32,32,32,114,7,0,0,0,
-    114,242,0,0,0,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,202,4,
-    0,0,243,8,0,0,0,6,1,6,1,14,1,10,1,114,
-    71,1,0,0,115,36,0,0,0,22,26,9,13,9,19,22,
-    26,9,13,9,19,34,39,40,44,40,63,40,63,34,64,9,
-    13,9,31,29,40,9,13,9,26,9,26,9,26,114,10,0,
+    95,102,105,108,101,110,97,109,101,189,4,0,0,114,42,1,
+    0,0,114,42,1,0,0,115,6,0,0,0,16,20,16,25,
+    9,25,114,10,0,0,0,78,41,14,114,153,0,0,0,114,
+    152,0,0,0,114,154,0,0,0,114,155,0,0,0,114,242,
+    0,0,0,114,29,1,0,0,114,36,1,0,0,114,246,0,
+    0,0,114,253,0,0,0,114,212,0,0,0,114,249,0,0,
+    0,114,13,1,0,0,114,163,0,0,0,114,209,0,0,0,
+    114,13,0,0,0,114,10,0,0,0,114,7,0,0,0,114,
+    44,1,0,0,114,44,1,0,0,142,4,0,0,115,24,0,
+    0,0,8,0,4,2,6,6,6,4,6,4,6,3,6,8,
+    6,6,6,6,6,4,2,4,12,1,115,98,0,0,0,0,
+    129,0,129,0,129,0,129,0,129,0,129,0,129,0,129,0,
+    129,8,233,0,127,0,127,0,127,0,127,0,127,0,127,0,
+    127,0,127,0,127,2,29,0,129,0,129,0,129,0,129,0,
+    129,0,129,0,129,0,129,0,129,2,227,0,127,0,127,0,
+    127,0,127,0,127,0,127,0,127,0,127,0,127,6,33,6,
+    4,6,3,6,8,6,6,6,6,6,4,6,4,2,2,12,
+    3,115,74,0,0,0,1,1,1,1,1,1,1,1,5,8,
+    1,1,5,25,5,25,5,25,5,49,5,49,5,49,5,49,
+    5,49,5,49,5,22,5,22,5,22,5,47,5,47,5,47,
+    5,53,5,53,5,53,5,20,5,20,5,20,5,20,5,20,
+    5,20,6,17,5,25,5,25,5,25,5,25,5,25,5,25,
+    114,10,0,0,0,114,44,1,0,0,99,0,0,0,0,0,
+    0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,115,
+    82,0,0,0,101,0,90,1,100,0,90,2,100,1,90,3,
+    100,2,132,0,90,4,100,3,132,0,90,5,100,4,132,0,
+    90,6,100,5,132,0,90,7,100,6,132,0,90,8,100,7,
+    132,0,90,9,100,8,132,0,90,10,100,9,132,0,90,11,
+    100,10,132,0,90,12,100,11,132,0,90,13,100,12,132,0,
+    90,14,100,13,83,0,41,14,218,14,95,78,97,109,101,115,
+    112,97,99,101,80,97,116,104,97,38,1,0,0,82,101,112,
+    114,101,115,101,110,116,115,32,97,32,110,97,109,101,115,112,
+    97,99,101,32,112,97,99,107,97,103,101,39,115,32,112,97,
+    116,104,46,32,32,73,116,32,117,115,101,115,32,116,104,101,
+    32,109,111,100,117,108,101,32,110,97,109,101,10,32,32,32,
+    32,116,111,32,102,105,110,100,32,105,116,115,32,112,97,114,
+    101,110,116,32,109,111,100,117,108,101,44,32,97,110,100,32,
+    102,114,111,109,32,116,104,101,114,101,32,105,116,32,108,111,
+    111,107,115,32,117,112,32,116,104,101,32,112,97,114,101,110,
+    116,39,115,10,32,32,32,32,95,95,112,97,116,104,95,95,
+    46,32,32,87,104,101,110,32,116,104,105,115,32,99,104,97,
+    110,103,101,115,44,32,116,104,101,32,109,111,100,117,108,101,
+    39,115,32,111,119,110,32,112,97,116,104,32,105,115,32,114,
+    101,99,111,109,112,117,116,101,100,44,10,32,32,32,32,117,
+    115,105,110,103,32,112,97,116,104,95,102,105,110,100,101,114,
+    46,32,32,70,111,114,32,116,111,112,45,108,101,118,101,108,
+    32,109,111,100,117,108,101,115,44,32,116,104,101,32,112,97,
+    114,101,110,116,32,109,111,100,117,108,101,39,115,32,112,97,
+    116,104,10,32,32,32,32,105,115,32,115,121,115,46,112,97,
+    116,104,46,99,4,0,0,0,0,0,0,0,0,0,0,0,
+    3,0,0,0,3,0,0,0,115,36,0,0,0,124,1,124,
+    0,95,0,124,2,124,0,95,1,116,2,124,0,160,3,161,
+    0,131,1,124,0,95,4,124,3,124,0,95,5,100,0,83,
+    0,114,71,0,0,0,41,6,218,5,95,110,97,109,101,218,
+    5,95,112,97,116,104,114,140,0,0,0,218,16,95,103,101,
+    116,95,112,97,114,101,110,116,95,112,97,116,104,218,17,95,
+    108,97,115,116,95,112,97,114,101,110,116,95,112,97,116,104,
+    218,12,95,112,97,116,104,95,102,105,110,100,101,114,169,4,
+    114,147,0,0,0,114,145,0,0,0,114,67,0,0,0,90,
+    11,112,97,116,104,95,102,105,110,100,101,114,115,4,0,0,
+    0,32,32,32,32,114,7,0,0,0,114,242,0,0,0,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,202,4,0,0,243,8,0,0,
+    0,6,1,6,1,14,1,10,1,114,71,1,0,0,115,36,
+    0,0,0,22,26,9,13,9,19,22,26,9,13,9,19,34,
+    39,40,44,40,63,40,63,34,64,9,13,9,31,29,40,9,
+    13,9,26,9,26,9,26,114,10,0,0,0,99,1,0,0,
+    0,0,0,0,0,0,0,0,0,3,0,0,0,3,0,0,
+    0,115,38,0,0,0,124,0,106,0,160,1,100,1,161,1,
+    92,3,125,1,125,2,125,3,124,2,100,2,107,2,114,15,
+    100,3,83,0,124,1,100,4,102,2,83,0,41,6,122,62,
+    82,101,116,117,114,110,115,32,97,32,116,117,112,108,101,32,
+    111,102,32,40,112,97,114,101,110,116,45,109,111,100,117,108,
+    101,45,110,97,109,101,44,32,112,97,114,101,110,116,45,112,
+    97,116,104,45,97,116,116,114,45,110,97,109,101,41,114,101,
+    0,0,0,114,11,0,0,0,41,2,114,18,0,0,0,114,
+    67,0,0,0,90,8,95,95,112,97,116,104,95,95,78,41,
+    2,114,65,1,0,0,114,108,0,0,0,41,4,114,147,0,
+    0,0,114,57,1,0,0,218,3,100,111,116,90,2,109,101,
+    115,4,0,0,0,32,32,32,32,114,7,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,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,110,97,109,101,115,208,
+    4,0,0,115,8,0,0,0,18,2,8,1,4,2,8,3,
+    115,8,0,0,0,18,2,6,1,6,2,8,3,115,38,0,
+    0,0,27,31,27,37,27,53,49,52,27,53,9,24,9,15,
+    17,20,22,24,12,15,19,21,12,21,9,33,20,33,20,33,
+    16,22,24,34,16,34,9,34,114,10,0,0,0,99,1,0,
+    0,0,0,0,0,0,0,0,0,0,3,0,0,0,3,0,
+    0,0,115,28,0,0,0,124,0,160,0,161,0,92,2,125,
+    1,125,2,116,1,116,2,106,3,124,1,25,0,124,2,131,
+    2,83,0,114,71,0,0,0,41,4,114,73,1,0,0,114,
+    158,0,0,0,114,18,0,0,0,218,7,109,111,100,117,108,
+    101,115,41,3,114,147,0,0,0,90,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,115,3,0,
+    0,0,32,32,32,114,7,0,0,0,114,67,1,0,0,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,
+    218,4,0,0,243,4,0,0,0,12,1,16,1,114,75,1,
+    0,0,115,28,0,0,0,46,50,46,76,46,76,9,43,9,
+    27,29,43,16,23,24,27,24,35,36,54,24,55,57,71,16,
+    72,9,72,114,10,0,0,0,99,1,0,0,0,0,0,0,
+    0,0,0,0,0,4,0,0,0,3,0,0,0,115,80,0,
+    0,0,116,0,124,0,160,1,161,0,131,1,125,1,124,1,
+    124,0,106,2,107,3,114,37,124,0,160,3,124,0,106,4,
+    124,1,161,2,125,2,124,2,100,0,117,1,114,34,124,2,
+    106,5,100,0,117,0,114,34,124,2,106,6,114,34,124,2,
+    106,6,124,0,95,7,124,1,124,0,95,2,124,0,106,7,
+    83,0,114,71,0,0,0,41,8,114,140,0,0,0,114,67,
+    1,0,0,114,68,1,0,0,114,69,1,0,0,114,65,1,
+    0,0,114,167,0,0,0,114,208,0,0,0,114,66,1,0,
+    0,41,3,114,147,0,0,0,90,11,112,97,114,101,110,116,
+    95,112,97,116,104,114,216,0,0,0,115,3,0,0,0,32,
+    32,32,114,7,0,0,0,218,12,95,114,101,99,97,108,99,
+    117,108,97,116,101,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,222,4,0,0,115,16,0,0,0,12,2,10,1,14,
+    1,18,3,6,1,8,1,6,1,6,1,115,24,0,0,0,
+    12,2,8,1,2,7,14,250,6,3,2,2,8,254,2,2,
+    4,255,10,1,6,1,6,1,115,80,0,0,0,23,28,29,
+    33,29,52,29,52,23,53,9,20,12,23,27,31,27,49,12,
+    49,9,49,20,24,20,62,38,42,38,48,50,61,20,62,13,
+    17,16,20,28,32,16,32,13,65,37,41,37,48,52,56,37,
+    56,13,65,20,24,20,51,17,65,34,38,34,65,21,25,21,
+    31,38,49,13,17,13,35,16,20,16,26,9,26,114,10,0,
     0,0,99,1,0,0,0,0,0,0,0,0,0,0,0,3,
-    0,0,0,3,0,0,0,115,38,0,0,0,124,0,106,0,
-    160,1,100,1,161,1,92,3,125,1,125,2,125,3,124,2,
-    100,2,107,2,114,15,100,3,83,0,124,1,100,4,102,2,
-    83,0,41,6,122,62,82,101,116,117,114,110,115,32,97,32,
-    116,117,112,108,101,32,111,102,32,40,112,97,114,101,110,116,
-    45,109,111,100,117,108,101,45,110,97,109,101,44,32,112,97,
-    114,101,110,116,45,112,97,116,104,45,97,116,116,114,45,110,
-    97,109,101,41,114,101,0,0,0,114,11,0,0,0,41,2,
-    114,18,0,0,0,114,67,0,0,0,90,8,95,95,112,97,
-    116,104,95,95,78,41,2,114,65,1,0,0,114,108,0,0,
-    0,41,4,114,147,0,0,0,114,57,1,0,0,218,3,100,
-    111,116,90,2,109,101,115,4,0,0,0,32,32,32,32,114,
-    7,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,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,
-    110,97,109,101,115,208,4,0,0,115,8,0,0,0,18,2,
-    8,1,4,2,8,3,115,8,0,0,0,18,2,6,1,6,
-    2,8,3,115,38,0,0,0,27,31,27,37,27,53,49,52,
-    27,53,9,24,9,15,17,20,22,24,12,15,19,21,12,21,
-    9,33,20,33,20,33,16,22,24,34,16,34,9,34,114,10,
-    0,0,0,99,1,0,0,0,0,0,0,0,0,0,0,0,
-    3,0,0,0,3,0,0,0,115,28,0,0,0,124,0,160,
-    0,161,0,92,2,125,1,125,2,116,1,116,2,106,3,124,
-    1,25,0,124,2,131,2,83,0,114,71,0,0,0,41,4,
-    114,73,1,0,0,114,158,0,0,0,114,18,0,0,0,218,
-    7,109,111,100,117,108,101,115,41,3,114,147,0,0,0,90,
-    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,115,3,0,0,0,32,32,32,114,7,0,0,0,
-    114,67,1,0,0,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,218,4,0,0,243,4,0,0,0,12,
-    1,16,1,114,75,1,0,0,115,28,0,0,0,46,50,46,
-    76,46,76,9,43,9,27,29,43,16,23,24,27,24,35,36,
-    54,24,55,57,71,16,72,9,72,114,10,0,0,0,99,1,
-    0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,3,
-    0,0,0,115,80,0,0,0,116,0,124,0,160,1,161,0,
-    131,1,125,1,124,1,124,0,106,2,107,3,114,37,124,0,
-    160,3,124,0,106,4,124,1,161,2,125,2,124,2,100,0,
-    117,1,114,34,124,2,106,5,100,0,117,0,114,34,124,2,
-    106,6,114,34,124,2,106,6,124,0,95,7,124,1,124,0,
-    95,2,124,0,106,7,83,0,114,71,0,0,0,41,8,114,
-    140,0,0,0,114,67,1,0,0,114,68,1,0,0,114,69,
-    1,0,0,114,65,1,0,0,114,167,0,0,0,114,208,0,
-    0,0,114,66,1,0,0,41,3,114,147,0,0,0,90,11,
-    112,97,114,101,110,116,95,112,97,116,104,114,216,0,0,0,
-    115,3,0,0,0,32,32,32,114,7,0,0,0,218,12,95,
-    114,101,99,97,108,99,117,108,97,116,101,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,222,4,0,0,115,16,0,0,
-    0,12,2,10,1,14,1,18,3,6,1,8,1,6,1,6,
-    1,115,24,0,0,0,12,2,8,1,2,7,14,250,6,3,
-    2,2,8,254,2,2,4,255,10,1,6,1,6,1,115,80,
-    0,0,0,23,28,29,33,29,52,29,52,23,53,9,20,12,
-    23,27,31,27,49,12,49,9,49,20,24,20,62,38,42,38,
-    48,50,61,20,62,13,17,16,20,28,32,16,32,13,65,37,
-    41,37,48,52,56,37,56,13,65,20,24,20,51,17,65,34,
-    38,34,65,21,25,21,31,38,49,13,17,13,35,16,20,16,
-    26,9,26,114,10,0,0,0,99,1,0,0,0,0,0,0,
-    0,0,0,0,0,3,0,0,0,3,0,0,0,243,12,0,
-    0,0,116,0,124,0,160,1,161,0,131,1,83,0,114,71,
-    0,0,0,41,2,218,4,105,116,101,114,114,76,1,0,0,
-    114,35,1,0,0,115,1,0,0,0,32,114,7,0,0,0,
-    218,8,95,95,105,116,101,114,95,95,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,235,4,0,0,243,2,0,0,0,12,1,114,80,
-    1,0,0,115,12,0,0,0,16,20,21,25,21,40,21,40,
-    16,41,9,41,114,10,0,0,0,99,2,0,0,0,0,0,
-    0,0,0,0,0,0,2,0,0,0,3,0,0,0,115,12,
-    0,0,0,124,0,160,0,161,0,124,1,25,0,83,0,114,
-    71,0,0,0,169,1,114,76,1,0,0,41,2,114,147,0,
-    0,0,218,5,105,110,100,101,120,115,2,0,0,0,32,32,
-    114,7,0,0,0,218,11,95,95,103,101,116,105,116,101,109,
-    95,95,122,26,95,78,97,109,101,115,112,97,99,101,80,97,
-    116,104,46,95,95,103,101,116,105,116,101,109,95,95,238,4,
-    0,0,114,80,1,0,0,114,80,1,0,0,115,12,0,0,
-    0,16,20,16,35,16,35,36,41,16,42,9,42,114,10,0,
-    0,0,99,3,0,0,0,0,0,0,0,0,0,0,0,3,
-    0,0,0,3,0,0,0,115,14,0,0,0,124,2,124,0,
-    106,0,124,1,60,0,100,0,83,0,114,71,0,0,0,41,
-    1,114,66,1,0,0,41,3,114,147,0,0,0,114,82,1,
-    0,0,114,67,0,0,0,115,3,0,0,0,32,32,32,114,
-    7,0,0,0,218,11,95,95,115,101,116,105,116,101,109,95,
-    95,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,241,4,0,
-    0,243,2,0,0,0,14,1,114,85,1,0,0,115,14,0,
-    0,0,29,33,9,13,9,19,20,25,9,26,9,26,9,26,
-    114,10,0,0,0,99,1,0,0,0,0,0,0,0,0,0,
-    0,0,3,0,0,0,3,0,0,0,114,77,1,0,0,114,
-    71,0,0,0,41,2,114,4,0,0,0,114,76,1,0,0,
-    114,35,1,0,0,115,1,0,0,0,32,114,7,0,0,0,
-    218,7,95,95,108,101,110,95,95,122,22,95,78,97,109,101,
-    115,112,97,99,101,80,97,116,104,46,95,95,108,101,110,95,
-    95,244,4,0,0,114,80,1,0,0,114,80,1,0,0,115,
-    12,0,0,0,16,19,20,24,20,39,20,39,16,40,9,40,
-    114,10,0,0,0,99,1,0,0,0,0,0,0,0,0,0,
-    0,0,3,0,0,0,3,0,0,0,243,12,0,0,0,100,
-    1,160,0,124,0,106,1,161,1,83,0,41,2,78,122,20,
-    95,78,97,109,101,115,112,97,99,101,80,97,116,104,40,123,
-    33,114,125,41,41,2,114,93,0,0,0,114,66,1,0,0,
-    114,35,1,0,0,115,1,0,0,0,32,114,7,0,0,0,
-    218,8,95,95,114,101,112,114,95,95,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,247,4,0,0,114,80,1,0,0,114,80,1,0,
-    0,115,12,0,0,0,16,38,16,57,46,50,46,56,16,57,
-    9,57,114,10,0,0,0,99,2,0,0,0,0,0,0,0,
-    0,0,0,0,3,0,0,0,3,0,0,0,115,12,0,0,
-    0,124,1,124,0,160,0,161,0,118,0,83,0,114,71,0,
-    0,0,114,81,1,0,0,169,2,114,147,0,0,0,218,4,
-    105,116,101,109,115,2,0,0,0,32,32,114,7,0,0,0,
-    218,12,95,95,99,111,110,116,97,105,110,115,95,95,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,250,4,0,0,114,
-    80,1,0,0,114,80,1,0,0,115,12,0,0,0,16,20,
-    24,28,24,43,24,43,16,43,9,43,114,10,0,0,0,99,
-    2,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,
-    3,0,0,0,115,16,0,0,0,124,0,106,0,160,1,124,
-    1,161,1,1,0,100,0,83,0,114,71,0,0,0,41,2,
-    114,66,1,0,0,114,63,0,0,0,114,89,1,0,0,115,
-    2,0,0,0,32,32,114,7,0,0,0,114,63,0,0,0,
-    122,21,95,78,97,109,101,115,112,97,99,101,80,97,116,104,
-    46,97,112,112,101,110,100,253,4,0,0,243,2,0,0,0,
-    16,1,114,92,1,0,0,115,16,0,0,0,9,13,9,19,
-    9,32,27,31,9,32,9,32,9,32,9,32,114,10,0,0,
-    0,78,41,15,114,153,0,0,0,114,152,0,0,0,114,154,
-    0,0,0,114,155,0,0,0,114,242,0,0,0,114,73,1,
-    0,0,114,67,1,0,0,114,76,1,0,0,114,79,1,0,
-    0,114,83,1,0,0,114,84,1,0,0,114,86,1,0,0,
-    114,88,1,0,0,114,91,1,0,0,114,63,0,0,0,114,
-    13,0,0,0,114,10,0,0,0,114,7,0,0,0,114,64,
-    1,0,0,114,64,1,0,0,195,4,0,0,115,26,0,0,
-    0,8,0,4,1,6,6,6,6,6,10,6,4,6,13,6,
-    3,6,3,6,3,6,3,6,3,10,3,115,100,0,0,0,
-    0,129,0,129,0,129,0,129,0,129,0,129,0,129,0,129,
-    0,129,8,180,0,127,0,127,0,127,0,127,0,127,0,127,
-    0,127,0,127,0,127,2,81,0,129,0,129,0,129,0,129,
-    0,129,0,129,0,129,0,129,0,129,2,175,0,127,0,127,
-    0,127,0,127,0,127,0,127,0,127,0,127,0,127,6,87,
-    6,10,6,4,6,13,6,3,6,3,6,3,6,3,6,3,
-    6,3,10,3,115,82,0,0,0,1,1,1,1,1,1,1,
-    1,5,20,1,1,5,40,5,40,5,40,5,34,5,34,5,
-    34,5,72,5,72,5,72,5,26,5,26,5,26,5,41,5,
-    41,5,41,5,42,5,42,5,42,5,33,5,33,5,33,5,
-    40,5,40,5,40,5,57,5,57,5,57,5,43,5,43,5,
-    43,5,32,5,32,5,32,5,32,5,32,114,10,0,0,0,
-    114,64,1,0,0,99,0,0,0,0,0,0,0,0,0,0,
-    0,0,2,0,0,0,0,0,0,0,115,70,0,0,0,101,
-    0,90,1,100,0,90,2,100,1,132,0,90,3,101,4,100,
-    2,132,0,131,1,90,5,100,3,132,0,90,6,100,4,132,
-    0,90,7,100,5,132,0,90,8,100,6,132,0,90,9,100,
-    7,132,0,90,10,100,8,132,0,90,11,100,9,132,0,90,
-    12,100,10,83,0,41,11,218,16,95,78,97,109,101,115,112,
-    97,99,101,76,111,97,100,101,114,99,4,0,0,0,0,0,
-    0,0,0,0,0,0,4,0,0,0,3,0,0,0,115,18,
-    0,0,0,116,0,124,1,124,2,124,3,131,3,124,0,95,
-    1,100,0,83,0,114,71,0,0,0,41,2,114,64,1,0,
-    0,114,66,1,0,0,114,70,1,0,0,115,4,0,0,0,
-    32,32,32,32,114,7,0,0,0,114,242,0,0,0,122,25,
+    0,0,0,3,0,0,0,243,12,0,0,0,116,0,124,0,
+    160,1,161,0,131,1,83,0,114,71,0,0,0,41,2,218,
+    4,105,116,101,114,114,76,1,0,0,114,35,1,0,0,115,
+    1,0,0,0,32,114,7,0,0,0,218,8,95,95,105,116,
+    101,114,95,95,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,235,4,0,
+    0,243,2,0,0,0,12,1,114,80,1,0,0,115,12,0,
+    0,0,16,20,21,25,21,40,21,40,16,41,9,41,114,10,
+    0,0,0,99,2,0,0,0,0,0,0,0,0,0,0,0,
+    2,0,0,0,3,0,0,0,115,12,0,0,0,124,0,160,
+    0,161,0,124,1,25,0,83,0,114,71,0,0,0,169,1,
+    114,76,1,0,0,41,2,114,147,0,0,0,218,5,105,110,
+    100,101,120,115,2,0,0,0,32,32,114,7,0,0,0,218,
+    11,95,95,103,101,116,105,116,101,109,95,95,122,26,95,78,
+    97,109,101,115,112,97,99,101,80,97,116,104,46,95,95,103,
+    101,116,105,116,101,109,95,95,238,4,0,0,114,80,1,0,
+    0,114,80,1,0,0,115,12,0,0,0,16,20,16,35,16,
+    35,36,41,16,42,9,42,114,10,0,0,0,99,3,0,0,
+    0,0,0,0,0,0,0,0,0,3,0,0,0,3,0,0,
+    0,115,14,0,0,0,124,2,124,0,106,0,124,1,60,0,
+    100,0,83,0,114,71,0,0,0,41,1,114,66,1,0,0,
+    41,3,114,147,0,0,0,114,82,1,0,0,114,67,0,0,
+    0,115,3,0,0,0,32,32,32,114,7,0,0,0,218,11,
+    95,95,115,101,116,105,116,101,109,95,95,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,241,4,0,0,243,2,0,0,0,
+    14,1,114,85,1,0,0,115,14,0,0,0,29,33,9,13,
+    9,19,20,25,9,26,9,26,9,26,114,10,0,0,0,99,
+    1,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,
+    3,0,0,0,114,77,1,0,0,114,71,0,0,0,41,2,
+    114,4,0,0,0,114,76,1,0,0,114,35,1,0,0,115,
+    1,0,0,0,32,114,7,0,0,0,218,7,95,95,108,101,
+    110,95,95,122,22,95,78,97,109,101,115,112,97,99,101,80,
+    97,116,104,46,95,95,108,101,110,95,95,244,4,0,0,114,
+    80,1,0,0,114,80,1,0,0,115,12,0,0,0,16,19,
+    20,24,20,39,20,39,16,40,9,40,114,10,0,0,0,99,
+    1,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,
+    3,0,0,0,243,12,0,0,0,100,1,160,0,124,0,106,
+    1,161,1,83,0,41,2,78,122,20,95,78,97,109,101,115,
+    112,97,99,101,80,97,116,104,40,123,33,114,125,41,41,2,
+    114,93,0,0,0,114,66,1,0,0,114,35,1,0,0,115,
+    1,0,0,0,32,114,7,0,0,0,218,8,95,95,114,101,
+    112,114,95,95,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,247,4,0,
+    0,114,80,1,0,0,114,80,1,0,0,115,12,0,0,0,
+    16,38,16,57,46,50,46,56,16,57,9,57,114,10,0,0,
+    0,99,2,0,0,0,0,0,0,0,0,0,0,0,3,0,
+    0,0,3,0,0,0,115,12,0,0,0,124,1,124,0,160,
+    0,161,0,118,0,83,0,114,71,0,0,0,114,81,1,0,
+    0,169,2,114,147,0,0,0,218,4,105,116,101,109,115,2,
+    0,0,0,32,32,114,7,0,0,0,218,12,95,95,99,111,
+    110,116,97,105,110,115,95,95,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,250,4,0,0,114,80,1,0,0,114,80,
+    1,0,0,115,12,0,0,0,16,20,24,28,24,43,24,43,
+    16,43,9,43,114,10,0,0,0,99,2,0,0,0,0,0,
+    0,0,0,0,0,0,3,0,0,0,3,0,0,0,115,16,
+    0,0,0,124,0,106,0,160,1,124,1,161,1,1,0,100,
+    0,83,0,114,71,0,0,0,41,2,114,66,1,0,0,114,
+    63,0,0,0,114,89,1,0,0,115,2,0,0,0,32,32,
+    114,7,0,0,0,114,63,0,0,0,122,21,95,78,97,109,
+    101,115,112,97,99,101,80,97,116,104,46,97,112,112,101,110,
+    100,253,4,0,0,243,2,0,0,0,16,1,114,92,1,0,
+    0,115,16,0,0,0,9,13,9,19,9,32,27,31,9,32,
+    9,32,9,32,9,32,114,10,0,0,0,78,41,15,114,153,
+    0,0,0,114,152,0,0,0,114,154,0,0,0,114,155,0,
+    0,0,114,242,0,0,0,114,73,1,0,0,114,67,1,0,
+    0,114,76,1,0,0,114,79,1,0,0,114,83,1,0,0,
+    114,84,1,0,0,114,86,1,0,0,114,88,1,0,0,114,
+    91,1,0,0,114,63,0,0,0,114,13,0,0,0,114,10,
+    0,0,0,114,7,0,0,0,114,64,1,0,0,114,64,1,
+    0,0,195,4,0,0,115,26,0,0,0,8,0,4,1,6,
+    6,6,6,6,10,6,4,6,13,6,3,6,3,6,3,6,
+    3,6,3,10,3,115,100,0,0,0,0,129,0,129,0,129,
+    0,129,0,129,0,129,0,129,0,129,0,129,8,180,0,127,
+    0,127,0,127,0,127,0,127,0,127,0,127,0,127,0,127,
+    2,81,0,129,0,129,0,129,0,129,0,129,0,129,0,129,
+    0,129,0,129,2,175,0,127,0,127,0,127,0,127,0,127,
+    0,127,0,127,0,127,0,127,6,87,6,10,6,4,6,13,
+    6,3,6,3,6,3,6,3,6,3,6,3,10,3,115,82,
+    0,0,0,1,1,1,1,1,1,1,1,5,20,1,1,5,
+    40,5,40,5,40,5,34,5,34,5,34,5,72,5,72,5,
+    72,5,26,5,26,5,26,5,41,5,41,5,41,5,42,5,
+    42,5,42,5,33,5,33,5,33,5,40,5,40,5,40,5,
+    57,5,57,5,57,5,43,5,43,5,43,5,32,5,32,5,
+    32,5,32,5,32,114,10,0,0,0,114,64,1,0,0,99,
+    0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,
+    0,0,0,0,115,70,0,0,0,101,0,90,1,100,0,90,
+    2,100,1,132,0,90,3,101,4,100,2,132,0,131,1,90,
+    5,100,3,132,0,90,6,100,4,132,0,90,7,100,5,132,
+    0,90,8,100,6,132,0,90,9,100,7,132,0,90,10,100,
+    8,132,0,90,11,100,9,132,0,90,12,100,10,83,0,41,
+    11,218,16,95,78,97,109,101,115,112,97,99,101,76,111,97,
+    100,101,114,99,4,0,0,0,0,0,0,0,0,0,0,0,
+    4,0,0,0,3,0,0,0,115,18,0,0,0,116,0,124,
+    1,124,2,124,3,131,3,124,0,95,1,100,0,83,0,114,
+    71,0,0,0,41,2,114,64,1,0,0,114,66,1,0,0,
+    114,70,1,0,0,115,4,0,0,0,32,32,32,32,114,7,
+    0,0,0,114,242,0,0,0,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,3,5,0,0,243,2,0,0,0,18,1,114,94,
+    1,0,0,115,18,0,0,0,22,36,37,41,43,47,49,60,
+    22,61,9,13,9,19,9,19,9,19,114,10,0,0,0,99,
+    1,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,
+    3,0,0,0,115,24,0,0,0,116,0,106,1,100,1,116,
+    2,131,2,1,0,100,2,160,3,124,0,106,4,161,1,83,
+    0,41,4,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,82,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,40,41,32,105,115,32,100,101,112,114,
+    101,99,97,116,101,100,32,97,110,100,32,115,108,97,116,101,
+    100,32,102,111,114,32,114,101,109,111,118,97,108,32,105,110,
+    32,80,121,116,104,111,110,32,51,46,49,50,122,25,60,109,
+    111,100,117,108,101,32,123,33,114,125,32,40,110,97,109,101,
+    115,112,97,99,101,41,62,78,41,5,114,103,0,0,0,114,
+    104,0,0,0,114,105,0,0,0,114,93,0,0,0,114,153,
+    0,0,0,41,1,114,252,0,0,0,115,1,0,0,0,32,
+    114,7,0,0,0,218,11,109,111,100,117,108,101,95,114,101,
+    112,114,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,
+    6,5,0,0,115,8,0,0,0,6,7,2,1,4,255,12,
+    2,115,6,0,0,0,4,7,8,1,12,1,115,24,0,0,
+    0,9,18,9,23,24,59,61,79,9,80,9,80,16,43,16,
+    67,51,57,51,66,16,67,9,67,114,10,0,0,0,99,2,
+    0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,3,
+    0,0,0,114,26,0,0,0,41,2,78,84,114,13,0,0,
+    0,114,255,0,0,0,115,2,0,0,0,32,32,114,7,0,
+    0,0,114,212,0,0,0,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,17,5,0,0,243,2,0,0,0,4,1,114,
+    96,1,0,0,115,4,0,0,0,16,20,16,20,114,10,0,
+    0,0,99,2,0,0,0,0,0,0,0,0,0,0,0,1,
+    0,0,0,3,0,0,0,114,26,0,0,0,41,2,78,114,
+    11,0,0,0,114,13,0,0,0,114,255,0,0,0,115,2,
+    0,0,0,32,32,114,7,0,0,0,114,13,1,0,0,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,20,5,0,0,
+    114,96,1,0,0,114,96,1,0,0,115,4,0,0,0,16,
+    18,16,18,114,10,0,0,0,99,2,0,0,0,0,0,0,
+    0,0,0,0,0,6,0,0,0,3,0,0,0,115,16,0,
+    0,0,116,0,100,1,100,2,100,3,100,4,100,5,141,4,
+    83,0,41,6,78,114,11,0,0,0,122,8,60,115,116,114,
+    105,110,103,62,114,251,0,0,0,84,41,1,114,15,1,0,
+    0,41,1,114,16,1,0,0,114,255,0,0,0,115,2,0,
+    0,0,32,32,114,7,0,0,0,114,249,0,0,0,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,3,5,0,0,243,2,0,
-    0,0,18,1,114,94,1,0,0,115,18,0,0,0,22,36,
-    37,41,43,47,49,60,22,61,9,13,9,19,9,19,9,19,
-    114,10,0,0,0,99,1,0,0,0,0,0,0,0,0,0,
-    0,0,3,0,0,0,3,0,0,0,115,24,0,0,0,116,
-    0,106,1,100,1,116,2,131,2,1,0,100,2,160,3,124,
-    0,106,4,161,1,83,0,41,4,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,82,
+    46,103,101,116,95,99,111,100,101,23,5,0,0,114,92,1,
+    0,0,114,92,1,0,0,115,16,0,0,0,16,23,24,26,
+    28,38,40,46,61,65,16,66,16,66,9,66,114,10,0,0,
+    0,99,2,0,0,0,0,0,0,0,0,0,0,0,1,0,
+    0,0,3,0,0,0,114,26,0,0,0,114,244,0,0,0,
+    114,13,0,0,0,114,245,0,0,0,115,2,0,0,0,32,
+    32,114,7,0,0,0,114,246,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,26,5,0,0,114,
+    247,0,0,0,114,248,0,0,0,115,4,0,0,0,0,0,
+    0,0,114,10,0,0,0,99,2,0,0,0,0,0,0,0,
+    0,0,0,0,1,0,0,0,3,0,0,0,115,4,0,0,
+    0,100,0,83,0,114,71,0,0,0,114,13,0,0,0,114,
+    60,1,0,0,115,2,0,0,0,32,32,114,7,0,0,0,
+    114,253,0,0,0,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,29,5,0,0,114,96,1,0,0,114,96,1,0,
+    0,115,4,0,0,0,9,13,9,13,114,10,0,0,0,99,
+    2,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,
+    3,0,0,0,115,26,0,0,0,116,0,160,1,100,1,124,
+    0,106,2,161,2,1,0,116,0,160,3,124,0,124,1,161,
+    2,83,0,41,3,122,98,76,111,97,100,32,97,32,110,97,
+    109,101,115,112,97,99,101,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,122,38,110,97,109,101,115,
+    112,97,99,101,32,109,111,100,117,108,101,32,108,111,97,100,
+    101,100,32,119,105,116,104,32,112,97,116,104,32,123,33,114,
+    125,78,41,4,114,162,0,0,0,114,176,0,0,0,114,66,
+    1,0,0,114,254,0,0,0,114,255,0,0,0,115,2,0,
+    0,0,32,32,114,7,0,0,0,114,0,1,0,0,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,40,41,32,105,
-    115,32,100,101,112,114,101,99,97,116,101,100,32,97,110,100,
-    32,115,108,97,116,101,100,32,102,111,114,32,114,101,109,111,
-    118,97,108,32,105,110,32,80,121,116,104,111,110,32,51,46,
-    49,50,122,25,60,109,111,100,117,108,101,32,123,33,114,125,
-    32,40,110,97,109,101,115,112,97,99,101,41,62,78,41,5,
-    114,103,0,0,0,114,104,0,0,0,114,105,0,0,0,114,
-    93,0,0,0,114,153,0,0,0,41,1,114,252,0,0,0,
-    115,1,0,0,0,32,114,7,0,0,0,218,11,109,111,100,
-    117,108,101,95,114,101,112,114,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,6,5,0,0,115,8,0,0,0,6,
-    7,2,1,4,255,12,2,115,6,0,0,0,4,7,8,1,
-    12,1,115,24,0,0,0,9,18,9,23,24,59,61,79,9,
-    80,9,80,16,43,16,67,51,57,51,66,16,67,9,67,114,
-    10,0,0,0,99,2,0,0,0,0,0,0,0,0,0,0,
-    0,1,0,0,0,3,0,0,0,114,26,0,0,0,41,2,
-    78,84,114,13,0,0,0,114,255,0,0,0,115,2,0,0,
-    0,32,32,114,7,0,0,0,114,212,0,0,0,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,17,5,0,0,243,2,
-    0,0,0,4,1,114,96,1,0,0,115,4,0,0,0,16,
-    20,16,20,114,10,0,0,0,99,2,0,0,0,0,0,0,
-    0,0,0,0,0,1,0,0,0,3,0,0,0,114,26,0,
-    0,0,41,2,78,114,11,0,0,0,114,13,0,0,0,114,
-    255,0,0,0,115,2,0,0,0,32,32,114,7,0,0,0,
-    114,13,1,0,0,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,20,5,0,0,114,96,1,0,0,114,96,1,0,0,
-    115,4,0,0,0,16,18,16,18,114,10,0,0,0,99,2,
-    0,0,0,0,0,0,0,0,0,0,0,6,0,0,0,3,
-    0,0,0,115,16,0,0,0,116,0,100,1,100,2,100,3,
-    100,4,100,5,141,4,83,0,41,6,78,114,11,0,0,0,
-    122,8,60,115,116,114,105,110,103,62,114,251,0,0,0,84,
-    41,1,114,15,1,0,0,41,1,114,16,1,0,0,114,255,
-    0,0,0,115,2,0,0,0,32,32,114,7,0,0,0,114,
-    249,0,0,0,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,23,
-    5,0,0,114,92,1,0,0,114,92,1,0,0,115,16,0,
-    0,0,16,23,24,26,28,38,40,46,61,65,16,66,16,66,
-    9,66,114,10,0,0,0,99,2,0,0,0,0,0,0,0,
-    0,0,0,0,1,0,0,0,3,0,0,0,114,26,0,0,
-    0,114,244,0,0,0,114,13,0,0,0,114,245,0,0,0,
-    115,2,0,0,0,32,32,114,7,0,0,0,114,246,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,26,5,0,0,114,247,0,0,0,114,248,0,0,0,115,
-    4,0,0,0,0,0,0,0,114,10,0,0,0,99,2,0,
-    0,0,0,0,0,0,0,0,0,0,1,0,0,0,3,0,
-    0,0,115,4,0,0,0,100,0,83,0,114,71,0,0,0,
-    114,13,0,0,0,114,60,1,0,0,115,2,0,0,0,32,
-    32,114,7,0,0,0,114,253,0,0,0,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,29,5,0,0,114,96,1,
-    0,0,114,96,1,0,0,115,4,0,0,0,9,13,9,13,
-    114,10,0,0,0,99,2,0,0,0,0,0,0,0,0,0,
-    0,0,4,0,0,0,3,0,0,0,115,26,0,0,0,116,
-    0,160,1,100,1,124,0,106,2,161,2,1,0,116,0,160,
-    3,124,0,124,1,161,2,83,0,41,3,122,98,76,111,97,
-    100,32,97,32,110,97,109,101,115,112,97,99,101,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,122,
-    38,110,97,109,101,115,112,97,99,101,32,109,111,100,117,108,
-    101,32,108,111,97,100,101,100,32,119,105,116,104,32,112,97,
-    116,104,32,123,33,114,125,78,41,4,114,162,0,0,0,114,
-    176,0,0,0,114,66,1,0,0,114,254,0,0,0,114,255,
-    0,0,0,115,2,0,0,0,32,32,114,7,0,0,0,114,
-    0,1,0,0,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,32,5,0,0,115,8,0,0,0,6,7,4,1,4,
-    255,12,3,115,10,0,0,0,2,7,2,1,2,255,8,1,
-    12,2,115,26,0,0,0,9,19,9,48,37,77,37,41,37,
-    47,9,48,9,48,16,26,16,60,45,49,51,59,16,60,9,
-    60,114,10,0,0,0,99,2,0,0,0,0,0,0,0,0,
-    0,0,0,2,0,0,0,3,0,0,0,115,22,0,0,0,
-    100,1,100,2,108,0,109,1,125,2,1,0,124,2,124,0,
-    106,2,131,1,83,0,41,3,78,114,0,0,0,0,41,1,
-    218,15,78,97,109,101,115,112,97,99,101,82,101,97,100,101,
-    114,41,3,114,46,1,0,0,114,97,1,0,0,114,66,1,
-    0,0,41,3,114,147,0,0,0,114,252,0,0,0,114,97,
-    1,0,0,115,3,0,0,0,32,32,32,114,7,0,0,0,
-    114,47,1,0,0,122,36,95,78,97,109,101,115,112,97,99,
-    101,76,111,97,100,101,114,46,103,101,116,95,114,101,115,111,
-    117,114,99,101,95,114,101,97,100,101,114,44,5,0,0,243,
-    4,0,0,0,12,1,10,1,114,98,1,0,0,115,22,0,
-    0,0,9,54,9,54,9,54,9,54,9,54,9,54,16,31,
-    32,36,32,42,16,43,9,43,114,10,0,0,0,78,41,13,
-    114,153,0,0,0,114,152,0,0,0,114,154,0,0,0,114,
-    242,0,0,0,114,239,0,0,0,114,95,1,0,0,114,212,
-    0,0,0,114,13,1,0,0,114,249,0,0,0,114,246,0,
-    0,0,114,253,0,0,0,114,0,1,0,0,114,47,1,0,
-    0,114,13,0,0,0,114,10,0,0,0,114,7,0,0,0,
-    114,93,1,0,0,114,93,1,0,0,2,5,0,0,115,22,
-    0,0,0,8,0,6,1,2,3,8,1,6,10,6,3,6,
-    3,6,3,6,3,6,3,10,12,115,62,0,0,0,0,129,
-    0,129,0,129,0,129,0,129,0,129,0,129,0,129,0,129,
-    0,129,8,244,0,127,0,127,0,127,0,127,0,127,0,127,
-    0,127,0,127,0,127,0,127,6,14,2,2,8,9,6,3,
-    6,3,6,3,6,3,6,3,6,12,10,4,115,70,0,0,
-    0,1,1,1,1,1,1,1,1,5,61,5,61,5,61,6,
-    18,5,67,5,67,5,67,5,67,5,20,5,20,5,20,5,
-    18,5,18,5,18,5,66,5,66,5,66,5,57,5,57,5,
-    57,5,13,5,13,5,13,5,60,5,60,5,60,5,43,5,
-    43,5,43,5,43,5,43,114,10,0,0,0,114,93,1,0,
-    0,99,0,0,0,0,0,0,0,0,0,0,0,0,3,0,
-    0,0,0,0,0,0,115,102,0,0,0,101,0,90,1,100,
-    0,90,2,100,1,90,3,101,4,100,2,132,0,131,1,90,
-    5,101,4,100,3,132,0,131,1,90,6,101,7,100,4,132,
-    0,131,1,90,8,101,7,100,5,132,0,131,1,90,9,101,
-    7,100,11,100,7,132,1,131,1,90,10,101,7,100,12,100,
-    8,132,1,131,1,90,11,101,7,100,11,100,9,132,1,131,
-    1,90,12,101,4,100,10,132,0,131,1,90,13,100,6,83,
-    0,41,13,218,10,80,97,116,104,70,105,110,100,101,114,122,
-    62,77,101,116,97,32,112,97,116,104,32,102,105,110,100,101,
-    114,32,102,111,114,32,115,121,115,46,112,97,116,104,32,97,
-    110,100,32,112,97,99,107,97,103,101,32,95,95,112,97,116,
-    104,95,95,32,97,116,116,114,105,98,117,116,101,115,46,99,
-    0,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,
-    3,0,0,0,115,64,0,0,0,116,0,116,1,106,2,160,
-    3,161,0,131,1,68,0,93,22,92,2,125,0,125,1,124,
-    1,100,1,117,0,114,20,116,1,106,2,124,0,61,0,113,
-    7,116,4,124,1,100,2,131,2,114,29,124,1,160,5,161,
-    0,1,0,113,7,100,1,83,0,41,3,122,125,67,97,108,
-    108,32,116,104,101,32,105,110,118,97,108,105,100,97,116,101,
-    95,99,97,99,104,101,115,40,41,32,109,101,116,104,111,100,
-    32,111,110,32,97,108,108,32,112,97,116,104,32,101,110,116,
-    114,121,32,102,105,110,100,101,114,115,10,32,32,32,32,32,
-    32,32,32,115,116,111,114,101,100,32,105,110,32,115,121,115,
-    46,112,97,116,104,95,105,109,112,111,114,116,101,114,95,99,
-    97,99,104,101,115,32,40,119,104,101,114,101,32,105,109,112,
-    108,101,109,101,110,116,101,100,41,46,78,218,17,105,110,118,
-    97,108,105,100,97,116,101,95,99,97,99,104,101,115,41,6,
-    218,4,108,105,115,116,114,18,0,0,0,218,19,112,97,116,
-    104,95,105,109,112,111,114,116,101,114,95,99,97,99,104,101,
-    218,5,105,116,101,109,115,114,156,0,0,0,114,100,1,0,
-    0,41,2,114,145,0,0,0,218,6,102,105,110,100,101,114,
-    115,2,0,0,0,32,32,114,7,0,0,0,114,100,1,0,
-    0,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,55,
-    5,0,0,115,14,0,0,0,22,4,8,1,10,1,10,1,
-    8,1,2,128,4,252,115,20,0,0,0,12,4,4,4,6,
-    252,6,1,2,3,10,254,8,1,10,1,2,128,4,0,115,
-    64,0,0,0,29,33,34,37,34,57,34,65,34,65,29,66,
-    9,43,9,43,13,25,13,17,19,25,16,22,26,30,16,30,
-    13,43,21,24,21,44,45,49,21,50,21,50,18,25,26,32,
-    34,53,18,54,13,43,17,23,17,43,17,43,17,43,0,0,
-    9,43,9,43,114,10,0,0,0,99,1,0,0,0,0,0,
-    0,0,0,0,0,0,9,0,0,0,3,0,0,0,115,78,
-    0,0,0,116,0,106,1,100,1,117,1,114,14,116,0,106,
-    1,115,14,116,2,106,3,100,2,116,4,131,2,1,0,116,
-    0,106,1,68,0,93,18,125,1,9,0,124,1,124,0,131,
-    1,2,0,1,0,83,0,35,0,4,0,116,5,121,38,1,
-    0,1,0,1,0,89,0,113,17,37,0,100,1,83,0,119,
-    0,41,3,122,46,83,101,97,114,99,104,32,115,121,115,46,
-    112,97,116,104,95,104,111,111,107,115,32,102,111,114,32,97,
-    32,102,105,110,100,101,114,32,102,111,114,32,39,112,97,116,
-    104,39,46,78,122,23,115,121,115,46,112,97,116,104,95,104,
-    111,111,107,115,32,105,115,32,101,109,112,116,121,41,6,114,
-    18,0,0,0,218,10,112,97,116,104,95,104,111,111,107,115,
-    114,103,0,0,0,114,104,0,0,0,114,165,0,0,0,114,
-    146,0,0,0,41,2,114,67,0,0,0,90,4,104,111,111,
-    107,115,2,0,0,0,32,32,114,7,0,0,0,218,11,95,
-    112,97,116,104,95,104,111,111,107,115,122,22,80,97,116,104,
-    70,105,110,100,101,114,46,95,112,97,116,104,95,104,111,111,
-    107,115,65,5,0,0,115,22,0,0,0,16,3,12,1,10,
-    1,2,1,12,1,2,128,12,1,4,1,2,128,4,2,2,
-    253,115,32,0,0,0,8,3,2,1,4,255,14,1,4,1,
-    4,6,2,250,2,4,12,254,2,128,2,2,2,255,12,1,
-    2,128,4,2,2,254,115,78,0,0,0,12,15,12,26,34,
-    38,12,38,9,69,47,50,47,61,9,69,13,22,13,27,28,
-    53,55,68,13,69,13,69,21,24,21,35,9,24,9,24,13,
-    17,13,25,24,28,29,33,24,34,17,34,17,34,17,34,0,
-    0,13,25,20,31,13,25,13,25,13,25,13,25,17,25,17,
-    25,0,0,20,24,20,24,13,25,115,12,0,0,0,148,3,
-    26,2,154,7,35,9,166,1,35,9,99,2,0,0,0,0,
-    0,0,0,0,0,0,0,8,0,0,0,3,0,0,0,115,
-    104,0,0,0,124,1,100,1,107,2,114,21,9,0,116,0,
-    106,1,131,0,125,1,110,11,35,0,4,0,116,2,121,51,
-    1,0,1,0,1,0,89,0,100,2,83,0,37,0,9,0,
-    116,3,106,4,124,1,25,0,125,2,124,2,83,0,35,0,
-    4,0,116,5,121,50,1,0,1,0,1,0,124,0,160,6,
-    124,1,161,1,125,2,124,2,116,3,106,4,124,1,60,0,
-    89,0,124,2,83,0,37,0,119,0,119,0,41,3,122,210,
-    71,101,116,32,116,104,101,32,102,105,110,100,101,114,32,102,
-    111,114,32,116,104,101,32,112,97,116,104,32,101,110,116,114,
-    121,32,102,114,111,109,32,115,121,115,46,112,97,116,104,95,
-    105,109,112,111,114,116,101,114,95,99,97,99,104,101,46,10,
-    10,32,32,32,32,32,32,32,32,73,102,32,116,104,101,32,
-    112,97,116,104,32,101,110,116,114,121,32,105,115,32,110,111,
-    116,32,105,110,32,116,104,101,32,99,97,99,104,101,44,32,
-    102,105,110,100,32,116,104,101,32,97,112,112,114,111,112,114,
-    105,97,116,101,32,102,105,110,100,101,114,10,32,32,32,32,
-    32,32,32,32,97,110,100,32,99,97,99,104,101,32,105,116,
-    46,32,73,102,32,110,111,32,102,105,110,100,101,114,32,105,
-    115,32,97,118,97,105,108,97,98,108,101,44,32,115,116,111,
-    114,101,32,78,111,110,101,46,10,10,32,32,32,32,32,32,
-    32,32,114,11,0,0,0,78,41,7,114,21,0,0,0,114,
-    86,0,0,0,218,17,70,105,108,101,78,111,116,70,111,117,
-    110,100,69,114,114,111,114,114,18,0,0,0,114,102,1,0,
-    0,218,8,75,101,121,69,114,114,111,114,114,106,1,0,0,
-    41,3,114,227,0,0,0,114,67,0,0,0,114,104,1,0,
-    0,115,3,0,0,0,32,32,32,114,7,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,122,31,80,97,116,104,70,105,110,100,101,114,
-    46,95,112,97,116,104,95,105,109,112,111,114,116,101,114,95,
-    99,97,99,104,101,78,5,0,0,115,36,0,0,0,8,8,
-    2,1,10,1,2,128,12,1,6,3,2,128,2,1,10,1,
-    4,4,2,128,12,253,10,1,12,1,4,1,2,128,2,253,
-    2,250,115,42,0,0,0,6,8,4,6,10,252,2,128,2,
-    4,2,253,14,3,2,128,2,5,10,253,4,4,2,128,2,
-    255,2,254,8,2,10,255,12,1,4,1,2,128,2,255,2,
-    251,115,104,0,0,0,12,16,20,22,12,22,9,28,13,28,
-    24,27,24,34,24,36,17,21,17,21,0,0,13,28,20,37,
-    13,28,13,28,13,28,13,28,24,28,24,28,24,28,0,0,
-    9,51,22,25,22,45,46,50,22,51,13,19,16,22,9,22,
-    0,0,9,51,16,24,9,51,9,51,9,51,9,51,22,25,
-    22,43,38,42,22,43,13,19,45,51,13,16,13,36,37,41,
-    13,42,13,42,16,22,9,22,0,0,9,51,13,28,115,24,
-    0,0,0,133,4,10,0,138,7,20,7,150,5,29,0,157,
-    17,49,7,178,1,49,7,179,1,20,7,99,3,0,0,0,
-    0,0,0,0,0,0,0,0,4,0,0,0,3,0,0,0,
-    115,138,0,0,0,116,0,124,2,100,1,131,2,114,27,116,
-    1,160,2,124,2,161,1,155,0,100,2,157,2,125,3,116,
-    3,106,4,124,3,116,5,131,2,1,0,124,2,160,6,124,
-    1,161,1,92,2,125,4,125,5,110,21,116,1,160,2,124,
-    2,161,1,155,0,100,3,157,2,125,3,116,3,106,4,124,
-    3,116,5,131,2,1,0,124,2,160,7,124,1,161,1,125,
-    4,103,0,125,5,124,4,100,0,117,1,114,58,116,1,160,
-    8,124,1,124,4,161,2,83,0,116,1,160,9,124,1,100,
-    0,161,2,125,6,124,5,124,6,95,10,124,6,83,0,41,
-    4,78,114,164,0,0,0,122,53,46,102,105,110,100,95,115,
-    112,101,99,40,41,32,110,111,116,32,102,111,117,110,100,59,
-    32,102,97,108,108,105,110,103,32,98,97,99,107,32,116,111,
-    32,102,105,110,100,95,108,111,97,100,101,114,40,41,122,53,
-    46,102,105,110,100,95,115,112,101,99,40,41,32,110,111,116,
-    32,102,111,117,110,100,59,32,102,97,108,108,105,110,103,32,
-    98,97,99,107,32,116,111,32,102,105,110,100,95,109,111,100,
-    117,108,101,40,41,41,11,114,156,0,0,0,114,162,0,0,
-    0,90,12,95,111,98,106,101,99,116,95,110,97,109,101,114,
-    103,0,0,0,114,104,0,0,0,114,165,0,0,0,114,164,
-    0,0,0,114,235,0,0,0,114,230,0,0,0,114,213,0,
-    0,0,114,208,0,0,0,41,7,114,227,0,0,0,114,166,
-    0,0,0,114,104,1,0,0,114,169,0,0,0,114,167,0,
-    0,0,114,168,0,0,0,114,216,0,0,0,115,7,0,0,
-    0,32,32,32,32,32,32,32,114,7,0,0,0,218,16,95,
-    108,101,103,97,99,121,95,103,101,116,95,115,112,101,99,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,100,5,0,0,
-    115,26,0,0,0,10,4,16,1,12,2,16,1,16,2,12,
-    2,10,1,4,1,8,1,12,1,12,1,6,1,4,1,115,
-    36,0,0,0,8,4,2,10,8,247,6,1,2,255,12,2,
-    16,1,8,2,6,1,2,255,12,2,10,1,4,1,6,1,
-    14,1,12,1,6,1,4,1,115,138,0,0,0,12,19,20,
-    26,28,41,12,42,9,26,23,33,23,54,47,53,23,54,20,
-    52,20,52,20,52,13,16,13,22,13,27,28,31,33,46,13,
-    47,13,47,32,38,32,60,51,59,32,60,13,29,13,19,21,
-    29,21,29,23,33,23,54,47,53,23,54,20,52,20,52,20,
-    52,13,16,13,22,13,27,28,31,33,46,13,47,13,47,22,
-    28,22,50,41,49,22,50,13,19,24,26,13,21,12,18,26,
-    30,12,30,9,65,20,30,20,65,48,56,58,64,20,65,13,
-    65,16,26,16,53,38,46,48,52,16,53,9,13,43,51,9,
-    13,9,40,16,20,9,20,114,10,0,0,0,78,99,4,0,
-    0,0,0,0,0,0,0,0,0,0,5,0,0,0,3,0,
-    0,0,115,166,0,0,0,103,0,125,4,124,2,68,0,93,
-    67,125,5,116,0,124,5,116,1,116,2,102,2,131,2,115,
-    14,113,4,124,0,160,3,124,5,161,1,125,6,124,6,100,
-    1,117,1,114,71,116,4,124,6,100,2,131,2,114,35,124,
-    6,160,5,124,1,124,3,161,2,125,7,110,6,124,0,160,
-    6,124,1,124,6,161,2,125,7,124,7,100,1,117,0,114,
-    46,113,4,124,7,106,7,100,1,117,1,114,55,124,7,2,
-    0,1,0,83,0,124,7,106,8,125,8,124,8,100,1,117,
-    0,114,66,116,9,100,3,131,1,130,1,124,4,160,10,124,
-    8,161,1,1,0,113,4,116,11,160,12,124,1,100,1,161,
-    2,125,7,124,4,124,7,95,8,124,7,83,0,41,4,122,
-    63,70,105,110,100,32,116,104,101,32,108,111,97,100,101,114,
-    32,111,114,32,110,97,109,101,115,112,97,99,101,95,112,97,
-    116,104,32,102,111,114,32,116,104,105,115,32,109,111,100,117,
-    108,101,47,112,97,99,107,97,103,101,32,110,97,109,101,46,
-    78,114,232,0,0,0,122,19,115,112,101,99,32,109,105,115,
-    115,105,110,103,32,108,111,97,100,101,114,41,13,114,188,0,
-    0,0,114,113,0,0,0,218,5,98,121,116,101,115,114,109,
-    1,0,0,114,156,0,0,0,114,232,0,0,0,114,110,1,
-    0,0,114,167,0,0,0,114,208,0,0,0,114,146,0,0,
-    0,114,194,0,0,0,114,162,0,0,0,114,213,0,0,0,
-    41,9,114,227,0,0,0,114,166,0,0,0,114,67,0,0,
-    0,114,231,0,0,0,218,14,110,97,109,101,115,112,97,99,
-    101,95,112,97,116,104,90,5,101,110,116,114,121,114,104,1,
-    0,0,114,216,0,0,0,114,168,0,0,0,115,9,0,0,
-    0,32,32,32,32,32,32,32,32,32,114,7,0,0,0,218,
-    9,95,103,101,116,95,115,112,101,99,122,20,80,97,116,104,
-    70,105,110,100,101,114,46,95,103,101,116,95,115,112,101,99,
-    121,5,0,0,115,42,0,0,0,4,5,8,1,14,1,2,
-    1,10,1,8,1,10,1,14,1,12,2,8,1,2,1,10,
-    1,8,1,6,1,8,1,8,1,10,5,2,128,12,2,6,
-    1,4,1,115,50,0,0,0,4,5,2,1,4,24,2,232,
-    12,1,4,1,10,1,6,1,2,16,8,241,2,3,14,254,
-    12,2,6,1,4,1,8,1,10,1,6,1,6,1,10,1,
-    10,5,2,128,12,2,6,1,4,1,115,166,0,0,0,26,
-    28,9,23,22,26,9,24,9,24,13,18,20,30,31,36,39,
-    42,44,49,38,50,20,51,13,25,17,25,22,25,22,53,47,
-    52,22,53,13,19,16,22,30,34,16,34,13,48,20,27,28,
-    34,36,47,20,48,17,66,28,34,28,62,45,53,55,61,28,
-    62,21,25,21,25,28,31,28,66,49,57,59,65,28,66,21,
-    25,20,24,28,32,20,32,17,29,21,29,20,24,20,31,39,
-    43,20,43,17,32,28,32,21,32,21,32,21,32,28,32,28,
-    59,17,25,20,28,32,36,20,36,17,61,27,38,39,60,27,
-    61,21,61,17,31,17,48,39,47,17,48,17,48,0,0,20,
-    30,20,57,42,50,52,56,20,57,13,17,47,61,13,17,13,
-    44,20,24,13,24,114,10,0,0,0,99,4,0,0,0,0,
-    0,0,0,0,0,0,0,5,0,0,0,3,0,0,0,115,
-    94,0,0,0,124,2,100,1,117,0,114,7,116,0,106,1,
-    125,2,124,0,160,2,124,1,124,2,124,3,161,3,125,4,
-    124,4,100,1,117,0,114,20,100,1,83,0,124,4,106,3,
-    100,1,117,0,114,45,124,4,106,4,125,5,124,5,114,43,
-    100,1,124,4,95,5,116,6,124,1,124,5,124,0,106,2,
-    131,3,124,4,95,4,124,4,83,0,100,1,83,0,124,4,
-    83,0,41,2,122,141,84,114,121,32,116,111,32,102,105,110,
-    100,32,97,32,115,112,101,99,32,102,111,114,32,39,102,117,
-    108,108,110,97,109,101,39,32,111,110,32,115,121,115,46,112,
-    97,116,104,32,111,114,32,39,112,97,116,104,39,46,10,10,
-    32,32,32,32,32,32,32,32,84,104,101,32,115,101,97,114,
-    99,104,32,105,115,32,98,97,115,101,100,32,111,110,32,115,
-    121,115,46,112,97,116,104,95,104,111,111,107,115,32,97,110,
-    100,32,115,121,115,46,112,97,116,104,95,105,109,112,111,114,
-    116,101,114,95,99,97,99,104,101,46,10,32,32,32,32,32,
-    32,32,32,78,41,7,114,18,0,0,0,114,67,0,0,0,
-    114,113,1,0,0,114,167,0,0,0,114,208,0,0,0,114,
-    211,0,0,0,114,64,1,0,0,41,6,114,227,0,0,0,
-    114,166,0,0,0,114,67,0,0,0,114,231,0,0,0,114,
-    216,0,0,0,114,112,1,0,0,115,6,0,0,0,32,32,
-    32,32,32,32,114,7,0,0,0,114,232,0,0,0,122,20,
-    80,97,116,104,70,105,110,100,101,114,46,102,105,110,100,95,
-    115,112,101,99,153,5,0,0,115,26,0,0,0,8,6,6,
-    1,14,1,8,1,4,1,10,1,6,1,4,1,6,3,16,
-    1,4,1,4,2,4,2,115,32,0,0,0,6,6,8,1,
-    14,1,6,1,2,13,4,244,8,1,2,11,6,246,2,1,
-    2,7,6,252,16,1,4,1,4,2,4,2,115,94,0,0,
-    0,12,16,20,24,12,24,9,28,20,23,20,28,13,17,16,
-    19,16,53,30,38,40,44,46,52,16,53,9,13,12,16,20,
-    24,12,24,9,24,20,24,20,24,14,18,14,25,29,33,14,
-    33,9,24,30,34,30,61,13,27,16,30,13,28,31,35,17,
-    21,17,28,51,65,66,74,76,90,92,95,92,105,51,106,17,
-    21,17,48,24,28,17,28,24,28,24,28,20,24,13,24,114,
-    10,0,0,0,99,3,0,0,0,0,0,0,0,0,0,0,
-    0,4,0,0,0,3,0,0,0,115,42,0,0,0,116,0,
-    106,1,100,1,116,2,131,2,1,0,124,0,160,3,124,1,
-    124,2,161,2,125,3,124,3,100,2,117,0,114,18,100,2,
-    83,0,124,3,106,4,83,0,41,3,122,170,102,105,110,100,
-    32,116,104,101,32,109,111,100,117,108,101,32,111,110,32,115,
-    121,115,46,112,97,116,104,32,111,114,32,39,112,97,116,104,
-    39,32,98,97,115,101,100,32,111,110,32,115,121,115,46,112,
-    97,116,104,95,104,111,111,107,115,32,97,110,100,10,32,32,
-    32,32,32,32,32,32,115,121,115,46,112,97,116,104,95,105,
-    109,112,111,114,116,101,114,95,99,97,99,104,101,46,10,10,
+    46,108,111,97,100,95,109,111,100,117,108,101,32,5,0,0,
+    115,8,0,0,0,6,7,4,1,4,255,12,3,115,10,0,
+    0,0,2,7,2,1,2,255,8,1,12,2,115,26,0,0,
+    0,9,19,9,48,37,77,37,41,37,47,9,48,9,48,16,
+    26,16,60,45,49,51,59,16,60,9,60,114,10,0,0,0,
+    99,2,0,0,0,0,0,0,0,0,0,0,0,2,0,0,
+    0,3,0,0,0,115,22,0,0,0,100,1,100,2,108,0,
+    109,1,125,2,1,0,124,2,124,0,106,2,131,1,83,0,
+    41,3,78,114,0,0,0,0,41,1,218,15,78,97,109,101,
+    115,112,97,99,101,82,101,97,100,101,114,41,3,114,46,1,
+    0,0,114,97,1,0,0,114,66,1,0,0,41,3,114,147,
+    0,0,0,114,252,0,0,0,114,97,1,0,0,115,3,0,
+    0,0,32,32,32,114,7,0,0,0,114,47,1,0,0,122,
+    36,95,78,97,109,101,115,112,97,99,101,76,111,97,100,101,
+    114,46,103,101,116,95,114,101,115,111,117,114,99,101,95,114,
+    101,97,100,101,114,44,5,0,0,243,4,0,0,0,12,1,
+    10,1,114,98,1,0,0,115,22,0,0,0,9,54,9,54,
+    9,54,9,54,9,54,9,54,16,31,32,36,32,42,16,43,
+    9,43,114,10,0,0,0,78,41,13,114,153,0,0,0,114,
+    152,0,0,0,114,154,0,0,0,114,242,0,0,0,114,239,
+    0,0,0,114,95,1,0,0,114,212,0,0,0,114,13,1,
+    0,0,114,249,0,0,0,114,246,0,0,0,114,253,0,0,
+    0,114,0,1,0,0,114,47,1,0,0,114,13,0,0,0,
+    114,10,0,0,0,114,7,0,0,0,114,93,1,0,0,114,
+    93,1,0,0,2,5,0,0,115,22,0,0,0,8,0,6,
+    1,2,3,8,1,6,10,6,3,6,3,6,3,6,3,6,
+    3,10,12,115,62,0,0,0,0,129,0,129,0,129,0,129,
+    0,129,0,129,0,129,0,129,0,129,0,129,8,244,0,127,
+    0,127,0,127,0,127,0,127,0,127,0,127,0,127,0,127,
+    0,127,6,14,2,2,8,9,6,3,6,3,6,3,6,3,
+    6,3,6,12,10,4,115,70,0,0,0,1,1,1,1,1,
+    1,1,1,5,61,5,61,5,61,6,18,5,67,5,67,5,
+    67,5,67,5,20,5,20,5,20,5,18,5,18,5,18,5,
+    66,5,66,5,66,5,57,5,57,5,57,5,13,5,13,5,
+    13,5,60,5,60,5,60,5,43,5,43,5,43,5,43,5,
+    43,114,10,0,0,0,114,93,1,0,0,99,0,0,0,0,
+    0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,
+    115,102,0,0,0,101,0,90,1,100,0,90,2,100,1,90,
+    3,101,4,100,2,132,0,131,1,90,5,101,4,100,3,132,
+    0,131,1,90,6,101,7,100,4,132,0,131,1,90,8,101,
+    7,100,5,132,0,131,1,90,9,101,7,100,11,100,7,132,
+    1,131,1,90,10,101,7,100,12,100,8,132,1,131,1,90,
+    11,101,7,100,11,100,9,132,1,131,1,90,12,101,4,100,
+    10,132,0,131,1,90,13,100,6,83,0,41,13,218,10,80,
+    97,116,104,70,105,110,100,101,114,122,62,77,101,116,97,32,
+    112,97,116,104,32,102,105,110,100,101,114,32,102,111,114,32,
+    115,121,115,46,112,97,116,104,32,97,110,100,32,112,97,99,
+    107,97,103,101,32,95,95,112,97,116,104,95,95,32,97,116,
+    116,114,105,98,117,116,101,115,46,99,0,0,0,0,0,0,
+    0,0,0,0,0,0,4,0,0,0,3,0,0,0,115,64,
+    0,0,0,116,0,116,1,106,2,160,3,161,0,131,1,68,
+    0,93,22,92,2,125,0,125,1,124,1,100,1,117,0,114,
+    20,116,1,106,2,124,0,61,0,113,7,116,4,124,1,100,
+    2,131,2,114,29,124,1,160,5,161,0,1,0,113,7,100,
+    1,83,0,41,3,122,125,67,97,108,108,32,116,104,101,32,
+    105,110,118,97,108,105,100,97,116,101,95,99,97,99,104,101,
+    115,40,41,32,109,101,116,104,111,100,32,111,110,32,97,108,
+    108,32,112,97,116,104,32,101,110,116,114,121,32,102,105,110,
+    100,101,114,115,10,32,32,32,32,32,32,32,32,115,116,111,
+    114,101,100,32,105,110,32,115,121,115,46,112,97,116,104,95,
+    105,109,112,111,114,116,101,114,95,99,97,99,104,101,115,32,
+    40,119,104,101,114,101,32,105,109,112,108,101,109,101,110,116,
+    101,100,41,46,78,218,17,105,110,118,97,108,105,100,97,116,
+    101,95,99,97,99,104,101,115,41,6,218,4,108,105,115,116,
+    114,18,0,0,0,218,19,112,97,116,104,95,105,109,112,111,
+    114,116,101,114,95,99,97,99,104,101,218,5,105,116,101,109,
+    115,114,156,0,0,0,114,100,1,0,0,41,2,114,145,0,
+    0,0,218,6,102,105,110,100,101,114,115,2,0,0,0,32,
+    32,114,7,0,0,0,114,100,1,0,0,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,55,5,0,0,115,14,0,
+    0,0,22,4,8,1,10,1,10,1,8,1,2,128,4,252,
+    115,20,0,0,0,12,4,4,4,6,252,6,1,2,3,10,
+    254,8,1,10,1,2,128,4,0,115,64,0,0,0,29,33,
+    34,37,34,57,34,65,34,65,29,66,9,43,9,43,13,25,
+    13,17,19,25,16,22,26,30,16,30,13,43,21,24,21,44,
+    45,49,21,50,21,50,18,25,26,32,34,53,18,54,13,43,
+    17,23,17,43,17,43,17,43,0,0,9,43,9,43,114,10,
+    0,0,0,99,1,0,0,0,0,0,0,0,0,0,0,0,
+    9,0,0,0,3,0,0,0,115,78,0,0,0,116,0,106,
+    1,100,1,117,1,114,14,116,0,106,1,115,14,116,2,106,
+    3,100,2,116,4,131,2,1,0,116,0,106,1,68,0,93,
+    19,125,1,9,0,124,1,124,0,131,1,2,0,1,0,83,
+    0,35,0,4,0,116,5,121,35,1,0,1,0,1,0,89,
+    0,113,17,119,0,37,0,100,1,83,0,41,3,122,46,83,
+    101,97,114,99,104,32,115,121,115,46,112,97,116,104,95,104,
+    111,111,107,115,32,102,111,114,32,97,32,102,105,110,100,101,
+    114,32,102,111,114,32,39,112,97,116,104,39,46,78,122,23,
+    115,121,115,46,112,97,116,104,95,104,111,111,107,115,32,105,
+    115,32,101,109,112,116,121,41,6,114,18,0,0,0,218,10,
+    112,97,116,104,95,104,111,111,107,115,114,103,0,0,0,114,
+    104,0,0,0,114,165,0,0,0,114,146,0,0,0,41,2,
+    114,67,0,0,0,90,4,104,111,111,107,115,2,0,0,0,
+    32,32,114,7,0,0,0,218,11,95,112,97,116,104,95,104,
+    111,111,107,115,122,22,80,97,116,104,70,105,110,100,101,114,
+    46,95,112,97,116,104,95,104,111,111,107,115,65,5,0,0,
+    115,22,0,0,0,16,3,12,1,10,1,2,1,12,1,2,
+    128,12,1,4,1,2,255,2,128,4,3,115,30,0,0,0,
+    8,3,2,1,4,255,14,1,4,1,4,6,2,250,2,4,
+    12,254,2,128,2,2,2,255,14,1,2,128,4,2,115,78,
+    0,0,0,12,15,12,26,34,38,12,38,9,69,47,50,47,
+    61,9,69,13,22,13,27,28,53,55,68,13,69,13,69,21,
+    24,21,35,9,24,9,24,13,17,13,25,24,28,29,33,24,
+    34,17,34,17,34,17,34,0,0,13,25,20,31,13,25,13,
+    25,13,25,13,25,17,25,17,25,13,25,0,0,20,24,20,
+    24,115,12,0,0,0,148,3,26,2,154,7,36,9,163,1,
+    36,9,99,2,0,0,0,0,0,0,0,0,0,0,0,8,
+    0,0,0,3,0,0,0,115,104,0,0,0,124,1,100,1,
+    107,2,114,22,9,0,116,0,106,1,131,0,125,1,110,12,
+    35,0,4,0,116,2,121,20,1,0,1,0,1,0,89,0,
+    100,2,83,0,119,0,37,0,9,0,116,3,106,4,124,1,
+    25,0,125,2,124,2,83,0,35,0,4,0,116,5,121,50,
+    1,0,1,0,1,0,124,0,160,6,124,1,161,1,125,2,
+    124,2,116,3,106,4,124,1,60,0,89,0,124,2,83,0,
+    119,0,37,0,41,3,122,210,71,101,116,32,116,104,101,32,
+    102,105,110,100,101,114,32,102,111,114,32,116,104,101,32,112,
+    97,116,104,32,101,110,116,114,121,32,102,114,111,109,32,115,
+    121,115,46,112,97,116,104,95,105,109,112,111,114,116,101,114,
+    95,99,97,99,104,101,46,10,10,32,32,32,32,32,32,32,
+    32,73,102,32,116,104,101,32,112,97,116,104,32,101,110,116,
+    114,121,32,105,115,32,110,111,116,32,105,110,32,116,104,101,
+    32,99,97,99,104,101,44,32,102,105,110,100,32,116,104,101,
+    32,97,112,112,114,111,112,114,105,97,116,101,32,102,105,110,
+    100,101,114,10,32,32,32,32,32,32,32,32,97,110,100,32,
+    99,97,99,104,101,32,105,116,46,32,73,102,32,110,111,32,
+    102,105,110,100,101,114,32,105,115,32,97,118,97,105,108,97,
+    98,108,101,44,32,115,116,111,114,101,32,78,111,110,101,46,
+    10,10,32,32,32,32,32,32,32,32,114,11,0,0,0,78,
+    41,7,114,21,0,0,0,114,86,0,0,0,218,17,70,105,
+    108,101,78,111,116,70,111,117,110,100,69,114,114,111,114,114,
+    18,0,0,0,114,102,1,0,0,218,8,75,101,121,69,114,
+    114,111,114,114,106,1,0,0,41,3,114,227,0,0,0,114,
+    67,0,0,0,114,104,1,0,0,115,3,0,0,0,32,32,
+    32,114,7,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,122,31,80,97,
+    116,104,70,105,110,100,101,114,46,95,112,97,116,104,95,105,
+    109,112,111,114,116,101,114,95,99,97,99,104,101,78,5,0,
+    0,115,36,0,0,0,8,8,2,1,10,1,2,128,12,1,
+    6,3,2,253,2,128,2,4,10,1,4,4,2,128,12,253,
+    10,1,12,1,4,1,2,253,2,128,115,40,0,0,0,6,
+    8,4,6,10,252,2,128,2,4,2,253,16,3,2,128,2,
+    5,10,253,4,4,2,128,2,255,2,254,8,2,10,255,12,
+    1,4,1,2,255,2,128,115,104,0,0,0,12,16,20,22,
+    12,22,9,28,13,28,24,27,24,34,24,36,17,21,17,21,
+    0,0,13,28,20,37,13,28,13,28,13,28,13,28,24,28,
+    24,28,24,28,13,28,0,0,9,51,22,25,22,45,46,50,
+    22,51,13,19,16,22,9,22,0,0,9,51,16,24,9,51,
+    9,51,9,51,9,51,22,25,22,43,38,42,22,43,13,19,
+    45,51,13,16,13,36,37,41,13,42,13,42,16,22,9,22,
+    9,51,0,0,115,24,0,0,0,133,4,10,0,138,7,21,
+    7,148,1,21,7,151,5,30,0,158,17,51,7,178,1,51,
+    7,99,3,0,0,0,0,0,0,0,0,0,0,0,4,0,
+    0,0,3,0,0,0,115,138,0,0,0,116,0,124,2,100,
+    1,131,2,114,27,116,1,160,2,124,2,161,1,155,0,100,
+    2,157,2,125,3,116,3,106,4,124,3,116,5,131,2,1,
+    0,124,2,160,6,124,1,161,1,92,2,125,4,125,5,110,
+    21,116,1,160,2,124,2,161,1,155,0,100,3,157,2,125,
+    3,116,3,106,4,124,3,116,5,131,2,1,0,124,2,160,
+    7,124,1,161,1,125,4,103,0,125,5,124,4,100,0,117,
+    1,114,58,116,1,160,8,124,1,124,4,161,2,83,0,116,
+    1,160,9,124,1,100,0,161,2,125,6,124,5,124,6,95,
+    10,124,6,83,0,41,4,78,114,164,0,0,0,122,53,46,
+    102,105,110,100,95,115,112,101,99,40,41,32,110,111,116,32,
+    102,111,117,110,100,59,32,102,97,108,108,105,110,103,32,98,
+    97,99,107,32,116,111,32,102,105,110,100,95,108,111,97,100,
+    101,114,40,41,122,53,46,102,105,110,100,95,115,112,101,99,
+    40,41,32,110,111,116,32,102,111,117,110,100,59,32,102,97,
+    108,108,105,110,103,32,98,97,99,107,32,116,111,32,102,105,
+    110,100,95,109,111,100,117,108,101,40,41,41,11,114,156,0,
+    0,0,114,162,0,0,0,90,12,95,111,98,106,101,99,116,
+    95,110,97,109,101,114,103,0,0,0,114,104,0,0,0,114,
+    165,0,0,0,114,164,0,0,0,114,235,0,0,0,114,230,
+    0,0,0,114,213,0,0,0,114,208,0,0,0,41,7,114,
+    227,0,0,0,114,166,0,0,0,114,104,1,0,0,114,169,
+    0,0,0,114,167,0,0,0,114,168,0,0,0,114,216,0,
+    0,0,115,7,0,0,0,32,32,32,32,32,32,32,114,7,
+    0,0,0,218,16,95,108,101,103,97,99,121,95,103,101,116,
+    95,115,112,101,99,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,100,5,0,0,115,26,0,0,0,10,4,16,1,12,
+    2,16,1,16,2,12,2,10,1,4,1,8,1,12,1,12,
+    1,6,1,4,1,115,36,0,0,0,8,4,2,10,8,247,
+    6,1,2,255,12,2,16,1,8,2,6,1,2,255,12,2,
+    10,1,4,1,6,1,14,1,12,1,6,1,4,1,115,138,
+    0,0,0,12,19,20,26,28,41,12,42,9,26,23,33,23,
+    54,47,53,23,54,20,52,20,52,20,52,13,16,13,22,13,
+    27,28,31,33,46,13,47,13,47,32,38,32,60,51,59,32,
+    60,13,29,13,19,21,29,21,29,23,33,23,54,47,53,23,
+    54,20,52,20,52,20,52,13,16,13,22,13,27,28,31,33,
+    46,13,47,13,47,22,28,22,50,41,49,22,50,13,19,24,
+    26,13,21,12,18,26,30,12,30,9,65,20,30,20,65,48,
+    56,58,64,20,65,13,65,16,26,16,53,38,46,48,52,16,
+    53,9,13,43,51,9,13,9,40,16,20,9,20,114,10,0,
+    0,0,78,99,4,0,0,0,0,0,0,0,0,0,0,0,
+    5,0,0,0,3,0,0,0,115,166,0,0,0,103,0,125,
+    4,124,2,68,0,93,67,125,5,116,0,124,5,116,1,116,
+    2,102,2,131,2,115,14,113,4,124,0,160,3,124,5,161,
+    1,125,6,124,6,100,1,117,1,114,71,116,4,124,6,100,
+    2,131,2,114,35,124,6,160,5,124,1,124,3,161,2,125,
+    7,110,6,124,0,160,6,124,1,124,6,161,2,125,7,124,
+    7,100,1,117,0,114,46,113,4,124,7,106,7,100,1,117,
+    1,114,55,124,7,2,0,1,0,83,0,124,7,106,8,125,
+    8,124,8,100,1,117,0,114,66,116,9,100,3,131,1,130,
+    1,124,4,160,10,124,8,161,1,1,0,113,4,116,11,160,
+    12,124,1,100,1,161,2,125,7,124,4,124,7,95,8,124,
+    7,83,0,41,4,122,63,70,105,110,100,32,116,104,101,32,
+    108,111,97,100,101,114,32,111,114,32,110,97,109,101,115,112,
+    97,99,101,95,112,97,116,104,32,102,111,114,32,116,104,105,
+    115,32,109,111,100,117,108,101,47,112,97,99,107,97,103,101,
+    32,110,97,109,101,46,78,114,232,0,0,0,122,19,115,112,
+    101,99,32,109,105,115,115,105,110,103,32,108,111,97,100,101,
+    114,41,13,114,188,0,0,0,114,113,0,0,0,218,5,98,
+    121,116,101,115,114,109,1,0,0,114,156,0,0,0,114,232,
+    0,0,0,114,110,1,0,0,114,167,0,0,0,114,208,0,
+    0,0,114,146,0,0,0,114,194,0,0,0,114,162,0,0,
+    0,114,213,0,0,0,41,9,114,227,0,0,0,114,166,0,
+    0,0,114,67,0,0,0,114,231,0,0,0,218,14,110,97,
+    109,101,115,112,97,99,101,95,112,97,116,104,90,5,101,110,
+    116,114,121,114,104,1,0,0,114,216,0,0,0,114,168,0,
+    0,0,115,9,0,0,0,32,32,32,32,32,32,32,32,32,
+    114,7,0,0,0,218,9,95,103,101,116,95,115,112,101,99,
+    122,20,80,97,116,104,70,105,110,100,101,114,46,95,103,101,
+    116,95,115,112,101,99,121,5,0,0,115,42,0,0,0,4,
+    5,8,1,14,1,2,1,10,1,8,1,10,1,14,1,12,
+    2,8,1,2,1,10,1,8,1,6,1,8,1,8,1,10,
+    5,2,128,12,2,6,1,4,1,115,50,0,0,0,4,5,
+    2,1,4,24,2,232,12,1,4,1,10,1,6,1,2,16,
+    8,241,2,3,14,254,12,2,6,1,4,1,8,1,10,1,
+    6,1,6,1,10,1,10,5,2,128,12,2,6,1,4,1,
+    115,166,0,0,0,26,28,9,23,22,26,9,24,9,24,13,
+    18,20,30,31,36,39,42,44,49,38,50,20,51,13,25,17,
+    25,22,25,22,53,47,52,22,53,13,19,16,22,30,34,16,
+    34,13,48,20,27,28,34,36,47,20,48,17,66,28,34,28,
+    62,45,53,55,61,28,62,21,25,21,25,28,31,28,66,49,
+    57,59,65,28,66,21,25,20,24,28,32,20,32,17,29,21,
+    29,20,24,20,31,39,43,20,43,17,32,28,32,21,32,21,
+    32,21,32,28,32,28,59,17,25,20,28,32,36,20,36,17,
+    61,27,38,39,60,27,61,21,61,17,31,17,48,39,47,17,
+    48,17,48,0,0,20,30,20,57,42,50,52,56,20,57,13,
+    17,47,61,13,17,13,44,20,24,13,24,114,10,0,0,0,
+    99,4,0,0,0,0,0,0,0,0,0,0,0,5,0,0,
+    0,3,0,0,0,115,94,0,0,0,124,2,100,1,117,0,
+    114,7,116,0,106,1,125,2,124,0,160,2,124,1,124,2,
+    124,3,161,3,125,4,124,4,100,1,117,0,114,20,100,1,
+    83,0,124,4,106,3,100,1,117,0,114,45,124,4,106,4,
+    125,5,124,5,114,43,100,1,124,4,95,5,116,6,124,1,
+    124,5,124,0,106,2,131,3,124,4,95,4,124,4,83,0,
+    100,1,83,0,124,4,83,0,41,2,122,141,84,114,121,32,
+    116,111,32,102,105,110,100,32,97,32,115,112,101,99,32,102,
+    111,114,32,39,102,117,108,108,110,97,109,101,39,32,111,110,
+    32,115,121,115,46,112,97,116,104,32,111,114,32,39,112,97,
+    116,104,39,46,10,10,32,32,32,32,32,32,32,32,84,104,
+    101,32,115,101,97,114,99,104,32,105,115,32,98,97,115,101,
+    100,32,111,110,32,115,121,115,46,112,97,116,104,95,104,111,
+    111,107,115,32,97,110,100,32,115,121,115,46,112,97,116,104,
+    95,105,109,112,111,114,116,101,114,95,99,97,99,104,101,46,
+    10,32,32,32,32,32,32,32,32,78,41,7,114,18,0,0,
+    0,114,67,0,0,0,114,113,1,0,0,114,167,0,0,0,
+    114,208,0,0,0,114,211,0,0,0,114,64,1,0,0,41,
+    6,114,227,0,0,0,114,166,0,0,0,114,67,0,0,0,
+    114,231,0,0,0,114,216,0,0,0,114,112,1,0,0,115,
+    6,0,0,0,32,32,32,32,32,32,114,7,0,0,0,114,
+    232,0,0,0,122,20,80,97,116,104,70,105,110,100,101,114,
+    46,102,105,110,100,95,115,112,101,99,153,5,0,0,115,26,
+    0,0,0,8,6,6,1,14,1,8,1,4,1,10,1,6,
+    1,4,1,6,3,16,1,4,1,4,2,4,2,115,32,0,
+    0,0,6,6,8,1,14,1,6,1,2,13,4,244,8,1,
+    2,11,6,246,2,1,2,7,6,252,16,1,4,1,4,2,
+    4,2,115,94,0,0,0,12,16,20,24,12,24,9,28,20,
+    23,20,28,13,17,16,19,16,53,30,38,40,44,46,52,16,
+    53,9,13,12,16,20,24,12,24,9,24,20,24,20,24,14,
+    18,14,25,29,33,14,33,9,24,30,34,30,61,13,27,16,
+    30,13,28,31,35,17,21,17,28,51,65,66,74,76,90,92,
+    95,92,105,51,106,17,21,17,48,24,28,17,28,24,28,24,
+    28,20,24,13,24,114,10,0,0,0,99,3,0,0,0,0,
+    0,0,0,0,0,0,0,4,0,0,0,3,0,0,0,115,
+    42,0,0,0,116,0,106,1,100,1,116,2,131,2,1,0,
+    124,0,160,3,124,1,124,2,161,2,125,3,124,3,100,2,
+    117,0,114,18,100,2,83,0,124,3,106,4,83,0,41,3,
+    122,170,102,105,110,100,32,116,104,101,32,109,111,100,117,108,
+    101,32,111,110,32,115,121,115,46,112,97,116,104,32,111,114,
+    32,39,112,97,116,104,39,32,98,97,115,101,100,32,111,110,
+    32,115,121,115,46,112,97,116,104,95,104,111,111,107,115,32,
+    97,110,100,10,32,32,32,32,32,32,32,32,115,121,115,46,
+    112,97,116,104,95,105,109,112,111,114,116,101,114,95,99,97,
+    99,104,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,122,101,80,97,
+    116,104,70,105,110,100,101,114,46,102,105,110,100,95,109,111,
+    100,117,108,101,40,41,32,105,115,32,100,101,112,114,101,99,
+    97,116,101,100,32,97,110,100,32,115,108,97,116,101,100,32,
+    102,111,114,32,114,101,109,111,118,97,108,32,105,110,32,80,
+    121,116,104,111,110,32,51,46,49,50,59,32,117,115,101,32,
+    102,105,110,100,95,115,112,101,99,40,41,32,105,110,115,116,
+    101,97,100,78,114,233,0,0,0,114,234,0,0,0,115,4,
+    0,0,0,32,32,32,32,114,7,0,0,0,114,235,0,0,
+    0,122,22,80,97,116,104,70,105,110,100,101,114,46,102,105,
+    110,100,95,109,111,100,117,108,101,177,5,0,0,115,14,0,
+    0,0,6,8,2,2,4,254,12,3,8,1,4,1,6,1,
+    115,14,0,0,0,4,8,2,1,6,1,12,1,6,1,6,
+    1,6,1,115,42,0,0,0,9,18,9,23,24,84,24,42,
+    9,43,9,43,16,19,16,45,30,38,40,44,16,45,9,13,
+    12,16,20,24,12,24,9,24,20,24,20,24,16,20,16,27,
+    9,27,114,10,0,0,0,99,0,0,0,0,0,0,0,0,
+    0,0,0,0,4,0,0,0,15,0,0,0,115,28,0,0,
+    0,100,1,100,2,108,0,109,1,125,2,1,0,124,2,106,
+    2,124,0,105,0,124,1,164,1,142,1,83,0,41,4,97,
+    32,1,0,0,10,32,32,32,32,32,32,32,32,70,105,110,
+    100,32,100,105,115,116,114,105,98,117,116,105,111,110,115,46,
+    10,10,32,32,32,32,32,32,32,32,82,101,116,117,114,110,
+    32,97,110,32,105,116,101,114,97,98,108,101,32,111,102,32,
+    97,108,108,32,68,105,115,116,114,105,98,117,116,105,111,110,
+    32,105,110,115,116,97,110,99,101,115,32,99,97,112,97,98,
+    108,101,32,111,102,10,32,32,32,32,32,32,32,32,108,111,
+    97,100,105,110,103,32,116,104,101,32,109,101,116,97,100,97,
+    116,97,32,102,111,114,32,112,97,99,107,97,103,101,115,32,
+    109,97,116,99,104,105,110,103,32,96,96,99,111,110,116,101,
+    120,116,46,110,97,109,101,96,96,10,32,32,32,32,32,32,
+    32,32,40,111,114,32,97,108,108,32,110,97,109,101,115,32,
+    105,102,32,96,96,78,111,110,101,96,96,32,105,110,100,105,
+    99,97,116,101,100,41,32,97,108,111,110,103,32,116,104,101,
+    32,112,97,116,104,115,32,105,110,32,116,104,101,32,108,105,
+    115,116,10,32,32,32,32,32,32,32,32,111,102,32,100,105,
+    114,101,99,116,111,114,105,101,115,32,96,96,99,111,110,116,
+    101,120,116,46,112,97,116,104,96,96,46,10,32,32,32,32,
+    32,32,32,32,114,0,0,0,0,41,1,218,18,77,101,116,
+    97,100,97,116,97,80,97,116,104,70,105,110,100,101,114,78,
+    41,3,90,18,105,109,112,111,114,116,108,105,98,46,109,101,
+    116,97,100,97,116,97,114,114,1,0,0,218,18,102,105,110,
+    100,95,100,105,115,116,114,105,98,117,116,105,111,110,115,41,
+    3,114,148,0,0,0,114,149,0,0,0,114,114,1,0,0,
+    115,3,0,0,0,32,32,32,114,7,0,0,0,114,115,1,
+    0,0,122,29,80,97,116,104,70,105,110,100,101,114,46,102,
+    105,110,100,95,100,105,115,116,114,105,98,117,116,105,111,110,
+    115,193,5,0,0,243,4,0,0,0,12,10,16,1,114,116,
+    1,0,0,115,28,0,0,0,9,58,9,58,9,58,9,58,
+    9,58,9,58,16,34,16,53,55,59,16,70,63,69,16,70,
+    16,70,9,70,114,10,0,0,0,114,71,0,0,0,114,236,
+    0,0,0,41,14,114,153,0,0,0,114,152,0,0,0,114,
+    154,0,0,0,114,155,0,0,0,114,239,0,0,0,114,100,
+    1,0,0,114,106,1,0,0,114,240,0,0,0,114,109,1,
+    0,0,114,110,1,0,0,114,113,1,0,0,114,232,0,0,
+    0,114,235,0,0,0,114,115,1,0,0,114,13,0,0,0,
+    114,10,0,0,0,114,7,0,0,0,114,99,1,0,0,114,
+    99,1,0,0,51,5,0,0,115,36,0,0,0,8,0,4,
+    2,2,2,8,1,2,9,8,1,2,12,8,1,2,21,8,
+    1,2,20,10,1,2,31,10,1,2,23,10,1,2,15,12,
+    1,115,124,0,0,0,0,129,0,129,0,129,0,129,0,129,
+    0,129,0,129,0,129,0,129,0,129,8,195,0,127,0,127,
+    0,127,0,127,0,127,0,127,0,127,0,127,0,127,0,127,
+    2,63,0,129,0,129,0,129,0,129,0,129,0,129,0,129,
+    0,129,0,129,0,129,2,193,0,127,0,127,0,127,0,127,
+    0,127,0,127,0,127,0,127,0,127,0,127,2,65,8,8,
+    2,2,8,11,2,2,8,20,2,2,8,19,2,2,2,1,
+    8,29,2,2,2,1,8,21,2,2,2,1,8,13,2,2,
+    12,11,115,102,0,0,0,1,1,1,1,1,1,1,1,5,
+    73,1,1,6,18,5,43,5,43,5,43,5,43,6,18,5,
+    24,5,24,5,24,5,24,6,17,5,22,5,22,5,22,5,
+    22,6,17,5,20,5,20,5,20,5,20,6,17,47,51,5,
+    24,5,24,5,24,5,24,6,17,39,43,5,24,5,24,5,
+    24,5,24,6,17,41,45,5,27,5,27,5,27,5,27,6,
+    18,5,70,5,70,5,70,5,70,5,70,5,70,114,10,0,
+    0,0,114,99,1,0,0,99,0,0,0,0,0,0,0,0,
+    0,0,0,0,2,0,0,0,0,0,0,0,115,74,0,0,
+    0,101,0,90,1,100,0,90,2,100,1,90,3,100,2,132,
+    0,90,4,100,3,132,0,90,5,101,6,90,7,100,4,132,
+    0,90,8,100,5,132,0,90,9,100,11,100,7,132,1,90,
+    10,100,8,132,0,90,11,101,12,100,9,132,0,131,1,90,
+    13,100,10,132,0,90,14,100,6,83,0,41,12,218,10,70,
+    105,108,101,70,105,110,100,101,114,122,172,70,105,108,101,45,
+    98,97,115,101,100,32,102,105,110,100,101,114,46,10,10,32,
+    32,32,32,73,110,116,101,114,97,99,116,105,111,110,115,32,
+    119,105,116,104,32,116,104,101,32,102,105,108,101,32,115,121,
+    115,116,101,109,32,97,114,101,32,99,97,99,104,101,100,32,
+    102,111,114,32,112,101,114,102,111,114,109,97,110,99,101,44,
+    32,98,101,105,110,103,10,32,32,32,32,114,101,102,114,101,
+    115,104,101,100,32,119,104,101,110,32,116,104,101,32,100,105,
+    114,101,99,116,111,114,121,32,116,104,101,32,102,105,110,100,
+    101,114,32,105,115,32,104,97,110,100,108,105,110,103,32,104,
+    97,115,32,98,101,101,110,32,109,111,100,105,102,105,101,100,
+    46,10,10,32,32,32,32,99,2,0,0,0,0,0,0,0,
+    0,0,0,0,5,0,0,0,7,0,0,0,115,112,0,0,
+    0,135,5,103,0,125,3,124,2,68,0,93,15,92,2,138,
+    5,125,4,124,3,160,0,136,5,102,1,100,1,132,8,124,
+    4,68,0,131,1,161,1,1,0,113,5,124,3,124,0,95,
+    1,124,1,112,27,100,2,124,0,95,2,116,3,124,0,106,
+    2,131,1,115,43,116,4,116,5,106,6,131,0,124,0,106,
+    2,131,2,124,0,95,2,100,3,124,0,95,7,116,8,131,
+    0,124,0,95,9,116,8,131,0,124,0,95,10,100,4,83,
+    0,41,5,122,154,73,110,105,116,105,97,108,105,122,101,32,
+    119,105,116,104,32,116,104,101,32,112,97,116,104,32,116,111,
+    32,115,101,97,114,99,104,32,111,110,32,97,110,100,32,97,
+    32,118,97,114,105,97,98,108,101,32,110,117,109,98,101,114,
+    32,111,102,10,32,32,32,32,32,32,32,32,50,45,116,117,
+    112,108,101,115,32,99,111,110,116,97,105,110,105,110,103,32,
+    116,104,101,32,108,111,97,100,101,114,32,97,110,100,32,116,
+    104,101,32,102,105,108,101,32,115,117,102,102,105,120,101,115,
+    32,116,104,101,32,108,111,97,100,101,114,10,32,32,32,32,
+    32,32,32,32,114,101,99,111,103,110,105,122,101,115,46,99,
+    1,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,
+    51,0,0,0,115,24,0,0,0,129,0,124,0,93,7,125,
+    1,124,1,137,2,102,2,86,0,1,0,113,2,100,0,83,
+    0,114,71,0,0,0,114,13,0,0,0,41,3,114,5,0,
+    0,0,114,61,1,0,0,114,167,0,0,0,115,3,0,0,
+    0,32,32,128,114,7,0,0,0,114,8,0,0,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,222,5,0,0,243,4,0,0,0,2,
+    128,22,0,114,118,1,0,0,115,24,0,0,0,0,0,27,
+    68,27,68,49,55,29,35,37,43,28,44,27,68,27,68,27,
+    68,27,68,27,68,114,10,0,0,0,114,101,0,0,0,114,
+    134,0,0,0,78,41,11,114,194,0,0,0,218,8,95,108,
+    111,97,100,101,114,115,114,67,0,0,0,114,90,0,0,0,
+    114,69,0,0,0,114,21,0,0,0,114,86,0,0,0,218,
+    11,95,112,97,116,104,95,109,116,105,109,101,218,3,115,101,
+    116,218,11,95,112,97,116,104,95,99,97,99,104,101,218,19,
+    95,114,101,108,97,120,101,100,95,112,97,116,104,95,99,97,
+    99,104,101,41,6,114,147,0,0,0,114,67,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,218,0,0,0,114,167,0,
+    0,0,115,6,0,0,0,32,32,32,32,32,64,114,7,0,
+    0,0,114,242,0,0,0,122,19,70,105,108,101,70,105,110,
+    100,101,114,46,95,95,105,110,105,116,95,95,216,5,0,0,
+    115,22,0,0,0,2,128,4,4,12,1,24,1,6,1,10,
+    2,10,1,18,1,6,1,8,1,12,1,115,26,0,0,0,
+    2,128,4,4,2,1,4,1,6,255,24,1,6,1,10,2,
+    8,1,20,1,6,1,8,1,12,1,115,112,0,0,0,0,
+    0,19,21,9,16,33,47,9,68,9,68,13,29,13,19,21,
+    29,13,20,13,68,27,68,27,68,27,68,27,68,59,67,27,
+    68,27,68,13,68,13,68,13,68,25,32,9,13,9,22,21,
+    25,21,32,29,32,9,13,9,18,16,27,28,32,28,37,16,
+    38,9,60,25,35,36,39,36,46,36,48,50,54,50,59,25,
+    60,13,17,13,22,28,30,9,13,9,25,28,31,28,33,9,
+    13,9,25,36,39,36,41,9,13,9,33,9,33,9,33,114,
+    10,0,0,0,99,1,0,0,0,0,0,0,0,0,0,0,
+    0,2,0,0,0,3,0,0,0,115,10,0,0,0,100,1,
+    124,0,95,0,100,2,83,0,41,3,122,31,73,110,118,97,
+    108,105,100,97,116,101,32,116,104,101,32,100,105,114,101,99,
+    116,111,114,121,32,109,116,105,109,101,46,114,134,0,0,0,
+    78,41,1,114,120,1,0,0,114,35,1,0,0,115,1,0,
+    0,0,32,114,7,0,0,0,114,100,1,0,0,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,232,5,0,0,114,
+    85,0,0,0,114,85,0,0,0,115,10,0,0,0,28,30,
+    9,13,9,25,9,25,9,25,114,10,0,0,0,99,2,0,
+    0,0,0,0,0,0,0,0,0,0,3,0,0,0,3,0,
+    0,0,115,54,0,0,0,116,0,106,1,100,1,116,2,131,
+    2,1,0,124,0,160,3,124,1,161,1,125,2,124,2,100,
+    2,117,0,114,19,100,2,103,0,102,2,83,0,124,2,106,
+    4,124,2,106,5,112,25,103,0,102,2,83,0,41,3,122,
+    197,84,114,121,32,116,111,32,102,105,110,100,32,97,32,108,
+    111,97,100,101,114,32,102,111,114,32,116,104,101,32,115,112,
+    101,99,105,102,105,101,100,32,109,111,100,117,108,101,44,32,
+    111,114,32,116,104,101,32,110,97,109,101,115,112,97,99,101,
+    10,32,32,32,32,32,32,32,32,112,97,99,107,97,103,101,
+    32,112,111,114,116,105,111,110,115,46,32,82,101,116,117,114,
+    110,115,32,40,108,111,97,100,101,114,44,32,108,105,115,116,
+    45,111,102,45,112,111,114,116,105,111,110,115,41,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,122,101,80,97,116,104,70,105,110,100,
-    101,114,46,102,105,110,100,95,109,111,100,117,108,101,40,41,
+    32,32,32,32,32,32,122,101,70,105,108,101,70,105,110,100,
+    101,114,46,102,105,110,100,95,108,111,97,100,101,114,40,41,
     32,105,115,32,100,101,112,114,101,99,97,116,101,100,32,97,
     110,100,32,115,108,97,116,101,100,32,102,111,114,32,114,101,
     109,111,118,97,108,32,105,110,32,80,121,116,104,111,110,32,
     51,46,49,50,59,32,117,115,101,32,102,105,110,100,95,115,
-    112,101,99,40,41,32,105,110,115,116,101,97,100,78,114,233,
-    0,0,0,114,234,0,0,0,115,4,0,0,0,32,32,32,
-    32,114,7,0,0,0,114,235,0,0,0,122,22,80,97,116,
-    104,70,105,110,100,101,114,46,102,105,110,100,95,109,111,100,
-    117,108,101,177,5,0,0,115,14,0,0,0,6,8,2,2,
-    4,254,12,3,8,1,4,1,6,1,115,14,0,0,0,4,
-    8,2,1,6,1,12,1,6,1,6,1,6,1,115,42,0,
-    0,0,9,18,9,23,24,84,24,42,9,43,9,43,16,19,
-    16,45,30,38,40,44,16,45,9,13,12,16,20,24,12,24,
-    9,24,20,24,20,24,16,20,16,27,9,27,114,10,0,0,
-    0,99,0,0,0,0,0,0,0,0,0,0,0,0,4,0,
-    0,0,15,0,0,0,115,28,0,0,0,100,1,100,2,108,
-    0,109,1,125,2,1,0,124,2,106,2,124,0,105,0,124,
-    1,164,1,142,1,83,0,41,4,97,32,1,0,0,10,32,
-    32,32,32,32,32,32,32,70,105,110,100,32,100,105,115,116,
-    114,105,98,117,116,105,111,110,115,46,10,10,32,32,32,32,
-    32,32,32,32,82,101,116,117,114,110,32,97,110,32,105,116,
-    101,114,97,98,108,101,32,111,102,32,97,108,108,32,68,105,
-    115,116,114,105,98,117,116,105,111,110,32,105,110,115,116,97,
-    110,99,101,115,32,99,97,112,97,98,108,101,32,111,102,10,
-    32,32,32,32,32,32,32,32,108,111,97,100,105,110,103,32,
-    116,104,101,32,109,101,116,97,100,97,116,97,32,102,111,114,
-    32,112,97,99,107,97,103,101,115,32,109,97,116,99,104,105,
-    110,103,32,96,96,99,111,110,116,101,120,116,46,110,97,109,
-    101,96,96,10,32,32,32,32,32,32,32,32,40,111,114,32,
-    97,108,108,32,110,97,109,101,115,32,105,102,32,96,96,78,
-    111,110,101,96,96,32,105,110,100,105,99,97,116,101,100,41,
-    32,97,108,111,110,103,32,116,104,101,32,112,97,116,104,115,
-    32,105,110,32,116,104,101,32,108,105,115,116,10,32,32,32,
-    32,32,32,32,32,111,102,32,100,105,114,101,99,116,111,114,
-    105,101,115,32,96,96,99,111,110,116,101,120,116,46,112,97,
-    116,104,96,96,46,10,32,32,32,32,32,32,32,32,114,0,
-    0,0,0,41,1,218,18,77,101,116,97,100,97,116,97,80,
-    97,116,104,70,105,110,100,101,114,78,41,3,90,18,105,109,
-    112,111,114,116,108,105,98,46,109,101,116,97,100,97,116,97,
-    114,114,1,0,0,218,18,102,105,110,100,95,100,105,115,116,
-    114,105,98,117,116,105,111,110,115,41,3,114,148,0,0,0,
-    114,149,0,0,0,114,114,1,0,0,115,3,0,0,0,32,
-    32,32,114,7,0,0,0,114,115,1,0,0,122,29,80,97,
-    116,104,70,105,110,100,101,114,46,102,105,110,100,95,100,105,
-    115,116,114,105,98,117,116,105,111,110,115,193,5,0,0,243,
-    4,0,0,0,12,10,16,1,114,116,1,0,0,115,28,0,
-    0,0,9,58,9,58,9,58,9,58,9,58,9,58,16,34,
-    16,53,55,59,16,70,63,69,16,70,16,70,9,70,114,10,
-    0,0,0,114,71,0,0,0,114,236,0,0,0,41,14,114,
+    112,101,99,40,41,32,105,110,115,116,101,97,100,78,41,6,
+    114,103,0,0,0,114,104,0,0,0,114,105,0,0,0,114,
+    232,0,0,0,114,167,0,0,0,114,208,0,0,0,41,3,
+    114,147,0,0,0,114,166,0,0,0,114,216,0,0,0,115,
+    3,0,0,0,32,32,32,114,7,0,0,0,114,164,0,0,
+    0,122,22,70,105,108,101,70,105,110,100,101,114,46,102,105,
+    110,100,95,108,111,97,100,101,114,238,5,0,0,115,14,0,
+    0,0,6,7,2,2,4,254,10,3,8,1,8,1,16,1,
+    115,14,0,0,0,4,7,2,1,6,1,10,1,6,1,10,
+    1,16,1,115,54,0,0,0,9,18,9,23,24,84,24,42,
+    9,43,9,43,16,20,16,40,31,39,16,40,9,13,12,16,
+    20,24,12,24,9,28,20,24,26,28,20,28,13,28,16,20,
+    16,27,29,33,29,60,29,66,64,66,16,66,9,66,114,10,
+    0,0,0,99,6,0,0,0,0,0,0,0,0,0,0,0,
+    6,0,0,0,3,0,0,0,115,26,0,0,0,124,1,124,
+    2,124,3,131,2,125,6,116,0,124,2,124,3,124,6,124,
+    4,100,1,141,4,83,0,41,2,78,114,207,0,0,0,41,
+    1,114,219,0,0,0,41,7,114,147,0,0,0,114,217,0,
+    0,0,114,166,0,0,0,114,67,0,0,0,90,4,115,109,
+    115,108,114,231,0,0,0,114,167,0,0,0,115,7,0,0,
+    0,32,32,32,32,32,32,32,114,7,0,0,0,114,113,1,
+    0,0,122,20,70,105,108,101,70,105,110,100,101,114,46,95,
+    103,101,116,95,115,112,101,99,253,5,0,0,115,8,0,0,
+    0,10,1,8,1,2,1,6,255,115,6,0,0,0,10,1,
+    8,1,8,1,115,26,0,0,0,18,30,31,39,41,45,18,
+    46,9,15,16,39,40,48,50,54,63,69,67,71,16,72,16,
+    72,9,72,114,10,0,0,0,78,99,3,0,0,0,0,0,
+    0,0,0,0,0,0,9,0,0,0,3,0,0,0,115,126,
+    1,0,0,100,1,125,3,124,1,160,0,100,2,161,1,100,
+    3,25,0,125,4,9,0,116,1,124,0,106,2,112,17,116,
+    3,106,4,131,0,131,1,106,5,125,5,110,13,35,0,4,
+    0,116,6,121,32,1,0,1,0,1,0,100,4,125,5,89,
+    0,110,2,119,0,37,0,124,5,124,0,106,7,107,3,114,
+    46,124,0,160,8,161,0,1,0,124,5,124,0,95,7,116,
+    9,131,0,114,57,124,0,106,10,125,6,124,4,160,11,161,
+    0,125,7,110,5,124,0,106,12,125,6,124,4,125,7,124,
+    7,124,6,118,0,114,109,116,13,124,0,106,2,124,4,131,
+    2,125,8,124,0,106,14,68,0,93,29,92,2,125,9,125,
+    10,100,5,124,9,23,0,125,11,116,13,124,8,124,11,131,
+    2,125,12,116,15,124,12,131,1,114,104,124,0,160,16,124,
+    10,124,1,124,12,124,8,103,1,124,2,161,5,2,0,1,
+    0,83,0,113,75,116,17,124,8,131,1,125,3,124,0,106,
+    14,68,0,93,56,92,2,125,9,125,10,9,0,116,13,124,
+    0,106,2,124,4,124,9,23,0,131,2,125,12,110,13,35,
+    0,4,0,116,18,121,137,1,0,1,0,1,0,89,0,1,
+    0,100,6,83,0,119,0,37,0,116,19,160,20,100,7,124,
+    12,100,3,100,8,166,3,1,0,124,7,124,9,23,0,124,
+    6,118,0,114,168,116,15,124,12,131,1,114,168,124,0,160,
+    16,124,10,124,1,124,12,100,6,124,2,161,5,2,0,1,
+    0,83,0,113,112,124,3,114,189,116,19,160,20,100,9,124,
+    8,161,2,1,0,116,19,160,21,124,1,100,6,161,2,125,
+    13,124,8,103,1,124,13,95,22,124,13,83,0,100,6,83,
+    0,41,10,122,111,84,114,121,32,116,111,32,102,105,110,100,
+    32,97,32,115,112,101,99,32,102,111,114,32,116,104,101,32,
+    115,112,101,99,105,102,105,101,100,32,109,111,100,117,108,101,
+    46,10,10,32,32,32,32,32,32,32,32,82,101,116,117,114,
+    110,115,32,116,104,101,32,109,97,116,99,104,105,110,103,32,
+    115,112,101,99,44,32,111,114,32,78,111,110,101,32,105,102,
+    32,110,111,116,32,102,111,117,110,100,46,10,32,32,32,32,
+    32,32,32,32,70,114,101,0,0,0,114,47,0,0,0,114,
+    134,0,0,0,114,242,0,0,0,78,122,9,116,114,121,105,
+    110,103,32,123,125,41,1,90,9,118,101,114,98,111,115,105,
+    116,121,122,25,112,111,115,115,105,98,108,101,32,110,97,109,
+    101,115,112,97,99,101,32,102,111,114,32,123,125,41,23,114,
+    108,0,0,0,114,78,0,0,0,114,67,0,0,0,114,21,
+    0,0,0,114,86,0,0,0,114,50,1,0,0,114,80,0,
+    0,0,114,120,1,0,0,218,11,95,102,105,108,108,95,99,
+    97,99,104,101,114,24,0,0,0,114,123,1,0,0,114,135,
+    0,0,0,114,122,1,0,0,114,69,0,0,0,114,119,1,
+    0,0,114,84,0,0,0,114,113,1,0,0,114,87,0,0,
+    0,114,115,0,0,0,114,162,0,0,0,114,176,0,0,0,
+    114,213,0,0,0,114,208,0,0,0,41,14,114,147,0,0,
+    0,114,166,0,0,0,114,231,0,0,0,90,12,105,115,95,
+    110,97,109,101,115,112,97,99,101,90,11,116,97,105,108,95,
+    109,111,100,117,108,101,114,196,0,0,0,90,5,99,97,99,
+    104,101,90,12,99,97,99,104,101,95,109,111,100,117,108,101,
+    90,9,98,97,115,101,95,112,97,116,104,114,61,1,0,0,
+    114,217,0,0,0,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,
+    216,0,0,0,115,14,0,0,0,32,32,32,32,32,32,32,
+    32,32,32,32,32,32,32,114,7,0,0,0,114,232,0,0,
+    0,122,20,70,105,108,101,70,105,110,100,101,114,46,102,105,
+    110,100,95,115,112,101,99,2,6,0,0,115,94,0,0,0,
+    4,5,14,1,2,1,22,1,2,128,12,1,8,1,2,255,
+    2,128,10,2,8,1,6,1,6,2,6,1,10,1,6,2,
+    4,1,8,2,12,1,14,1,8,1,10,1,8,1,24,1,
+    2,255,8,5,14,2,2,1,18,1,2,128,12,1,8,1,
+    2,255,2,128,16,2,12,1,8,1,10,1,4,1,8,255,
+    2,128,4,2,12,1,12,1,8,1,4,1,4,1,115,114,
+    0,0,0,4,5,14,1,2,4,22,254,2,128,2,2,2,
+    255,18,1,2,128,8,1,2,2,8,255,6,1,4,2,2,
+    5,6,252,10,1,6,2,4,1,6,2,2,10,12,247,4,
+    1,4,8,6,248,8,1,10,1,6,1,28,1,8,4,4,
+    2,4,9,6,247,2,4,18,254,2,128,2,2,2,255,18,
+    1,2,128,16,1,10,1,2,3,6,254,2,2,2,255,2,
+    1,6,255,12,1,2,128,2,1,2,4,12,253,12,1,8,
+    1,4,1,4,1,115,126,1,0,0,24,29,9,21,23,31,
+    23,47,43,46,23,47,48,49,23,50,9,20,9,23,21,31,
+    32,36,32,41,32,57,45,48,45,55,45,57,21,58,21,67,
+    13,18,13,18,0,0,9,23,16,23,9,23,9,23,9,23,
+    9,23,21,23,13,18,13,18,13,18,9,23,0,0,12,17,
+    21,25,21,37,12,37,9,37,13,17,13,31,13,31,13,31,
+    32,37,13,17,13,29,12,23,12,25,9,39,21,25,21,45,
+    13,18,28,39,28,47,28,47,13,25,13,25,21,25,21,37,
+    13,18,28,39,13,25,12,24,28,33,12,33,9,54,25,35,
+    36,40,36,45,47,58,25,59,13,22,41,45,41,54,13,54,
+    13,54,17,37,17,23,25,37,33,43,46,52,33,52,17,30,
+    29,39,40,49,51,64,29,65,17,26,20,32,33,42,20,43,
+    17,98,28,32,28,98,43,55,57,65,67,76,79,88,78,89,
+    91,97,28,98,21,98,21,98,21,98,17,98,32,43,44,53,
+    32,54,17,29,37,41,37,50,9,56,9,56,13,33,13,19,
+    21,33,13,28,29,39,40,44,40,49,51,62,65,71,51,71,
+    29,72,17,26,17,26,0,0,13,28,20,30,13,28,13,28,
+    13,28,13,28,24,28,24,28,24,28,24,28,13,28,0,0,
+    13,23,13,77,41,52,54,63,75,76,13,77,13,77,13,77,
+    16,28,31,37,16,37,41,46,16,46,13,56,20,32,33,42,
+    20,43,17,56,28,32,28,56,43,55,57,65,67,76,43,47,
+    49,55,28,56,21,56,21,56,21,56,0,0,12,24,9,24,
+    13,23,13,80,41,68,70,79,13,80,13,80,20,30,20,57,
+    42,50,52,56,20,57,13,17,48,57,47,58,13,17,13,44,
+    20,24,13,24,16,20,16,20,115,30,0,0,0,138,10,21,
+    0,149,9,33,7,160,1,33,7,193,53,8,65,62,2,193,
+    62,7,66,10,9,194,9,1,66,10,9,99,1,0,0,0,
+    0,0,0,0,0,0,0,0,10,0,0,0,3,0,0,0,
+    115,192,0,0,0,124,0,106,0,125,1,9,0,116,1,106,
+    2,124,1,112,11,116,1,106,3,131,0,131,1,125,2,110,
+    16,35,0,4,0,116,4,116,5,116,6,102,3,121,28,1,
+    0,1,0,1,0,103,0,125,2,89,0,110,2,119,0,37,
+    0,116,7,106,8,160,9,100,1,161,1,115,42,116,10,124,
+    2,131,1,124,0,95,11,110,37,116,10,131,0,125,3,124,
+    2,68,0,93,28,125,4,124,4,160,12,100,2,161,1,92,
+    3,125,5,125,6,125,7,124,6,114,68,100,3,160,13,124,
+    5,124,7,160,14,161,0,161,2,125,8,110,2,124,5,125,
+    8,124,3,160,15,124,8,161,1,1,0,113,47,124,3,124,
+    0,95,11,116,7,106,8,160,9,116,16,161,1,114,94,100,
+    4,132,0,124,2,68,0,131,1,124,0,95,17,100,5,83,
+    0,100,5,83,0,41,6,122,68,70,105,108,108,32,116,104,
+    101,32,99,97,99,104,101,32,111,102,32,112,111,116,101,110,
+    116,105,97,108,32,109,111,100,117,108,101,115,32,97,110,100,
+    32,112,97,99,107,97,103,101,115,32,102,111,114,32,116,104,
+    105,115,32,100,105,114,101,99,116,111,114,121,46,114,17,0,
+    0,0,114,101,0,0,0,114,92,0,0,0,99,1,0,0,
+    0,0,0,0,0,0,0,0,0,4,0,0,0,19,0,0,
+    0,115,20,0,0,0,104,0,124,0,93,6,125,1,124,1,
+    160,0,161,0,146,2,113,2,83,0,114,13,0,0,0,41,
+    1,114,135,0,0,0,41,2,114,5,0,0,0,90,2,102,
+    110,115,2,0,0,0,32,32,114,7,0,0,0,114,15,0,
+    0,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,112,62,82,6,0,
+    0,243,2,0,0,0,20,0,114,126,1,0,0,115,20,0,
+    0,0,40,71,40,71,40,71,56,58,41,43,41,51,41,51,
+    40,71,40,71,40,71,114,10,0,0,0,78,41,18,114,67,
+    0,0,0,114,21,0,0,0,90,7,108,105,115,116,100,105,
+    114,114,86,0,0,0,114,107,1,0,0,218,15,80,101,114,
+    109,105,115,115,105,111,110,69,114,114,111,114,218,18,78,111,
+    116,65,68,105,114,101,99,116,111,114,121,69,114,114,111,114,
+    114,18,0,0,0,114,28,0,0,0,114,29,0,0,0,114,
+    121,1,0,0,114,122,1,0,0,114,130,0,0,0,114,93,
+    0,0,0,114,135,0,0,0,218,3,97,100,100,114,30,0,
+    0,0,114,123,1,0,0,41,9,114,147,0,0,0,114,67,
+    0,0,0,90,8,99,111,110,116,101,110,116,115,90,21,108,
+    111,119,101,114,95,115,117,102,102,105,120,95,99,111,110,116,
+    101,110,116,115,114,90,1,0,0,114,145,0,0,0,114,72,
+    1,0,0,114,61,1,0,0,90,8,110,101,119,95,110,97,
+    109,101,115,9,0,0,0,32,32,32,32,32,32,32,32,32,
+    114,7,0,0,0,114,125,1,0,0,122,22,70,105,108,101,
+    70,105,110,100,101,114,46,95,102,105,108,108,95,99,97,99,
+    104,101,53,6,0,0,115,42,0,0,0,6,2,2,1,20,
+    1,2,128,18,1,8,3,2,253,2,128,12,6,12,1,6,
+    7,8,1,16,1,4,1,18,1,4,2,12,1,6,1,12,
+    1,18,1,4,255,115,48,0,0,0,6,2,2,6,20,252,
+    2,128,2,4,8,253,18,3,2,128,10,3,2,16,12,241,
+    6,7,2,1,4,6,2,250,16,1,2,1,2,3,18,254,
+    4,2,12,1,6,1,10,1,24,1,115,192,0,0,0,16,
+    20,16,25,9,13,9,26,24,27,24,35,36,40,36,56,44,
+    47,44,54,44,56,24,57,13,21,13,21,0,0,9,26,17,
+    34,36,51,53,71,16,72,9,26,9,26,9,26,9,26,24,
+    26,13,21,13,21,13,21,9,26,0,0,16,19,16,28,16,
+    46,40,45,16,46,9,53,32,35,36,44,32,45,13,17,13,
+    29,13,29,37,40,37,42,13,34,25,33,13,52,13,52,17,
+    21,37,41,37,56,52,55,37,56,17,34,17,21,23,26,28,
+    34,20,23,17,36,32,39,32,68,47,51,53,59,53,67,53,
+    67,32,68,21,29,21,29,32,36,21,29,17,38,17,52,43,
+    51,17,52,17,52,17,52,32,53,13,17,13,29,12,15,12,
+    24,12,64,36,63,12,64,9,71,40,71,40,71,62,70,40,
+    71,40,71,13,17,13,37,13,37,13,37,9,71,9,71,115,
+    12,0,0,0,132,9,14,0,142,12,29,7,156,1,29,7,
+    99,1,0,0,0,0,0,0,0,0,0,0,0,2,0,0,
+    0,7,0,0,0,115,20,0,0,0,135,0,135,1,136,0,
+    136,1,102,2,100,1,132,8,125,2,124,2,83,0,41,3,
+    97,20,1,0,0,65,32,99,108,97,115,115,32,109,101,116,
+    104,111,100,32,119,104,105,99,104,32,114,101,116,117,114,110,
+    115,32,97,32,99,108,111,115,117,114,101,32,116,111,32,117,
+    115,101,32,111,110,32,115,121,115,46,112,97,116,104,95,104,
+    111,111,107,10,32,32,32,32,32,32,32,32,119,104,105,99,
+    104,32,119,105,108,108,32,114,101,116,117,114,110,32,97,110,
+    32,105,110,115,116,97,110,99,101,32,117,115,105,110,103,32,
+    116,104,101,32,115,112,101,99,105,102,105,101,100,32,108,111,
+    97,100,101,114,115,32,97,110,100,32,116,104,101,32,112,97,
+    116,104,10,32,32,32,32,32,32,32,32,99,97,108,108,101,
+    100,32,111,110,32,116,104,101,32,99,108,111,115,117,114,101,
+    46,10,10,32,32,32,32,32,32,32,32,73,102,32,116,104,
+    101,32,112,97,116,104,32,99,97,108,108,101,100,32,111,110,
+    32,116,104,101,32,99,108,111,115,117,114,101,32,105,115,32,
+    110,111,116,32,97,32,100,105,114,101,99,116,111,114,121,44,
+    32,73,109,112,111,114,116,69,114,114,111,114,32,105,115,10,
+    32,32,32,32,32,32,32,32,114,97,105,115,101,100,46,10,
+    10,32,32,32,32,32,32,32,32,99,1,0,0,0,0,0,
+    0,0,0,0,0,0,4,0,0,0,19,0,0,0,115,36,
+    0,0,0,116,0,124,0,131,1,115,10,116,1,100,1,124,
+    0,100,2,141,2,130,1,137,1,124,0,103,1,137,2,162,
+    1,82,0,142,0,83,0,41,4,122,45,80,97,116,104,32,
+    104,111,111,107,32,102,111,114,32,105,109,112,111,114,116,108,
+    105,98,46,109,97,99,104,105,110,101,114,121,46,70,105,108,
+    101,70,105,110,100,101,114,46,122,30,111,110,108,121,32,100,
+    105,114,101,99,116,111,114,105,101,115,32,97,114,101,32,115,
+    117,112,112,111,114,116,101,100,114,77,0,0,0,78,41,2,
+    114,87,0,0,0,114,146,0,0,0,41,3,114,67,0,0,
+    0,114,227,0,0,0,114,124,1,0,0,115,3,0,0,0,
+    32,128,128,114,7,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,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,104,95,104,111,111,107,95,102,111,114,95,
+    70,105,108,101,70,105,110,100,101,114,94,6,0,0,115,6,
+    0,0,0,8,2,12,1,16,1,115,6,0,0,0,6,2,
+    14,1,16,1,115,36,0,0,0,20,31,32,36,20,37,13,
+    79,23,34,35,67,74,78,23,79,23,79,17,79,20,23,24,
+    28,20,46,31,45,20,46,20,46,20,46,13,46,114,10,0,
+    0,0,78,114,13,0,0,0,41,3,114,227,0,0,0,114,
+    124,1,0,0,114,130,1,0,0,115,3,0,0,0,96,96,
+    32,114,7,0,0,0,218,9,112,97,116,104,95,104,111,111,
+    107,122,20,70,105,108,101,70,105,110,100,101,114,46,112,97,
+    116,104,95,104,111,111,107,84,6,0,0,115,6,0,0,0,
+    4,128,12,10,4,6,115,6,0,0,0,4,128,12,14,4,
+    2,115,20,0,0,0,0,0,0,0,9,46,9,46,9,46,
+    9,46,9,46,9,46,16,40,9,40,114,10,0,0,0,99,
+    1,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,
+    3,0,0,0,114,87,1,0,0,41,2,78,122,16,70,105,
+    108,101,70,105,110,100,101,114,40,123,33,114,125,41,41,2,
+    114,93,0,0,0,114,67,0,0,0,114,35,1,0,0,115,
+    1,0,0,0,32,114,7,0,0,0,114,88,1,0,0,122,
+    19,70,105,108,101,70,105,110,100,101,114,46,95,95,114,101,
+    112,114,95,95,102,6,0,0,114,80,1,0,0,114,80,1,
+    0,0,115,12,0,0,0,16,34,16,52,42,46,42,51,16,
+    52,9,52,114,10,0,0,0,114,71,0,0,0,41,15,114,
     153,0,0,0,114,152,0,0,0,114,154,0,0,0,114,155,
-    0,0,0,114,239,0,0,0,114,100,1,0,0,114,106,1,
-    0,0,114,240,0,0,0,114,109,1,0,0,114,110,1,0,
-    0,114,113,1,0,0,114,232,0,0,0,114,235,0,0,0,
-    114,115,1,0,0,114,13,0,0,0,114,10,0,0,0,114,
-    7,0,0,0,114,99,1,0,0,114,99,1,0,0,51,5,
-    0,0,115,36,0,0,0,8,0,4,2,2,2,8,1,2,
-    9,8,1,2,12,8,1,2,21,8,1,2,20,10,1,2,
-    31,10,1,2,23,10,1,2,15,12,1,115,124,0,0,0,
-    0,129,0,129,0,129,0,129,0,129,0,129,0,129,0,129,
-    0,129,0,129,8,195,0,127,0,127,0,127,0,127,0,127,
-    0,127,0,127,0,127,0,127,0,127,2,63,0,129,0,129,
-    0,129,0,129,0,129,0,129,0,129,0,129,0,129,0,129,
-    2,193,0,127,0,127,0,127,0,127,0,127,0,127,0,127,
-    0,127,0,127,0,127,2,65,8,8,2,2,8,11,2,2,
-    8,20,2,2,8,19,2,2,2,1,8,29,2,2,2,1,
-    8,21,2,2,2,1,8,13,2,2,12,11,115,102,0,0,
-    0,1,1,1,1,1,1,1,1,5,73,1,1,6,18,5,
-    43,5,43,5,43,5,43,6,18,5,24,5,24,5,24,5,
-    24,6,17,5,22,5,22,5,22,5,22,6,17,5,20,5,
-    20,5,20,5,20,6,17,47,51,5,24,5,24,5,24,5,
-    24,6,17,39,43,5,24,5,24,5,24,5,24,6,17,41,
-    45,5,27,5,27,5,27,5,27,6,18,5,70,5,70,5,
-    70,5,70,5,70,5,70,114,10,0,0,0,114,99,1,0,
-    0,99,0,0,0,0,0,0,0,0,0,0,0,0,2,0,
-    0,0,0,0,0,0,115,74,0,0,0,101,0,90,1,100,
-    0,90,2,100,1,90,3,100,2,132,0,90,4,100,3,132,
-    0,90,5,101,6,90,7,100,4,132,0,90,8,100,5,132,
-    0,90,9,100,11,100,7,132,1,90,10,100,8,132,0,90,
-    11,101,12,100,9,132,0,131,1,90,13,100,10,132,0,90,
-    14,100,6,83,0,41,12,218,10,70,105,108,101,70,105,110,
-    100,101,114,122,172,70,105,108,101,45,98,97,115,101,100,32,
-    102,105,110,100,101,114,46,10,10,32,32,32,32,73,110,116,
-    101,114,97,99,116,105,111,110,115,32,119,105,116,104,32,116,
-    104,101,32,102,105,108,101,32,115,121,115,116,101,109,32,97,
-    114,101,32,99,97,99,104,101,100,32,102,111,114,32,112,101,
-    114,102,111,114,109,97,110,99,101,44,32,98,101,105,110,103,
-    10,32,32,32,32,114,101,102,114,101,115,104,101,100,32,119,
-    104,101,110,32,116,104,101,32,100,105,114,101,99,116,111,114,
-    121,32,116,104,101,32,102,105,110,100,101,114,32,105,115,32,
-    104,97,110,100,108,105,110,103,32,104,97,115,32,98,101,101,
-    110,32,109,111,100,105,102,105,101,100,46,10,10,32,32,32,
-    32,99,2,0,0,0,0,0,0,0,0,0,0,0,5,0,
-    0,0,7,0,0,0,115,112,0,0,0,135,5,103,0,125,
-    3,124,2,68,0,93,15,92,2,138,5,125,4,124,3,160,
-    0,136,5,102,1,100,1,132,8,124,4,68,0,131,1,161,
-    1,1,0,113,5,124,3,124,0,95,1,124,1,112,27,100,
-    2,124,0,95,2,116,3,124,0,106,2,131,1,115,43,116,
-    4,116,5,106,6,131,0,124,0,106,2,131,2,124,0,95,
-    2,100,3,124,0,95,7,116,8,131,0,124,0,95,9,116,
-    8,131,0,124,0,95,10,100,4,83,0,41,5,122,154,73,
-    110,105,116,105,97,108,105,122,101,32,119,105,116,104,32,116,
-    104,101,32,112,97,116,104,32,116,111,32,115,101,97,114,99,
-    104,32,111,110,32,97,110,100,32,97,32,118,97,114,105,97,
-    98,108,101,32,110,117,109,98,101,114,32,111,102,10,32,32,
-    32,32,32,32,32,32,50,45,116,117,112,108,101,115,32,99,
-    111,110,116,97,105,110,105,110,103,32,116,104,101,32,108,111,
-    97,100,101,114,32,97,110,100,32,116,104,101,32,102,105,108,
-    101,32,115,117,102,102,105,120,101,115,32,116,104,101,32,108,
-    111,97,100,101,114,10,32,32,32,32,32,32,32,32,114,101,
-    99,111,103,110,105,122,101,115,46,99,1,0,0,0,0,0,
-    0,0,0,0,0,0,3,0,0,0,51,0,0,0,115,24,
-    0,0,0,129,0,124,0,93,7,125,1,124,1,137,2,102,
-    2,86,0,1,0,113,2,100,0,83,0,114,71,0,0,0,
-    114,13,0,0,0,41,3,114,5,0,0,0,114,61,1,0,
-    0,114,167,0,0,0,115,3,0,0,0,32,32,128,114,7,
-    0,0,0,114,8,0,0,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,
-    222,5,0,0,243,4,0,0,0,2,128,22,0,114,118,1,
-    0,0,115,24,0,0,0,0,0,27,68,27,68,49,55,29,
-    35,37,43,28,44,27,68,27,68,27,68,27,68,27,68,114,
-    10,0,0,0,114,101,0,0,0,114,134,0,0,0,78,41,
-    11,114,194,0,0,0,218,8,95,108,111,97,100,101,114,115,
-    114,67,0,0,0,114,90,0,0,0,114,69,0,0,0,114,
-    21,0,0,0,114,86,0,0,0,218,11,95,112,97,116,104,
-    95,109,116,105,109,101,218,3,115,101,116,218,11,95,112,97,
-    116,104,95,99,97,99,104,101,218,19,95,114,101,108,97,120,
-    101,100,95,112,97,116,104,95,99,97,99,104,101,41,6,114,
-    147,0,0,0,114,67,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,218,0,0,0,114,167,0,0,0,115,6,0,0,
-    0,32,32,32,32,32,64,114,7,0,0,0,114,242,0,0,
-    0,122,19,70,105,108,101,70,105,110,100,101,114,46,95,95,
-    105,110,105,116,95,95,216,5,0,0,115,22,0,0,0,2,
-    128,4,4,12,1,24,1,6,1,10,2,10,1,18,1,6,
-    1,8,1,12,1,115,26,0,0,0,2,128,4,4,2,1,
-    4,1,6,255,24,1,6,1,10,2,8,1,20,1,6,1,
-    8,1,12,1,115,112,0,0,0,0,0,19,21,9,16,33,
-    47,9,68,9,68,13,29,13,19,21,29,13,20,13,68,27,
-    68,27,68,27,68,27,68,59,67,27,68,27,68,13,68,13,
-    68,13,68,25,32,9,13,9,22,21,25,21,32,29,32,9,
-    13,9,18,16,27,28,32,28,37,16,38,9,60,25,35,36,
-    39,36,46,36,48,50,54,50,59,25,60,13,17,13,22,28,
-    30,9,13,9,25,28,31,28,33,9,13,9,25,36,39,36,
-    41,9,13,9,33,9,33,9,33,114,10,0,0,0,99,1,
-    0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,3,
-    0,0,0,115,10,0,0,0,100,1,124,0,95,0,100,2,
-    83,0,41,3,122,31,73,110,118,97,108,105,100,97,116,101,
-    32,116,104,101,32,100,105,114,101,99,116,111,114,121,32,109,
-    116,105,109,101,46,114,134,0,0,0,78,41,1,114,120,1,
-    0,0,114,35,1,0,0,115,1,0,0,0,32,114,7,0,
-    0,0,114,100,1,0,0,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,232,5,0,0,114,85,0,0,0,114,85,
-    0,0,0,115,10,0,0,0,28,30,9,13,9,25,9,25,
-    9,25,114,10,0,0,0,99,2,0,0,0,0,0,0,0,
-    0,0,0,0,3,0,0,0,3,0,0,0,115,54,0,0,
-    0,116,0,106,1,100,1,116,2,131,2,1,0,124,0,160,
-    3,124,1,161,1,125,2,124,2,100,2,117,0,114,19,100,
-    2,103,0,102,2,83,0,124,2,106,4,124,2,106,5,112,
-    25,103,0,102,2,83,0,41,3,122,197,84,114,121,32,116,
-    111,32,102,105,110,100,32,97,32,108,111,97,100,101,114,32,
-    102,111,114,32,116,104,101,32,115,112,101,99,105,102,105,101,
-    100,32,109,111,100,117,108,101,44,32,111,114,32,116,104,101,
-    32,110,97,109,101,115,112,97,99,101,10,32,32,32,32,32,
-    32,32,32,112,97,99,107,97,103,101,32,112,111,114,116,105,
-    111,110,115,46,32,82,101,116,117,114,110,115,32,40,108,111,
-    97,100,101,114,44,32,108,105,115,116,45,111,102,45,112,111,
-    114,116,105,111,110,115,41,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,
-    122,101,70,105,108,101,70,105,110,100,101,114,46,102,105,110,
-    100,95,108,111,97,100,101,114,40,41,32,105,115,32,100,101,
-    112,114,101,99,97,116,101,100,32,97,110,100,32,115,108,97,
-    116,101,100,32,102,111,114,32,114,101,109,111,118,97,108,32,
-    105,110,32,80,121,116,104,111,110,32,51,46,49,50,59,32,
-    117,115,101,32,102,105,110,100,95,115,112,101,99,40,41,32,
-    105,110,115,116,101,97,100,78,41,6,114,103,0,0,0,114,
-    104,0,0,0,114,105,0,0,0,114,232,0,0,0,114,167,
-    0,0,0,114,208,0,0,0,41,3,114,147,0,0,0,114,
-    166,0,0,0,114,216,0,0,0,115,3,0,0,0,32,32,
-    32,114,7,0,0,0,114,164,0,0,0,122,22,70,105,108,
-    101,70,105,110,100,101,114,46,102,105,110,100,95,108,111,97,
-    100,101,114,238,5,0,0,115,14,0,0,0,6,7,2,2,
-    4,254,10,3,8,1,8,1,16,1,115,14,0,0,0,4,
-    7,2,1,6,1,10,1,6,1,10,1,16,1,115,54,0,
-    0,0,9,18,9,23,24,84,24,42,9,43,9,43,16,20,
-    16,40,31,39,16,40,9,13,12,16,20,24,12,24,9,28,
-    20,24,26,28,20,28,13,28,16,20,16,27,29,33,29,60,
-    29,66,64,66,16,66,9,66,114,10,0,0,0,99,6,0,
-    0,0,0,0,0,0,0,0,0,0,6,0,0,0,3,0,
-    0,0,115,26,0,0,0,124,1,124,2,124,3,131,2,125,
-    6,116,0,124,2,124,3,124,6,124,4,100,1,141,4,83,
-    0,41,2,78,114,207,0,0,0,41,1,114,219,0,0,0,
-    41,7,114,147,0,0,0,114,217,0,0,0,114,166,0,0,
-    0,114,67,0,0,0,90,4,115,109,115,108,114,231,0,0,
-    0,114,167,0,0,0,115,7,0,0,0,32,32,32,32,32,
-    32,32,114,7,0,0,0,114,113,1,0,0,122,20,70,105,
-    108,101,70,105,110,100,101,114,46,95,103,101,116,95,115,112,
-    101,99,253,5,0,0,115,8,0,0,0,10,1,8,1,2,
-    1,6,255,115,6,0,0,0,10,1,8,1,8,1,115,26,
-    0,0,0,18,30,31,39,41,45,18,46,9,15,16,39,40,
-    48,50,54,63,69,67,71,16,72,16,72,9,72,114,10,0,
-    0,0,78,99,3,0,0,0,0,0,0,0,0,0,0,0,
-    9,0,0,0,3,0,0,0,115,126,1,0,0,100,1,125,
-    3,124,1,160,0,100,2,161,1,100,3,25,0,125,4,9,
-    0,116,1,124,0,106,2,112,17,116,3,106,4,131,0,131,
-    1,106,5,125,5,110,12,35,0,4,0,116,6,121,190,1,
-    0,1,0,1,0,100,4,125,5,89,0,110,1,37,0,124,
-    5,124,0,106,7,107,3,114,45,124,0,160,8,161,0,1,
-    0,124,5,124,0,95,7,116,9,131,0,114,56,124,0,106,
-    10,125,6,124,4,160,11,161,0,125,7,110,5,124,0,106,
-    12,125,6,124,4,125,7,124,7,124,6,118,0,114,108,116,
-    13,124,0,106,2,124,4,131,2,125,8,124,0,106,14,68,
-    0,93,29,92,2,125,9,125,10,100,5,124,9,23,0,125,
-    11,116,13,124,8,124,11,131,2,125,12,116,15,124,12,131,
-    1,114,103,124,0,160,16,124,10,124,1,124,12,124,8,103,
-    1,124,2,161,5,2,0,1,0,83,0,113,74,116,17,124,
-    8,131,1,125,3,124,0,106,14,68,0,93,55,92,2,125,
-    9,125,10,9,0,116,13,124,0,106,2,124,4,124,9,23,
-    0,131,2,125,12,110,12,35,0,4,0,116,18,121,189,1,
-    0,1,0,1,0,89,0,1,0,100,6,83,0,37,0,116,
-    19,160,20,100,7,124,12,100,3,100,8,166,3,1,0,124,
-    7,124,9,23,0,124,6,118,0,114,166,116,15,124,12,131,
-    1,114,166,124,0,160,16,124,10,124,1,124,12,100,6,124,
-    2,161,5,2,0,1,0,83,0,113,111,124,3,114,187,116,
-    19,160,20,100,9,124,8,161,2,1,0,116,19,160,21,124,
-    1,100,6,161,2,125,13,124,8,103,1,124,13,95,22,124,
-    13,83,0,100,6,83,0,119,0,119,0,41,10,122,111,84,
-    114,121,32,116,111,32,102,105,110,100,32,97,32,115,112,101,
-    99,32,102,111,114,32,116,104,101,32,115,112,101,99,105,102,
-    105,101,100,32,109,111,100,117,108,101,46,10,10,32,32,32,
-    32,32,32,32,32,82,101,116,117,114,110,115,32,116,104,101,
-    32,109,97,116,99,104,105,110,103,32,115,112,101,99,44,32,
-    111,114,32,78,111,110,101,32,105,102,32,110,111,116,32,102,
-    111,117,110,100,46,10,32,32,32,32,32,32,32,32,70,114,
-    101,0,0,0,114,47,0,0,0,114,134,0,0,0,114,242,
-    0,0,0,78,122,9,116,114,121,105,110,103,32,123,125,41,
-    1,90,9,118,101,114,98,111,115,105,116,121,122,25,112,111,
-    115,115,105,98,108,101,32,110,97,109,101,115,112,97,99,101,
-    32,102,111,114,32,123,125,41,23,114,108,0,0,0,114,78,
-    0,0,0,114,67,0,0,0,114,21,0,0,0,114,86,0,
-    0,0,114,50,1,0,0,114,80,0,0,0,114,120,1,0,
-    0,218,11,95,102,105,108,108,95,99,97,99,104,101,114,24,
-    0,0,0,114,123,1,0,0,114,135,0,0,0,114,122,1,
-    0,0,114,69,0,0,0,114,119,1,0,0,114,84,0,0,
-    0,114,113,1,0,0,114,87,0,0,0,114,115,0,0,0,
-    114,162,0,0,0,114,176,0,0,0,114,213,0,0,0,114,
-    208,0,0,0,41,14,114,147,0,0,0,114,166,0,0,0,
-    114,231,0,0,0,90,12,105,115,95,110,97,109,101,115,112,
-    97,99,101,90,11,116,97,105,108,95,109,111,100,117,108,101,
-    114,196,0,0,0,90,5,99,97,99,104,101,90,12,99,97,
-    99,104,101,95,109,111,100,117,108,101,90,9,98,97,115,101,
-    95,112,97,116,104,114,61,1,0,0,114,217,0,0,0,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,216,0,0,0,115,14,
-    0,0,0,32,32,32,32,32,32,32,32,32,32,32,32,32,
-    32,114,7,0,0,0,114,232,0,0,0,122,20,70,105,108,
-    101,70,105,110,100,101,114,46,102,105,110,100,95,115,112,101,
-    99,2,6,0,0,115,94,0,0,0,4,5,14,1,2,1,
-    22,1,2,128,12,1,8,1,2,128,10,1,8,1,6,1,
-    6,2,6,1,10,1,6,2,4,1,8,2,12,1,14,1,
-    8,1,10,1,8,1,24,1,2,255,8,5,14,2,2,1,
-    18,1,2,128,12,1,8,1,2,128,16,1,12,1,8,1,
-    10,1,4,1,8,255,2,128,4,2,12,1,12,1,8,1,
-    4,1,4,1,2,244,2,228,115,118,0,0,0,4,5,14,
-    1,2,4,22,254,2,128,2,2,2,255,16,1,2,128,8,
-    1,2,2,8,255,6,1,4,2,2,5,6,252,10,1,6,
-    2,4,1,6,2,2,10,12,247,4,1,4,8,6,248,8,
-    1,10,1,6,1,28,1,8,4,4,2,4,9,6,247,2,
-    4,18,254,2,128,2,2,2,255,16,1,2,128,16,1,10,
-    1,2,3,6,254,2,2,2,255,2,1,6,255,12,1,2,
-    128,2,1,2,4,12,253,12,1,8,1,4,1,4,1,2,
-    245,2,228,115,126,1,0,0,24,29,9,21,23,31,23,47,
-    43,46,23,47,48,49,23,50,9,20,9,23,21,31,32,36,
-    32,41,32,57,45,48,45,55,45,57,21,58,21,67,13,18,
-    13,18,0,0,9,23,16,23,9,23,9,23,9,23,9,23,
-    21,23,13,18,13,18,13,18,0,0,12,17,21,25,21,37,
-    12,37,9,37,13,17,13,31,13,31,13,31,32,37,13,17,
-    13,29,12,23,12,25,9,39,21,25,21,45,13,18,28,39,
-    28,47,28,47,13,25,13,25,21,25,21,37,13,18,28,39,
-    13,25,12,24,28,33,12,33,9,54,25,35,36,40,36,45,
-    47,58,25,59,13,22,41,45,41,54,13,54,13,54,17,37,
-    17,23,25,37,33,43,46,52,33,52,17,30,29,39,40,49,
-    51,64,29,65,17,26,20,32,33,42,20,43,17,98,28,32,
-    28,98,43,55,57,65,67,76,79,88,78,89,91,97,28,98,
-    21,98,21,98,21,98,17,98,32,43,44,53,32,54,17,29,
-    37,41,37,50,9,56,9,56,13,33,13,19,21,33,13,28,
-    29,39,40,44,40,49,51,62,65,71,51,71,29,72,17,26,
-    17,26,0,0,13,28,20,30,13,28,13,28,13,28,13,28,
-    24,28,24,28,24,28,24,28,0,0,13,23,13,77,41,52,
-    54,63,75,76,13,77,13,77,13,77,16,28,31,37,16,37,
-    41,46,16,46,13,56,20,32,33,42,20,43,17,56,28,32,
-    28,56,43,55,57,65,67,76,43,47,49,55,28,56,21,56,
-    21,56,21,56,0,0,12,24,9,24,13,23,13,80,41,68,
-    70,79,13,80,13,80,20,30,20,57,42,50,52,56,20,57,
-    13,17,48,57,47,58,13,17,13,44,20,24,13,24,16,20,
-    16,20,13,28,9,23,115,31,0,0,0,138,10,21,0,149,
-    9,32,7,193,52,8,65,61,2,193,61,7,66,8,9,194,
-    61,1,66,8,9,194,62,1,32,7,99,1,0,0,0,0,
-    0,0,0,0,0,0,0,10,0,0,0,3,0,0,0,115,
-    192,0,0,0,124,0,106,0,125,1,9,0,116,1,106,2,
-    124,1,112,11,116,1,106,3,131,0,131,1,125,2,110,15,
-    35,0,4,0,116,4,116,5,116,6,102,3,121,95,1,0,
-    1,0,1,0,103,0,125,2,89,0,110,1,37,0,116,7,
-    106,8,160,9,100,1,161,1,115,41,116,10,124,2,131,1,
-    124,0,95,11,110,37,116,10,131,0,125,3,124,2,68,0,
-    93,28,125,4,124,4,160,12,100,2,161,1,92,3,125,5,
-    125,6,125,7,124,6,114,67,100,3,160,13,124,5,124,7,
-    160,14,161,0,161,2,125,8,110,2,124,5,125,8,124,3,
-    160,15,124,8,161,1,1,0,113,46,124,3,124,0,95,11,
-    116,7,106,8,160,9,116,16,161,1,114,93,100,4,132,0,
-    124,2,68,0,131,1,124,0,95,17,100,5,83,0,100,5,
-    83,0,119,0,41,6,122,68,70,105,108,108,32,116,104,101,
-    32,99,97,99,104,101,32,111,102,32,112,111,116,101,110,116,
-    105,97,108,32,109,111,100,117,108,101,115,32,97,110,100,32,
-    112,97,99,107,97,103,101,115,32,102,111,114,32,116,104,105,
-    115,32,100,105,114,101,99,116,111,114,121,46,114,17,0,0,
-    0,114,101,0,0,0,114,92,0,0,0,99,1,0,0,0,
-    0,0,0,0,0,0,0,0,4,0,0,0,19,0,0,0,
-    115,20,0,0,0,104,0,124,0,93,6,125,1,124,1,160,
-    0,161,0,146,2,113,2,83,0,114,13,0,0,0,41,1,
-    114,135,0,0,0,41,2,114,5,0,0,0,90,2,102,110,
-    115,2,0,0,0,32,32,114,7,0,0,0,114,15,0,0,
-    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,112,62,82,6,0,0,
-    243,2,0,0,0,20,0,114,126,1,0,0,115,20,0,0,
-    0,40,71,40,71,40,71,56,58,41,43,41,51,41,51,40,
-    71,40,71,40,71,114,10,0,0,0,78,41,18,114,67,0,
-    0,0,114,21,0,0,0,90,7,108,105,115,116,100,105,114,
-    114,86,0,0,0,114,107,1,0,0,218,15,80,101,114,109,
-    105,115,115,105,111,110,69,114,114,111,114,218,18,78,111,116,
-    65,68,105,114,101,99,116,111,114,121,69,114,114,111,114,114,
-    18,0,0,0,114,28,0,0,0,114,29,0,0,0,114,121,
-    1,0,0,114,122,1,0,0,114,130,0,0,0,114,93,0,
-    0,0,114,135,0,0,0,218,3,97,100,100,114,30,0,0,
-    0,114,123,1,0,0,41,9,114,147,0,0,0,114,67,0,
-    0,0,90,8,99,111,110,116,101,110,116,115,90,21,108,111,
-    119,101,114,95,115,117,102,102,105,120,95,99,111,110,116,101,
-    110,116,115,114,90,1,0,0,114,145,0,0,0,114,72,1,
-    0,0,114,61,1,0,0,90,8,110,101,119,95,110,97,109,
-    101,115,9,0,0,0,32,32,32,32,32,32,32,32,32,114,
-    7,0,0,0,114,125,1,0,0,122,22,70,105,108,101,70,
-    105,110,100,101,114,46,95,102,105,108,108,95,99,97,99,104,
-    101,53,6,0,0,115,42,0,0,0,6,2,2,1,20,1,
-    2,128,18,1,8,3,2,128,12,3,12,1,6,7,8,1,
-    16,1,4,1,18,1,4,2,12,1,6,1,12,1,18,1,
-    4,255,2,233,115,50,0,0,0,6,2,2,6,20,252,2,
-    128,2,4,8,253,16,3,2,128,10,3,2,16,12,241,6,
-    7,2,1,4,6,2,250,16,1,2,1,2,3,18,254,4,
-    2,12,1,6,1,10,1,24,1,2,235,115,192,0,0,0,
-    16,20,16,25,9,13,9,26,24,27,24,35,36,40,36,56,
-    44,47,44,54,44,56,24,57,13,21,13,21,0,0,9,26,
-    17,34,36,51,53,71,16,72,9,26,9,26,9,26,9,26,
-    24,26,13,21,13,21,13,21,0,0,16,19,16,28,16,46,
-    40,45,16,46,9,53,32,35,36,44,32,45,13,17,13,29,
-    13,29,37,40,37,42,13,34,25,33,13,52,13,52,17,21,
-    37,41,37,56,52,55,37,56,17,34,17,21,23,26,28,34,
-    20,23,17,36,32,39,32,68,47,51,53,59,53,67,53,67,
-    32,68,21,29,21,29,32,36,21,29,17,38,17,52,43,51,
-    17,52,17,52,17,52,32,53,13,17,13,29,12,15,12,24,
-    12,64,36,63,12,64,9,71,40,71,40,71,62,70,40,71,
-    40,71,13,17,13,37,13,37,13,37,9,71,9,71,9,26,
-    115,13,0,0,0,132,9,14,0,142,12,28,7,193,31,1,
-    28,7,99,1,0,0,0,0,0,0,0,0,0,0,0,2,
-    0,0,0,7,0,0,0,115,20,0,0,0,135,0,135,1,
-    136,0,136,1,102,2,100,1,132,8,125,2,124,2,83,0,
-    41,3,97,20,1,0,0,65,32,99,108,97,115,115,32,109,
-    101,116,104,111,100,32,119,104,105,99,104,32,114,101,116,117,
-    114,110,115,32,97,32,99,108,111,115,117,114,101,32,116,111,
-    32,117,115,101,32,111,110,32,115,121,115,46,112,97,116,104,
-    95,104,111,111,107,10,32,32,32,32,32,32,32,32,119,104,
-    105,99,104,32,119,105,108,108,32,114,101,116,117,114,110,32,
-    97,110,32,105,110,115,116,97,110,99,101,32,117,115,105,110,
-    103,32,116,104,101,32,115,112,101,99,105,102,105,101,100,32,
-    108,111,97,100,101,114,115,32,97,110,100,32,116,104,101,32,
-    112,97,116,104,10,32,32,32,32,32,32,32,32,99,97,108,
-    108,101,100,32,111,110,32,116,104,101,32,99,108,111,115,117,
-    114,101,46,10,10,32,32,32,32,32,32,32,32,73,102,32,
-    116,104,101,32,112,97,116,104,32,99,97,108,108,101,100,32,
-    111,110,32,116,104,101,32,99,108,111,115,117,114,101,32,105,
-    115,32,110,111,116,32,97,32,100,105,114,101,99,116,111,114,
-    121,44,32,73,109,112,111,114,116,69,114,114,111,114,32,105,
-    115,10,32,32,32,32,32,32,32,32,114,97,105,115,101,100,
-    46,10,10,32,32,32,32,32,32,32,32,99,1,0,0,0,
-    0,0,0,0,0,0,0,0,4,0,0,0,19,0,0,0,
-    115,36,0,0,0,116,0,124,0,131,1,115,10,116,1,100,
-    1,124,0,100,2,141,2,130,1,137,1,124,0,103,1,137,
-    2,162,1,82,0,142,0,83,0,41,4,122,45,80,97,116,
-    104,32,104,111,111,107,32,102,111,114,32,105,109,112,111,114,
-    116,108,105,98,46,109,97,99,104,105,110,101,114,121,46,70,
-    105,108,101,70,105,110,100,101,114,46,122,30,111,110,108,121,
-    32,100,105,114,101,99,116,111,114,105,101,115,32,97,114,101,
-    32,115,117,112,112,111,114,116,101,100,114,77,0,0,0,78,
-    41,2,114,87,0,0,0,114,146,0,0,0,41,3,114,67,
-    0,0,0,114,227,0,0,0,114,124,1,0,0,115,3,0,
-    0,0,32,128,128,114,7,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,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,104,95,104,111,111,107,95,102,111,
-    114,95,70,105,108,101,70,105,110,100,101,114,94,6,0,0,
-    115,6,0,0,0,8,2,12,1,16,1,115,6,0,0,0,
-    6,2,14,1,16,1,115,36,0,0,0,20,31,32,36,20,
-    37,13,79,23,34,35,67,74,78,23,79,23,79,17,79,20,
-    23,24,28,20,46,31,45,20,46,20,46,20,46,13,46,114,
-    10,0,0,0,78,114,13,0,0,0,41,3,114,227,0,0,
-    0,114,124,1,0,0,114,130,1,0,0,115,3,0,0,0,
-    96,96,32,114,7,0,0,0,218,9,112,97,116,104,95,104,
-    111,111,107,122,20,70,105,108,101,70,105,110,100,101,114,46,
-    112,97,116,104,95,104,111,111,107,84,6,0,0,115,6,0,
-    0,0,4,128,12,10,4,6,115,6,0,0,0,4,128,12,
-    14,4,2,115,20,0,0,0,0,0,0,0,9,46,9,46,
-    9,46,9,46,9,46,9,46,16,40,9,40,114,10,0,0,
-    0,99,1,0,0,0,0,0,0,0,0,0,0,0,3,0,
-    0,0,3,0,0,0,114,87,1,0,0,41,2,78,122,16,
-    70,105,108,101,70,105,110,100,101,114,40,123,33,114,125,41,
-    41,2,114,93,0,0,0,114,67,0,0,0,114,35,1,0,
-    0,115,1,0,0,0,32,114,7,0,0,0,114,88,1,0,
-    0,122,19,70,105,108,101,70,105,110,100,101,114,46,95,95,
-    114,101,112,114,95,95,102,6,0,0,114,80,1,0,0,114,
-    80,1,0,0,115,12,0,0,0,16,34,16,52,42,46,42,
-    51,16,52,9,52,114,10,0,0,0,114,71,0,0,0,41,
-    15,114,153,0,0,0,114,152,0,0,0,114,154,0,0,0,
-    114,155,0,0,0,114,242,0,0,0,114,100,1,0,0,114,
-    170,0,0,0,114,235,0,0,0,114,164,0,0,0,114,113,
-    1,0,0,114,232,0,0,0,114,125,1,0,0,114,240,0,
-    0,0,114,131,1,0,0,114,88,1,0,0,114,13,0,0,
-    0,114,10,0,0,0,114,7,0,0,0,114,117,1,0,0,
-    114,117,1,0,0,207,5,0,0,115,24,0,0,0,8,0,
-    4,2,6,7,6,16,4,4,6,2,6,15,8,5,6,51,
-    2,31,8,1,10,17,115,116,0,0,0,0,129,0,129,0,
-    129,0,129,0,129,0,129,0,129,0,129,0,129,0,129,0,
-    129,8,166,0,127,0,127,0,127,0,127,0,127,0,127,0,
-    127,0,127,0,127,0,127,0,127,2,97,0,129,0,129,0,
-    129,0,129,0,129,0,129,0,129,0,129,0,129,0,129,0,
-    129,2,159,0,127,0,127,0,127,0,127,0,127,0,127,0,
-    127,0,127,0,127,0,127,0,127,6,113,6,4,4,2,6,
-    15,6,5,2,2,6,49,6,31,2,2,8,16,10,3,115,
-    74,0,0,0,1,1,1,1,1,1,1,1,5,8,1,1,
-    5,41,5,41,5,41,5,30,5,30,5,30,19,36,5,16,
-    5,66,5,66,5,66,5,72,5,72,5,72,42,46,5,20,
-    5,20,5,20,5,71,5,71,5,71,6,17,5,40,5,40,
-    5,40,5,40,5,52,5,52,5,52,5,52,5,52,114,10,
-    0,0,0,114,117,1,0,0,99,4,0,0,0,0,0,0,
-    0,0,0,0,0,8,0,0,0,3,0,0,0,115,146,0,
-    0,0,124,0,160,0,100,1,161,1,125,4,124,0,160,0,
-    100,2,161,1,125,5,124,4,115,33,124,5,114,18,124,5,
-    106,1,125,4,110,15,124,2,124,3,107,2,114,28,116,2,
-    124,1,124,2,131,2,125,4,110,5,116,3,124,1,124,2,
-    131,2,125,4,124,5,115,42,116,4,124,1,124,2,124,4,
-    100,3,141,3,125,5,9,0,124,5,124,0,100,2,60,0,
-    124,4,124,0,100,1,60,0,124,2,124,0,100,4,60,0,
-    124,3,124,0,100,5,60,0,100,0,83,0,35,0,4,0,
-    116,5,121,72,1,0,1,0,1,0,89,0,100,0,83,0,
-    37,0,119,0,41,6,78,218,10,95,95,108,111,97,100,101,
-    114,95,95,218,8,95,95,115,112,101,99,95,95,41,1,114,
-    167,0,0,0,90,8,95,95,102,105,108,101,95,95,90,10,
-    95,95,99,97,99,104,101,100,95,95,41,6,218,3,103,101,
-    116,114,167,0,0,0,114,58,1,0,0,114,49,1,0,0,
-    114,219,0,0,0,218,9,69,120,99,101,112,116,105,111,110,
-    41,6,90,2,110,115,114,145,0,0,0,90,8,112,97,116,
-    104,110,97,109,101,90,9,99,112,97,116,104,110,97,109,101,
-    114,167,0,0,0,114,216,0,0,0,115,6,0,0,0,32,
-    32,32,32,32,32,114,7,0,0,0,218,14,95,102,105,120,
-    95,117,112,95,109,111,100,117,108,101,114,136,1,0,0,108,
-    6,0,0,115,40,0,0,0,10,2,10,1,4,1,4,1,
-    8,1,8,1,12,1,10,2,4,1,14,1,2,1,8,1,
-    8,1,8,1,12,1,2,128,12,1,6,2,2,128,2,254,
-    115,48,0,0,0,10,2,10,1,2,1,2,6,2,251,2,
-    5,8,252,6,1,2,3,12,254,10,2,2,1,16,1,2,
-    8,8,250,8,1,8,1,12,1,2,128,2,3,2,254,14,
-    2,2,128,2,0,115,146,0,0,0,14,16,14,34,21,33,
-    14,34,5,11,12,14,12,30,19,29,12,30,5,9,12,18,
-    5,54,12,16,9,54,22,26,22,33,13,19,13,19,14,22,
-    26,35,14,35,9,54,22,42,43,47,49,57,22,58,13,19,
-    13,19,22,38,39,43,45,53,22,54,13,19,12,16,5,70,
-    16,39,40,44,46,54,63,69,16,70,16,70,9,13,5,13,
-    26,30,9,11,12,22,9,23,28,34,9,11,12,24,9,25,
-    26,34,9,11,12,22,9,23,28,37,9,11,12,24,9,25,
-    9,25,9,25,0,0,5,13,12,21,5,13,5,13,5,13,
-    5,13,9,13,9,13,9,13,0,0,5,13,115,15,0,0,
-    0,171,16,61,0,189,7,65,7,7,193,8,1,65,7,7,
-    99,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,
-    0,3,0,0,0,115,38,0,0,0,116,0,116,1,106,2,
-    131,0,102,2,125,0,116,3,116,4,102,2,125,1,116,5,
-    116,6,102,2,125,2,124,0,124,1,124,2,103,3,83,0,
-    41,2,122,95,82,101,116,117,114,110,115,32,97,32,108,105,
-    115,116,32,111,102,32,102,105,108,101,45,98,97,115,101,100,
-    32,109,111,100,117,108,101,32,108,111,97,100,101,114,115,46,
-    10,10,32,32,32,32,69,97,99,104,32,105,116,101,109,32,
-    105,115,32,97,32,116,117,112,108,101,32,40,108,111,97,100,
-    101,114,44,32,115,117,102,102,105,120,101,115,41,46,10,32,
-    32,32,32,78,41,7,114,44,1,0,0,114,190,0,0,0,
-    218,18,101,120,116,101,110,115,105,111,110,95,115,117,102,102,
-    105,120,101,115,114,49,1,0,0,114,131,0,0,0,114,58,
-    1,0,0,114,117,0,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,115,3,0,0,0,32,32,32,
-    114,7,0,0,0,114,214,0,0,0,114,214,0,0,0,131,
-    6,0,0,243,8,0,0,0,12,5,8,1,8,1,10,1,
-    114,138,1,0,0,115,38,0,0,0,18,37,39,43,39,62,
-    39,64,18,64,5,15,14,30,32,47,14,47,5,11,16,36,
-    38,55,16,55,5,13,13,23,25,31,33,41,12,42,5,42,
-    114,10,0,0,0,99,1,0,0,0,0,0,0,0,0,0,
-    0,0,1,0,0,0,3,0,0,0,115,8,0,0,0,124,
-    0,97,0,100,0,83,0,114,71,0,0,0,41,1,114,162,
-    0,0,0,41,1,218,17,95,98,111,111,116,115,116,114,97,
-    112,95,109,111,100,117,108,101,115,1,0,0,0,32,114,7,
-    0,0,0,218,21,95,115,101,116,95,98,111,111,116,115,116,
-    114,97,112,95,109,111,100,117,108,101,114,140,1,0,0,142,
-    6,0,0,243,2,0,0,0,8,2,114,141,1,0,0,115,
-    8,0,0,0,18,35,5,15,5,15,5,15,114,10,0,0,
-    0,99,1,0,0,0,0,0,0,0,0,0,0,0,4,0,
-    0,0,3,0,0,0,115,50,0,0,0,116,0,124,0,131,
-    1,1,0,116,1,131,0,125,1,116,2,106,3,160,4,116,
-    5,106,6,124,1,142,0,103,1,161,1,1,0,116,2,106,
-    7,160,8,116,9,161,1,1,0,100,1,83,0,41,2,122,
-    41,73,110,115,116,97,108,108,32,116,104,101,32,112,97,116,
-    104,45,98,97,115,101,100,32,105,109,112,111,114,116,32,99,
-    111,109,112,111,110,101,110,116,115,46,78,41,10,114,140,1,
-    0,0,114,214,0,0,0,114,18,0,0,0,114,105,1,0,
-    0,114,194,0,0,0,114,117,1,0,0,114,131,1,0,0,
-    218,9,109,101,116,97,95,112,97,116,104,114,63,0,0,0,
-    114,99,1,0,0,41,2,114,139,1,0,0,90,17,115,117,
-    112,112,111,114,116,101,100,95,108,111,97,100,101,114,115,115,
-    2,0,0,0,32,32,114,7,0,0,0,218,8,95,105,110,
-    115,116,97,108,108,114,143,1,0,0,147,6,0,0,243,8,
-    0,0,0,8,2,6,1,20,1,16,1,114,144,1,0,0,
-    115,50,0,0,0,5,26,27,44,5,45,5,45,25,52,25,
-    54,5,22,5,8,5,19,5,70,28,38,28,48,50,67,28,
-    68,27,69,5,70,5,70,5,8,5,18,5,37,26,36,5,
-    37,5,37,5,37,5,37,114,10,0,0,0,41,1,114,91,
-    0,0,0,114,71,0,0,0,41,3,78,78,78,41,2,114,
-    0,0,0,0,114,0,0,0,0,41,1,84,41,85,114,155,
-    0,0,0,114,162,0,0,0,114,190,0,0,0,114,95,0,
-    0,0,114,18,0,0,0,114,103,0,0,0,114,187,0,0,
-    0,114,28,0,0,0,114,237,0,0,0,90,2,110,116,114,
-    21,0,0,0,114,221,0,0,0,90,5,112,111,115,105,120,
-    114,53,0,0,0,218,3,97,108,108,114,61,0,0,0,114,
-    140,0,0,0,114,59,0,0,0,114,64,0,0,0,90,20,
-    95,112,97,116,104,115,101,112,115,95,119,105,116,104,95,99,
-    111,108,111,110,114,31,0,0,0,90,37,95,67,65,83,69,
-    95,73,78,83,69,78,83,73,84,73,86,69,95,80,76,65,
-    84,70,79,82,77,83,95,66,89,84,69,83,95,75,69,89,
-    114,30,0,0,0,114,32,0,0,0,114,24,0,0,0,114,
-    39,0,0,0,114,45,0,0,0,114,48,0,0,0,114,69,
-    0,0,0,114,76,0,0,0,114,78,0,0,0,114,83,0,
-    0,0,114,84,0,0,0,114,87,0,0,0,114,90,0,0,
-    0,114,99,0,0,0,218,4,116,121,112,101,218,8,95,95,
-    99,111,100,101,95,95,114,189,0,0,0,114,37,0,0,0,
-    114,175,0,0,0,114,36,0,0,0,114,42,0,0,0,114,
-    20,1,0,0,114,120,0,0,0,114,116,0,0,0,114,131,
-    0,0,0,114,63,0,0,0,114,137,1,0,0,114,238,0,
-    0,0,114,117,0,0,0,90,23,68,69,66,85,71,95,66,
-    89,84,69,67,79,68,69,95,83,85,70,70,73,88,69,83,
-    90,27,79,80,84,73,77,73,90,69,68,95,66,89,84,69,
-    67,79,68,69,95,83,85,70,70,73,88,69,83,114,125,0,
-    0,0,114,132,0,0,0,114,139,0,0,0,114,141,0,0,
-    0,114,143,0,0,0,114,163,0,0,0,114,170,0,0,0,
-    114,179,0,0,0,114,183,0,0,0,114,185,0,0,0,114,
-    192,0,0,0,114,197,0,0,0,114,199,0,0,0,114,205,
-    0,0,0,218,6,111,98,106,101,99,116,114,215,0,0,0,
-    114,219,0,0,0,114,220,0,0,0,114,241,0,0,0,114,
-    2,1,0,0,114,23,1,0,0,114,49,1,0,0,114,58,
-    1,0,0,114,44,1,0,0,114,64,1,0,0,114,93,1,
-    0,0,114,99,1,0,0,114,117,1,0,0,114,136,1,0,
-    0,114,214,0,0,0,114,140,1,0,0,114,143,1,0,0,
-    114,13,0,0,0,114,10,0,0,0,114,7,0,0,0,218,
-    8,60,109,111,100,117,108,101,62,114,149,1,0,0,1,0,
-    0,0,115,180,0,0,0,4,0,4,22,8,3,8,1,8,
-    1,8,1,8,1,10,3,4,1,8,1,10,1,8,2,4,
-    3,10,1,6,2,20,2,8,1,8,1,10,1,12,1,4,
-    4,4,1,2,1,2,1,4,255,6,4,6,16,6,3,6,
-    5,6,5,4,6,8,1,6,30,6,6,6,8,6,10,6,
-    9,6,5,4,7,8,1,6,8,8,5,10,22,0,127,16,
-    41,12,1,4,2,4,1,6,2,4,1,10,1,8,2,6,
-    2,8,2,14,2,6,71,6,40,6,19,6,12,6,12,6,
-    31,6,20,6,33,6,28,8,24,8,13,8,10,6,11,6,
-    14,4,3,2,1,10,255,12,73,12,67,14,30,0,127,12,
-    17,16,50,16,45,16,25,12,53,12,63,12,49,0,127,12,
-    29,0,127,8,30,6,23,6,11,10,5,115,220,0,0,0,
-    4,7,4,15,8,3,8,1,8,1,8,1,8,1,10,3,
-    2,1,2,4,8,253,10,1,8,2,2,3,2,3,10,254,
-    6,2,20,2,8,1,8,1,10,1,12,1,4,4,4,1,
-    2,1,4,1,2,255,6,18,6,2,6,5,6,6,6,5,
-    2,3,2,34,8,250,6,6,6,8,6,10,6,9,6,5,
-    6,7,2,3,2,11,8,251,6,5,2,3,6,19,10,3,
-    0,127,16,41,12,1,4,2,4,1,6,2,2,1,12,1,
-    8,2,6,2,8,2,4,2,10,68,6,40,6,19,6,12,
-    6,12,6,31,6,20,6,33,6,28,6,24,2,3,6,10,
-    2,3,6,7,2,3,6,8,6,12,6,5,4,3,2,1,
-    10,67,12,69,12,30,0,127,8,17,0,129,2,242,0,127,
-    4,14,12,50,8,45,4,214,4,42,8,25,4,234,4,22,
-    8,53,4,206,4,50,12,62,12,48,0,127,12,31,0,127,
-    12,28,2,5,6,20,6,11,6,5,10,8,115,158,2,0,
-    0,1,4,1,4,14,18,1,11,1,12,1,12,1,12,1,
-    12,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,
-    11,1,17,1,17,1,17,1,17,1,15,1,15,1,15,1,
-    15,16,19,16,28,32,39,16,39,1,12,4,15,1,24,5,
-    21,5,21,5,21,5,21,5,18,5,18,5,18,5,18,5,
-    18,5,24,5,24,5,24,5,24,4,15,1,28,24,28,30,
-    33,23,34,5,20,5,20,24,27,23,28,5,20,8,11,11,
-    53,11,53,37,52,11,53,11,53,8,53,1,53,1,53,1,
-    53,12,27,28,29,12,30,1,9,18,23,24,39,18,40,1,
-    15,19,21,19,43,27,42,19,43,1,16,24,58,24,58,42,
-    57,24,58,24,58,1,21,39,45,1,36,41,59,1,38,33,
-    70,35,70,33,70,1,28,1,23,1,23,1,23,15,31,15,
-    33,1,12,1,55,1,55,1,55,1,42,1,42,1,42,1,
-    42,1,42,1,42,4,15,1,63,5,42,5,42,5,42,5,
-    42,5,63,5,63,5,63,1,34,1,34,1,34,1,26,1,
-    26,1,26,1,50,1,50,1,50,1,46,1,46,1,46,1,
-    46,1,46,1,46,4,15,1,48,5,82,5,82,5,82,5,
-    82,5,48,5,48,5,48,36,41,1,14,1,14,1,14,14,
-    18,19,32,19,41,14,42,1,11,17,21,16,44,32,33,35,
-    43,16,44,47,54,16,54,1,13,21,24,21,59,36,48,50,
-    58,21,59,1,18,12,25,1,9,8,14,1,5,20,25,19,
-    26,1,16,4,15,1,35,5,20,5,35,28,34,5,35,5,
-    35,22,26,22,45,22,47,1,19,22,28,21,29,1,18,57,
-    74,1,74,1,24,27,54,44,48,66,70,1,48,1,48,1,
-    48,1,48,1,48,1,64,1,64,1,64,1,71,1,71,1,
-    71,1,20,1,20,1,20,1,16,1,16,1,16,1,31,1,
-    31,1,31,1,18,1,18,1,18,1,17,1,17,1,17,1,
-    76,1,76,1,76,1,10,1,10,1,10,34,38,1,57,1,
-    57,1,57,40,41,1,16,1,16,1,16,50,54,1,16,1,
-    16,1,16,1,68,1,68,1,68,13,19,13,21,1,10,44,
-    48,60,64,56,65,1,16,1,16,1,16,1,16,1,16,1,
-    24,1,24,1,24,1,24,1,24,1,24,1,60,1,60,1,
-    60,1,60,1,60,1,60,1,27,1,27,1,27,1,27,20,
-    33,1,27,1,27,1,32,1,32,1,32,1,32,1,32,1,
-    32,1,45,1,45,1,45,1,45,24,34,36,48,1,45,1,
-    45,1,20,1,20,1,20,1,20,28,38,40,53,1,20,1,
-    20,1,25,1,25,1,25,1,25,27,37,39,52,1,25,1,
-    25,1,32,1,32,1,32,1,32,1,32,1,32,1,43,1,
-    43,1,43,1,43,1,43,1,43,1,70,1,70,1,70,1,
-    70,1,70,1,70,1,52,1,52,1,52,1,52,1,52,1,
-    52,50,54,1,13,1,13,1,13,1,42,1,42,1,42,1,
-    35,1,35,1,35,1,37,1,37,1,37,1,37,1,37,114,
-    10,0,0,0,
+    0,0,0,114,242,0,0,0,114,100,1,0,0,114,170,0,
+    0,0,114,235,0,0,0,114,164,0,0,0,114,113,1,0,
+    0,114,232,0,0,0,114,125,1,0,0,114,240,0,0,0,
+    114,131,1,0,0,114,88,1,0,0,114,13,0,0,0,114,
+    10,0,0,0,114,7,0,0,0,114,117,1,0,0,114,117,
+    1,0,0,207,5,0,0,115,24,0,0,0,8,0,4,2,
+    6,7,6,16,4,4,6,2,6,15,8,5,6,51,2,31,
+    8,1,10,17,115,116,0,0,0,0,129,0,129,0,129,0,
+    129,0,129,0,129,0,129,0,129,0,129,0,129,0,129,8,
+    166,0,127,0,127,0,127,0,127,0,127,0,127,0,127,0,
+    127,0,127,0,127,0,127,2,97,0,129,0,129,0,129,0,
+    129,0,129,0,129,0,129,0,129,0,129,0,129,0,129,2,
+    159,0,127,0,127,0,127,0,127,0,127,0,127,0,127,0,
+    127,0,127,0,127,0,127,6,113,6,4,4,2,6,15,6,
+    5,2,2,6,49,6,31,2,2,8,16,10,3,115,74,0,
+    0,0,1,1,1,1,1,1,1,1,5,8,1,1,5,41,
+    5,41,5,41,5,30,5,30,5,30,19,36,5,16,5,66,
+    5,66,5,66,5,72,5,72,5,72,42,46,5,20,5,20,
+    5,20,5,71,5,71,5,71,6,17,5,40,5,40,5,40,
+    5,40,5,52,5,52,5,52,5,52,5,52,114,10,0,0,
+    0,114,117,1,0,0,99,4,0,0,0,0,0,0,0,0,
+    0,0,0,8,0,0,0,3,0,0,0,115,146,0,0,0,
+    124,0,160,0,100,1,161,1,125,4,124,0,160,0,100,2,
+    161,1,125,5,124,4,115,33,124,5,114,18,124,5,106,1,
+    125,4,110,15,124,2,124,3,107,2,114,28,116,2,124,1,
+    124,2,131,2,125,4,110,5,116,3,124,1,124,2,131,2,
+    125,4,124,5,115,42,116,4,124,1,124,2,124,4,100,3,
+    141,3,125,5,9,0,124,5,124,0,100,2,60,0,124,4,
+    124,0,100,1,60,0,124,2,124,0,100,4,60,0,124,3,
+    124,0,100,5,60,0,100,0,83,0,35,0,4,0,116,5,
+    121,71,1,0,1,0,1,0,89,0,100,0,83,0,119,0,
+    37,0,41,6,78,218,10,95,95,108,111,97,100,101,114,95,
+    95,218,8,95,95,115,112,101,99,95,95,41,1,114,167,0,
+    0,0,90,8,95,95,102,105,108,101,95,95,90,10,95,95,
+    99,97,99,104,101,100,95,95,41,6,218,3,103,101,116,114,
+    167,0,0,0,114,58,1,0,0,114,49,1,0,0,114,219,
+    0,0,0,218,9,69,120,99,101,112,116,105,111,110,41,6,
+    90,2,110,115,114,145,0,0,0,90,8,112,97,116,104,110,
+    97,109,101,90,9,99,112,97,116,104,110,97,109,101,114,167,
+    0,0,0,114,216,0,0,0,115,6,0,0,0,32,32,32,
+    32,32,32,114,7,0,0,0,218,14,95,102,105,120,95,117,
+    112,95,109,111,100,117,108,101,114,136,1,0,0,108,6,0,
+    0,115,40,0,0,0,10,2,10,1,4,1,4,1,8,1,
+    8,1,12,1,10,2,4,1,14,1,2,1,8,1,8,1,
+    8,1,12,1,2,128,12,1,6,2,2,254,2,128,115,46,
+    0,0,0,10,2,10,1,2,1,2,6,2,251,2,5,8,
+    252,6,1,2,3,12,254,10,2,2,1,16,1,2,8,8,
+    250,8,1,8,1,12,1,2,128,2,3,2,254,16,2,2,
+    128,115,146,0,0,0,14,16,14,34,21,33,14,34,5,11,
+    12,14,12,30,19,29,12,30,5,9,12,18,5,54,12,16,
+    9,54,22,26,22,33,13,19,13,19,14,22,26,35,14,35,
+    9,54,22,42,43,47,49,57,22,58,13,19,13,19,22,38,
+    39,43,45,53,22,54,13,19,12,16,5,70,16,39,40,44,
+    46,54,63,69,16,70,16,70,9,13,5,13,26,30,9,11,
+    12,22,9,23,28,34,9,11,12,24,9,25,26,34,9,11,
+    12,22,9,23,28,37,9,11,12,24,9,25,9,25,9,25,
+    0,0,5,13,12,21,5,13,5,13,5,13,5,13,9,13,
+    9,13,9,13,5,13,0,0,115,15,0,0,0,171,16,61,
+    0,189,7,65,8,7,193,7,1,65,8,7,99,0,0,0,
+    0,0,0,0,0,0,0,0,0,3,0,0,0,3,0,0,
+    0,115,38,0,0,0,116,0,116,1,106,2,131,0,102,2,
+    125,0,116,3,116,4,102,2,125,1,116,5,116,6,102,2,
+    125,2,124,0,124,1,124,2,103,3,83,0,41,2,122,95,
+    82,101,116,117,114,110,115,32,97,32,108,105,115,116,32,111,
+    102,32,102,105,108,101,45,98,97,115,101,100,32,109,111,100,
+    117,108,101,32,108,111,97,100,101,114,115,46,10,10,32,32,
+    32,32,69,97,99,104,32,105,116,101,109,32,105,115,32,97,
+    32,116,117,112,108,101,32,40,108,111,97,100,101,114,44,32,
+    115,117,102,102,105,120,101,115,41,46,10,32,32,32,32,78,
+    41,7,114,44,1,0,0,114,190,0,0,0,218,18,101,120,
+    116,101,110,115,105,111,110,95,115,117,102,102,105,120,101,115,
+    114,49,1,0,0,114,131,0,0,0,114,58,1,0,0,114,
+    117,0,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,115,3,0,0,0,32,32,32,114,7,0,0,
+    0,114,214,0,0,0,114,214,0,0,0,131,6,0,0,243,
+    8,0,0,0,12,5,8,1,8,1,10,1,114,138,1,0,
+    0,115,38,0,0,0,18,37,39,43,39,62,39,64,18,64,
+    5,15,14,30,32,47,14,47,5,11,16,36,38,55,16,55,
+    5,13,13,23,25,31,33,41,12,42,5,42,114,10,0,0,
+    0,99,1,0,0,0,0,0,0,0,0,0,0,0,1,0,
+    0,0,3,0,0,0,115,8,0,0,0,124,0,97,0,100,
+    0,83,0,114,71,0,0,0,41,1,114,162,0,0,0,41,
+    1,218,17,95,98,111,111,116,115,116,114,97,112,95,109,111,
+    100,117,108,101,115,1,0,0,0,32,114,7,0,0,0,218,
+    21,95,115,101,116,95,98,111,111,116,115,116,114,97,112,95,
+    109,111,100,117,108,101,114,140,1,0,0,142,6,0,0,243,
+    2,0,0,0,8,2,114,141,1,0,0,115,8,0,0,0,
+    18,35,5,15,5,15,5,15,114,10,0,0,0,99,1,0,
+    0,0,0,0,0,0,0,0,0,0,4,0,0,0,3,0,
+    0,0,115,50,0,0,0,116,0,124,0,131,1,1,0,116,
+    1,131,0,125,1,116,2,106,3,160,4,116,5,106,6,124,
+    1,142,0,103,1,161,1,1,0,116,2,106,7,160,8,116,
+    9,161,1,1,0,100,1,83,0,41,2,122,41,73,110,115,
+    116,97,108,108,32,116,104,101,32,112,97,116,104,45,98,97,
+    115,101,100,32,105,109,112,111,114,116,32,99,111,109,112,111,
+    110,101,110,116,115,46,78,41,10,114,140,1,0,0,114,214,
+    0,0,0,114,18,0,0,0,114,105,1,0,0,114,194,0,
+    0,0,114,117,1,0,0,114,131,1,0,0,218,9,109,101,
+    116,97,95,112,97,116,104,114,63,0,0,0,114,99,1,0,
+    0,41,2,114,139,1,0,0,90,17,115,117,112,112,111,114,
+    116,101,100,95,108,111,97,100,101,114,115,115,2,0,0,0,
+    32,32,114,7,0,0,0,218,8,95,105,110,115,116,97,108,
+    108,114,143,1,0,0,147,6,0,0,243,8,0,0,0,8,
+    2,6,1,20,1,16,1,114,144,1,0,0,115,50,0,0,
+    0,5,26,27,44,5,45,5,45,25,52,25,54,5,22,5,
+    8,5,19,5,70,28,38,28,48,50,67,28,68,27,69,5,
+    70,5,70,5,8,5,18,5,37,26,36,5,37,5,37,5,
+    37,5,37,114,10,0,0,0,41,1,114,91,0,0,0,114,
+    71,0,0,0,41,3,78,78,78,41,2,114,0,0,0,0,
+    114,0,0,0,0,41,1,84,41,85,114,155,0,0,0,114,
+    162,0,0,0,114,190,0,0,0,114,95,0,0,0,114,18,
+    0,0,0,114,103,0,0,0,114,187,0,0,0,114,28,0,
+    0,0,114,237,0,0,0,90,2,110,116,114,21,0,0,0,
+    114,221,0,0,0,90,5,112,111,115,105,120,114,53,0,0,
+    0,218,3,97,108,108,114,61,0,0,0,114,140,0,0,0,
+    114,59,0,0,0,114,64,0,0,0,90,20,95,112,97,116,
+    104,115,101,112,115,95,119,105,116,104,95,99,111,108,111,110,
+    114,31,0,0,0,90,37,95,67,65,83,69,95,73,78,83,
+    69,78,83,73,84,73,86,69,95,80,76,65,84,70,79,82,
+    77,83,95,66,89,84,69,83,95,75,69,89,114,30,0,0,
+    0,114,32,0,0,0,114,24,0,0,0,114,39,0,0,0,
+    114,45,0,0,0,114,48,0,0,0,114,69,0,0,0,114,
+    76,0,0,0,114,78,0,0,0,114,83,0,0,0,114,84,
+    0,0,0,114,87,0,0,0,114,90,0,0,0,114,99,0,
+    0,0,218,4,116,121,112,101,218,8,95,95,99,111,100,101,
+    95,95,114,189,0,0,0,114,37,0,0,0,114,175,0,0,
+    0,114,36,0,0,0,114,42,0,0,0,114,20,1,0,0,
+    114,120,0,0,0,114,116,0,0,0,114,131,0,0,0,114,
+    63,0,0,0,114,137,1,0,0,114,238,0,0,0,114,117,
+    0,0,0,90,23,68,69,66,85,71,95,66,89,84,69,67,
+    79,68,69,95,83,85,70,70,73,88,69,83,90,27,79,80,
+    84,73,77,73,90,69,68,95,66,89,84,69,67,79,68,69,
+    95,83,85,70,70,73,88,69,83,114,125,0,0,0,114,132,
+    0,0,0,114,139,0,0,0,114,141,0,0,0,114,143,0,
+    0,0,114,163,0,0,0,114,170,0,0,0,114,179,0,0,
+    0,114,183,0,0,0,114,185,0,0,0,114,192,0,0,0,
+    114,197,0,0,0,114,199,0,0,0,114,205,0,0,0,218,
+    6,111,98,106,101,99,116,114,215,0,0,0,114,219,0,0,
+    0,114,220,0,0,0,114,241,0,0,0,114,2,1,0,0,
+    114,23,1,0,0,114,49,1,0,0,114,58,1,0,0,114,
+    44,1,0,0,114,64,1,0,0,114,93,1,0,0,114,99,
+    1,0,0,114,117,1,0,0,114,136,1,0,0,114,214,0,
+    0,0,114,140,1,0,0,114,143,1,0,0,114,13,0,0,
+    0,114,10,0,0,0,114,7,0,0,0,218,8,60,109,111,
+    100,117,108,101,62,114,149,1,0,0,1,0,0,0,115,180,
+    0,0,0,4,0,4,22,8,3,8,1,8,1,8,1,8,
+    1,10,3,4,1,8,1,10,1,8,2,4,3,10,1,6,
+    2,20,2,8,1,8,1,10,1,12,1,4,4,4,1,2,
+    1,2,1,4,255,6,4,6,16,6,3,6,5,6,5,4,
+    6,8,1,6,30,6,6,6,8,6,10,6,9,6,5,4,
+    7,8,1,6,8,8,5,10,22,0,127,16,41,12,1,4,
+    2,4,1,6,2,4,1,10,1,8,2,6,2,8,2,14,
+    2,6,71,6,40,6,19,6,12,6,12,6,31,6,20,6,
+    33,6,28,8,24,8,13,8,10,6,11,6,14,4,3,2,
+    1,10,255,12,73,12,67,14,30,0,127,12,17,16,50,16,
+    45,16,25,12,53,12,63,12,49,0,127,12,29,0,127,8,
+    30,6,23,6,11,10,5,115,220,0,0,0,4,7,4,15,
+    8,3,8,1,8,1,8,1,8,1,10,3,2,1,2,4,
+    8,253,10,1,8,2,2,3,2,3,10,254,6,2,20,2,
+    8,1,8,1,10,1,12,1,4,4,4,1,2,1,4,1,
+    2,255,6,18,6,2,6,5,6,6,6,5,2,3,2,34,
+    8,250,6,6,6,8,6,10,6,9,6,5,6,7,2,3,
+    2,11,8,251,6,5,2,3,6,19,10,3,0,127,16,41,
+    12,1,4,2,4,1,6,2,2,1,12,1,8,2,6,2,
+    8,2,4,2,10,68,6,40,6,19,6,12,6,12,6,31,
+    6,20,6,33,6,28,6,24,2,3,6,10,2,3,6,7,
+    2,3,6,8,6,12,6,5,4,3,2,1,10,67,12,69,
+    12,30,0,127,8,17,0,129,2,242,0,127,4,14,12,50,
+    8,45,4,214,4,42,8,25,4,234,4,22,8,53,4,206,
+    4,50,12,62,12,48,0,127,12,31,0,127,12,28,2,5,
+    6,20,6,11,6,5,10,8,115,158,2,0,0,1,4,1,
+    4,14,18,1,11,1,12,1,12,1,12,1,12,1,11,1,
+    11,1,11,1,11,1,11,1,11,1,11,1,11,1,17,1,
+    17,1,17,1,17,1,15,1,15,1,15,1,15,16,19,16,
+    28,32,39,16,39,1,12,4,15,1,24,5,21,5,21,5,
+    21,5,21,5,18,5,18,5,18,5,18,5,18,5,24,5,
+    24,5,24,5,24,4,15,1,28,24,28,30,33,23,34,5,
+    20,5,20,24,27,23,28,5,20,8,11,11,53,11,53,37,
+    52,11,53,11,53,8,53,1,53,1,53,1,53,12,27,28,
+    29,12,30,1,9,18,23,24,39,18,40,1,15,19,21,19,
+    43,27,42,19,43,1,16,24,58,24,58,42,57,24,58,24,
+    58,1,21,39,45,1,36,41,59,1,38,33,70,35,70,33,
+    70,1,28,1,23,1,23,1,23,15,31,15,33,1,12,1,
+    55,1,55,1,55,1,42,1,42,1,42,1,42,1,42,1,
+    42,4,15,1,63,5,42,5,42,5,42,5,42,5,63,5,
+    63,5,63,1,34,1,34,1,34,1,26,1,26,1,26,1,
+    50,1,50,1,50,1,46,1,46,1,46,1,46,1,46,1,
+    46,4,15,1,48,5,82,5,82,5,82,5,82,5,48,5,
+    48,5,48,36,41,1,14,1,14,1,14,14,18,19,32,19,
+    41,14,42,1,11,17,21,16,44,32,33,35,43,16,44,47,
+    54,16,54,1,13,21,24,21,59,36,48,50,58,21,59,1,
+    18,12,25,1,9,8,14,1,5,20,25,19,26,1,16,4,
+    15,1,35,5,20,5,35,28,34,5,35,5,35,22,26,22,
+    45,22,47,1,19,22,28,21,29,1,18,57,74,1,74,1,
+    24,27,54,44,48,66,70,1,48,1,48,1,48,1,48,1,
+    48,1,64,1,64,1,64,1,71,1,71,1,71,1,20,1,
+    20,1,20,1,16,1,16,1,16,1,31,1,31,1,31,1,
+    18,1,18,1,18,1,17,1,17,1,17,1,76,1,76,1,
+    76,1,10,1,10,1,10,34,38,1,57,1,57,1,57,40,
+    41,1,16,1,16,1,16,50,54,1,16,1,16,1,16,1,
+    68,1,68,1,68,13,19,13,21,1,10,44,48,60,64,56,
+    65,1,16,1,16,1,16,1,16,1,16,1,24,1,24,1,
+    24,1,24,1,24,1,24,1,60,1,60,1,60,1,60,1,
+    60,1,60,1,27,1,27,1,27,1,27,20,33,1,27,1,
+    27,1,32,1,32,1,32,1,32,1,32,1,32,1,45,1,
+    45,1,45,1,45,24,34,36,48,1,45,1,45,1,20,1,
+    20,1,20,1,20,28,38,40,53,1,20,1,20,1,25,1,
+    25,1,25,1,25,27,37,39,52,1,25,1,25,1,32,1,
+    32,1,32,1,32,1,32,1,32,1,43,1,43,1,43,1,
+    43,1,43,1,43,1,70,1,70,1,70,1,70,1,70,1,
+    70,1,52,1,52,1,52,1,52,1,52,1,52,50,54,1,
+    13,1,13,1,13,1,42,1,42,1,42,1,35,1,35,1,
+    35,1,37,1,37,1,37,1,37,1,37,114,10,0,0,0,
 };
diff --git a/Python/importlib_zipimport.h b/Python/importlib_zipimport.h
index 15ad71f72b19d..370c980c8fe73 100644
--- a/Python/importlib_zipimport.h
+++ b/Python/importlib_zipimport.h
@@ -121,20 +121,20 @@ const unsigned char _Py_M__zipimport[] = {
     125,1,124,1,115,22,116,4,100,2,124,1,100,3,141,2,
     130,1,116,5,114,30,124,1,160,6,116,5,116,7,161,2,
     125,1,103,0,125,3,9,0,9,0,116,8,106,9,124,1,
-    131,1,125,4,110,36,35,0,4,0,116,10,116,11,102,2,
-    121,147,1,0,1,0,1,0,116,8,106,12,124,1,131,1,
+    131,1,125,4,110,37,35,0,4,0,116,10,116,11,102,2,
+    121,75,1,0,1,0,1,0,116,8,106,12,124,1,131,1,
     92,2,125,5,125,6,124,5,124,1,107,2,114,66,116,4,
     100,5,124,1,100,3,141,2,130,1,124,5,125,1,124,3,
-    160,13,124,6,161,1,1,0,89,0,110,15,37,0,124,4,
-    106,14,100,6,64,0,100,7,107,3,114,89,116,4,100,5,
-    124,1,100,3,141,2,130,1,113,91,113,33,9,0,116,15,
-    124,1,25,0,125,7,110,18,35,0,4,0,116,16,121,146,
-    1,0,1,0,1,0,116,17,124,1,131,1,125,7,124,7,
-    116,15,124,1,60,0,89,0,110,1,37,0,124,7,124,0,
-    95,18,124,1,124,0,95,19,116,8,106,20,124,3,100,0,
-    100,0,100,8,133,3,25,0,142,0,124,0,95,21,124,0,
-    106,21,114,144,124,0,4,0,106,21,116,7,55,0,2,0,
-    95,21,100,0,83,0,100,0,83,0,119,0,119,0,41,9,
+    160,13,124,6,161,1,1,0,89,0,110,16,119,0,37,0,
+    124,4,106,14,100,6,64,0,100,7,107,3,114,90,116,4,
+    100,5,124,1,100,3,141,2,130,1,113,92,113,33,9,0,
+    116,15,124,1,25,0,125,7,110,19,35,0,4,0,116,16,
+    121,115,1,0,1,0,1,0,116,17,124,1,131,1,125,7,
+    124,7,116,15,124,1,60,0,89,0,110,2,119,0,37,0,
+    124,7,124,0,95,18,124,1,124,0,95,19,116,8,106,20,
+    124,3,100,0,100,0,100,8,133,3,25,0,142,0,124,0,
+    95,21,124,0,106,21,114,146,124,0,4,0,106,21,116,7,
+    55,0,2,0,95,21,100,0,83,0,100,0,83,0,41,9,
     78,114,0,0,0,0,122,21,97,114,99,104,105,118,101,32,
     112,97,116,104,32,105,115,32,101,109,112,116,121,169,1,218,
     4,112,97,116,104,84,122,14,110,111,116,32,97,32,90,105,
@@ -163,670 +163,668 @@ const unsigned char _Py_M__zipimport[] = {
     114,116,101,114,46,95,95,105,110,105,116,95,95,64,0,0,
     0,115,76,0,0,0,10,1,8,1,10,1,4,1,12,1,
     4,1,12,1,4,2,2,1,2,1,12,1,2,128,16,1,
-    14,3,8,1,12,1,4,1,14,1,2,128,14,3,12,2,
-    2,1,2,240,2,18,10,1,2,128,12,1,8,1,12,1,
-    2,128,6,1,6,1,22,2,6,1,18,1,4,255,2,249,
-    2,239,115,84,0,0,0,8,1,2,2,8,255,10,1,2,
+    14,3,8,1,12,1,4,1,14,1,2,249,2,128,14,10,
+    12,2,2,1,2,240,2,18,10,1,2,128,12,1,8,1,
+    12,1,2,254,2,128,6,3,6,1,22,2,6,1,18,1,
+    4,255,115,80,0,0,0,8,1,2,2,8,255,10,1,2,
     1,14,1,2,1,14,1,4,2,2,1,2,16,12,242,2,
-    128,2,8,6,249,8,7,14,252,6,1,14,1,4,1,14,
+    128,2,8,6,249,8,7,14,252,6,1,14,1,4,1,16,
     1,2,128,12,3,14,2,2,1,2,240,2,22,10,253,2,
-    128,2,3,2,254,8,2,8,255,12,1,2,128,6,1,6,
-    1,22,2,4,1,24,1,2,250,2,244,115,40,1,0,0,
-    16,26,27,31,33,36,16,37,9,37,13,22,13,22,13,22,
-    13,22,20,22,20,37,32,36,20,37,13,17,16,20,9,69,
-    19,33,34,57,64,68,19,69,19,69,13,69,12,24,9,56,
-    20,24,20,56,33,45,47,55,20,56,13,17,18,20,9,15,
-    15,19,13,22,22,41,22,52,53,57,22,58,17,19,17,19,
-    0,0,13,40,21,28,30,40,20,41,13,40,13,40,13,40,
-    13,40,37,56,37,68,69,73,37,74,17,34,17,24,26,34,
-    20,27,31,35,20,35,17,70,27,41,42,58,65,69,27,70,
-    27,70,21,70,24,31,17,21,17,23,17,40,31,39,17,40,
-    17,40,17,40,17,40,0,0,21,23,21,31,34,42,21,42,
-    47,55,20,55,17,70,27,41,42,58,65,69,27,70,27,70,
-    21,70,17,22,15,19,9,47,21,41,42,46,21,47,13,18,
-    13,18,0,0,9,47,16,24,9,47,9,47,9,47,9,47,
-    21,36,37,41,21,42,13,18,42,47,13,33,34,38,13,39,
-    13,39,13,39,0,0,23,28,9,13,9,20,24,28,9,13,
+    128,2,3,2,254,8,2,8,255,14,1,2,128,6,1,6,
+    1,22,2,4,1,24,1,115,40,1,0,0,16,26,27,31,
+    33,36,16,37,9,37,13,22,13,22,13,22,13,22,20,22,
+    20,37,32,36,20,37,13,17,16,20,9,69,19,33,34,57,
+    64,68,19,69,19,69,13,69,12,24,9,56,20,24,20,56,
+    33,45,47,55,20,56,13,17,18,20,9,15,15,19,13,22,
+    22,41,22,52,53,57,22,58,17,19,17,19,0,0,13,40,
+    21,28,30,40,20,41,13,40,13,40,13,40,13,40,37,56,
+    37,68,69,73,37,74,17,34,17,24,26,34,20,27,31,35,
+    20,35,17,70,27,41,42,58,65,69,27,70,27,70,21,70,
+    24,31,17,21,17,23,17,40,31,39,17,40,17,40,17,40,
+    17,40,13,40,0,0,21,23,21,31,34,42,21,42,47,55,
+    20,55,17,70,27,41,42,58,65,69,27,70,27,70,21,70,
+    17,22,15,19,9,47,21,41,42,46,21,47,13,18,13,18,
+    0,0,9,47,16,24,9,47,9,47,9,47,9,47,21,36,
+    37,41,21,42,13,18,42,47,13,33,34,38,13,39,13,39,
+    13,39,9,47,0,0,23,28,9,13,9,20,24,28,9,13,
     9,21,23,42,23,53,55,61,62,66,62,66,64,66,62,66,
     55,67,23,68,9,13,9,20,12,16,12,23,9,36,13,17,
     13,24,13,24,28,36,13,36,13,24,13,24,13,24,13,24,
-    9,36,9,36,9,47,13,40,115,33,0,0,0,162,5,40,
-    0,168,33,65,11,7,193,28,4,65,33,0,193,33,15,65,
-    50,7,194,18,1,65,50,7,194,19,1,65,11,7,78,99,
-    3,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,
-    3,0,0,0,115,90,0,0,0,116,0,106,1,100,1,116,
-    2,131,2,1,0,116,3,124,0,124,1,131,2,125,3,124,
-    3,100,2,117,1,114,19,124,0,103,0,102,2,83,0,116,
-    4,124,0,124,1,131,2,125,4,116,5,124,0,124,4,131,
-    2,114,41,100,2,124,0,106,6,155,0,116,7,155,0,124,
-    4,155,0,157,3,103,1,102,2,83,0,100,2,103,0,102,
-    2,83,0,41,3,97,47,2,0,0,102,105,110,100,95,108,
-    111,97,100,101,114,40,102,117,108,108,110,97,109,101,44,32,
-    112,97,116,104,61,78,111,110,101,41,32,45,62,32,115,101,
-    108,102,44,32,115,116,114,32,111,114,32,78,111,110,101,46,
-    10,10,32,32,32,32,32,32,32,32,83,101,97,114,99,104,
-    32,102,111,114,32,97,32,109,111,100,117,108,101,32,115,112,
-    101,99,105,102,105,101,100,32,98,121,32,39,102,117,108,108,
-    110,97,109,101,39,46,32,39,102,117,108,108,110,97,109,101,
-    39,32,109,117,115,116,32,98,101,32,116,104,101,10,32,32,
-    32,32,32,32,32,32,102,117,108,108,121,32,113,117,97,108,
-    105,102,105,101,100,32,40,100,111,116,116,101,100,41,32,109,
-    111,100,117,108,101,32,110,97,109,101,46,32,73,116,32,114,
-    101,116,117,114,110,115,32,116,104,101,32,122,105,112,105,109,
-    112,111,114,116,101,114,10,32,32,32,32,32,32,32,32,105,
-    110,115,116,97,110,99,101,32,105,116,115,101,108,102,32,105,
-    102,32,116,104,101,32,109,111,100,117,108,101,32,119,97,115,
-    32,102,111,117,110,100,44,32,97,32,115,116,114,105,110,103,
-    32,99,111,110,116,97,105,110,105,110,103,32,116,104,101,10,
-    32,32,32,32,32,32,32,32,102,117,108,108,32,112,97,116,
-    104,32,110,97,109,101,32,105,102,32,105,116,39,115,32,112,
-    111,115,115,105,98,108,121,32,97,32,112,111,114,116,105,111,
-    110,32,111,102,32,97,32,110,97,109,101,115,112,97,99,101,
-    32,112,97,99,107,97,103,101,44,10,32,32,32,32,32,32,
-    32,32,111,114,32,78,111,110,101,32,111,116,104,101,114,119,
-    105,115,101,46,32,84,104,101,32,111,112,116,105,111,110,97,
-    108,32,39,112,97,116,104,39,32,97,114,103,117,109,101,110,
-    116,32,105,115,32,105,103,110,111,114,101,100,32,45,45,32,
-    105,116,39,115,10,32,32,32,32,32,32,32,32,116,104,101,
-    114,101,32,102,111,114,32,99,111,109,112,97,116,105,98,105,
-    108,105,116,121,32,119,105,116,104,32,116,104,101,32,105,109,
-    112,111,114,116,101,114,32,112,114,111,116,111,99,111,108,46,
-    10,10,32,32,32,32,32,32,32,32,68,101,112,114,101,99,
-    97,116,101,100,32,115,105,110,99,101,32,80,121,116,104,111,
-    110,32,51,46,49,48,46,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,32,32,32,32,32,32,32,32,122,102,122,105,112,105,109,
-    112,111,114,116,101,114,46,102,105,110,100,95,108,111,97,100,
-    101,114,40,41,32,105,115,32,100,101,112,114,101,99,97,116,
-    101,100,32,97,110,100,32,115,108,97,116,101,100,32,102,111,
-    114,32,114,101,109,111,118,97,108,32,105,110,32,80,121,116,
-    104,111,110,32,51,46,49,50,59,32,117,115,101,32,102,105,
-    110,100,95,115,112,101,99,40,41,32,105,110,115,116,101,97,
-    100,78,41,8,218,9,95,119,97,114,110,105,110,103,115,218,
-    4,119,97,114,110,218,18,68,101,112,114,101,99,97,116,105,
-    111,110,87,97,114,110,105,110,103,218,16,95,103,101,116,95,
-    109,111,100,117,108,101,95,105,110,102,111,218,16,95,103,101,
-    116,95,109,111,100,117,108,101,95,112,97,116,104,218,7,95,
-    105,115,95,100,105,114,114,30,0,0,0,114,21,0,0,0,
-    41,5,114,33,0,0,0,218,8,102,117,108,108,110,97,109,
-    101,114,14,0,0,0,218,2,109,105,218,7,109,111,100,112,
-    97,116,104,115,5,0,0,0,32,32,32,32,32,114,11,0,
-    0,0,218,11,102,105,110,100,95,108,111,97,100,101,114,122,
-    23,122,105,112,105,109,112,111,114,116,101,114,46,102,105,110,
-    100,95,108,111,97,100,101,114,110,0,0,0,115,20,0,0,
-    0,6,12,2,2,4,254,10,3,8,1,8,2,10,7,10,
-    1,24,4,8,2,115,20,0,0,0,4,12,2,1,6,1,
-    10,1,6,1,10,2,10,7,8,1,26,4,8,2,115,90,
-    0,0,0,9,18,9,23,24,73,24,42,9,43,9,43,14,
-    30,31,35,37,45,14,46,9,11,12,14,22,26,12,26,9,
-    28,20,24,26,28,20,28,13,28,19,35,36,40,42,50,19,
-    51,9,16,12,19,20,24,26,33,12,34,9,64,20,24,30,
-    34,30,42,27,63,44,52,27,63,54,61,27,63,27,63,26,
-    64,20,64,13,64,16,20,22,24,16,24,9,24,114,10,0,
-    0,0,99,3,0,0,0,0,0,0,0,0,0,0,0,4,
-    0,0,0,3,0,0,0,115,28,0,0,0,116,0,106,1,
-    100,1,116,2,131,2,1,0,124,0,160,3,124,1,124,2,
-    161,2,100,2,25,0,83,0,41,4,97,203,1,0,0,102,
-    105,110,100,95,109,111,100,117,108,101,40,102,117,108,108,110,
-    97,109,101,44,32,112,97,116,104,61,78,111,110,101,41,32,
-    45,62,32,115,101,108,102,32,111,114,32,78,111,110,101,46,
-    10,10,32,32,32,32,32,32,32,32,83,101,97,114,99,104,
-    32,102,111,114,32,97,32,109,111,100,117,108,101,32,115,112,
-    101,99,105,102,105,101,100,32,98,121,32,39,102,117,108,108,
-    110,97,109,101,39,46,32,39,102,117,108,108,110,97,109,101,
-    39,32,109,117,115,116,32,98,101,32,116,104,101,10,32,32,
-    32,32,32,32,32,32,102,117,108,108,121,32,113,117,97,108,
-    105,102,105,101,100,32,40,100,111,116,116,101,100,41,32,109,
-    111,100,117,108,101,32,110,97,109,101,46,32,73,116,32,114,
-    101,116,117,114,110,115,32,116,104,101,32,122,105,112,105,109,
-    112,111,114,116,101,114,10,32,32,32,32,32,32,32,32,105,
-    110,115,116,97,110,99,101,32,105,116,115,101,108,102,32,105,
-    102,32,116,104,101,32,109,111,100,117,108,101,32,119,97,115,
-    32,102,111,117,110,100,44,32,111,114,32,78,111,110,101,32,
-    105,102,32,105,116,32,119,97,115,110,39,116,46,10,32,32,
-    32,32,32,32,32,32,84,104,101,32,111,112,116,105,111,110,
-    97,108,32,39,112,97,116,104,39,32,97,114,103,117,109,101,
-    110,116,32,105,115,32,105,103,110,111,114,101,100,32,45,45,
-    32,105,116,39,115,32,116,104,101,114,101,32,102,111,114,32,
-    99,111,109,112,97,116,105,98,105,108,105,116,121,10,32,32,
-    32,32,32,32,32,32,119,105,116,104,32,116,104,101,32,105,
-    109,112,111,114,116,101,114,32,112,114,111,116,111,99,111,108,
-    46,10,10,32,32,32,32,32,32,32,32,68,101,112,114,101,
-    99,97,116,101,100,32,115,105,110,99,101,32,80,121,116,104,
-    111,110,32,51,46,49,48,46,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,32,32,32,32,32,32,32,32,122,102,122,105,112,105,
-    109,112,111,114,116,101,114,46,102,105,110,100,95,109,111,100,
-    117,108,101,40,41,32,105,115,32,100,101,112,114,101,99,97,
-    116,101,100,32,97,110,100,32,115,108,97,116,101,100,32,102,
-    111,114,32,114,101,109,111,118,97,108,32,105,110,32,80,121,
-    116,104,111,110,32,51,46,49,50,59,32,117,115,101,32,102,
-    105,110,100,95,115,112,101,99,40,41,32,105,110,115,116,101,
-    97,100,114,0,0,0,0,78,41,4,114,36,0,0,0,114,
-    37,0,0,0,114,38,0,0,0,114,45,0,0,0,41,3,
-    114,33,0,0,0,114,42,0,0,0,114,14,0,0,0,115,
-    3,0,0,0,32,32,32,114,11,0,0,0,218,11,102,105,
-    110,100,95,109,111,100,117,108,101,122,23,122,105,112,105,109,
-    112,111,114,116,101,114,46,102,105,110,100,95,109,111,100,117,
-    108,101,147,0,0,0,115,8,0,0,0,6,11,2,2,4,
-    254,16,3,115,8,0,0,0,4,11,2,1,6,1,16,1,
-    115,28,0,0,0,9,18,9,23,24,73,24,42,9,43,9,
-    43,16,20,16,48,33,41,43,47,16,48,49,50,16,51,9,
-    51,114,10,0,0,0,99,3,0,0,0,0,0,0,0,0,
-    0,0,0,5,0,0,0,3,0,0,0,115,108,0,0,0,
-    116,0,124,0,124,1,131,2,125,3,124,3,100,1,117,1,
-    114,17,116,1,106,2,124,1,124,0,124,3,100,2,141,3,
-    83,0,116,3,124,0,124,1,131,2,125,4,116,4,124,0,
-    124,4,131,2,114,52,124,0,106,5,155,0,116,6,155,0,
-    124,4,155,0,157,3,125,5,116,1,106,7,124,1,100,1,
-    100,3,100,4,141,3,125,6,124,6,106,8,160,9,124,5,
-    161,1,1,0,124,6,83,0,100,1,83,0,41,5,122,107,
-    67,114,101,97,116,101,32,97,32,77,111,100,117,108,101,83,
-    112,101,99,32,102,111,114,32,116,104,101,32,115,112,101,99,
-    105,102,105,101,100,32,109,111,100,117,108,101,46,10,10,32,
-    32,32,32,32,32,32,32,82,101,116,117,114,110,115,32,78,
-    111,110,101,32,105,102,32,116,104,101,32,109,111,100,117,108,
-    101,32,99,97,110,110,111,116,32,98,101,32,102,111,117,110,
-    100,46,10,32,32,32,32,32,32,32,32,78,41,1,218,10,
-    105,115,95,112,97,99,107,97,103,101,84,41,3,218,4,110,
-    97,109,101,90,6,108,111,97,100,101,114,114,47,0,0,0,
-    41,10,114,39,0,0,0,218,10,95,98,111,111,116,115,116,
-    114,97,112,90,16,115,112,101,99,95,102,114,111,109,95,108,
-    111,97,100,101,114,114,40,0,0,0,114,41,0,0,0,114,
-    30,0,0,0,114,21,0,0,0,90,10,77,111,100,117,108,
-    101,83,112,101,99,90,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,114,25,0,0,0,41,7,114,33,0,0,0,114,42,0,
-    0,0,90,6,116,97,114,103,101,116,90,11,109,111,100,117,
-    108,101,95,105,110,102,111,114,44,0,0,0,114,14,0,0,
-    0,90,4,115,112,101,99,115,7,0,0,0,32,32,32,32,
-    32,32,32,114,11,0,0,0,218,9,102,105,110,100,95,115,
-    112,101,99,122,21,122,105,112,105,109,112,111,114,116,101,114,
-    46,102,105,110,100,95,115,112,101,99,163,0,0,0,115,24,
-    0,0,0,10,5,8,1,16,1,10,7,10,1,18,4,8,
-    1,2,1,6,255,12,2,4,1,4,2,115,28,0,0,0,
-    10,5,6,1,2,19,16,238,10,7,8,1,2,10,18,250,
-    8,1,6,1,2,255,12,2,4,1,4,2,115,108,0,0,
-    0,23,39,40,44,46,54,23,55,9,20,12,23,31,35,12,
-    35,9,28,20,30,20,47,48,56,58,62,75,86,20,87,20,
-    87,13,87,23,39,40,44,46,54,23,55,13,20,16,23,24,
-    28,30,37,16,38,13,28,27,31,27,39,24,60,41,49,24,
-    60,51,58,24,60,24,60,17,21,24,34,24,45,51,59,68,
-    72,57,61,24,62,24,62,17,21,17,21,17,48,17,61,56,
-    60,17,61,17,61,24,28,17,28,24,28,24,28,114,10,0,
-    0,0,99,2,0,0,0,0,0,0,0,0,0,0,0,3,
-    0,0,0,3,0,0,0,115,20,0,0,0,116,0,124,0,
-    124,1,131,2,92,3,125,2,125,3,125,4,124,2,83,0,
-    41,2,122,166,103,101,116,95,99,111,100,101,40,102,117,108,
-    108,110,97,109,101,41,32,45,62,32,99,111,100,101,32,111,
-    98,106,101,99,116,46,10,10,32,32,32,32,32,32,32,32,
-    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,115,
-    112,101,99,105,102,105,101,100,32,109,111,100,117,108,101,46,
-    32,82,97,105,115,101,32,90,105,112,73,109,112,111,114,116,
-    69,114,114,111,114,10,32,32,32,32,32,32,32,32,105,102,
-    32,116,104,101,32,109,111,100,117,108,101,32,99,111,117,108,
-    100,110,39,116,32,98,101,32,105,109,112,111,114,116,101,100,
-    46,10,32,32,32,32,32,32,32,32,78,169,1,218,16,95,
-    103,101,116,95,109,111,100,117,108,101,95,99,111,100,101,169,
-    5,114,33,0,0,0,114,42,0,0,0,218,4,99,111,100,
-    101,218,9,105,115,112,97,99,107,97,103,101,114,44,0,0,
-    0,115,5,0,0,0,32,32,32,32,32,114,11,0,0,0,
-    218,8,103,101,116,95,99,111,100,101,122,20,122,105,112,105,
-    109,112,111,114,116,101,114,46,103,101,116,95,99,111,100,101,
-    190,0,0,0,243,4,0,0,0,16,6,4,1,114,57,0,
-    0,0,115,20,0,0,0,36,52,53,57,59,67,36,68,9,
-    33,9,13,15,24,26,33,16,20,9,20,114,10,0,0,0,
-    99,2,0,0,0,0,0,0,0,0,0,0,0,8,0,0,
-    0,3,0,0,0,115,114,0,0,0,116,0,114,8,124,1,
-    160,1,116,0,116,2,161,2,125,1,124,1,125,2,124,1,
-    160,3,124,0,106,4,116,2,23,0,161,1,114,29,124,1,
-    116,5,124,0,106,4,116,2,23,0,131,1,100,1,133,2,
-    25,0,125,2,9,0,124,0,106,6,124,2,25,0,125,3,
-    110,14,35,0,4,0,116,7,121,56,1,0,1,0,1,0,
-    116,8,100,2,100,3,124,2,131,3,130,1,37,0,116,9,
-    124,0,106,4,124,3,131,2,83,0,119,0,41,4,122,154,
-    103,101,116,95,100,97,116,97,40,112,97,116,104,110,97,109,
-    101,41,32,45,62,32,115,116,114,105,110,103,32,119,105,116,
-    104,32,102,105,108,101,32,100,97,116,97,46,10,10,32,32,
-    32,32,32,32,32,32,82,101,116,117,114,110,32,116,104,101,
-    32,100,97,116,97,32,97,115,115,111,99,105,97,116,101,100,
-    32,119,105,116,104,32,39,112,97,116,104,110,97,109,101,39,
-    46,32,82,97,105,115,101,32,79,83,69,114,114,111,114,32,
-    105,102,10,32,32,32,32,32,32,32,32,116,104,101,32,102,
-    105,108,101,32,119,97,115,110,39,116,32,102,111,117,110,100,
-    46,10,32,32,32,32,32,32,32,32,78,114,0,0,0,0,
-    218,0,41,10,114,19,0,0,0,114,20,0,0,0,114,21,
-    0,0,0,218,10,115,116,97,114,116,115,119,105,116,104,114,
-    30,0,0,0,218,3,108,101,110,114,29,0,0,0,114,27,
-    0,0,0,114,23,0,0,0,218,9,95,103,101,116,95,100,
-    97,116,97,41,4,114,33,0,0,0,218,8,112,97,116,104,
-    110,97,109,101,90,3,107,101,121,218,9,116,111,99,95,101,
-    110,116,114,121,115,4,0,0,0,32,32,32,32,114,11,0,
-    0,0,218,8,103,101,116,95,100,97,116,97,122,20,122,105,
-    112,105,109,112,111,114,116,101,114,46,103,101,116,95,100,97,
-    116,97,200,0,0,0,115,26,0,0,0,4,6,12,1,4,
-    2,16,1,22,1,2,2,12,1,2,128,12,1,12,1,2,
-    128,12,1,2,254,115,28,0,0,0,2,6,14,1,4,2,
-    14,1,24,1,2,5,12,254,2,128,2,2,2,255,20,1,
-    2,128,12,1,2,255,115,114,0,0,0,12,24,9,64,24,
-    32,24,64,41,53,55,63,24,64,13,21,15,23,9,12,12,
-    20,12,56,32,36,32,44,47,55,32,55,12,56,9,58,19,
-    27,28,31,32,36,32,44,47,55,32,55,28,56,28,57,28,
-    57,19,58,13,16,9,38,25,29,25,36,37,40,25,41,13,
-    22,13,22,0,0,9,38,16,24,9,38,9,38,9,38,9,
-    38,19,26,27,28,30,32,34,37,19,38,13,38,0,0,16,
-    25,26,30,26,38,40,49,16,50,9,50,9,38,115,12,0,
-    0,0,158,5,36,0,164,13,49,7,184,1,49,7,99,2,
-    0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,3,
-    0,0,0,115,20,0,0,0,116,0,124,0,124,1,131,2,
-    92,3,125,2,125,3,125,4,124,4,83,0,41,2,122,165,
-    103,101,116,95,102,105,108,101,110,97,109,101,40,102,117,108,
-    108,110,97,109,101,41,32,45,62,32,102,105,108,101,110,97,
-    109,101,32,115,116,114,105,110,103,46,10,10,32,32,32,32,
-    32,32,32,32,82,101,116,117,114,110,32,116,104,101,32,102,
-    105,108,101,110,97,109,101,32,102,111,114,32,116,104,101,32,
-    115,112,101,99,105,102,105,101,100,32,109,111,100,117,108,101,
-    32,111,114,32,114,97,105,115,101,32,90,105,112,73,109,112,
-    111,114,116,69,114,114,111,114,10,32,32,32,32,32,32,32,
-    32,105,102,32,105,116,32,99,111,117,108,100,110,39,116,32,
-    98,101,32,105,109,112,111,114,116,101,100,46,10,32,32,32,
-    32,32,32,32,32,78,114,51,0,0,0,114,53,0,0,0,
-    115,5,0,0,0,32,32,32,32,32,114,11,0,0,0,218,
-    12,103,101,116,95,102,105,108,101,110,97,109,101,122,24,122,
-    105,112,105,109,112,111,114,116,101,114,46,103,101,116,95,102,
-    105,108,101,110,97,109,101,221,0,0,0,243,4,0,0,0,
-    16,8,4,1,114,66,0,0,0,115,20,0,0,0,36,52,
-    53,57,59,67,36,68,9,33,9,13,15,24,26,33,16,23,
-    9,23,114,10,0,0,0,99,2,0,0,0,0,0,0,0,
-    0,0,0,0,8,0,0,0,3,0,0,0,115,128,0,0,
-    0,116,0,124,0,124,1,131,2,125,2,124,2,100,1,117,
-    0,114,18,116,1,100,2,124,1,155,2,157,2,124,1,100,
-    3,141,2,130,1,116,2,124,0,124,1,131,2,125,3,124,
-    2,114,32,116,3,106,4,124,3,100,4,131,2,125,4,110,
-    5,124,3,155,0,100,5,157,2,125,4,9,0,124,0,106,
-    5,124,4,25,0,125,5,110,11,35,0,4,0,116,6,121,
-    63,1,0,1,0,1,0,89,0,100,1,83,0,37,0,116,
-    7,124,0,106,8,124,5,131,2,160,9,161,0,83,0,119,
-    0,41,6,122,253,103,101,116,95,115,111,117,114,99,101,40,
-    102,117,108,108,110,97,109,101,41,32,45,62,32,115,111,117,
-    114,99,101,32,115,116,114,105,110,103,46,10,10,32,32,32,
-    32,32,32,32,32,82,101,116,117,114,110,32,116,104,101,32,
-    115,111,117,114,99,101,32,99,111,100,101,32,102,111,114,32,
-    116,104,101,32,115,112,101,99,105,102,105,101,100,32,109,111,
-    100,117,108,101,46,32,82,97,105,115,101,32,90,105,112,73,
-    109,112,111,114,116,69,114,114,111,114,10,32,32,32,32,32,
-    32,32,32,105,102,32,116,104,101,32,109,111,100,117,108,101,
-    32,99,111,117,108,100,110,39,116,32,98,101,32,102,111,117,
-    110,100,44,32,114,101,116,117,114,110,32,78,111,110,101,32,
-    105,102,32,116,104,101,32,97,114,99,104,105,118,101,32,100,
-    111,101,115,10,32,32,32,32,32,32,32,32,99,111,110,116,
-    97,105,110,32,116,104,101,32,109,111,100,117,108,101,44,32,
-    98,117,116,32,104,97,115,32,110,111,32,115,111,117,114,99,
-    101,32,102,111,114,32,105,116,46,10,32,32,32,32,32,32,
-    32,32,78,250,18,99,97,110,39,116,32,102,105,110,100,32,
-    109,111,100,117,108,101,32,169,1,114,48,0,0,0,250,11,
-    95,95,105,110,105,116,95,95,46,112,121,250,3,46,112,121,
-    41,10,114,39,0,0,0,114,3,0,0,0,114,40,0,0,
-    0,114,22,0,0,0,114,31,0,0,0,114,29,0,0,0,
-    114,27,0,0,0,114,61,0,0,0,114,30,0,0,0,218,
-    6,100,101,99,111,100,101,41,6,114,33,0,0,0,114,42,
-    0,0,0,114,43,0,0,0,114,14,0,0,0,218,8,102,
-    117,108,108,112,97,116,104,114,63,0,0,0,115,6,0,0,
-    0,32,32,32,32,32,32,114,11,0,0,0,218,10,103,101,
-    116,95,115,111,117,114,99,101,122,22,122,105,112,105,109,112,
-    111,114,116,101,114,46,103,101,116,95,115,111,117,114,99,101,
-    233,0,0,0,115,30,0,0,0,10,7,8,1,18,1,10,
-    2,4,1,14,1,10,2,2,2,12,1,2,128,12,1,6,
-    2,2,128,16,1,2,253,115,34,0,0,0,10,7,6,1,
-    20,1,10,2,2,1,2,3,14,254,10,2,2,6,12,253,
-    2,128,2,3,2,254,14,2,2,128,16,1,2,255,115,128,
-    0,0,0,14,30,31,35,37,45,14,46,9,11,12,14,18,
-    22,12,22,9,83,19,33,34,67,35,43,34,67,34,67,74,
-    82,19,83,19,83,13,83,16,32,33,37,39,47,16,48,9,
-    13,12,14,9,36,24,43,24,54,55,59,61,74,24,75,13,
-    21,13,21,27,31,24,36,24,36,24,36,13,21,9,24,25,
-    29,25,36,37,45,25,46,13,22,13,22,0,0,9,24,16,
-    24,9,24,9,24,9,24,9,24,20,24,20,24,20,24,0,
-    0,16,25,26,30,26,38,40,49,16,50,16,59,16,59,9,
-    59,9,24,115,12,0,0,0,166,5,44,0,172,7,54,7,
-    191,1,54,7,99,2,0,0,0,0,0,0,0,0,0,0,
-    0,4,0,0,0,3,0,0,0,115,40,0,0,0,116,0,
-    124,0,124,1,131,2,125,2,124,2,100,1,117,0,114,18,
-    116,1,100,2,124,1,155,2,157,2,124,1,100,3,141,2,
-    130,1,124,2,83,0,41,4,122,171,105,115,95,112,97,99,
-    107,97,103,101,40,102,117,108,108,110,97,109,101,41,32,45,
-    62,32,98,111,111,108,46,10,10,32,32,32,32,32,32,32,
-    32,82,101,116,117,114,110,32,84,114,117,101,32,105,102,32,
-    116,104,101,32,109,111,100,117,108,101,32,115,112,101,99,105,
-    102,105,101,100,32,98,121,32,102,117,108,108,110,97,109,101,
-    32,105,115,32,97,32,112,97,99,107,97,103,101,46,10,32,
-    32,32,32,32,32,32,32,82,97,105,115,101,32,90,105,112,
-    73,109,112,111,114,116,69,114,114,111,114,32,105,102,32,116,
-    104,101,32,109,111,100,117,108,101,32,99,111,117,108,100,110,
-    39,116,32,98,101,32,102,111,117,110,100,46,10,32,32,32,
-    32,32,32,32,32,78,114,67,0,0,0,114,68,0,0,0,
-    41,2,114,39,0,0,0,114,3,0,0,0,41,3,114,33,
-    0,0,0,114,42,0,0,0,114,43,0,0,0,115,3,0,
-    0,0,32,32,32,114,11,0,0,0,114,47,0,0,0,122,
-    22,122,105,112,105,109,112,111,114,116,101,114,46,105,115,95,
-    112,97,99,107,97,103,101,3,1,0,0,115,8,0,0,0,
-    10,6,8,1,18,1,4,1,115,8,0,0,0,10,6,6,
-    1,20,1,4,1,115,40,0,0,0,14,30,31,35,37,45,
-    14,46,9,11,12,14,18,22,12,22,9,83,19,33,34,67,
-    35,43,34,67,34,67,74,82,19,83,19,83,13,83,16,18,
-    9,18,114,10,0,0,0,99,2,0,0,0,0,0,0,0,
-    0,0,0,0,8,0,0,0,3,0,0,0,115,0,1,0,
-    0,100,1,125,2,116,0,106,1,124,2,116,2,131,2,1,
-    0,116,3,124,0,124,1,131,2,92,3,125,3,125,4,125,
-    5,116,4,106,5,160,6,124,1,161,1,125,6,124,6,100,
-    2,117,0,115,31,116,7,124,6,116,8,131,2,115,40,116,
-    8,124,1,131,1,125,6,124,6,116,4,106,5,124,1,60,
-    0,124,0,124,6,95,9,9,0,124,4,114,62,116,10,124,
-    0,124,1,131,2,125,7,116,11,106,12,124,0,106,13,124,
-    7,131,2,125,8,124,8,103,1,124,6,95,14,116,15,124,
-    6,100,3,131,2,115,70,116,16,124,6,95,16,116,11,106,
-    17,124,6,106,18,124,1,124,5,131,3,1,0,116,19,124,
-    3,124,6,106,18,131,2,1,0,110,10,35,0,1,0,1,
-    0,1,0,116,4,106,5,124,1,61,0,130,0,37,0,9,
-    0,116,4,106,5,124,1,25,0,125,6,110,16,35,0,4,
-    0,116,20,121,127,1,0,1,0,1,0,116,21,100,4,124,
-    1,155,2,100,5,157,3,131,1,130,1,37,0,116,22,106,
-    23,100,6,124,1,124,5,131,3,1,0,124,6,83,0,119,
-    0,41,7,97,64,1,0,0,108,111,97,100,95,109,111,100,
-    117,108,101,40,102,117,108,108,110,97,109,101,41,32,45,62,
-    32,109,111,100,117,108,101,46,10,10,32,32,32,32,32,32,
-    32,32,76,111,97,100,32,116,104,101,32,109,111,100,117,108,
-    101,32,115,112,101,99,105,102,105,101,100,32,98,121,32,39,
-    102,117,108,108,110,97,109,101,39,46,32,39,102,117,108,108,
-    110,97,109,101,39,32,109,117,115,116,32,98,101,32,116,104,
-    101,10,32,32,32,32,32,32,32,32,102,117,108,108,121,32,
-    113,117,97,108,105,102,105,101,100,32,40,100,111,116,116,101,
-    100,41,32,109,111,100,117,108,101,32,110,97,109,101,46,32,
-    73,116,32,114,101,116,117,114,110,115,32,116,104,101,32,105,
-    109,112,111,114,116,101,100,10,32,32,32,32,32,32,32,32,
-    109,111,100,117,108,101,44,32,111,114,32,114,97,105,115,101,
-    115,32,90,105,112,73,109,112,111,114,116,69,114,114,111,114,
-    32,105,102,32,105,116,32,99,111,117,108,100,32,110,111,116,
-    32,98,101,32,105,109,112,111,114,116,101,100,46,10,10,32,
+    9,36,9,36,115,33,0,0,0,162,5,40,0,168,33,65,
+    12,7,193,11,1,65,12,7,193,29,4,65,34,0,193,34,
+    15,65,52,7,193,51,1,65,52,7,78,99,3,0,0,0,
+    0,0,0,0,0,0,0,0,4,0,0,0,3,0,0,0,
+    115,90,0,0,0,116,0,106,1,100,1,116,2,131,2,1,
+    0,116,3,124,0,124,1,131,2,125,3,124,3,100,2,117,
+    1,114,19,124,0,103,0,102,2,83,0,116,4,124,0,124,
+    1,131,2,125,4,116,5,124,0,124,4,131,2,114,41,100,
+    2,124,0,106,6,155,0,116,7,155,0,124,4,155,0,157,
+    3,103,1,102,2,83,0,100,2,103,0,102,2,83,0,41,
+    3,97,47,2,0,0,102,105,110,100,95,108,111,97,100,101,
+    114,40,102,117,108,108,110,97,109,101,44,32,112,97,116,104,
+    61,78,111,110,101,41,32,45,62,32,115,101,108,102,44,32,
+    115,116,114,32,111,114,32,78,111,110,101,46,10,10,32,32,
+    32,32,32,32,32,32,83,101,97,114,99,104,32,102,111,114,
+    32,97,32,109,111,100,117,108,101,32,115,112,101,99,105,102,
+    105,101,100,32,98,121,32,39,102,117,108,108,110,97,109,101,
+    39,46,32,39,102,117,108,108,110,97,109,101,39,32,109,117,
+    115,116,32,98,101,32,116,104,101,10,32,32,32,32,32,32,
+    32,32,102,117,108,108,121,32,113,117,97,108,105,102,105,101,
+    100,32,40,100,111,116,116,101,100,41,32,109,111,100,117,108,
+    101,32,110,97,109,101,46,32,73,116,32,114,101,116,117,114,
+    110,115,32,116,104,101,32,122,105,112,105,109,112,111,114,116,
+    101,114,10,32,32,32,32,32,32,32,32,105,110,115,116,97,
+    110,99,101,32,105,116,115,101,108,102,32,105,102,32,116,104,
+    101,32,109,111,100,117,108,101,32,119,97,115,32,102,111,117,
+    110,100,44,32,97,32,115,116,114,105,110,103,32,99,111,110,
+    116,97,105,110,105,110,103,32,116,104,101,10,32,32,32,32,
+    32,32,32,32,102,117,108,108,32,112,97,116,104,32,110,97,
+    109,101,32,105,102,32,105,116,39,115,32,112,111,115,115,105,
+    98,108,121,32,97,32,112,111,114,116,105,111,110,32,111,102,
+    32,97,32,110,97,109,101,115,112,97,99,101,32,112,97,99,
+    107,97,103,101,44,10,32,32,32,32,32,32,32,32,111,114,
+    32,78,111,110,101,32,111,116,104,101,114,119,105,115,101,46,
+    32,84,104,101,32,111,112,116,105,111,110,97,108,32,39,112,
+    97,116,104,39,32,97,114,103,117,109,101,110,116,32,105,115,
+    32,105,103,110,111,114,101,100,32,45,45,32,105,116,39,115,
+    10,32,32,32,32,32,32,32,32,116,104,101,114,101,32,102,
+    111,114,32,99,111,109,112,97,116,105,98,105,108,105,116,121,
+    32,119,105,116,104,32,116,104,101,32,105,109,112,111,114,116,
+    101,114,32,112,114,111,116,111,99,111,108,46,10,10,32,32,
+    32,32,32,32,32,32,68,101,112,114,101,99,97,116,101,100,
+    32,115,105,110,99,101,32,80,121,116,104,111,110,32,51,46,
+    49,48,46,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,32,32,32,
+    32,32,32,32,32,122,102,122,105,112,105,109,112,111,114,116,
+    101,114,46,102,105,110,100,95,108,111,97,100,101,114,40,41,
+    32,105,115,32,100,101,112,114,101,99,97,116,101,100,32,97,
+    110,100,32,115,108,97,116,101,100,32,102,111,114,32,114,101,
+    109,111,118,97,108,32,105,110,32,80,121,116,104,111,110,32,
+    51,46,49,50,59,32,117,115,101,32,102,105,110,100,95,115,
+    112,101,99,40,41,32,105,110,115,116,101,97,100,78,41,8,
+    218,9,95,119,97,114,110,105,110,103,115,218,4,119,97,114,
+    110,218,18,68,101,112,114,101,99,97,116,105,111,110,87,97,
+    114,110,105,110,103,218,16,95,103,101,116,95,109,111,100,117,
+    108,101,95,105,110,102,111,218,16,95,103,101,116,95,109,111,
+    100,117,108,101,95,112,97,116,104,218,7,95,105,115,95,100,
+    105,114,114,30,0,0,0,114,21,0,0,0,41,5,114,33,
+    0,0,0,218,8,102,117,108,108,110,97,109,101,114,14,0,
+    0,0,218,2,109,105,218,7,109,111,100,112,97,116,104,115,
+    5,0,0,0,32,32,32,32,32,114,11,0,0,0,218,11,
+    102,105,110,100,95,108,111,97,100,101,114,122,23,122,105,112,
+    105,109,112,111,114,116,101,114,46,102,105,110,100,95,108,111,
+    97,100,101,114,110,0,0,0,115,20,0,0,0,6,12,2,
+    2,4,254,10,3,8,1,8,2,10,7,10,1,24,4,8,
+    2,115,20,0,0,0,4,12,2,1,6,1,10,1,6,1,
+    10,2,10,7,8,1,26,4,8,2,115,90,0,0,0,9,
+    18,9,23,24,73,24,42,9,43,9,43,14,30,31,35,37,
+    45,14,46,9,11,12,14,22,26,12,26,9,28,20,24,26,
+    28,20,28,13,28,19,35,36,40,42,50,19,51,9,16,12,
+    19,20,24,26,33,12,34,9,64,20,24,30,34,30,42,27,
+    63,44,52,27,63,54,61,27,63,27,63,26,64,20,64,13,
+    64,16,20,22,24,16,24,9,24,114,10,0,0,0,99,3,
+    0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,3,
+    0,0,0,115,28,0,0,0,116,0,106,1,100,1,116,2,
+    131,2,1,0,124,0,160,3,124,1,124,2,161,2,100,2,
+    25,0,83,0,41,4,97,203,1,0,0,102,105,110,100,95,
+    109,111,100,117,108,101,40,102,117,108,108,110,97,109,101,44,
+    32,112,97,116,104,61,78,111,110,101,41,32,45,62,32,115,
+    101,108,102,32,111,114,32,78,111,110,101,46,10,10,32,32,
+    32,32,32,32,32,32,83,101,97,114,99,104,32,102,111,114,
+    32,97,32,109,111,100,117,108,101,32,115,112,101,99,105,102,
+    105,101,100,32,98,121,32,39,102,117,108,108,110,97,109,101,
+    39,46,32,39,102,117,108,108,110,97,109,101,39,32,109,117,
+    115,116,32,98,101,32,116,104,101,10,32,32,32,32,32,32,
+    32,32,102,117,108,108,121,32,113,117,97,108,105,102,105,101,
+    100,32,40,100,111,116,116,101,100,41,32,109,111,100,117,108,
+    101,32,110,97,109,101,46,32,73,116,32,114,101,116,117,114,
+    110,115,32,116,104,101,32,122,105,112,105,109,112,111,114,116,
+    101,114,10,32,32,32,32,32,32,32,32,105,110,115,116,97,
+    110,99,101,32,105,116,115,101,108,102,32,105,102,32,116,104,
+    101,32,109,111,100,117,108,101,32,119,97,115,32,102,111,117,
+    110,100,44,32,111,114,32,78,111,110,101,32,105,102,32,105,
+    116,32,119,97,115,110,39,116,46,10,32,32,32,32,32,32,
+    32,32,84,104,101,32,111,112,116,105,111,110,97,108,32,39,
+    112,97,116,104,39,32,97,114,103,117,109,101,110,116,32,105,
+    115,32,105,103,110,111,114,101,100,32,45,45,32,105,116,39,
+    115,32,116,104,101,114,101,32,102,111,114,32,99,111,109,112,
+    97,116,105,98,105,108,105,116,121,10,32,32,32,32,32,32,
+    32,32,119,105,116,104,32,116,104,101,32,105,109,112,111,114,
+    116,101,114,32,112,114,111,116,111,99,111,108,46,10,10,32,
     32,32,32,32,32,32,32,68,101,112,114,101,99,97,116,101,
     100,32,115,105,110,99,101,32,80,121,116,104,111,110,32,51,
-    46,49,48,46,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,
-    32,32,32,32,32,32,32,32,122,114,122,105,112,105,109,112,
-    111,114,116,46,122,105,112,105,109,112,111,114,116,101,114,46,
-    108,111,97,100,95,109,111,100,117,108,101,40,41,32,105,115,
-    32,100,101,112,114,101,99,97,116,101,100,32,97,110,100,32,
-    115,108,97,116,101,100,32,102,111,114,32,114,101,109,111,118,
-    97,108,32,105,110,32,80,121,116,104,111,110,32,51,46,49,
-    50,59,32,117,115,101,32,101,120,101,99,95,109,111,100,117,
-    108,101,40,41,32,105,110,115,116,101,97,100,78,218,12,95,
-    95,98,117,105,108,116,105,110,115,95,95,122,14,76,111,97,
-    100,101,100,32,109,111,100,117,108,101,32,122,25,32,110,111,
-    116,32,102,111,117,110,100,32,105,110,32,115,121,115,46,109,
-    111,100,117,108,101,115,122,30,105,109,112,111,114,116,32,123,
-    125,32,35,32,108,111,97,100,101,100,32,102,114,111,109,32,
-    90,105,112,32,123,125,41,24,114,36,0,0,0,114,37,0,
-    0,0,114,38,0,0,0,114,52,0,0,0,218,3,115,121,
-    115,218,7,109,111,100,117,108,101,115,218,3,103,101,116,114,
-    16,0,0,0,218,12,95,109,111,100,117,108,101,95,116,121,
-    112,101,218,10,95,95,108,111,97,100,101,114,95,95,114,40,
-    0,0,0,114,22,0,0,0,114,31,0,0,0,114,30,0,
-    0,0,90,8,95,95,112,97,116,104,95,95,218,7,104,97,
-    115,97,116,116,114,114,74,0,0,0,90,14,95,102,105,120,
-    95,117,112,95,109,111,100,117,108,101,218,8,95,95,100,105,
-    99,116,95,95,218,4,101,120,101,99,114,27,0,0,0,218,
-    11,73,109,112,111,114,116,69,114,114,111,114,114,49,0,0,
-    0,218,16,95,118,101,114,98,111,115,101,95,109,101,115,115,
-    97,103,101,41,9,114,33,0,0,0,114,42,0,0,0,218,
-    3,109,115,103,114,54,0,0,0,114,55,0,0,0,114,44,
-    0,0,0,90,3,109,111,100,114,14,0,0,0,114,72,0,
-    0,0,115,9,0,0,0,32,32,32,32,32,32,32,32,32,
-    114,11,0,0,0,218,11,108,111,97,100,95,109,111,100,117,
-    108,101,122,23,122,105,112,105,109,112,111,114,116,101,114,46,
-    108,111,97,100,95,109,111,100,117,108,101,16,1,0,0,115,
-    62,0,0,0,4,9,12,2,16,1,12,1,18,1,8,1,
-    10,1,6,1,2,2,4,1,10,3,14,1,8,1,10,2,
-    6,1,16,1,14,1,2,128,6,1,8,1,2,1,2,128,
-    2,2,12,1,2,128,12,1,16,1,2,128,14,1,4,1,
-    2,253,115,74,0,0,0,2,10,2,255,12,2,16,1,12,
-    1,6,1,2,2,8,254,2,2,8,255,10,1,6,1,2,
-    16,2,243,2,5,10,254,14,1,8,1,8,2,8,1,16,
-    1,14,1,2,128,6,3,8,255,2,1,2,128,2,5,12,
-    254,2,128,2,2,2,255,24,1,2,128,14,1,4,1,2,
-    254,115,0,1,0,0,16,67,9,12,9,18,9,23,24,27,
-    29,47,9,48,9,48,36,52,53,57,59,67,36,68,9,33,
-    9,13,15,24,26,33,15,18,15,26,15,40,31,39,15,40,
-    9,12,12,15,19,23,12,23,9,40,31,41,42,45,47,59,
-    31,60,9,40,19,31,32,40,19,41,13,16,37,40,13,16,
-    13,24,25,33,13,34,26,30,9,12,9,23,9,18,16,25,
-    13,42,24,40,41,45,47,55,24,56,17,21,28,47,28,58,
-    59,63,59,71,73,77,28,78,17,25,33,41,32,42,17,20,
-    17,29,20,27,28,31,33,47,20,48,13,48,36,48,17,20,
-    17,33,13,32,13,47,48,51,48,60,62,70,72,79,13,80,
-    13,80,13,17,18,22,24,27,24,36,13,37,13,37,13,37,
-    0,0,9,18,9,18,9,18,17,20,17,28,29,37,17,38,
-    13,18,0,0,9,86,19,22,19,30,31,39,19,40,13,16,
-    13,16,0,0,9,86,16,24,9,86,9,86,9,86,9,86,
-    19,30,31,85,32,40,31,85,31,85,31,85,19,86,13,86,
-    0,0,9,19,9,36,37,69,71,79,81,88,9,89,9,89,
-    16,19,9,19,9,86,115,29,0,0,0,172,40,65,21,0,
-    193,21,9,65,30,7,193,32,5,65,38,0,193,38,15,65,
-    53,7,193,63,1,65,53,7,99,2,0,0,0,0,0,0,
-    0,0,0,0,0,8,0,0,0,3,0,0,0,115,64,0,
-    0,0,9,0,124,0,160,0,124,1,161,1,115,8,100,1,
-    83,0,110,11,35,0,4,0,116,1,121,31,1,0,1,0,
-    1,0,89,0,100,1,83,0,37,0,100,2,100,3,108,2,
-    109,3,125,2,1,0,124,2,124,0,124,1,131,2,83,0,
-    119,0,41,4,122,204,82,101,116,117,114,110,32,116,104,101,
-    32,82,101,115,111,117,114,99,101,82,101,97,100,101,114,32,
-    102,111,114,32,97,32,112,97,99,107,97,103,101,32,105,110,
-    32,97,32,122,105,112,32,102,105,108,101,46,10,10,32,32,
-    32,32,32,32,32,32,73,102,32,39,102,117,108,108,110,97,
-    109,101,39,32,105,115,32,97,32,112,97,99,107,97,103,101,
-    32,119,105,116,104,105,110,32,116,104,101,32,122,105,112,32,
-    102,105,108,101,44,32,114,101,116,117,114,110,32,116,104,101,
-    10,32,32,32,32,32,32,32,32,39,82,101,115,111,117,114,
-    99,101,82,101,97,100,101,114,39,32,111,98,106,101,99,116,
-    32,102,111,114,32,116,104,101,32,112,97,99,107,97,103,101,
-    46,32,32,79,116,104,101,114,119,105,115,101,32,114,101,116,
-    117,114,110,32,78,111,110,101,46,10,32,32,32,32,32,32,
-    32,32,78,114,0,0,0,0,41,1,218,9,90,105,112,82,
-    101,97,100,101,114,41,4,114,47,0,0,0,114,3,0,0,
-    0,90,17,105,109,112,111,114,116,108,105,98,46,114,101,97,
-    100,101,114,115,114,87,0,0,0,41,3,114,33,0,0,0,
-    114,42,0,0,0,114,87,0,0,0,115,3,0,0,0,32,
-    32,32,114,11,0,0,0,218,19,103,101,116,95,114,101,115,
-    111,117,114,99,101,95,114,101,97,100,101,114,122,31,122,105,
-    112,105,109,112,111,114,116,101,114,46,103,101,116,95,114,101,
-    115,111,117,114,99,101,95,114,101,97,100,101,114,59,1,0,
-    0,115,22,0,0,0,2,6,10,1,4,1,2,255,2,128,
-    12,2,6,1,2,128,12,1,10,1,2,253,115,22,0,0,
-    0,2,10,8,253,8,1,2,128,2,2,2,255,14,1,2,
-    128,12,1,10,1,2,254,115,64,0,0,0,9,24,20,24,
-    20,45,36,44,20,45,13,28,24,28,24,28,13,28,0,0,
-    9,24,16,30,9,24,9,24,9,24,9,24,20,24,20,24,
-    20,24,0,0,9,48,9,48,9,48,9,48,9,48,9,48,
-    16,25,26,30,32,40,16,41,9,41,9,24,115,12,0,0,
-    0,129,5,9,0,137,7,19,7,159,1,19,7,99,1,0,
+    46,49,48,46,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,32,32,
+    32,32,32,32,32,32,122,102,122,105,112,105,109,112,111,114,
+    116,101,114,46,102,105,110,100,95,109,111,100,117,108,101,40,
+    41,32,105,115,32,100,101,112,114,101,99,97,116,101,100,32,
+    97,110,100,32,115,108,97,116,101,100,32,102,111,114,32,114,
+    101,109,111,118,97,108,32,105,110,32,80,121,116,104,111,110,
+    32,51,46,49,50,59,32,117,115,101,32,102,105,110,100,95,
+    115,112,101,99,40,41,32,105,110,115,116,101,97,100,114,0,
+    0,0,0,78,41,4,114,36,0,0,0,114,37,0,0,0,
+    114,38,0,0,0,114,45,0,0,0,41,3,114,33,0,0,
+    0,114,42,0,0,0,114,14,0,0,0,115,3,0,0,0,
+    32,32,32,114,11,0,0,0,218,11,102,105,110,100,95,109,
+    111,100,117,108,101,122,23,122,105,112,105,109,112,111,114,116,
+    101,114,46,102,105,110,100,95,109,111,100,117,108,101,147,0,
+    0,0,115,8,0,0,0,6,11,2,2,4,254,16,3,115,
+    8,0,0,0,4,11,2,1,6,1,16,1,115,28,0,0,
+    0,9,18,9,23,24,73,24,42,9,43,9,43,16,20,16,
+    48,33,41,43,47,16,48,49,50,16,51,9,51,114,10,0,
+    0,0,99,3,0,0,0,0,0,0,0,0,0,0,0,5,
+    0,0,0,3,0,0,0,115,108,0,0,0,116,0,124,0,
+    124,1,131,2,125,3,124,3,100,1,117,1,114,17,116,1,
+    106,2,124,1,124,0,124,3,100,2,141,3,83,0,116,3,
+    124,0,124,1,131,2,125,4,116,4,124,0,124,4,131,2,
+    114,52,124,0,106,5,155,0,116,6,155,0,124,4,155,0,
+    157,3,125,5,116,1,106,7,124,1,100,1,100,3,100,4,
+    141,3,125,6,124,6,106,8,160,9,124,5,161,1,1,0,
+    124,6,83,0,100,1,83,0,41,5,122,107,67,114,101,97,
+    116,101,32,97,32,77,111,100,117,108,101,83,112,101,99,32,
+    102,111,114,32,116,104,101,32,115,112,101,99,105,102,105,101,
+    100,32,109,111,100,117,108,101,46,10,10,32,32,32,32,32,
+    32,32,32,82,101,116,117,114,110,115,32,78,111,110,101,32,
+    105,102,32,116,104,101,32,109,111,100,117,108,101,32,99,97,
+    110,110,111,116,32,98,101,32,102,111,117,110,100,46,10,32,
+    32,32,32,32,32,32,32,78,41,1,218,10,105,115,95,112,
+    97,99,107,97,103,101,84,41,3,218,4,110,97,109,101,90,
+    6,108,111,97,100,101,114,114,47,0,0,0,41,10,114,39,
+    0,0,0,218,10,95,98,111,111,116,115,116,114,97,112,90,
+    16,115,112,101,99,95,102,114,111,109,95,108,111,97,100,101,
+    114,114,40,0,0,0,114,41,0,0,0,114,30,0,0,0,
+    114,21,0,0,0,90,10,77,111,100,117,108,101,83,112,101,
+    99,90,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,114,25,0,
+    0,0,41,7,114,33,0,0,0,114,42,0,0,0,90,6,
+    116,97,114,103,101,116,90,11,109,111,100,117,108,101,95,105,
+    110,102,111,114,44,0,0,0,114,14,0,0,0,90,4,115,
+    112,101,99,115,7,0,0,0,32,32,32,32,32,32,32,114,
+    11,0,0,0,218,9,102,105,110,100,95,115,112,101,99,122,
+    21,122,105,112,105,109,112,111,114,116,101,114,46,102,105,110,
+    100,95,115,112,101,99,163,0,0,0,115,24,0,0,0,10,
+    5,8,1,16,1,10,7,10,1,18,4,8,1,2,1,6,
+    255,12,2,4,1,4,2,115,28,0,0,0,10,5,6,1,
+    2,19,16,238,10,7,8,1,2,10,18,250,8,1,6,1,
+    2,255,12,2,4,1,4,2,115,108,0,0,0,23,39,40,
+    44,46,54,23,55,9,20,12,23,31,35,12,35,9,28,20,
+    30,20,47,48,56,58,62,75,86,20,87,20,87,13,87,23,
+    39,40,44,46,54,23,55,13,20,16,23,24,28,30,37,16,
+    38,13,28,27,31,27,39,24,60,41,49,24,60,51,58,24,
+    60,24,60,17,21,24,34,24,45,51,59,68,72,57,61,24,
+    62,24,62,17,21,17,21,17,48,17,61,56,60,17,61,17,
+    61,24,28,17,28,24,28,24,28,114,10,0,0,0,99,2,
+    0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,3,
+    0,0,0,115,20,0,0,0,116,0,124,0,124,1,131,2,
+    92,3,125,2,125,3,125,4,124,2,83,0,41,2,122,166,
+    103,101,116,95,99,111,100,101,40,102,117,108,108,110,97,109,
+    101,41,32,45,62,32,99,111,100,101,32,111,98,106,101,99,
+    116,46,10,10,32,32,32,32,32,32,32,32,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,115,112,101,99,105,
+    102,105,101,100,32,109,111,100,117,108,101,46,32,82,97,105,
+    115,101,32,90,105,112,73,109,112,111,114,116,69,114,114,111,
+    114,10,32,32,32,32,32,32,32,32,105,102,32,116,104,101,
+    32,109,111,100,117,108,101,32,99,111,117,108,100,110,39,116,
+    32,98,101,32,105,109,112,111,114,116,101,100,46,10,32,32,
+    32,32,32,32,32,32,78,169,1,218,16,95,103,101,116,95,
+    109,111,100,117,108,101,95,99,111,100,101,169,5,114,33,0,
+    0,0,114,42,0,0,0,218,4,99,111,100,101,218,9,105,
+    115,112,97,99,107,97,103,101,114,44,0,0,0,115,5,0,
+    0,0,32,32,32,32,32,114,11,0,0,0,218,8,103,101,
+    116,95,99,111,100,101,122,20,122,105,112,105,109,112,111,114,
+    116,101,114,46,103,101,116,95,99,111,100,101,190,0,0,0,
+    243,4,0,0,0,16,6,4,1,114,57,0,0,0,115,20,
+    0,0,0,36,52,53,57,59,67,36,68,9,33,9,13,15,
+    24,26,33,16,20,9,20,114,10,0,0,0,99,2,0,0,
+    0,0,0,0,0,0,0,0,0,8,0,0,0,3,0,0,
+    0,115,114,0,0,0,116,0,114,8,124,1,160,1,116,0,
+    116,2,161,2,125,1,124,1,125,2,124,1,160,3,124,0,
+    106,4,116,2,23,0,161,1,114,29,124,1,116,5,124,0,
+    106,4,116,2,23,0,131,1,100,1,133,2,25,0,125,2,
+    9,0,124,0,106,6,124,2,25,0,125,3,110,15,35,0,
+    4,0,116,7,121,49,1,0,1,0,1,0,116,8,100,2,
+    100,3,124,2,131,3,130,1,119,0,37,0,116,9,124,0,
+    106,4,124,3,131,2,83,0,41,4,122,154,103,101,116,95,
+    100,97,116,97,40,112,97,116,104,110,97,109,101,41,32,45,
+    62,32,115,116,114,105,110,103,32,119,105,116,104,32,102,105,
+    108,101,32,100,97,116,97,46,10,10,32,32,32,32,32,32,
+    32,32,82,101,116,117,114,110,32,116,104,101,32,100,97,116,
+    97,32,97,115,115,111,99,105,97,116,101,100,32,119,105,116,
+    104,32,39,112,97,116,104,110,97,109,101,39,46,32,82,97,
+    105,115,101,32,79,83,69,114,114,111,114,32,105,102,10,32,
+    32,32,32,32,32,32,32,116,104,101,32,102,105,108,101,32,
+    119,97,115,110,39,116,32,102,111,117,110,100,46,10,32,32,
+    32,32,32,32,32,32,78,114,0,0,0,0,218,0,41,10,
+    114,19,0,0,0,114,20,0,0,0,114,21,0,0,0,218,
+    10,115,116,97,114,116,115,119,105,116,104,114,30,0,0,0,
+    218,3,108,101,110,114,29,0,0,0,114,27,0,0,0,114,
+    23,0,0,0,218,9,95,103,101,116,95,100,97,116,97,41,
+    4,114,33,0,0,0,218,8,112,97,116,104,110,97,109,101,
+    90,3,107,101,121,218,9,116,111,99,95,101,110,116,114,121,
+    115,4,0,0,0,32,32,32,32,114,11,0,0,0,218,8,
+    103,101,116,95,100,97,116,97,122,20,122,105,112,105,109,112,
+    111,114,116,101,114,46,103,101,116,95,100,97,116,97,200,0,
+    0,0,115,26,0,0,0,4,6,12,1,4,2,16,1,22,
+    1,2,2,12,1,2,128,12,1,12,1,2,255,2,128,12,
+    2,115,26,0,0,0,2,6,14,1,4,2,14,1,24,1,
+    2,5,12,254,2,128,2,2,2,255,22,1,2,128,12,1,
+    115,114,0,0,0,12,24,9,64,24,32,24,64,41,53,55,
+    63,24,64,13,21,15,23,9,12,12,20,12,56,32,36,32,
+    44,47,55,32,55,12,56,9,58,19,27,28,31,32,36,32,
+    44,47,55,32,55,28,56,28,57,28,57,19,58,13,16,9,
+    38,25,29,25,36,37,40,25,41,13,22,13,22,0,0,9,
+    38,16,24,9,38,9,38,9,38,9,38,19,26,27,28,30,
+    32,34,37,19,38,13,38,9,38,0,0,16,25,26,30,26,
+    38,40,49,16,50,9,50,115,8,0,0,0,158,5,36,0,
+    164,14,50,7,99,2,0,0,0,0,0,0,0,0,0,0,
+    0,3,0,0,0,3,0,0,0,115,20,0,0,0,116,0,
+    124,0,124,1,131,2,92,3,125,2,125,3,125,4,124,4,
+    83,0,41,2,122,165,103,101,116,95,102,105,108,101,110,97,
+    109,101,40,102,117,108,108,110,97,109,101,41,32,45,62,32,
+    102,105,108,101,110,97,109,101,32,115,116,114,105,110,103,46,
+    10,10,32,32,32,32,32,32,32,32,82,101,116,117,114,110,
+    32,116,104,101,32,102,105,108,101,110,97,109,101,32,102,111,
+    114,32,116,104,101,32,115,112,101,99,105,102,105,101,100,32,
+    109,111,100,117,108,101,32,111,114,32,114,97,105,115,101,32,
+    90,105,112,73,109,112,111,114,116,69,114,114,111,114,10,32,
+    32,32,32,32,32,32,32,105,102,32,105,116,32,99,111,117,
+    108,100,110,39,116,32,98,101,32,105,109,112,111,114,116,101,
+    100,46,10,32,32,32,32,32,32,32,32,78,114,51,0,0,
+    0,114,53,0,0,0,115,5,0,0,0,32,32,32,32,32,
+    114,11,0,0,0,218,12,103,101,116,95,102,105,108,101,110,
+    97,109,101,122,24,122,105,112,105,109,112,111,114,116,101,114,
+    46,103,101,116,95,102,105,108,101,110,97,109,101,221,0,0,
+    0,243,4,0,0,0,16,8,4,1,114,66,0,0,0,115,
+    20,0,0,0,36,52,53,57,59,67,36,68,9,33,9,13,
+    15,24,26,33,16,23,9,23,114,10,0,0,0,99,2,0,
     0,0,0,0,0,0,0,0,0,0,8,0,0,0,3,0,
-    0,0,115,74,0,0,0,9,0,116,0,124,0,106,1,131,
-    1,124,0,95,2,124,0,106,2,116,3,124,0,106,1,60,
-    0,100,1,83,0,35,0,4,0,116,4,121,36,1,0,1,
-    0,1,0,116,3,160,5,124,0,106,1,100,1,161,2,1,
-    0,100,1,124,0,95,2,89,0,100,1,83,0,37,0,119,
-    0,41,2,122,41,82,101,108,111,97,100,32,116,104,101,32,
-    102,105,108,101,32,100,97,116,97,32,111,102,32,116,104,101,
-    32,97,114,99,104,105,118,101,32,112,97,116,104,46,78,41,
-    6,114,28,0,0,0,114,30,0,0,0,114,29,0,0,0,
-    114,26,0,0,0,114,3,0,0,0,218,3,112,111,112,169,
-    1,114,33,0,0,0,115,1,0,0,0,32,114,11,0,0,
-    0,218,17,105,110,118,97,108,105,100,97,116,101,95,99,97,
-    99,104,101,115,122,29,122,105,112,105,109,112,111,114,116,101,
-    114,46,105,110,118,97,108,105,100,97,116,101,95,99,97,99,
-    104,101,115,74,1,0,0,115,18,0,0,0,2,2,12,1,
-    16,1,2,128,12,1,14,1,12,1,2,128,2,254,115,22,
-    0,0,0,2,7,12,252,16,1,2,128,2,3,2,254,8,
-    2,14,255,12,1,2,128,2,0,115,74,0,0,0,9,31,
-    27,42,43,47,43,55,27,56,13,17,13,24,50,54,50,61,
-    13,33,34,38,34,46,13,47,13,47,13,47,0,0,9,31,
-    16,30,9,31,9,31,9,31,9,31,13,33,13,57,38,42,
-    38,50,52,56,13,57,13,57,27,31,13,17,13,24,13,24,
-    13,24,13,24,0,0,9,31,115,12,0,0,0,129,12,15,
-    0,143,17,35,7,164,1,35,7,99,1,0,0,0,0,0,
-    0,0,0,0,0,0,5,0,0,0,3,0,0,0,115,24,
-    0,0,0,100,1,124,0,106,0,155,0,116,1,155,0,124,
-    0,106,2,155,0,100,2,157,5,83,0,41,3,78,122,21,
-    60,122,105,112,105,109,112,111,114,116,101,114,32,111,98,106,
-    101,99,116,32,34,122,2,34,62,41,3,114,30,0,0,0,
-    114,21,0,0,0,114,32,0,0,0,114,90,0,0,0,115,
-    1,0,0,0,32,114,11,0,0,0,218,8,95,95,114,101,
-    112,114,95,95,122,20,122,105,112,105,109,112,111,114,116,101,
-    114,46,95,95,114,101,112,114,95,95,84,1,0,0,243,2,
-    0,0,0,24,1,114,93,0,0,0,115,24,0,0,0,16,
-    79,40,44,40,52,16,79,54,62,16,79,64,68,64,75,16,
-    79,16,79,16,79,9,79,114,10,0,0,0,169,1,78,41,
-    17,114,6,0,0,0,114,7,0,0,0,114,8,0,0,0,
-    218,7,95,95,100,111,99,95,95,114,35,0,0,0,114,45,
-    0,0,0,114,46,0,0,0,114,50,0,0,0,114,56,0,
-    0,0,114,64,0,0,0,114,65,0,0,0,114,73,0,0,
-    0,114,47,0,0,0,114,86,0,0,0,114,88,0,0,0,
-    114,91,0,0,0,114,92,0,0,0,114,9,0,0,0,114,
-    10,0,0,0,114,11,0,0,0,114,4,0,0,0,114,4,
-    0,0,0,46,0,0,0,115,30,0,0,0,8,0,4,1,
-    6,17,8,46,8,37,8,16,6,27,6,10,6,21,6,12,
-    6,26,6,13,6,43,6,15,10,10,115,38,0,0,0,8,
-    210,2,59,2,197,6,102,2,8,6,32,2,5,6,14,2,
-    2,6,25,6,9,6,20,6,13,6,25,6,13,6,44,6,
-    15,6,10,10,4,115,100,0,0,0,1,1,1,1,1,1,
-    1,1,5,8,1,1,5,36,5,36,5,36,42,46,5,24,
-    5,24,5,24,42,46,5,51,5,51,5,51,42,46,5,28,
-    5,28,5,28,5,20,5,20,5,20,5,50,5,50,5,50,
-    5,23,5,23,5,23,5,59,5,59,5,59,5,18,5,18,
-    5,18,5,19,5,19,5,19,5,41,5,41,5,41,5,31,
-    5,31,5,31,5,79,5,79,5,79,5,79,5,79,114,10,
-    0,0,0,122,12,95,95,105,110,105,116,95,95,46,112,121,
-    99,84,114,69,0,0,0,70,41,3,122,4,46,112,121,99,
-    84,70,41,3,114,70,0,0,0,70,70,99,2,0,0,0,
-    0,0,0,0,0,0,0,0,4,0,0,0,3,0,0,0,
-    115,20,0,0,0,124,0,106,0,124,1,160,1,100,1,161,
-    1,100,2,25,0,23,0,83,0,41,3,78,218,1,46,233,
-    2,0,0,0,41,2,114,32,0,0,0,218,10,114,112,97,
-    114,116,105,116,105,111,110,41,2,114,33,0,0,0,114,42,
-    0,0,0,115,2,0,0,0,32,32,114,11,0,0,0,114,
-    40,0,0,0,114,40,0,0,0,102,1,0,0,243,2,0,
-    0,0,20,1,114,99,0,0,0,115,20,0,0,0,12,16,
-    12,23,26,34,26,50,46,49,26,50,51,52,26,53,12,53,
-    5,53,114,10,0,0,0,99,2,0,0,0,0,0,0,0,
-    0,0,0,0,2,0,0,0,3,0,0,0,115,18,0,0,
-    0,124,1,116,0,23,0,125,2,124,2,124,0,106,1,118,
-    0,83,0,114,94,0,0,0,41,2,114,21,0,0,0,114,
-    29,0,0,0,41,3,114,33,0,0,0,114,14,0,0,0,
-    90,7,100,105,114,112,97,116,104,115,3,0,0,0,32,32,
-    32,114,11,0,0,0,114,41,0,0,0,114,41,0,0,0,
-    106,1,0,0,243,4,0,0,0,8,4,10,2,114,100,0,
-    0,0,115,18,0,0,0,15,19,22,30,15,30,5,12,12,
-    19,23,27,23,34,12,34,5,34,114,10,0,0,0,99,2,
-    0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,3,
-    0,0,0,115,56,0,0,0,116,0,124,0,124,1,131,2,
-    125,2,116,1,68,0,93,18,92,3,125,3,125,4,125,5,
-    124,2,124,3,23,0,125,6,124,6,124,0,106,2,118,0,
-    114,25,124,5,2,0,1,0,83,0,113,7,100,0,83,0,
-    114,94,0,0,0,41,3,114,40,0,0,0,218,16,95,122,
-    105,112,95,115,101,97,114,99,104,111,114,100,101,114,114,29,
-    0,0,0,41,7,114,33,0,0,0,114,42,0,0,0,114,
-    14,0,0,0,218,6,115,117,102,102,105,120,218,10,105,115,
-    98,121,116,101,99,111,100,101,114,55,0,0,0,114,72,0,
-    0,0,115,7,0,0,0,32,32,32,32,32,32,32,114,11,
-    0,0,0,114,39,0,0,0,114,39,0,0,0,115,1,0,
-    0,115,14,0,0,0,10,1,14,1,8,1,10,1,8,1,
-    2,255,4,2,115,16,0,0,0,10,1,2,1,4,3,8,
-    253,8,1,8,1,12,1,4,1,115,56,0,0,0,12,28,
-    29,33,35,43,12,44,5,9,42,58,5,29,5,29,9,38,
-    9,15,17,27,29,38,20,24,27,33,20,33,9,17,12,20,
-    24,28,24,35,12,35,9,29,20,29,13,29,13,29,13,29,
-    9,29,12,16,12,16,114,10,0,0,0,99,1,0,0,0,
-    0,0,0,0,0,0,0,0,9,0,0,0,3,0,0,0,
-    115,248,4,0,0,9,0,116,0,106,1,124,0,131,1,125,
-    1,110,18,35,0,4,0,116,2,144,2,121,123,1,0,1,
-    0,1,0,116,3,100,1,124,0,155,2,157,2,124,0,100,
-    2,141,2,130,1,37,0,124,1,53,0,1,0,9,0,124,
-    1,160,4,116,5,11,0,100,3,161,2,1,0,124,1,160,
-    6,161,0,125,2,124,1,160,7,116,5,161,1,125,3,110,
-    18,35,0,4,0,116,2,144,2,121,122,1,0,1,0,1,
+    0,0,115,128,0,0,0,116,0,124,0,124,1,131,2,125,
+    2,124,2,100,1,117,0,114,18,116,1,100,2,124,1,155,
+    2,157,2,124,1,100,3,141,2,130,1,116,2,124,0,124,
+    1,131,2,125,3,124,2,114,32,116,3,106,4,124,3,100,
+    4,131,2,125,4,110,5,124,3,155,0,100,5,157,2,125,
+    4,9,0,124,0,106,5,124,4,25,0,125,5,110,12,35,
+    0,4,0,116,6,121,54,1,0,1,0,1,0,89,0,100,
+    1,83,0,119,0,37,0,116,7,124,0,106,8,124,5,131,
+    2,160,9,161,0,83,0,41,6,122,253,103,101,116,95,115,
+    111,117,114,99,101,40,102,117,108,108,110,97,109,101,41,32,
+    45,62,32,115,111,117,114,99,101,32,115,116,114,105,110,103,
+    46,10,10,32,32,32,32,32,32,32,32,82,101,116,117,114,
+    110,32,116,104,101,32,115,111,117,114,99,101,32,99,111,100,
+    101,32,102,111,114,32,116,104,101,32,115,112,101,99,105,102,
+    105,101,100,32,109,111,100,117,108,101,46,32,82,97,105,115,
+    101,32,90,105,112,73,109,112,111,114,116,69,114,114,111,114,
+    10,32,32,32,32,32,32,32,32,105,102,32,116,104,101,32,
+    109,111,100,117,108,101,32,99,111,117,108,100,110,39,116,32,
+    98,101,32,102,111,117,110,100,44,32,114,101,116,117,114,110,
+    32,78,111,110,101,32,105,102,32,116,104,101,32,97,114,99,
+    104,105,118,101,32,100,111,101,115,10,32,32,32,32,32,32,
+    32,32,99,111,110,116,97,105,110,32,116,104,101,32,109,111,
+    100,117,108,101,44,32,98,117,116,32,104,97,115,32,110,111,
+    32,115,111,117,114,99,101,32,102,111,114,32,105,116,46,10,
+    32,32,32,32,32,32,32,32,78,250,18,99,97,110,39,116,
+    32,102,105,110,100,32,109,111,100,117,108,101,32,169,1,114,
+    48,0,0,0,250,11,95,95,105,110,105,116,95,95,46,112,
+    121,250,3,46,112,121,41,10,114,39,0,0,0,114,3,0,
+    0,0,114,40,0,0,0,114,22,0,0,0,114,31,0,0,
+    0,114,29,0,0,0,114,27,0,0,0,114,61,0,0,0,
+    114,30,0,0,0,218,6,100,101,99,111,100,101,41,6,114,
+    33,0,0,0,114,42,0,0,0,114,43,0,0,0,114,14,
+    0,0,0,218,8,102,117,108,108,112,97,116,104,114,63,0,
+    0,0,115,6,0,0,0,32,32,32,32,32,32,114,11,0,
+    0,0,218,10,103,101,116,95,115,111,117,114,99,101,122,22,
+    122,105,112,105,109,112,111,114,116,101,114,46,103,101,116,95,
+    115,111,117,114,99,101,233,0,0,0,115,30,0,0,0,10,
+    7,8,1,18,1,10,2,4,1,14,1,10,2,2,2,12,
+    1,2,128,12,1,6,2,2,254,2,128,16,3,115,32,0,
+    0,0,10,7,6,1,20,1,10,2,2,1,2,3,14,254,
+    10,2,2,6,12,253,2,128,2,3,2,254,16,2,2,128,
+    16,1,115,128,0,0,0,14,30,31,35,37,45,14,46,9,
+    11,12,14,18,22,12,22,9,83,19,33,34,67,35,43,34,
+    67,34,67,74,82,19,83,19,83,13,83,16,32,33,37,39,
+    47,16,48,9,13,12,14,9,36,24,43,24,54,55,59,61,
+    74,24,75,13,21,13,21,27,31,24,36,24,36,24,36,13,
+    21,9,24,25,29,25,36,37,45,25,46,13,22,13,22,0,
+    0,9,24,16,24,9,24,9,24,9,24,9,24,20,24,20,
+    24,20,24,9,24,0,0,16,25,26,30,26,38,40,49,16,
+    50,16,59,16,59,9,59,115,12,0,0,0,166,5,44,0,
+    172,7,55,7,182,1,55,7,99,2,0,0,0,0,0,0,
+    0,0,0,0,0,4,0,0,0,3,0,0,0,115,40,0,
+    0,0,116,0,124,0,124,1,131,2,125,2,124,2,100,1,
+    117,0,114,18,116,1,100,2,124,1,155,2,157,2,124,1,
+    100,3,141,2,130,1,124,2,83,0,41,4,122,171,105,115,
+    95,112,97,99,107,97,103,101,40,102,117,108,108,110,97,109,
+    101,41,32,45,62,32,98,111,111,108,46,10,10,32,32,32,
+    32,32,32,32,32,82,101,116,117,114,110,32,84,114,117,101,
+    32,105,102,32,116,104,101,32,109,111,100,117,108,101,32,115,
+    112,101,99,105,102,105,101,100,32,98,121,32,102,117,108,108,
+    110,97,109,101,32,105,115,32,97,32,112,97,99,107,97,103,
+    101,46,10,32,32,32,32,32,32,32,32,82,97,105,115,101,
+    32,90,105,112,73,109,112,111,114,116,69,114,114,111,114,32,
+    105,102,32,116,104,101,32,109,111,100,117,108,101,32,99,111,
+    117,108,100,110,39,116,32,98,101,32,102,111,117,110,100,46,
+    10,32,32,32,32,32,32,32,32,78,114,67,0,0,0,114,
+    68,0,0,0,41,2,114,39,0,0,0,114,3,0,0,0,
+    41,3,114,33,0,0,0,114,42,0,0,0,114,43,0,0,
+    0,115,3,0,0,0,32,32,32,114,11,0,0,0,114,47,
+    0,0,0,122,22,122,105,112,105,109,112,111,114,116,101,114,
+    46,105,115,95,112,97,99,107,97,103,101,3,1,0,0,115,
+    8,0,0,0,10,6,8,1,18,1,4,1,115,8,0,0,
+    0,10,6,6,1,20,1,4,1,115,40,0,0,0,14,30,
+    31,35,37,45,14,46,9,11,12,14,18,22,12,22,9,83,
+    19,33,34,67,35,43,34,67,34,67,74,82,19,83,19,83,
+    13,83,16,18,9,18,114,10,0,0,0,99,2,0,0,0,
+    0,0,0,0,0,0,0,0,8,0,0,0,3,0,0,0,
+    115,0,1,0,0,100,1,125,2,116,0,106,1,124,2,116,
+    2,131,2,1,0,116,3,124,0,124,1,131,2,92,3,125,
+    3,125,4,125,5,116,4,106,5,160,6,124,1,161,1,125,
+    6,124,6,100,2,117,0,115,31,116,7,124,6,116,8,131,
+    2,115,40,116,8,124,1,131,1,125,6,124,6,116,4,106,
+    5,124,1,60,0,124,0,124,6,95,9,9,0,124,4,114,
+    62,116,10,124,0,124,1,131,2,125,7,116,11,106,12,124,
+    0,106,13,124,7,131,2,125,8,124,8,103,1,124,6,95,
+    14,116,15,124,6,100,3,131,2,115,70,116,16,124,6,95,
+    16,116,11,106,17,124,6,106,18,124,1,124,5,131,3,1,
+    0,116,19,124,3,124,6,106,18,131,2,1,0,110,10,35,
+    0,1,0,1,0,1,0,116,4,106,5,124,1,61,0,130,
+    0,37,0,9,0,116,4,106,5,124,1,25,0,125,6,110,
+    17,35,0,4,0,116,20,121,117,1,0,1,0,1,0,116,
+    21,100,4,124,1,155,2,100,5,157,3,131,1,130,1,119,
+    0,37,0,116,22,106,23,100,6,124,1,124,5,131,3,1,
+    0,124,6,83,0,41,7,97,64,1,0,0,108,111,97,100,
+    95,109,111,100,117,108,101,40,102,117,108,108,110,97,109,101,
+    41,32,45,62,32,109,111,100,117,108,101,46,10,10,32,32,
+    32,32,32,32,32,32,76,111,97,100,32,116,104,101,32,109,
+    111,100,117,108,101,32,115,112,101,99,105,102,105,101,100,32,
+    98,121,32,39,102,117,108,108,110,97,109,101,39,46,32,39,
+    102,117,108,108,110,97,109,101,39,32,109,117,115,116,32,98,
+    101,32,116,104,101,10,32,32,32,32,32,32,32,32,102,117,
+    108,108,121,32,113,117,97,108,105,102,105,101,100,32,40,100,
+    111,116,116,101,100,41,32,109,111,100,117,108,101,32,110,97,
+    109,101,46,32,73,116,32,114,101,116,117,114,110,115,32,116,
+    104,101,32,105,109,112,111,114,116,101,100,10,32,32,32,32,
+    32,32,32,32,109,111,100,117,108,101,44,32,111,114,32,114,
+    97,105,115,101,115,32,90,105,112,73,109,112,111,114,116,69,
+    114,114,111,114,32,105,102,32,105,116,32,99,111,117,108,100,
+    32,110,111,116,32,98,101,32,105,109,112,111,114,116,101,100,
+    46,10,10,32,32,32,32,32,32,32,32,68,101,112,114,101,
+    99,97,116,101,100,32,115,105,110,99,101,32,80,121,116,104,
+    111,110,32,51,46,49,48,46,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,32,32,32,32,32,32,32,32,122,114,122,105,
+    112,105,109,112,111,114,116,46,122,105,112,105,109,112,111,114,
+    116,101,114,46,108,111,97,100,95,109,111,100,117,108,101,40,
+    41,32,105,115,32,100,101,112,114,101,99,97,116,101,100,32,
+    97,110,100,32,115,108,97,116,101,100,32,102,111,114,32,114,
+    101,109,111,118,97,108,32,105,110,32,80,121,116,104,111,110,
+    32,51,46,49,50,59,32,117,115,101,32,101,120,101,99,95,
+    109,111,100,117,108,101,40,41,32,105,110,115,116,101,97,100,
+    78,218,12,95,95,98,117,105,108,116,105,110,115,95,95,122,
+    14,76,111,97,100,101,100,32,109,111,100,117,108,101,32,122,
+    25,32,110,111,116,32,102,111,117,110,100,32,105,110,32,115,
+    121,115,46,109,111,100,117,108,101,115,122,30,105,109,112,111,
+    114,116,32,123,125,32,35,32,108,111,97,100,101,100,32,102,
+    114,111,109,32,90,105,112,32,123,125,41,24,114,36,0,0,
+    0,114,37,0,0,0,114,38,0,0,0,114,52,0,0,0,
+    218,3,115,121,115,218,7,109,111,100,117,108,101,115,218,3,
+    103,101,116,114,16,0,0,0,218,12,95,109,111,100,117,108,
+    101,95,116,121,112,101,218,10,95,95,108,111,97,100,101,114,
+    95,95,114,40,0,0,0,114,22,0,0,0,114,31,0,0,
+    0,114,30,0,0,0,90,8,95,95,112,97,116,104,95,95,
+    218,7,104,97,115,97,116,116,114,114,74,0,0,0,90,14,
+    95,102,105,120,95,117,112,95,109,111,100,117,108,101,218,8,
+    95,95,100,105,99,116,95,95,218,4,101,120,101,99,114,27,
+    0,0,0,218,11,73,109,112,111,114,116,69,114,114,111,114,
+    114,49,0,0,0,218,16,95,118,101,114,98,111,115,101,95,
+    109,101,115,115,97,103,101,41,9,114,33,0,0,0,114,42,
+    0,0,0,218,3,109,115,103,114,54,0,0,0,114,55,0,
+    0,0,114,44,0,0,0,90,3,109,111,100,114,14,0,0,
+    0,114,72,0,0,0,115,9,0,0,0,32,32,32,32,32,
+    32,32,32,32,114,11,0,0,0,218,11,108,111,97,100,95,
+    109,111,100,117,108,101,122,23,122,105,112,105,109,112,111,114,
+    116,101,114,46,108,111,97,100,95,109,111,100,117,108,101,16,
+    1,0,0,115,62,0,0,0,4,9,12,2,16,1,12,1,
+    18,1,8,1,10,1,6,1,2,2,4,1,10,3,14,1,
+    8,1,10,2,6,1,16,1,14,1,2,128,6,1,8,1,
+    2,1,2,128,2,2,12,1,2,128,12,1,16,1,2,255,
+    2,128,14,2,4,1,115,72,0,0,0,2,10,2,255,12,
+    2,16,1,12,1,6,1,2,2,8,254,2,2,8,255,10,
+    1,6,1,2,16,2,243,2,5,10,254,14,1,8,1,8,
+    2,8,1,16,1,14,1,2,128,6,3,8,255,2,1,2,
+    128,2,5,12,254,2,128,2,2,2,255,26,1,2,128,14,
+    1,4,1,115,0,1,0,0,16,67,9,12,9,18,9,23,
+    24,27,29,47,9,48,9,48,36,52,53,57,59,67,36,68,
+    9,33,9,13,15,24,26,33,15,18,15,26,15,40,31,39,
+    15,40,9,12,12,15,19,23,12,23,9,40,31,41,42,45,
+    47,59,31,60,9,40,19,31,32,40,19,41,13,16,37,40,
+    13,16,13,24,25,33,13,34,26,30,9,12,9,23,9,18,
+    16,25,13,42,24,40,41,45,47,55,24,56,17,21,28,47,
+    28,58,59,63,59,71,73,77,28,78,17,25,33,41,32,42,
+    17,20,17,29,20,27,28,31,33,47,20,48,13,48,36,48,
+    17,20,17,33,13,32,13,47,48,51,48,60,62,70,72,79,
+    13,80,13,80,13,17,18,22,24,27,24,36,13,37,13,37,
+    13,37,0,0,9,18,9,18,9,18,17,20,17,28,29,37,
+    17,38,13,18,0,0,9,86,19,22,19,30,31,39,19,40,
+    13,16,13,16,0,0,9,86,16,24,9,86,9,86,9,86,
+    9,86,19,30,31,85,32,40,31,85,31,85,31,85,19,86,
+    13,86,9,86,0,0,9,19,9,36,37,69,71,79,81,88,
+    9,89,9,89,16,19,9,19,115,23,0,0,0,172,40,65,
+    21,0,193,21,9,65,30,7,193,32,5,65,38,0,193,38,
+    16,65,54,7,99,2,0,0,0,0,0,0,0,0,0,0,
+    0,8,0,0,0,3,0,0,0,115,64,0,0,0,9,0,
+    124,0,160,0,124,1,161,1,115,8,100,1,83,0,110,12,
+    35,0,4,0,116,1,121,19,1,0,1,0,1,0,89,0,
+    100,1,83,0,119,0,37,0,100,2,100,3,108,2,109,3,
+    125,2,1,0,124,2,124,0,124,1,131,2,83,0,41,4,
+    122,204,82,101,116,117,114,110,32,116,104,101,32,82,101,115,
+    111,117,114,99,101,82,101,97,100,101,114,32,102,111,114,32,
+    97,32,112,97,99,107,97,103,101,32,105,110,32,97,32,122,
+    105,112,32,102,105,108,101,46,10,10,32,32,32,32,32,32,
+    32,32,73,102,32,39,102,117,108,108,110,97,109,101,39,32,
+    105,115,32,97,32,112,97,99,107,97,103,101,32,119,105,116,
+    104,105,110,32,116,104,101,32,122,105,112,32,102,105,108,101,
+    44,32,114,101,116,117,114,110,32,116,104,101,10,32,32,32,
+    32,32,32,32,32,39,82,101,115,111,117,114,99,101,82,101,
+    97,100,101,114,39,32,111,98,106,101,99,116,32,102,111,114,
+    32,116,104,101,32,112,97,99,107,97,103,101,46,32,32,79,
+    116,104,101,114,119,105,115,101,32,114,101,116,117,114,110,32,
+    78,111,110,101,46,10,32,32,32,32,32,32,32,32,78,114,
+    0,0,0,0,41,1,218,9,90,105,112,82,101,97,100,101,
+    114,41,4,114,47,0,0,0,114,3,0,0,0,90,17,105,
+    109,112,111,114,116,108,105,98,46,114,101,97,100,101,114,115,
+    114,87,0,0,0,41,3,114,33,0,0,0,114,42,0,0,
+    0,114,87,0,0,0,115,3,0,0,0,32,32,32,114,11,
+    0,0,0,218,19,103,101,116,95,114,101,115,111,117,114,99,
+    101,95,114,101,97,100,101,114,122,31,122,105,112,105,109,112,
+    111,114,116,101,114,46,103,101,116,95,114,101,115,111,117,114,
+    99,101,95,114,101,97,100,101,114,59,1,0,0,115,22,0,
+    0,0,2,6,10,1,4,1,2,255,2,128,12,2,6,1,
+    2,255,2,128,12,2,10,1,115,20,0,0,0,2,10,8,
+    253,8,1,2,128,2,2,2,255,16,1,2,128,12,1,10,
+    1,115,64,0,0,0,9,24,20,24,20,45,36,44,20,45,
+    13,28,24,28,24,28,13,28,0,0,9,24,16,30,9,24,
+    9,24,9,24,9,24,20,24,20,24,20,24,9,24,0,0,
+    9,48,9,48,9,48,9,48,9,48,9,48,16,25,26,30,
+    32,40,16,41,9,41,115,12,0,0,0,129,5,9,0,137,
+    7,20,7,147,1,20,7,99,1,0,0,0,0,0,0,0,
+    0,0,0,0,8,0,0,0,3,0,0,0,115,74,0,0,
+    0,9,0,116,0,124,0,106,1,131,1,124,0,95,2,124,
+    0,106,2,116,3,124,0,106,1,60,0,100,1,83,0,35,
+    0,4,0,116,4,121,35,1,0,1,0,1,0,116,3,160,
+    5,124,0,106,1,100,1,161,2,1,0,100,1,124,0,95,
+    2,89,0,100,1,83,0,119,0,37,0,41,2,122,41,82,
+    101,108,111,97,100,32,116,104,101,32,102,105,108,101,32,100,
+    97,116,97,32,111,102,32,116,104,101,32,97,114,99,104,105,
+    118,101,32,112,97,116,104,46,78,41,6,114,28,0,0,0,
+    114,30,0,0,0,114,29,0,0,0,114,26,0,0,0,114,
+    3,0,0,0,218,3,112,111,112,169,1,114,33,0,0,0,
+    115,1,0,0,0,32,114,11,0,0,0,218,17,105,110,118,
+    97,108,105,100,97,116,101,95,99,97,99,104,101,115,122,29,
+    122,105,112,105,109,112,111,114,116,101,114,46,105,110,118,97,
+    108,105,100,97,116,101,95,99,97,99,104,101,115,74,1,0,
+    0,115,18,0,0,0,2,2,12,1,16,1,2,128,12,1,
+    14,1,12,1,2,254,2,128,115,20,0,0,0,2,7,12,
+    252,16,1,2,128,2,3,2,254,8,2,14,255,14,1,2,
+    128,115,74,0,0,0,9,31,27,42,43,47,43,55,27,56,
+    13,17,13,24,50,54,50,61,13,33,34,38,34,46,13,47,
+    13,47,13,47,0,0,9,31,16,30,9,31,9,31,9,31,
+    9,31,13,33,13,57,38,42,38,50,52,56,13,57,13,57,
+    27,31,13,17,13,24,13,24,13,24,13,24,9,31,0,0,
+    115,12,0,0,0,129,12,15,0,143,17,36,7,163,1,36,
+    7,99,1,0,0,0,0,0,0,0,0,0,0,0,5,0,
+    0,0,3,0,0,0,115,24,0,0,0,100,1,124,0,106,
+    0,155,0,116,1,155,0,124,0,106,2,155,0,100,2,157,
+    5,83,0,41,3,78,122,21,60,122,105,112,105,109,112,111,
+    114,116,101,114,32,111,98,106,101,99,116,32,34,122,2,34,
+    62,41,3,114,30,0,0,0,114,21,0,0,0,114,32,0,
+    0,0,114,90,0,0,0,115,1,0,0,0,32,114,11,0,
+    0,0,218,8,95,95,114,101,112,114,95,95,122,20,122,105,
+    112,105,109,112,111,114,116,101,114,46,95,95,114,101,112,114,
+    95,95,84,1,0,0,243,2,0,0,0,24,1,114,93,0,
+    0,0,115,24,0,0,0,16,79,40,44,40,52,16,79,54,
+    62,16,79,64,68,64,75,16,79,16,79,16,79,9,79,114,
+    10,0,0,0,169,1,78,41,17,114,6,0,0,0,114,7,
+    0,0,0,114,8,0,0,0,218,7,95,95,100,111,99,95,
+    95,114,35,0,0,0,114,45,0,0,0,114,46,0,0,0,
+    114,50,0,0,0,114,56,0,0,0,114,64,0,0,0,114,
+    65,0,0,0,114,73,0,0,0,114,47,0,0,0,114,86,
+    0,0,0,114,88,0,0,0,114,91,0,0,0,114,92,0,
+    0,0,114,9,0,0,0,114,10,0,0,0,114,11,0,0,
+    0,114,4,0,0,0,114,4,0,0,0,46,0,0,0,115,
+    30,0,0,0,8,0,4,1,6,17,8,46,8,37,8,16,
+    6,27,6,10,6,21,6,12,6,26,6,13,6,43,6,15,
+    10,10,115,38,0,0,0,8,210,2,59,2,197,6,102,2,
+    8,6,32,2,5,6,14,2,2,6,25,6,9,6,20,6,
+    13,6,25,6,13,6,44,6,15,6,10,10,4,115,100,0,
+    0,0,1,1,1,1,1,1,1,1,5,8,1,1,5,36,
+    5,36,5,36,42,46,5,24,5,24,5,24,42,46,5,51,
+    5,51,5,51,42,46,5,28,5,28,5,28,5,20,5,20,
+    5,20,5,50,5,50,5,50,5,23,5,23,5,23,5,59,
+    5,59,5,59,5,18,5,18,5,18,5,19,5,19,5,19,
+    5,41,5,41,5,41,5,31,5,31,5,31,5,79,5,79,
+    5,79,5,79,5,79,114,10,0,0,0,122,12,95,95,105,
+    110,105,116,95,95,46,112,121,99,84,114,69,0,0,0,70,
+    41,3,122,4,46,112,121,99,84,70,41,3,114,70,0,0,
+    0,70,70,99,2,0,0,0,0,0,0,0,0,0,0,0,
+    4,0,0,0,3,0,0,0,115,20,0,0,0,124,0,106,
+    0,124,1,160,1,100,1,161,1,100,2,25,0,23,0,83,
+    0,41,3,78,218,1,46,233,2,0,0,0,41,2,114,32,
+    0,0,0,218,10,114,112,97,114,116,105,116,105,111,110,41,
+    2,114,33,0,0,0,114,42,0,0,0,115,2,0,0,0,
+    32,32,114,11,0,0,0,114,40,0,0,0,114,40,0,0,
+    0,102,1,0,0,243,2,0,0,0,20,1,114,99,0,0,
+    0,115,20,0,0,0,12,16,12,23,26,34,26,50,46,49,
+    26,50,51,52,26,53,12,53,5,53,114,10,0,0,0,99,
+    2,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,
+    3,0,0,0,115,18,0,0,0,124,1,116,0,23,0,125,
+    2,124,2,124,0,106,1,118,0,83,0,114,94,0,0,0,
+    41,2,114,21,0,0,0,114,29,0,0,0,41,3,114,33,
+    0,0,0,114,14,0,0,0,90,7,100,105,114,112,97,116,
+    104,115,3,0,0,0,32,32,32,114,11,0,0,0,114,41,
+    0,0,0,114,41,0,0,0,106,1,0,0,243,4,0,0,
+    0,8,4,10,2,114,100,0,0,0,115,18,0,0,0,15,
+    19,22,30,15,30,5,12,12,19,23,27,23,34,12,34,5,
+    34,114,10,0,0,0,99,2,0,0,0,0,0,0,0,0,
+    0,0,0,4,0,0,0,3,0,0,0,115,56,0,0,0,
+    116,0,124,0,124,1,131,2,125,2,116,1,68,0,93,18,
+    92,3,125,3,125,4,125,5,124,2,124,3,23,0,125,6,
+    124,6,124,0,106,2,118,0,114,25,124,5,2,0,1,0,
+    83,0,113,7,100,0,83,0,114,94,0,0,0,41,3,114,
+    40,0,0,0,218,16,95,122,105,112,95,115,101,97,114,99,
+    104,111,114,100,101,114,114,29,0,0,0,41,7,114,33,0,
+    0,0,114,42,0,0,0,114,14,0,0,0,218,6,115,117,
+    102,102,105,120,218,10,105,115,98,121,116,101,99,111,100,101,
+    114,55,0,0,0,114,72,0,0,0,115,7,0,0,0,32,
+    32,32,32,32,32,32,114,11,0,0,0,114,39,0,0,0,
+    114,39,0,0,0,115,1,0,0,115,14,0,0,0,10,1,
+    14,1,8,1,10,1,8,1,2,255,4,2,115,16,0,0,
+    0,10,1,2,1,4,3,8,253,8,1,8,1,12,1,4,
+    1,115,56,0,0,0,12,28,29,33,35,43,12,44,5,9,
+    42,58,5,29,5,29,9,38,9,15,17,27,29,38,20,24,
+    27,33,20,33,9,17,12,20,24,28,24,35,12,35,9,29,
+    20,29,13,29,13,29,13,29,9,29,12,16,12,16,114,10,
+    0,0,0,99,1,0,0,0,0,0,0,0,0,0,0,0,
+    9,0,0,0,3,0,0,0,115,240,4,0,0,9,0,116,
+    0,106,1,124,0,131,1,125,1,110,18,35,0,4,0,116,
+    2,121,23,1,0,1,0,1,0,116,3,100,1,124,0,155,
+    2,157,2,124,0,100,2,141,2,130,1,119,0,37,0,124,
+    1,53,0,1,0,9,0,124,1,160,4,116,5,11,0,100,
+    3,161,2,1,0,124,1,160,6,161,0,125,2,124,1,160,
+    7,116,5,161,1,125,3,110,18,35,0,4,0,116,2,121,
+    62,1,0,1,0,1,0,116,3,100,4,124,0,155,2,157,
+    2,124,0,100,2,141,2,130,1,119,0,37,0,116,8,124,
+    3,131,1,116,5,107,3,114,79,116,3,100,4,124,0,155,
+    2,157,2,124,0,100,2,141,2,130,1,124,3,100,0,100,
+    5,133,2,25,0,116,9,107,3,114,204,9,0,124,1,160,
+    4,100,6,100,3,161,2,1,0,124,1,160,6,161,0,125,
+    4,110,18,35,0,4,0,116,2,121,115,1,0,1,0,1,
     0,116,3,100,4,124,0,155,2,157,2,124,0,100,2,141,
-    2,130,1,37,0,116,8,124,3,131,1,116,5,107,3,114,
-    79,116,3,100,4,124,0,155,2,157,2,124,0,100,2,141,
-    2,130,1,124,3,100,0,100,5,133,2,25,0,116,9,107,
-    3,114,204,9,0,124,1,160,4,100,6,100,3,161,2,1,
-    0,124,1,160,6,161,0,125,4,110,18,35,0,4,0,116,
-    2,144,2,121,121,1,0,1,0,1,0,116,3,100,4,124,
-    0,155,2,157,2,124,0,100,2,141,2,130,1,37,0,116,
-    10,124,4,116,11,24,0,116,5,24,0,100,6,131,2,125,
-    5,9,0,124,1,160,4,124,5,161,1,1,0,124,1,160,
-    7,161,0,125,6,110,18,35,0,4,0,116,2,144,2,121,
-    120,1,0,1,0,1,0,116,3,100,4,124,0,155,2,157,
-    2,124,0,100,2,141,2,130,1,37,0,124,6,160,12,116,
-    9,161,1,125,7,124,7,100,6,107,0,114,173,116,3,100,
-    7,124,0,155,2,157,2,124,0,100,2,141,2,130,1,124,
-    6,124,7,124,7,116,5,23,0,133,2,25,0,125,3,116,
-    8,124,3,131,1,116,5,107,3,114,196,116,3,100,8,124,
-    0,155,2,157,2,124,0,100,2,141,2,130,1,124,4,116,
-    8,124,6,131,1,24,0,124,7,23,0,125,2,116,13,124,
-    3,100,9,100,10,133,2,25,0,131,1,125,8,116,13,124,
-    3,100,10,100,11,133,2,25,0,131,1,125,9,124,2,124,
-    8,107,0,114,233,116,3,100,12,124,0,155,2,157,2,124,
-    0,100,2,141,2,130,1,124,2,124,9,107,0,114,246,116,
-    3,100,13,124,0,155,2,157,2,124,0,100,2,141,2,130,
-    1,124,2,124,8,56,0,125,2,124,2,124,9,24,0,125,
-    10,124,10,100,6,107,0,144,1,114,12,116,3,100,14,124,
-    0,155,2,157,2,124,0,100,2,141,2,130,1,105,0,125,
-    11,100,6,125,12,9,0,124,1,160,4,124,2,161,1,1,
-    0,110,18,35,0,4,0,116,2,144,2,121,119,1,0,1,
-    0,1,0,116,3,100,4,124,0,155,2,157,2,124,0,100,
-    2,141,2,130,1,37,0,9,0,124,1,160,7,100,16,161,
-    1,125,3,116,8,124,3,131,1,100,5,107,0,144,1,114,
-    58,116,14,100,17,131,1,130,1,124,3,100,0,100,5,133,
-    2,25,0,100,18,107,3,144,1,114,69,144,2,113,88,116,
-    8,124,3,131,1,100,16,107,3,144,1,114,80,116,14,100,
-    17,131,1,130,1,116,15,124,3,100,19,100,20,133,2,25,
-    0,131,1,125,13,116,15,124,3,100,20,100,9,133,2,25,
-    0,131,1,125,14,116,15,124,3,100,9,100,21,133,2,25,
-    0,131,1,125,15,116,15,124,3,100,21,100,10,133,2,25,
-    0,131,1,125,16,116,13,124,3,100,10,100,11,133,2,25,
-    0,131,1,125,17,116,13,124,3,100,11,100,22,133,2,25,
-    0,131,1,125,18,116,13,124,3,100,22,100,23,133,2,25,
-    0,131,1,125,4,116,15,124,3,100,23,100,24,133,2,25,
-    0,131,1,125,19,116,15,124,3,100,24,100,25,133,2,25,
-    0,131,1,125,20,116,15,124,3,100,25,100,26,133,2,25,
-    0,131,1,125,21,116,13,124,3,100,27,100,16,133,2,25,
-    0,131,1,125,22,124,19,124,20,23,0,124,21,23,0,125,
-    8,124,22,124,9,107,4,144,1,114,188,116,3,100,28,124,
-    0,155,2,157,2,124,0,100,2,141,2,130,1,124,22,124,
-    10,55,0,125,22,9,0,124,1,160,7,124,19,161,1,125,
-    23,110,18,35,0,4,0,116,2,144,2,121,118,1,0,1,
-    0,1,0,116,3,100,4,124,0,155,2,157,2,124,0,100,
-    2,141,2,130,1,37,0,116,8,124,23,131,1,124,19,107,
-    3,144,1,114,233,116,3,100,4,124,0,155,2,157,2,124,
-    0,100,2,141,2,130,1,9,0,116,8,124,1,160,7,124,
-    8,124,19,24,0,161,1,131,1,124,8,124,19,24,0,107,
-    3,144,2,114,1,116,3,100,4,124,0,155,2,157,2,124,
-    0,100,2,141,2,130,1,110,18,35,0,4,0,116,2,144,
-    2,121,117,1,0,1,0,1,0,116,3,100,4,124,0,155,
-    2,157,2,124,0,100,2,141,2,130,1,37,0,124,13,100,
-    29,64,0,144,2,114,30,124,23,160,16,161,0,125,23,110,
-    26,9,0,124,23,160,16,100,30,161,1,125,23,110,19,35,
-    0,4,0,116,17,144,2,121,116,1,0,1,0,1,0,124,
-    23,160,16,100,31,161,1,160,18,116,19,161,1,125,23,89,
-    0,110,1,37,0,124,23,160,20,100,32,116,21,161,2,125,
+    2,130,1,119,0,37,0,116,10,124,4,116,11,24,0,116,
+    5,24,0,100,6,131,2,125,5,9,0,124,1,160,4,124,
+    5,161,1,1,0,124,1,160,7,161,0,125,6,110,18,35,
+    0,4,0,116,2,121,153,1,0,1,0,1,0,116,3,100,
+    4,124,0,155,2,157,2,124,0,100,2,141,2,130,1,119,
+    0,37,0,124,6,160,12,116,9,161,1,125,7,124,7,100,
+    6,107,0,114,173,116,3,100,7,124,0,155,2,157,2,124,
+    0,100,2,141,2,130,1,124,6,124,7,124,7,116,5,23,
+    0,133,2,25,0,125,3,116,8,124,3,131,1,116,5,107,
+    3,114,196,116,3,100,8,124,0,155,2,157,2,124,0,100,
+    2,141,2,130,1,124,4,116,8,124,6,131,1,24,0,124,
+    7,23,0,125,2,116,13,124,3,100,9,100,10,133,2,25,
+    0,131,1,125,8,116,13,124,3,100,10,100,11,133,2,25,
+    0,131,1,125,9,124,2,124,8,107,0,114,233,116,3,100,
+    12,124,0,155,2,157,2,124,0,100,2,141,2,130,1,124,
+    2,124,9,107,0,114,246,116,3,100,13,124,0,155,2,157,
+    2,124,0,100,2,141,2,130,1,124,2,124,8,56,0,125,
+    2,124,2,124,9,24,0,125,10,124,10,100,6,107,0,144,
+    1,114,12,116,3,100,14,124,0,155,2,157,2,124,0,100,
+    2,141,2,130,1,105,0,125,11,100,6,125,12,9,0,124,
+    1,160,4,124,2,161,1,1,0,110,19,35,0,4,0,116,
+    2,144,1,121,40,1,0,1,0,1,0,116,3,100,4,124,
+    0,155,2,157,2,124,0,100,2,141,2,130,1,119,0,37,
+    0,9,0,124,1,160,7,100,16,161,1,125,3,116,8,124,
+    3,131,1,100,5,107,0,144,1,114,59,116,14,100,17,131,
+    1,130,1,124,3,100,0,100,5,133,2,25,0,100,18,107,
+    3,144,1,114,70,144,2,113,92,116,8,124,3,131,1,100,
+    16,107,3,144,1,114,81,116,14,100,17,131,1,130,1,116,
+    15,124,3,100,19,100,20,133,2,25,0,131,1,125,13,116,
+    15,124,3,100,20,100,9,133,2,25,0,131,1,125,14,116,
+    15,124,3,100,9,100,21,133,2,25,0,131,1,125,15,116,
+    15,124,3,100,21,100,10,133,2,25,0,131,1,125,16,116,
+    13,124,3,100,10,100,11,133,2,25,0,131,1,125,17,116,
+    13,124,3,100,11,100,22,133,2,25,0,131,1,125,18,116,
+    13,124,3,100,22,100,23,133,2,25,0,131,1,125,4,116,
+    15,124,3,100,23,100,24,133,2,25,0,131,1,125,19,116,
+    15,124,3,100,24,100,25,133,2,25,0,131,1,125,20,116,
+    15,124,3,100,25,100,26,133,2,25,0,131,1,125,21,116,
+    13,124,3,100,27,100,16,133,2,25,0,131,1,125,22,124,
+    19,124,20,23,0,124,21,23,0,125,8,124,22,124,9,107,
+    4,144,1,114,189,116,3,100,28,124,0,155,2,157,2,124,
+    0,100,2,141,2,130,1,124,22,124,10,55,0,125,22,9,
+    0,124,1,160,7,124,19,161,1,125,23,110,19,35,0,4,
+    0,116,2,144,1,121,217,1,0,1,0,1,0,116,3,100,
+    4,124,0,155,2,157,2,124,0,100,2,141,2,130,1,119,
+    0,37,0,116,8,124,23,131,1,124,19,107,3,144,1,114,
+    235,116,3,100,4,124,0,155,2,157,2,124,0,100,2,141,
+    2,130,1,9,0,116,8,124,1,160,7,124,8,124,19,24,
+    0,161,1,131,1,124,8,124,19,24,0,107,3,144,2,114,
+    3,116,3,100,4,124,0,155,2,157,2,124,0,100,2,141,
+    2,130,1,110,19,35,0,4,0,116,2,144,2,121,21,1,
+    0,1,0,1,0,116,3,100,4,124,0,155,2,157,2,124,
+    0,100,2,141,2,130,1,119,0,37,0,124,13,100,29,64,
+    0,144,2,114,33,124,23,160,16,161,0,125,23,110,27,9,
+    0,124,23,160,16,100,30,161,1,125,23,110,20,35,0,4,
+    0,116,17,144,2,121,58,1,0,1,0,1,0,124,23,160,
+    16,100,31,161,1,160,18,116,19,161,1,125,23,89,0,110,
+    2,119,0,37,0,124,23,160,20,100,32,116,21,161,2,125,
     23,116,22,106,23,124,0,124,23,131,2,125,24,124,24,124,
     14,124,18,124,4,124,22,124,15,124,16,124,17,102,8,125,
     25,124,25,124,11,124,23,60,0,124,12,100,33,55,0,125,
-    12,144,1,113,42,9,0,100,0,4,0,4,0,131,3,1,
-    0,110,12,35,0,49,0,144,2,115,101,119,4,37,0,1,
+    12,144,1,113,43,9,0,100,0,4,0,4,0,131,3,1,
+    0,110,12,35,0,49,0,144,2,115,105,119,4,37,0,1,
     0,1,0,1,0,89,0,1,0,1,0,116,24,106,25,100,
-    34,124,12,124,0,131,3,1,0,124,11,83,0,119,0,119,
-    0,119,0,119,0,119,0,119,0,119,0,119,0,41,35,78,
+    34,124,12,124,0,131,3,1,0,124,11,83,0,41,35,78,
     122,21,99,97,110,39,116,32,111,112,101,110,32,90,105,112,
     32,102,105,108,101,58,32,114,13,0,0,0,114,97,0,0,
     0,250,21,99,97,110,39,116,32,114,101,97,100,32,90,105,
@@ -884,62 +882,61 @@ const unsigned char _Py_M__zipimport[] = {
     32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
     32,32,32,32,32,32,32,32,32,114,11,0,0,0,114,28,
     0,0,0,114,28,0,0,0,146,1,0,0,115,18,1,0,
-    0,2,1,12,1,2,128,14,1,18,1,2,128,6,2,2,
-    1,14,1,8,1,12,1,2,128,14,1,18,1,2,128,12,
-    1,18,1,16,1,2,3,12,1,10,1,2,128,14,1,10,
-    1,2,1,6,255,2,128,8,2,2,1,2,255,2,1,4,
-    255,2,2,10,1,10,1,2,128,14,1,10,1,2,1,6,
-    255,2,128,10,2,8,1,10,1,2,1,6,255,16,2,12,
-    1,10,1,2,1,6,255,16,2,16,2,16,1,8,1,18,
-    1,8,1,18,1,8,1,8,1,10,1,18,1,4,2,4,
-    2,2,1,12,1,2,128,14,1,18,1,2,128,2,1,10,
-    1,14,1,8,1,18,2,4,1,14,1,8,1,16,1,16,
-    1,16,1,16,1,16,1,16,1,16,1,16,1,16,1,16,
-    1,16,1,12,1,10,1,18,1,8,1,2,2,12,1,2,
-    128,14,1,18,1,2,128,14,1,18,1,2,4,28,1,18,
-    1,2,255,2,128,14,2,18,1,2,128,10,2,10,2,2,
-    3,12,1,2,128,14,1,20,1,2,128,12,2,12,1,20,
+    0,2,1,12,1,2,128,12,1,18,1,2,255,2,128,6,
+    3,2,1,14,1,8,1,12,1,2,128,12,1,18,1,2,
+    255,2,128,12,2,18,1,16,1,2,3,12,1,10,1,2,
+    128,12,1,10,1,2,1,6,255,2,255,2,128,8,3,2,
+    1,2,255,2,1,4,255,2,2,10,1,10,1,2,128,12,
+    1,10,1,2,1,6,255,2,255,2,128,10,3,8,1,10,
+    1,2,1,6,255,16,2,12,1,10,1,2,1,6,255,16,
+    2,16,2,16,1,8,1,18,1,8,1,18,1,8,1,8,
+    1,10,1,18,1,4,2,4,2,2,1,12,1,2,128,14,
+    1,18,1,2,255,2,128,2,2,10,1,14,1,8,1,18,
+    2,4,1,14,1,8,1,16,1,16,1,16,1,16,1,16,
+    1,16,1,16,1,16,1,16,1,16,1,16,1,12,1,10,
+    1,18,1,8,1,2,2,12,1,2,128,14,1,18,1,2,
+    255,2,128,14,2,18,1,2,4,28,1,18,1,2,255,2,
+    128,14,2,18,1,2,255,2,128,10,3,10,2,2,3,12,
+    1,2,128,14,1,20,1,2,255,2,128,12,3,12,1,20,
     1,8,1,8,1,4,202,2,6,22,196,2,128,12,0,14,
-    109,4,1,2,247,2,246,2,246,2,227,2,227,2,248,2,
-    246,2,248,115,34,1,0,0,2,4,12,254,2,128,2,2,
+    109,4,1,115,18,1,0,0,2,4,12,254,2,128,2,2,
     2,255,28,1,2,128,2,2,4,108,2,154,14,252,8,1,
     12,1,2,128,2,2,2,255,28,1,2,128,10,1,20,1,
     14,1,2,25,2,239,12,252,10,1,2,128,2,3,2,254,
-    10,2,10,255,8,1,2,128,8,1,8,1,2,255,2,7,
-    10,252,10,1,2,128,2,3,2,254,10,2,10,255,8,1,
+    8,2,10,255,10,1,2,128,8,1,8,1,2,255,2,7,
+    10,252,10,1,2,128,2,3,2,254,8,2,10,255,10,1,
     2,128,10,1,6,1,2,2,10,255,8,1,16,1,10,1,
     2,2,10,255,8,1,16,1,16,2,16,1,6,1,20,1,
     6,1,20,1,8,1,8,1,6,1,22,1,4,2,4,2,
-    2,4,12,254,2,128,2,2,2,255,28,1,2,128,2,1,
+    2,4,12,254,2,128,2,2,2,255,30,1,2,128,2,1,
     10,1,10,1,12,1,14,2,8,1,10,1,12,1,16,1,
     16,1,16,1,16,1,16,1,16,1,16,1,16,1,16,1,
     16,1,16,1,12,1,6,1,22,1,8,1,2,5,12,254,
-    2,128,2,2,2,255,28,1,2,128,10,1,22,1,2,8,
-    24,253,24,1,2,128,2,2,2,255,28,1,2,128,6,2,
-    4,8,10,250,2,6,12,254,2,128,2,2,2,255,30,1,
+    2,128,2,2,2,255,30,1,2,128,10,1,22,1,2,8,
+    24,253,24,1,2,128,2,2,2,255,30,1,2,128,6,2,
+    4,8,10,250,2,6,12,254,2,128,2,2,2,255,32,1,
     2,128,12,2,12,1,20,1,8,1,8,1,4,202,2,6,
-    22,48,2,128,12,0,14,1,4,1,2,248,2,246,2,246,
-    2,227,2,228,2,248,2,245,2,248,115,248,4,0,0,5,
+    22,48,2,128,12,0,14,1,4,1,115,240,4,0,0,5,
     80,14,17,14,27,28,35,14,36,9,11,9,11,0,0,5,
-    80,12,19,5,80,5,80,5,80,5,80,5,80,15,29,30,
-    65,31,38,30,65,30,65,72,79,15,80,15,80,9,80,0,
+    80,12,19,5,80,5,80,5,80,5,80,15,29,30,65,31,
+    38,30,65,30,65,72,79,15,80,15,80,9,80,5,80,0,
     0,10,12,5,23,5,23,9,84,13,15,13,46,22,42,21,
     42,44,45,13,46,13,46,31,33,31,40,31,40,13,28,22,
     24,22,51,30,50,22,51,13,19,13,19,0,0,9,84,16,
-    23,9,84,9,84,9,84,9,84,9,84,19,33,34,69,35,
-    42,34,69,34,69,76,83,19,84,19,84,13,84,0,0,12,
+    23,9,84,9,84,9,84,9,84,19,33,34,69,35,42,34,
+    69,34,69,76,83,19,84,19,84,13,84,9,84,0,0,12,
     15,16,22,12,23,27,47,12,47,9,84,19,33,34,69,35,
     42,34,69,34,69,76,83,19,84,19,84,13,84,12,18,19,
     21,20,21,19,21,12,22,26,44,12,44,9,58,13,51,17,
     19,17,30,25,26,28,29,17,30,17,30,29,31,29,38,29,
     38,17,26,17,26,0,0,13,51,20,27,13,51,13,51,13,
-    51,13,51,13,51,23,37,38,73,39,46,38,73,38,73,43,
-    50,23,51,23,51,17,51,0,0,33,36,37,46,49,64,37,
+    51,13,51,23,37,38,73,39,46,38,73,38,73,43,50,23,
+    51,23,51,17,51,13,51,0,0,33,36,37,46,49,64,37,
     64,37,57,37,57,59,60,33,61,13,30,13,51,17,19,17,
     43,25,42,17,43,17,43,24,26,24,33,24,33,17,21,17,
-    21,0,0,13,51,20,27,13,51,13,51,13,51,13,51,13,
-    51,23,37,38,73,39,46,38,73,38,73,43,50,23,51,23,
-    51,17,51,0,0,19,23,19,49,30,48,19,49,13,16,16,
+    21,0,0,13,51,20,27,13,51,13,51,13,51,13,51,23,
+    37,38,73,39,46,38,73,38,73,43,50,23,51,23,51,17,
+    51,13,51,0,0,19,23,19,49,30,48,19,49,13,16,16,
     19,22,23,16,23,13,51,23,37,38,68,39,46,38,68,38,
     68,43,50,23,51,23,51,17,51,22,26,27,30,31,34,35,
     55,31,55,27,55,22,56,13,19,16,19,20,26,16,27,31,
@@ -956,156 +953,153 @@ const unsigned char _Py_M__zipimport[] = {
     100,19,101,19,101,13,101,17,19,9,14,17,18,9,14,9,
     84,13,15,13,37,21,36,13,37,13,37,13,37,0,0,9,
     84,16,23,9,84,9,84,9,84,9,84,9,84,19,33,34,
-    69,35,42,34,69,34,69,76,83,19,84,19,84,13,84,0,
-    0,15,19,22,24,22,33,30,32,22,33,13,19,16,19,20,
-    26,16,27,30,31,16,31,13,62,13,62,23,31,32,61,23,
-    62,17,62,16,22,23,25,24,25,23,25,16,26,30,43,16,
-    43,13,22,13,22,17,22,17,22,16,19,20,26,16,27,31,
-    33,16,33,13,62,13,62,23,31,32,61,23,62,17,62,21,
-    35,36,42,43,44,45,47,43,47,36,48,21,49,13,18,24,
-    38,39,45,46,48,49,51,46,51,39,52,24,53,13,21,20,
-    34,35,41,42,44,45,47,42,47,35,48,20,49,13,17,20,
-    34,35,41,42,44,45,47,42,47,35,48,20,49,13,17,19,
-    33,34,40,41,43,44,46,41,46,34,47,19,48,13,16,25,
-    39,40,46,47,49,50,52,47,52,40,53,25,54,13,22,25,
-    39,40,46,47,49,50,52,47,52,40,53,25,54,13,22,25,
-    39,40,46,47,49,50,52,47,52,40,53,25,54,13,22,26,
-    40,41,47,48,50,51,53,48,53,41,54,26,55,13,23,28,
-    42,43,49,50,52,53,55,50,55,43,56,28,57,13,25,27,
-    41,42,48,49,51,52,54,49,54,42,55,27,56,13,24,27,
-    36,39,49,27,49,52,64,27,64,13,24,16,27,30,43,16,
-    43,13,92,13,92,23,37,38,77,39,46,38,77,38,77,84,
-    91,23,92,23,92,17,92,13,24,28,38,13,38,13,24,13,
-    88,24,26,24,42,32,41,24,42,17,21,17,21,0,0,13,
-    88,20,27,13,88,13,88,13,88,13,88,13,88,23,37,38,
-    73,39,46,38,73,38,73,80,87,23,88,23,88,17,88,0,
-    0,16,19,20,24,16,25,29,38,16,38,13,88,13,88,23,
+    69,35,42,34,69,34,69,76,83,19,84,19,84,13,84,9,
+    84,0,0,15,19,22,24,22,33,30,32,22,33,13,19,16,
+    19,20,26,16,27,30,31,16,31,13,62,13,62,23,31,32,
+    61,23,62,17,62,16,22,23,25,24,25,23,25,16,26,30,
+    43,16,43,13,22,13,22,17,22,17,22,16,19,20,26,16,
+    27,31,33,16,33,13,62,13,62,23,31,32,61,23,62,17,
+    62,21,35,36,42,43,44,45,47,43,47,36,48,21,49,13,
+    18,24,38,39,45,46,48,49,51,46,51,39,52,24,53,13,
+    21,20,34,35,41,42,44,45,47,42,47,35,48,20,49,13,
+    17,20,34,35,41,42,44,45,47,42,47,35,48,20,49,13,
+    17,19,33,34,40,41,43,44,46,41,46,34,47,19,48,13,
+    16,25,39,40,46,47,49,50,52,47,52,40,53,25,54,13,
+    22,25,39,40,46,47,49,50,52,47,52,40,53,25,54,13,
+    22,25,39,40,46,47,49,50,52,47,52,40,53,25,54,13,
+    22,26,40,41,47,48,50,51,53,48,53,41,54,26,55,13,
+    23,28,42,43,49,50,52,53,55,50,55,43,56,28,57,13,
+    25,27,41,42,48,49,51,52,54,49,54,42,55,27,56,13,
+    24,27,36,39,49,27,49,52,64,27,64,13,24,16,27,30,
+    43,16,43,13,92,13,92,23,37,38,77,39,46,38,77,38,
+    77,84,91,23,92,23,92,17,92,13,24,28,38,13,38,13,
+    24,13,88,24,26,24,42,32,41,24,42,17,21,17,21,0,
+    0,13,88,20,27,13,88,13,88,13,88,13,88,13,88,23,
     37,38,73,39,46,38,73,38,73,80,87,23,88,23,88,17,
-    88,13,88,20,23,24,26,24,56,32,43,46,55,32,55,24,
-    56,20,57,61,72,75,84,61,84,20,84,17,92,17,92,27,
-    41,42,77,43,50,42,77,42,77,84,91,27,92,27,92,21,
-    92,17,92,0,0,13,88,20,27,13,88,13,88,13,88,13,
+    88,13,88,0,0,16,19,20,24,16,25,29,38,16,38,13,
     88,13,88,23,37,38,73,39,46,38,73,38,73,80,87,23,
-    88,23,88,17,88,0,0,16,21,24,29,16,29,13,72,13,
-    72,24,28,24,37,24,37,17,21,17,21,17,72,28,32,28,
-    48,40,47,28,48,21,25,21,25,0,0,17,72,24,42,17,
-    72,17,72,17,72,17,72,17,72,28,32,28,49,40,48,28,
-    49,28,72,60,71,28,72,21,25,21,25,21,25,0,0,20,
-    24,20,47,33,36,38,46,20,47,13,17,20,39,20,50,51,
-    58,60,64,20,65,13,17,18,22,24,32,34,43,45,54,56,
-    67,69,73,75,79,81,84,17,85,13,14,27,28,13,18,19,
-    23,13,24,13,18,22,23,13,23,13,18,15,19,15,19,17,
-    22,5,23,5,23,5,23,5,23,5,23,5,23,5,23,5,
-    23,5,23,5,23,5,23,0,0,5,23,5,23,5,23,5,
-    23,5,23,5,23,5,15,5,32,33,68,70,75,77,84,5,
-    85,5,85,12,17,5,17,17,72,13,88,13,88,9,84,13,
-    51,13,51,9,84,5,80,115,235,0,0,0,129,5,7,0,
-    135,17,24,7,155,1,73,31,3,157,16,46,2,173,1,73,
-    31,3,174,17,63,9,191,24,73,31,3,193,24,10,65,35,
-    2,193,34,1,73,31,3,193,35,17,65,52,9,193,52,10,
-    73,31,3,193,63,9,66,9,2,194,8,1,73,31,3,194,
-    9,17,66,26,9,194,26,65,54,73,31,3,196,17,5,68,
-    23,2,196,22,1,73,31,3,196,23,17,68,40,9,196,40,
-    66,24,73,31,3,199,1,5,71,7,2,199,6,1,73,31,
-    3,199,7,17,71,24,9,199,24,17,73,31,3,199,42,23,
-    72,2,2,200,1,1,73,31,3,200,2,17,72,19,9,200,
-    19,11,73,31,3,200,31,5,72,37,2,200,36,1,73,31,
-    3,200,37,16,72,55,9,200,53,35,73,31,3,201,31,5,
-    73,36,11,201,37,3,73,36,11,201,52,1,72,55,9,201,
-    53,1,72,19,9,201,54,1,71,24,9,201,55,1,68,40,
-    9,201,56,1,66,26,9,201,57,1,65,52,9,201,58,1,
-    63,9,201,59,1,24,7,117,190,1,0,0,0,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,30,31,32,33,34,35,
-    36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,
-    52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,
-    68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,
-    84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,
-    100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,
-    116,117,118,119,120,121,122,123,124,125,126,127,195,135,195,188,
-    195,169,195,162,195,164,195,160,195,165,195,167,195,170,195,171,
-    195,168,195,175,195,174,195,172,195,132,195,133,195,137,195,166,
-    195,134,195,180,195,182,195,178,195,187,195,185,195,191,195,150,
-    195,156,194,162,194,163,194,165,226,130,167,198,146,195,161,195,
-    173,195,179,195,186,195,177,195,145,194,170,194,186,194,191,226,
-    140,144,194,172,194,189,194,188,194,161,194,171,194,187,226,150,
-    145,226,150,146,226,150,147,226,148,130,226,148,164,226,149,161,
-    226,149,162,226,149,150,226,149,149,226,149,163,226,149,145,226,
-    149,151,226,149,157,226,149,156,226,149,155,226,148,144,226,148,
-    148,226,148,180,226,148,172,226,148,156,226,148,128,226,148,188,
-    226,149,158,226,149,159,226,149,154,226,149,148,226,149,169,226,
-    149,166,226,149,160,226,149,144,226,149,172,226,149,167,226,149,
-    168,226,149,164,226,149,165,226,149,153,226,149,152,226,149,146,
-    226,149,147,226,149,171,226,149,170,226,148,152,226,148,140,226,
-    150,136,226,150,132,226,150,140,226,150,144,226,150,128,206,177,
-    195,159,206,147,207,128,206,163,207,131,194,181,207,132,206,166,
-    206,152,206,169,206,180,226,136,158,207,134,206,181,226,136,169,
-    226,137,161,194,177,226,137,165,226,137,164,226,140,160,226,140,
-    161,195,183,226,137,136,194,176,226,136,153,194,183,226,136,154,
-    226,129,191,194,178,226,150,160,194,160,99,0,0,0,0,0,
-    0,0,0,0,0,0,0,8,0,0,0,3,0,0,0,115,
-    110,0,0,0,116,0,114,11,116,1,106,2,100,1,131,1,
-    1,0,116,3,100,2,131,1,130,1,100,3,97,0,9,0,
-    100,4,100,5,108,4,109,5,125,0,1,0,110,17,35,0,
-    4,0,116,6,121,54,1,0,1,0,1,0,116,1,106,2,
-    100,1,131,1,1,0,116,3,100,2,131,1,130,1,37,0,
-    9,0,100,6,97,0,110,5,35,0,100,6,97,0,119,0,
-    37,0,116,1,106,2,100,7,131,1,1,0,124,0,83,0,
-    119,0,41,8,78,122,27,122,105,112,105,109,112,111,114,116,
-    58,32,122,108,105,98,32,85,78,65,86,65,73,76,65,66,
-    76,69,250,41,99,97,110,39,116,32,100,101,99,111,109,112,
-    114,101,115,115,32,100,97,116,97,59,32,122,108,105,98,32,
-    110,111,116,32,97,118,97,105,108,97,98,108,101,84,114,0,
-    0,0,0,169,1,218,10,100,101,99,111,109,112,114,101,115,
-    115,70,122,25,122,105,112,105,109,112,111,114,116,58,32,122,
-    108,105,98,32,97,118,97,105,108,97,98,108,101,41,7,218,
-    15,95,105,109,112,111,114,116,105,110,103,95,122,108,105,98,
-    114,49,0,0,0,114,84,0,0,0,114,3,0,0,0,90,
-    4,122,108,105,98,114,153,0,0,0,218,9,69,120,99,101,
-    112,116,105,111,110,114,152,0,0,0,115,1,0,0,0,32,
-    114,11,0,0,0,218,20,95,103,101,116,95,100,101,99,111,
-    109,112,114,101,115,115,95,102,117,110,99,114,156,0,0,0,
-    48,2,0,0,115,36,0,0,0,4,2,10,3,8,1,4,
-    2,2,1,14,1,2,128,12,1,10,1,8,1,2,128,2,
-    253,6,5,2,128,8,0,10,2,4,1,2,249,115,42,0,
-    0,0,2,2,2,4,10,255,8,1,4,2,2,7,14,251,
-    2,128,2,3,2,254,8,2,10,255,8,1,2,128,2,253,
-    6,5,2,128,8,0,10,2,4,1,2,251,115,110,0,0,
-    0,8,23,5,74,9,19,9,36,37,66,9,67,9,67,15,
-    29,30,73,15,74,9,74,23,27,5,20,5,32,9,36,9,
-    36,9,36,9,36,9,36,9,36,9,36,0,0,5,74,12,
-    21,5,74,5,74,5,74,5,74,9,19,9,36,37,66,9,
-    67,9,67,15,29,30,73,15,74,9,74,0,0,9,36,27,
-    32,9,24,9,24,0,0,27,32,9,24,9,32,9,32,5,
-    15,5,32,33,60,5,61,5,61,12,22,5,22,5,74,115,
-    24,0,0,0,142,6,21,0,148,1,42,0,149,16,37,7,
-    165,1,42,0,170,4,46,7,182,1,37,7,99,2,0,0,
+    88,23,88,17,88,13,88,20,23,24,26,24,56,32,43,46,
+    55,32,55,24,56,20,57,61,72,75,84,61,84,20,84,17,
+    92,17,92,27,41,42,77,43,50,42,77,42,77,84,91,27,
+    92,27,92,21,92,17,92,0,0,13,88,20,27,13,88,13,
+    88,13,88,13,88,13,88,23,37,38,73,39,46,38,73,38,
+    73,80,87,23,88,23,88,17,88,13,88,0,0,16,21,24,
+    29,16,29,13,72,13,72,24,28,24,37,24,37,17,21,17,
+    21,17,72,28,32,28,48,40,47,28,48,21,25,21,25,0,
+    0,17,72,24,42,17,72,17,72,17,72,17,72,17,72,28,
+    32,28,49,40,48,28,49,28,72,60,71,28,72,21,25,21,
+    25,21,25,17,72,0,0,20,24,20,47,33,36,38,46,20,
+    47,13,17,20,39,20,50,51,58,60,64,20,65,13,17,18,
+    22,24,32,34,43,45,54,56,67,69,73,75,79,81,84,17,
+    85,13,14,27,28,13,18,19,23,13,24,13,18,22,23,13,
+    23,13,18,15,19,15,19,17,22,5,23,5,23,5,23,5,
+    23,5,23,5,23,5,23,5,23,5,23,5,23,5,23,0,
+    0,5,23,5,23,5,23,5,23,5,23,5,23,5,15,5,
+    32,33,68,70,75,77,84,5,85,5,85,12,17,5,17,115,
+    201,0,0,0,129,5,7,0,135,17,24,7,155,1,73,35,
+    3,157,16,46,2,173,1,73,35,3,174,17,63,9,191,24,
+    73,35,3,193,24,10,65,35,2,193,34,1,73,35,3,193,
+    35,17,65,52,9,193,52,10,73,35,3,193,63,9,66,9,
+    2,194,8,1,73,35,3,194,9,17,66,26,9,194,26,65,
+    54,73,35,3,196,17,5,68,23,2,196,22,1,73,35,3,
+    196,23,18,68,41,9,196,41,66,24,73,35,3,199,2,5,
+    71,8,2,199,7,1,73,35,3,199,8,18,71,26,9,199,
+    26,17,73,35,3,199,44,23,72,4,2,200,3,1,73,35,
+    3,200,4,18,72,22,9,200,22,11,73,35,3,200,34,5,
+    72,40,2,200,39,1,73,35,3,200,40,16,72,59,9,200,
+    56,2,73,35,3,200,58,1,72,59,9,200,59,33,73,35,
+    3,201,35,5,73,40,11,201,41,3,73,40,11,117,190,1,
+    0,0,0,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,
+    30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,
+    46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,
+    62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,
+    78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,
+    94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,
+    110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,
+    126,127,195,135,195,188,195,169,195,162,195,164,195,160,195,165,
+    195,167,195,170,195,171,195,168,195,175,195,174,195,172,195,132,
+    195,133,195,137,195,166,195,134,195,180,195,182,195,178,195,187,
+    195,185,195,191,195,150,195,156,194,162,194,163,194,165,226,130,
+    167,198,146,195,161,195,173,195,179,195,186,195,177,195,145,194,
+    170,194,186,194,191,226,140,144,194,172,194,189,194,188,194,161,
+    194,171,194,187,226,150,145,226,150,146,226,150,147,226,148,130,
+    226,148,164,226,149,161,226,149,162,226,149,150,226,149,149,226,
+    149,163,226,149,145,226,149,151,226,149,157,226,149,156,226,149,
+    155,226,148,144,226,148,148,226,148,180,226,148,172,226,148,156,
+    226,148,128,226,148,188,226,149,158,226,149,159,226,149,154,226,
+    149,148,226,149,169,226,149,166,226,149,160,226,149,144,226,149,
+    172,226,149,167,226,149,168,226,149,164,226,149,165,226,149,153,
+    226,149,152,226,149,146,226,149,147,226,149,171,226,149,170,226,
+    148,152,226,148,140,226,150,136,226,150,132,226,150,140,226,150,
+    144,226,150,128,206,177,195,159,206,147,207,128,206,163,207,131,
+    194,181,207,132,206,166,206,152,206,169,206,180,226,136,158,207,
+    134,206,181,226,136,169,226,137,161,194,177,226,137,165,226,137,
+    164,226,140,160,226,140,161,195,183,226,137,136,194,176,226,136,
+    153,194,183,226,136,154,226,129,191,194,178,226,150,160,194,160,
+    99,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,
+    0,3,0,0,0,115,110,0,0,0,116,0,114,11,116,1,
+    106,2,100,1,131,1,1,0,116,3,100,2,131,1,130,1,
+    100,3,97,0,9,0,100,4,100,5,108,4,109,5,125,0,
+    1,0,110,18,35,0,4,0,116,6,121,37,1,0,1,0,
+    1,0,116,1,106,2,100,1,131,1,1,0,116,3,100,2,
+    131,1,130,1,119,0,37,0,9,0,100,6,97,0,110,5,
+    35,0,100,6,97,0,119,0,37,0,116,1,106,2,100,7,
+    131,1,1,0,124,0,83,0,41,8,78,122,27,122,105,112,
+    105,109,112,111,114,116,58,32,122,108,105,98,32,85,78,65,
+    86,65,73,76,65,66,76,69,250,41,99,97,110,39,116,32,
+    100,101,99,111,109,112,114,101,115,115,32,100,97,116,97,59,
+    32,122,108,105,98,32,110,111,116,32,97,118,97,105,108,97,
+    98,108,101,84,114,0,0,0,0,169,1,218,10,100,101,99,
+    111,109,112,114,101,115,115,70,122,25,122,105,112,105,109,112,
+    111,114,116,58,32,122,108,105,98,32,97,118,97,105,108,97,
+    98,108,101,41,7,218,15,95,105,109,112,111,114,116,105,110,
+    103,95,122,108,105,98,114,49,0,0,0,114,84,0,0,0,
+    114,3,0,0,0,90,4,122,108,105,98,114,153,0,0,0,
+    218,9,69,120,99,101,112,116,105,111,110,114,152,0,0,0,
+    115,1,0,0,0,32,114,11,0,0,0,218,20,95,103,101,
+    116,95,100,101,99,111,109,112,114,101,115,115,95,102,117,110,
+    99,114,156,0,0,0,48,2,0,0,115,36,0,0,0,4,
+    2,10,3,8,1,4,2,2,1,14,1,2,128,12,1,10,
+    1,8,1,2,254,2,128,2,255,6,5,2,128,8,0,10,
+    2,4,1,115,40,0,0,0,2,2,2,4,10,255,8,1,
+    4,2,2,7,14,251,2,128,2,3,2,254,8,2,10,255,
+    10,1,2,128,2,253,6,5,2,128,8,0,10,2,4,1,
+    115,110,0,0,0,8,23,5,74,9,19,9,36,37,66,9,
+    67,9,67,15,29,30,73,15,74,9,74,23,27,5,20,5,
+    32,9,36,9,36,9,36,9,36,9,36,9,36,9,36,0,
+    0,5,74,12,21,5,74,5,74,5,74,5,74,9,19,9,
+    36,37,66,9,67,9,67,15,29,30,73,15,74,9,74,5,
+    74,0,0,9,36,27,32,9,24,9,24,0,0,27,32,9,
+    24,9,32,9,32,5,15,5,32,33,60,5,61,5,61,12,
+    22,5,22,115,20,0,0,0,142,6,21,0,148,1,43,0,
+    149,17,38,7,166,1,43,0,171,4,47,7,99,2,0,0,
     0,0,0,0,0,0,0,0,0,9,0,0,0,3,0,0,
     0,115,132,1,0,0,124,1,92,8,125,2,125,3,125,4,
     125,5,125,6,125,7,125,8,125,9,124,4,100,1,107,0,
     114,18,116,0,100,2,131,1,130,1,116,1,106,2,124,0,
     131,1,53,0,125,10,9,0,124,10,160,3,124,6,161,1,
-    1,0,110,17,35,0,4,0,116,4,121,193,1,0,1,0,
+    1,0,110,18,35,0,4,0,116,4,121,47,1,0,1,0,
     1,0,116,0,100,3,124,0,155,2,157,2,124,0,100,4,
-    141,2,130,1,37,0,124,10,160,5,100,5,161,1,125,11,
-    116,6,124,11,131,1,100,5,107,3,114,63,116,7,100,6,
-    131,1,130,1,124,11,100,0,100,7,133,2,25,0,100,8,
-    107,3,114,80,116,0,100,9,124,0,155,2,157,2,124,0,
-    100,4,141,2,130,1,116,8,124,11,100,10,100,11,133,2,
-    25,0,131,1,125,12,116,8,124,11,100,11,100,5,133,2,
-    25,0,131,1,125,13,100,5,124,12,23,0,124,13,23,0,
-    125,14,124,6,124,14,55,0,125,6,9,0,124,10,160,3,
-    124,6,161,1,1,0,110,17,35,0,4,0,116,4,121,192,
-    1,0,1,0,1,0,116,0,100,3,124,0,155,2,157,2,
-    124,0,100,4,141,2,130,1,37,0,124,10,160,5,124,4,
-    161,1,125,15,116,6,124,15,131,1,124,4,107,3,114,145,
-    116,4,100,12,131,1,130,1,9,0,100,0,4,0,4,0,
-    131,3,1,0,110,11,35,0,49,0,115,157,119,4,37,0,
-    1,0,1,0,1,0,89,0,1,0,1,0,124,3,100,1,
-    107,2,114,169,124,15,83,0,9,0,116,9,131,0,125,16,
-    110,12,35,0,4,0,116,10,121,191,1,0,1,0,1,0,
-    116,0,100,13,131,1,130,1,37,0,124,16,124,15,100,14,
-    131,2,83,0,119,0,119,0,119,0,41,15,78,114,0,0,
+    141,2,130,1,119,0,37,0,124,10,160,5,100,5,161,1,
+    125,11,116,6,124,11,131,1,100,5,107,3,114,64,116,7,
+    100,6,131,1,130,1,124,11,100,0,100,7,133,2,25,0,
+    100,8,107,3,114,81,116,0,100,9,124,0,155,2,157,2,
+    124,0,100,4,141,2,130,1,116,8,124,11,100,10,100,11,
+    133,2,25,0,131,1,125,12,116,8,124,11,100,11,100,5,
+    133,2,25,0,131,1,125,13,100,5,124,12,23,0,124,13,
+    23,0,125,14,124,6,124,14,55,0,125,6,9,0,124,10,
+    160,3,124,6,161,1,1,0,110,18,35,0,4,0,116,4,
+    121,130,1,0,1,0,1,0,116,0,100,3,124,0,155,2,
+    157,2,124,0,100,4,141,2,130,1,119,0,37,0,124,10,
+    160,5,124,4,161,1,125,15,116,6,124,15,131,1,124,4,
+    107,3,114,147,116,4,100,12,131,1,130,1,9,0,100,0,
+    4,0,4,0,131,3,1,0,110,11,35,0,49,0,115,159,
+    119,4,37,0,1,0,1,0,1,0,89,0,1,0,1,0,
+    124,3,100,1,107,2,114,171,124,15,83,0,9,0,116,9,
+    131,0,125,16,110,13,35,0,4,0,116,10,121,187,1,0,
+    1,0,1,0,116,0,100,13,131,1,130,1,119,0,37,0,
+    124,16,124,15,100,14,131,2,83,0,41,15,78,114,0,0,
     0,0,122,18,110,101,103,97,116,105,118,101,32,100,97,116,
     97,32,115,105,122,101,114,104,0,0,0,114,13,0,0,0,
     114,116,0,0,0,114,110,0,0,0,114,105,0,0,0,115,
@@ -1127,293 +1121,291 @@ const unsigned char _Py_M__zipimport[] = {
     32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
     32,114,11,0,0,0,114,61,0,0,0,114,61,0,0,0,
     69,2,0,0,115,88,0,0,0,20,1,8,1,8,1,12,
-    2,2,2,12,1,2,128,12,1,18,1,2,128,10,1,12,
-    1,8,1,16,2,18,2,16,2,16,1,12,1,8,1,2,
-    1,12,1,2,128,12,1,18,1,2,128,10,1,12,1,8,
-    1,2,255,20,233,2,128,12,0,8,26,4,2,2,3,8,
-    1,2,128,12,1,8,1,2,128,10,1,2,254,2,243,2,
-    240,115,94,0,0,0,20,1,6,1,10,1,8,2,2,24,
-    2,232,2,5,12,254,2,128,2,2,2,255,26,1,2,128,
+    2,2,2,12,1,2,128,12,1,18,1,2,255,2,128,10,
+    2,12,1,8,1,16,2,18,2,16,2,16,1,12,1,8,
+    1,2,1,12,1,2,128,12,1,18,1,2,255,2,128,10,
+    2,12,1,8,1,2,255,20,233,2,128,12,0,8,26,4,
+    2,2,3,8,1,2,128,12,1,8,1,2,255,2,128,10,
+    2,115,88,0,0,0,20,1,6,1,10,1,8,2,2,24,
+    2,232,2,5,12,254,2,128,2,2,2,255,28,1,2,128,
     10,1,10,1,10,1,14,2,20,2,16,2,16,1,12,1,
-    8,1,2,4,12,254,2,128,2,2,2,255,26,1,2,128,
+    8,1,2,4,12,254,2,128,2,2,2,255,28,1,2,128,
     10,1,10,1,32,1,2,128,12,0,6,2,6,2,2,6,
-    8,254,2,128,2,2,2,255,16,1,2,128,10,1,2,255,
-    2,243,2,240,115,132,1,0,0,78,87,5,75,5,13,15,
-    23,25,34,36,45,47,58,60,64,66,70,72,75,8,17,20,
-    21,8,21,5,51,15,29,30,50,15,51,9,51,10,13,10,
-    23,24,31,10,32,5,56,36,38,9,84,13,15,13,33,21,
+    8,254,2,128,2,2,2,255,18,1,2,128,10,1,115,132,
+    1,0,0,78,87,5,75,5,13,15,23,25,34,36,45,47,
+    58,60,64,66,70,72,75,8,17,20,21,8,21,5,51,15,
+    29,30,50,15,51,9,51,10,13,10,23,24,31,10,32,5,
+    56,36,38,9,84,13,15,13,33,21,32,13,33,13,33,13,
+    33,0,0,9,84,16,23,9,84,9,84,9,84,9,84,19,
+    33,34,69,35,42,34,69,34,69,76,83,19,84,19,84,13,
+    84,9,84,0,0,18,20,18,29,26,28,18,29,9,15,12,
+    15,16,22,12,23,27,29,12,29,9,58,19,27,28,57,19,
+    58,13,58,12,18,19,21,20,21,19,21,12,22,26,39,12,
+    39,9,86,19,33,34,71,35,42,34,71,34,71,78,85,19,
+    86,19,86,13,86,21,35,36,42,43,45,46,48,43,48,36,
+    49,21,50,9,18,22,36,37,43,44,46,47,49,44,49,37,
+    50,22,51,9,19,23,25,28,37,23,37,40,50,23,50,9,
+    20,9,20,24,35,9,35,9,20,9,84,13,15,13,33,21,
     32,13,33,13,33,13,33,0,0,9,84,16,23,9,84,9,
     84,9,84,9,84,19,33,34,69,35,42,34,69,34,69,76,
-    83,19,84,19,84,13,84,0,0,18,20,18,29,26,28,18,
-    29,9,15,12,15,16,22,12,23,27,29,12,29,9,58,19,
-    27,28,57,19,58,13,58,12,18,19,21,20,21,19,21,12,
-    22,26,39,12,39,9,86,19,33,34,71,35,42,34,71,34,
-    71,78,85,19,86,19,86,13,86,21,35,36,42,43,45,46,
-    48,43,48,36,49,21,50,9,18,22,36,37,43,44,46,47,
-    49,44,49,37,50,22,51,9,19,23,25,28,37,23,37,40,
-    50,23,50,9,20,9,20,24,35,9,35,9,20,9,84,13,
-    15,13,33,21,32,13,33,13,33,13,33,0,0,9,84,16,
-    23,9,84,9,84,9,84,9,84,19,33,34,69,35,42,34,
-    69,34,69,76,83,19,84,19,84,13,84,0,0,20,22,20,
-    38,28,37,20,38,9,17,12,15,16,24,12,25,29,38,12,
-    38,9,56,19,26,27,55,19,56,13,56,9,56,5,56,5,
-    56,5,56,5,56,5,56,5,56,5,56,5,56,5,56,5,
-    56,0,0,5,56,5,56,5,56,5,56,5,56,5,56,8,
-    16,20,21,8,21,5,24,16,24,9,24,5,74,22,42,22,
-    44,9,19,9,19,0,0,5,74,12,21,5,74,5,74,5,
-    74,5,74,15,29,30,73,15,74,9,74,0,0,12,22,23,
-    31,33,36,12,37,5,37,5,74,9,84,9,84,115,88,0,
-    0,0,151,1,66,24,3,153,5,31,2,158,1,66,24,3,
-    159,16,47,9,175,59,66,24,3,193,43,5,65,49,2,193,
-    48,1,66,24,3,193,49,16,66,1,9,194,1,16,66,24,
-    3,194,24,4,66,28,11,194,29,3,66,28,11,194,42,3,
-    66,46,0,194,46,11,66,57,7,194,63,1,66,57,7,195,
-    0,1,66,1,9,195,1,1,47,9,99,2,0,0,0,0,
-    0,0,0,0,0,0,0,3,0,0,0,3,0,0,0,115,
-    16,0,0,0,116,0,124,0,124,1,24,0,131,1,100,1,
-    107,1,83,0,41,2,78,114,5,0,0,0,41,1,218,3,
-    97,98,115,41,2,90,2,116,49,90,2,116,50,115,2,0,
-    0,0,32,32,114,11,0,0,0,218,9,95,101,113,95,109,
-    116,105,109,101,114,159,0,0,0,115,2,0,0,243,2,0,
-    0,0,16,2,114,160,0,0,0,115,16,0,0,0,12,15,
-    16,18,21,23,16,23,12,24,28,29,12,29,5,29,114,10,
-    0,0,0,99,5,0,0,0,0,0,0,0,0,0,0,0,
-    5,0,0,0,3,0,0,0,115,254,0,0,0,124,3,124,
-    2,100,1,156,2,125,5,116,0,106,1,124,4,124,3,124,
-    5,131,3,125,6,124,6,100,2,64,0,100,3,107,3,125,
-    7,124,7,114,63,124,6,100,4,64,0,100,3,107,3,125,
-    8,116,2,106,3,100,5,107,3,114,62,124,8,115,38,116,
-    2,106,3,100,6,107,2,114,62,116,4,124,0,124,2,131,
-    2,125,9,124,9,100,0,117,1,114,62,116,2,106,5,116,
-    0,106,6,124,9,131,2,125,10,116,0,106,7,124,4,124,
-    10,124,3,124,5,131,4,1,0,110,40,116,8,124,0,124,
-    2,131,2,92,2,125,11,125,12,124,11,114,103,116,9,116,
-    10,124,4,100,7,100,8,133,2,25,0,131,1,124,11,131,
-    2,114,93,116,10,124,4,100,8,100,9,133,2,25,0,131,
-    1,124,12,107,3,114,103,116,11,106,12,100,10,124,3,155,
-    2,157,2,131,1,1,0,100,0,83,0,116,13,106,14,124,
-    4,100,9,100,0,133,2,25,0,131,1,125,13,116,15,124,
-    13,116,16,131,2,115,125,116,17,100,11,124,1,155,2,100,
-    12,157,3,131,1,130,1,124,13,83,0,41,13,78,41,2,
-    114,48,0,0,0,114,14,0,0,0,114,5,0,0,0,114,
-    0,0,0,0,114,97,0,0,0,90,5,110,101,118,101,114,
-    90,6,97,108,119,97,121,115,114,111,0,0,0,114,106,0,
-    0,0,114,107,0,0,0,122,22,98,121,116,101,99,111,100,
-    101,32,105,115,32,115,116,97,108,101,32,102,111,114,32,122,
-    16,99,111,109,112,105,108,101,100,32,109,111,100,117,108,101,
-    32,122,21,32,105,115,32,110,111,116,32,97,32,99,111,100,
-    101,32,111,98,106,101,99,116,41,18,114,22,0,0,0,90,
-    13,95,99,108,97,115,115,105,102,121,95,112,121,99,218,4,
-    95,105,109,112,90,21,99,104,101,99,107,95,104,97,115,104,
-    95,98,97,115,101,100,95,112,121,99,115,218,15,95,103,101,
-    116,95,112,121,99,95,115,111,117,114,99,101,218,11,115,111,
-    117,114,99,101,95,104,97,115,104,90,17,95,82,65,87,95,
-    77,65,71,73,67,95,78,85,77,66,69,82,90,18,95,118,
-    97,108,105,100,97,116,101,95,104,97,115,104,95,112,121,99,
-    218,29,95,103,101,116,95,109,116,105,109,101,95,97,110,100,
-    95,115,105,122,101,95,111,102,95,115,111,117,114,99,101,114,
-    159,0,0,0,114,2,0,0,0,114,49,0,0,0,114,84,
-    0,0,0,218,7,109,97,114,115,104,97,108,90,5,108,111,
-    97,100,115,114,16,0,0,0,218,10,95,99,111,100,101,95,
-    116,121,112,101,218,9,84,121,112,101,69,114,114,111,114,41,
-    14,114,33,0,0,0,114,62,0,0,0,114,72,0,0,0,
-    114,42,0,0,0,114,138,0,0,0,90,11,101,120,99,95,
-    100,101,116,97,105,108,115,114,141,0,0,0,90,10,104,97,
-    115,104,95,98,97,115,101,100,90,12,99,104,101,99,107,95,
-    115,111,117,114,99,101,90,12,115,111,117,114,99,101,95,98,
-    121,116,101,115,114,163,0,0,0,90,12,115,111,117,114,99,
-    101,95,109,116,105,109,101,90,11,115,111,117,114,99,101,95,
-    115,105,122,101,114,54,0,0,0,115,14,0,0,0,32,32,
-    32,32,32,32,32,32,32,32,32,32,32,32,114,11,0,0,
-    0,218,15,95,117,110,109,97,114,115,104,97,108,95,99,111,
-    100,101,114,168,0,0,0,123,2,0,0,115,72,0,0,0,
-    2,2,2,1,6,254,14,5,12,2,4,1,12,1,10,1,
-    2,1,2,255,8,1,2,255,10,2,8,1,4,1,4,1,
-    2,1,4,254,4,5,8,1,4,255,2,128,8,4,6,255,
-    4,3,22,3,18,1,2,255,4,2,8,1,4,255,4,2,
-    18,2,10,1,16,1,4,1,115,82,0,0,0,2,2,2,
-    1,4,1,2,253,14,5,12,2,2,1,2,24,12,233,8,
-    1,2,10,2,247,2,9,8,247,2,9,10,248,6,1,2,
-    7,4,250,4,1,2,1,2,1,2,253,4,5,12,1,2,
-    128,8,3,6,255,2,3,2,7,20,252,2,4,18,253,2,
-    3,4,254,12,1,4,1,18,2,8,1,18,1,4,1,115,
-    254,0,0,0,17,25,17,25,19,6,19,6,5,16,13,32,
-    13,46,47,51,53,61,63,74,13,75,5,10,18,23,26,29,
-    18,29,33,34,18,34,5,15,8,18,5,28,24,29,32,36,
-    24,36,40,41,24,41,9,21,13,17,13,39,43,50,13,50,
-    9,62,18,30,9,62,34,38,34,60,64,72,34,72,9,62,
-    28,43,44,48,50,58,28,59,13,25,16,28,36,40,16,40,
-    13,62,31,35,31,47,21,40,21,58,21,33,31,18,17,28,
-    17,36,17,55,21,25,27,38,40,48,50,61,17,62,17,62,
-    0,0,13,42,43,47,49,57,13,58,9,34,9,21,23,34,
-    12,24,9,28,21,30,31,45,46,50,51,52,53,55,51,55,
-    46,56,31,57,59,71,21,72,13,28,21,35,36,40,41,43,
-    44,46,41,46,36,47,21,48,52,63,21,63,13,28,17,27,
-    17,44,21,58,22,30,21,58,21,58,17,59,17,59,24,28,
-    24,28,12,19,12,25,26,30,31,33,31,34,31,34,26,35,
-    12,36,5,9,12,22,23,27,29,39,12,40,5,78,15,24,
-    25,77,26,34,25,77,25,77,25,77,15,78,9,78,12,16,
-    5,16,114,10,0,0,0,99,1,0,0,0,0,0,0,0,
-    0,0,0,0,4,0,0,0,3,0,0,0,115,28,0,0,
-    0,124,0,160,0,100,1,100,2,161,2,125,0,124,0,160,
-    0,100,3,100,2,161,2,125,0,124,0,83,0,41,4,78,
-    115,2,0,0,0,13,10,243,1,0,0,0,10,243,1,0,
-    0,0,13,41,1,114,20,0,0,0,41,1,218,6,115,111,
-    117,114,99,101,115,1,0,0,0,32,114,11,0,0,0,218,
-    23,95,110,111,114,109,97,108,105,122,101,95,108,105,110,101,
-    95,101,110,100,105,110,103,115,114,172,0,0,0,168,2,0,
-    0,243,6,0,0,0,12,1,12,1,4,1,114,173,0,0,
-    0,115,28,0,0,0,14,20,14,44,29,36,38,43,14,44,
-    5,11,14,20,14,42,29,34,36,41,14,42,5,11,12,18,
-    5,18,114,10,0,0,0,99,2,0,0,0,0,0,0,0,
-    0,0,0,0,6,0,0,0,3,0,0,0,115,24,0,0,
-    0,116,0,124,1,131,1,125,1,116,1,124,1,124,0,100,
-    1,100,2,100,3,141,4,83,0,41,4,78,114,82,0,0,
-    0,84,41,1,90,12,100,111,110,116,95,105,110,104,101,114,
-    105,116,41,2,114,172,0,0,0,218,7,99,111,109,112,105,
-    108,101,41,2,114,62,0,0,0,114,171,0,0,0,115,2,
-    0,0,0,32,32,114,11,0,0,0,218,15,95,99,111,109,
-    112,105,108,101,95,115,111,117,114,99,101,114,175,0,0,0,
-    175,2,0,0,243,4,0,0,0,8,1,16,1,114,176,0,
-    0,0,115,24,0,0,0,14,37,38,44,14,45,5,11,12,
-    19,20,26,28,36,38,44,59,63,12,64,12,64,5,64,114,
-    10,0,0,0,99,2,0,0,0,0,0,0,0,0,0,0,
-    0,10,0,0,0,3,0,0,0,115,68,0,0,0,116,0,
-    106,1,124,0,100,1,63,0,100,2,23,0,124,0,100,3,
-    63,0,100,4,64,0,124,0,100,5,64,0,124,1,100,6,
-    63,0,124,1,100,3,63,0,100,7,64,0,124,1,100,5,
-    64,0,100,8,20,0,100,9,100,9,100,9,102,9,131,1,
-    83,0,41,10,78,233,9,0,0,0,105,188,7,0,0,233,
-    5,0,0,0,233,15,0,0,0,233,31,0,0,0,233,11,
-    0,0,0,233,63,0,0,0,114,97,0,0,0,114,15,0,
-    0,0,41,2,114,143,0,0,0,90,6,109,107,116,105,109,
-    101,41,2,218,1,100,114,150,0,0,0,115,2,0,0,0,
-    32,32,114,11,0,0,0,218,14,95,112,97,114,115,101,95,
-    100,111,115,116,105,109,101,114,184,0,0,0,181,2,0,0,
-    115,18,0,0,0,4,1,10,1,10,1,6,1,6,1,10,
-    1,10,1,6,1,6,249,115,16,0,0,0,4,1,10,1,
-    10,1,6,1,6,1,10,1,10,1,12,1,115,68,0,0,
-    0,12,16,12,23,10,11,15,16,10,16,20,24,9,24,10,
-    11,15,16,10,16,20,23,9,23,9,10,13,17,9,17,9,
-    10,14,16,9,16,10,11,15,16,10,16,20,24,9,24,10,
-    11,14,18,10,18,22,23,9,23,9,11,13,15,17,19,24,
-    20,12,21,5,21,114,10,0,0,0,99,2,0,0,0,0,
-    0,0,0,0,0,0,0,10,0,0,0,3,0,0,0,115,
-    112,0,0,0,9,0,124,1,100,1,100,0,133,2,25,0,
-    100,2,118,0,115,11,74,0,130,1,124,1,100,0,100,1,
-    133,2,25,0,125,1,124,0,106,0,124,1,25,0,125,2,
-    124,2,100,3,25,0,125,3,124,2,100,4,25,0,125,4,
-    124,2,100,5,25,0,125,5,116,1,124,4,124,3,131,2,
-    124,5,102,2,83,0,35,0,4,0,116,2,116,3,116,4,
-    102,3,121,55,1,0,1,0,1,0,89,0,100,6,83,0,
-    37,0,119,0,41,7,78,114,15,0,0,0,169,2,218,1,
-    99,218,1,111,114,178,0,0,0,233,6,0,0,0,233,3,
-    0,0,0,41,2,114,0,0,0,0,114,0,0,0,0,41,
-    5,114,29,0,0,0,114,184,0,0,0,114,27,0,0,0,
-    218,10,73,110,100,101,120,69,114,114,111,114,114,167,0,0,
-    0,41,6,114,33,0,0,0,114,14,0,0,0,114,63,0,
-    0,0,114,143,0,0,0,114,144,0,0,0,90,17,117,110,
-    99,111,109,112,114,101,115,115,101,100,95,115,105,122,101,115,
-    6,0,0,0,32,32,32,32,32,32,114,11,0,0,0,114,
-    164,0,0,0,114,164,0,0,0,194,2,0,0,115,26,0,
-    0,0,2,1,20,2,12,1,10,1,8,3,8,1,8,1,
-    14,1,2,128,18,1,6,1,2,128,2,255,115,28,0,0,
-    0,2,13,20,246,12,1,10,1,8,3,8,1,8,1,14,
-    1,2,128,2,2,8,255,14,1,2,128,2,0,115,112,0,
-    0,0,5,20,16,20,21,23,21,24,21,24,16,25,29,39,
-    16,39,9,39,9,39,9,39,16,20,21,24,22,24,21,24,
-    16,25,9,13,21,25,21,32,33,37,21,38,9,18,16,25,
-    26,27,16,28,9,13,16,25,26,27,16,28,9,13,29,38,
-    39,40,29,41,9,26,16,30,31,35,37,41,16,42,44,61,
-    16,61,9,61,0,0,5,20,13,21,23,33,35,44,12,45,
-    5,20,5,20,5,20,5,20,16,20,16,20,16,20,0,0,
-    5,20,115,12,0,0,0,129,39,41,0,169,10,54,7,183,
-    1,54,7,99,2,0,0,0,0,0,0,0,0,0,0,0,
-    8,0,0,0,3,0,0,0,115,82,0,0,0,124,1,100,
-    1,100,0,133,2,25,0,100,2,118,0,115,10,74,0,130,
-    1,124,1,100,0,100,1,133,2,25,0,125,1,9,0,124,
-    0,106,0,124,1,25,0,125,2,110,11,35,0,4,0,116,
-    1,121,40,1,0,1,0,1,0,89,0,100,0,83,0,37,
-    0,116,2,124,0,106,3,124,2,131,2,83,0,119,0,41,
-    3,78,114,15,0,0,0,114,185,0,0,0,41,4,114,29,
-    0,0,0,114,27,0,0,0,114,61,0,0,0,114,30,0,
-    0,0,41,3,114,33,0,0,0,114,14,0,0,0,114,63,
-    0,0,0,115,3,0,0,0,32,32,32,114,11,0,0,0,
-    114,162,0,0,0,114,162,0,0,0,213,2,0,0,115,20,
-    0,0,0,20,2,12,1,2,2,12,1,2,128,12,1,6,
-    1,2,128,12,2,2,253,115,22,0,0,0,20,2,12,1,
-    2,7,12,252,2,128,2,2,2,255,14,1,2,128,12,2,
-    2,254,115,82,0,0,0,12,16,17,19,17,20,17,20,12,
-    21,25,35,12,35,5,35,5,35,5,35,12,16,17,20,18,
-    20,17,20,12,21,5,9,5,50,21,25,21,32,33,37,21,
-    38,9,18,9,18,0,0,5,20,12,20,5,20,5,20,5,
-    20,5,20,16,20,16,20,16,20,0,0,16,25,26,30,26,
-    38,40,49,16,50,9,50,5,20,115,12,0,0,0,145,5,
-    23,0,151,7,33,7,168,1,33,7,99,2,0,0,0,0,
-    0,0,0,0,0,0,0,9,0,0,0,3,0,0,0,115,
-    14,1,0,0,116,0,124,0,124,1,131,2,125,2,100,0,
-    125,3,116,1,68,0,93,100,92,3,125,4,125,5,125,6,
-    124,2,124,4,23,0,125,7,116,2,106,3,100,1,124,0,
-    106,4,116,5,124,7,100,2,100,3,141,5,1,0,9,0,
-    124,0,106,6,124,7,25,0,125,8,110,10,35,0,4,0,
-    116,7,121,134,1,0,1,0,1,0,89,0,113,9,37,0,
-    124,8,100,4,25,0,125,9,116,8,124,0,106,4,124,8,
-    131,2,125,10,100,0,125,11,124,5,114,89,9,0,116,9,
-    124,0,124,9,124,7,124,1,124,10,131,5,125,11,110,24,
-    35,0,4,0,116,10,121,133,1,0,125,12,1,0,124,12,
-    125,3,89,0,100,0,125,12,126,12,110,10,100,0,125,12,
-    126,12,119,1,37,0,116,11,124,9,124,10,131,2,125,11,
-    124,11,100,0,117,0,114,99,113,9,124,8,100,4,25,0,
-    125,9,124,11,124,6,124,9,102,3,2,0,1,0,83,0,
-    124,3,114,124,100,5,124,3,155,0,157,2,125,13,116,12,
-    124,13,124,1,100,6,141,2,124,3,130,2,116,12,100,7,
-    124,1,155,2,157,2,124,1,100,6,141,2,130,1,119,0,
-    119,0,41,8,78,122,13,116,114,121,105,110,103,32,123,125,
-    123,125,123,125,114,97,0,0,0,41,1,90,9,118,101,114,
-    98,111,115,105,116,121,114,0,0,0,0,122,20,109,111,100,
-    117,108,101,32,108,111,97,100,32,102,97,105,108,101,100,58,
-    32,114,68,0,0,0,114,67,0,0,0,41,13,114,40,0,
-    0,0,114,101,0,0,0,114,49,0,0,0,114,84,0,0,
-    0,114,30,0,0,0,114,21,0,0,0,114,29,0,0,0,
-    114,27,0,0,0,114,61,0,0,0,114,168,0,0,0,114,
-    83,0,0,0,114,175,0,0,0,114,3,0,0,0,41,14,
-    114,33,0,0,0,114,42,0,0,0,114,14,0,0,0,90,
-    12,105,109,112,111,114,116,95,101,114,114,111,114,114,102,0,
-    0,0,114,103,0,0,0,114,55,0,0,0,114,72,0,0,
-    0,114,63,0,0,0,114,44,0,0,0,114,138,0,0,0,
-    114,54,0,0,0,90,3,101,120,99,114,85,0,0,0,115,
-    14,0,0,0,32,32,32,32,32,32,32,32,32,32,32,32,
-    32,32,114,11,0,0,0,114,52,0,0,0,114,52,0,0,
-    0,228,2,0,0,115,64,0,0,0,10,1,4,1,14,1,
-    8,1,22,1,2,1,12,1,2,128,12,1,4,1,2,128,
-    8,2,12,1,4,1,4,1,2,1,18,1,2,128,12,1,
-    14,1,10,128,10,2,8,1,2,3,8,1,14,1,4,2,
-    10,1,14,1,18,2,2,241,2,247,115,76,0,0,0,10,
-    1,4,1,2,1,4,29,8,227,8,1,22,1,2,21,12,
-    237,2,128,2,2,2,255,12,1,2,128,8,2,12,1,4,
-    1,2,1,2,6,2,254,18,254,2,128,2,2,2,255,22,
-    1,10,128,10,2,6,1,4,3,8,1,14,1,2,2,2,
-    4,10,253,14,1,18,2,2,242,2,247,115,14,1,0,0,
-    12,28,29,33,35,43,12,44,5,9,20,24,5,17,42,58,
-    5,83,5,83,9,38,9,15,17,27,29,38,20,24,27,33,
-    20,33,9,17,9,19,9,36,37,52,54,58,54,66,68,76,
-    78,86,98,99,9,100,9,100,9,100,9,44,25,29,25,36,
-    37,45,25,46,13,22,13,22,0,0,9,17,16,24,9,17,
-    9,17,9,17,9,17,13,17,13,17,0,0,23,32,33,34,
-    23,35,13,20,20,29,30,34,30,42,44,53,20,54,13,17,
-    20,24,13,17,16,26,13,54,17,39,28,43,44,48,50,57,
-    59,67,69,77,79,83,28,84,21,25,21,25,0,0,17,39,
-    24,35,17,39,17,39,17,39,17,39,36,39,21,33,21,33,
-    21,33,21,33,21,33,21,33,0,0,0,0,0,0,0,0,
-    0,0,24,39,40,47,49,53,24,54,17,21,16,20,24,28,
-    16,28,13,25,17,25,23,32,33,34,23,35,13,20,20,24,
-    26,35,37,44,20,44,13,44,13,44,13,44,12,24,9,83,
-    19,56,42,54,19,56,19,56,13,16,19,33,34,37,44,52,
-    19,53,19,53,59,71,13,71,19,33,34,67,35,43,34,67,
-    34,67,74,82,19,83,19,83,13,83,17,39,9,17,115,42,
-    0,0,0,158,5,36,2,164,7,45,9,189,8,65,6,2,
-    193,6,7,65,24,9,193,13,2,65,20,9,193,20,4,65,
-    24,9,194,5,1,65,24,9,194,6,1,45,9,41,46,114,
+    83,19,84,19,84,13,84,9,84,0,0,20,22,20,38,28,
+    37,20,38,9,17,12,15,16,24,12,25,29,38,12,38,9,
+    56,19,26,27,55,19,56,13,56,9,56,5,56,5,56,5,
+    56,5,56,5,56,5,56,5,56,5,56,5,56,5,56,0,
+    0,5,56,5,56,5,56,5,56,5,56,5,56,8,16,20,
+    21,8,21,5,24,16,24,9,24,5,74,22,42,22,44,9,
+    19,9,19,0,0,5,74,12,21,5,74,5,74,5,74,5,
+    74,15,29,30,73,15,74,9,74,5,74,0,0,12,22,23,
+    31,33,36,12,37,5,37,115,71,0,0,0,151,1,66,26,
+    3,153,5,31,2,158,1,66,26,3,159,17,48,9,176,59,
+    66,26,3,193,44,5,65,50,2,193,49,1,66,26,3,193,
+    50,17,66,3,9,194,3,16,66,26,3,194,26,4,66,30,
+    11,194,31,3,66,30,11,194,44,3,66,48,0,194,48,12,
+    66,60,7,99,2,0,0,0,0,0,0,0,0,0,0,0,
+    3,0,0,0,3,0,0,0,115,16,0,0,0,116,0,124,
+    0,124,1,24,0,131,1,100,1,107,1,83,0,41,2,78,
+    114,5,0,0,0,41,1,218,3,97,98,115,41,2,90,2,
+    116,49,90,2,116,50,115,2,0,0,0,32,32,114,11,0,
+    0,0,218,9,95,101,113,95,109,116,105,109,101,114,159,0,
+    0,0,115,2,0,0,243,2,0,0,0,16,2,114,160,0,
+    0,0,115,16,0,0,0,12,15,16,18,21,23,16,23,12,
+    24,28,29,12,29,5,29,114,10,0,0,0,99,5,0,0,
+    0,0,0,0,0,0,0,0,0,5,0,0,0,3,0,0,
+    0,115,254,0,0,0,124,3,124,2,100,1,156,2,125,5,
+    116,0,106,1,124,4,124,3,124,5,131,3,125,6,124,6,
+    100,2,64,0,100,3,107,3,125,7,124,7,114,63,124,6,
+    100,4,64,0,100,3,107,3,125,8,116,2,106,3,100,5,
+    107,3,114,62,124,8,115,38,116,2,106,3,100,6,107,2,
+    114,62,116,4,124,0,124,2,131,2,125,9,124,9,100,0,
+    117,1,114,62,116,2,106,5,116,0,106,6,124,9,131,2,
+    125,10,116,0,106,7,124,4,124,10,124,3,124,5,131,4,
+    1,0,110,40,116,8,124,0,124,2,131,2,92,2,125,11,
+    125,12,124,11,114,103,116,9,116,10,124,4,100,7,100,8,
+    133,2,25,0,131,1,124,11,131,2,114,93,116,10,124,4,
+    100,8,100,9,133,2,25,0,131,1,124,12,107,3,114,103,
+    116,11,106,12,100,10,124,3,155,2,157,2,131,1,1,0,
+    100,0,83,0,116,13,106,14,124,4,100,9,100,0,133,2,
+    25,0,131,1,125,13,116,15,124,13,116,16,131,2,115,125,
+    116,17,100,11,124,1,155,2,100,12,157,3,131,1,130,1,
+    124,13,83,0,41,13,78,41,2,114,48,0,0,0,114,14,
+    0,0,0,114,5,0,0,0,114,0,0,0,0,114,97,0,
+    0,0,90,5,110,101,118,101,114,90,6,97,108,119,97,121,
+    115,114,111,0,0,0,114,106,0,0,0,114,107,0,0,0,
+    122,22,98,121,116,101,99,111,100,101,32,105,115,32,115,116,
+    97,108,101,32,102,111,114,32,122,16,99,111,109,112,105,108,
+    101,100,32,109,111,100,117,108,101,32,122,21,32,105,115,32,
+    110,111,116,32,97,32,99,111,100,101,32,111,98,106,101,99,
+    116,41,18,114,22,0,0,0,90,13,95,99,108,97,115,115,
+    105,102,121,95,112,121,99,218,4,95,105,109,112,90,21,99,
+    104,101,99,107,95,104,97,115,104,95,98,97,115,101,100,95,
+    112,121,99,115,218,15,95,103,101,116,95,112,121,99,95,115,
+    111,117,114,99,101,218,11,115,111,117,114,99,101,95,104,97,
+    115,104,90,17,95,82,65,87,95,77,65,71,73,67,95,78,
+    85,77,66,69,82,90,18,95,118,97,108,105,100,97,116,101,
+    95,104,97,115,104,95,112,121,99,218,29,95,103,101,116,95,
+    109,116,105,109,101,95,97,110,100,95,115,105,122,101,95,111,
+    102,95,115,111,117,114,99,101,114,159,0,0,0,114,2,0,
+    0,0,114,49,0,0,0,114,84,0,0,0,218,7,109,97,
+    114,115,104,97,108,90,5,108,111,97,100,115,114,16,0,0,
+    0,218,10,95,99,111,100,101,95,116,121,112,101,218,9,84,
+    121,112,101,69,114,114,111,114,41,14,114,33,0,0,0,114,
+    62,0,0,0,114,72,0,0,0,114,42,0,0,0,114,138,
+    0,0,0,90,11,101,120,99,95,100,101,116,97,105,108,115,
+    114,141,0,0,0,90,10,104,97,115,104,95,98,97,115,101,
+    100,90,12,99,104,101,99,107,95,115,111,117,114,99,101,90,
+    12,115,111,117,114,99,101,95,98,121,116,101,115,114,163,0,
+    0,0,90,12,115,111,117,114,99,101,95,109,116,105,109,101,
+    90,11,115,111,117,114,99,101,95,115,105,122,101,114,54,0,
+    0,0,115,14,0,0,0,32,32,32,32,32,32,32,32,32,
+    32,32,32,32,32,114,11,0,0,0,218,15,95,117,110,109,
+    97,114,115,104,97,108,95,99,111,100,101,114,168,0,0,0,
+    123,2,0,0,115,72,0,0,0,2,2,2,1,6,254,14,
+    5,12,2,4,1,12,1,10,1,2,1,2,255,8,1,2,
+    255,10,2,8,1,4,1,4,1,2,1,4,254,4,5,8,
+    1,4,255,2,128,8,4,6,255,4,3,22,3,18,1,2,
+    255,4,2,8,1,4,255,4,2,18,2,10,1,16,1,4,
+    1,115,82,0,0,0,2,2,2,1,4,1,2,253,14,5,
+    12,2,2,1,2,24,12,233,8,1,2,10,2,247,2,9,
+    8,247,2,9,10,248,6,1,2,7,4,250,4,1,2,1,
+    2,1,2,253,4,5,12,1,2,128,8,3,6,255,2,3,
+    2,7,20,252,2,4,18,253,2,3,4,254,12,1,4,1,
+    18,2,8,1,18,1,4,1,115,254,0,0,0,17,25,17,
+    25,19,6,19,6,5,16,13,32,13,46,47,51,53,61,63,
+    74,13,75,5,10,18,23,26,29,18,29,33,34,18,34,5,
+    15,8,18,5,28,24,29,32,36,24,36,40,41,24,41,9,
+    21,13,17,13,39,43,50,13,50,9,62,18,30,9,62,34,
+    38,34,60,64,72,34,72,9,62,28,43,44,48,50,58,28,
+    59,13,25,16,28,36,40,16,40,13,62,31,35,31,47,21,
+    40,21,58,21,33,31,18,17,28,17,36,17,55,21,25,27,
+    38,40,48,50,61,17,62,17,62,0,0,13,42,43,47,49,
+    57,13,58,9,34,9,21,23,34,12,24,9,28,21,30,31,
+    45,46,50,51,52,53,55,51,55,46,56,31,57,59,71,21,
+    72,13,28,21,35,36,40,41,43,44,46,41,46,36,47,21,
+    48,52,63,21,63,13,28,17,27,17,44,21,58,22,30,21,
+    58,21,58,17,59,17,59,24,28,24,28,12,19,12,25,26,
+    30,31,33,31,34,31,34,26,35,12,36,5,9,12,22,23,
+    27,29,39,12,40,5,78,15,24,25,77,26,34,25,77,25,
+    77,25,77,15,78,9,78,12,16,5,16,114,10,0,0,0,
+    99,1,0,0,0,0,0,0,0,0,0,0,0,4,0,0,
+    0,3,0,0,0,115,28,0,0,0,124,0,160,0,100,1,
+    100,2,161,2,125,0,124,0,160,0,100,3,100,2,161,2,
+    125,0,124,0,83,0,41,4,78,115,2,0,0,0,13,10,
+    243,1,0,0,0,10,243,1,0,0,0,13,41,1,114,20,
+    0,0,0,41,1,218,6,115,111,117,114,99,101,115,1,0,
+    0,0,32,114,11,0,0,0,218,23,95,110,111,114,109,97,
+    108,105,122,101,95,108,105,110,101,95,101,110,100,105,110,103,
+    115,114,172,0,0,0,168,2,0,0,243,6,0,0,0,12,
+    1,12,1,4,1,114,173,0,0,0,115,28,0,0,0,14,
+    20,14,44,29,36,38,43,14,44,5,11,14,20,14,42,29,
+    34,36,41,14,42,5,11,12,18,5,18,114,10,0,0,0,
+    99,2,0,0,0,0,0,0,0,0,0,0,0,6,0,0,
+    0,3,0,0,0,115,24,0,0,0,116,0,124,1,131,1,
+    125,1,116,1,124,1,124,0,100,1,100,2,100,3,141,4,
+    83,0,41,4,78,114,82,0,0,0,84,41,1,90,12,100,
+    111,110,116,95,105,110,104,101,114,105,116,41,2,114,172,0,
+    0,0,218,7,99,111,109,112,105,108,101,41,2,114,62,0,
+    0,0,114,171,0,0,0,115,2,0,0,0,32,32,114,11,
+    0,0,0,218,15,95,99,111,109,112,105,108,101,95,115,111,
+    117,114,99,101,114,175,0,0,0,175,2,0,0,243,4,0,
+    0,0,8,1,16,1,114,176,0,0,0,115,24,0,0,0,
+    14,37,38,44,14,45,5,11,12,19,20,26,28,36,38,44,
+    59,63,12,64,12,64,5,64,114,10,0,0,0,99,2,0,
+    0,0,0,0,0,0,0,0,0,0,10,0,0,0,3,0,
+    0,0,115,68,0,0,0,116,0,106,1,124,0,100,1,63,
+    0,100,2,23,0,124,0,100,3,63,0,100,4,64,0,124,
+    0,100,5,64,0,124,1,100,6,63,0,124,1,100,3,63,
+    0,100,7,64,0,124,1,100,5,64,0,100,8,20,0,100,
+    9,100,9,100,9,102,9,131,1,83,0,41,10,78,233,9,
+    0,0,0,105,188,7,0,0,233,5,0,0,0,233,15,0,
+    0,0,233,31,0,0,0,233,11,0,0,0,233,63,0,0,
+    0,114,97,0,0,0,114,15,0,0,0,41,2,114,143,0,
+    0,0,90,6,109,107,116,105,109,101,41,2,218,1,100,114,
+    150,0,0,0,115,2,0,0,0,32,32,114,11,0,0,0,
+    218,14,95,112,97,114,115,101,95,100,111,115,116,105,109,101,
+    114,184,0,0,0,181,2,0,0,115,18,0,0,0,4,1,
+    10,1,10,1,6,1,6,1,10,1,10,1,6,1,6,249,
+    115,16,0,0,0,4,1,10,1,10,1,6,1,6,1,10,
+    1,10,1,12,1,115,68,0,0,0,12,16,12,23,10,11,
+    15,16,10,16,20,24,9,24,10,11,15,16,10,16,20,23,
+    9,23,9,10,13,17,9,17,9,10,14,16,9,16,10,11,
+    15,16,10,16,20,24,9,24,10,11,14,18,10,18,22,23,
+    9,23,9,11,13,15,17,19,24,20,12,21,5,21,114,10,
+    0,0,0,99,2,0,0,0,0,0,0,0,0,0,0,0,
+    10,0,0,0,3,0,0,0,115,112,0,0,0,9,0,124,
+    1,100,1,100,0,133,2,25,0,100,2,118,0,115,11,74,
+    0,130,1,124,1,100,0,100,1,133,2,25,0,125,1,124,
+    0,106,0,124,1,25,0,125,2,124,2,100,3,25,0,125,
+    3,124,2,100,4,25,0,125,4,124,2,100,5,25,0,125,
+    5,116,1,124,4,124,3,131,2,124,5,102,2,83,0,35,
+    0,4,0,116,2,116,3,116,4,102,3,121,54,1,0,1,
+    0,1,0,89,0,100,6,83,0,119,0,37,0,41,7,78,
+    114,15,0,0,0,169,2,218,1,99,218,1,111,114,178,0,
+    0,0,233,6,0,0,0,233,3,0,0,0,41,2,114,0,
+    0,0,0,114,0,0,0,0,41,5,114,29,0,0,0,114,
+    184,0,0,0,114,27,0,0,0,218,10,73,110,100,101,120,
+    69,114,114,111,114,114,167,0,0,0,41,6,114,33,0,0,
+    0,114,14,0,0,0,114,63,0,0,0,114,143,0,0,0,
+    114,144,0,0,0,90,17,117,110,99,111,109,112,114,101,115,
+    115,101,100,95,115,105,122,101,115,6,0,0,0,32,32,32,
+    32,32,32,114,11,0,0,0,114,164,0,0,0,114,164,0,
+    0,0,194,2,0,0,115,26,0,0,0,2,1,20,2,12,
+    1,10,1,8,3,8,1,8,1,14,1,2,128,18,1,6,
+    1,2,255,2,128,115,26,0,0,0,2,13,20,246,12,1,
+    10,1,8,3,8,1,8,1,14,1,2,128,2,2,8,255,
+    16,1,2,128,115,112,0,0,0,5,20,16,20,21,23,21,
+    24,21,24,16,25,29,39,16,39,9,39,9,39,9,39,16,
+    20,21,24,22,24,21,24,16,25,9,13,21,25,21,32,33,
+    37,21,38,9,18,16,25,26,27,16,28,9,13,16,25,26,
+    27,16,28,9,13,29,38,39,40,29,41,9,26,16,30,31,
+    35,37,41,16,42,44,61,16,61,9,61,0,0,5,20,13,
+    21,23,33,35,44,12,45,5,20,5,20,5,20,5,20,16,
+    20,16,20,16,20,5,20,0,0,115,12,0,0,0,129,39,
+    41,0,169,10,55,7,182,1,55,7,99,2,0,0,0,0,
+    0,0,0,0,0,0,0,8,0,0,0,3,0,0,0,115,
+    82,0,0,0,124,1,100,1,100,0,133,2,25,0,100,2,
+    118,0,115,10,74,0,130,1,124,1,100,0,100,1,133,2,
+    25,0,125,1,9,0,124,0,106,0,124,1,25,0,125,2,
+    110,12,35,0,4,0,116,1,121,33,1,0,1,0,1,0,
+    89,0,100,0,83,0,119,0,37,0,116,2,124,0,106,3,
+    124,2,131,2,83,0,41,3,78,114,15,0,0,0,114,185,
+    0,0,0,41,4,114,29,0,0,0,114,27,0,0,0,114,
+    61,0,0,0,114,30,0,0,0,41,3,114,33,0,0,0,
+    114,14,0,0,0,114,63,0,0,0,115,3,0,0,0,32,
+    32,32,114,11,0,0,0,114,162,0,0,0,114,162,0,0,
+    0,213,2,0,0,115,20,0,0,0,20,2,12,1,2,2,
+    12,1,2,128,12,1,6,1,2,255,2,128,12,3,115,20,
+    0,0,0,20,2,12,1,2,7,12,252,2,128,2,2,2,
+    255,16,1,2,128,12,2,115,82,0,0,0,12,16,17,19,
+    17,20,17,20,12,21,25,35,12,35,5,35,5,35,5,35,
+    12,16,17,20,18,20,17,20,12,21,5,9,5,50,21,25,
+    21,32,33,37,21,38,9,18,9,18,0,0,5,20,12,20,
+    5,20,5,20,5,20,5,20,16,20,16,20,16,20,5,20,
+    0,0,16,25,26,30,26,38,40,49,16,50,9,50,115,12,
+    0,0,0,145,5,23,0,151,7,34,7,161,1,34,7,99,
+    2,0,0,0,0,0,0,0,0,0,0,0,9,0,0,0,
+    3,0,0,0,115,14,1,0,0,116,0,124,0,124,1,131,
+    2,125,2,100,0,125,3,116,1,68,0,93,102,92,3,125,
+    4,125,5,125,6,124,2,124,4,23,0,125,7,116,2,106,
+    3,100,1,124,0,106,4,116,5,124,7,100,2,100,3,141,
+    5,1,0,9,0,124,0,106,6,124,7,25,0,125,8,110,
+    11,35,0,4,0,116,7,121,45,1,0,1,0,1,0,89,
+    0,113,9,119,0,37,0,124,8,100,4,25,0,125,9,116,
+    8,124,0,106,4,124,8,131,2,125,10,100,0,125,11,124,
+    5,114,91,9,0,116,9,124,0,124,9,124,7,124,1,124,
+    10,131,5,125,11,110,25,35,0,4,0,116,10,121,89,1,
+    0,125,12,1,0,124,12,125,3,89,0,100,0,125,12,126,
+    12,110,11,100,0,125,12,126,12,119,1,119,0,37,0,116,
+    11,124,9,124,10,131,2,125,11,124,11,100,0,117,0,114,
+    101,113,9,124,8,100,4,25,0,125,9,124,11,124,6,124,
+    9,102,3,2,0,1,0,83,0,124,3,114,126,100,5,124,
+    3,155,0,157,2,125,13,116,12,124,13,124,1,100,6,141,
+    2,124,3,130,2,116,12,100,7,124,1,155,2,157,2,124,
+    1,100,6,141,2,130,1,41,8,78,122,13,116,114,121,105,
+    110,103,32,123,125,123,125,123,125,114,97,0,0,0,41,1,
+    90,9,118,101,114,98,111,115,105,116,121,114,0,0,0,0,
+    122,20,109,111,100,117,108,101,32,108,111,97,100,32,102,97,
+    105,108,101,100,58,32,114,68,0,0,0,114,67,0,0,0,
+    41,13,114,40,0,0,0,114,101,0,0,0,114,49,0,0,
+    0,114,84,0,0,0,114,30,0,0,0,114,21,0,0,0,
+    114,29,0,0,0,114,27,0,0,0,114,61,0,0,0,114,
+    168,0,0,0,114,83,0,0,0,114,175,0,0,0,114,3,
+    0,0,0,41,14,114,33,0,0,0,114,42,0,0,0,114,
+    14,0,0,0,90,12,105,109,112,111,114,116,95,101,114,114,
+    111,114,114,102,0,0,0,114,103,0,0,0,114,55,0,0,
+    0,114,72,0,0,0,114,63,0,0,0,114,44,0,0,0,
+    114,138,0,0,0,114,54,0,0,0,90,3,101,120,99,114,
+    85,0,0,0,115,14,0,0,0,32,32,32,32,32,32,32,
+    32,32,32,32,32,32,32,114,11,0,0,0,114,52,0,0,
+    0,114,52,0,0,0,228,2,0,0,115,66,0,0,0,10,
+    1,4,1,14,1,8,1,22,1,2,1,12,1,2,128,12,
+    1,4,1,2,255,2,128,8,3,12,1,4,1,4,1,2,
+    1,18,1,2,128,12,1,14,1,8,128,2,255,2,128,10,
+    3,8,1,2,3,8,1,14,1,4,2,10,1,14,1,18,
+    2,115,76,0,0,0,10,1,4,1,2,1,4,29,8,227,
+    8,1,22,1,2,21,12,237,2,128,2,2,2,255,14,1,
+    2,128,8,2,12,1,4,1,2,1,2,6,2,254,18,254,
+    2,128,2,2,2,255,22,1,8,128,2,0,2,128,10,2,
+    6,1,4,3,8,1,14,1,2,2,2,4,10,253,14,1,
+    18,2,115,14,1,0,0,12,28,29,33,35,43,12,44,5,
+    9,20,24,5,17,42,58,5,83,5,83,9,38,9,15,17,
+    27,29,38,20,24,27,33,20,33,9,17,9,19,9,36,37,
+    52,54,58,54,66,68,76,78,86,98,99,9,100,9,100,9,
+    100,9,44,25,29,25,36,37,45,25,46,13,22,13,22,0,
+    0,9,17,16,24,9,17,9,17,9,17,9,17,13,17,13,
+    17,9,17,0,0,23,32,33,34,23,35,13,20,20,29,30,
+    34,30,42,44,53,20,54,13,17,20,24,13,17,16,26,13,
+    54,17,39,28,43,44,48,50,57,59,67,69,77,79,83,28,
+    84,21,25,21,25,0,0,17,39,24,35,17,39,17,39,17,
+    39,17,39,36,39,21,33,21,33,21,33,21,33,21,33,21,
+    33,0,0,0,0,0,0,0,0,17,39,0,0,24,39,40,
+    47,49,53,24,54,17,21,16,20,24,28,16,28,13,25,17,
+    25,23,32,33,34,23,35,13,20,20,24,26,35,37,44,20,
+    44,13,44,13,44,13,44,12,24,9,83,19,56,42,54,19,
+    56,19,56,13,16,19,33,34,37,44,52,19,53,19,53,59,
+    71,13,71,19,33,34,67,35,43,34,67,34,67,74,82,19,
+    83,19,83,13,83,115,35,0,0,0,158,5,36,2,164,7,
+    46,9,173,1,46,9,190,8,65,7,2,193,7,7,65,26,
+    9,193,14,2,65,21,9,193,21,5,65,26,9,41,46,114,
     95,0,0,0,90,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,22,0,0,0,114,1,0,0,0,114,2,0,0,0,90,


From webhook-mailer at python.org  Mon Aug  9 05:40:30 2021
From: webhook-mailer at python.org (markshannon)
Date: Mon, 09 Aug 2021 09:40:30 -0000
Subject: [Python-checkins] bpo-44826: Specialize STORE_ATTR (GH-27590)
Message-ID: <mailman.948.1628502031.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/ac75f6bdd4748b3378dd321f862d13aa1898f77a
commit: ac75f6bdd4748b3378dd321f862d13aa1898f77a
branch: main
author: Mark Shannon <mark at hotpy.org>
committer: markshannon <mark at hotpy.org>
date: 2021-08-09T10:40:21+01:00
summary:

bpo-44826: Specialize STORE_ATTR (GH-27590)

* Generalize cache names for LOAD_ATTR to allow store and delete specializations.

* Factor out specialization of attribute dictionary access.

* Specialize STORE_ATTR.

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-05-17-49-55.bpo-44826.zQsyK5.rst
M Include/internal/pycore_code.h
M Include/internal/pycore_dict.h
M Include/opcode.h
M Lib/opcode.py
M Objects/dictobject.c
M Python/ceval.c
M Python/opcode_targets.h
M Python/specialize.c

diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
index 312939ee1d26e6..3d8f9c2d228e7f 100644
--- a/Include/internal/pycore_code.h
+++ b/Include/internal/pycore_code.h
@@ -23,7 +23,7 @@ typedef struct {
 typedef struct {
     uint32_t tp_version;
     uint32_t dk_version_or_hint;
-} _PyLoadAttrCache;
+} _PyAttrCache;
 
 typedef struct {
     uint32_t module_keys_version;
@@ -43,7 +43,7 @@ typedef struct {
 typedef union {
     _PyEntryZero zero;
     _PyAdaptiveEntry adaptive;
-    _PyLoadAttrCache load_attr;
+    _PyAttrCache attr;
     _PyLoadGlobalCache load_global;
 } SpecializedCacheEntry;
 
@@ -297,6 +297,7 @@ cache_backoff(_PyAdaptiveEntry *entry) {
 /* Specialization functions */
 
 int _Py_Specialize_LoadAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name, SpecializedCacheEntry *cache);
+int _Py_Specialize_StoreAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name, SpecializedCacheEntry *cache);
 int _Py_Specialize_LoadGlobal(PyObject *globals, PyObject *builtins, _Py_CODEUNIT *instr, PyObject *name, SpecializedCacheEntry *cache);
 int _Py_Specialize_BinarySubscr(PyObject *sub, PyObject *container, _Py_CODEUNIT *instr);
 
diff --git a/Include/internal/pycore_dict.h b/Include/internal/pycore_dict.h
index b2c64b2168cdcf..2becc30beb4d8d 100644
--- a/Include/internal/pycore_dict.h
+++ b/Include/internal/pycore_dict.h
@@ -89,6 +89,9 @@ struct _dictkeysobject {
 #define DK_ENTRIES(dk) \
     ((PyDictKeyEntry*)(&((int8_t*)((dk)->dk_indices))[DK_SIZE(dk) * DK_IXSIZE(dk)]))
 
+extern uint64_t _pydict_global_version;
+
+#define DICT_NEXT_VERSION() (++_pydict_global_version)
 
 #ifdef __cplusplus
 }
diff --git a/Include/opcode.h b/Include/opcode.h
index 7bebb871edb444..50b783289590da 100644
--- a/Include/opcode.h
+++ b/Include/opcode.h
@@ -149,6 +149,10 @@ extern "C" {
 #define LOAD_GLOBAL_ADAPTIVE     41
 #define LOAD_GLOBAL_MODULE       42
 #define LOAD_GLOBAL_BUILTIN      43
+#define STORE_ATTR_ADAPTIVE      44
+#define STORE_ATTR_SPLIT_KEYS    45
+#define STORE_ATTR_SLOT          46
+#define STORE_ATTR_WITH_HINT     47
 #ifdef NEED_OPCODE_JUMP_TABLES
 static uint32_t _PyOpcode_RelativeJump[8] = {
     0U,
diff --git a/Lib/opcode.py b/Lib/opcode.py
index 7735848db0958d..061506d0b88bd9 100644
--- a/Lib/opcode.py
+++ b/Lib/opcode.py
@@ -233,6 +233,10 @@ def jabs_op(name, op):
     "LOAD_GLOBAL_ADAPTIVE",
     "LOAD_GLOBAL_MODULE",
     "LOAD_GLOBAL_BUILTIN",
+    "STORE_ATTR_ADAPTIVE",
+    "STORE_ATTR_SPLIT_KEYS",
+    "STORE_ATTR_SLOT",
+    "STORE_ATTR_WITH_HINT",
 ]
 
 _specialization_stats = [
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-05-17-49-55.bpo-44826.zQsyK5.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-05-17-49-55.bpo-44826.zQsyK5.rst
new file mode 100644
index 00000000000000..ccdb5e0c606c0f
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-05-17-49-55.bpo-44826.zQsyK5.rst	
@@ -0,0 +1,9 @@
+Initial implementation of adaptive specialization of STORE_ATTR
+
+Three specialized forms of STORE_ATTR are added:
+
+* STORE_ATTR_SLOT
+
+* STORE_ATTR_SPLIT_KEYS
+
+* STORE_ATTR_WITH_HINT
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 5ad630feaf1e86..c78cbafe583bdc 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -234,9 +234,7 @@ static PyObject* dict_iter(PyDictObject *dict);
 /*Global counter used to set ma_version_tag field of dictionary.
  * It is incremented each time that a dictionary is created and each
  * time that a dictionary is modified. */
-static uint64_t pydict_global_version = 0;
-
-#define DICT_NEXT_VERSION() (++pydict_global_version)
+uint64_t _pydict_global_version = 0;
 
 #include "clinic/dictobject.c.h"
 
diff --git a/Python/ceval.c b/Python/ceval.c
index e3658b81388321..b7b63856c61c80 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -2766,6 +2766,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
         }
 
         case TARGET(STORE_ATTR): {
+            PREDICTED(STORE_ATTR);
             PyObject *name = GETITEM(names, oparg);
             PyObject *owner = TOP();
             PyObject *v = SECOND();
@@ -3394,7 +3395,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             PyTypeObject *tp = Py_TYPE(owner);
             SpecializedCacheEntry *caches = GET_CACHE();
             _PyAdaptiveEntry *cache0 = &caches[0].adaptive;
-            _PyLoadAttrCache *cache1 = &caches[-1].load_attr;
+            _PyAttrCache *cache1 = &caches[-1].attr;
             assert(cache1->tp_version != 0);
             DEOPT_IF(tp->tp_version_tag != cache1->tp_version, LOAD_ATTR);
             assert(tp->tp_dictoffset > 0);
@@ -3418,7 +3419,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             PyObject *res;
             SpecializedCacheEntry *caches = GET_CACHE();
             _PyAdaptiveEntry *cache0 = &caches[0].adaptive;
-            _PyLoadAttrCache *cache1 = &caches[-1].load_attr;
+            _PyAttrCache *cache1 = &caches[-1].attr;
             DEOPT_IF(!PyModule_CheckExact(owner), LOAD_ATTR);
             PyDictObject *dict = (PyDictObject *)((PyModuleObject *)owner)->md_dict;
             assert(dict != NULL);
@@ -3443,7 +3444,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             PyTypeObject *tp = Py_TYPE(owner);
             SpecializedCacheEntry *caches = GET_CACHE();
             _PyAdaptiveEntry *cache0 = &caches[0].adaptive;
-            _PyLoadAttrCache *cache1 = &caches[-1].load_attr;
+            _PyAttrCache *cache1 = &caches[-1].attr;
             assert(cache1->tp_version != 0);
             DEOPT_IF(tp->tp_version_tag != cache1->tp_version, LOAD_ATTR);
             assert(tp->tp_dictoffset > 0);
@@ -3472,7 +3473,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             PyTypeObject *tp = Py_TYPE(owner);
             SpecializedCacheEntry *caches = GET_CACHE();
             _PyAdaptiveEntry *cache0 = &caches[0].adaptive;
-            _PyLoadAttrCache *cache1 = &caches[-1].load_attr;
+            _PyAttrCache *cache1 = &caches[-1].attr;
             assert(cache1->tp_version != 0);
             DEOPT_IF(tp->tp_version_tag != cache1->tp_version, LOAD_ATTR);
             char *addr = (char *)owner + cache0->index;
@@ -3486,6 +3487,121 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
+        case TARGET(STORE_ATTR_ADAPTIVE): {
+            assert(cframe.use_tracing == 0);
+            SpecializedCacheEntry *cache = GET_CACHE();
+            if (cache->adaptive.counter == 0) {
+                PyObject *owner = TOP();
+                PyObject *name = GETITEM(names, cache->adaptive.original_oparg);
+                next_instr--;
+                if (_Py_Specialize_StoreAttr(owner, next_instr, name, cache) < 0) {
+                    goto error;
+                }
+                DISPATCH();
+            }
+            else {
+                STAT_INC(STORE_ATTR, deferred);
+                cache->adaptive.counter--;
+                oparg = cache->adaptive.original_oparg;
+                JUMP_TO_INSTRUCTION(STORE_ATTR);
+            }
+        }
+
+        case TARGET(STORE_ATTR_SPLIT_KEYS): {
+            assert(cframe.use_tracing == 0);
+            PyObject *owner = TOP();
+            PyTypeObject *tp = Py_TYPE(owner);
+            SpecializedCacheEntry *caches = GET_CACHE();
+            _PyAdaptiveEntry *cache0 = &caches[0].adaptive;
+            _PyAttrCache *cache1 = &caches[-1].attr;
+            assert(cache1->tp_version != 0);
+            DEOPT_IF(tp->tp_version_tag != cache1->tp_version, STORE_ATTR);
+            assert(tp->tp_dictoffset > 0);
+            PyDictObject *dict = *(PyDictObject **)(((char *)owner) + tp->tp_dictoffset);
+            DEOPT_IF(dict == NULL, STORE_ATTR);
+            assert(PyDict_CheckExact((PyObject *)dict));
+            DEOPT_IF(dict->ma_keys->dk_version != cache1->dk_version_or_hint, STORE_ATTR);
+            /* Need to maintain ordering of dicts */
+            DEOPT_IF(cache0->index > 0 && dict->ma_values[cache0->index-1] == NULL, STORE_ATTR);
+            STAT_INC(STORE_ATTR, hit);
+            record_cache_hit(cache0);
+            STACK_SHRINK(1);
+            PyObject *value = POP();
+            PyObject *old_value = dict->ma_values[cache0->index];
+            dict->ma_values[cache0->index] = value;
+            if (old_value == NULL) {
+                dict->ma_used++;
+            }
+            else {
+                Py_DECREF(old_value);
+            }
+            /* Ensure dict is GC tracked if it needs to be */
+            if (!_PyObject_GC_IS_TRACKED(dict) && _PyObject_GC_MAY_BE_TRACKED(value)) {
+                _PyObject_GC_TRACK(dict);
+            }
+            /* PEP 509 */
+            dict->ma_version_tag = DICT_NEXT_VERSION();
+            Py_DECREF(owner);
+            DISPATCH();
+        }
+
+        case TARGET(STORE_ATTR_WITH_HINT): {
+            assert(cframe.use_tracing == 0);
+            PyObject *owner = TOP();
+            PyTypeObject *tp = Py_TYPE(owner);
+            SpecializedCacheEntry *caches = GET_CACHE();
+            _PyAdaptiveEntry *cache0 = &caches[0].adaptive;
+            _PyAttrCache *cache1 = &caches[-1].attr;
+            assert(cache1->tp_version != 0);
+            DEOPT_IF(tp->tp_version_tag != cache1->tp_version, STORE_ATTR);
+            assert(tp->tp_dictoffset > 0);
+            PyDictObject *dict = *(PyDictObject **)(((char *)owner) + tp->tp_dictoffset);
+            DEOPT_IF(dict == NULL, STORE_ATTR);
+            assert(PyDict_CheckExact((PyObject *)dict));
+            PyObject *name = GETITEM(names, cache0->original_oparg);
+            uint32_t hint = cache1->dk_version_or_hint;
+            DEOPT_IF(hint >= dict->ma_keys->dk_nentries, STORE_ATTR);
+            PyDictKeyEntry *ep = DK_ENTRIES(dict->ma_keys) + hint;
+            DEOPT_IF(ep->me_key != name, STORE_ATTR);
+            PyObject *old_value = ep->me_value;
+            DEOPT_IF(old_value == NULL, STORE_ATTR);
+            STAT_INC(STORE_ATTR, hit);
+            record_cache_hit(cache0);
+            STACK_SHRINK(1);
+            PyObject *value = POP();
+            ep->me_value = value;
+            Py_DECREF(old_value);
+            /* Ensure dict is GC tracked if it needs to be */
+            if (!_PyObject_GC_IS_TRACKED(dict) && _PyObject_GC_MAY_BE_TRACKED(value)) {
+                _PyObject_GC_TRACK(dict);
+            }
+            /* PEP 509 */
+            dict->ma_version_tag = DICT_NEXT_VERSION();
+            Py_DECREF(owner);
+            DISPATCH();
+        }
+
+        case TARGET(STORE_ATTR_SLOT): {
+            assert(cframe.use_tracing == 0);
+            PyObject *owner = TOP();
+            PyTypeObject *tp = Py_TYPE(owner);
+            SpecializedCacheEntry *caches = GET_CACHE();
+            _PyAdaptiveEntry *cache0 = &caches[0].adaptive;
+            _PyAttrCache *cache1 = &caches[-1].attr;
+            assert(cache1->tp_version != 0);
+            DEOPT_IF(tp->tp_version_tag != cache1->tp_version, STORE_ATTR);
+            char *addr = (char *)owner + cache0->index;
+            STAT_INC(STORE_ATTR, hit);
+            record_cache_hit(cache0);
+            STACK_SHRINK(1);
+            PyObject *value = POP();
+            PyObject *old_value = *(PyObject **)addr;
+            *(PyObject **)addr = value;
+            Py_XDECREF(old_value);
+            Py_DECREF(owner);
+            DISPATCH();
+        }
+
         case TARGET(COMPARE_OP): {
             assert(oparg <= Py_GE);
             PyObject *right = POP();
@@ -4429,6 +4545,7 @@ opname ## _miss: \
     }
 
 MISS_WITH_CACHE(LOAD_ATTR)
+MISS_WITH_CACHE(STORE_ATTR)
 MISS_WITH_CACHE(LOAD_GLOBAL)
 MISS_WITH_OPARG_COUNTER(BINARY_SUBSCR)
 
diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h
index d88c766c07ab46..24ee44f2d08c07 100644
--- a/Python/opcode_targets.h
+++ b/Python/opcode_targets.h
@@ -43,10 +43,10 @@ static void *opcode_targets[256] = {
     &&TARGET_LOAD_GLOBAL_ADAPTIVE,
     &&TARGET_LOAD_GLOBAL_MODULE,
     &&TARGET_LOAD_GLOBAL_BUILTIN,
-    &&_unknown_opcode,
-    &&_unknown_opcode,
-    &&_unknown_opcode,
-    &&_unknown_opcode,
+    &&TARGET_STORE_ATTR_ADAPTIVE,
+    &&TARGET_STORE_ATTR_SPLIT_KEYS,
+    &&TARGET_STORE_ATTR_SLOT,
+    &&TARGET_STORE_ATTR_WITH_HINT,
     &&_unknown_opcode,
     &&TARGET_WITH_EXCEPT_START,
     &&TARGET_GET_AITER,
diff --git a/Python/specialize.c b/Python/specialize.c
index 1ca49d244a87b0..effbca269bff1b 100644
--- a/Python/specialize.c
+++ b/Python/specialize.c
@@ -173,6 +173,7 @@ _Py_PrintSpecializationStats(void)
     print_stats(out, &_specialization_stats[LOAD_ATTR], "load_attr");
     print_stats(out, &_specialization_stats[LOAD_GLOBAL], "load_global");
     print_stats(out, &_specialization_stats[BINARY_SUBSCR], "binary_subscr");
+    print_stats(out, &_specialization_stats[STORE_ATTR], "store_attr");
     if (out != stderr) {
         fclose(out);
     }
@@ -262,13 +263,15 @@ static uint8_t adaptive_opcodes[256] = {
     [LOAD_ATTR] = LOAD_ATTR_ADAPTIVE,
     [LOAD_GLOBAL] = LOAD_GLOBAL_ADAPTIVE,
     [BINARY_SUBSCR] = BINARY_SUBSCR_ADAPTIVE,
+    [STORE_ATTR] = STORE_ATTR_ADAPTIVE,
 };
 
 /* The number of cache entries required for a "family" of instructions. */
 static uint8_t cache_requirements[256] = {
-    [LOAD_ATTR] = 2, /* _PyAdaptiveEntry and _PyLoadAttrCache */
+    [LOAD_ATTR] = 2, /* _PyAdaptiveEntry and _PyAttrCache */
     [LOAD_GLOBAL] = 2, /* _PyAdaptiveEntry and _PyLoadGlobalCache */
     [BINARY_SUBSCR] = 0,
+    [STORE_ATTR] = 2, /* _PyAdaptiveEntry and _PyAttrCache */
 };
 
 /* Return the oparg for the cache_offset and instruction index.
@@ -416,7 +419,7 @@ _Py_Quicken(PyCodeObject *code) {
 static int
 specialize_module_load_attr(
     PyObject *owner, _Py_CODEUNIT *instr, PyObject *name,
-    _PyAdaptiveEntry *cache0, _PyLoadAttrCache *cache1)
+    _PyAdaptiveEntry *cache0, _PyAttrCache *cache1)
 {
     PyModuleObject *m = (PyModuleObject *)owner;
     PyObject *value = NULL;
@@ -475,15 +478,24 @@ typedef enum {
     MUTABLE,   /* Instance of a mutable class; might, or might not, be a descriptor */
     ABSENT, /* Attribute is not present on the class */
     DUNDER_CLASS, /* __class__ attribute */
-    GETATTRIBUTE_OVERRIDDEN /* __getattribute__ has been overridden */
+    GETSET_OVERRIDDEN /* __getattribute__ or __setattr__ has been overridden */
 } DesciptorClassification;
 
+
 static DesciptorClassification
-analyze_descriptor(PyTypeObject *type, PyObject *name, PyObject **descr)
+analyze_descriptor(PyTypeObject *type, PyObject *name, PyObject **descr, int store)
 {
-    if (type->tp_getattro != PyObject_GenericGetAttr) {
-        *descr = NULL;
-        return GETATTRIBUTE_OVERRIDDEN;
+    if (store) {
+        if (type->tp_setattro != PyObject_GenericSetAttr) {
+            *descr = NULL;
+            return GETSET_OVERRIDDEN;
+        }
+    }
+    else {
+        if (type->tp_getattro != PyObject_GenericGetAttr) {
+            *descr = NULL;
+            return GETSET_OVERRIDDEN;
+        }
     }
     PyObject *descriptor = _PyType_Lookup(type, name);
     *descr = descriptor;
@@ -522,11 +534,92 @@ analyze_descriptor(PyTypeObject *type, PyObject *name, PyObject **descr)
     return NON_DESCRIPTOR;
 }
 
+static int
+specialize_dict_access(
+    PyObject *owner, _Py_CODEUNIT *instr, PyTypeObject *type,
+    DesciptorClassification kind, PyObject *name,
+    _PyAdaptiveEntry *cache0, _PyAttrCache *cache1,
+    int base_op, int split_op, int hint_op)
+{
+    assert(kind == NON_OVERRIDING || kind == NON_DESCRIPTOR || kind == ABSENT);
+    // No desciptor, or non overriding.
+    if (type->tp_dictoffset < 0) {
+        SPECIALIZATION_FAIL(base_op, type, name, "negative offset");
+        return 0;
+    }
+    if (type->tp_dictoffset > 0) {
+        PyObject **dictptr = (PyObject **) ((char *)owner + type->tp_dictoffset);
+        if (*dictptr == NULL || !PyDict_CheckExact(*dictptr)) {
+            SPECIALIZATION_FAIL(base_op, type, name, "no dict or not a dict");
+            return 0;
+        }
+        // We found an instance with a __dict__.
+        PyDictObject *dict = (PyDictObject *)*dictptr;
+        if ((type->tp_flags & Py_TPFLAGS_HEAPTYPE)
+            && dict->ma_keys == ((PyHeapTypeObject*)type)->ht_cached_keys
+        ) {
+            // Keys are shared
+            assert(PyUnicode_CheckExact(name));
+            Py_hash_t hash = PyObject_Hash(name);
+            if (hash == -1) {
+                return -1;
+            }
+            PyObject *value;
+            Py_ssize_t index = _Py_dict_lookup(dict, name, hash, &value);
+            assert (index != DKIX_ERROR);
+            if (index != (uint16_t)index) {
+                SPECIALIZATION_FAIL(base_op, type, name,
+                                    index < 0 ? "attribute not in dict" : "index out of range");
+                return 0;
+            }
+            uint32_t keys_version = _PyDictKeys_GetVersionForCurrentState(dict);
+            if (keys_version == 0) {
+                SPECIALIZATION_FAIL(base_op, type, name, "no more key versions");
+                return 0;
+            }
+            cache1->dk_version_or_hint = keys_version;
+            cache1->tp_version = type->tp_version_tag;
+            cache0->index = (uint16_t)index;
+            *instr = _Py_MAKECODEUNIT(split_op, _Py_OPARG(*instr));
+            return 0;
+        }
+        else {
+            PyObject *value = NULL;
+            Py_ssize_t hint =
+                _PyDict_GetItemHint(dict, name, -1, &value);
+            if (hint != (uint32_t)hint) {
+                SPECIALIZATION_FAIL(base_op, type, name, "hint out of range");
+                return 0;
+            }
+            cache1->dk_version_or_hint = (uint32_t)hint;
+            cache1->tp_version = type->tp_version_tag;
+            *instr = _Py_MAKECODEUNIT(hint_op, _Py_OPARG(*instr));
+            return 1;
+        }
+    }
+    assert(type->tp_dictoffset == 0);
+    /* No attribute in instance dictionary */
+    switch(kind) {
+        case NON_OVERRIDING:
+            SPECIALIZATION_FAIL(base_op, type, name, "non-overriding descriptor");
+            return 0;
+        case NON_DESCRIPTOR:
+            /* To do -- Optimize this case */
+            SPECIALIZATION_FAIL(base_op, type, name, "non descriptor");
+            return 0;
+        case ABSENT:
+            SPECIALIZATION_FAIL(base_op, type, name, "no attribute");
+            return 0;
+        default:
+            Py_UNREACHABLE();
+    }
+}
+
 int
 _Py_Specialize_LoadAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name, SpecializedCacheEntry *cache)
 {
     _PyAdaptiveEntry *cache0 = &cache->adaptive;
-    _PyLoadAttrCache *cache1 = &cache[-1].load_attr;
+    _PyAttrCache *cache1 = &cache[-1].attr;
     if (PyModule_CheckExact(owner)) {
         int err = specialize_module_load_attr(owner, instr, name, cache0, cache1);
         if (err) {
@@ -541,7 +634,7 @@ _Py_Specialize_LoadAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name, Sp
         }
     }
     PyObject *descr;
-    DesciptorClassification kind = analyze_descriptor(type, name, &descr);
+    DesciptorClassification kind = analyze_descriptor(type, name, &descr, 0);
     switch(kind) {
         case OVERRIDING:
             SPECIALIZATION_FAIL(LOAD_ATTR, type, name, "overriding descriptor");
@@ -557,6 +650,10 @@ _Py_Specialize_LoadAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name, Sp
             PyMemberDescrObject *member = (PyMemberDescrObject *)descr;
             struct PyMemberDef *dmem = member->d_member;
             Py_ssize_t offset = dmem->offset;
+            if (dmem->flags & PY_AUDIT_READ) {
+                SPECIALIZATION_FAIL(LOAD_ATTR, type, name, "audit read");
+                goto fail;
+            }
             if (offset != (uint16_t)offset) {
                 SPECIALIZATION_FAIL(LOAD_ATTR, type, name, "offset out of range");
                 goto fail;
@@ -583,7 +680,7 @@ _Py_Specialize_LoadAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name, Sp
         case MUTABLE:
             SPECIALIZATION_FAIL(LOAD_ATTR, type, name, "mutable class attribute");
             goto fail;
-        case GETATTRIBUTE_OVERRIDDEN:
+        case GETSET_OVERRIDDEN:
             SPECIALIZATION_FAIL(LOAD_ATTR, type, name, "__getattribute__ overridden");
             goto fail;
         case NON_OVERRIDING:
@@ -591,90 +688,109 @@ _Py_Specialize_LoadAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name, Sp
         case ABSENT:
             break;
     }
-    assert(kind == NON_OVERRIDING || kind == NON_DESCRIPTOR || kind == ABSENT);
-    // No desciptor, or non overriding.
-    if (type->tp_dictoffset < 0) {
-        SPECIALIZATION_FAIL(LOAD_ATTR, type, name, "negative offset");
+    int err = specialize_dict_access(
+        owner, instr, type, kind, name, cache0, cache1,
+        LOAD_ATTR, LOAD_ATTR_SPLIT_KEYS, LOAD_ATTR_WITH_HINT
+    );
+    if (err < 0) {
+        return -1;
+    }
+    if (err) {
+        goto success;
+    }
+fail:
+    STAT_INC(LOAD_ATTR, specialization_failure);
+    assert(!PyErr_Occurred());
+    cache_backoff(cache0);
+    return 0;
+success:
+    STAT_INC(LOAD_ATTR, specialization_success);
+    assert(!PyErr_Occurred());
+    cache0->counter = saturating_start();
+    return 0;
+}
+
+int
+_Py_Specialize_StoreAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name, SpecializedCacheEntry *cache)
+{
+    _PyAdaptiveEntry *cache0 = &cache->adaptive;
+    _PyAttrCache *cache1 = &cache[-1].attr;
+    PyTypeObject *type = Py_TYPE(owner);
+    if (PyModule_CheckExact(owner)) {
+        SPECIALIZATION_FAIL(STORE_ATTR, type, name, "module attribute");
         goto fail;
     }
-    if (type->tp_dictoffset > 0) {
-        PyObject **dictptr = (PyObject **) ((char *)owner + type->tp_dictoffset);
-        if (*dictptr == NULL || !PyDict_CheckExact(*dictptr)) {
-            SPECIALIZATION_FAIL(LOAD_ATTR, type, name, "no dict or not a dict");
+    PyObject *descr;
+    DesciptorClassification kind = analyze_descriptor(type, name, &descr, 1);
+    switch(kind) {
+        case OVERRIDING:
+            SPECIALIZATION_FAIL(STORE_ATTR, type, name, "overriding descriptor");
             goto fail;
-        }
-        // We found an instance with a __dict__.
-        PyDictObject *dict = (PyDictObject *)*dictptr;
-        if ((type->tp_flags & Py_TPFLAGS_HEAPTYPE)
-            && dict->ma_keys == ((PyHeapTypeObject*)type)->ht_cached_keys
-        ) {
-            // Keys are shared
-            assert(PyUnicode_CheckExact(name));
-            Py_hash_t hash = PyObject_Hash(name);
-            if (hash == -1) {
-                return -1;
-            }
-            PyObject *value;
-            Py_ssize_t index = _Py_dict_lookup(dict, name, hash, &value);
-            assert (index != DKIX_ERROR);
-            if (index != (uint16_t)index) {
-                SPECIALIZATION_FAIL(LOAD_ATTR, type, name,
-                                    index < 0 ? "attribute not in dict" : "index out of range");
-                goto fail;
-            }
-            uint32_t keys_version = _PyDictKeys_GetVersionForCurrentState(dict);
-            if (keys_version == 0) {
-                SPECIALIZATION_FAIL(LOAD_ATTR, type, name, "no more key versions");
+        case METHOD:
+            SPECIALIZATION_FAIL(STORE_ATTR, type, name, "method");
+            goto fail;
+        case PROPERTY:
+            SPECIALIZATION_FAIL(STORE_ATTR, type, name, "property");
+            goto fail;
+        case OBJECT_SLOT:
+        {
+            PyMemberDescrObject *member = (PyMemberDescrObject *)descr;
+            struct PyMemberDef *dmem = member->d_member;
+            Py_ssize_t offset = dmem->offset;
+            if (dmem->flags & READONLY) {
+                SPECIALIZATION_FAIL(STORE_ATTR, type, name, "read only");
                 goto fail;
             }
-            cache1->dk_version_or_hint = keys_version;
-            cache1->tp_version = type->tp_version_tag;
-            cache0->index = (uint16_t)index;
-            *instr = _Py_MAKECODEUNIT(LOAD_ATTR_SPLIT_KEYS, _Py_OPARG(*instr));
-            goto success;
-        }
-        else {
-            PyObject *value = NULL;
-            Py_ssize_t hint =
-                _PyDict_GetItemHint(dict, name, -1, &value);
-            if (hint != (uint32_t)hint) {
-                SPECIALIZATION_FAIL(LOAD_ATTR, type, name, "hint out of range");
+            if (offset != (uint16_t)offset) {
+                SPECIALIZATION_FAIL(STORE_ATTR, type, name, "offset out of range");
                 goto fail;
             }
-            cache1->dk_version_or_hint = (uint32_t)hint;
+            assert(dmem->type == T_OBJECT_EX);
+            assert(offset > 0);
+            cache0->index = (uint16_t)offset;
             cache1->tp_version = type->tp_version_tag;
-            *instr = _Py_MAKECODEUNIT(LOAD_ATTR_WITH_HINT, _Py_OPARG(*instr));
+            *instr = _Py_MAKECODEUNIT(STORE_ATTR_SLOT, _Py_OPARG(*instr));
             goto success;
         }
-    }
-    assert(type->tp_dictoffset == 0);
-    /* No attribute in instance dictionary */
-    switch(kind) {
-        case NON_OVERRIDING:
-            SPECIALIZATION_FAIL(LOAD_ATTR, type, name, "non-overriding descriptor");
+        case DUNDER_CLASS:
+        case OTHER_SLOT:
+            SPECIALIZATION_FAIL(STORE_ATTR, type, name, "other slot");
             goto fail;
-        case NON_DESCRIPTOR:
-            /* To do -- Optimize this case */
-            SPECIALIZATION_FAIL(LOAD_ATTR, type, name, "non descriptor");
+        case MUTABLE:
+            SPECIALIZATION_FAIL(STORE_ATTR, type, name, "mutable class attribute");
             goto fail;
-        case ABSENT:
-            SPECIALIZATION_FAIL(LOAD_ATTR, type, name, "no attribute");
+        case GETSET_OVERRIDDEN:
+            SPECIALIZATION_FAIL(STORE_ATTR, type, name, "__setattr__ overridden");
             goto fail;
-        default:
-            Py_UNREACHABLE();
+        case NON_OVERRIDING:
+        case NON_DESCRIPTOR:
+        case ABSENT:
+            break;
+    }
+
+    int err = specialize_dict_access(
+        owner, instr, type, kind, name, cache0, cache1,
+        STORE_ATTR, STORE_ATTR_SPLIT_KEYS, STORE_ATTR_WITH_HINT
+    );
+    if (err < 0) {
+        return -1;
+    }
+    if (err) {
+        goto success;
     }
 fail:
-    STAT_INC(LOAD_ATTR, specialization_failure);
+    STAT_INC(STORE_ATTR, specialization_failure);
     assert(!PyErr_Occurred());
     cache_backoff(cache0);
     return 0;
 success:
-    STAT_INC(LOAD_ATTR, specialization_success);
+    STAT_INC(STORE_ATTR, specialization_success);
     assert(!PyErr_Occurred());
     cache0->counter = saturating_start();
     return 0;
 }
 
+
 int
 _Py_Specialize_LoadGlobal(
     PyObject *globals, PyObject *builtins,


From webhook-mailer at python.org  Mon Aug  9 05:54:53 2021
From: webhook-mailer at python.org (pablogsal)
Date: Mon, 09 Aug 2021 09:54:53 -0000
Subject: [Python-checkins] bpo-44840: Compiler: Move duplication of exit
 blocks with no line numbers to after CFG optimization. (GH-27656) (#27673)
Message-ID: <mailman.949.1628502895.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/762ef85f441cdec002cb4e812b9e77ae5033e571
commit: 762ef85f441cdec002cb4e812b9e77ae5033e571
branch: 3.10
author: Mark Shannon <mark at hotpy.org>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-08-09T10:54:48+01:00
summary:

bpo-44840: Compiler: Move duplication of exit blocks with no line numbers to after CFG optimization. (GH-27656) (#27673)

(cherry picked from commit b854557b49083d8625a433eb36aacb0c87d67c52)

files:
M Lib/test/test_dis.py
M Lib/test/test_sys_settrace.py
M Python/compile.c
M Python/importlib.h
M Python/importlib_external.h
M Python/importlib_zipimport.h

diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
index a8c2e4d153b8f..d03aa75a6a9a0 100644
--- a/Lib/test/test_dis.py
+++ b/Lib/test/test_dis.py
@@ -1059,17 +1059,17 @@ def jumpy():
   Instruction(opname='LOAD_CONST', opcode=100, arg=6, argval='Who let lolcatz into this test suite?', argrepr="'Who let lolcatz into this test suite?'", offset=98, starts_line=None, is_jump_target=False),
   Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=100, starts_line=None, is_jump_target=False),
   Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=102, starts_line=None, is_jump_target=False),
-  Instruction(opname='SETUP_FINALLY', opcode=122, arg=48, argval=202, argrepr='to 202', offset=104, starts_line=20, is_jump_target=True),
+  Instruction(opname='SETUP_FINALLY', opcode=122, arg=63, argval=232, argrepr='to 232', offset=104, starts_line=20, is_jump_target=True),
   Instruction(opname='SETUP_FINALLY', opcode=122, arg=6, argval=120, argrepr='to 120', offset=106, starts_line=None, is_jump_target=False),
   Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval=1, argrepr='1', offset=108, starts_line=21, is_jump_target=False),
   Instruction(opname='LOAD_CONST', opcode=100, arg=7, argval=0, argrepr='0', offset=110, starts_line=None, is_jump_target=False),
   Instruction(opname='BINARY_TRUE_DIVIDE', opcode=27, arg=None, argval=None, argrepr='', offset=112, starts_line=None, is_jump_target=False),
   Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=114, starts_line=None, is_jump_target=False),
   Instruction(opname='POP_BLOCK', opcode=87, arg=None, argval=None, argrepr='', offset=116, starts_line=None, is_jump_target=False),
-  Instruction(opname='JUMP_FORWARD', opcode=110, arg=12, argval=144, argrepr='to 144', offset=118, starts_line=None, is_jump_target=False),
+  Instruction(opname='JUMP_FORWARD', opcode=110, arg=13, argval=146, argrepr='to 146', offset=118, starts_line=None, is_jump_target=False),
   Instruction(opname='DUP_TOP', opcode=4, arg=None, argval=None, argrepr='', offset=120, starts_line=22, is_jump_target=True),
   Instruction(opname='LOAD_GLOBAL', opcode=116, arg=2, argval='ZeroDivisionError', argrepr='ZeroDivisionError', offset=122, starts_line=None, is_jump_target=False),
-  Instruction(opname='JUMP_IF_NOT_EXC_MATCH', opcode=121, arg=120, argval=240, argrepr='to 240', offset=124, starts_line=None, is_jump_target=False),
+  Instruction(opname='JUMP_IF_NOT_EXC_MATCH', opcode=121, arg=72, argval=144, argrepr='to 144', offset=124, starts_line=None, is_jump_target=False),
   Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=126, starts_line=None, is_jump_target=False),
   Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=128, starts_line=None, is_jump_target=False),
   Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=130, starts_line=None, is_jump_target=False),
@@ -1078,56 +1078,56 @@ def jumpy():
   Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=136, starts_line=None, is_jump_target=False),
   Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=138, starts_line=None, is_jump_target=False),
   Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=140, starts_line=None, is_jump_target=False),
-  Instruction(opname='JUMP_FORWARD', opcode=110, arg=41, argval=226, argrepr='to 226', offset=142, starts_line=None, is_jump_target=False),
-  Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=144, starts_line=25, is_jump_target=True),
-  Instruction(opname='SETUP_WITH', opcode=143, arg=12, argval=172, argrepr='to 172', offset=146, starts_line=None, is_jump_target=False),
-  Instruction(opname='STORE_FAST', opcode=125, arg=1, argval='dodgy', argrepr='dodgy', offset=148, starts_line=None, is_jump_target=False),
-  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=150, starts_line=26, is_jump_target=False),
-  Instruction(opname='LOAD_CONST', opcode=100, arg=9, argval='Never reach this', argrepr="'Never reach this'", offset=152, starts_line=None, is_jump_target=False),
-  Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=154, starts_line=None, is_jump_target=False),
-  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=156, starts_line=None, is_jump_target=False),
-  Instruction(opname='POP_BLOCK', opcode=87, arg=None, argval=None, argrepr='', offset=158, starts_line=None, is_jump_target=False),
-  Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=160, starts_line=25, is_jump_target=False),
-  Instruction(opname='DUP_TOP', opcode=4, arg=None, argval=None, argrepr='', offset=162, starts_line=None, is_jump_target=False),
+  Instruction(opname='JUMP_FORWARD', opcode=110, arg=30, argval=204, argrepr='to 204', offset=142, starts_line=None, is_jump_target=False),
+  Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=144, starts_line=22, is_jump_target=True),
+  Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=146, starts_line=25, is_jump_target=True),
+  Instruction(opname='SETUP_WITH', opcode=143, arg=12, argval=174, argrepr='to 174', offset=148, starts_line=None, is_jump_target=False),
+  Instruction(opname='STORE_FAST', opcode=125, arg=1, argval='dodgy', argrepr='dodgy', offset=150, starts_line=None, is_jump_target=False),
+  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=152, starts_line=26, is_jump_target=False),
+  Instruction(opname='LOAD_CONST', opcode=100, arg=9, argval='Never reach this', argrepr="'Never reach this'", offset=154, starts_line=None, is_jump_target=False),
+  Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=156, starts_line=None, is_jump_target=False),
+  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=158, starts_line=None, is_jump_target=False),
+  Instruction(opname='POP_BLOCK', opcode=87, arg=None, argval=None, argrepr='', offset=160, starts_line=None, is_jump_target=False),
+  Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=162, starts_line=25, is_jump_target=False),
   Instruction(opname='DUP_TOP', opcode=4, arg=None, argval=None, argrepr='', offset=164, starts_line=None, is_jump_target=False),
-  Instruction(opname='CALL_FUNCTION', opcode=131, arg=3, argval=3, argrepr='', offset=166, starts_line=None, is_jump_target=False),
-  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=168, starts_line=None, is_jump_target=False),
-  Instruction(opname='JUMP_FORWARD', opcode=110, arg=20, argval=212, argrepr='to 212', offset=170, starts_line=None, is_jump_target=False),
-  Instruction(opname='WITH_EXCEPT_START', opcode=49, arg=None, argval=None, argrepr='', offset=172, starts_line=None, is_jump_target=True),
-  Instruction(opname='POP_JUMP_IF_TRUE', opcode=115, arg=89, argval=178, argrepr='to 178', offset=174, starts_line=None, is_jump_target=False),
-  Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=176, starts_line=None, is_jump_target=False),
-  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=178, starts_line=None, is_jump_target=True),
-  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=180, starts_line=None, is_jump_target=False),
+  Instruction(opname='DUP_TOP', opcode=4, arg=None, argval=None, argrepr='', offset=166, starts_line=None, is_jump_target=False),
+  Instruction(opname='CALL_FUNCTION', opcode=131, arg=3, argval=3, argrepr='', offset=168, starts_line=None, is_jump_target=False),
+  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=170, starts_line=None, is_jump_target=False),
+  Instruction(opname='JUMP_FORWARD', opcode=110, arg=22, argval=218, argrepr='to 218', offset=172, starts_line=None, is_jump_target=False),
+  Instruction(opname='WITH_EXCEPT_START', opcode=49, arg=None, argval=None, argrepr='', offset=174, starts_line=None, is_jump_target=True),
+  Instruction(opname='POP_JUMP_IF_TRUE', opcode=115, arg=90, argval=180, argrepr='to 180', offset=176, starts_line=None, is_jump_target=False),
+  Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=178, starts_line=None, is_jump_target=False),
+  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=180, starts_line=None, is_jump_target=True),
   Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=182, starts_line=None, is_jump_target=False),
-  Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=184, starts_line=None, is_jump_target=False),
-  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=186, starts_line=None, is_jump_target=False),
-  Instruction(opname='POP_BLOCK', opcode=87, arg=None, argval=None, argrepr='', offset=188, starts_line=None, is_jump_target=False),
-  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=190, starts_line=28, is_jump_target=False),
-  Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=192, starts_line=None, is_jump_target=False),
-  Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=194, starts_line=None, is_jump_target=False),
-  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=196, starts_line=None, is_jump_target=False),
-  Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=198, starts_line=None, is_jump_target=False),
-  Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=200, starts_line=None, is_jump_target=False),
-  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=202, starts_line=None, is_jump_target=True),
-  Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=204, starts_line=None, is_jump_target=False),
-  Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=206, starts_line=None, is_jump_target=False),
-  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=208, starts_line=None, is_jump_target=False),
-  Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=210, starts_line=None, is_jump_target=False),
-  Instruction(opname='POP_BLOCK', opcode=87, arg=None, argval=None, argrepr='', offset=212, starts_line=25, is_jump_target=True),
-  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=214, starts_line=28, is_jump_target=False),
-  Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=216, starts_line=None, is_jump_target=False),
-  Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=218, starts_line=None, is_jump_target=False),
-  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=220, starts_line=None, is_jump_target=False),
-  Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=222, starts_line=None, is_jump_target=False),
-  Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=224, starts_line=None, is_jump_target=False),
-  Instruction(opname='POP_BLOCK', opcode=87, arg=None, argval=None, argrepr='', offset=226, starts_line=23, is_jump_target=True),
-  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=228, starts_line=28, is_jump_target=False),
-  Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=230, starts_line=None, is_jump_target=False),
-  Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=232, starts_line=None, is_jump_target=False),
-  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=234, starts_line=None, is_jump_target=False),
-  Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=236, starts_line=None, is_jump_target=False),
-  Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=238, starts_line=None, is_jump_target=False),
-  Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=240, starts_line=22, is_jump_target=True),
+  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=184, starts_line=None, is_jump_target=False),
+  Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=186, starts_line=None, is_jump_target=False),
+  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=188, starts_line=None, is_jump_target=False),
+  Instruction(opname='POP_BLOCK', opcode=87, arg=None, argval=None, argrepr='', offset=190, starts_line=None, is_jump_target=False),
+  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=192, starts_line=28, is_jump_target=False),
+  Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=194, starts_line=None, is_jump_target=False),
+  Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=196, starts_line=None, is_jump_target=False),
+  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=198, starts_line=None, is_jump_target=False),
+  Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=200, starts_line=None, is_jump_target=False),
+  Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=202, starts_line=None, is_jump_target=False),
+  Instruction(opname='POP_BLOCK', opcode=87, arg=None, argval=None, argrepr='', offset=204, starts_line=23, is_jump_target=True),
+  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=206, starts_line=28, is_jump_target=False),
+  Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=208, starts_line=None, is_jump_target=False),
+  Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=210, starts_line=None, is_jump_target=False),
+  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=212, starts_line=None, is_jump_target=False),
+  Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=214, starts_line=None, is_jump_target=False),
+  Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=216, starts_line=None, is_jump_target=False),
+  Instruction(opname='POP_BLOCK', opcode=87, arg=None, argval=None, argrepr='', offset=218, starts_line=25, is_jump_target=True),
+  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=220, starts_line=28, is_jump_target=False),
+  Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=222, starts_line=None, is_jump_target=False),
+  Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=224, starts_line=None, is_jump_target=False),
+  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=226, starts_line=None, is_jump_target=False),
+  Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=228, starts_line=None, is_jump_target=False),
+  Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=230, starts_line=None, is_jump_target=False),
+  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=232, starts_line=None, is_jump_target=True),
+  Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=234, starts_line=None, is_jump_target=False),
+  Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=236, starts_line=None, is_jump_target=False),
+  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=238, starts_line=None, is_jump_target=False),
+  Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=240, starts_line=None, is_jump_target=False),
 ]
 
 # One last piece of inspect fodder to check the default line number handling
diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py
index 213c88b404010..4f13bbd6bfda2 100644
--- a/Lib/test/test_sys_settrace.py
+++ b/Lib/test/test_sys_settrace.py
@@ -894,6 +894,29 @@ def func():
              (4, 'line'),
              (4, 'return')])
 
+    def test_nested_ifs_with_and(self):
+
+        def func():
+            if A:
+                if B:
+                    if C:
+                        if D:
+                            return False
+                else:
+                    return False
+            elif E and F:
+                return True
+
+        A = B = True
+        C = False
+
+        self.run_and_compare(func,
+            [(0, 'call'),
+             (1, 'line'),
+             (2, 'line'),
+             (3, 'line'),
+             (3, 'return')])
+
     def test_nested_try_if(self):
 
         def func():
diff --git a/Python/compile.c b/Python/compile.c
index de2a6bf296a4e..edc77e50c9b6c 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -862,7 +862,7 @@ compiler_copy_block(struct compiler *c, basicblock *block)
      * a block can only have one fallthrough predecessor.
      */
     assert(block->b_nofallthrough);
-    basicblock *result = compiler_next_block(c);
+    basicblock *result = compiler_new_block(c);
     if (result == NULL) {
         return NULL;
     }
@@ -6980,8 +6980,9 @@ normalize_basic_block(basicblock *bb);
 static int
 optimize_cfg(struct compiler *c, struct assembler *a, PyObject *consts);
 
+/* Duplicates exit BBs, so that line numbers can be propagated to them */
 static int
-ensure_exits_have_lineno(struct compiler *c);
+duplicate_exits_without_lineno(struct compiler *c);
 
 static int
 extend_block(basicblock *bb);
@@ -7035,10 +7036,10 @@ guarantee_lineno_for_exits(struct assembler *a, int firstlineno) {
         }
         struct instr *last = &b->b_instr[b->b_iused-1];
         if (last->i_lineno < 0) {
-            if (last->i_opcode == RETURN_VALUE)
-            {
+            if (last->i_opcode == RETURN_VALUE) {
                 for (int i = 0; i < b->b_iused; i++) {
                     assert(b->b_instr[i].i_lineno < 0);
+
                     b->b_instr[i].i_lineno = lineno;
                 }
             }
@@ -7049,6 +7050,9 @@ guarantee_lineno_for_exits(struct assembler *a, int firstlineno) {
     }
 }
 
+static void
+propagate_line_numbers(struct assembler *a);
+
 static PyCodeObject *
 assemble(struct compiler *c, int addNone)
 {
@@ -7081,10 +7085,6 @@ assemble(struct compiler *c, int addNone)
         }
     }
 
-    if (ensure_exits_have_lineno(c)) {
-        return NULL;
-    }
-
     nblocks = 0;
     entryblock = NULL;
     for (b = c->u->u_blocks; b != NULL; b = b->b_list) {
@@ -7118,8 +7118,11 @@ assemble(struct compiler *c, int addNone)
     if (optimize_cfg(c, &a, consts)) {
         goto error;
     }
+    if (duplicate_exits_without_lineno(c)) {
+        return NULL;
+    }
+    propagate_line_numbers(&a);
     guarantee_lineno_for_exits(&a, c->u->u_firstlineno);
-
     /* Can't modify the bytecode after computing jump offsets. */
     assemble_jump_offsets(&a, c);
 
@@ -7691,7 +7694,7 @@ eliminate_empty_basic_blocks(basicblock *entry) {
  * but has no impact on the generated line number events.
  */
 static void
-propogate_line_numbers(struct assembler *a) {
+propagate_line_numbers(struct assembler *a) {
     for (basicblock *b = a->a_entry; b != NULL; b = b->b_next) {
         if (b->b_iused == 0) {
             continue;
@@ -7748,6 +7751,11 @@ optimize_cfg(struct compiler *c, struct assembler *a, PyObject *consts)
         clean_basic_block(b, -1);
         assert(b->b_predecessors == 0);
     }
+    for (basicblock *b = c->u->u_blocks; b != NULL; b = b->b_list) {
+        if (extend_block(b)) {
+            return -1;
+        }
+    }
     if (mark_reachable(a)) {
         return -1;
     }
@@ -7792,7 +7800,6 @@ optimize_cfg(struct compiler *c, struct assembler *a, PyObject *consts)
     if (maybe_empty_blocks) {
         eliminate_empty_basic_blocks(a->a_entry);
     }
-    propogate_line_numbers(a);
     return 0;
 }
 
@@ -7811,7 +7818,7 @@ is_exit_without_lineno(basicblock *b) {
  * copy the line number from the sole predecessor block.
  */
 static int
-ensure_exits_have_lineno(struct compiler *c)
+duplicate_exits_without_lineno(struct compiler *c)
 {
     basicblock *entry = NULL;
     /* Copy all exit blocks without line number that are targets of a jump.
@@ -7826,21 +7833,22 @@ ensure_exits_have_lineno(struct compiler *c)
                     continue;
             }
             basicblock *target = b->b_instr[b->b_iused-1].i_target;
-            if (is_exit_without_lineno(target)) {
+            if (is_exit_without_lineno(target) && target->b_predecessors > 1) {
                 basicblock *new_target = compiler_copy_block(c, target);
                 if (new_target == NULL) {
                     return -1;
                 }
                 new_target->b_instr[0].i_lineno = b->b_instr[b->b_iused-1].i_lineno;
                 b->b_instr[b->b_iused-1].i_target = new_target;
+                target->b_predecessors--;
+                new_target->b_predecessors = 1;
+                new_target->b_next = target->b_next;
+                target->b_next = new_target;
             }
         }
         entry = b;
     }
     assert(entry != NULL);
-    if (is_exit_without_lineno(entry)) {
-        entry->b_instr[0].i_lineno = c->u->u_firstlineno;
-    }
     /* Eliminate empty blocks */
     for (basicblock *b = c->u->u_blocks; b != NULL; b = b->b_list) {
         while (b->b_next && b->b_next->b_iused == 0) {
diff --git a/Python/importlib.h b/Python/importlib.h
index a992340ddb8f2..ef2870596e793 100644
--- a/Python/importlib.h
+++ b/Python/importlib.h
@@ -189,17 +189,17 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     117,108,101,76,111,99,107,46,97,99,113,117,105,114,101,99,
     1,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,
     8,0,0,0,67,0,0,0,115,176,0,0,0,116,0,160,
-    1,161,0,125,1,124,0,106,2,143,55,1,0,124,0,106,
+    1,161,0,125,1,124,0,106,2,143,71,1,0,124,0,106,
     3,124,1,107,3,114,17,116,4,100,1,131,1,130,1,124,
     0,106,5,100,2,107,4,115,24,74,0,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,80,100,0,124,0,95,3,124,0,106,6,114,
-    72,124,0,4,0,106,6,100,3,56,0,2,0,95,6,124,
+    2,107,2,114,62,100,0,124,0,95,3,124,0,106,6,114,
+    70,124,0,4,0,106,6,100,3,56,0,2,0,95,6,124,
     0,106,7,160,8,161,0,1,0,87,0,100,0,4,0,4,
-    0,131,3,1,0,100,0,83,0,49,0,115,65,119,1,1,
-    0,1,0,1,0,89,0,1,0,100,0,83,0,87,0,100,
-    0,4,0,4,0,131,3,1,0,100,0,83,0,87,0,100,
-    0,4,0,4,0,131,3,1,0,100,0,83,0,41,4,78,
+    0,131,3,1,0,100,0,83,0,87,0,100,0,4,0,4,
+    0,131,3,1,0,100,0,83,0,87,0,100,0,4,0,4,
+    0,131,3,1,0,100,0,83,0,49,0,115,81,119,1,1,
+    0,1,0,1,0,89,0,1,0,100,0,83,0,41,4,78,
     250,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,25,0,0,0,114,42,0,0,0,41,9,114,26,0,
@@ -209,8 +209,8 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     0,0,0,114,45,0,0,0,114,5,0,0,0,114,5,0,
     0,0,114,6,0,0,0,114,44,0,0,0,125,0,0,0,
     115,32,0,0,0,8,1,8,1,10,1,8,1,14,1,14,
-    1,10,1,6,1,6,1,14,1,12,1,34,247,2,7,14,
-    249,2,5,14,251,122,19,95,77,111,100,117,108,101,76,111,
+    1,10,1,6,1,6,1,14,1,12,1,14,247,2,5,14,
+    251,2,7,34,249,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,0,0,0,0,1,0,0,0,5,0,0,0,67,
     0,0,0,243,18,0,0,0,100,1,160,0,124,0,106,1,
@@ -319,715 +319,717 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     0,114,6,0,0,0,114,57,0,0,0,163,0,0,0,115,
     8,0,0,0,8,0,8,2,8,4,12,4,114,57,0,0,
     0,99,1,0,0,0,0,0,0,0,0,0,0,0,3,0,
-    0,0,8,0,0,0,67,0,0,0,115,146,0,0,0,116,
-    0,160,1,161,0,1,0,122,55,122,7,116,2,124,0,25,
-    0,131,0,125,1,87,0,110,9,4,0,116,3,121,72,1,
-    0,1,0,1,0,100,1,125,1,89,0,124,1,100,1,117,
-    0,114,65,116,4,100,1,117,0,114,35,116,5,124,0,131,
-    1,125,1,110,4,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,116,0,160,9,161,
-    0,1,0,124,1,83,0,116,0,160,9,161,0,1,0,119,
-    0,87,0,116,0,160,9,161,0,1,0,124,1,83,0,119,
-    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,0,0,0,0,2,0,
-    0,0,8,0,0,0,83,0,0,0,115,68,0,0,0,116,
-    0,160,1,161,0,1,0,122,17,116,2,160,3,124,1,161,
-    1,124,0,117,0,114,27,116,2,124,1,61,0,87,0,116,
+    0,0,8,0,0,0,67,0,0,0,115,148,0,0,0,116,
+    0,160,1,161,0,1,0,122,64,122,7,116,2,124,0,25,
+    0,131,0,125,1,87,0,110,11,4,0,116,3,121,23,1,
+    0,1,0,1,0,100,1,125,1,89,0,110,1,119,0,124,
+    1,100,1,117,0,114,62,116,4,100,1,117,0,114,37,116,
+    5,124,0,131,1,125,1,110,4,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,116,
+    0,160,9,161,0,1,0,124,1,83,0,87,0,116,0,160,
+    9,161,0,1,0,124,1,83,0,116,0,160,9,161,0,1,
+    0,119,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,0,0,0,0,
+    2,0,0,0,8,0,0,0,83,0,0,0,115,68,0,0,
+    0,116,0,160,1,161,0,1,0,122,24,116,2,160,3,124,
+    1,161,1,124,0,117,0,114,22,116,2,124,1,61,0,87,
+    0,116,0,160,4,161,0,1,0,100,0,83,0,87,0,116,
     0,160,4,161,0,1,0,100,0,83,0,116,0,160,4,161,
-    0,1,0,119,0,87,0,116,0,160,4,161,0,1,0,100,
-    0,83,0,114,0,0,0,0,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,38,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,20,0,0,0,114,5,0,0,
-    0,114,5,0,0,0,114,6,0,0,0,218,2,99,98,198,
-    0,0,0,115,14,0,0,0,8,1,2,1,14,4,8,1,
-    22,2,2,253,12,3,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,64,0,0,0,114,65,0,0,0,
-    114,66,0,0,0,218,8,75,101,121,69,114,114,111,114,114,
-    26,0,0,0,114,55,0,0,0,114,23,0,0,0,218,8,
-    95,119,101,97,107,114,101,102,114,68,0,0,0,114,67,0,
-    0,0,41,3,114,20,0,0,0,114,27,0,0,0,114,69,
+    0,1,0,119,0,114,0,0,0,0,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,
+    38,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,20,0,0,0,114,5,
+    0,0,0,114,5,0,0,0,114,6,0,0,0,218,2,99,
+    98,198,0,0,0,115,14,0,0,0,8,1,2,1,14,4,
+    8,1,12,2,2,253,22,3,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,64,0,0,0,114,65,0,
+    0,0,114,66,0,0,0,218,8,75,101,121,69,114,114,111,
+    114,114,26,0,0,0,114,55,0,0,0,114,23,0,0,0,
+    218,8,95,119,101,97,107,114,101,102,114,68,0,0,0,114,
+    67,0,0,0,41,3,114,20,0,0,0,114,27,0,0,0,
+    114,69,0,0,0,114,5,0,0,0,114,5,0,0,0,114,
+    6,0,0,0,114,60,0,0,0,179,0,0,0,115,38,0,
+    0,0,8,6,2,1,2,1,14,1,12,1,8,1,2,255,
+    8,3,8,1,10,1,8,2,12,2,18,11,8,2,4,2,
+    2,235,8,19,4,2,10,254,114,60,0,0,0,99,1,0,
+    0,0,0,0,0,0,0,0,0,0,2,0,0,0,8,0,
+    0,0,67,0,0,0,115,54,0,0,0,116,0,124,0,131,
+    1,125,1,122,6,124,1,160,1,161,0,1,0,87,0,110,
+    10,4,0,116,2,121,20,1,0,1,0,1,0,89,0,100,
+    1,83,0,119,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,60,0,0,0,114,43,0,0,0,114,
+    22,0,0,0,114,44,0,0,0,41,2,114,20,0,0,0,
+    114,27,0,0,0,114,5,0,0,0,114,5,0,0,0,114,
+    6,0,0,0,218,19,95,108,111,99,107,95,117,110,108,111,
+    99,107,95,109,111,100,117,108,101,216,0,0,0,115,14,0,
+    0,0,8,6,2,1,12,1,12,1,6,3,2,253,12,5,
+    114,72,0,0,0,99,1,0,0,0,0,0,0,0,0,0,
+    0,0,3,0,0,0,4,0,0,0,79,0,0,0,115,14,
+    0,0,0,124,0,124,1,105,0,124,2,164,1,142,1,83,
+    0,41,2,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,78,114,5,0,0,0,41,3,218,1,
+    102,114,62,0,0,0,90,4,107,119,100,115,114,5,0,0,
+    0,114,5,0,0,0,114,6,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,233,0,0,0,115,2,0,0,0,14,
+    8,114,74,0,0,0,114,42,0,0,0,41,1,218,9,118,
+    101,114,98,111,115,105,116,121,99,1,0,0,0,0,0,0,
+    0,1,0,0,0,3,0,0,0,4,0,0,0,71,0,0,
+    0,115,58,0,0,0,116,0,106,1,106,2,124,1,107,5,
+    114,27,124,0,160,3,100,1,161,1,115,15,100,2,124,0,
+    23,0,125,0,116,4,124,0,106,5,124,2,142,0,116,0,
+    106,6,100,3,141,2,1,0,100,4,83,0,100,4,83,0,
+    41,5,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,41,2,250,1,35,122,7,105,109,112,111,114,116,32,122,
+    2,35,32,41,1,90,4,102,105,108,101,78,41,7,114,18,
+    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,50,0,0,0,218,6,115,116,100,
+    101,114,114,41,3,218,7,109,101,115,115,97,103,101,114,75,
+    0,0,0,114,62,0,0,0,114,5,0,0,0,114,5,0,
+    0,0,114,6,0,0,0,218,16,95,118,101,114,98,111,115,
+    101,95,109,101,115,115,97,103,101,244,0,0,0,115,10,0,
+    0,0,12,2,10,1,8,1,24,1,4,253,114,83,0,0,
+    0,99,1,0,0,0,0,0,0,0,0,0,0,0,2,0,
+    0,0,3,0,0,0,3,0,0,0,243,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,4,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,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,118,1,114,14,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,250,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,114,19,0,0,0,41,4,114,18,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,50,0,0,0,169,2,114,33,0,0,0,218,
+    8,102,117,108,108,110,97,109,101,169,1,218,3,102,120,110,
+    114,5,0,0,0,114,6,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,254,0,0,0,243,10,0,0,0,10,1,
+    10,1,2,1,6,255,10,2,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,78,169,
+    1,114,17,0,0,0,41,2,114,91,0,0,0,114,92,0,
+    0,0,114,5,0,0,0,114,90,0,0,0,114,6,0,0,
+    0,218,17,95,114,101,113,117,105,114,101,115,95,98,117,105,
+    108,116,105,110,252,0,0,0,243,6,0,0,0,12,2,10,
+    5,4,1,114,95,0,0,0,99,1,0,0,0,0,0,0,
+    0,0,0,0,0,2,0,0,0,3,0,0,0,3,0,0,
+    0,114,84,0,0,0,41,4,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,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,
+    14,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,169,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,114,19,0,
+    0,0,41,4,114,64,0,0,0,218,9,105,115,95,102,114,
+    111,122,101,110,114,87,0,0,0,114,50,0,0,0,114,88,
+    0,0,0,114,90,0,0,0,114,5,0,0,0,114,6,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,9,1,0,0,
+    114,93,0,0,0,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,78,114,94,0,0,0,41,
+    2,114,91,0,0,0,114,99,0,0,0,114,5,0,0,0,
+    114,90,0,0,0,114,6,0,0,0,218,16,95,114,101,113,
+    117,105,114,101,115,95,102,114,111,122,101,110,7,1,0,0,
+    114,96,0,0,0,114,100,0,0,0,99,2,0,0,0,0,
+    0,0,0,0,0,0,0,5,0,0,0,4,0,0,0,67,
+    0,0,0,115,74,0,0,0,100,1,125,2,116,0,160,1,
+    124,2,116,2,161,2,1,0,116,3,124,1,124,0,131,2,
+    125,3,124,1,116,4,106,5,118,0,114,33,116,4,106,5,
+    124,1,25,0,125,4,116,6,124,3,124,4,131,2,1,0,
+    116,4,106,5,124,1,25,0,83,0,116,7,124,3,131,1,
+    83,0,41,3,122,130,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,40,41,32,105,110,115,116,101,97,
+    100,46,10,10,32,32,32,32,122,103,116,104,101,32,108,111,
+    97,100,95,109,111,100,117,108,101,40,41,32,109,101,116,104,
+    111,100,32,105,115,32,100,101,112,114,101,99,97,116,101,100,
+    32,97,110,100,32,115,108,97,116,101,100,32,102,111,114,32,
+    114,101,109,111,118,97,108,32,105,110,32,80,121,116,104,111,
+    110,32,51,46,49,50,59,32,117,115,101,32,101,120,101,99,
+    95,109,111,100,117,108,101,40,41,32,105,110,115,116,101,97,
+    100,78,41,8,218,9,95,119,97,114,110,105,110,103,115,218,
+    4,119,97,114,110,218,18,68,101,112,114,101,99,97,116,105,
+    111,110,87,97,114,110,105,110,103,218,16,115,112,101,99,95,
+    102,114,111,109,95,108,111,97,100,101,114,114,18,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,5,114,33,0,0,0,114,89,
+    0,0,0,218,3,109,115,103,218,4,115,112,101,99,218,6,
+    109,111,100,117,108,101,114,5,0,0,0,114,5,0,0,0,
+    114,6,0,0,0,218,17,95,108,111,97,100,95,109,111,100,
+    117,108,101,95,115,104,105,109,19,1,0,0,115,16,0,0,
+    0,4,6,12,2,10,1,10,1,10,1,10,1,10,1,8,
+    2,114,111,0,0,0,99,1,0,0,0,0,0,0,0,0,
+    0,0,0,5,0,0,0,8,0,0,0,67,0,0,0,115,
+    188,0,0,0,116,0,124,0,100,1,100,2,131,3,125,1,
+    116,0,124,0,100,3,100,2,131,3,4,0,125,2,114,18,
+    116,1,124,2,131,1,83,0,116,2,124,1,100,4,131,2,
+    114,39,122,6,124,1,160,3,124,0,161,1,87,0,83,0,
+    4,0,116,4,121,38,1,0,1,0,1,0,89,0,110,1,
+    119,0,122,5,124,0,106,5,125,3,87,0,110,11,4,0,
+    116,6,121,55,1,0,1,0,1,0,100,5,125,3,89,0,
+    110,1,119,0,122,5,124,0,106,7,125,4,87,0,110,26,
+    4,0,116,6,121,87,1,0,1,0,1,0,124,1,100,2,
+    117,0,114,79,100,6,160,8,124,3,161,1,6,0,89,0,
+    83,0,100,7,160,8,124,3,124,1,161,2,6,0,89,0,
+    83,0,119,0,100,8,160,8,124,3,124,4,161,2,83,0,
+    41,9,122,44,84,104,101,32,105,109,112,108,101,109,101,110,
+    116,97,116,105,111,110,32,111,102,32,77,111,100,117,108,101,
+    84,121,112,101,46,95,95,114,101,112,114,95,95,40,41,46,
+    218,10,95,95,108,111,97,100,101,114,95,95,78,218,8,95,
+    95,115,112,101,99,95,95,218,11,109,111,100,117,108,101,95,
+    114,101,112,114,250,1,63,250,13,60,109,111,100,117,108,101,
+    32,123,33,114,125,62,250,20,60,109,111,100,117,108,101,32,
+    123,33,114,125,32,40,123,33,114,125,41,62,250,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,9,114,13,0,0,0,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,11,0,0,0,114,114,0,0,0,218,9,
+    69,120,99,101,112,116,105,111,110,114,9,0,0,0,114,2,
+    0,0,0,218,8,95,95,102,105,108,101,95,95,114,50,0,
+    0,0,41,5,114,110,0,0,0,218,6,108,111,97,100,101,
+    114,114,109,0,0,0,114,20,0,0,0,218,8,102,105,108,
+    101,110,97,109,101,114,5,0,0,0,114,5,0,0,0,114,
+    6,0,0,0,218,12,95,109,111,100,117,108,101,95,114,101,
+    112,114,38,1,0,0,115,44,0,0,0,12,2,16,1,8,
+    1,10,1,2,1,12,1,12,1,4,1,2,255,2,3,10,
+    1,12,1,8,1,2,255,2,2,10,1,12,1,8,1,14,
+    1,16,2,2,252,12,6,114,124,0,0,0,99,0,0,0,
+    0,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,0,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,16,103,0,
+    110,1,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,20,
+    0,0,0,114,122,0,0,0,114,126,0,0,0,114,127,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,33,0,0,0,114,20,0,
+    0,0,114,122,0,0,0,114,126,0,0,0,114,127,0,0,
+    0,114,128,0,0,0,114,5,0,0,0,114,5,0,0,0,
+    114,6,0,0,0,114,34,0,0,0,101,1,0,0,115,14,
+    0,0,0,6,2,6,1,6,1,6,1,14,1,6,3,10,
+    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,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,117,1,114,26,124,1,160,4,100,3,160,0,124,0,
+    106,3,161,1,161,1,1,0,124,0,106,5,100,0,117,1,
+    114,40,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,
+    50,0,0,0,114,20,0,0,0,114,122,0,0,0,114,126,
+    0,0,0,218,6,97,112,112,101,110,100,114,129,0,0,0,
+    218,9,95,95,99,108,97,115,115,95,95,114,9,0,0,0,
+    218,4,106,111,105,110,41,2,114,33,0,0,0,114,62,0,
+    0,0,114,5,0,0,0,114,5,0,0,0,114,6,0,0,
+    0,114,53,0,0,0,113,1,0,0,115,20,0,0,0,10,
+    1,10,1,4,255,10,2,18,1,10,1,6,1,8,1,4,
+    255,22,2,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,0,0,0,0,3,0,0,0,8,0,0,0,67,0,0,
+    0,115,102,0,0,0,124,0,106,0,125,2,122,36,124,0,
+    106,1,124,1,106,1,107,2,111,38,124,0,106,2,124,1,
+    106,2,107,2,111,38,124,0,106,3,124,1,106,3,107,2,
+    111,38,124,2,124,1,106,0,107,2,111,38,124,0,106,4,
+    124,1,106,4,107,2,111,38,124,0,106,5,124,1,106,5,
+    107,2,87,0,83,0,4,0,116,6,121,50,1,0,1,0,
+    1,0,116,7,6,0,89,0,83,0,119,0,114,0,0,0,
+    0,41,8,114,129,0,0,0,114,20,0,0,0,114,122,0,
+    0,0,114,126,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,2,0,
+    0,0,218,14,78,111,116,73,109,112,108,101,109,101,110,116,
+    101,100,41,3,114,33,0,0,0,90,5,111,116,104,101,114,
+    90,4,115,109,115,108,114,5,0,0,0,114,5,0,0,0,
+    114,6,0,0,0,218,6,95,95,101,113,95,95,123,1,0,
+    0,115,32,0,0,0,6,1,2,1,12,1,10,1,2,255,
+    10,2,2,254,8,3,2,253,10,4,2,252,10,5,4,251,
+    12,6,8,1,2,255,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,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,117,0,114,
+    26,124,0,106,1,100,0,117,1,114,26,124,0,106,2,114,
+    26,116,3,100,0,117,0,114,19,116,4,130,1,116,3,160,
+    5,124,0,106,1,161,1,124,0,95,0,124,0,106,0,83,
+    0,114,0,0,0,0,41,6,114,131,0,0,0,114,126,0,
+    0,0,114,130,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,114,52,
     0,0,0,114,5,0,0,0,114,5,0,0,0,114,6,0,
-    0,0,114,60,0,0,0,179,0,0,0,115,38,0,0,0,
-    8,6,2,1,2,1,14,1,12,1,6,1,8,2,8,1,
-    10,1,8,2,12,2,18,11,8,2,4,2,10,254,2,237,
-    8,19,4,2,2,232,114,60,0,0,0,99,1,0,0,0,
-    0,0,0,0,0,0,0,0,2,0,0,0,8,0,0,0,
-    67,0,0,0,115,54,0,0,0,116,0,124,0,131,1,125,
-    1,122,6,124,1,160,1,161,0,1,0,87,0,110,9,4,
-    0,116,2,121,26,1,0,1,0,1,0,89,0,100,1,83,
-    0,124,1,160,3,161,0,1,0,100,1,83,0,119,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,60,0,0,0,114,43,0,0,0,114,22,0,
-    0,0,114,44,0,0,0,41,2,114,20,0,0,0,114,27,
+    0,0,114,135,0,0,0,135,1,0,0,115,12,0,0,0,
+    10,2,16,1,8,1,4,1,14,1,6,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,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,114,0,0,0,0,41,1,114,131,
+    0,0,0,41,2,114,33,0,0,0,114,135,0,0,0,114,
+    5,0,0,0,114,5,0,0,0,114,6,0,0,0,114,135,
+    0,0,0,144,1,0,0,115,2,0,0,0,10,2,99,1,
+    0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,3,
+    0,0,0,67,0,0,0,115,32,0,0,0,124,0,106,0,
+    100,1,117,0,114,13,124,0,106,1,160,2,100,2,161,1,
+    100,3,25,0,83,0,124,0,106,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,25,0,0,0,41,3,114,129,0,0,0,
+    114,20,0,0,0,218,10,114,112,97,114,116,105,116,105,111,
+    110,114,52,0,0,0,114,5,0,0,0,114,5,0,0,0,
+    114,6,0,0,0,218,6,112,97,114,101,110,116,148,1,0,
+    0,115,6,0,0,0,10,3,16,1,6,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,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,114,0,0,0,0,41,1,114,130,0,0,0,114,
+    52,0,0,0,114,5,0,0,0,114,5,0,0,0,114,6,
+    0,0,0,114,136,0,0,0,156,1,0,0,115,2,0,0,
+    0,6,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,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,114,0,0,0,0,41,2,218,
+    4,98,111,111,108,114,130,0,0,0,41,2,114,33,0,0,
+    0,218,5,118,97,108,117,101,114,5,0,0,0,114,5,0,
+    0,0,114,6,0,0,0,114,136,0,0,0,160,1,0,0,
+    115,2,0,0,0,14,2,41,12,114,9,0,0,0,114,8,
+    0,0,0,114,1,0,0,0,114,10,0,0,0,114,34,0,
+    0,0,114,53,0,0,0,114,138,0,0,0,218,8,112,114,
+    111,112,101,114,116,121,114,135,0,0,0,218,6,115,101,116,
+    116,101,114,114,143,0,0,0,114,136,0,0,0,114,5,0,
+    0,0,114,5,0,0,0,114,5,0,0,0,114,6,0,0,
+    0,114,125,0,0,0,64,1,0,0,115,34,0,0,0,8,
+    0,4,1,4,36,2,1,12,255,8,12,8,10,2,12,10,
+    1,4,8,10,1,2,3,10,1,2,7,10,1,4,3,14,
+    1,114,125,0,0,0,169,2,114,126,0,0,0,114,128,0,
+    0,0,99,2,0,0,0,0,0,0,0,2,0,0,0,6,
+    0,0,0,8,0,0,0,67,0,0,0,115,150,0,0,0,
+    116,0,124,1,100,1,131,2,114,37,116,1,100,2,117,0,
+    114,11,116,2,130,1,116,1,106,3,125,4,124,3,100,2,
+    117,0,114,24,124,4,124,0,124,1,100,3,141,2,83,0,
+    124,3,114,28,103,0,110,1,100,2,125,5,124,4,124,0,
+    124,1,124,5,100,4,141,3,83,0,124,3,100,2,117,0,
+    114,67,116,0,124,1,100,5,131,2,114,65,122,7,124,1,
+    160,4,124,0,161,1,125,3,87,0,110,13,4,0,116,5,
+    121,64,1,0,1,0,1,0,100,2,125,3,89,0,110,3,
+    119,0,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,122,0,0,0,41,2,114,122,0,0,0,114,129,0,0,
+    0,114,128,0,0,0,70,114,148,0,0,0,41,7,114,11,
+    0,0,0,114,139,0,0,0,114,140,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,128,0,0,0,114,87,0,0,0,
+    114,125,0,0,0,41,6,114,20,0,0,0,114,122,0,0,
+    0,114,126,0,0,0,114,128,0,0,0,114,149,0,0,0,
+    90,6,115,101,97,114,99,104,114,5,0,0,0,114,5,0,
+    0,0,114,6,0,0,0,114,104,0,0,0,165,1,0,0,
+    115,38,0,0,0,10,2,8,1,4,1,6,1,8,2,12,
+    1,12,1,6,1,2,1,6,255,8,3,10,1,2,1,14,
+    1,12,1,8,1,2,255,4,4,16,2,114,104,0,0,0,
+    99,3,0,0,0,0,0,0,0,0,0,0,0,8,0,0,
+    0,8,0,0,0,67,0,0,0,115,38,1,0,0,122,5,
+    124,0,106,0,125,3,87,0,110,9,4,0,116,1,121,14,
+    1,0,1,0,1,0,89,0,110,7,119,0,124,3,100,0,
+    117,1,114,21,124,3,83,0,124,0,106,2,125,4,124,1,
+    100,0,117,0,114,43,122,5,124,0,106,3,125,1,87,0,
+    110,9,4,0,116,1,121,42,1,0,1,0,1,0,89,0,
+    110,1,119,0,122,5,124,0,106,4,125,5,87,0,110,11,
+    4,0,116,1,121,59,1,0,1,0,1,0,100,0,125,5,
+    89,0,110,1,119,0,124,2,100,0,117,0,114,87,124,5,
+    100,0,117,0,114,85,122,5,124,1,106,5,125,2,87,0,
+    110,13,4,0,116,1,121,84,1,0,1,0,1,0,100,0,
+    125,2,89,0,110,3,119,0,124,5,125,2,122,5,124,0,
+    106,6,125,6,87,0,110,11,4,0,116,1,121,103,1,0,
+    1,0,1,0,100,0,125,6,89,0,110,1,119,0,122,7,
+    116,7,124,0,106,8,131,1,125,7,87,0,110,11,4,0,
+    116,1,121,122,1,0,1,0,1,0,100,0,125,7,89,0,
+    110,1,119,0,116,9,124,4,124,1,124,2,100,1,141,3,
+    125,3,124,5,100,0,117,0,114,136,100,2,110,1,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,169,1,114,126,0,0,0,70,84,
+    41,13,114,113,0,0,0,114,2,0,0,0,114,9,0,0,
+    0,114,112,0,0,0,114,121,0,0,0,218,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,125,0,0,0,114,130,0,0,0,114,135,0,0,0,114,
+    129,0,0,0,41,8,114,110,0,0,0,114,122,0,0,0,
+    114,126,0,0,0,114,109,0,0,0,114,20,0,0,0,90,
+    8,108,111,99,97,116,105,111,110,114,135,0,0,0,114,129,
     0,0,0,114,5,0,0,0,114,5,0,0,0,114,6,0,
-    0,0,218,19,95,108,111,99,107,95,117,110,108,111,99,107,
-    95,109,111,100,117,108,101,216,0,0,0,115,14,0,0,0,
-    8,6,2,1,12,1,12,1,6,3,12,2,2,251,114,72,
-    0,0,0,99,1,0,0,0,0,0,0,0,0,0,0,0,
-    3,0,0,0,4,0,0,0,79,0,0,0,115,14,0,0,
-    0,124,0,124,1,105,0,124,2,164,1,142,1,83,0,41,
-    2,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,78,114,5,0,0,0,41,3,218,1,102,114,
-    62,0,0,0,90,4,107,119,100,115,114,5,0,0,0,114,
-    5,0,0,0,114,6,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,233,0,0,0,115,2,0,0,0,14,8,114,
-    74,0,0,0,114,42,0,0,0,41,1,218,9,118,101,114,
-    98,111,115,105,116,121,99,1,0,0,0,0,0,0,0,1,
-    0,0,0,3,0,0,0,4,0,0,0,71,0,0,0,115,
-    58,0,0,0,116,0,106,1,106,2,124,1,107,5,114,27,
-    124,0,160,3,100,1,161,1,115,15,100,2,124,0,23,0,
-    125,0,116,4,124,0,106,5,124,2,142,0,116,0,106,6,
-    100,3,141,2,1,0,100,4,83,0,100,4,83,0,41,5,
-    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,41,
-    2,250,1,35,122,7,105,109,112,111,114,116,32,122,2,35,
-    32,41,1,90,4,102,105,108,101,78,41,7,114,18,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,50,0,0,0,218,6,115,116,100,101,114,
-    114,41,3,218,7,109,101,115,115,97,103,101,114,75,0,0,
-    0,114,62,0,0,0,114,5,0,0,0,114,5,0,0,0,
-    114,6,0,0,0,218,16,95,118,101,114,98,111,115,101,95,
-    109,101,115,115,97,103,101,244,0,0,0,115,10,0,0,0,
-    12,2,10,1,8,1,24,1,4,253,114,83,0,0,0,99,
-    1,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,
-    3,0,0,0,3,0,0,0,243,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,4,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,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,
-    118,1,114,14,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,250,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,114,19,0,0,0,41,4,114,18,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,50,0,0,0,169,2,114,33,0,0,0,218,8,102,
-    117,108,108,110,97,109,101,169,1,218,3,102,120,110,114,5,
-    0,0,0,114,6,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,254,0,0,0,243,10,0,0,0,10,1,10,1,
-    2,1,6,255,10,2,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,78,169,1,114,
-    17,0,0,0,41,2,114,91,0,0,0,114,92,0,0,0,
-    114,5,0,0,0,114,90,0,0,0,114,6,0,0,0,218,
-    17,95,114,101,113,117,105,114,101,115,95,98,117,105,108,116,
-    105,110,252,0,0,0,243,6,0,0,0,12,2,10,5,4,
-    1,114,95,0,0,0,99,1,0,0,0,0,0,0,0,0,
-    0,0,0,2,0,0,0,3,0,0,0,3,0,0,0,114,
-    84,0,0,0,41,4,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,
-    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,14,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,169,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,114,19,0,0,0,
-    41,4,114,64,0,0,0,218,9,105,115,95,102,114,111,122,
-    101,110,114,87,0,0,0,114,50,0,0,0,114,88,0,0,
-    0,114,90,0,0,0,114,5,0,0,0,114,6,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,9,1,0,0,114,93,
-    0,0,0,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,78,114,94,0,0,0,41,2,114,
-    91,0,0,0,114,99,0,0,0,114,5,0,0,0,114,90,
-    0,0,0,114,6,0,0,0,218,16,95,114,101,113,117,105,
-    114,101,115,95,102,114,111,122,101,110,7,1,0,0,114,96,
-    0,0,0,114,100,0,0,0,99,2,0,0,0,0,0,0,
-    0,0,0,0,0,5,0,0,0,4,0,0,0,67,0,0,
-    0,115,74,0,0,0,100,1,125,2,116,0,160,1,124,2,
-    116,2,161,2,1,0,116,3,124,1,124,0,131,2,125,3,
-    124,1,116,4,106,5,118,0,114,33,116,4,106,5,124,1,
-    25,0,125,4,116,6,124,3,124,4,131,2,1,0,116,4,
-    106,5,124,1,25,0,83,0,116,7,124,3,131,1,83,0,
-    41,3,122,130,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,40,41,32,105,110,115,116,101,97,100,46,
-    10,10,32,32,32,32,122,103,116,104,101,32,108,111,97,100,
-    95,109,111,100,117,108,101,40,41,32,109,101,116,104,111,100,
-    32,105,115,32,100,101,112,114,101,99,97,116,101,100,32,97,
-    110,100,32,115,108,97,116,101,100,32,102,111,114,32,114,101,
-    109,111,118,97,108,32,105,110,32,80,121,116,104,111,110,32,
-    51,46,49,50,59,32,117,115,101,32,101,120,101,99,95,109,
-    111,100,117,108,101,40,41,32,105,110,115,116,101,97,100,78,
-    41,8,218,9,95,119,97,114,110,105,110,103,115,218,4,119,
-    97,114,110,218,18,68,101,112,114,101,99,97,116,105,111,110,
-    87,97,114,110,105,110,103,218,16,115,112,101,99,95,102,114,
-    111,109,95,108,111,97,100,101,114,114,18,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,5,114,33,0,0,0,114,89,0,0,
-    0,218,3,109,115,103,218,4,115,112,101,99,218,6,109,111,
-    100,117,108,101,114,5,0,0,0,114,5,0,0,0,114,6,
-    0,0,0,218,17,95,108,111,97,100,95,109,111,100,117,108,
-    101,95,115,104,105,109,19,1,0,0,115,16,0,0,0,4,
-    6,12,2,10,1,10,1,10,1,10,1,10,1,8,2,114,
-    111,0,0,0,99,1,0,0,0,0,0,0,0,0,0,0,
-    0,5,0,0,0,8,0,0,0,67,0,0,0,115,184,0,
-    0,0,116,0,124,0,100,1,100,2,131,3,125,1,116,0,
-    124,0,100,3,100,2,131,3,4,0,125,2,114,18,116,1,
-    124,2,131,1,83,0,116,2,124,1,100,4,131,2,114,37,
-    122,6,124,1,160,3,124,0,161,1,87,0,83,0,4,0,
-    116,4,121,91,1,0,1,0,1,0,89,0,122,5,124,0,
-    106,5,125,3,87,0,110,9,4,0,116,6,121,90,1,0,
-    1,0,1,0,100,5,125,3,89,0,122,5,124,0,106,7,
-    125,4,87,0,110,25,4,0,116,6,121,89,1,0,1,0,
-    1,0,124,1,100,2,117,0,114,75,100,6,160,8,124,3,
-    161,1,6,0,89,0,83,0,100,7,160,8,124,3,124,1,
-    161,2,6,0,89,0,83,0,100,8,160,8,124,3,124,4,
-    161,2,83,0,119,0,119,0,119,0,41,9,122,44,84,104,
-    101,32,105,109,112,108,101,109,101,110,116,97,116,105,111,110,
-    32,111,102,32,77,111,100,117,108,101,84,121,112,101,46,95,
-    95,114,101,112,114,95,95,40,41,46,218,10,95,95,108,111,
-    97,100,101,114,95,95,78,218,8,95,95,115,112,101,99,95,
-    95,218,11,109,111,100,117,108,101,95,114,101,112,114,250,1,
-    63,250,13,60,109,111,100,117,108,101,32,123,33,114,125,62,
-    250,20,60,109,111,100,117,108,101,32,123,33,114,125,32,40,
-    123,33,114,125,41,62,250,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,
-    9,114,13,0,0,0,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,11,
-    0,0,0,114,114,0,0,0,218,9,69,120,99,101,112,116,
-    105,111,110,114,9,0,0,0,114,2,0,0,0,218,8,95,
-    95,102,105,108,101,95,95,114,50,0,0,0,41,5,114,110,
-    0,0,0,218,6,108,111,97,100,101,114,114,109,0,0,0,
-    114,20,0,0,0,218,8,102,105,108,101,110,97,109,101,114,
-    5,0,0,0,114,5,0,0,0,114,6,0,0,0,218,12,
-    95,109,111,100,117,108,101,95,114,101,112,114,38,1,0,0,
-    115,44,0,0,0,12,2,16,1,8,1,10,1,2,1,12,
-    1,12,1,2,1,2,2,10,1,12,1,6,1,2,1,10,
-    1,12,1,8,1,14,1,16,2,12,2,2,250,2,252,2,
-    251,114,124,0,0,0,99,0,0,0,0,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,0,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,16,103,0,110,1,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,20,0,0,0,114,122,0,
-    0,0,114,126,0,0,0,114,127,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,33,0,0,0,114,20,0,0,0,114,122,0,0,
-    0,114,126,0,0,0,114,127,0,0,0,114,128,0,0,0,
-    114,5,0,0,0,114,5,0,0,0,114,6,0,0,0,114,
-    34,0,0,0,101,1,0,0,115,14,0,0,0,6,2,6,
-    1,6,1,6,1,14,1,6,3,10,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,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,117,1,114,26,
-    124,1,160,4,100,3,160,0,124,0,106,3,161,1,161,1,
-    1,0,124,0,106,5,100,0,117,1,114,40,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,50,0,0,0,114,20,
-    0,0,0,114,122,0,0,0,114,126,0,0,0,218,6,97,
-    112,112,101,110,100,114,129,0,0,0,218,9,95,95,99,108,
-    97,115,115,95,95,114,9,0,0,0,218,4,106,111,105,110,
-    41,2,114,33,0,0,0,114,62,0,0,0,114,5,0,0,
-    0,114,5,0,0,0,114,6,0,0,0,114,53,0,0,0,
-    113,1,0,0,115,20,0,0,0,10,1,10,1,4,255,10,
-    2,18,1,10,1,6,1,8,1,4,255,22,2,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,0,0,0,0,3,
-    0,0,0,8,0,0,0,67,0,0,0,115,102,0,0,0,
-    124,0,106,0,125,2,122,36,124,0,106,1,124,1,106,1,
-    107,2,111,38,124,0,106,2,124,1,106,2,107,2,111,38,
-    124,0,106,3,124,1,106,3,107,2,111,38,124,2,124,1,
-    106,0,107,2,111,38,124,0,106,4,124,1,106,4,107,2,
-    111,38,124,0,106,5,124,1,106,5,107,2,87,0,83,0,
-    4,0,116,6,121,50,1,0,1,0,1,0,116,7,6,0,
-    89,0,83,0,119,0,114,0,0,0,0,41,8,114,129,0,
-    0,0,114,20,0,0,0,114,122,0,0,0,114,126,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,2,0,0,0,218,14,78,111,
-    116,73,109,112,108,101,109,101,110,116,101,100,41,3,114,33,
-    0,0,0,90,5,111,116,104,101,114,90,4,115,109,115,108,
-    114,5,0,0,0,114,5,0,0,0,114,6,0,0,0,218,
-    6,95,95,101,113,95,95,123,1,0,0,115,32,0,0,0,
-    6,1,2,1,12,1,10,1,2,255,10,2,2,254,8,3,
-    2,253,10,4,2,252,10,5,4,251,12,6,8,1,2,255,
-    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,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,117,0,114,26,124,0,106,1,100,
-    0,117,1,114,26,124,0,106,2,114,26,116,3,100,0,117,
-    0,114,19,116,4,130,1,116,3,160,5,124,0,106,1,161,
-    1,124,0,95,0,124,0,106,0,83,0,114,0,0,0,0,
-    41,6,114,131,0,0,0,114,126,0,0,0,114,130,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,114,52,0,0,0,114,5,0,
-    0,0,114,5,0,0,0,114,6,0,0,0,114,135,0,0,
-    0,135,1,0,0,115,12,0,0,0,10,2,16,1,8,1,
-    4,1,14,1,6,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,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,114,0,0,0,0,41,1,114,131,0,0,0,41,2,114,
-    33,0,0,0,114,135,0,0,0,114,5,0,0,0,114,5,
-    0,0,0,114,6,0,0,0,114,135,0,0,0,144,1,0,
-    0,115,2,0,0,0,10,2,99,1,0,0,0,0,0,0,
-    0,0,0,0,0,1,0,0,0,3,0,0,0,67,0,0,
-    0,115,32,0,0,0,124,0,106,0,100,1,117,0,114,13,
-    124,0,106,1,160,2,100,2,161,1,100,3,25,0,83,0,
-    124,0,106,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,25,
-    0,0,0,41,3,114,129,0,0,0,114,20,0,0,0,218,
-    10,114,112,97,114,116,105,116,105,111,110,114,52,0,0,0,
-    114,5,0,0,0,114,5,0,0,0,114,6,0,0,0,218,
-    6,112,97,114,101,110,116,148,1,0,0,115,6,0,0,0,
-    10,3,16,1,6,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,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,114,0,0,
-    0,0,41,1,114,130,0,0,0,114,52,0,0,0,114,5,
-    0,0,0,114,5,0,0,0,114,6,0,0,0,114,136,0,
-    0,0,156,1,0,0,115,2,0,0,0,6,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,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,114,0,0,0,0,41,2,218,4,98,111,111,108,114,
-    130,0,0,0,41,2,114,33,0,0,0,218,5,118,97,108,
-    117,101,114,5,0,0,0,114,5,0,0,0,114,6,0,0,
-    0,114,136,0,0,0,160,1,0,0,115,2,0,0,0,14,
-    2,41,12,114,9,0,0,0,114,8,0,0,0,114,1,0,
-    0,0,114,10,0,0,0,114,34,0,0,0,114,53,0,0,
-    0,114,138,0,0,0,218,8,112,114,111,112,101,114,116,121,
-    114,135,0,0,0,218,6,115,101,116,116,101,114,114,143,0,
-    0,0,114,136,0,0,0,114,5,0,0,0,114,5,0,0,
-    0,114,5,0,0,0,114,6,0,0,0,114,125,0,0,0,
-    64,1,0,0,115,34,0,0,0,8,0,4,1,4,36,2,
-    1,12,255,8,12,8,10,2,12,10,1,4,8,10,1,2,
-    3,10,1,2,7,10,1,4,3,14,1,114,125,0,0,0,
-    169,2,114,126,0,0,0,114,128,0,0,0,99,2,0,0,
-    0,0,0,0,0,2,0,0,0,6,0,0,0,8,0,0,
-    0,67,0,0,0,115,150,0,0,0,116,0,124,1,100,1,
-    131,2,114,37,116,1,100,2,117,0,114,11,116,2,130,1,
-    116,1,106,3,125,4,124,3,100,2,117,0,114,24,124,4,
-    124,0,124,1,100,3,141,2,83,0,124,3,114,28,103,0,
-    110,1,100,2,125,5,124,4,124,0,124,1,124,5,100,4,
-    141,3,83,0,124,3,100,2,117,0,114,66,116,0,124,1,
-    100,5,131,2,114,64,122,7,124,1,160,4,124,0,161,1,
-    125,3,87,0,110,12,4,0,116,5,121,74,1,0,1,0,
-    1,0,100,2,125,3,89,0,110,2,100,6,125,3,116,6,
-    124,0,124,1,124,2,124,3,100,7,141,4,83,0,119,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,122,0,0,0,41,
-    2,114,122,0,0,0,114,129,0,0,0,114,128,0,0,0,
-    70,114,148,0,0,0,41,7,114,11,0,0,0,114,139,0,
-    0,0,114,140,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,128,0,0,0,114,87,0,0,0,114,125,0,0,0,41,
-    6,114,20,0,0,0,114,122,0,0,0,114,126,0,0,0,
-    114,128,0,0,0,114,149,0,0,0,90,6,115,101,97,114,
-    99,104,114,5,0,0,0,114,5,0,0,0,114,6,0,0,
-    0,114,104,0,0,0,165,1,0,0,115,38,0,0,0,10,
-    2,8,1,4,1,6,1,8,2,12,1,12,1,6,1,2,
-    1,6,255,8,3,10,1,2,1,14,1,12,1,8,1,4,
-    3,16,2,2,250,114,104,0,0,0,99,3,0,0,0,0,
-    0,0,0,0,0,0,0,8,0,0,0,8,0,0,0,67,
-    0,0,0,115,30,1,0,0,122,5,124,0,106,0,125,3,
-    87,0,110,8,4,0,116,1,121,142,1,0,1,0,1,0,
-    89,0,110,6,124,3,100,0,117,1,114,20,124,3,83,0,
-    124,0,106,2,125,4,124,1,100,0,117,0,114,40,122,5,
-    124,0,106,3,125,1,87,0,110,7,4,0,116,1,121,141,
-    1,0,1,0,1,0,89,0,122,5,124,0,106,4,125,5,
-    87,0,110,9,4,0,116,1,121,140,1,0,1,0,1,0,
-    100,0,125,5,89,0,124,2,100,0,117,0,114,81,124,5,
-    100,0,117,0,114,79,122,5,124,1,106,5,125,2,87,0,
-    110,12,4,0,116,1,121,139,1,0,1,0,1,0,100,0,
-    125,2,89,0,110,2,124,5,125,2,122,5,124,0,106,6,
-    125,6,87,0,110,9,4,0,116,1,121,138,1,0,1,0,
-    1,0,100,0,125,6,89,0,122,7,116,7,124,0,106,8,
-    131,1,125,7,87,0,110,9,4,0,116,1,121,137,1,0,
-    1,0,1,0,100,0,125,7,89,0,116,9,124,4,124,1,
-    124,2,100,1,141,3,125,3,124,5,100,0,117,0,114,126,
-    100,2,110,1,100,3,124,3,95,10,124,6,124,3,95,11,
-    124,7,124,3,95,12,124,3,83,0,119,0,119,0,119,0,
-    119,0,119,0,119,0,41,4,78,169,1,114,126,0,0,0,
-    70,84,41,13,114,113,0,0,0,114,2,0,0,0,114,9,
-    0,0,0,114,112,0,0,0,114,121,0,0,0,218,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,125,0,0,0,114,130,0,0,0,114,135,0,0,
-    0,114,129,0,0,0,41,8,114,110,0,0,0,114,122,0,
-    0,0,114,126,0,0,0,114,109,0,0,0,114,20,0,0,
-    0,90,8,108,111,99,97,116,105,111,110,114,135,0,0,0,
-    114,129,0,0,0,114,5,0,0,0,114,5,0,0,0,114,
-    6,0,0,0,218,17,95,115,112,101,99,95,102,114,111,109,
-    95,109,111,100,117,108,101,191,1,0,0,115,84,0,0,0,
-    2,2,10,1,12,1,4,1,8,2,4,1,6,2,8,1,
-    2,1,10,1,12,1,2,2,2,1,10,1,12,1,6,1,
-    8,1,8,1,2,1,10,1,12,1,8,1,4,2,2,1,
-    10,1,12,1,6,1,2,1,14,1,12,1,6,1,14,2,
-    18,1,6,1,6,1,4,1,2,249,2,252,2,250,2,250,
-    2,251,2,246,114,155,0,0,0,70,169,1,218,8,111,118,
-    101,114,114,105,100,101,99,2,0,0,0,0,0,0,0,1,
-    0,0,0,5,0,0,0,8,0,0,0,67,0,0,0,115,
-    178,1,0,0,124,2,115,10,116,0,124,1,100,1,100,0,
-    131,3,100,0,117,0,114,24,122,6,124,0,106,1,124,1,
-    95,2,87,0,110,7,4,0,116,3,121,216,1,0,1,0,
-    1,0,89,0,124,2,115,34,116,0,124,1,100,2,100,0,
-    131,3,100,0,117,0,114,83,124,0,106,4,125,3,124,3,
-    100,0,117,0,114,70,124,0,106,5,100,0,117,1,114,70,
-    116,6,100,0,117,0,114,52,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,124,3,124,0,95,4,100,0,124,1,95,11,
-    122,5,124,3,124,1,95,12,87,0,110,7,4,0,116,3,
-    121,215,1,0,1,0,1,0,89,0,124,2,115,93,116,0,
-    124,1,100,3,100,0,131,3,100,0,117,0,114,107,122,6,
-    124,0,106,13,124,1,95,14,87,0,110,7,4,0,116,3,
-    121,214,1,0,1,0,1,0,89,0,122,5,124,0,124,1,
-    95,15,87,0,110,7,4,0,116,3,121,213,1,0,1,0,
-    1,0,89,0,124,2,115,130,116,0,124,1,100,4,100,0,
-    131,3,100,0,117,0,114,149,124,0,106,5,100,0,117,1,
-    114,149,122,6,124,0,106,5,124,1,95,16,87,0,110,7,
-    4,0,116,3,121,212,1,0,1,0,1,0,89,0,124,0,
-    106,17,114,208,124,2,115,162,116,0,124,1,100,5,100,0,
-    131,3,100,0,117,0,114,176,122,6,124,0,106,18,124,1,
-    95,11,87,0,110,7,4,0,116,3,121,211,1,0,1,0,
-    1,0,89,0,124,2,115,186,116,0,124,1,100,6,100,0,
-    131,3,100,0,117,0,114,208,124,0,106,19,100,0,117,1,
-    114,208,122,7,124,0,106,19,124,1,95,20,87,0,124,1,
-    83,0,4,0,116,3,121,210,1,0,1,0,1,0,89,0,
-    124,1,83,0,124,1,83,0,119,0,119,0,119,0,119,0,
-    119,0,119,0,119,0,41,7,78,114,9,0,0,0,114,112,
-    0,0,0,218,11,95,95,112,97,99,107,97,103,101,95,95,
-    114,154,0,0,0,114,121,0,0,0,114,152,0,0,0,41,
-    21,114,13,0,0,0,114,20,0,0,0,114,9,0,0,0,
-    114,2,0,0,0,114,122,0,0,0,114,129,0,0,0,114,
-    139,0,0,0,114,140,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,121,0,0,0,
-    114,112,0,0,0,114,143,0,0,0,114,158,0,0,0,114,
-    113,0,0,0,114,154,0,0,0,114,136,0,0,0,114,126,
-    0,0,0,114,135,0,0,0,114,152,0,0,0,41,5,114,
-    109,0,0,0,114,110,0,0,0,114,157,0,0,0,114,122,
-    0,0,0,114,159,0,0,0,114,5,0,0,0,114,5,0,
-    0,0,114,6,0,0,0,218,18,95,105,110,105,116,95,109,
-    111,100,117,108,101,95,97,116,116,114,115,236,1,0,0,115,
-    112,0,0,0,20,4,2,1,12,1,12,1,2,1,20,2,
-    6,1,8,1,10,2,8,1,4,1,6,1,10,2,8,1,
-    6,1,6,11,2,1,10,1,12,1,2,1,20,2,2,1,
-    12,1,12,1,2,1,2,2,10,1,12,1,2,1,20,2,
-    10,1,2,1,12,1,12,1,2,1,6,2,20,1,2,1,
-    12,1,12,1,2,1,20,2,10,1,2,1,10,1,4,3,
-    12,254,2,1,8,1,2,254,2,249,2,249,2,249,2,251,
-    2,250,2,228,114,161,0,0,0,99,1,0,0,0,0,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,15,124,0,106,1,160,2,124,0,161,
-    1,125,1,110,10,116,0,124,0,106,1,100,3,131,2,114,
-    25,116,3,100,4,131,1,130,1,124,1,100,1,117,0,114,
-    34,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,11,0,0,0,
-    114,122,0,0,0,114,162,0,0,0,114,87,0,0,0,114,
-    21,0,0,0,114,20,0,0,0,114,161,0,0,0,169,2,
-    114,109,0,0,0,114,110,0,0,0,114,5,0,0,0,114,
-    5,0,0,0,114,6,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,4,3,12,1,14,3,12,1,8,1,8,2,
-    10,1,10,1,4,1,114,165,0,0,0,99,1,0,0,0,
-    0,0,0,0,0,0,0,0,2,0,0,0,4,0,0,0,
-    67,0,0,0,115,100,0,0,0,124,0,106,0,100,1,117,
-    0,114,7,100,2,110,2,124,0,106,0,125,1,124,0,106,
-    1,100,1,117,0,114,32,124,0,106,2,100,1,117,0,114,
-    25,100,3,160,3,124,1,161,1,83,0,100,4,160,3,124,
-    1,124,0,106,2,161,2,83,0,124,0,106,4,114,42,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,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,115,0,0,0,114,116,0,
-    0,0,114,117,0,0,0,114,118,0,0,0,250,18,60,109,
-    111,100,117,108,101,32,123,33,114,125,32,40,123,125,41,62,
-    41,5,114,20,0,0,0,114,126,0,0,0,114,122,0,0,
-    0,114,50,0,0,0,114,136,0,0,0,41,2,114,109,0,
-    0,0,114,20,0,0,0,114,5,0,0,0,114,5,0,0,
-    0,114,6,0,0,0,114,119,0,0,0,69,2,0,0,115,
-    16,0,0,0,20,3,10,1,10,1,10,1,14,2,6,2,
-    14,1,16,2,114,119,0,0,0,99,2,0,0,0,0,0,
-    0,0,0,0,0,0,4,0,0,0,10,0,0,0,67,0,
-    0,0,115,24,1,0,0,124,0,106,0,125,2,116,1,124,
-    2,131,1,143,115,1,0,116,2,106,3,160,4,124,2,161,
-    1,124,1,117,1,114,27,100,1,160,5,124,2,161,1,125,
-    3,116,6,124,3,124,2,100,2,141,2,130,1,122,80,124,
-    0,106,7,100,3,117,0,114,53,124,0,106,8,100,3,117,
-    0,114,45,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,110,
-    40,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,87,116,11,124,0,106,
-    7,131,1,155,0,100,8,157,2,125,3,116,12,160,13,124,
-    3,116,14,161,2,1,0,124,0,106,7,160,15,124,2,161,
-    1,1,0,110,6,124,0,106,7,160,16,124,1,161,1,1,
-    0,87,0,116,2,106,3,160,17,124,0,106,0,161,1,125,
-    1,124,1,116,2,106,3,124,0,106,0,60,0,110,24,116,
+    0,0,218,17,95,115,112,101,99,95,102,114,111,109,95,109,
+    111,100,117,108,101,191,1,0,0,115,84,0,0,0,2,2,
+    10,1,12,1,4,1,2,255,8,3,4,1,6,2,8,1,
+    2,1,10,1,12,1,4,2,2,254,2,3,10,1,12,1,
+    8,1,2,255,8,2,8,1,2,1,10,1,12,1,8,1,
+    2,255,4,3,2,1,10,1,12,1,8,1,2,255,2,2,
+    14,1,12,1,8,1,2,255,14,3,18,1,6,1,6,1,
+    4,1,114,155,0,0,0,70,169,1,218,8,111,118,101,114,
+    114,105,100,101,99,2,0,0,0,0,0,0,0,1,0,0,
+    0,5,0,0,0,8,0,0,0,67,0,0,0,115,190,1,
+    0,0,124,2,115,10,116,0,124,1,100,1,100,0,131,3,
+    100,0,117,0,114,26,122,6,124,0,106,1,124,1,95,2,
+    87,0,110,9,4,0,116,3,121,25,1,0,1,0,1,0,
+    89,0,110,1,119,0,124,2,115,36,116,0,124,1,100,2,
+    100,0,131,3,100,0,117,0,114,87,124,0,106,4,125,3,
+    124,3,100,0,117,0,114,72,124,0,106,5,100,0,117,1,
+    114,72,116,6,100,0,117,0,114,54,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,124,3,124,0,95,4,100,0,124,1,
+    95,11,122,5,124,3,124,1,95,12,87,0,110,9,4,0,
+    116,3,121,86,1,0,1,0,1,0,89,0,110,1,119,0,
+    124,2,115,97,116,0,124,1,100,3,100,0,131,3,100,0,
+    117,0,114,113,122,6,124,0,106,13,124,1,95,14,87,0,
+    110,9,4,0,116,3,121,112,1,0,1,0,1,0,89,0,
+    110,1,119,0,122,5,124,0,124,1,95,15,87,0,110,9,
+    4,0,116,3,121,127,1,0,1,0,1,0,89,0,110,1,
+    119,0,124,2,115,138,116,0,124,1,100,4,100,0,131,3,
+    100,0,117,0,114,159,124,0,106,5,100,0,117,1,114,159,
+    122,6,124,0,106,5,124,1,95,16,87,0,110,9,4,0,
+    116,3,121,158,1,0,1,0,1,0,89,0,110,1,119,0,
+    124,0,106,17,114,221,124,2,115,172,116,0,124,1,100,5,
+    100,0,131,3,100,0,117,0,114,188,122,6,124,0,106,18,
+    124,1,95,11,87,0,110,9,4,0,116,3,121,187,1,0,
+    1,0,1,0,89,0,110,1,119,0,124,2,115,198,116,0,
+    124,1,100,6,100,0,131,3,100,0,117,0,114,221,124,0,
+    106,19,100,0,117,1,114,221,122,7,124,0,106,19,124,1,
+    95,20,87,0,124,1,83,0,4,0,116,3,121,220,1,0,
+    1,0,1,0,89,0,124,1,83,0,119,0,124,1,83,0,
+    41,7,78,114,9,0,0,0,114,112,0,0,0,218,11,95,
+    95,112,97,99,107,97,103,101,95,95,114,154,0,0,0,114,
+    121,0,0,0,114,152,0,0,0,41,21,114,13,0,0,0,
+    114,20,0,0,0,114,9,0,0,0,114,2,0,0,0,114,
+    122,0,0,0,114,129,0,0,0,114,139,0,0,0,114,140,
+    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,121,0,0,0,114,112,0,0,0,114,
+    143,0,0,0,114,158,0,0,0,114,113,0,0,0,114,154,
+    0,0,0,114,136,0,0,0,114,126,0,0,0,114,135,0,
+    0,0,114,152,0,0,0,41,5,114,109,0,0,0,114,110,
+    0,0,0,114,157,0,0,0,114,122,0,0,0,114,159,0,
+    0,0,114,5,0,0,0,114,5,0,0,0,114,6,0,0,
+    0,218,18,95,105,110,105,116,95,109,111,100,117,108,101,95,
+    97,116,116,114,115,236,1,0,0,115,114,0,0,0,20,4,
+    2,1,12,1,12,1,4,1,2,255,20,3,6,1,8,1,
+    10,2,8,1,4,1,6,1,10,2,8,1,6,1,6,11,
+    2,1,10,1,12,1,4,1,2,255,20,3,2,1,12,1,
+    12,1,4,1,2,255,2,3,10,1,12,1,4,1,2,255,
+    20,3,10,1,2,1,12,1,12,1,4,1,2,255,6,3,
+    20,1,2,1,12,1,12,1,4,1,2,255,20,3,10,1,
+    2,1,10,1,4,3,12,254,2,1,4,1,2,254,4,2,
+    114,161,0,0,0,99,1,0,0,0,0,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,15,124,0,106,1,160,2,124,0,161,1,125,1,110,
+    10,116,0,124,0,106,1,100,3,131,2,114,25,116,3,100,
+    4,131,1,130,1,124,1,100,1,117,0,114,34,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,11,0,0,0,114,122,0,0,
+    0,114,162,0,0,0,114,87,0,0,0,114,21,0,0,0,
+    114,20,0,0,0,114,161,0,0,0,169,2,114,109,0,0,
+    0,114,110,0,0,0,114,5,0,0,0,114,5,0,0,0,
+    114,6,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,
+    4,3,12,1,14,3,12,1,8,1,8,2,10,1,10,1,
+    4,1,114,165,0,0,0,99,1,0,0,0,0,0,0,0,
+    0,0,0,0,2,0,0,0,4,0,0,0,67,0,0,0,
+    115,100,0,0,0,124,0,106,0,100,1,117,0,114,7,100,
+    2,110,2,124,0,106,0,125,1,124,0,106,1,100,1,117,
+    0,114,32,124,0,106,2,100,1,117,0,114,25,100,3,160,
+    3,124,1,161,1,83,0,100,4,160,3,124,1,124,0,106,
+    2,161,2,83,0,124,0,106,4,114,42,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,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,115,0,0,0,114,116,0,0,0,114,117,
+    0,0,0,114,118,0,0,0,250,18,60,109,111,100,117,108,
+    101,32,123,33,114,125,32,40,123,125,41,62,41,5,114,20,
+    0,0,0,114,126,0,0,0,114,122,0,0,0,114,50,0,
+    0,0,114,136,0,0,0,41,2,114,109,0,0,0,114,20,
+    0,0,0,114,5,0,0,0,114,5,0,0,0,114,6,0,
+    0,0,114,119,0,0,0,69,2,0,0,115,16,0,0,0,
+    20,3,10,1,10,1,10,1,14,2,6,2,14,1,16,2,
+    114,119,0,0,0,99,2,0,0,0,0,0,0,0,0,0,
+    0,0,4,0,0,0,10,0,0,0,67,0,0,0,115,24,
+    1,0,0,124,0,106,0,125,2,116,1,124,2,131,1,143,
+    123,1,0,116,2,106,3,160,4,124,2,161,1,124,1,117,
+    1,114,27,100,1,160,5,124,2,161,1,125,3,116,6,124,
+    3,124,2,100,2,141,2,130,1,122,80,124,0,106,7,100,
+    3,117,0,114,53,124,0,106,8,100,3,117,0,114,45,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,110,40,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,87,116,11,124,0,106,7,131,1,155,
+    0,100,8,157,2,125,3,116,12,160,13,124,3,116,14,161,
+    2,1,0,124,0,106,7,160,15,124,2,161,1,1,0,110,
+    6,124,0,106,7,160,16,124,1,161,1,1,0,87,0,116,
     2,106,3,160,17,124,0,106,0,161,1,125,1,124,1,116,
-    2,106,3,124,0,106,0,60,0,119,0,49,0,115,125,119,
-    1,1,0,1,0,1,0,89,0,1,0,124,1,83,0,87,
-    0,100,3,4,0,4,0,131,3,1,0,124,1,83,0,41,
-    9,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,114,19,0,0,0,78,250,
-    14,109,105,115,115,105,110,103,32,108,111,97,100,101,114,84,
-    114,156,0,0,0,114,163,0,0,0,250,55,46,101,120,101,
-    99,95,109,111,100,117,108,101,40,41,32,110,111,116,32,102,
-    111,117,110,100,59,32,102,97,108,108,105,110,103,32,98,97,
-    99,107,32,116,111,32,108,111,97,100,95,109,111,100,117,108,
-    101,40,41,41,18,114,20,0,0,0,114,57,0,0,0,114,
-    18,0,0,0,114,105,0,0,0,114,38,0,0,0,114,50,
-    0,0,0,114,87,0,0,0,114,122,0,0,0,114,129,0,
-    0,0,114,161,0,0,0,114,11,0,0,0,114,7,0,0,
-    0,114,101,0,0,0,114,102,0,0,0,218,13,73,109,112,
-    111,114,116,87,97,114,110,105,110,103,218,11,108,111,97,100,
-    95,109,111,100,117,108,101,114,163,0,0,0,218,3,112,111,
-    112,41,4,114,109,0,0,0,114,110,0,0,0,114,20,0,
-    0,0,114,108,0,0,0,114,5,0,0,0,114,5,0,0,
-    0,114,6,0,0,0,114,106,0,0,0,86,2,0,0,115,
-    52,0,0,0,6,2,10,1,16,1,10,1,12,1,2,1,
-    10,1,10,1,14,1,16,2,14,2,12,1,16,1,12,2,
-    14,1,12,2,2,128,14,4,14,1,14,255,14,1,16,233,
-    4,24,2,255,10,233,4,24,114,106,0,0,0,99,1,0,
-    0,0,0,0,0,0,0,0,0,0,2,0,0,0,8,0,
-    0,0,67,0,0,0,115,10,1,0,0,122,9,124,0,106,
-    0,160,1,124,0,106,2,161,1,1,0,87,0,110,23,1,
-    0,1,0,1,0,124,0,106,2,116,3,106,4,118,0,114,
-    32,116,3,106,4,160,5,124,0,106,2,161,1,125,1,124,
-    1,116,3,106,4,124,0,106,2,60,0,130,0,116,3,106,
-    4,160,5,124,0,106,2,161,1,125,1,124,1,116,3,106,
-    4,124,0,106,2,60,0,116,6,124,1,100,1,100,0,131,
-    3,100,0,117,0,114,68,122,6,124,0,106,0,124,1,95,
-    7,87,0,110,7,4,0,116,8,121,132,1,0,1,0,1,
-    0,89,0,116,6,124,1,100,2,100,0,131,3,100,0,117,
-    0,114,104,122,20,124,1,106,9,124,1,95,10,116,11,124,
-    1,100,3,131,2,115,95,124,0,106,2,160,12,100,4,161,
-    1,100,5,25,0,124,1,95,10,87,0,110,7,4,0,116,
-    8,121,131,1,0,1,0,1,0,89,0,116,6,124,1,100,
-    6,100,0,131,3,100,0,117,0,114,128,122,6,124,0,124,
-    1,95,13,87,0,124,1,83,0,4,0,116,8,121,130,1,
-    0,1,0,1,0,89,0,124,1,83,0,124,1,83,0,119,
-    0,119,0,119,0,41,7,78,114,112,0,0,0,114,158,0,
-    0,0,114,154,0,0,0,114,141,0,0,0,114,25,0,0,
-    0,114,113,0,0,0,41,14,114,122,0,0,0,114,170,0,
-    0,0,114,20,0,0,0,114,18,0,0,0,114,105,0,0,
-    0,114,171,0,0,0,114,13,0,0,0,114,112,0,0,0,
-    114,2,0,0,0,114,9,0,0,0,114,158,0,0,0,114,
-    11,0,0,0,114,142,0,0,0,114,113,0,0,0,114,164,
+    2,106,3,124,0,106,0,60,0,110,14,116,2,106,3,160,
+    17,124,0,106,0,161,1,125,1,124,1,116,2,106,3,124,
+    0,106,0,60,0,119,0,87,0,100,3,4,0,4,0,131,
+    3,1,0,124,1,83,0,49,0,115,133,119,1,1,0,1,
+    0,1,0,89,0,1,0,124,1,83,0,41,9,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,114,19,0,0,0,78,250,14,109,105,115,
+    115,105,110,103,32,108,111,97,100,101,114,84,114,156,0,0,
+    0,114,163,0,0,0,250,55,46,101,120,101,99,95,109,111,
+    100,117,108,101,40,41,32,110,111,116,32,102,111,117,110,100,
+    59,32,102,97,108,108,105,110,103,32,98,97,99,107,32,116,
+    111,32,108,111,97,100,95,109,111,100,117,108,101,40,41,41,
+    18,114,20,0,0,0,114,57,0,0,0,114,18,0,0,0,
+    114,105,0,0,0,114,38,0,0,0,114,50,0,0,0,114,
+    87,0,0,0,114,122,0,0,0,114,129,0,0,0,114,161,
+    0,0,0,114,11,0,0,0,114,7,0,0,0,114,101,0,
+    0,0,114,102,0,0,0,218,13,73,109,112,111,114,116,87,
+    97,114,110,105,110,103,218,11,108,111,97,100,95,109,111,100,
+    117,108,101,114,163,0,0,0,218,3,112,111,112,41,4,114,
+    109,0,0,0,114,110,0,0,0,114,20,0,0,0,114,108,
     0,0,0,114,5,0,0,0,114,5,0,0,0,114,6,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,116,2,0,
-    0,115,64,0,0,0,2,3,18,1,6,1,12,1,14,1,
-    12,1,2,1,14,3,12,1,16,1,2,1,12,1,12,1,
-    2,1,16,1,2,1,8,4,10,1,18,1,4,128,12,1,
-    2,1,16,1,2,1,8,1,4,3,12,254,2,1,8,1,
-    2,254,2,251,2,246,114,172,0,0,0,99,1,0,0,0,
+    0,0,114,106,0,0,0,86,2,0,0,115,50,0,0,0,
+    6,2,10,1,16,1,10,1,12,1,2,1,10,1,10,1,
+    14,1,16,2,14,2,12,1,16,1,12,2,14,1,12,2,
+    2,128,14,4,14,1,14,255,16,1,10,233,4,24,16,232,
+    4,24,114,106,0,0,0,99,1,0,0,0,0,0,0,0,
+    0,0,0,0,2,0,0,0,8,0,0,0,67,0,0,0,
+    115,14,1,0,0,122,9,124,0,106,0,160,1,124,0,106,
+    2,161,1,1,0,87,0,110,23,1,0,1,0,1,0,124,
+    0,106,2,116,3,106,4,118,0,114,32,116,3,106,4,160,
+    5,124,0,106,2,161,1,125,1,124,1,116,3,106,4,124,
+    0,106,2,60,0,130,0,116,3,106,4,160,5,124,0,106,
+    2,161,1,125,1,124,1,116,3,106,4,124,0,106,2,60,
+    0,116,6,124,1,100,1,100,0,131,3,100,0,117,0,114,
+    70,122,6,124,0,106,0,124,1,95,7,87,0,110,9,4,
+    0,116,8,121,69,1,0,1,0,1,0,89,0,110,1,119,
+    0,116,6,124,1,100,2,100,0,131,3,100,0,117,0,114,
+    108,122,20,124,1,106,9,124,1,95,10,116,11,124,1,100,
+    3,131,2,115,97,124,0,106,2,160,12,100,4,161,1,100,
+    5,25,0,124,1,95,10,87,0,110,9,4,0,116,8,121,
+    107,1,0,1,0,1,0,89,0,110,1,119,0,116,6,124,
+    1,100,6,100,0,131,3,100,0,117,0,114,133,122,6,124,
+    0,124,1,95,13,87,0,124,1,83,0,4,0,116,8,121,
+    132,1,0,1,0,1,0,89,0,124,1,83,0,119,0,124,
+    1,83,0,41,7,78,114,112,0,0,0,114,158,0,0,0,
+    114,154,0,0,0,114,141,0,0,0,114,25,0,0,0,114,
+    113,0,0,0,41,14,114,122,0,0,0,114,170,0,0,0,
+    114,20,0,0,0,114,18,0,0,0,114,105,0,0,0,114,
+    171,0,0,0,114,13,0,0,0,114,112,0,0,0,114,2,
+    0,0,0,114,9,0,0,0,114,158,0,0,0,114,11,0,
+    0,0,114,142,0,0,0,114,113,0,0,0,114,164,0,0,
+    0,114,5,0,0,0,114,5,0,0,0,114,6,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,116,2,0,0,115,
+    66,0,0,0,2,3,18,1,6,1,12,1,14,1,12,1,
+    2,1,14,3,12,1,16,1,2,1,12,1,12,1,4,1,
+    2,255,16,2,2,1,8,4,10,1,18,1,4,128,12,1,
+    4,1,2,255,16,2,2,1,8,1,4,3,12,254,2,1,
+    4,1,2,254,4,2,114,172,0,0,0,99,1,0,0,0,
     0,0,0,0,0,0,0,0,3,0,0,0,11,0,0,0,
     67,0,0,0,115,242,0,0,0,124,0,106,0,100,0,117,
     1,114,29,116,1,124,0,106,0,100,1,131,2,115,29,116,
     2,124,0,106,0,131,1,155,0,100,2,157,2,125,1,116,
     3,160,4,124,1,116,5,161,2,1,0,116,6,124,0,131,
     1,83,0,116,7,124,0,131,1,125,2,100,3,124,0,95,
-    8,122,79,124,2,116,9,106,10,124,0,106,11,60,0,122,
+    8,122,80,124,2,116,9,106,10,124,0,106,11,60,0,122,
     26,124,0,106,0,100,0,117,0,114,62,124,0,106,12,100,
     0,117,0,114,61,116,13,100,4,124,0,106,11,100,5,141,
     2,130,1,110,6,124,0,106,0,160,14,124,2,161,1,1,
-    0,87,0,110,19,1,0,1,0,1,0,122,7,116,9,106,
+    0,87,0,110,20,1,0,1,0,1,0,122,7,116,9,106,
     10,124,0,106,11,61,0,87,0,130,0,4,0,116,15,121,
-    120,1,0,1,0,1,0,89,0,130,0,116,9,106,10,160,
-    16,124,0,106,11,161,1,125,2,124,2,116,9,106,10,124,
-    0,106,11,60,0,116,17,100,6,124,0,106,11,124,0,106,
-    0,131,3,1,0,87,0,100,7,124,0,95,8,124,2,83,
-    0,100,7,124,0,95,8,119,0,119,0,41,8,78,114,163,
+    89,1,0,1,0,1,0,89,0,130,0,119,0,116,9,106,
+    10,160,16,124,0,106,11,161,1,125,2,124,2,116,9,106,
+    10,124,0,106,11,60,0,116,17,100,6,124,0,106,11,124,
+    0,106,0,131,3,1,0,87,0,100,7,124,0,95,8,124,
+    2,83,0,100,7,124,0,95,8,119,0,41,8,78,114,163,
     0,0,0,114,168,0,0,0,84,114,167,0,0,0,114,19,
     0,0,0,122,18,105,109,112,111,114,116,32,123,33,114,125,
     32,35,32,123,33,114,125,70,41,18,114,122,0,0,0,114,
@@ -1043,8 +1045,8 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     0,0,115,60,0,0,0,10,2,12,2,16,1,12,2,8,
     1,8,2,6,5,2,1,12,1,2,1,10,1,10,1,14,
     1,2,255,12,4,4,128,6,1,2,1,12,1,2,3,12,
-    254,2,1,2,1,14,5,12,1,18,1,6,2,4,2,8,
-    254,2,245,114,173,0,0,0,99,1,0,0,0,0,0,0,
+    254,2,1,2,1,2,254,14,7,12,1,18,1,6,2,4,
+    2,8,254,114,173,0,0,0,99,1,0,0,0,0,0,0,
     0,0,0,0,0,1,0,0,0,8,0,0,0,67,0,0,
     0,115,54,0,0,0,116,0,124,0,106,1,131,1,143,12,
     1,0,116,2,124,0,131,1,87,0,2,0,100,1,4,0,
@@ -1453,21 +1455,21 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     0,116,0,106,1,125,3,124,3,100,1,117,0,114,11,116,
     2,100,2,131,1,130,1,124,3,115,19,116,3,160,4,100,
     3,116,5,161,2,1,0,124,0,116,0,106,6,118,0,125,
-    4,124,3,68,0,93,109,125,5,116,7,131,0,143,46,1,
-    0,122,5,124,5,106,8,125,6,87,0,110,26,4,0,116,
-    9,121,139,1,0,1,0,1,0,116,10,124,5,124,0,124,
+    4,124,3,68,0,93,111,125,5,116,7,131,0,143,47,1,
+    0,122,5,124,5,106,8,125,6,87,0,110,27,4,0,116,
+    9,121,64,1,0,1,0,1,0,116,10,124,5,124,0,124,
     1,131,3,125,7,124,7,100,1,117,0,114,62,89,0,87,
     0,100,1,4,0,4,0,131,3,1,0,113,26,89,0,110,
-    6,124,6,124,0,124,1,124,2,131,3,125,7,87,0,100,
-    1,4,0,4,0,131,3,1,0,110,8,49,0,115,80,119,
-    1,1,0,1,0,1,0,89,0,1,0,124,7,100,1,117,
-    1,114,135,124,4,115,131,124,0,116,0,106,6,118,0,114,
-    131,116,0,106,6,124,0,25,0,125,8,122,5,124,8,106,
-    11,125,9,87,0,110,12,4,0,116,9,121,138,1,0,1,
-    0,1,0,124,7,6,0,89,0,2,0,1,0,83,0,124,
-    9,100,1,117,0,114,127,124,7,2,0,1,0,83,0,124,
-    9,2,0,1,0,83,0,124,7,2,0,1,0,83,0,113,
-    26,100,1,83,0,119,0,119,0,41,4,122,21,70,105,110,
+    7,119,0,124,6,124,0,124,1,124,2,131,3,125,7,87,
+    0,100,1,4,0,4,0,131,3,1,0,110,8,49,0,115,
+    81,119,1,1,0,1,0,1,0,89,0,1,0,124,7,100,
+    1,117,1,114,137,124,4,115,133,124,0,116,0,106,6,118,
+    0,114,133,116,0,106,6,124,0,25,0,125,8,122,5,124,
+    8,106,11,125,9,87,0,110,13,4,0,116,9,121,120,1,
+    0,1,0,1,0,124,7,6,0,89,0,2,0,1,0,83,
+    0,119,0,124,9,100,1,117,0,114,129,124,7,2,0,1,
+    0,83,0,124,9,2,0,1,0,83,0,124,7,2,0,1,
+    0,83,0,113,26,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,
@@ -1486,9 +1488,9 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     10,95,102,105,110,100,95,115,112,101,99,153,3,0,0,115,
     68,0,0,0,6,2,8,1,8,2,4,3,12,1,10,5,
     8,1,8,1,2,1,10,1,12,1,12,1,8,1,2,1,
-    14,250,4,5,12,3,2,128,28,248,8,9,14,2,10,1,
-    2,1,10,1,12,1,12,4,8,2,8,1,8,2,8,2,
-    2,239,4,19,2,243,2,244,114,215,0,0,0,99,3,0,
+    14,250,4,5,2,254,12,5,2,128,28,248,8,9,14,2,
+    10,1,2,1,10,1,12,1,12,4,2,252,8,6,8,1,
+    8,2,8,2,2,239,4,19,114,215,0,0,0,99,3,0,
     0,0,0,0,0,0,0,0,0,0,3,0,0,0,5,0,
     0,0,67,0,0,0,115,110,0,0,0,116,0,124,0,116,
     1,131,2,115,14,116,2,100,1,160,3,116,4,124,0,131,
@@ -1496,7 +1498,7 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     5,100,3,131,1,130,1,124,2,100,2,107,4,114,41,116,
     0,124,1,116,1,131,2,115,35,116,2,100,4,131,1,130,
     1,124,1,115,41,116,6,100,5,131,1,130,1,124,0,115,
-    53,124,2,100,2,107,2,114,51,116,5,100,6,131,1,130,
+    51,124,2,100,2,107,2,114,53,116,5,100,6,131,1,130,
     1,100,7,83,0,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,
@@ -1523,23 +1525,23 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     122,4,123,33,114,125,99,2,0,0,0,0,0,0,0,0,
     0,0,0,9,0,0,0,8,0,0,0,67,0,0,0,115,
     16,1,0,0,100,0,125,2,124,0,160,0,100,1,161,1,
-    100,2,25,0,125,3,124,3,114,63,124,3,116,1,106,2,
+    100,2,25,0,125,3,124,3,114,64,124,3,116,1,106,2,
     118,1,114,21,116,3,124,1,124,3,131,2,1,0,124,0,
     116,1,106,2,118,0,114,31,116,1,106,2,124,0,25,0,
     83,0,116,1,106,2,124,3,25,0,125,4,122,5,124,4,
-    106,4,125,2,87,0,110,21,4,0,116,5,121,135,1,0,
+    106,4,125,2,87,0,110,22,4,0,116,5,121,63,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,116,9,124,0,124,2,131,2,125,6,124,6,100,0,
-    117,0,114,81,116,8,116,6,160,7,124,0,161,1,124,0,
-    100,4,141,2,130,1,116,10,124,6,131,1,125,7,124,3,
-    114,132,116,1,106,2,124,3,25,0,125,4,124,0,160,0,
-    100,1,161,1,100,5,25,0,125,8,122,9,116,11,124,4,
-    124,8,124,7,131,3,1,0,87,0,124,7,83,0,4,0,
-    116,5,121,134,1,0,1,0,1,0,100,6,124,3,155,2,
-    100,7,124,8,155,2,157,4,125,5,116,12,160,13,124,5,
-    116,14,161,2,1,0,89,0,124,7,83,0,124,7,83,0,
-    119,0,119,0,41,8,78,114,141,0,0,0,114,25,0,0,
+    130,2,119,0,116,9,124,0,124,2,131,2,125,6,124,6,
+    100,0,117,0,114,82,116,8,116,6,160,7,124,0,161,1,
+    124,0,100,4,141,2,130,1,116,10,124,6,131,1,125,7,
+    124,3,114,134,116,1,106,2,124,3,25,0,125,4,124,0,
+    160,0,100,1,161,1,100,5,25,0,125,8,122,9,116,11,
+    124,4,124,8,124,7,131,3,1,0,87,0,124,7,83,0,
+    4,0,116,5,121,133,1,0,1,0,1,0,100,6,124,3,
+    155,2,100,7,124,8,155,2,157,4,125,5,116,12,160,13,
+    124,5,116,14,161,2,1,0,89,0,124,7,83,0,119,0,
+    124,7,83,0,41,8,78,114,141,0,0,0,114,25,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,114,19,0,0,0,233,
     2,0,0,0,122,27,67,97,110,110,111,116,32,115,101,116,
@@ -1558,326 +1560,327 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     5,99,104,105,108,100,114,5,0,0,0,114,5,0,0,0,
     114,6,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,219,3,
-    0,0,115,58,0,0,0,4,1,14,1,4,1,10,1,10,
+    0,0,115,60,0,0,0,4,1,14,1,4,1,10,1,10,
     1,10,2,10,1,10,1,2,1,10,1,12,1,16,1,14,
-    1,10,1,8,1,18,1,8,2,4,1,10,2,14,1,2,
-    1,14,1,4,4,12,253,16,1,14,1,8,1,2,253,2,
-    242,114,226,0,0,0,99,2,0,0,0,0,0,0,0,0,
-    0,0,0,4,0,0,0,8,0,0,0,67,0,0,0,115,
-    128,0,0,0,116,0,124,0,131,1,143,31,1,0,116,1,
-    106,2,160,3,124,0,116,4,161,2,125,2,124,2,116,4,
-    117,0,114,28,116,5,124,0,124,1,131,2,87,0,2,0,
-    100,1,4,0,4,0,131,3,1,0,83,0,87,0,100,1,
-    4,0,4,0,131,3,1,0,110,8,49,0,115,38,119,1,
-    1,0,1,0,1,0,89,0,1,0,124,2,100,1,117,0,
-    114,58,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,114,19,0,0,
-    0,41,9,114,57,0,0,0,114,18,0,0,0,114,105,0,
-    0,0,114,38,0,0,0,218,14,95,78,69,69,68,83,95,
-    76,79,65,68,73,78,71,114,226,0,0,0,114,50,0,0,
-    0,114,224,0,0,0,114,72,0,0,0,41,4,114,20,0,
-    0,0,114,225,0,0,0,114,110,0,0,0,114,82,0,0,
-    0,114,5,0,0,0,114,5,0,0,0,114,6,0,0,0,
-    218,14,95,102,105,110,100,95,97,110,100,95,108,111,97,100,
-    254,3,0,0,115,28,0,0,0,10,2,14,1,8,1,8,
-    1,16,253,2,2,28,254,8,5,2,1,6,1,2,255,12,
-    2,8,2,4,1,114,228,0,0,0,114,25,0,0,0,99,
-    3,0,0,0,0,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,
-    16,116,1,124,0,124,1,124,2,131,3,125,0,116,2,124,
-    0,116,3,131,2,83,0,41,3,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,25,0,0,0,78,41,4,114,221,0,0,0,114,211,0,
-    0,0,114,228,0,0,0,218,11,95,103,99,100,95,105,109,
-    112,111,114,116,114,220,0,0,0,114,5,0,0,0,114,5,
-    0,0,0,114,6,0,0,0,114,229,0,0,0,14,4,0,
-    0,115,8,0,0,0,12,9,8,1,12,1,10,1,114,229,
-    0,0,0,169,1,218,9,114,101,99,117,114,115,105,118,101,
-    99,3,0,0,0,0,0,0,0,1,0,0,0,8,0,0,
-    0,11,0,0,0,67,0,0,0,115,218,0,0,0,124,1,
-    68,0,93,103,125,4,116,0,124,4,116,1,131,2,115,32,
-    124,3,114,17,124,0,106,2,100,1,23,0,125,5,110,2,
-    100,2,125,5,116,3,100,3,124,5,155,0,100,4,116,4,
-    124,4,131,1,106,2,155,0,157,4,131,1,130,1,124,4,
-    100,5,107,2,114,53,124,3,115,52,116,5,124,0,100,6,
-    131,2,114,52,116,6,124,0,124,0,106,7,124,2,100,7,
-    100,8,141,4,1,0,113,2,116,5,124,0,124,4,131,2,
-    115,105,100,9,160,8,124,0,106,2,124,4,161,2,125,6,
-    122,7,116,9,124,2,124,6,131,2,1,0,87,0,113,2,
-    4,0,116,10,121,108,1,0,125,7,1,0,122,21,124,7,
-    106,11,124,6,107,2,114,100,116,12,106,13,160,14,124,6,
-    116,15,161,2,100,10,117,1,114,100,87,0,89,0,100,10,
-    125,7,126,7,113,2,130,0,100,10,125,7,126,7,119,1,
-    113,2,124,0,83,0,119,0,41,11,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,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,114,230,
-    0,0,0,114,206,0,0,0,78,41,16,114,216,0,0,0,
-    114,217,0,0,0,114,9,0,0,0,114,218,0,0,0,114,
-    3,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,114,233,0,0,0,
-    114,50,0,0,0,114,74,0,0,0,114,224,0,0,0,114,
-    20,0,0,0,114,18,0,0,0,114,105,0,0,0,114,38,
-    0,0,0,114,227,0,0,0,41,8,114,110,0,0,0,218,
-    8,102,114,111,109,108,105,115,116,114,225,0,0,0,114,231,
-    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,5,0,
-    0,0,114,5,0,0,0,114,6,0,0,0,114,234,0,0,
-    0,29,4,0,0,115,56,0,0,0,8,10,10,1,4,1,
-    12,1,4,2,10,1,8,1,8,255,8,2,14,1,10,1,
-    2,1,6,255,2,128,10,2,14,1,2,1,14,1,14,1,
-    10,4,16,1,2,255,12,2,2,1,8,128,2,245,4,12,
-    2,248,114,234,0,0,0,99,1,0,0,0,0,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,117,1,114,
-    41,124,2,100,3,117,1,114,39,124,1,124,2,106,1,107,
-    3,114,39,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,117,1,114,48,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,118,1,114,71,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,158,0,0,0,114,113,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,9,0,0,0,114,154,0,0,0,
-    114,141,0,0,0,114,25,0,0,0,41,6,114,38,0,0,
-    0,114,143,0,0,0,114,101,0,0,0,114,102,0,0,0,
-    114,169,0,0,0,114,142,0,0,0,41,3,218,7,103,108,
-    111,98,97,108,115,114,209,0,0,0,114,109,0,0,0,114,
-    5,0,0,0,114,5,0,0,0,114,6,0,0,0,218,17,
-    95,99,97,108,99,95,95,95,112,97,99,107,97,103,101,95,
-    95,66,4,0,0,115,42,0,0,0,10,7,10,1,8,1,
-    18,1,6,1,2,1,4,255,4,1,6,255,4,2,6,254,
-    4,3,8,1,6,1,6,2,4,2,6,254,8,3,8,1,
-    14,1,4,1,114,240,0,0,0,114,5,0,0,0,99,5,
-    0,0,0,0,0,0,0,0,0,0,0,9,0,0,0,5,
-    0,0,0,67,0,0,0,115,174,0,0,0,124,4,100,1,
-    107,2,114,9,116,0,124,0,131,1,125,5,110,18,124,1,
-    100,2,117,1,114,15,124,1,110,1,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,74,124,4,100,1,107,2,114,42,116,0,
-    124,0,160,2,100,3,161,1,100,1,25,0,131,1,83,0,
-    124,0,115,46,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,
-    116,7,124,5,100,4,131,2,114,85,116,8,124,5,124,3,
-    116,0,131,3,83,0,124,5,83,0,41,5,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,25,0,0,0,78,114,141,
-    0,0,0,114,154,0,0,0,41,9,114,229,0,0,0,114,
-    240,0,0,0,218,9,112,97,114,116,105,116,105,111,110,114,
-    208,0,0,0,114,18,0,0,0,114,105,0,0,0,114,9,
-    0,0,0,114,11,0,0,0,114,234,0,0,0,41,9,114,
-    20,0,0,0,114,239,0,0,0,218,6,108,111,99,97,108,
-    115,114,235,0,0,0,114,210,0,0,0,114,110,0,0,0,
-    90,8,103,108,111,98,97,108,115,95,114,209,0,0,0,90,
-    7,99,117,116,95,111,102,102,114,5,0,0,0,114,5,0,
-    0,0,114,6,0,0,0,218,10,95,95,105,109,112,111,114,
-    116,95,95,93,4,0,0,115,30,0,0,0,8,11,10,1,
-    16,2,8,1,12,1,4,1,8,3,18,1,4,1,4,1,
-    26,4,30,3,10,1,12,1,4,2,114,243,0,0,0,99,
-    1,0,0,0,0,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,117,0,114,15,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,175,0,0,0,114,183,0,0,0,114,87,0,
-    0,0,114,173,0,0,0,41,2,114,20,0,0,0,114,109,
+    1,2,254,10,3,8,1,18,1,8,2,4,1,10,2,14,
+    1,2,1,14,1,4,4,12,253,16,1,14,1,4,1,2,
+    253,4,3,114,226,0,0,0,99,2,0,0,0,0,0,0,
+    0,0,0,0,0,4,0,0,0,8,0,0,0,67,0,0,
+    0,115,128,0,0,0,116,0,124,0,131,1,143,31,1,0,
+    116,1,106,2,160,3,124,0,116,4,161,2,125,2,124,2,
+    116,4,117,0,114,28,116,5,124,0,124,1,131,2,87,0,
+    2,0,100,1,4,0,4,0,131,3,1,0,83,0,87,0,
+    100,1,4,0,4,0,131,3,1,0,110,8,49,0,115,38,
+    119,1,1,0,1,0,1,0,89,0,1,0,124,2,100,1,
+    117,0,114,58,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,114,19,
+    0,0,0,41,9,114,57,0,0,0,114,18,0,0,0,114,
+    105,0,0,0,114,38,0,0,0,218,14,95,78,69,69,68,
+    83,95,76,79,65,68,73,78,71,114,226,0,0,0,114,50,
+    0,0,0,114,224,0,0,0,114,72,0,0,0,41,4,114,
+    20,0,0,0,114,225,0,0,0,114,110,0,0,0,114,82,
     0,0,0,114,5,0,0,0,114,5,0,0,0,114,6,0,
-    0,0,218,18,95,98,117,105,108,116,105,110,95,102,114,111,
-    109,95,110,97,109,101,130,4,0,0,115,8,0,0,0,10,
-    1,8,1,12,1,8,1,114,244,0,0,0,99,2,0,0,
-    0,0,0,0,0,0,0,0,0,10,0,0,0,5,0,0,
-    0,67,0,0,0,115,166,0,0,0,124,1,97,0,124,0,
-    97,1,116,2,116,1,131,1,125,2,116,1,106,3,160,4,
-    161,0,68,0,93,36,92,2,125,3,125,4,116,5,124,4,
-    124,2,131,2,114,49,124,3,116,1,106,6,118,0,114,30,
-    116,7,125,5,110,9,116,0,160,8,124,3,161,1,114,38,
-    116,9,125,5,110,1,113,13,116,10,124,4,124,5,131,2,
-    125,6,116,11,124,6,124,4,131,2,1,0,113,13,116,1,
-    106,3,116,12,25,0,125,7,100,1,68,0,93,23,125,8,
-    124,8,116,1,106,3,118,1,114,69,116,13,124,8,131,1,
-    125,9,110,5,116,1,106,3,124,8,25,0,125,9,116,14,
-    124,7,124,8,124,9,131,3,1,0,113,57,100,2,83,0,
-    41,3,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,41,3,
-    114,26,0,0,0,114,101,0,0,0,114,71,0,0,0,78,
-    41,15,114,64,0,0,0,114,18,0,0,0,114,3,0,0,
-    0,114,105,0,0,0,218,5,105,116,101,109,115,114,216,0,
-    0,0,114,86,0,0,0,114,175,0,0,0,114,98,0,0,
-    0,114,193,0,0,0,114,155,0,0,0,114,161,0,0,0,
-    114,9,0,0,0,114,244,0,0,0,114,12,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,20,0,0,0,114,110,0,0,
-    0,114,122,0,0,0,114,109,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,5,0,0,0,114,5,0,0,0,
-    114,6,0,0,0,218,6,95,115,101,116,117,112,137,4,0,
-    0,115,40,0,0,0,4,9,4,1,8,3,18,1,10,1,
-    10,1,6,1,10,1,6,1,2,2,10,1,10,1,2,128,
-    10,3,8,1,10,1,10,1,10,2,14,1,4,251,114,248,
-    0,0,0,99,2,0,0,0,0,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,248,
-    0,0,0,114,18,0,0,0,114,214,0,0,0,114,132,0,
-    0,0,114,175,0,0,0,114,193,0,0,0,41,2,114,246,
-    0,0,0,114,247,0,0,0,114,5,0,0,0,114,5,0,
-    0,0,114,6,0,0,0,218,8,95,105,110,115,116,97,108,
-    108,172,4,0,0,115,6,0,0,0,10,2,12,2,16,1,
-    114,249,0,0,0,99,0,0,0,0,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,25,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,139,0,0,0,114,249,0,0,0,114,18,
-    0,0,0,114,105,0,0,0,114,9,0,0,0,41,1,114,
-    250,0,0,0,114,5,0,0,0,114,5,0,0,0,114,6,
-    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,
-    180,4,0,0,115,6,0,0,0,8,3,4,1,20,1,114,
-    251,0,0,0,114,190,0,0,0,114,0,0,0,0,114,24,
-    0,0,0,41,4,78,78,114,5,0,0,0,114,25,0,0,
-    0,41,54,114,10,0,0,0,114,7,0,0,0,114,26,0,
-    0,0,114,101,0,0,0,114,71,0,0,0,114,139,0,0,
-    0,114,17,0,0,0,114,21,0,0,0,114,66,0,0,0,
-    114,37,0,0,0,114,47,0,0,0,114,22,0,0,0,114,
-    23,0,0,0,114,55,0,0,0,114,57,0,0,0,114,60,
-    0,0,0,114,72,0,0,0,114,74,0,0,0,114,83,0,
-    0,0,114,95,0,0,0,114,100,0,0,0,114,111,0,0,
-    0,114,124,0,0,0,114,125,0,0,0,114,104,0,0,0,
-    114,155,0,0,0,114,161,0,0,0,114,165,0,0,0,114,
-    119,0,0,0,114,106,0,0,0,114,172,0,0,0,114,173,
-    0,0,0,114,107,0,0,0,114,175,0,0,0,114,193,0,
-    0,0,114,200,0,0,0,114,211,0,0,0,114,213,0,0,
-    0,114,215,0,0,0,114,221,0,0,0,90,15,95,69,82,
-    82,95,77,83,71,95,80,82,69,70,73,88,114,223,0,0,
-    0,114,226,0,0,0,218,6,111,98,106,101,99,116,114,227,
-    0,0,0,114,228,0,0,0,114,229,0,0,0,114,234,0,
-    0,0,114,240,0,0,0,114,243,0,0,0,114,244,0,0,
-    0,114,248,0,0,0,114,249,0,0,0,114,251,0,0,0,
-    114,5,0,0,0,114,5,0,0,0,114,5,0,0,0,114,
-    6,0,0,0,218,8,60,109,111,100,117,108,101,62,1,0,
-    0,0,115,104,0,0,0,4,0,8,22,4,9,4,1,4,
-    1,4,3,8,3,8,8,4,8,4,2,16,3,14,4,14,
-    77,14,21,8,16,8,37,8,17,14,11,8,8,8,11,8,
-    12,8,19,14,26,16,101,10,26,14,45,8,72,8,17,8,
-    17,8,30,8,36,8,45,14,15,14,80,14,85,8,13,8,
-    9,10,10,8,47,4,16,8,1,8,2,6,32,8,3,10,
-    16,14,15,8,37,10,27,8,37,8,7,8,35,12,8,
+    0,0,218,14,95,102,105,110,100,95,97,110,100,95,108,111,
+    97,100,254,3,0,0,115,28,0,0,0,10,2,14,1,8,
+    1,8,1,16,253,2,2,28,254,8,5,2,1,6,1,2,
+    255,12,2,8,2,4,1,114,228,0,0,0,114,25,0,0,
+    0,99,3,0,0,0,0,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,16,116,1,124,0,124,1,124,2,131,3,125,0,116,
+    2,124,0,116,3,131,2,83,0,41,3,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,25,0,0,0,78,41,4,114,221,0,0,0,114,
+    211,0,0,0,114,228,0,0,0,218,11,95,103,99,100,95,
+    105,109,112,111,114,116,114,220,0,0,0,114,5,0,0,0,
+    114,5,0,0,0,114,6,0,0,0,114,229,0,0,0,14,
+    4,0,0,115,8,0,0,0,12,9,8,1,12,1,10,1,
+    114,229,0,0,0,169,1,218,9,114,101,99,117,114,115,105,
+    118,101,99,3,0,0,0,0,0,0,0,1,0,0,0,8,
+    0,0,0,11,0,0,0,67,0,0,0,115,218,0,0,0,
+    124,1,68,0,93,104,125,4,116,0,124,4,116,1,131,2,
+    115,32,124,3,114,17,124,0,106,2,100,1,23,0,125,5,
+    110,2,100,2,125,5,116,3,100,3,124,5,155,0,100,4,
+    116,4,124,4,131,1,106,2,155,0,157,4,131,1,130,1,
+    124,4,100,5,107,2,114,53,124,3,115,52,116,5,124,0,
+    100,6,131,2,114,52,116,6,124,0,124,0,106,7,124,2,
+    100,7,100,8,141,4,1,0,113,2,116,5,124,0,124,4,
+    131,2,115,106,100,9,160,8,124,0,106,2,124,4,161,2,
+    125,6,122,7,116,9,124,2,124,6,131,2,1,0,87,0,
+    113,2,4,0,116,10,121,105,1,0,125,7,1,0,122,21,
+    124,7,106,11,124,6,107,2,114,100,116,12,106,13,160,14,
+    124,6,116,15,161,2,100,10,117,1,114,100,87,0,89,0,
+    100,10,125,7,126,7,113,2,130,0,100,10,125,7,126,7,
+    119,1,119,0,113,2,124,0,83,0,41,11,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,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,
+    114,230,0,0,0,114,206,0,0,0,78,41,16,114,216,0,
+    0,0,114,217,0,0,0,114,9,0,0,0,114,218,0,0,
+    0,114,3,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,114,233,0,
+    0,0,114,50,0,0,0,114,74,0,0,0,114,224,0,0,
+    0,114,20,0,0,0,114,18,0,0,0,114,105,0,0,0,
+    114,38,0,0,0,114,227,0,0,0,41,8,114,110,0,0,
+    0,218,8,102,114,111,109,108,105,115,116,114,225,0,0,0,
+    114,231,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,
+    5,0,0,0,114,5,0,0,0,114,6,0,0,0,114,234,
+    0,0,0,29,4,0,0,115,56,0,0,0,8,10,10,1,
+    4,1,12,1,4,2,10,1,8,1,8,255,8,2,14,1,
+    10,1,2,1,6,255,2,128,10,2,14,1,2,1,14,1,
+    14,1,10,4,16,1,2,255,12,2,2,1,8,128,2,249,
+    2,252,4,12,114,234,0,0,0,99,1,0,0,0,0,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,117,
+    1,114,41,124,2,100,3,117,1,114,39,124,1,124,2,106,
+    1,107,3,114,39,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,117,1,114,
+    48,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,118,1,114,71,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,158,0,0,0,114,113,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,9,0,0,0,114,154,0,
+    0,0,114,141,0,0,0,114,25,0,0,0,41,6,114,38,
+    0,0,0,114,143,0,0,0,114,101,0,0,0,114,102,0,
+    0,0,114,169,0,0,0,114,142,0,0,0,41,3,218,7,
+    103,108,111,98,97,108,115,114,209,0,0,0,114,109,0,0,
+    0,114,5,0,0,0,114,5,0,0,0,114,6,0,0,0,
+    218,17,95,99,97,108,99,95,95,95,112,97,99,107,97,103,
+    101,95,95,66,4,0,0,115,42,0,0,0,10,7,10,1,
+    8,1,18,1,6,1,2,1,4,255,4,1,6,255,4,2,
+    6,254,4,3,8,1,6,1,6,2,4,2,6,254,8,3,
+    8,1,14,1,4,1,114,240,0,0,0,114,5,0,0,0,
+    99,5,0,0,0,0,0,0,0,0,0,0,0,9,0,0,
+    0,5,0,0,0,67,0,0,0,115,174,0,0,0,124,4,
+    100,1,107,2,114,9,116,0,124,0,131,1,125,5,110,18,
+    124,1,100,2,117,1,114,15,124,1,110,1,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,74,124,4,100,1,107,2,114,42,
+    116,0,124,0,160,2,100,3,161,1,100,1,25,0,131,1,
+    83,0,124,0,115,46,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,116,7,124,5,100,4,131,2,114,85,116,8,124,5,
+    124,3,116,0,131,3,83,0,124,5,83,0,41,5,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,25,0,0,0,78,
+    114,141,0,0,0,114,154,0,0,0,41,9,114,229,0,0,
+    0,114,240,0,0,0,218,9,112,97,114,116,105,116,105,111,
+    110,114,208,0,0,0,114,18,0,0,0,114,105,0,0,0,
+    114,9,0,0,0,114,11,0,0,0,114,234,0,0,0,41,
+    9,114,20,0,0,0,114,239,0,0,0,218,6,108,111,99,
+    97,108,115,114,235,0,0,0,114,210,0,0,0,114,110,0,
+    0,0,90,8,103,108,111,98,97,108,115,95,114,209,0,0,
+    0,90,7,99,117,116,95,111,102,102,114,5,0,0,0,114,
+    5,0,0,0,114,6,0,0,0,218,10,95,95,105,109,112,
+    111,114,116,95,95,93,4,0,0,115,30,0,0,0,8,11,
+    10,1,16,2,8,1,12,1,4,1,8,3,18,1,4,1,
+    4,1,26,4,30,3,10,1,12,1,4,2,114,243,0,0,
+    0,99,1,0,0,0,0,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,117,0,114,
+    15,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,175,0,0,0,114,183,0,0,0,114,
+    87,0,0,0,114,173,0,0,0,41,2,114,20,0,0,0,
+    114,109,0,0,0,114,5,0,0,0,114,5,0,0,0,114,
+    6,0,0,0,218,18,95,98,117,105,108,116,105,110,95,102,
+    114,111,109,95,110,97,109,101,130,4,0,0,115,8,0,0,
+    0,10,1,8,1,12,1,8,1,114,244,0,0,0,99,2,
+    0,0,0,0,0,0,0,0,0,0,0,10,0,0,0,5,
+    0,0,0,67,0,0,0,115,166,0,0,0,124,1,97,0,
+    124,0,97,1,116,2,116,1,131,1,125,2,116,1,106,3,
+    160,4,161,0,68,0,93,36,92,2,125,3,125,4,116,5,
+    124,4,124,2,131,2,114,49,124,3,116,1,106,6,118,0,
+    114,30,116,7,125,5,110,9,116,0,160,8,124,3,161,1,
+    114,38,116,9,125,5,110,1,113,13,116,10,124,4,124,5,
+    131,2,125,6,116,11,124,6,124,4,131,2,1,0,113,13,
+    116,1,106,3,116,12,25,0,125,7,100,1,68,0,93,23,
+    125,8,124,8,116,1,106,3,118,1,114,69,116,13,124,8,
+    131,1,125,9,110,5,116,1,106,3,124,8,25,0,125,9,
+    116,14,124,7,124,8,124,9,131,3,1,0,113,57,100,2,
+    83,0,41,3,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,
+    41,3,114,26,0,0,0,114,101,0,0,0,114,71,0,0,
+    0,78,41,15,114,64,0,0,0,114,18,0,0,0,114,3,
+    0,0,0,114,105,0,0,0,218,5,105,116,101,109,115,114,
+    216,0,0,0,114,86,0,0,0,114,175,0,0,0,114,98,
+    0,0,0,114,193,0,0,0,114,155,0,0,0,114,161,0,
+    0,0,114,9,0,0,0,114,244,0,0,0,114,12,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,20,0,0,0,114,110,
+    0,0,0,114,122,0,0,0,114,109,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,5,0,0,0,114,5,0,
+    0,0,114,6,0,0,0,218,6,95,115,101,116,117,112,137,
+    4,0,0,115,40,0,0,0,4,9,4,1,8,3,18,1,
+    10,1,10,1,6,1,10,1,6,1,2,2,10,1,10,1,
+    2,128,10,3,8,1,10,1,10,1,10,2,14,1,4,251,
+    114,248,0,0,0,99,2,0,0,0,0,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,248,0,0,0,114,18,0,0,0,114,214,0,0,0,114,
+    132,0,0,0,114,175,0,0,0,114,193,0,0,0,41,2,
+    114,246,0,0,0,114,247,0,0,0,114,5,0,0,0,114,
+    5,0,0,0,114,6,0,0,0,218,8,95,105,110,115,116,
+    97,108,108,172,4,0,0,115,6,0,0,0,10,2,12,2,
+    16,1,114,249,0,0,0,99,0,0,0,0,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,25,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,139,0,0,0,114,249,0,0,0,
+    114,18,0,0,0,114,105,0,0,0,114,9,0,0,0,41,
+    1,114,250,0,0,0,114,5,0,0,0,114,5,0,0,0,
+    114,6,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,180,4,0,0,115,6,0,0,0,8,3,4,1,20,
+    1,114,251,0,0,0,114,190,0,0,0,114,0,0,0,0,
+    114,24,0,0,0,41,4,78,78,114,5,0,0,0,114,25,
+    0,0,0,41,54,114,10,0,0,0,114,7,0,0,0,114,
+    26,0,0,0,114,101,0,0,0,114,71,0,0,0,114,139,
+    0,0,0,114,17,0,0,0,114,21,0,0,0,114,66,0,
+    0,0,114,37,0,0,0,114,47,0,0,0,114,22,0,0,
+    0,114,23,0,0,0,114,55,0,0,0,114,57,0,0,0,
+    114,60,0,0,0,114,72,0,0,0,114,74,0,0,0,114,
+    83,0,0,0,114,95,0,0,0,114,100,0,0,0,114,111,
+    0,0,0,114,124,0,0,0,114,125,0,0,0,114,104,0,
+    0,0,114,155,0,0,0,114,161,0,0,0,114,165,0,0,
+    0,114,119,0,0,0,114,106,0,0,0,114,172,0,0,0,
+    114,173,0,0,0,114,107,0,0,0,114,175,0,0,0,114,
+    193,0,0,0,114,200,0,0,0,114,211,0,0,0,114,213,
+    0,0,0,114,215,0,0,0,114,221,0,0,0,90,15,95,
+    69,82,82,95,77,83,71,95,80,82,69,70,73,88,114,223,
+    0,0,0,114,226,0,0,0,218,6,111,98,106,101,99,116,
+    114,227,0,0,0,114,228,0,0,0,114,229,0,0,0,114,
+    234,0,0,0,114,240,0,0,0,114,243,0,0,0,114,244,
+    0,0,0,114,248,0,0,0,114,249,0,0,0,114,251,0,
+    0,0,114,5,0,0,0,114,5,0,0,0,114,5,0,0,
+    0,114,6,0,0,0,218,8,60,109,111,100,117,108,101,62,
+    1,0,0,0,115,104,0,0,0,4,0,8,22,4,9,4,
+    1,4,1,4,3,8,3,8,8,4,8,4,2,16,3,14,
+    4,14,77,14,21,8,16,8,37,8,17,14,11,8,8,8,
+    11,8,12,8,19,14,26,16,101,10,26,14,45,8,72,8,
+    17,8,17,8,30,8,36,8,45,14,15,14,80,14,85,8,
+    13,8,9,10,10,8,47,4,16,8,1,8,2,6,32,8,
+    3,10,16,14,15,8,37,10,27,8,37,8,7,8,35,12,
+    8,
 };
diff --git a/Python/importlib_external.h b/Python/importlib_external.h
index 4b4831b4cf6a1..01fdef7cc8955 100644
--- a/Python/importlib_external.h
+++ b/Python/importlib_external.h
@@ -266,9 +266,9 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
     0,0,0,115,2,0,0,0,10,7,114,75,0,0,0,99,
     2,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,
     8,0,0,0,67,0,0,0,115,48,0,0,0,122,6,116,
-    0,124,0,131,1,125,2,87,0,110,9,4,0,116,1,121,
-    23,1,0,1,0,1,0,89,0,100,1,83,0,124,2,106,
-    2,100,2,64,0,124,1,107,2,83,0,119,0,41,4,122,
+    0,124,0,131,1,125,2,87,0,110,10,4,0,116,1,121,
+    16,1,0,1,0,1,0,89,0,100,1,83,0,119,0,124,
+    2,106,2,100,2,64,0,124,1,107,2,83,0,41,4,122,
     49,84,101,115,116,32,119,104,101,116,104,101,114,32,116,104,
     101,32,112,97,116,104,32,105,115,32,116,104,101,32,115,112,
     101,99,105,102,105,101,100,32,109,111,100,101,32,116,121,112,
@@ -278,8 +278,8 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
     9,115,116,97,116,95,105,110,102,111,114,7,0,0,0,114,
     7,0,0,0,114,8,0,0,0,218,18,95,112,97,116,104,
     95,105,115,95,109,111,100,101,95,116,121,112,101,150,0,0,
-    0,115,12,0,0,0,2,2,12,1,12,1,6,1,14,1,
-    2,254,114,79,0,0,0,99,1,0,0,0,0,0,0,0,
+    0,115,12,0,0,0,2,2,12,1,12,1,6,1,2,255,
+    14,2,114,79,0,0,0,99,1,0,0,0,0,0,0,0,
     0,0,0,0,1,0,0,0,3,0,0,0,67,0,0,0,
     115,10,0,0,0,116,0,124,0,100,1,131,2,83,0,41,
     3,122,31,82,101,112,108,97,99,101,109,101,110,116,32,102,
@@ -558,56 +558,56 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
     255,10,2,8,1,14,1,8,1,16,1,10,1,4,1,2,
     1,8,255,16,2,8,1,16,1,14,2,18,1,114,128,0,
     0,0,99,1,0,0,0,0,0,0,0,0,0,0,0,5,
-    0,0,0,9,0,0,0,67,0,0,0,115,122,0,0,0,
+    0,0,0,9,0,0,0,67,0,0,0,115,124,0,0,0,
     116,0,124,0,131,1,100,1,107,2,114,8,100,2,83,0,
     124,0,160,1,100,3,161,1,92,3,125,1,125,2,125,3,
     124,1,114,28,124,3,160,2,161,0,100,4,100,5,133,2,
     25,0,100,6,107,3,114,30,124,0,83,0,122,6,116,3,
-    124,0,131,1,125,4,87,0,110,15,4,0,116,4,116,5,
-    102,2,121,60,1,0,1,0,1,0,124,0,100,2,100,5,
-    133,2,25,0,125,4,89,0,116,6,124,4,131,1,114,58,
-    124,4,83,0,124,0,83,0,119,0,41,7,122,188,67,111,
-    110,118,101,114,116,32,97,32,98,121,116,101,99,111,100,101,
-    32,102,105,108,101,32,112,97,116,104,32,116,111,32,97,32,
-    115,111,117,114,99,101,32,112,97,116,104,32,40,105,102,32,
-    112,111,115,115,105,98,108,101,41,46,10,10,32,32,32,32,
-    84,104,105,115,32,102,117,110,99,116,105,111,110,32,101,120,
-    105,115,116,115,32,112,117,114,101,108,121,32,102,111,114,32,
-    98,97,99,107,119,97,114,100,115,45,99,111,109,112,97,116,
-    105,98,105,108,105,116,121,32,102,111,114,10,32,32,32,32,
-    80,121,73,109,112,111,114,116,95,69,120,101,99,67,111,100,
-    101,77,111,100,117,108,101,87,105,116,104,70,105,108,101,110,
-    97,109,101,115,40,41,32,105,110,32,116,104,101,32,67,32,
-    65,80,73,46,10,10,32,32,32,32,114,0,0,0,0,78,
-    114,97,0,0,0,233,253,255,255,255,233,255,255,255,255,90,
-    2,112,121,41,7,114,4,0,0,0,114,104,0,0,0,218,
-    5,108,111,119,101,114,114,128,0,0,0,114,107,0,0,0,
-    114,111,0,0,0,114,80,0,0,0,41,5,218,13,98,121,
-    116,101,99,111,100,101,95,112,97,116,104,114,119,0,0,0,
-    218,1,95,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,7,0,0,0,
-    114,7,0,0,0,114,8,0,0,0,218,15,95,103,101,116,
-    95,115,111,117,114,99,101,102,105,108,101,235,1,0,0,115,
-    22,0,0,0,12,7,4,1,16,1,24,1,4,1,2,1,
-    12,1,16,1,14,1,16,1,2,254,114,135,0,0,0,99,
-    1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,
-    8,0,0,0,67,0,0,0,115,70,0,0,0,124,0,160,
-    0,116,1,116,2,131,1,161,1,114,21,122,5,116,3,124,
-    0,131,1,87,0,83,0,4,0,116,4,121,34,1,0,1,
-    0,1,0,89,0,110,11,124,0,160,0,116,1,116,5,131,
-    1,161,1,114,30,124,0,83,0,100,0,83,0,100,0,83,
-    0,119,0,114,69,0,0,0,41,6,114,58,0,0,0,218,
+    124,0,131,1,125,4,87,0,110,17,4,0,116,4,116,5,
+    102,2,121,53,1,0,1,0,1,0,124,0,100,2,100,5,
+    133,2,25,0,125,4,89,0,110,1,119,0,116,6,124,4,
+    131,1,114,60,124,4,83,0,124,0,83,0,41,7,122,188,
+    67,111,110,118,101,114,116,32,97,32,98,121,116,101,99,111,
+    100,101,32,102,105,108,101,32,112,97,116,104,32,116,111,32,
+    97,32,115,111,117,114,99,101,32,112,97,116,104,32,40,105,
+    102,32,112,111,115,115,105,98,108,101,41,46,10,10,32,32,
+    32,32,84,104,105,115,32,102,117,110,99,116,105,111,110,32,
+    101,120,105,115,116,115,32,112,117,114,101,108,121,32,102,111,
+    114,32,98,97,99,107,119,97,114,100,115,45,99,111,109,112,
+    97,116,105,98,105,108,105,116,121,32,102,111,114,10,32,32,
+    32,32,80,121,73,109,112,111,114,116,95,69,120,101,99,67,
+    111,100,101,77,111,100,117,108,101,87,105,116,104,70,105,108,
+    101,110,97,109,101,115,40,41,32,105,110,32,116,104,101,32,
+    67,32,65,80,73,46,10,10,32,32,32,32,114,0,0,0,
+    0,78,114,97,0,0,0,233,253,255,255,255,233,255,255,255,
+    255,90,2,112,121,41,7,114,4,0,0,0,114,104,0,0,
+    0,218,5,108,111,119,101,114,114,128,0,0,0,114,107,0,
+    0,0,114,111,0,0,0,114,80,0,0,0,41,5,218,13,
+    98,121,116,101,99,111,100,101,95,112,97,116,104,114,119,0,
+    0,0,218,1,95,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,7,0,
+    0,0,114,7,0,0,0,114,8,0,0,0,218,15,95,103,
+    101,116,95,115,111,117,114,99,101,102,105,108,101,235,1,0,
+    0,115,22,0,0,0,12,7,4,1,16,1,24,1,4,1,
+    2,1,12,1,16,1,16,1,2,255,16,2,114,135,0,0,
+    0,99,1,0,0,0,0,0,0,0,0,0,0,0,1,0,
+    0,0,8,0,0,0,67,0,0,0,115,68,0,0,0,124,
+    0,160,0,116,1,116,2,131,1,161,1,114,23,122,5,116,
+    3,124,0,131,1,87,0,83,0,4,0,116,4,121,22,1,
+    0,1,0,1,0,89,0,100,0,83,0,119,0,124,0,160,
+    0,116,1,116,5,131,1,161,1,114,32,124,0,83,0,100,
+    0,83,0,114,69,0,0,0,41,6,114,58,0,0,0,218,
     5,116,117,112,108,101,114,127,0,0,0,114,121,0,0,0,
     114,107,0,0,0,114,113,0,0,0,41,1,114,120,0,0,
     0,114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,
     218,11,95,103,101,116,95,99,97,99,104,101,100,254,1,0,
-    0,115,20,0,0,0,14,1,2,1,10,1,12,1,4,1,
-    14,1,4,1,4,2,4,252,2,255,114,137,0,0,0,99,
-    1,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,
-    8,0,0,0,67,0,0,0,115,48,0,0,0,122,7,116,
-    0,124,0,131,1,106,1,125,1,87,0,110,9,4,0,116,
-    2,121,23,1,0,1,0,1,0,100,1,125,1,89,0,124,
-    1,100,2,79,0,125,1,124,1,83,0,119,0,41,4,122,
+    0,115,18,0,0,0,14,1,2,1,10,1,12,1,6,1,
+    2,255,14,2,4,1,4,2,114,137,0,0,0,99,1,0,
+    0,0,0,0,0,0,0,0,0,0,2,0,0,0,8,0,
+    0,0,67,0,0,0,115,50,0,0,0,122,7,116,0,124,
+    0,131,1,106,1,125,1,87,0,110,11,4,0,116,2,121,
+    18,1,0,1,0,1,0,100,1,125,1,89,0,110,1,119,
+    0,124,1,100,2,79,0,125,1,124,1,83,0,41,4,122,
     51,67,97,108,99,117,108,97,116,101,32,116,104,101,32,109,
     111,100,101,32,112,101,114,109,105,115,115,105,111,110,115,32,
     102,111,114,32,97,32,98,121,116,101,99,111,100,101,32,102,
@@ -616,7 +616,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
     41,2,114,65,0,0,0,114,78,0,0,0,114,7,0,0,
     0,114,7,0,0,0,114,8,0,0,0,218,10,95,99,97,
     108,99,95,109,111,100,101,10,2,0,0,115,14,0,0,0,
-    2,2,14,1,12,1,6,1,8,3,4,1,2,251,114,139,
+    2,2,14,1,12,1,8,1,2,255,8,4,4,1,114,139,
     0,0,0,99,1,0,0,0,0,0,0,0,0,0,0,0,
     3,0,0,0,4,0,0,0,3,0,0,0,115,52,0,0,
     0,100,6,135,0,102,1,100,2,100,3,132,9,125,1,116,
@@ -789,9 +789,9 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
     25,0,131,1,124,1,100,3,64,0,107,3,114,31,100,4,
     124,3,155,2,157,2,125,5,116,1,160,2,100,5,124,5,
     161,2,1,0,116,3,124,5,102,1,105,0,124,4,164,1,
-    142,1,130,1,124,2,100,6,117,1,114,60,116,0,124,0,
+    142,1,130,1,124,2,100,6,117,1,114,58,116,0,124,0,
     100,2,100,7,133,2,25,0,131,1,124,2,100,3,64,0,
-    107,3,114,58,116,3,100,4,124,3,155,2,157,2,102,1,
+    107,3,114,60,116,3,100,4,124,3,155,2,157,2,102,1,
     105,0,124,4,164,1,142,1,130,1,100,6,83,0,100,6,
     83,0,41,8,97,7,2,0,0,86,97,108,105,100,97,116,
     101,32,97,32,112,121,99,32,97,103,97,105,110,115,116,32,
@@ -975,1793 +975,1793 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
     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,99,
     2,0,0,0,0,0,0,0,2,0,0,0,9,0,0,0,
-    8,0,0,0,67,0,0,0,115,52,1,0,0,124,1,100,
-    1,117,0,114,28,100,2,125,1,116,0,124,2,100,3,131,
-    2,114,27,122,7,124,2,160,1,124,0,161,1,125,1,87,
-    0,110,35,4,0,116,2,121,153,1,0,1,0,1,0,89,
-    0,110,27,110,26,116,3,160,4,124,1,161,1,125,1,116,
-    5,124,1,131,1,115,54,122,9,116,6,116,3,160,7,161,
-    0,124,1,131,2,125,1,87,0,110,7,4,0,116,8,121,
-    152,1,0,1,0,1,0,89,0,116,9,106,10,124,0,124,
-    2,124,1,100,4,141,3,125,4,100,5,124,4,95,11,124,
-    2,100,1,117,0,114,96,116,12,131,0,68,0,93,21,92,
-    2,125,5,125,6,124,1,160,13,116,14,124,6,131,1,161,
-    1,114,93,124,5,124,0,124,1,131,2,125,2,124,2,124,
-    4,95,15,1,0,113,96,113,72,100,1,83,0,124,3,116,
-    16,117,0,114,127,116,0,124,2,100,6,131,2,114,126,122,
-    7,124,2,160,17,124,0,161,1,125,7,87,0,110,8,4,
-    0,116,2,121,151,1,0,1,0,1,0,89,0,110,9,124,
-    7,114,126,103,0,124,4,95,18,110,3,124,3,124,4,95,
-    18,124,4,106,18,103,0,107,2,114,149,124,1,114,149,116,
-    19,124,1,131,1,100,7,25,0,125,8,124,4,106,18,160,
-    20,124,8,161,1,1,0,124,4,83,0,119,0,119,0,119,
-    0,41,8,97,61,1,0,0,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,97,32,102,105,108,101,32,108,111,99,
-    97,116,105,111,110,46,10,10,32,32,32,32,84,111,32,105,
-    110,100,105,99,97,116,101,32,116,104,97,116,32,116,104,101,
-    32,109,111,100,117,108,101,32,105,115,32,97,32,112,97,99,
-    107,97,103,101,44,32,115,101,116,10,32,32,32,32,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,32,116,111,32,97,32,108,105,
-    115,116,32,111,102,32,100,105,114,101,99,116,111,114,121,32,
-    112,97,116,104,115,46,32,32,65,110,10,32,32,32,32,101,
-    109,112,116,121,32,108,105,115,116,32,105,115,32,115,117,102,
-    102,105,99,105,101,110,116,44,32,116,104,111,117,103,104,32,
-    105,116,115,32,110,111,116,32,111,116,104,101,114,119,105,115,
-    101,32,117,115,101,102,117,108,32,116,111,32,116,104,101,10,
-    32,32,32,32,105,109,112,111,114,116,32,115,121,115,116,101,
-    109,46,10,10,32,32,32,32,84,104,101,32,108,111,97,100,
-    101,114,32,109,117,115,116,32,116,97,107,101,32,97,32,115,
-    112,101,99,32,97,115,32,105,116,115,32,111,110,108,121,32,
-    95,95,105,110,105,116,95,95,40,41,32,97,114,103,46,10,
-    10,32,32,32,32,78,122,9,60,117,110,107,110,111,119,110,
-    62,218,12,103,101,116,95,102,105,108,101,110,97,109,101,169,
-    1,218,6,111,114,105,103,105,110,84,218,10,105,115,95,112,
-    97,99,107,97,103,101,114,0,0,0,0,41,21,114,153,0,
-    0,0,114,203,0,0,0,114,142,0,0,0,114,18,0,0,
-    0,114,103,0,0,0,114,86,0,0,0,114,67,0,0,0,
-    114,82,0,0,0,114,76,0,0,0,114,159,0,0,0,218,
-    10,77,111,100,117,108,101,83,112,101,99,90,13,95,115,101,
-    116,95,102,105,108,101,97,116,116,114,218,27,95,103,101,116,
-    95,115,117,112,112,111,114,116,101,100,95,102,105,108,101,95,
-    108,111,97,100,101,114,115,114,58,0,0,0,114,136,0,0,
-    0,114,164,0,0,0,218,9,95,80,79,80,85,76,65,84,
-    69,114,206,0,0,0,114,202,0,0,0,114,74,0,0,0,
-    114,61,0,0,0,41,9,114,141,0,0,0,90,8,108,111,
-    99,97,116,105,111,110,114,164,0,0,0,114,202,0,0,0,
-    218,4,115,112,101,99,218,12,108,111,97,100,101,114,95,99,
-    108,97,115,115,218,8,115,117,102,102,105,120,101,115,114,206,
-    0,0,0,90,7,100,105,114,110,97,109,101,114,7,0,0,
-    0,114,7,0,0,0,114,8,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,209,2,0,0,115,84,0,0,0,8,12,4,
-    4,10,1,2,2,14,1,12,1,4,1,2,251,10,7,8,
-    1,2,1,18,1,12,1,2,1,16,8,6,1,8,3,14,
-    1,14,1,10,1,6,1,4,1,2,253,4,5,8,3,10,
-    2,2,1,14,1,12,1,4,1,4,2,6,1,2,128,6,
-    2,10,1,4,1,12,1,12,1,4,2,2,244,2,228,2,
-    249,114,213,0,0,0,99,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,4,0,0,0,64,0,0,0,115,
-    88,0,0,0,101,0,90,1,100,0,90,2,100,1,90,3,
-    100,2,90,4,100,3,90,5,101,6,111,15,100,4,101,7,
-    118,0,90,8,101,9,100,5,100,6,132,0,131,1,90,10,
-    101,11,100,7,100,8,132,0,131,1,90,12,101,11,100,14,
-    100,10,100,11,132,1,131,1,90,13,101,11,100,15,100,12,
-    100,13,132,1,131,1,90,14,100,9,83,0,41,16,218,21,
-    87,105,110,100,111,119,115,82,101,103,105,115,116,114,121,70,
-    105,110,100,101,114,122,62,77,101,116,97,32,112,97,116,104,
-    32,102,105,110,100,101,114,32,102,111,114,32,109,111,100,117,
-    108,101,115,32,100,101,99,108,97,114,101,100,32,105,110,32,
-    116,104,101,32,87,105,110,100,111,119,115,32,114,101,103,105,
-    115,116,114,121,46,122,59,83,111,102,116,119,97,114,101,92,
-    80,121,116,104,111,110,92,80,121,116,104,111,110,67,111,114,
-    101,92,123,115,121,115,95,118,101,114,115,105,111,110,125,92,
-    77,111,100,117,108,101,115,92,123,102,117,108,108,110,97,109,
-    101,125,122,65,83,111,102,116,119,97,114,101,92,80,121,116,
-    104,111,110,92,80,121,116,104,111,110,67,111,114,101,92,123,
-    115,121,115,95,118,101,114,115,105,111,110,125,92,77,111,100,
-    117,108,101,115,92,123,102,117,108,108,110,97,109,101,125,92,
-    68,101,98,117,103,122,6,95,100,46,112,121,100,99,1,0,
-    0,0,0,0,0,0,0,0,0,0,1,0,0,0,8,0,
-    0,0,67,0,0,0,115,50,0,0,0,122,8,116,0,160,
-    1,116,0,106,2,124,0,161,2,87,0,83,0,4,0,116,
-    3,121,24,1,0,1,0,1,0,116,0,160,1,116,0,106,
-    4,124,0,161,2,6,0,89,0,83,0,119,0,114,69,0,
-    0,0,41,5,218,6,119,105,110,114,101,103,90,7,79,112,
-    101,110,75,101,121,90,17,72,75,69,89,95,67,85,82,82,
-    69,78,84,95,85,83,69,82,114,76,0,0,0,90,18,72,
-    75,69,89,95,76,79,67,65,76,95,77,65,67,72,73,78,
-    69,114,19,0,0,0,114,7,0,0,0,114,7,0,0,0,
-    114,8,0,0,0,218,14,95,111,112,101,110,95,114,101,103,
-    105,115,116,114,121,38,3,0,0,115,10,0,0,0,2,2,
-    16,1,12,1,18,1,2,255,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,2,
-    0,0,0,0,0,0,0,0,0,0,0,6,0,0,0,8,
-    0,0,0,67,0,0,0,115,134,0,0,0,124,0,106,0,
-    114,7,124,0,106,1,125,2,110,3,124,0,106,2,125,2,
-    124,2,106,3,124,1,100,1,116,4,106,5,100,0,100,2,
-    133,2,25,0,22,0,100,3,141,2,125,3,122,32,124,0,
-    160,6,124,3,161,1,143,16,125,4,116,7,160,8,124,4,
-    100,4,161,2,125,5,87,0,100,0,4,0,4,0,131,3,
-    1,0,87,0,124,5,83,0,49,0,115,49,119,1,1,0,
-    1,0,1,0,89,0,1,0,87,0,124,5,83,0,4,0,
-    116,9,121,66,1,0,1,0,1,0,89,0,100,0,83,0,
-    119,0,41,5,78,122,5,37,100,46,37,100,114,44,0,0,
-    0,41,2,114,163,0,0,0,90,11,115,121,115,95,118,101,
-    114,115,105,111,110,114,10,0,0,0,41,10,218,11,68,69,
-    66,85,71,95,66,85,73,76,68,218,18,82,69,71,73,83,
-    84,82,89,95,75,69,89,95,68,69,66,85,71,218,12,82,
-    69,71,73,83,84,82,89,95,75,69,89,114,89,0,0,0,
-    114,15,0,0,0,218,12,118,101,114,115,105,111,110,95,105,
-    110,102,111,114,216,0,0,0,114,215,0,0,0,90,10,81,
-    117,101,114,121,86,97,108,117,101,114,76,0,0,0,41,6,
-    218,3,99,108,115,114,163,0,0,0,90,12,114,101,103,105,
-    115,116,114,121,95,107,101,121,114,20,0,0,0,90,4,104,
-    107,101,121,218,8,102,105,108,101,112,97,116,104,114,7,0,
-    0,0,114,7,0,0,0,114,8,0,0,0,218,16,95,115,
-    101,97,114,99,104,95,114,101,103,105,115,116,114,121,45,3,
-    0,0,115,32,0,0,0,6,2,8,1,6,2,6,1,16,
-    1,6,255,2,2,12,1,14,1,12,255,4,4,18,252,4,
-    4,12,254,6,1,2,255,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,114,99,104,95,114,101,103,105,115,116,114,121,78,
-    99,4,0,0,0,0,0,0,0,0,0,0,0,8,0,0,
-    0,8,0,0,0,67,0,0,0,115,120,0,0,0,124,0,
-    160,0,124,1,161,1,125,4,124,4,100,0,117,0,114,11,
-    100,0,83,0,122,6,116,1,124,4,131,1,1,0,87,0,
-    110,9,4,0,116,2,121,59,1,0,1,0,1,0,89,0,
-    100,0,83,0,116,3,131,0,68,0,93,26,92,2,125,5,
-    125,6,124,4,160,4,116,5,124,6,131,1,161,1,114,56,
-    116,6,106,7,124,1,124,5,124,1,124,4,131,2,124,4,
-    100,1,141,3,125,7,124,7,2,0,1,0,83,0,113,30,
-    100,0,83,0,119,0,41,2,78,114,204,0,0,0,41,8,
-    114,223,0,0,0,114,75,0,0,0,114,76,0,0,0,114,
-    208,0,0,0,114,58,0,0,0,114,136,0,0,0,114,159,
-    0,0,0,218,16,115,112,101,99,95,102,114,111,109,95,108,
-    111,97,100,101,114,41,8,114,221,0,0,0,114,163,0,0,
-    0,114,65,0,0,0,218,6,116,97,114,103,101,116,114,222,
-    0,0,0,114,164,0,0,0,114,212,0,0,0,114,210,0,
-    0,0,114,7,0,0,0,114,7,0,0,0,114,8,0,0,
-    0,218,9,102,105,110,100,95,115,112,101,99,60,3,0,0,
-    115,34,0,0,0,10,2,8,1,4,1,2,1,12,1,12,
-    1,6,1,14,1,14,1,6,1,8,1,2,1,6,254,8,
-    3,2,252,4,255,2,254,122,31,87,105,110,100,111,119,115,
+    8,0,0,0,67,0,0,0,115,54,1,0,0,124,1,100,
+    1,117,0,114,29,100,2,125,1,116,0,124,2,100,3,131,
+    2,114,28,122,7,124,2,160,1,124,0,161,1,125,1,87,
+    0,110,38,4,0,116,2,121,27,1,0,1,0,1,0,89,
+    0,110,30,119,0,110,28,116,3,160,4,124,1,161,1,125,
+    1,116,5,124,1,131,1,115,57,122,9,116,6,116,3,160,
+    7,161,0,124,1,131,2,125,1,87,0,110,9,4,0,116,
+    8,121,56,1,0,1,0,1,0,89,0,110,1,119,0,116,
+    9,106,10,124,0,124,2,124,1,100,4,141,3,125,4,100,
+    5,124,4,95,11,124,2,100,1,117,0,114,99,116,12,131,
+    0,68,0,93,21,92,2,125,5,125,6,124,1,160,13,116,
+    14,124,6,131,1,161,1,114,96,124,5,124,0,124,1,131,
+    2,125,2,124,2,124,4,95,15,1,0,113,99,113,75,100,
+    1,83,0,124,3,116,16,117,0,114,131,116,0,124,2,100,
+    6,131,2,114,130,122,7,124,2,160,17,124,0,161,1,125,
+    7,87,0,110,9,4,0,116,2,121,124,1,0,1,0,1,
+    0,89,0,110,10,119,0,124,7,114,130,103,0,124,4,95,
+    18,110,3,124,3,124,4,95,18,124,4,106,18,103,0,107,
+    2,114,153,124,1,114,153,116,19,124,1,131,1,100,7,25,
+    0,125,8,124,4,106,18,160,20,124,8,161,1,1,0,124,
+    4,83,0,41,8,97,61,1,0,0,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,97,32,102,105,108,101,32,108,
+    111,99,97,116,105,111,110,46,10,10,32,32,32,32,84,111,
+    32,105,110,100,105,99,97,116,101,32,116,104,97,116,32,116,
+    104,101,32,109,111,100,117,108,101,32,105,115,32,97,32,112,
+    97,99,107,97,103,101,44,32,115,101,116,10,32,32,32,32,
+    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,32,116,111,32,97,32,
+    108,105,115,116,32,111,102,32,100,105,114,101,99,116,111,114,
+    121,32,112,97,116,104,115,46,32,32,65,110,10,32,32,32,
+    32,101,109,112,116,121,32,108,105,115,116,32,105,115,32,115,
+    117,102,102,105,99,105,101,110,116,44,32,116,104,111,117,103,
+    104,32,105,116,115,32,110,111,116,32,111,116,104,101,114,119,
+    105,115,101,32,117,115,101,102,117,108,32,116,111,32,116,104,
+    101,10,32,32,32,32,105,109,112,111,114,116,32,115,121,115,
+    116,101,109,46,10,10,32,32,32,32,84,104,101,32,108,111,
+    97,100,101,114,32,109,117,115,116,32,116,97,107,101,32,97,
+    32,115,112,101,99,32,97,115,32,105,116,115,32,111,110,108,
+    121,32,95,95,105,110,105,116,95,95,40,41,32,97,114,103,
+    46,10,10,32,32,32,32,78,122,9,60,117,110,107,110,111,
+    119,110,62,218,12,103,101,116,95,102,105,108,101,110,97,109,
+    101,169,1,218,6,111,114,105,103,105,110,84,218,10,105,115,
+    95,112,97,99,107,97,103,101,114,0,0,0,0,41,21,114,
+    153,0,0,0,114,203,0,0,0,114,142,0,0,0,114,18,
+    0,0,0,114,103,0,0,0,114,86,0,0,0,114,67,0,
+    0,0,114,82,0,0,0,114,76,0,0,0,114,159,0,0,
+    0,218,10,77,111,100,117,108,101,83,112,101,99,90,13,95,
+    115,101,116,95,102,105,108,101,97,116,116,114,218,27,95,103,
+    101,116,95,115,117,112,112,111,114,116,101,100,95,102,105,108,
+    101,95,108,111,97,100,101,114,115,114,58,0,0,0,114,136,
+    0,0,0,114,164,0,0,0,218,9,95,80,79,80,85,76,
+    65,84,69,114,206,0,0,0,114,202,0,0,0,114,74,0,
+    0,0,114,61,0,0,0,41,9,114,141,0,0,0,90,8,
+    108,111,99,97,116,105,111,110,114,164,0,0,0,114,202,0,
+    0,0,218,4,115,112,101,99,218,12,108,111,97,100,101,114,
+    95,99,108,97,115,115,218,8,115,117,102,102,105,120,101,115,
+    114,206,0,0,0,90,7,100,105,114,110,97,109,101,114,7,
+    0,0,0,114,7,0,0,0,114,8,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,209,2,0,0,115,84,0,0,0,8,
+    12,4,4,10,1,2,2,14,1,12,1,4,1,2,255,2,
+    252,10,7,8,1,2,1,18,1,12,1,4,1,2,255,16,
+    9,6,1,8,3,14,1,14,1,10,1,6,1,4,1,2,
+    253,4,5,8,3,10,2,2,1,14,1,12,1,4,1,2,
+    255,4,3,6,1,2,128,6,2,10,1,4,1,12,1,12,
+    1,4,2,114,213,0,0,0,99,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,4,0,0,0,64,0,0,
+    0,115,88,0,0,0,101,0,90,1,100,0,90,2,100,1,
+    90,3,100,2,90,4,100,3,90,5,101,6,111,15,100,4,
+    101,7,118,0,90,8,101,9,100,5,100,6,132,0,131,1,
+    90,10,101,11,100,7,100,8,132,0,131,1,90,12,101,11,
+    100,14,100,10,100,11,132,1,131,1,90,13,101,11,100,15,
+    100,12,100,13,132,1,131,1,90,14,100,9,83,0,41,16,
+    218,21,87,105,110,100,111,119,115,82,101,103,105,115,116,114,
+    121,70,105,110,100,101,114,122,62,77,101,116,97,32,112,97,
+    116,104,32,102,105,110,100,101,114,32,102,111,114,32,109,111,
+    100,117,108,101,115,32,100,101,99,108,97,114,101,100,32,105,
+    110,32,116,104,101,32,87,105,110,100,111,119,115,32,114,101,
+    103,105,115,116,114,121,46,122,59,83,111,102,116,119,97,114,
+    101,92,80,121,116,104,111,110,92,80,121,116,104,111,110,67,
+    111,114,101,92,123,115,121,115,95,118,101,114,115,105,111,110,
+    125,92,77,111,100,117,108,101,115,92,123,102,117,108,108,110,
+    97,109,101,125,122,65,83,111,102,116,119,97,114,101,92,80,
+    121,116,104,111,110,92,80,121,116,104,111,110,67,111,114,101,
+    92,123,115,121,115,95,118,101,114,115,105,111,110,125,92,77,
+    111,100,117,108,101,115,92,123,102,117,108,108,110,97,109,101,
+    125,92,68,101,98,117,103,122,6,95,100,46,112,121,100,99,
+    1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,
+    8,0,0,0,67,0,0,0,115,50,0,0,0,122,8,116,
+    0,160,1,116,0,106,2,124,0,161,2,87,0,83,0,4,
+    0,116,3,121,24,1,0,1,0,1,0,116,0,160,1,116,
+    0,106,4,124,0,161,2,6,0,89,0,83,0,119,0,114,
+    69,0,0,0,41,5,218,6,119,105,110,114,101,103,90,7,
+    79,112,101,110,75,101,121,90,17,72,75,69,89,95,67,85,
+    82,82,69,78,84,95,85,83,69,82,114,76,0,0,0,90,
+    18,72,75,69,89,95,76,79,67,65,76,95,77,65,67,72,
+    73,78,69,114,19,0,0,0,114,7,0,0,0,114,7,0,
+    0,0,114,8,0,0,0,218,14,95,111,112,101,110,95,114,
+    101,103,105,115,116,114,121,38,3,0,0,115,10,0,0,0,
+    2,2,16,1,12,1,18,1,2,255,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,2,0,0,0,0,0,0,0,0,0,0,0,6,0,0,
+    0,8,0,0,0,67,0,0,0,115,134,0,0,0,124,0,
+    106,0,114,7,124,0,106,1,125,2,110,3,124,0,106,2,
+    125,2,124,2,106,3,124,1,100,1,116,4,106,5,100,0,
+    100,2,133,2,25,0,22,0,100,3,141,2,125,3,122,32,
+    124,0,160,6,124,3,161,1,143,16,125,4,116,7,160,8,
+    124,4,100,4,161,2,125,5,87,0,100,0,4,0,4,0,
+    131,3,1,0,87,0,124,5,83,0,49,0,115,49,119,1,
+    1,0,1,0,1,0,89,0,1,0,87,0,124,5,83,0,
+    4,0,116,9,121,66,1,0,1,0,1,0,89,0,100,0,
+    83,0,119,0,41,5,78,122,5,37,100,46,37,100,114,44,
+    0,0,0,41,2,114,163,0,0,0,90,11,115,121,115,95,
+    118,101,114,115,105,111,110,114,10,0,0,0,41,10,218,11,
+    68,69,66,85,71,95,66,85,73,76,68,218,18,82,69,71,
+    73,83,84,82,89,95,75,69,89,95,68,69,66,85,71,218,
+    12,82,69,71,73,83,84,82,89,95,75,69,89,114,89,0,
+    0,0,114,15,0,0,0,218,12,118,101,114,115,105,111,110,
+    95,105,110,102,111,114,216,0,0,0,114,215,0,0,0,90,
+    10,81,117,101,114,121,86,97,108,117,101,114,76,0,0,0,
+    41,6,218,3,99,108,115,114,163,0,0,0,90,12,114,101,
+    103,105,115,116,114,121,95,107,101,121,114,20,0,0,0,90,
+    4,104,107,101,121,218,8,102,105,108,101,112,97,116,104,114,
+    7,0,0,0,114,7,0,0,0,114,8,0,0,0,218,16,
+    95,115,101,97,114,99,104,95,114,101,103,105,115,116,114,121,
+    45,3,0,0,115,32,0,0,0,6,2,8,1,6,2,6,
+    1,16,1,6,255,2,2,12,1,14,1,12,255,4,4,18,
+    252,4,4,12,254,6,1,2,255,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,114,99,104,95,114,101,103,105,115,116,114,
+    121,78,99,4,0,0,0,0,0,0,0,0,0,0,0,8,
+    0,0,0,8,0,0,0,67,0,0,0,115,120,0,0,0,
+    124,0,160,0,124,1,161,1,125,4,124,4,100,0,117,0,
+    114,11,100,0,83,0,122,6,116,1,124,4,131,1,1,0,
+    87,0,110,10,4,0,116,2,121,27,1,0,1,0,1,0,
+    89,0,100,0,83,0,119,0,116,3,131,0,68,0,93,26,
+    92,2,125,5,125,6,124,4,160,4,116,5,124,6,131,1,
+    161,1,114,57,116,6,106,7,124,1,124,5,124,1,124,4,
+    131,2,124,4,100,1,141,3,125,7,124,7,2,0,1,0,
+    83,0,113,31,100,0,83,0,41,2,78,114,204,0,0,0,
+    41,8,114,223,0,0,0,114,75,0,0,0,114,76,0,0,
+    0,114,208,0,0,0,114,58,0,0,0,114,136,0,0,0,
+    114,159,0,0,0,218,16,115,112,101,99,95,102,114,111,109,
+    95,108,111,97,100,101,114,41,8,114,221,0,0,0,114,163,
+    0,0,0,114,65,0,0,0,218,6,116,97,114,103,101,116,
+    114,222,0,0,0,114,164,0,0,0,114,212,0,0,0,114,
+    210,0,0,0,114,7,0,0,0,114,7,0,0,0,114,8,
+    0,0,0,218,9,102,105,110,100,95,115,112,101,99,60,3,
+    0,0,115,34,0,0,0,10,2,8,1,4,1,2,1,12,
+    1,12,1,6,1,2,255,14,2,14,1,6,1,8,1,2,
+    1,6,254,8,3,2,252,4,255,122,31,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,115,112,101,99,99,3,0,0,0,0,
+    0,0,0,0,0,0,0,4,0,0,0,4,0,0,0,67,
+    0,0,0,115,42,0,0,0,116,0,160,1,100,1,116,2,
+    161,2,1,0,124,0,160,3,124,1,124,2,161,2,125,3,
+    124,3,100,2,117,1,114,19,124,3,106,4,83,0,100,2,
+    83,0,41,3,122,106,70,105,110,100,32,109,111,100,117,108,
+    101,32,110,97,109,101,100,32,105,110,32,116,104,101,32,114,
+    101,103,105,115,116,114,121,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,
+    122,112,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,40,41,32,105,115,32,100,101,112,114,101,99,97,
+    116,101,100,32,97,110,100,32,115,108,97,116,101,100,32,102,
+    111,114,32,114,101,109,111,118,97,108,32,105,110,32,80,121,
+    116,104,111,110,32,51,46,49,50,59,32,117,115,101,32,102,
+    105,110,100,95,115,112,101,99,40,41,32,105,110,115,116,101,
+    97,100,78,169,5,114,99,0,0,0,114,100,0,0,0,114,
+    101,0,0,0,114,226,0,0,0,114,164,0,0,0,169,4,
+    114,221,0,0,0,114,163,0,0,0,114,65,0,0,0,114,
+    210,0,0,0,114,7,0,0,0,114,7,0,0,0,114,8,
+    0,0,0,218,11,102,105,110,100,95,109,111,100,117,108,101,
+    76,3,0,0,115,14,0,0,0,6,7,2,2,4,254,12,
+    3,8,1,6,1,4,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,115,112,101,99,99,3,0,0,0,0,0,0,
-    0,0,0,0,0,4,0,0,0,4,0,0,0,67,0,0,
-    0,115,42,0,0,0,116,0,160,1,100,1,116,2,161,2,
-    1,0,124,0,160,3,124,1,124,2,161,2,125,3,124,3,
-    100,2,117,1,114,19,124,3,106,4,83,0,100,2,83,0,
-    41,3,122,106,70,105,110,100,32,109,111,100,117,108,101,32,
-    110,97,109,101,100,32,105,110,32,116,104,101,32,114,101,103,
-    105,115,116,114,121,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,122,112,
-    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,40,41,32,105,115,32,100,101,112,114,101,99,97,116,101,
-    100,32,97,110,100,32,115,108,97,116,101,100,32,102,111,114,
-    32,114,101,109,111,118,97,108,32,105,110,32,80,121,116,104,
-    111,110,32,51,46,49,50,59,32,117,115,101,32,102,105,110,
-    100,95,115,112,101,99,40,41,32,105,110,115,116,101,97,100,
-    78,169,5,114,99,0,0,0,114,100,0,0,0,114,101,0,
-    0,0,114,226,0,0,0,114,164,0,0,0,169,4,114,221,
-    0,0,0,114,163,0,0,0,114,65,0,0,0,114,210,0,
-    0,0,114,7,0,0,0,114,7,0,0,0,114,8,0,0,
-    0,218,11,102,105,110,100,95,109,111,100,117,108,101,76,3,
-    0,0,115,14,0,0,0,6,7,2,2,4,254,12,3,8,
-    1,6,1,4,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,169,2,78,78,114,69,0,0,
-    0,41,15,114,150,0,0,0,114,149,0,0,0,114,151,0,
-    0,0,114,152,0,0,0,114,219,0,0,0,114,218,0,0,
-    0,218,11,95,77,83,95,87,73,78,68,79,87,83,218,18,
-    69,88,84,69,78,83,73,79,78,95,83,85,70,70,73,88,
-    69,83,114,217,0,0,0,218,12,115,116,97,116,105,99,109,
-    101,116,104,111,100,114,216,0,0,0,218,11,99,108,97,115,
-    115,109,101,116,104,111,100,114,223,0,0,0,114,226,0,0,
-    0,114,229,0,0,0,114,7,0,0,0,114,7,0,0,0,
-    114,7,0,0,0,114,8,0,0,0,114,214,0,0,0,26,
-    3,0,0,115,30,0,0,0,8,0,4,2,2,3,2,255,
-    2,4,2,255,12,3,2,2,10,1,2,6,10,1,2,14,
-    12,1,2,15,16,1,114,214,0,0,0,99,0,0,0,0,
-    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,13,95,76,111,
-    97,100,101,114,66,97,115,105,99,115,122,83,66,97,115,101,
-    32,99,108,97,115,115,32,111,102,32,99,111,109,109,111,110,
-    32,99,111,100,101,32,110,101,101,100,101,100,32,98,121,32,
-    98,111,116,104,32,83,111,117,114,99,101,76,111,97,100,101,
-    114,32,97,110,100,10,32,32,32,32,83,111,117,114,99,101,
-    108,101,115,115,70,105,108,101,76,111,97,100,101,114,46,99,
-    2,0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,
-    4,0,0,0,67,0,0,0,115,64,0,0,0,116,0,124,
-    0,160,1,124,1,161,1,131,1,100,1,25,0,125,2,124,
-    2,160,2,100,2,100,1,161,2,100,3,25,0,125,3,124,
-    1,160,3,100,2,161,1,100,4,25,0,125,4,124,3,100,
-    5,107,2,111,31,124,4,100,5,107,3,83,0,41,7,122,
-    141,67,111,110,99,114,101,116,101,32,105,109,112,108,101,109,
-    101,110,116,97,116,105,111,110,32,111,102,32,73,110,115,112,
-    101,99,116,76,111,97,100,101,114,46,105,115,95,112,97,99,
-    107,97,103,101,32,98,121,32,99,104,101,99,107,105,110,103,
-    32,105,102,10,32,32,32,32,32,32,32,32,116,104,101,32,
-    112,97,116,104,32,114,101,116,117,114,110,101,100,32,98,121,
-    32,103,101,116,95,102,105,108,101,110,97,109,101,32,104,97,
-    115,32,97,32,102,105,108,101,110,97,109,101,32,111,102,32,
-    39,95,95,105,110,105,116,95,95,46,112,121,39,46,114,3,
-    0,0,0,114,97,0,0,0,114,0,0,0,0,114,44,0,
-    0,0,218,8,95,95,105,110,105,116,95,95,78,41,4,114,
-    74,0,0,0,114,203,0,0,0,114,125,0,0,0,114,104,
-    0,0,0,41,5,114,143,0,0,0,114,163,0,0,0,114,
-    120,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,7,
-    0,0,0,114,7,0,0,0,114,8,0,0,0,114,206,0,
-    0,0,98,3,0,0,115,8,0,0,0,18,3,16,1,14,
-    1,16,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,0,0,0,0,0,0,2,0,0,0,1,0,
-    0,0,67,0,0,0,114,23,0,0,0,169,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,7,0,0,0,169,
-    2,114,143,0,0,0,114,210,0,0,0,114,7,0,0,0,
-    114,7,0,0,0,114,8,0,0,0,218,13,99,114,101,97,
-    116,101,95,109,111,100,117,108,101,106,3,0,0,243,2,0,
-    0,0,4,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,0,0,0,0,3,0,
-    0,0,5,0,0,0,67,0,0,0,115,56,0,0,0,124,
-    0,160,0,124,1,106,1,161,1,125,2,124,2,100,1,117,
-    0,114,18,116,2,100,2,160,3,124,1,106,1,161,1,131,
-    1,130,1,116,4,160,5,116,6,124,2,124,1,106,7,161,
-    3,1,0,100,1,83,0,41,3,122,19,69,120,101,99,117,
-    116,101,32,116,104,101,32,109,111,100,117,108,101,46,78,122,
-    52,99,97,110,110,111,116,32,108,111,97,100,32,109,111,100,
-    117,108,101,32,123,33,114,125,32,119,104,101,110,32,103,101,
-    116,95,99,111,100,101,40,41,32,114,101,116,117,114,110,115,
-    32,78,111,110,101,41,8,218,8,103,101,116,95,99,111,100,
-    101,114,150,0,0,0,114,142,0,0,0,114,89,0,0,0,
-    114,159,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,
-    218,4,101,120,101,99,114,156,0,0,0,41,3,114,143,0,
-    0,0,218,6,109,111,100,117,108,101,114,188,0,0,0,114,
-    7,0,0,0,114,7,0,0,0,114,8,0,0,0,218,11,
-    101,120,101,99,95,109,111,100,117,108,101,109,3,0,0,115,
-    12,0,0,0,12,2,8,1,4,1,8,1,4,255,20,2,
-    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,0,0,0,0,2,0,0,0,4,0,0,0,
-    67,0,0,0,115,12,0,0,0,116,0,160,1,124,0,124,
-    1,161,2,83,0,41,2,122,26,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,78,41,2,114,159,0,0,0,218,17,95,108,111,
-    97,100,95,109,111,100,117,108,101,95,115,104,105,109,169,2,
-    114,143,0,0,0,114,163,0,0,0,114,7,0,0,0,114,
-    7,0,0,0,114,8,0,0,0,218,11,108,111,97,100,95,
-    109,111,100,117,108,101,117,3,0,0,115,2,0,0,0,12,
-    3,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,
-    150,0,0,0,114,149,0,0,0,114,151,0,0,0,114,152,
-    0,0,0,114,206,0,0,0,114,239,0,0,0,114,245,0,
-    0,0,114,248,0,0,0,114,7,0,0,0,114,7,0,0,
-    0,114,7,0,0,0,114,8,0,0,0,114,235,0,0,0,
-    93,3,0,0,115,12,0,0,0,8,0,4,2,8,3,8,
-    8,8,3,12,8,114,235,0,0,0,99,0,0,0,0,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,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,100,8,132,0,90,6,
-    100,9,100,10,132,0,90,7,100,11,100,12,156,1,100,13,
-    100,14,132,2,90,8,100,15,100,16,132,0,90,9,100,17,
-    83,0,41,18,218,12,83,111,117,114,99,101,76,111,97,100,
-    101,114,99,2,0,0,0,0,0,0,0,0,0,0,0,2,
-    0,0,0,1,0,0,0,67,0,0,0,115,4,0,0,0,
-    116,0,130,1,41,2,122,165,79,112,116,105,111,110,97,108,
-    32,109,101,116,104,111,100,32,116,104,97,116,32,114,101,116,
-    117,114,110,115,32,116,104,101,32,109,111,100,105,102,105,99,
-    97,116,105,111,110,32,116,105,109,101,32,40,97,110,32,105,
-    110,116,41,32,102,111,114,32,116,104,101,10,32,32,32,32,
-    32,32,32,32,115,112,101,99,105,102,105,101,100,32,112,97,
-    116,104,32,40,97,32,115,116,114,41,46,10,10,32,32,32,
-    32,32,32,32,32,82,97,105,115,101,115,32,79,83,69,114,
-    114,111,114,32,119,104,101,110,32,116,104,101,32,112,97,116,
-    104,32,99,97,110,110,111,116,32,98,101,32,104,97,110,100,
-    108,101,100,46,10,32,32,32,32,32,32,32,32,78,41,1,
-    114,76,0,0,0,169,2,114,143,0,0,0,114,65,0,0,
+    105,110,100,95,109,111,100,117,108,101,169,2,78,78,114,69,
+    0,0,0,41,15,114,150,0,0,0,114,149,0,0,0,114,
+    151,0,0,0,114,152,0,0,0,114,219,0,0,0,114,218,
+    0,0,0,218,11,95,77,83,95,87,73,78,68,79,87,83,
+    218,18,69,88,84,69,78,83,73,79,78,95,83,85,70,70,
+    73,88,69,83,114,217,0,0,0,218,12,115,116,97,116,105,
+    99,109,101,116,104,111,100,114,216,0,0,0,218,11,99,108,
+    97,115,115,109,101,116,104,111,100,114,223,0,0,0,114,226,
+    0,0,0,114,229,0,0,0,114,7,0,0,0,114,7,0,
+    0,0,114,7,0,0,0,114,8,0,0,0,114,214,0,0,
+    0,26,3,0,0,115,30,0,0,0,8,0,4,2,2,3,
+    2,255,2,4,2,255,12,3,2,2,10,1,2,6,10,1,
+    2,14,12,1,2,15,16,1,114,214,0,0,0,99,0,0,
+    0,0,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,13,95,
+    76,111,97,100,101,114,66,97,115,105,99,115,122,83,66,97,
+    115,101,32,99,108,97,115,115,32,111,102,32,99,111,109,109,
+    111,110,32,99,111,100,101,32,110,101,101,100,101,100,32,98,
+    121,32,98,111,116,104,32,83,111,117,114,99,101,76,111,97,
+    100,101,114,32,97,110,100,10,32,32,32,32,83,111,117,114,
+    99,101,108,101,115,115,70,105,108,101,76,111,97,100,101,114,
+    46,99,2,0,0,0,0,0,0,0,0,0,0,0,5,0,
+    0,0,4,0,0,0,67,0,0,0,115,64,0,0,0,116,
+    0,124,0,160,1,124,1,161,1,131,1,100,1,25,0,125,
+    2,124,2,160,2,100,2,100,1,161,2,100,3,25,0,125,
+    3,124,1,160,3,100,2,161,1,100,4,25,0,125,4,124,
+    3,100,5,107,2,111,31,124,4,100,5,107,3,83,0,41,
+    7,122,141,67,111,110,99,114,101,116,101,32,105,109,112,108,
+    101,109,101,110,116,97,116,105,111,110,32,111,102,32,73,110,
+    115,112,101,99,116,76,111,97,100,101,114,46,105,115,95,112,
+    97,99,107,97,103,101,32,98,121,32,99,104,101,99,107,105,
+    110,103,32,105,102,10,32,32,32,32,32,32,32,32,116,104,
+    101,32,112,97,116,104,32,114,101,116,117,114,110,101,100,32,
+    98,121,32,103,101,116,95,102,105,108,101,110,97,109,101,32,
+    104,97,115,32,97,32,102,105,108,101,110,97,109,101,32,111,
+    102,32,39,95,95,105,110,105,116,95,95,46,112,121,39,46,
+    114,3,0,0,0,114,97,0,0,0,114,0,0,0,0,114,
+    44,0,0,0,218,8,95,95,105,110,105,116,95,95,78,41,
+    4,114,74,0,0,0,114,203,0,0,0,114,125,0,0,0,
+    114,104,0,0,0,41,5,114,143,0,0,0,114,163,0,0,
+    0,114,120,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,7,0,0,0,114,7,0,0,0,114,8,0,0,0,114,
+    206,0,0,0,98,3,0,0,115,8,0,0,0,18,3,16,
+    1,14,1,16,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,0,0,0,0,0,0,2,0,0,0,
+    1,0,0,0,67,0,0,0,114,23,0,0,0,169,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,7,0,0,
+    0,169,2,114,143,0,0,0,114,210,0,0,0,114,7,0,
+    0,0,114,7,0,0,0,114,8,0,0,0,218,13,99,114,
+    101,97,116,101,95,109,111,100,117,108,101,106,3,0,0,243,
+    2,0,0,0,4,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,0,0,0,0,
+    3,0,0,0,5,0,0,0,67,0,0,0,115,56,0,0,
+    0,124,0,160,0,124,1,106,1,161,1,125,2,124,2,100,
+    1,117,0,114,18,116,2,100,2,160,3,124,1,106,1,161,
+    1,131,1,130,1,116,4,160,5,116,6,124,2,124,1,106,
+    7,161,3,1,0,100,1,83,0,41,3,122,19,69,120,101,
+    99,117,116,101,32,116,104,101,32,109,111,100,117,108,101,46,
+    78,122,52,99,97,110,110,111,116,32,108,111,97,100,32,109,
+    111,100,117,108,101,32,123,33,114,125,32,119,104,101,110,32,
+    103,101,116,95,99,111,100,101,40,41,32,114,101,116,117,114,
+    110,115,32,78,111,110,101,41,8,218,8,103,101,116,95,99,
+    111,100,101,114,150,0,0,0,114,142,0,0,0,114,89,0,
+    0,0,114,159,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,218,4,101,120,101,99,114,156,0,0,0,41,3,114,
+    143,0,0,0,218,6,109,111,100,117,108,101,114,188,0,0,
     0,114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,
-    218,10,112,97,116,104,95,109,116,105,109,101,125,3,0,0,
-    115,2,0,0,0,4,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,0,0,0,0,2,0,0,
-    0,4,0,0,0,67,0,0,0,115,14,0,0,0,100,1,
-    124,0,160,0,124,1,161,1,105,1,83,0,41,3,97,158,
-    1,0,0,79,112,116,105,111,110,97,108,32,109,101,116,104,
-    111,100,32,114,101,116,117,114,110,105,110,103,32,97,32,109,
-    101,116,97,100,97,116,97,32,100,105,99,116,32,102,111,114,
-    32,116,104,101,32,115,112,101,99,105,102,105,101,100,10,32,
-    32,32,32,32,32,32,32,112,97,116,104,32,40,97,32,115,
-    116,114,41,46,10,10,32,32,32,32,32,32,32,32,80,111,
-    115,115,105,98,108,101,32,107,101,121,115,58,10,32,32,32,
-    32,32,32,32,32,45,32,39,109,116,105,109,101,39,32,40,
-    109,97,110,100,97,116,111,114,121,41,32,105,115,32,116,104,
-    101,32,110,117,109,101,114,105,99,32,116,105,109,101,115,116,
-    97,109,112,32,111,102,32,108,97,115,116,32,115,111,117,114,
-    99,101,10,32,32,32,32,32,32,32,32,32,32,99,111,100,
-    101,32,109,111,100,105,102,105,99,97,116,105,111,110,59,10,
-    32,32,32,32,32,32,32,32,45,32,39,115,105,122,101,39,
-    32,40,111,112,116,105,111,110,97,108,41,32,105,115,32,116,
-    104,101,32,115,105,122,101,32,105,110,32,98,121,116,101,115,
-    32,111,102,32,116,104,101,32,115,111,117,114,99,101,32,99,
-    111,100,101,46,10,10,32,32,32,32,32,32,32,32,73,109,
-    112,108,101,109,101,110,116,105,110,103,32,116,104,105,115,32,
-    109,101,116,104,111,100,32,97,108,108,111,119,115,32,116,104,
-    101,32,108,111,97,100,101,114,32,116,111,32,114,101,97,100,
-    32,98,121,116,101,99,111,100,101,32,102,105,108,101,115,46,
-    10,32,32,32,32,32,32,32,32,82,97,105,115,101,115,32,
-    79,83,69,114,114,111,114,32,119,104,101,110,32,116,104,101,
-    32,112,97,116,104,32,99,97,110,110,111,116,32,98,101,32,
-    104,97,110,100,108,101,100,46,10,32,32,32,32,32,32,32,
-    32,114,193,0,0,0,78,41,1,114,251,0,0,0,114,250,
+    218,11,101,120,101,99,95,109,111,100,117,108,101,109,3,0,
+    0,115,12,0,0,0,12,2,8,1,4,1,8,1,4,255,
+    20,2,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,0,0,0,0,2,0,0,0,4,0,
+    0,0,67,0,0,0,115,12,0,0,0,116,0,160,1,124,
+    0,124,1,161,2,83,0,41,2,122,26,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,78,41,2,114,159,0,0,0,218,17,95,
+    108,111,97,100,95,109,111,100,117,108,101,95,115,104,105,109,
+    169,2,114,143,0,0,0,114,163,0,0,0,114,7,0,0,
+    0,114,7,0,0,0,114,8,0,0,0,218,11,108,111,97,
+    100,95,109,111,100,117,108,101,117,3,0,0,115,2,0,0,
+    0,12,3,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,150,0,0,0,114,149,0,0,0,114,151,0,0,0,
+    114,152,0,0,0,114,206,0,0,0,114,239,0,0,0,114,
+    245,0,0,0,114,248,0,0,0,114,7,0,0,0,114,7,
+    0,0,0,114,7,0,0,0,114,8,0,0,0,114,235,0,
+    0,0,93,3,0,0,115,12,0,0,0,8,0,4,2,8,
+    3,8,8,8,3,12,8,114,235,0,0,0,99,0,0,0,
+    0,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,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,100,8,132,0,
+    90,6,100,9,100,10,132,0,90,7,100,11,100,12,156,1,
+    100,13,100,14,132,2,90,8,100,15,100,16,132,0,90,9,
+    100,17,83,0,41,18,218,12,83,111,117,114,99,101,76,111,
+    97,100,101,114,99,2,0,0,0,0,0,0,0,0,0,0,
+    0,2,0,0,0,1,0,0,0,67,0,0,0,115,4,0,
+    0,0,116,0,130,1,41,2,122,165,79,112,116,105,111,110,
+    97,108,32,109,101,116,104,111,100,32,116,104,97,116,32,114,
+    101,116,117,114,110,115,32,116,104,101,32,109,111,100,105,102,
+    105,99,97,116,105,111,110,32,116,105,109,101,32,40,97,110,
+    32,105,110,116,41,32,102,111,114,32,116,104,101,10,32,32,
+    32,32,32,32,32,32,115,112,101,99,105,102,105,101,100,32,
+    112,97,116,104,32,40,97,32,115,116,114,41,46,10,10,32,
+    32,32,32,32,32,32,32,82,97,105,115,101,115,32,79,83,
+    69,114,114,111,114,32,119,104,101,110,32,116,104,101,32,112,
+    97,116,104,32,99,97,110,110,111,116,32,98,101,32,104,97,
+    110,100,108,101,100,46,10,32,32,32,32,32,32,32,32,78,
+    41,1,114,76,0,0,0,169,2,114,143,0,0,0,114,65,
     0,0,0,114,7,0,0,0,114,7,0,0,0,114,8,0,
-    0,0,218,10,112,97,116,104,95,115,116,97,116,115,133,3,
-    0,0,115,2,0,0,0,14,12,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,0,0,0,0,4,
-    0,0,0,4,0,0,0,67,0,0,0,115,12,0,0,0,
-    124,0,160,0,124,2,124,3,161,2,83,0,41,2,122,228,
-    79,112,116,105,111,110,97,108,32,109,101,116,104,111,100,32,
-    119,104,105,99,104,32,119,114,105,116,101,115,32,100,97,116,
-    97,32,40,98,121,116,101,115,41,32,116,111,32,97,32,102,
-    105,108,101,32,112,97,116,104,32,40,97,32,115,116,114,41,
-    46,10,10,32,32,32,32,32,32,32,32,73,109,112,108,101,
-    109,101,110,116,105,110,103,32,116,104,105,115,32,109,101,116,
-    104,111,100,32,97,108,108,111,119,115,32,102,111,114,32,116,
-    104,101,32,119,114,105,116,105,110,103,32,111,102,32,98,121,
-    116,101,99,111,100,101,32,102,105,108,101,115,46,10,10,32,
-    32,32,32,32,32,32,32,84,104,101,32,115,111,117,114,99,
-    101,32,112,97,116,104,32,105,115,32,110,101,101,100,101,100,
-    32,105,110,32,111,114,100,101,114,32,116,111,32,99,111,114,
-    114,101,99,116,108,121,32,116,114,97,110,115,102,101,114,32,
-    112,101,114,109,105,115,115,105,111,110,115,10,32,32,32,32,
-    32,32,32,32,78,41,1,218,8,115,101,116,95,100,97,116,
-    97,41,4,114,143,0,0,0,114,134,0,0,0,90,10,99,
-    97,99,104,101,95,112,97,116,104,114,41,0,0,0,114,7,
-    0,0,0,114,7,0,0,0,114,8,0,0,0,218,15,95,
-    99,97,99,104,101,95,98,121,116,101,99,111,100,101,147,3,
-    0,0,115,2,0,0,0,12,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,
-    0,0,0,0,3,0,0,0,1,0,0,0,67,0,0,0,
-    114,23,0,0,0,41,2,122,150,79,112,116,105,111,110,97,
-    108,32,109,101,116,104,111,100,32,119,104,105,99,104,32,119,
-    114,105,116,101,115,32,100,97,116,97,32,40,98,121,116,101,
-    115,41,32,116,111,32,97,32,102,105,108,101,32,112,97,116,
-    104,32,40,97,32,115,116,114,41,46,10,10,32,32,32,32,
-    32,32,32,32,73,109,112,108,101,109,101,110,116,105,110,103,
-    32,116,104,105,115,32,109,101,116,104,111,100,32,97,108,108,
-    111,119,115,32,102,111,114,32,116,104,101,32,119,114,105,116,
-    105,110,103,32,111,102,32,98,121,116,101,99,111,100,101,32,
-    102,105,108,101,115,46,10,32,32,32,32,32,32,32,32,78,
-    114,7,0,0,0,41,3,114,143,0,0,0,114,65,0,0,
-    0,114,41,0,0,0,114,7,0,0,0,114,7,0,0,0,
-    114,8,0,0,0,114,253,0,0,0,157,3,0,0,114,240,
-    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,0,0,0,0,5,0,0,0,10,0,0,0,67,
-    0,0,0,115,70,0,0,0,124,0,160,0,124,1,161,1,
-    125,2,122,10,124,0,160,1,124,2,161,1,125,3,87,0,
-    116,4,124,3,131,1,83,0,4,0,116,2,121,34,1,0,
-    125,4,1,0,122,7,116,3,100,1,124,1,100,2,141,2,
-    124,4,130,2,100,3,125,4,126,4,119,1,119,0,41,4,
-    122,52,67,111,110,99,114,101,116,101,32,105,109,112,108,101,
-    109,101,110,116,97,116,105,111,110,32,111,102,32,73,110,115,
-    112,101,99,116,76,111,97,100,101,114,46,103,101,116,95,115,
-    111,117,114,99,101,46,122,39,115,111,117,114,99,101,32,110,
-    111,116,32,97,118,97,105,108,97,98,108,101,32,116,104,114,
-    111,117,103,104,32,103,101,116,95,100,97,116,97,40,41,114,
-    140,0,0,0,78,41,5,114,203,0,0,0,218,8,103,101,
-    116,95,100,97,116,97,114,76,0,0,0,114,142,0,0,0,
-    114,200,0,0,0,41,5,114,143,0,0,0,114,163,0,0,
-    0,114,65,0,0,0,114,198,0,0,0,218,3,101,120,99,
+    0,0,218,10,112,97,116,104,95,109,116,105,109,101,125,3,
+    0,0,115,2,0,0,0,4,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,0,0,0,0,2,
+    0,0,0,4,0,0,0,67,0,0,0,115,14,0,0,0,
+    100,1,124,0,160,0,124,1,161,1,105,1,83,0,41,3,
+    97,158,1,0,0,79,112,116,105,111,110,97,108,32,109,101,
+    116,104,111,100,32,114,101,116,117,114,110,105,110,103,32,97,
+    32,109,101,116,97,100,97,116,97,32,100,105,99,116,32,102,
+    111,114,32,116,104,101,32,115,112,101,99,105,102,105,101,100,
+    10,32,32,32,32,32,32,32,32,112,97,116,104,32,40,97,
+    32,115,116,114,41,46,10,10,32,32,32,32,32,32,32,32,
+    80,111,115,115,105,98,108,101,32,107,101,121,115,58,10,32,
+    32,32,32,32,32,32,32,45,32,39,109,116,105,109,101,39,
+    32,40,109,97,110,100,97,116,111,114,121,41,32,105,115,32,
+    116,104,101,32,110,117,109,101,114,105,99,32,116,105,109,101,
+    115,116,97,109,112,32,111,102,32,108,97,115,116,32,115,111,
+    117,114,99,101,10,32,32,32,32,32,32,32,32,32,32,99,
+    111,100,101,32,109,111,100,105,102,105,99,97,116,105,111,110,
+    59,10,32,32,32,32,32,32,32,32,45,32,39,115,105,122,
+    101,39,32,40,111,112,116,105,111,110,97,108,41,32,105,115,
+    32,116,104,101,32,115,105,122,101,32,105,110,32,98,121,116,
+    101,115,32,111,102,32,116,104,101,32,115,111,117,114,99,101,
+    32,99,111,100,101,46,10,10,32,32,32,32,32,32,32,32,
+    73,109,112,108,101,109,101,110,116,105,110,103,32,116,104,105,
+    115,32,109,101,116,104,111,100,32,97,108,108,111,119,115,32,
+    116,104,101,32,108,111,97,100,101,114,32,116,111,32,114,101,
+    97,100,32,98,121,116,101,99,111,100,101,32,102,105,108,101,
+    115,46,10,32,32,32,32,32,32,32,32,82,97,105,115,101,
+    115,32,79,83,69,114,114,111,114,32,119,104,101,110,32,116,
+    104,101,32,112,97,116,104,32,99,97,110,110,111,116,32,98,
+    101,32,104,97,110,100,108,101,100,46,10,32,32,32,32,32,
+    32,32,32,114,193,0,0,0,78,41,1,114,251,0,0,0,
+    114,250,0,0,0,114,7,0,0,0,114,7,0,0,0,114,
+    8,0,0,0,218,10,112,97,116,104,95,115,116,97,116,115,
+    133,3,0,0,115,2,0,0,0,14,12,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,0,0,0,
+    0,4,0,0,0,4,0,0,0,67,0,0,0,115,12,0,
+    0,0,124,0,160,0,124,2,124,3,161,2,83,0,41,2,
+    122,228,79,112,116,105,111,110,97,108,32,109,101,116,104,111,
+    100,32,119,104,105,99,104,32,119,114,105,116,101,115,32,100,
+    97,116,97,32,40,98,121,116,101,115,41,32,116,111,32,97,
+    32,102,105,108,101,32,112,97,116,104,32,40,97,32,115,116,
+    114,41,46,10,10,32,32,32,32,32,32,32,32,73,109,112,
+    108,101,109,101,110,116,105,110,103,32,116,104,105,115,32,109,
+    101,116,104,111,100,32,97,108,108,111,119,115,32,102,111,114,
+    32,116,104,101,32,119,114,105,116,105,110,103,32,111,102,32,
+    98,121,116,101,99,111,100,101,32,102,105,108,101,115,46,10,
+    10,32,32,32,32,32,32,32,32,84,104,101,32,115,111,117,
+    114,99,101,32,112,97,116,104,32,105,115,32,110,101,101,100,
+    101,100,32,105,110,32,111,114,100,101,114,32,116,111,32,99,
+    111,114,114,101,99,116,108,121,32,116,114,97,110,115,102,101,
+    114,32,112,101,114,109,105,115,115,105,111,110,115,10,32,32,
+    32,32,32,32,32,32,78,41,1,218,8,115,101,116,95,100,
+    97,116,97,41,4,114,143,0,0,0,114,134,0,0,0,90,
+    10,99,97,99,104,101,95,112,97,116,104,114,41,0,0,0,
     114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,218,
-    10,103,101,116,95,115,111,117,114,99,101,164,3,0,0,115,
-    24,0,0,0,10,2,2,1,12,1,8,4,14,253,4,1,
-    2,1,4,255,2,1,2,255,8,128,2,255,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,130,0,0,0,41,1,218,9,95,111,
-    112,116,105,109,105,122,101,99,3,0,0,0,0,0,0,0,
-    1,0,0,0,4,0,0,0,8,0,0,0,67,0,0,0,
-    115,22,0,0,0,116,0,106,1,116,2,124,1,124,2,100,
-    1,100,2,124,3,100,3,141,6,83,0,41,5,122,130,82,
-    101,116,117,114,110,32,116,104,101,32,99,111,100,101,32,111,
-    98,106,101,99,116,32,99,111,109,112,105,108,101,100,32,102,
-    114,111,109,32,115,111,117,114,99,101,46,10,10,32,32,32,
-    32,32,32,32,32,84,104,101,32,39,100,97,116,97,39,32,
-    97,114,103,117,109,101,110,116,32,99,97,110,32,98,101,32,
-    97,110,121,32,111,98,106,101,99,116,32,116,121,112,101,32,
-    116,104,97,116,32,99,111,109,112,105,108,101,40,41,32,115,
-    117,112,112,111,114,116,115,46,10,32,32,32,32,32,32,32,
-    32,114,243,0,0,0,84,41,2,218,12,100,111,110,116,95,
-    105,110,104,101,114,105,116,114,108,0,0,0,78,41,3,114,
-    159,0,0,0,114,242,0,0,0,218,7,99,111,109,112,105,
-    108,101,41,4,114,143,0,0,0,114,41,0,0,0,114,65,
-    0,0,0,114,2,1,0,0,114,7,0,0,0,114,7,0,
-    0,0,114,8,0,0,0,218,14,115,111,117,114,99,101,95,
-    116,111,95,99,111,100,101,174,3,0,0,115,6,0,0,0,
-    12,5,4,1,6,255,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,0,0,0,0,0,0,
-    15,0,0,0,9,0,0,0,67,0,0,0,115,12,2,0,
-    0,124,0,160,0,124,1,161,1,125,2,100,1,125,3,100,
-    1,125,4,100,1,125,5,100,2,125,6,100,3,125,7,122,
-    6,116,1,124,2,131,1,125,8,87,0,110,11,4,0,116,
-    2,144,1,121,5,1,0,1,0,1,0,100,1,125,8,89,
-    0,110,143,122,7,124,0,160,3,124,2,161,1,125,9,87,
-    0,110,9,4,0,116,4,144,1,121,4,1,0,1,0,1,
-    0,89,0,110,126,116,5,124,9,100,4,25,0,131,1,125,
-    3,122,7,124,0,160,6,124,8,161,1,125,10,87,0,110,
-    9,4,0,116,4,144,1,121,3,1,0,1,0,1,0,89,
-    0,110,103,124,1,124,8,100,5,156,2,125,11,122,71,116,
-    7,124,10,124,1,124,11,131,3,125,12,116,8,124,10,131,
-    1,100,6,100,1,133,2,25,0,125,13,124,12,100,7,64,
-    0,100,8,107,3,125,6,124,6,114,138,124,12,100,9,64,
-    0,100,8,107,3,125,7,116,9,106,10,100,10,107,3,114,
-    137,124,7,115,119,116,9,106,10,100,11,107,2,114,137,124,
-    0,160,6,124,2,161,1,125,4,116,9,160,11,116,12,124,
-    4,161,2,125,5,116,13,124,10,124,5,124,1,124,11,131,
-    4,1,0,110,10,116,14,124,10,124,3,124,9,100,12,25,
-    0,124,1,124,11,131,5,1,0,87,0,110,11,4,0,116,
-    15,116,16,102,2,144,1,121,2,1,0,1,0,1,0,89,
-    0,110,15,116,17,160,18,100,13,124,8,124,2,161,3,1,
-    0,116,19,124,13,124,1,124,8,124,2,100,14,141,4,83,
-    0,124,4,100,1,117,0,114,185,124,0,160,6,124,2,161,
-    1,125,4,124,0,160,20,124,4,124,2,161,2,125,14,116,
-    17,160,18,100,15,124,2,161,2,1,0,116,21,106,22,115,
-    255,124,8,100,1,117,1,114,255,124,3,100,1,117,1,114,
-    255,124,6,114,226,124,5,100,1,117,0,114,219,116,9,160,
-    11,124,4,161,1,125,5,116,23,124,14,124,5,124,7,131,
-    3,125,10,110,8,116,24,124,14,124,3,116,25,124,4,131,
-    1,131,3,125,10,122,10,124,0,160,26,124,2,124,8,124,
-    10,161,3,1,0,87,0,124,14,83,0,4,0,116,2,144,
-    1,121,1,1,0,1,0,1,0,89,0,124,14,83,0,124,
-    14,83,0,119,0,119,0,119,0,119,0,119,0,41,16,122,
-    190,67,111,110,99,114,101,116,101,32,105,109,112,108,101,109,
-    101,110,116,97,116,105,111,110,32,111,102,32,73,110,115,112,
-    101,99,116,76,111,97,100,101,114,46,103,101,116,95,99,111,
-    100,101,46,10,10,32,32,32,32,32,32,32,32,82,101,97,
-    100,105,110,103,32,111,102,32,98,121,116,101,99,111,100,101,
-    32,114,101,113,117,105,114,101,115,32,112,97,116,104,95,115,
-    116,97,116,115,32,116,111,32,98,101,32,105,109,112,108,101,
-    109,101,110,116,101,100,46,32,84,111,32,119,114,105,116,101,
-    10,32,32,32,32,32,32,32,32,98,121,116,101,99,111,100,
-    101,44,32,115,101,116,95,100,97,116,97,32,109,117,115,116,
-    32,97,108,115,111,32,98,101,32,105,109,112,108,101,109,101,
-    110,116,101,100,46,10,10,32,32,32,32,32,32,32,32,78,
-    70,84,114,193,0,0,0,114,183,0,0,0,114,169,0,0,
-    0,114,3,0,0,0,114,0,0,0,0,114,44,0,0,0,
-    90,5,110,101,118,101,114,90,6,97,108,119,97,121,115,218,
-    4,115,105,122,101,122,13,123,125,32,109,97,116,99,104,101,
-    115,32,123,125,41,3,114,141,0,0,0,114,132,0,0,0,
-    114,134,0,0,0,122,19,99,111,100,101,32,111,98,106,101,
-    99,116,32,102,114,111,109,32,123,125,41,27,114,203,0,0,
-    0,114,121,0,0,0,114,107,0,0,0,114,252,0,0,0,
-    114,76,0,0,0,114,33,0,0,0,114,255,0,0,0,114,
-    176,0,0,0,218,10,109,101,109,111,114,121,118,105,101,119,
-    114,187,0,0,0,90,21,99,104,101,99,107,95,104,97,115,
-    104,95,98,97,115,101,100,95,112,121,99,115,114,181,0,0,
-    0,218,17,95,82,65,87,95,77,65,71,73,67,95,78,85,
-    77,66,69,82,114,182,0,0,0,114,180,0,0,0,114,142,
-    0,0,0,114,174,0,0,0,114,159,0,0,0,114,173,0,
-    0,0,114,189,0,0,0,114,5,1,0,0,114,15,0,0,
-    0,218,19,100,111,110,116,95,119,114,105,116,101,95,98,121,
-    116,101,99,111,100,101,114,195,0,0,0,114,194,0,0,0,
-    114,4,0,0,0,114,254,0,0,0,41,15,114,143,0,0,
-    0,114,163,0,0,0,114,134,0,0,0,114,178,0,0,0,
-    114,198,0,0,0,114,181,0,0,0,90,10,104,97,115,104,
-    95,98,97,115,101,100,90,12,99,104,101,99,107,95,115,111,
-    117,114,99,101,114,132,0,0,0,218,2,115,116,114,41,0,
-    0,0,114,175,0,0,0,114,16,0,0,0,90,10,98,121,
-    116,101,115,95,100,97,116,97,90,11,99,111,100,101,95,111,
-    98,106,101,99,116,114,7,0,0,0,114,7,0,0,0,114,
-    8,0,0,0,114,241,0,0,0,182,3,0,0,115,168,0,
-    0,0,10,7,4,1,4,1,4,1,4,1,4,1,2,1,
-    12,1,14,1,8,1,2,2,14,1,14,1,4,1,12,2,
-    2,1,14,1,14,1,4,1,2,3,2,1,6,254,2,4,
-    12,1,16,1,12,1,4,1,12,1,10,1,2,1,2,255,
-    8,2,2,254,10,3,4,1,2,1,2,1,4,254,8,4,
-    2,1,4,255,2,128,2,3,2,1,2,1,6,1,2,1,
-    2,1,4,251,4,128,18,7,4,1,8,2,2,1,4,255,
+    15,95,99,97,99,104,101,95,98,121,116,101,99,111,100,101,
+    147,3,0,0,115,2,0,0,0,12,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,0,0,0,0,3,0,0,0,1,0,0,0,67,0,
+    0,0,114,23,0,0,0,41,2,122,150,79,112,116,105,111,
+    110,97,108,32,109,101,116,104,111,100,32,119,104,105,99,104,
+    32,119,114,105,116,101,115,32,100,97,116,97,32,40,98,121,
+    116,101,115,41,32,116,111,32,97,32,102,105,108,101,32,112,
+    97,116,104,32,40,97,32,115,116,114,41,46,10,10,32,32,
+    32,32,32,32,32,32,73,109,112,108,101,109,101,110,116,105,
+    110,103,32,116,104,105,115,32,109,101,116,104,111,100,32,97,
+    108,108,111,119,115,32,102,111,114,32,116,104,101,32,119,114,
+    105,116,105,110,103,32,111,102,32,98,121,116,101,99,111,100,
+    101,32,102,105,108,101,115,46,10,32,32,32,32,32,32,32,
+    32,78,114,7,0,0,0,41,3,114,143,0,0,0,114,65,
+    0,0,0,114,41,0,0,0,114,7,0,0,0,114,7,0,
+    0,0,114,8,0,0,0,114,253,0,0,0,157,3,0,0,
+    114,240,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,0,0,0,0,5,0,0,0,10,0,0,
+    0,67,0,0,0,115,70,0,0,0,124,0,160,0,124,1,
+    161,1,125,2,122,10,124,0,160,1,124,2,161,1,125,3,
+    87,0,116,4,124,3,131,1,83,0,4,0,116,2,121,34,
+    1,0,125,4,1,0,122,7,116,3,100,1,124,1,100,2,
+    141,2,124,4,130,2,100,3,125,4,126,4,119,1,119,0,
+    41,4,122,52,67,111,110,99,114,101,116,101,32,105,109,112,
+    108,101,109,101,110,116,97,116,105,111,110,32,111,102,32,73,
+    110,115,112,101,99,116,76,111,97,100,101,114,46,103,101,116,
+    95,115,111,117,114,99,101,46,122,39,115,111,117,114,99,101,
+    32,110,111,116,32,97,118,97,105,108,97,98,108,101,32,116,
+    104,114,111,117,103,104,32,103,101,116,95,100,97,116,97,40,
+    41,114,140,0,0,0,78,41,5,114,203,0,0,0,218,8,
+    103,101,116,95,100,97,116,97,114,76,0,0,0,114,142,0,
+    0,0,114,200,0,0,0,41,5,114,143,0,0,0,114,163,
+    0,0,0,114,65,0,0,0,114,198,0,0,0,218,3,101,
+    120,99,114,7,0,0,0,114,7,0,0,0,114,8,0,0,
+    0,218,10,103,101,116,95,115,111,117,114,99,101,164,3,0,
+    0,115,24,0,0,0,10,2,2,1,12,1,8,4,14,253,
+    4,1,2,1,4,255,2,1,2,255,8,128,2,255,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,130,0,0,0,41,1,218,9,
+    95,111,112,116,105,109,105,122,101,99,3,0,0,0,0,0,
+    0,0,1,0,0,0,4,0,0,0,8,0,0,0,67,0,
+    0,0,115,22,0,0,0,116,0,106,1,116,2,124,1,124,
+    2,100,1,100,2,124,3,100,3,141,6,83,0,41,5,122,
+    130,82,101,116,117,114,110,32,116,104,101,32,99,111,100,101,
+    32,111,98,106,101,99,116,32,99,111,109,112,105,108,101,100,
+    32,102,114,111,109,32,115,111,117,114,99,101,46,10,10,32,
+    32,32,32,32,32,32,32,84,104,101,32,39,100,97,116,97,
+    39,32,97,114,103,117,109,101,110,116,32,99,97,110,32,98,
+    101,32,97,110,121,32,111,98,106,101,99,116,32,116,121,112,
+    101,32,116,104,97,116,32,99,111,109,112,105,108,101,40,41,
+    32,115,117,112,112,111,114,116,115,46,10,32,32,32,32,32,
+    32,32,32,114,243,0,0,0,84,41,2,218,12,100,111,110,
+    116,95,105,110,104,101,114,105,116,114,108,0,0,0,78,41,
+    3,114,159,0,0,0,114,242,0,0,0,218,7,99,111,109,
+    112,105,108,101,41,4,114,143,0,0,0,114,41,0,0,0,
+    114,65,0,0,0,114,2,1,0,0,114,7,0,0,0,114,
+    7,0,0,0,114,8,0,0,0,218,14,115,111,117,114,99,
+    101,95,116,111,95,99,111,100,101,174,3,0,0,115,6,0,
+    0,0,12,5,4,1,6,255,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,0,0,0,0,
+    0,0,15,0,0,0,9,0,0,0,67,0,0,0,115,2,
+    2,0,0,124,0,160,0,124,1,161,1,125,2,100,1,125,
+    3,100,1,125,4,100,1,125,5,100,2,125,6,100,3,125,
+    7,122,6,116,1,124,2,131,1,125,8,87,0,110,11,4,
+    0,116,2,121,32,1,0,1,0,1,0,100,1,125,8,89,
+    0,110,144,119,0,122,7,124,0,160,3,124,2,161,1,125,
+    9,87,0,110,9,4,0,116,4,121,49,1,0,1,0,1,
+    0,89,0,110,127,119,0,116,5,124,9,100,4,25,0,131,
+    1,125,3,122,7,124,0,160,6,124,8,161,1,125,10,87,
+    0,110,9,4,0,116,4,121,72,1,0,1,0,1,0,89,
+    0,110,104,119,0,124,1,124,8,100,5,156,2,125,11,122,
+    71,116,7,124,10,124,1,124,11,131,3,125,12,116,8,124,
+    10,131,1,100,6,100,1,133,2,25,0,125,13,124,12,100,
+    7,64,0,100,8,107,3,125,6,124,6,114,138,124,12,100,
+    9,64,0,100,8,107,3,125,7,116,9,106,10,100,10,107,
+    3,114,137,124,7,115,119,116,9,106,10,100,11,107,2,114,
+    137,124,0,160,6,124,2,161,1,125,4,116,9,160,11,116,
+    12,124,4,161,2,125,5,116,13,124,10,124,5,124,1,124,
+    11,131,4,1,0,110,10,116,14,124,10,124,3,124,9,100,
+    12,25,0,124,1,124,11,131,5,1,0,87,0,110,11,4,
+    0,116,15,116,16,102,2,121,160,1,0,1,0,1,0,89,
+    0,110,16,119,0,116,17,160,18,100,13,124,8,124,2,161,
+    3,1,0,116,19,124,13,124,1,124,8,124,2,100,14,141,
+    4,83,0,124,4,100,1,117,0,114,185,124,0,160,6,124,
+    2,161,1,125,4,124,0,160,20,124,4,124,2,161,2,125,
+    14,116,17,160,18,100,15,124,2,161,2,1,0,116,21,106,
+    22,115,255,124,8,100,1,117,1,114,255,124,3,100,1,117,
+    1,114,255,124,6,114,226,124,5,100,1,117,0,114,219,116,
+    9,160,11,124,4,161,1,125,5,116,23,124,14,124,5,124,
+    7,131,3,125,10,110,8,116,24,124,14,124,3,116,25,124,
+    4,131,1,131,3,125,10,122,10,124,0,160,26,124,2,124,
+    8,124,10,161,3,1,0,87,0,124,14,83,0,4,0,116,
+    2,121,254,1,0,1,0,1,0,89,0,124,14,83,0,119,
+    0,124,14,83,0,41,16,122,190,67,111,110,99,114,101,116,
+    101,32,105,109,112,108,101,109,101,110,116,97,116,105,111,110,
+    32,111,102,32,73,110,115,112,101,99,116,76,111,97,100,101,
+    114,46,103,101,116,95,99,111,100,101,46,10,10,32,32,32,
+    32,32,32,32,32,82,101,97,100,105,110,103,32,111,102,32,
+    98,121,116,101,99,111,100,101,32,114,101,113,117,105,114,101,
+    115,32,112,97,116,104,95,115,116,97,116,115,32,116,111,32,
+    98,101,32,105,109,112,108,101,109,101,110,116,101,100,46,32,
+    84,111,32,119,114,105,116,101,10,32,32,32,32,32,32,32,
+    32,98,121,116,101,99,111,100,101,44,32,115,101,116,95,100,
+    97,116,97,32,109,117,115,116,32,97,108,115,111,32,98,101,
+    32,105,109,112,108,101,109,101,110,116,101,100,46,10,10,32,
+    32,32,32,32,32,32,32,78,70,84,114,193,0,0,0,114,
+    183,0,0,0,114,169,0,0,0,114,3,0,0,0,114,0,
+    0,0,0,114,44,0,0,0,90,5,110,101,118,101,114,90,
+    6,97,108,119,97,121,115,218,4,115,105,122,101,122,13,123,
+    125,32,109,97,116,99,104,101,115,32,123,125,41,3,114,141,
+    0,0,0,114,132,0,0,0,114,134,0,0,0,122,19,99,
+    111,100,101,32,111,98,106,101,99,116,32,102,114,111,109,32,
+    123,125,41,27,114,203,0,0,0,114,121,0,0,0,114,107,
+    0,0,0,114,252,0,0,0,114,76,0,0,0,114,33,0,
+    0,0,114,255,0,0,0,114,176,0,0,0,218,10,109,101,
+    109,111,114,121,118,105,101,119,114,187,0,0,0,90,21,99,
+    104,101,99,107,95,104,97,115,104,95,98,97,115,101,100,95,
+    112,121,99,115,114,181,0,0,0,218,17,95,82,65,87,95,
+    77,65,71,73,67,95,78,85,77,66,69,82,114,182,0,0,
+    0,114,180,0,0,0,114,142,0,0,0,114,174,0,0,0,
+    114,159,0,0,0,114,173,0,0,0,114,189,0,0,0,114,
+    5,1,0,0,114,15,0,0,0,218,19,100,111,110,116,95,
+    119,114,105,116,101,95,98,121,116,101,99,111,100,101,114,195,
+    0,0,0,114,194,0,0,0,114,4,0,0,0,114,254,0,
+    0,0,41,15,114,143,0,0,0,114,163,0,0,0,114,134,
+    0,0,0,114,178,0,0,0,114,198,0,0,0,114,181,0,
+    0,0,90,10,104,97,115,104,95,98,97,115,101,100,90,12,
+    99,104,101,99,107,95,115,111,117,114,99,101,114,132,0,0,
+    0,218,2,115,116,114,41,0,0,0,114,175,0,0,0,114,
+    16,0,0,0,90,10,98,121,116,101,115,95,100,97,116,97,
+    90,11,99,111,100,101,95,111,98,106,101,99,116,114,7,0,
+    0,0,114,7,0,0,0,114,8,0,0,0,114,241,0,0,
+    0,182,3,0,0,115,170,0,0,0,10,7,4,1,4,1,
+    4,1,4,1,4,1,2,1,12,1,12,1,8,1,2,255,
+    2,3,14,1,12,1,4,1,2,255,12,3,2,1,14,1,
+    12,1,4,1,2,255,2,4,2,1,6,254,2,4,12,1,
+    16,1,12,1,4,1,12,1,10,1,2,1,2,255,8,2,
+    2,254,10,3,4,1,2,1,2,1,4,254,8,4,2,1,
+    4,255,2,128,2,3,2,1,2,1,6,1,2,1,2,1,
+    4,251,4,128,16,7,4,1,2,255,8,3,2,1,4,255,
     6,2,2,1,2,1,6,254,8,3,10,1,12,1,12,1,
     14,1,6,1,2,255,4,2,8,1,10,1,14,1,6,2,
-    6,1,4,255,2,2,16,1,4,3,14,254,2,1,8,1,
-    2,254,2,233,2,225,2,250,2,251,122,21,83,111,117,114,
-    99,101,76,111,97,100,101,114,46,103,101,116,95,99,111,100,
-    101,78,41,10,114,150,0,0,0,114,149,0,0,0,114,151,
-    0,0,0,114,251,0,0,0,114,252,0,0,0,114,254,0,
-    0,0,114,253,0,0,0,114,1,1,0,0,114,5,1,0,
-    0,114,241,0,0,0,114,7,0,0,0,114,7,0,0,0,
-    114,7,0,0,0,114,8,0,0,0,114,249,0,0,0,123,
-    3,0,0,115,16,0,0,0,8,0,8,2,8,8,8,14,
-    8,10,8,7,14,10,12,8,114,249,0,0,0,99,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,0,
-    0,0,0,0,0,0,115,92,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,101,
-    7,135,0,102,1,100,8,100,9,132,8,131,1,90,8,101,
-    7,100,10,100,11,132,0,131,1,90,9,100,12,100,13,132,
-    0,90,10,101,7,100,14,100,15,132,0,131,1,90,11,135,
-    0,4,0,90,12,83,0,41,16,218,10,70,105,108,101,76,
-    111,97,100,101,114,122,103,66,97,115,101,32,102,105,108,101,
-    32,108,111,97,100,101,114,32,99,108,97,115,115,32,119,104,
-    105,99,104,32,105,109,112,108,101,109,101,110,116,115,32,116,
-    104,101,32,108,111,97,100,101,114,32,112,114,111,116,111,99,
-    111,108,32,109,101,116,104,111,100,115,32,116,104,97,116,10,
-    32,32,32,32,114,101,113,117,105,114,101,32,102,105,108,101,
-    32,115,121,115,116,101,109,32,117,115,97,103,101,46,99,3,
-    0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,2,
-    0,0,0,67,0,0,0,115,16,0,0,0,124,1,124,0,
-    95,0,124,2,124,0,95,1,100,1,83,0,41,2,122,75,
-    67,97,99,104,101,32,116,104,101,32,109,111,100,117,108,101,
-    32,110,97,109,101,32,97,110,100,32,116,104,101,32,112,97,
-    116,104,32,116,111,32,116,104,101,32,102,105,108,101,32,102,
-    111,117,110,100,32,98,121,32,116,104,101,10,32,32,32,32,
-    32,32,32,32,102,105,110,100,101,114,46,78,114,183,0,0,
-    0,41,3,114,143,0,0,0,114,163,0,0,0,114,65,0,
-    0,0,114,7,0,0,0,114,7,0,0,0,114,8,0,0,
-    0,114,236,0,0,0,16,4,0,0,115,4,0,0,0,6,
-    3,10,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,0,0,0,0,2,0,0,0,2,0,0,0,67,0,0,
-    0,243,24,0,0,0,124,0,106,0,124,1,106,0,107,2,
-    111,11,124,0,106,1,124,1,106,1,107,2,83,0,114,69,
-    0,0,0,169,2,218,9,95,95,99,108,97,115,115,95,95,
-    114,156,0,0,0,169,2,114,143,0,0,0,90,5,111,116,
-    104,101,114,114,7,0,0,0,114,7,0,0,0,114,8,0,
-    0,0,218,6,95,95,101,113,95,95,22,4,0,0,243,6,
-    0,0,0,12,1,10,1,2,255,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,0,0,0,0,1,0,0,0,3,0,0,
-    0,67,0,0,0,243,20,0,0,0,116,0,124,0,106,1,
-    131,1,116,0,124,0,106,2,131,1,65,0,83,0,114,69,
-    0,0,0,169,3,218,4,104,97,115,104,114,141,0,0,0,
-    114,65,0,0,0,169,1,114,143,0,0,0,114,7,0,0,
-    0,114,7,0,0,0,114,8,0,0,0,218,8,95,95,104,
-    97,115,104,95,95,26,4,0,0,243,2,0,0,0,20,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,0,0,
-    0,0,2,0,0,0,3,0,0,0,3,0,0,0,115,16,
-    0,0,0,116,0,116,1,124,0,131,2,160,2,124,1,161,
-    1,83,0,41,2,122,100,76,111,97,100,32,97,32,109,111,
-    100,117,108,101,32,102,114,111,109,32,97,32,102,105,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,78,41,3,218,5,
-    115,117,112,101,114,114,11,1,0,0,114,248,0,0,0,114,
-    247,0,0,0,169,1,114,14,1,0,0,114,7,0,0,0,
-    114,8,0,0,0,114,248,0,0,0,29,4,0,0,115,2,
-    0,0,0,16,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,0,0,0,0,2,0,0,0,1,0,
-    0,0,67,0,0,0,243,6,0,0,0,124,0,106,0,83,
-    0,169,2,122,58,82,101,116,117,114,110,32,116,104,101,32,
-    112,97,116,104,32,116,111,32,116,104,101,32,115,111,117,114,
-    99,101,32,102,105,108,101,32,97,115,32,102,111,117,110,100,
-    32,98,121,32,116,104,101,32,102,105,110,100,101,114,46,78,
-    114,71,0,0,0,114,247,0,0,0,114,7,0,0,0,114,
-    7,0,0,0,114,8,0,0,0,114,203,0,0,0,41,4,
-    0,0,243,2,0,0,0,6,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,0,0,0,0,3,
-    0,0,0,8,0,0,0,67,0,0,0,115,128,0,0,0,
-    116,0,124,0,116,1,116,2,102,2,131,2,114,36,116,3,
-    160,4,116,5,124,1,131,1,161,1,143,12,125,2,124,2,
-    160,6,161,0,87,0,2,0,100,1,4,0,4,0,131,3,
-    1,0,83,0,49,0,115,29,119,1,1,0,1,0,1,0,
-    89,0,1,0,100,1,83,0,116,3,160,7,124,1,100,2,
-    161,2,143,12,125,2,124,2,160,6,161,0,87,0,2,0,
-    100,1,4,0,4,0,131,3,1,0,83,0,49,0,115,57,
-    119,1,1,0,1,0,1,0,89,0,1,0,100,1,83,0,
-    41,3,122,39,82,101,116,117,114,110,32,116,104,101,32,100,
-    97,116,97,32,102,114,111,109,32,112,97,116,104,32,97,115,
-    32,114,97,119,32,98,121,116,101,115,46,78,218,1,114,41,
-    8,114,185,0,0,0,114,249,0,0,0,218,19,69,120,116,
-    101,110,115,105,111,110,70,105,108,101,76,111,97,100,101,114,
-    114,91,0,0,0,90,9,111,112,101,110,95,99,111,100,101,
-    114,109,0,0,0,90,4,114,101,97,100,114,92,0,0,0,
-    41,3,114,143,0,0,0,114,65,0,0,0,114,94,0,0,
-    0,114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,
-    114,255,0,0,0,46,4,0,0,115,14,0,0,0,14,2,
-    16,1,6,1,36,255,14,3,6,1,36,255,122,19,70,105,
-    108,101,76,111,97,100,101,114,46,103,101,116,95,100,97,116,
-    97,99,2,0,0,0,0,0,0,0,0,0,0,0,3,0,
-    0,0,2,0,0,0,67,0,0,0,115,20,0,0,0,100,
-    1,100,2,108,0,109,1,125,2,1,0,124,2,124,0,131,
-    1,83,0,41,3,78,114,0,0,0,0,41,1,218,10,70,
-    105,108,101,82,101,97,100,101,114,41,2,218,17,105,109,112,
-    111,114,116,108,105,98,46,114,101,97,100,101,114,115,114,31,
-    1,0,0,41,3,114,143,0,0,0,114,244,0,0,0,114,
-    31,1,0,0,114,7,0,0,0,114,7,0,0,0,114,8,
-    0,0,0,218,19,103,101,116,95,114,101,115,111,117,114,99,
-    101,95,114,101,97,100,101,114,55,4,0,0,115,4,0,0,
-    0,12,2,8,1,122,30,70,105,108,101,76,111,97,100,101,
-    114,46,103,101,116,95,114,101,115,111,117,114,99,101,95,114,
-    101,97,100,101,114,41,13,114,150,0,0,0,114,149,0,0,
-    0,114,151,0,0,0,114,152,0,0,0,114,236,0,0,0,
-    114,16,1,0,0,114,22,1,0,0,114,160,0,0,0,114,
-    248,0,0,0,114,203,0,0,0,114,255,0,0,0,114,33,
-    1,0,0,90,13,95,95,99,108,97,115,115,99,101,108,108,
-    95,95,114,7,0,0,0,114,7,0,0,0,114,25,1,0,
-    0,114,8,0,0,0,114,11,1,0,0,11,4,0,0,115,
-    24,0,0,0,8,0,4,2,8,3,8,6,8,4,2,3,
-    14,1,2,11,10,1,8,4,2,9,18,1,114,11,1,0,
-    0,99,0,0,0,0,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,90,3,100,2,100,3,132,
-    0,90,4,100,4,100,5,132,0,90,5,100,6,100,7,156,
-    1,100,8,100,9,132,2,90,6,100,10,83,0,41,11,218,
-    16,83,111,117,114,99,101,70,105,108,101,76,111,97,100,101,
-    114,122,62,67,111,110,99,114,101,116,101,32,105,109,112,108,
-    101,109,101,110,116,97,116,105,111,110,32,111,102,32,83,111,
-    117,114,99,101,76,111,97,100,101,114,32,117,115,105,110,103,
-    32,116,104,101,32,102,105,108,101,32,115,121,115,116,101,109,
-    46,99,2,0,0,0,0,0,0,0,0,0,0,0,3,0,
-    0,0,3,0,0,0,67,0,0,0,115,22,0,0,0,116,
-    0,124,1,131,1,125,2,124,2,106,1,124,2,106,2,100,
-    1,156,2,83,0,41,3,122,33,82,101,116,117,114,110,32,
-    116,104,101,32,109,101,116,97,100,97,116,97,32,102,111,114,
-    32,116,104,101,32,112,97,116,104,46,41,2,114,193,0,0,
-    0,114,6,1,0,0,78,41,3,114,75,0,0,0,218,8,
-    115,116,95,109,116,105,109,101,90,7,115,116,95,115,105,122,
-    101,41,3,114,143,0,0,0,114,65,0,0,0,114,10,1,
-    0,0,114,7,0,0,0,114,7,0,0,0,114,8,0,0,
-    0,114,252,0,0,0,65,4,0,0,115,4,0,0,0,8,
-    2,14,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,0,0,0,0,5,0,0,
-    0,5,0,0,0,67,0,0,0,115,24,0,0,0,116,0,
-    124,1,131,1,125,4,124,0,106,1,124,2,124,3,124,4,
-    100,1,141,3,83,0,41,2,78,169,1,218,5,95,109,111,
-    100,101,41,2,114,139,0,0,0,114,253,0,0,0,41,5,
-    114,143,0,0,0,114,134,0,0,0,114,132,0,0,0,114,
-    41,0,0,0,114,78,0,0,0,114,7,0,0,0,114,7,
-    0,0,0,114,8,0,0,0,114,254,0,0,0,70,4,0,
-    0,115,4,0,0,0,8,2,16,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,114,87,0,0,
-    0,114,36,1,0,0,99,3,0,0,0,0,0,0,0,1,
-    0,0,0,9,0,0,0,11,0,0,0,67,0,0,0,115,
-    254,0,0,0,116,0,124,1,131,1,92,2,125,4,125,5,
-    103,0,125,6,124,4,114,31,116,1,124,4,131,1,115,31,
-    116,0,124,4,131,1,92,2,125,4,125,7,124,6,160,2,
-    124,7,161,1,1,0,124,4,114,31,116,1,124,4,131,1,
-    114,14,116,3,124,6,131,1,68,0,93,48,125,7,116,4,
-    124,4,124,7,131,2,125,4,122,7,116,5,160,6,124,4,
-    161,1,1,0,87,0,113,35,4,0,116,7,121,58,1,0,
-    1,0,1,0,89,0,113,35,4,0,116,8,121,126,1,0,
-    125,8,1,0,122,15,116,9,160,10,100,1,124,4,124,8,
-    161,3,1,0,87,0,89,0,100,2,125,8,126,8,1,0,
-    100,2,83,0,100,2,125,8,126,8,119,1,122,15,116,11,
-    124,1,124,2,124,3,131,3,1,0,116,9,160,10,100,3,
-    124,1,161,2,1,0,87,0,100,2,83,0,4,0,116,8,
-    121,125,1,0,125,8,1,0,122,14,116,9,160,10,100,1,
-    124,1,124,8,161,3,1,0,87,0,89,0,100,2,125,8,
-    126,8,100,2,83,0,100,2,125,8,126,8,119,1,119,0,
-    119,0,41,4,122,27,87,114,105,116,101,32,98,121,116,101,
-    115,32,100,97,116,97,32,116,111,32,97,32,102,105,108,101,
-    46,122,27,99,111,117,108,100,32,110,111,116,32,99,114,101,
-    97,116,101,32,123,33,114,125,58,32,123,33,114,125,78,122,
-    12,99,114,101,97,116,101,100,32,123,33,114,125,41,12,114,
-    74,0,0,0,114,83,0,0,0,114,61,0,0,0,218,8,
-    114,101,118,101,114,115,101,100,114,67,0,0,0,114,18,0,
-    0,0,90,5,109,107,100,105,114,218,15,70,105,108,101,69,
-    120,105,115,116,115,69,114,114,111,114,114,76,0,0,0,114,
-    159,0,0,0,114,173,0,0,0,114,95,0,0,0,41,9,
-    114,143,0,0,0,114,65,0,0,0,114,41,0,0,0,114,
-    37,1,0,0,218,6,112,97,114,101,110,116,114,120,0,0,
-    0,114,63,0,0,0,114,68,0,0,0,114,0,1,0,0,
-    114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,114,
-    253,0,0,0,75,4,0,0,115,56,0,0,0,12,2,4,
-    1,12,2,12,1,10,1,12,254,12,4,10,1,2,1,14,
-    1,12,1,4,2,14,1,6,3,4,1,4,255,16,2,8,
-    128,2,1,12,1,18,1,14,1,8,2,2,1,18,255,8,
-    128,2,254,2,247,122,25,83,111,117,114,99,101,70,105,108,
-    101,76,111,97,100,101,114,46,115,101,116,95,100,97,116,97,
-    78,41,7,114,150,0,0,0,114,149,0,0,0,114,151,0,
-    0,0,114,152,0,0,0,114,252,0,0,0,114,254,0,0,
-    0,114,253,0,0,0,114,7,0,0,0,114,7,0,0,0,
-    114,7,0,0,0,114,8,0,0,0,114,34,1,0,0,61,
-    4,0,0,115,10,0,0,0,8,0,4,2,8,2,8,5,
-    18,5,114,34,1,0,0,99,0,0,0,0,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,
+    6,1,4,255,2,2,16,1,4,3,12,254,2,1,4,1,
+    2,254,4,2,122,21,83,111,117,114,99,101,76,111,97,100,
+    101,114,46,103,101,116,95,99,111,100,101,78,41,10,114,150,
+    0,0,0,114,149,0,0,0,114,151,0,0,0,114,251,0,
+    0,0,114,252,0,0,0,114,254,0,0,0,114,253,0,0,
+    0,114,1,1,0,0,114,5,1,0,0,114,241,0,0,0,
+    114,7,0,0,0,114,7,0,0,0,114,7,0,0,0,114,
+    8,0,0,0,114,249,0,0,0,123,3,0,0,115,16,0,
+    0,0,8,0,8,2,8,8,8,14,8,10,8,7,14,10,
+    12,8,114,249,0,0,0,99,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,4,0,0,0,0,0,0,0,
+    115,92,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,20,83,111,117,114,99,101,108,
-    101,115,115,70,105,108,101,76,111,97,100,101,114,122,45,76,
-    111,97,100,101,114,32,119,104,105,99,104,32,104,97,110,100,
-    108,101,115,32,115,111,117,114,99,101,108,101,115,115,32,102,
-    105,108,101,32,105,109,112,111,114,116,115,46,99,2,0,0,
-    0,0,0,0,0,0,0,0,0,5,0,0,0,5,0,0,
-    0,67,0,0,0,115,68,0,0,0,124,0,160,0,124,1,
-    161,1,125,2,124,0,160,1,124,2,161,1,125,3,124,1,
-    124,2,100,1,156,2,125,4,116,2,124,3,124,1,124,4,
-    131,3,1,0,116,3,116,4,124,3,131,1,100,2,100,0,
-    133,2,25,0,124,1,124,2,100,3,141,3,83,0,41,4,
-    78,114,183,0,0,0,114,169,0,0,0,41,2,114,141,0,
-    0,0,114,132,0,0,0,41,5,114,203,0,0,0,114,255,
-    0,0,0,114,176,0,0,0,114,189,0,0,0,114,7,1,
-    0,0,41,5,114,143,0,0,0,114,163,0,0,0,114,65,
-    0,0,0,114,41,0,0,0,114,175,0,0,0,114,7,0,
-    0,0,114,7,0,0,0,114,8,0,0,0,114,241,0,0,
-    0,110,4,0,0,115,22,0,0,0,10,1,10,1,2,4,
-    2,1,6,254,12,4,2,1,14,1,2,1,2,1,6,253,
-    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,
+    5,100,6,100,7,132,0,90,6,101,7,135,0,102,1,100,
+    8,100,9,132,8,131,1,90,8,101,7,100,10,100,11,132,
+    0,131,1,90,9,100,12,100,13,132,0,90,10,101,7,100,
+    14,100,15,132,0,131,1,90,11,135,0,4,0,90,12,83,
+    0,41,16,218,10,70,105,108,101,76,111,97,100,101,114,122,
+    103,66,97,115,101,32,102,105,108,101,32,108,111,97,100,101,
+    114,32,99,108,97,115,115,32,119,104,105,99,104,32,105,109,
+    112,108,101,109,101,110,116,115,32,116,104,101,32,108,111,97,
+    100,101,114,32,112,114,111,116,111,99,111,108,32,109,101,116,
+    104,111,100,115,32,116,104,97,116,10,32,32,32,32,114,101,
+    113,117,105,114,101,32,102,105,108,101,32,115,121,115,116,101,
+    109,32,117,115,97,103,101,46,99,3,0,0,0,0,0,0,
+    0,0,0,0,0,3,0,0,0,2,0,0,0,67,0,0,
+    0,115,16,0,0,0,124,1,124,0,95,0,124,2,124,0,
+    95,1,100,1,83,0,41,2,122,75,67,97,99,104,101,32,
+    116,104,101,32,109,111,100,117,108,101,32,110,97,109,101,32,
+    97,110,100,32,116,104,101,32,112,97,116,104,32,116,111,32,
+    116,104,101,32,102,105,108,101,32,102,111,117,110,100,32,98,
+    121,32,116,104,101,10,32,32,32,32,32,32,32,32,102,105,
+    110,100,101,114,46,78,114,183,0,0,0,41,3,114,143,0,
+    0,0,114,163,0,0,0,114,65,0,0,0,114,7,0,0,
+    0,114,7,0,0,0,114,8,0,0,0,114,236,0,0,0,
+    16,4,0,0,115,4,0,0,0,6,3,10,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,0,0,0,0,2,
+    0,0,0,2,0,0,0,67,0,0,0,243,24,0,0,0,
+    124,0,106,0,124,1,106,0,107,2,111,11,124,0,106,1,
+    124,1,106,1,107,2,83,0,114,69,0,0,0,169,2,218,
+    9,95,95,99,108,97,115,115,95,95,114,156,0,0,0,169,
+    2,114,143,0,0,0,90,5,111,116,104,101,114,114,7,0,
+    0,0,114,7,0,0,0,114,8,0,0,0,218,6,95,95,
+    101,113,95,95,22,4,0,0,243,6,0,0,0,12,1,10,
+    1,2,255,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,0,
+    0,0,0,1,0,0,0,3,0,0,0,67,0,0,0,243,
+    20,0,0,0,116,0,124,0,106,1,131,1,116,0,124,0,
+    106,2,131,1,65,0,83,0,114,69,0,0,0,169,3,218,
+    4,104,97,115,104,114,141,0,0,0,114,65,0,0,0,169,
+    1,114,143,0,0,0,114,7,0,0,0,114,7,0,0,0,
+    114,8,0,0,0,218,8,95,95,104,97,115,104,95,95,26,
+    4,0,0,243,2,0,0,0,20,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,0,0,0,0,2,0,0,0,
-    1,0,0,0,67,0,0,0,114,23,0,0,0,41,2,122,
-    39,82,101,116,117,114,110,32,78,111,110,101,32,97,115,32,
-    116,104,101,114,101,32,105,115,32,110,111,32,115,111,117,114,
-    99,101,32,99,111,100,101,46,78,114,7,0,0,0,114,247,
+    3,0,0,0,3,0,0,0,115,16,0,0,0,116,0,116,
+    1,124,0,131,2,160,2,124,1,161,1,83,0,41,2,122,
+    100,76,111,97,100,32,97,32,109,111,100,117,108,101,32,102,
+    114,111,109,32,97,32,102,105,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,78,41,3,218,5,115,117,112,101,114,114,
+    11,1,0,0,114,248,0,0,0,114,247,0,0,0,169,1,
+    114,14,1,0,0,114,7,0,0,0,114,8,0,0,0,114,
+    248,0,0,0,29,4,0,0,115,2,0,0,0,16,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,
+    0,0,0,0,2,0,0,0,1,0,0,0,67,0,0,0,
+    243,6,0,0,0,124,0,106,0,83,0,169,2,122,58,82,
+    101,116,117,114,110,32,116,104,101,32,112,97,116,104,32,116,
+    111,32,116,104,101,32,115,111,117,114,99,101,32,102,105,108,
+    101,32,97,115,32,102,111,117,110,100,32,98,121,32,116,104,
+    101,32,102,105,110,100,101,114,46,78,114,71,0,0,0,114,
+    247,0,0,0,114,7,0,0,0,114,7,0,0,0,114,8,
+    0,0,0,114,203,0,0,0,41,4,0,0,243,2,0,0,
+    0,6,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,0,0,0,0,3,0,0,0,8,0,0,
+    0,67,0,0,0,115,128,0,0,0,116,0,124,0,116,1,
+    116,2,102,2,131,2,114,36,116,3,160,4,116,5,124,1,
+    131,1,161,1,143,12,125,2,124,2,160,6,161,0,87,0,
+    2,0,100,1,4,0,4,0,131,3,1,0,83,0,49,0,
+    115,29,119,1,1,0,1,0,1,0,89,0,1,0,100,1,
+    83,0,116,3,160,7,124,1,100,2,161,2,143,12,125,2,
+    124,2,160,6,161,0,87,0,2,0,100,1,4,0,4,0,
+    131,3,1,0,83,0,49,0,115,57,119,1,1,0,1,0,
+    1,0,89,0,1,0,100,1,83,0,41,3,122,39,82,101,
+    116,117,114,110,32,116,104,101,32,100,97,116,97,32,102,114,
+    111,109,32,112,97,116,104,32,97,115,32,114,97,119,32,98,
+    121,116,101,115,46,78,218,1,114,41,8,114,185,0,0,0,
+    114,249,0,0,0,218,19,69,120,116,101,110,115,105,111,110,
+    70,105,108,101,76,111,97,100,101,114,114,91,0,0,0,90,
+    9,111,112,101,110,95,99,111,100,101,114,109,0,0,0,90,
+    4,114,101,97,100,114,92,0,0,0,41,3,114,143,0,0,
+    0,114,65,0,0,0,114,94,0,0,0,114,7,0,0,0,
+    114,7,0,0,0,114,8,0,0,0,114,255,0,0,0,46,
+    4,0,0,115,14,0,0,0,14,2,16,1,6,1,36,255,
+    14,3,6,1,36,255,122,19,70,105,108,101,76,111,97,100,
+    101,114,46,103,101,116,95,100,97,116,97,99,2,0,0,0,
+    0,0,0,0,0,0,0,0,3,0,0,0,2,0,0,0,
+    67,0,0,0,115,20,0,0,0,100,1,100,2,108,0,109,
+    1,125,2,1,0,124,2,124,0,131,1,83,0,41,3,78,
+    114,0,0,0,0,41,1,218,10,70,105,108,101,82,101,97,
+    100,101,114,41,2,218,17,105,109,112,111,114,116,108,105,98,
+    46,114,101,97,100,101,114,115,114,31,1,0,0,41,3,114,
+    143,0,0,0,114,244,0,0,0,114,31,1,0,0,114,7,
+    0,0,0,114,7,0,0,0,114,8,0,0,0,218,19,103,
+    101,116,95,114,101,115,111,117,114,99,101,95,114,101,97,100,
+    101,114,55,4,0,0,115,4,0,0,0,12,2,8,1,122,
+    30,70,105,108,101,76,111,97,100,101,114,46,103,101,116,95,
+    114,101,115,111,117,114,99,101,95,114,101,97,100,101,114,41,
+    13,114,150,0,0,0,114,149,0,0,0,114,151,0,0,0,
+    114,152,0,0,0,114,236,0,0,0,114,16,1,0,0,114,
+    22,1,0,0,114,160,0,0,0,114,248,0,0,0,114,203,
+    0,0,0,114,255,0,0,0,114,33,1,0,0,90,13,95,
+    95,99,108,97,115,115,99,101,108,108,95,95,114,7,0,0,
+    0,114,7,0,0,0,114,25,1,0,0,114,8,0,0,0,
+    114,11,1,0,0,11,4,0,0,115,24,0,0,0,8,0,
+    4,2,8,3,8,6,8,4,2,3,14,1,2,11,10,1,
+    8,4,2,9,18,1,114,11,1,0,0,99,0,0,0,0,
+    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,90,3,100,2,100,3,132,0,90,4,100,4,100,
+    5,132,0,90,5,100,6,100,7,156,1,100,8,100,9,132,
+    2,90,6,100,10,83,0,41,11,218,16,83,111,117,114,99,
+    101,70,105,108,101,76,111,97,100,101,114,122,62,67,111,110,
+    99,114,101,116,101,32,105,109,112,108,101,109,101,110,116,97,
+    116,105,111,110,32,111,102,32,83,111,117,114,99,101,76,111,
+    97,100,101,114,32,117,115,105,110,103,32,116,104,101,32,102,
+    105,108,101,32,115,121,115,116,101,109,46,99,2,0,0,0,
+    0,0,0,0,0,0,0,0,3,0,0,0,3,0,0,0,
+    67,0,0,0,115,22,0,0,0,116,0,124,1,131,1,125,
+    2,124,2,106,1,124,2,106,2,100,1,156,2,83,0,41,
+    3,122,33,82,101,116,117,114,110,32,116,104,101,32,109,101,
+    116,97,100,97,116,97,32,102,111,114,32,116,104,101,32,112,
+    97,116,104,46,41,2,114,193,0,0,0,114,6,1,0,0,
+    78,41,3,114,75,0,0,0,218,8,115,116,95,109,116,105,
+    109,101,90,7,115,116,95,115,105,122,101,41,3,114,143,0,
+    0,0,114,65,0,0,0,114,10,1,0,0,114,7,0,0,
+    0,114,7,0,0,0,114,8,0,0,0,114,252,0,0,0,
+    65,4,0,0,115,4,0,0,0,8,2,14,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,0,0,0,0,5,0,0,0,5,0,0,0,67,
+    0,0,0,115,24,0,0,0,116,0,124,1,131,1,125,4,
+    124,0,106,1,124,2,124,3,124,4,100,1,141,3,83,0,
+    41,2,78,169,1,218,5,95,109,111,100,101,41,2,114,139,
+    0,0,0,114,253,0,0,0,41,5,114,143,0,0,0,114,
+    134,0,0,0,114,132,0,0,0,114,41,0,0,0,114,78,
     0,0,0,114,7,0,0,0,114,7,0,0,0,114,8,0,
-    0,0,114,1,1,0,0,126,4,0,0,114,24,0,0,0,
-    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,150,0,0,0,114,149,0,0,0,114,151,
-    0,0,0,114,152,0,0,0,114,241,0,0,0,114,1,1,
-    0,0,114,7,0,0,0,114,7,0,0,0,114,7,0,0,
-    0,114,8,0,0,0,114,41,1,0,0,106,4,0,0,115,
-    8,0,0,0,8,0,4,2,8,2,12,16,114,41,1,0,
+    0,0,114,254,0,0,0,70,4,0,0,115,4,0,0,0,
+    8,2,16,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,114,87,0,0,0,114,36,1,0,0,
+    99,3,0,0,0,0,0,0,0,1,0,0,0,9,0,0,
+    0,11,0,0,0,67,0,0,0,115,254,0,0,0,116,0,
+    124,1,131,1,92,2,125,4,125,5,103,0,125,6,124,4,
+    114,31,116,1,124,4,131,1,115,31,116,0,124,4,131,1,
+    92,2,125,4,125,7,124,6,160,2,124,7,161,1,1,0,
+    124,4,114,31,116,1,124,4,131,1,114,14,116,3,124,6,
+    131,1,68,0,93,49,125,7,116,4,124,4,124,7,131,2,
+    125,4,122,7,116,5,160,6,124,4,161,1,1,0,87,0,
+    113,35,4,0,116,7,121,58,1,0,1,0,1,0,89,0,
+    113,35,4,0,116,8,121,84,1,0,125,8,1,0,122,15,
+    116,9,160,10,100,1,124,4,124,8,161,3,1,0,87,0,
+    89,0,100,2,125,8,126,8,1,0,100,2,83,0,100,2,
+    125,8,126,8,119,1,119,0,122,15,116,11,124,1,124,2,
+    124,3,131,3,1,0,116,9,160,10,100,3,124,1,161,2,
+    1,0,87,0,100,2,83,0,4,0,116,8,121,126,1,0,
+    125,8,1,0,122,14,116,9,160,10,100,1,124,1,124,8,
+    161,3,1,0,87,0,89,0,100,2,125,8,126,8,100,2,
+    83,0,100,2,125,8,126,8,119,1,119,0,41,4,122,27,
+    87,114,105,116,101,32,98,121,116,101,115,32,100,97,116,97,
+    32,116,111,32,97,32,102,105,108,101,46,122,27,99,111,117,
+    108,100,32,110,111,116,32,99,114,101,97,116,101,32,123,33,
+    114,125,58,32,123,33,114,125,78,122,12,99,114,101,97,116,
+    101,100,32,123,33,114,125,41,12,114,74,0,0,0,114,83,
+    0,0,0,114,61,0,0,0,218,8,114,101,118,101,114,115,
+    101,100,114,67,0,0,0,114,18,0,0,0,90,5,109,107,
+    100,105,114,218,15,70,105,108,101,69,120,105,115,116,115,69,
+    114,114,111,114,114,76,0,0,0,114,159,0,0,0,114,173,
+    0,0,0,114,95,0,0,0,41,9,114,143,0,0,0,114,
+    65,0,0,0,114,41,0,0,0,114,37,1,0,0,218,6,
+    112,97,114,101,110,116,114,120,0,0,0,114,63,0,0,0,
+    114,68,0,0,0,114,0,1,0,0,114,7,0,0,0,114,
+    7,0,0,0,114,8,0,0,0,114,253,0,0,0,75,4,
+    0,0,115,56,0,0,0,12,2,4,1,12,2,12,1,10,
+    1,12,254,12,4,10,1,2,1,14,1,12,1,4,2,14,
+    1,6,3,4,1,4,255,16,2,8,128,2,251,2,6,12,
+    1,18,1,14,1,8,2,2,1,18,255,8,128,2,254,122,
+    25,83,111,117,114,99,101,70,105,108,101,76,111,97,100,101,
+    114,46,115,101,116,95,100,97,116,97,78,41,7,114,150,0,
+    0,0,114,149,0,0,0,114,151,0,0,0,114,152,0,0,
+    0,114,252,0,0,0,114,254,0,0,0,114,253,0,0,0,
+    114,7,0,0,0,114,7,0,0,0,114,7,0,0,0,114,
+    8,0,0,0,114,34,1,0,0,61,4,0,0,115,10,0,
+    0,0,8,0,4,2,8,2,8,5,18,5,114,34,1,0,
     0,99,0,0,0,0,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,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,100,7,132,
-    0,90,6,100,8,100,9,132,0,90,7,100,10,100,11,132,
-    0,90,8,100,12,100,13,132,0,90,9,100,14,100,15,132,
-    0,90,10,100,16,100,17,132,0,90,11,101,12,100,18,100,
-    19,132,0,131,1,90,13,100,20,83,0,41,21,114,30,1,
-    0,0,122,93,76,111,97,100,101,114,32,102,111,114,32,101,
-    120,116,101,110,115,105,111,110,32,109,111,100,117,108,101,115,
-    46,10,10,32,32,32,32,84,104,101,32,99,111,110,115,116,
-    114,117,99,116,111,114,32,105,115,32,100,101,115,105,103,110,
-    101,100,32,116,111,32,119,111,114,107,32,119,105,116,104,32,
-    70,105,108,101,70,105,110,100,101,114,46,10,10,32,32,32,
-    32,99,3,0,0,0,0,0,0,0,0,0,0,0,3,0,
-    0,0,2,0,0,0,67,0,0,0,115,16,0,0,0,124,
-    1,124,0,95,0,124,2,124,0,95,1,100,0,83,0,114,
-    69,0,0,0,114,183,0,0,0,41,3,114,143,0,0,0,
-    114,141,0,0,0,114,65,0,0,0,114,7,0,0,0,114,
-    7,0,0,0,114,8,0,0,0,114,236,0,0,0,139,4,
-    0,0,115,4,0,0,0,6,1,10,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,0,0,0,0,2,0,0,0,2,0,0,0,67,0,
-    0,0,114,12,1,0,0,114,69,0,0,0,114,13,1,0,
-    0,114,15,1,0,0,114,7,0,0,0,114,7,0,0,0,
-    114,8,0,0,0,114,16,1,0,0,143,4,0,0,114,17,
-    1,0,0,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,0,0,0,0,1,0,0,0,
-    3,0,0,0,67,0,0,0,114,18,1,0,0,114,69,0,
-    0,0,114,19,1,0,0,114,21,1,0,0,114,7,0,0,
-    0,114,7,0,0,0,114,8,0,0,0,114,22,1,0,0,
-    147,4,0,0,114,23,1,0,0,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,
-    0,0,0,0,3,0,0,0,5,0,0,0,67,0,0,0,
-    115,36,0,0,0,116,0,160,1,116,2,106,3,124,1,161,
-    2,125,2,116,0,160,4,100,1,124,1,106,5,124,0,106,
-    6,161,3,1,0,124,2,83,0,41,3,122,38,67,114,101,
-    97,116,101,32,97,110,32,117,110,105,116,105,97,108,105,122,
-    101,100,32,101,120,116,101,110,115,105,111,110,32,109,111,100,
-    117,108,101,122,38,101,120,116,101,110,115,105,111,110,32,109,
-    111,100,117,108,101,32,123,33,114,125,32,108,111,97,100,101,
-    100,32,102,114,111,109,32,123,33,114,125,78,41,7,114,159,
-    0,0,0,114,242,0,0,0,114,187,0,0,0,90,14,99,
-    114,101,97,116,101,95,100,121,110,97,109,105,99,114,173,0,
-    0,0,114,141,0,0,0,114,65,0,0,0,41,3,114,143,
-    0,0,0,114,210,0,0,0,114,244,0,0,0,114,7,0,
-    0,0,114,7,0,0,0,114,8,0,0,0,114,239,0,0,
-    0,150,4,0,0,115,14,0,0,0,4,2,6,1,4,255,
-    6,2,8,1,4,255,4,2,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,0,0,0,0,0,2,0,0,0,5,0,0,0,
-    67,0,0,0,115,36,0,0,0,116,0,160,1,116,2,106,
-    3,124,1,161,2,1,0,116,0,160,4,100,1,124,0,106,
-    5,124,0,106,6,161,3,1,0,100,2,83,0,41,3,122,
-    30,73,110,105,116,105,97,108,105,122,101,32,97,110,32,101,
-    120,116,101,110,115,105,111,110,32,109,111,100,117,108,101,122,
-    40,101,120,116,101,110,115,105,111,110,32,109,111,100,117,108,
-    101,32,123,33,114,125,32,101,120,101,99,117,116,101,100,32,
-    102,114,111,109,32,123,33,114,125,78,41,7,114,159,0,0,
-    0,114,242,0,0,0,114,187,0,0,0,90,12,101,120,101,
-    99,95,100,121,110,97,109,105,99,114,173,0,0,0,114,141,
-    0,0,0,114,65,0,0,0,169,2,114,143,0,0,0,114,
-    244,0,0,0,114,7,0,0,0,114,7,0,0,0,114,8,
-    0,0,0,114,245,0,0,0,158,4,0,0,115,8,0,0,
-    0,14,2,6,1,8,1,8,255,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,0,0,0,0,2,0,0,0,4,0,0,0,3,
-    0,0,0,115,36,0,0,0,116,0,124,0,106,1,131,1,
-    100,1,25,0,137,0,116,2,135,0,102,1,100,2,100,3,
-    132,8,116,3,68,0,131,1,131,1,83,0,41,5,122,49,
-    82,101,116,117,114,110,32,84,114,117,101,32,105,102,32,116,
-    104,101,32,101,120,116,101,110,115,105,111,110,32,109,111,100,
-    117,108,101,32,105,115,32,97,32,112,97,99,107,97,103,101,
-    46,114,3,0,0,0,99,1,0,0,0,0,0,0,0,0,
-    0,0,0,2,0,0,0,4,0,0,0,51,0,0,0,115,
-    28,0,0,0,129,0,124,0,93,9,125,1,136,0,100,0,
-    124,1,23,0,107,2,86,0,1,0,113,2,100,1,83,0,
-    41,2,114,236,0,0,0,78,114,7,0,0,0,169,2,114,
-    5,0,0,0,218,6,115,117,102,102,105,120,169,1,90,9,
-    102,105,108,101,95,110,97,109,101,114,7,0,0,0,114,8,
-    0,0,0,114,9,0,0,0,167,4,0,0,115,8,0,0,
-    0,2,128,4,0,2,1,20,255,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,60,103,101,110,101,120,112,114,62,78,41,4,114,
-    74,0,0,0,114,65,0,0,0,218,3,97,110,121,114,232,
-    0,0,0,114,247,0,0,0,114,7,0,0,0,114,45,1,
-    0,0,114,8,0,0,0,114,206,0,0,0,164,4,0,0,
-    115,8,0,0,0,14,2,12,1,2,1,8,255,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,0,0,0,0,2,0,0,0,1,0,
-    0,0,67,0,0,0,114,23,0,0,0,41,2,122,63,82,
-    101,116,117,114,110,32,78,111,110,101,32,97,115,32,97,110,
-    32,101,120,116,101,110,115,105,111,110,32,109,111,100,117,108,
-    101,32,99,97,110,110,111,116,32,99,114,101,97,116,101,32,
-    97,32,99,111,100,101,32,111,98,106,101,99,116,46,78,114,
-    7,0,0,0,114,247,0,0,0,114,7,0,0,0,114,7,
-    0,0,0,114,8,0,0,0,114,241,0,0,0,170,4,0,
-    0,114,24,0,0,0,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,0,0,0,
-    0,2,0,0,0,1,0,0,0,67,0,0,0,114,23,0,
-    0,0,41,2,122,53,82,101,116,117,114,110,32,78,111,110,
-    101,32,97,115,32,101,120,116,101,110,115,105,111,110,32,109,
-    111,100,117,108,101,115,32,104,97,118,101,32,110,111,32,115,
-    111,117,114,99,101,32,99,111,100,101,46,78,114,7,0,0,
-    0,114,247,0,0,0,114,7,0,0,0,114,7,0,0,0,
-    114,8,0,0,0,114,1,1,0,0,174,4,0,0,114,24,
-    0,0,0,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,0,0,0,0,
-    2,0,0,0,1,0,0,0,67,0,0,0,114,26,1,0,
-    0,114,27,1,0,0,114,71,0,0,0,114,247,0,0,0,
+    0,90,4,100,4,100,5,132,0,90,5,100,6,83,0,41,
+    7,218,20,83,111,117,114,99,101,108,101,115,115,70,105,108,
+    101,76,111,97,100,101,114,122,45,76,111,97,100,101,114,32,
+    119,104,105,99,104,32,104,97,110,100,108,101,115,32,115,111,
+    117,114,99,101,108,101,115,115,32,102,105,108,101,32,105,109,
+    112,111,114,116,115,46,99,2,0,0,0,0,0,0,0,0,
+    0,0,0,5,0,0,0,5,0,0,0,67,0,0,0,115,
+    68,0,0,0,124,0,160,0,124,1,161,1,125,2,124,0,
+    160,1,124,2,161,1,125,3,124,1,124,2,100,1,156,2,
+    125,4,116,2,124,3,124,1,124,4,131,3,1,0,116,3,
+    116,4,124,3,131,1,100,2,100,0,133,2,25,0,124,1,
+    124,2,100,3,141,3,83,0,41,4,78,114,183,0,0,0,
+    114,169,0,0,0,41,2,114,141,0,0,0,114,132,0,0,
+    0,41,5,114,203,0,0,0,114,255,0,0,0,114,176,0,
+    0,0,114,189,0,0,0,114,7,1,0,0,41,5,114,143,
+    0,0,0,114,163,0,0,0,114,65,0,0,0,114,41,0,
+    0,0,114,175,0,0,0,114,7,0,0,0,114,7,0,0,
+    0,114,8,0,0,0,114,241,0,0,0,110,4,0,0,115,
+    22,0,0,0,10,1,10,1,2,4,2,1,6,254,12,4,
+    2,1,14,1,2,1,2,1,6,253,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,0,0,0,0,2,0,0,0,1,0,0,0,67,0,
+    0,0,114,23,0,0,0,41,2,122,39,82,101,116,117,114,
+    110,32,78,111,110,101,32,97,115,32,116,104,101,114,101,32,
+    105,115,32,110,111,32,115,111,117,114,99,101,32,99,111,100,
+    101,46,78,114,7,0,0,0,114,247,0,0,0,114,7,0,
+    0,0,114,7,0,0,0,114,8,0,0,0,114,1,1,0,
+    0,126,4,0,0,114,24,0,0,0,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,150,
+    0,0,0,114,149,0,0,0,114,151,0,0,0,114,152,0,
+    0,0,114,241,0,0,0,114,1,1,0,0,114,7,0,0,
+    0,114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,
+    114,41,1,0,0,106,4,0,0,115,8,0,0,0,8,0,
+    4,2,8,2,12,16,114,41,1,0,0,99,0,0,0,0,
+    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,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,100,
+    13,132,0,90,9,100,14,100,15,132,0,90,10,100,16,100,
+    17,132,0,90,11,101,12,100,18,100,19,132,0,131,1,90,
+    13,100,20,83,0,41,21,114,30,1,0,0,122,93,76,111,
+    97,100,101,114,32,102,111,114,32,101,120,116,101,110,115,105,
+    111,110,32,109,111,100,117,108,101,115,46,10,10,32,32,32,
+    32,84,104,101,32,99,111,110,115,116,114,117,99,116,111,114,
+    32,105,115,32,100,101,115,105,103,110,101,100,32,116,111,32,
+    119,111,114,107,32,119,105,116,104,32,70,105,108,101,70,105,
+    110,100,101,114,46,10,10,32,32,32,32,99,3,0,0,0,
+    0,0,0,0,0,0,0,0,3,0,0,0,2,0,0,0,
+    67,0,0,0,115,16,0,0,0,124,1,124,0,95,0,124,
+    2,124,0,95,1,100,0,83,0,114,69,0,0,0,114,183,
+    0,0,0,41,3,114,143,0,0,0,114,141,0,0,0,114,
+    65,0,0,0,114,7,0,0,0,114,7,0,0,0,114,8,
+    0,0,0,114,236,0,0,0,139,4,0,0,115,4,0,0,
+    0,6,1,10,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,0,0,0,0,
+    2,0,0,0,2,0,0,0,67,0,0,0,114,12,1,0,
+    0,114,69,0,0,0,114,13,1,0,0,114,15,1,0,0,
     114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,114,
-    203,0,0,0,178,4,0,0,114,28,1,0,0,122,32,69,
+    16,1,0,0,143,4,0,0,114,17,1,0,0,122,26,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,150,0,0,0,114,149,0,0,0,114,151,0,0,
-    0,114,152,0,0,0,114,236,0,0,0,114,16,1,0,0,
-    114,22,1,0,0,114,239,0,0,0,114,245,0,0,0,114,
-    206,0,0,0,114,241,0,0,0,114,1,1,0,0,114,160,
-    0,0,0,114,203,0,0,0,114,7,0,0,0,114,7,0,
-    0,0,114,7,0,0,0,114,8,0,0,0,114,30,1,0,
-    0,131,4,0,0,115,24,0,0,0,8,0,4,2,8,6,
-    8,4,8,4,8,3,8,8,8,6,8,6,8,4,2,4,
-    14,1,114,30,1,0,0,99,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,2,0,0,0,64,0,0,0,
-    115,104,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,100,13,132,0,90,
-    9,100,14,100,15,132,0,90,10,100,16,100,17,132,0,90,
-    11,100,18,100,19,132,0,90,12,100,20,100,21,132,0,90,
-    13,100,22,100,23,132,0,90,14,100,24,83,0,41,25,218,
-    14,95,78,97,109,101,115,112,97,99,101,80,97,116,104,97,
-    38,1,0,0,82,101,112,114,101,115,101,110,116,115,32,97,
-    32,110,97,109,101,115,112,97,99,101,32,112,97,99,107,97,
-    103,101,39,115,32,112,97,116,104,46,32,32,73,116,32,117,
-    115,101,115,32,116,104,101,32,109,111,100,117,108,101,32,110,
-    97,109,101,10,32,32,32,32,116,111,32,102,105,110,100,32,
-    105,116,115,32,112,97,114,101,110,116,32,109,111,100,117,108,
-    101,44,32,97,110,100,32,102,114,111,109,32,116,104,101,114,
-    101,32,105,116,32,108,111,111,107,115,32,117,112,32,116,104,
-    101,32,112,97,114,101,110,116,39,115,10,32,32,32,32,95,
-    95,112,97,116,104,95,95,46,32,32,87,104,101,110,32,116,
-    104,105,115,32,99,104,97,110,103,101,115,44,32,116,104,101,
-    32,109,111,100,117,108,101,39,115,32,111,119,110,32,112,97,
-    116,104,32,105,115,32,114,101,99,111,109,112,117,116,101,100,
-    44,10,32,32,32,32,117,115,105,110,103,32,112,97,116,104,
-    95,102,105,110,100,101,114,46,32,32,70,111,114,32,116,111,
-    112,45,108,101,118,101,108,32,109,111,100,117,108,101,115,44,
-    32,116,104,101,32,112,97,114,101,110,116,32,109,111,100,117,
-    108,101,39,115,32,112,97,116,104,10,32,32,32,32,105,115,
-    32,115,121,115,46,112,97,116,104,46,99,4,0,0,0,0,
-    0,0,0,0,0,0,0,4,0,0,0,3,0,0,0,67,
-    0,0,0,115,36,0,0,0,124,1,124,0,95,0,124,2,
-    124,0,95,1,116,2,124,0,160,3,161,0,131,1,124,0,
-    95,4,124,3,124,0,95,5,100,0,83,0,114,69,0,0,
-    0,41,6,218,5,95,110,97,109,101,218,5,95,112,97,116,
-    104,114,136,0,0,0,218,16,95,103,101,116,95,112,97,114,
-    101,110,116,95,112,97,116,104,218,17,95,108,97,115,116,95,
-    112,97,114,101,110,116,95,112,97,116,104,218,12,95,112,97,
-    116,104,95,102,105,110,100,101,114,169,4,114,143,0,0,0,
-    114,141,0,0,0,114,65,0,0,0,90,11,112,97,116,104,
-    95,102,105,110,100,101,114,114,7,0,0,0,114,7,0,0,
-    0,114,8,0,0,0,114,236,0,0,0,191,4,0,0,115,
-    8,0,0,0,6,1,6,1,14,1,10,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,0,0,
-    0,0,4,0,0,0,3,0,0,0,67,0,0,0,115,38,
-    0,0,0,124,0,106,0,160,1,100,1,161,1,92,3,125,
-    1,125,2,125,3,124,2,100,2,107,2,114,15,100,3,83,
-    0,124,1,100,4,102,2,83,0,41,6,122,62,82,101,116,
-    117,114,110,115,32,97,32,116,117,112,108,101,32,111,102,32,
-    40,112,97,114,101,110,116,45,109,111,100,117,108,101,45,110,
-    97,109,101,44,32,112,97,114,101,110,116,45,112,97,116,104,
-    45,97,116,116,114,45,110,97,109,101,41,114,97,0,0,0,
-    114,10,0,0,0,41,2,114,15,0,0,0,114,65,0,0,
-    0,90,8,95,95,112,97,116,104,95,95,78,41,2,114,48,
-    1,0,0,114,104,0,0,0,41,4,114,143,0,0,0,114,
-    40,1,0,0,218,3,100,111,116,90,2,109,101,114,7,0,
-    0,0,114,7,0,0,0,114,8,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,197,4,0,0,115,8,0,0,0,18,2,
-    8,1,4,2,8,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,110,97,109,101,115,99,1,
-    0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,3,
-    0,0,0,67,0,0,0,115,28,0,0,0,124,0,160,0,
-    161,0,92,2,125,1,125,2,116,1,116,2,106,3,124,1,
-    25,0,124,2,131,2,83,0,114,69,0,0,0,41,4,114,
-    55,1,0,0,114,155,0,0,0,114,15,0,0,0,218,7,
-    109,111,100,117,108,101,115,41,3,114,143,0,0,0,90,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,7,0,0,0,114,7,0,0,0,114,8,0,0,
-    0,114,50,1,0,0,207,4,0,0,115,4,0,0,0,12,
-    1,16,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,0,0,0,
-    0,3,0,0,0,4,0,0,0,67,0,0,0,115,80,0,
-    0,0,116,0,124,0,160,1,161,0,131,1,125,1,124,1,
-    124,0,106,2,107,3,114,37,124,0,160,3,124,0,106,4,
-    124,1,161,2,125,2,124,2,100,0,117,1,114,34,124,2,
-    106,5,100,0,117,0,114,34,124,2,106,6,114,34,124,2,
-    106,6,124,0,95,7,124,1,124,0,95,2,124,0,106,7,
-    83,0,114,69,0,0,0,41,8,114,136,0,0,0,114,50,
-    1,0,0,114,51,1,0,0,114,52,1,0,0,114,48,1,
-    0,0,114,164,0,0,0,114,202,0,0,0,114,49,1,0,
-    0,41,3,114,143,0,0,0,90,11,112,97,114,101,110,116,
-    95,112,97,116,104,114,210,0,0,0,114,7,0,0,0,114,
-    7,0,0,0,114,8,0,0,0,218,12,95,114,101,99,97,
-    108,99,117,108,97,116,101,211,4,0,0,115,16,0,0,0,
-    12,2,10,1,14,1,18,3,6,1,8,1,6,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,0,0,0,0,0,1,0,0,0,3,0,
-    0,0,67,0,0,0,243,12,0,0,0,116,0,124,0,160,
-    1,161,0,131,1,83,0,114,69,0,0,0,41,2,218,4,
-    105,116,101,114,114,57,1,0,0,114,21,1,0,0,114,7,
-    0,0,0,114,7,0,0,0,114,8,0,0,0,218,8,95,
-    95,105,116,101,114,95,95,224,4,0,0,243,2,0,0,0,
-    12,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,2,0,0,0,
-    0,0,0,0,0,0,0,0,2,0,0,0,2,0,0,0,
-    67,0,0,0,115,12,0,0,0,124,0,160,0,161,0,124,
-    1,25,0,83,0,114,69,0,0,0,169,1,114,57,1,0,
-    0,41,2,114,143,0,0,0,218,5,105,110,100,101,120,114,
-    7,0,0,0,114,7,0,0,0,114,8,0,0,0,218,11,
-    95,95,103,101,116,105,116,101,109,95,95,227,4,0,0,114,
-    61,1,0,0,122,26,95,78,97,109,101,115,112,97,99,101,
-    80,97,116,104,46,95,95,103,101,116,105,116,101,109,95,95,
-    99,3,0,0,0,0,0,0,0,0,0,0,0,3,0,0,
-    0,3,0,0,0,67,0,0,0,115,14,0,0,0,124,2,
-    124,0,106,0,124,1,60,0,100,0,83,0,114,69,0,0,
-    0,41,1,114,49,1,0,0,41,3,114,143,0,0,0,114,
-    63,1,0,0,114,65,0,0,0,114,7,0,0,0,114,7,
-    0,0,0,114,8,0,0,0,218,11,95,95,115,101,116,105,
-    116,101,109,95,95,230,4,0,0,115,2,0,0,0,14,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,0,0,0,0,1,0,0,0,3,0,0,
-    0,67,0,0,0,114,58,1,0,0,114,69,0,0,0,41,
-    2,114,4,0,0,0,114,57,1,0,0,114,21,1,0,0,
-    114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,218,
-    7,95,95,108,101,110,95,95,233,4,0,0,114,61,1,0,
-    0,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,
+    101,114,46,95,95,101,113,95,95,99,1,0,0,0,0,0,
     0,0,0,0,0,0,1,0,0,0,3,0,0,0,67,0,
-    0,0,243,12,0,0,0,100,1,160,0,124,0,106,1,161,
-    1,83,0,41,2,78,122,20,95,78,97,109,101,115,112,97,
-    99,101,80,97,116,104,40,123,33,114,125,41,41,2,114,89,
-    0,0,0,114,49,1,0,0,114,21,1,0,0,114,7,0,
-    0,0,114,7,0,0,0,114,8,0,0,0,218,8,95,95,
-    114,101,112,114,95,95,236,4,0,0,114,61,1,0,0,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,0,0,0,0,2,0,0,0,3,0,0,0,67,0,0,
-    0,115,12,0,0,0,124,1,124,0,160,0,161,0,118,0,
-    83,0,114,69,0,0,0,114,62,1,0,0,169,2,114,143,
-    0,0,0,218,4,105,116,101,109,114,7,0,0,0,114,7,
-    0,0,0,114,8,0,0,0,218,12,95,95,99,111,110,116,
-    97,105,110,115,95,95,239,4,0,0,114,61,1,0,0,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,0,0,0,0,2,0,0,0,3,0,0,
-    0,67,0,0,0,115,16,0,0,0,124,0,106,0,160,1,
-    124,1,161,1,1,0,100,0,83,0,114,69,0,0,0,41,
-    2,114,49,1,0,0,114,61,0,0,0,114,69,1,0,0,
-    114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,114,
-    61,0,0,0,242,4,0,0,243,2,0,0,0,16,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,15,114,150,0,0,0,114,149,
-    0,0,0,114,151,0,0,0,114,152,0,0,0,114,236,0,
-    0,0,114,55,1,0,0,114,50,1,0,0,114,57,1,0,
-    0,114,60,1,0,0,114,64,1,0,0,114,65,1,0,0,
-    114,66,1,0,0,114,68,1,0,0,114,71,1,0,0,114,
-    61,0,0,0,114,7,0,0,0,114,7,0,0,0,114,7,
-    0,0,0,114,8,0,0,0,114,47,1,0,0,184,4,0,
-    0,115,26,0,0,0,8,0,4,1,8,6,8,6,8,10,
-    8,4,8,13,8,3,8,3,8,3,8,3,8,3,12,3,
-    114,47,1,0,0,99,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,3,0,0,0,64,0,0,0,115,88,
-    0,0,0,101,0,90,1,100,0,90,2,100,1,100,2,132,
-    0,90,3,101,4,100,3,100,4,132,0,131,1,90,5,100,
-    5,100,6,132,0,90,6,100,7,100,8,132,0,90,7,100,
-    9,100,10,132,0,90,8,100,11,100,12,132,0,90,9,100,
-    13,100,14,132,0,90,10,100,15,100,16,132,0,90,11,100,
-    17,100,18,132,0,90,12,100,19,83,0,41,20,218,16,95,
-    78,97,109,101,115,112,97,99,101,76,111,97,100,101,114,99,
-    4,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,
-    4,0,0,0,67,0,0,0,115,18,0,0,0,116,0,124,
-    1,124,2,124,3,131,3,124,0,95,1,100,0,83,0,114,
-    69,0,0,0,41,2,114,47,1,0,0,114,49,1,0,0,
-    114,53,1,0,0,114,7,0,0,0,114,7,0,0,0,114,
-    8,0,0,0,114,236,0,0,0,248,4,0,0,115,2,0,
-    0,0,18,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,
-    1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,
-    4,0,0,0,67,0,0,0,115,24,0,0,0,116,0,160,
-    1,100,1,116,2,161,2,1,0,100,2,160,3,124,0,106,
-    4,161,1,83,0,41,4,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,82,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,40,41,32,105,115,32,
-    100,101,112,114,101,99,97,116,101,100,32,97,110,100,32,115,
-    108,97,116,101,100,32,102,111,114,32,114,101,109,111,118,97,
-    108,32,105,110,32,80,121,116,104,111,110,32,51,46,49,50,
-    122,25,60,109,111,100,117,108,101,32,123,33,114,125,32,40,
-    110,97,109,101,115,112,97,99,101,41,62,78,41,5,114,99,
-    0,0,0,114,100,0,0,0,114,101,0,0,0,114,89,0,
-    0,0,114,150,0,0,0,41,1,114,244,0,0,0,114,7,
-    0,0,0,114,7,0,0,0,114,8,0,0,0,218,11,109,
-    111,100,117,108,101,95,114,101,112,114,251,4,0,0,115,8,
-    0,0,0,6,7,2,1,4,255,12,2,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,0,0,0,0,2,0,0,0,1,0,0,0,67,0,
-    0,0,114,23,0,0,0,41,2,78,84,114,7,0,0,0,
-    114,247,0,0,0,114,7,0,0,0,114,7,0,0,0,114,
-    8,0,0,0,114,206,0,0,0,6,5,0,0,243,2,0,
-    0,0,4,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,0,0,0,0,2,0,
-    0,0,1,0,0,0,67,0,0,0,114,23,0,0,0,41,
-    2,78,114,10,0,0,0,114,7,0,0,0,114,247,0,0,
-    0,114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,
-    114,1,1,0,0,9,5,0,0,114,75,1,0,0,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,0,0,0,0,2,0,0,0,6,0,0,0,
-    67,0,0,0,115,16,0,0,0,116,0,100,1,100,2,100,
-    3,100,4,100,5,141,4,83,0,41,6,78,114,10,0,0,
-    0,122,8,60,115,116,114,105,110,103,62,114,243,0,0,0,
-    84,41,1,114,3,1,0,0,41,1,114,4,1,0,0,114,
-    247,0,0,0,114,7,0,0,0,114,7,0,0,0,114,8,
-    0,0,0,114,241,0,0,0,12,5,0,0,114,72,1,0,
-    0,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,0,0,0,0,2,0,0,0,1,0,0,
-    0,67,0,0,0,114,23,0,0,0,114,237,0,0,0,114,
-    7,0,0,0,114,238,0,0,0,114,7,0,0,0,114,7,
-    0,0,0,114,8,0,0,0,114,239,0,0,0,15,5,0,
-    0,114,240,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,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,114,69,0,0,0,114,7,0,
-    0,0,114,42,1,0,0,114,7,0,0,0,114,7,0,0,
-    0,114,8,0,0,0,114,245,0,0,0,18,5,0,0,114,
-    75,1,0,0,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,0,0,0,0,2,
-    0,0,0,4,0,0,0,67,0,0,0,115,26,0,0,0,
-    116,0,160,1,100,1,124,0,106,2,161,2,1,0,116,0,
-    160,3,124,0,124,1,161,2,83,0,41,3,122,98,76,111,
-    97,100,32,97,32,110,97,109,101,115,112,97,99,101,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,
-    122,38,110,97,109,101,115,112,97,99,101,32,109,111,100,117,
-    108,101,32,108,111,97,100,101,100,32,119,105,116,104,32,112,
-    97,116,104,32,123,33,114,125,78,41,4,114,159,0,0,0,
-    114,173,0,0,0,114,49,1,0,0,114,246,0,0,0,114,
-    247,0,0,0,114,7,0,0,0,114,7,0,0,0,114,8,
-    0,0,0,114,248,0,0,0,21,5,0,0,115,8,0,0,
-    0,6,7,4,1,4,255,12,3,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,99,2,0,0,0,0,0,0,0,
-    0,0,0,0,3,0,0,0,2,0,0,0,67,0,0,0,
-    115,22,0,0,0,100,1,100,2,108,0,109,1,125,2,1,
-    0,124,2,124,0,106,2,131,1,83,0,41,3,78,114,0,
-    0,0,0,41,1,218,15,78,97,109,101,115,112,97,99,101,
-    82,101,97,100,101,114,41,3,114,32,1,0,0,114,76,1,
-    0,0,114,49,1,0,0,41,3,114,143,0,0,0,114,244,
-    0,0,0,114,76,1,0,0,114,7,0,0,0,114,7,0,
-    0,0,114,8,0,0,0,114,33,1,0,0,33,5,0,0,
-    115,4,0,0,0,12,1,10,1,122,36,95,78,97,109,101,
-    115,112,97,99,101,76,111,97,100,101,114,46,103,101,116,95,
-    114,101,115,111,117,114,99,101,95,114,101,97,100,101,114,78,
-    41,13,114,150,0,0,0,114,149,0,0,0,114,151,0,0,
-    0,114,236,0,0,0,114,233,0,0,0,114,74,1,0,0,
-    114,206,0,0,0,114,1,1,0,0,114,241,0,0,0,114,
-    239,0,0,0,114,245,0,0,0,114,248,0,0,0,114,33,
-    1,0,0,114,7,0,0,0,114,7,0,0,0,114,7,0,
-    0,0,114,8,0,0,0,114,73,1,0,0,247,4,0,0,
-    115,22,0,0,0,8,0,8,1,2,3,10,1,8,10,8,
-    3,8,3,8,3,8,3,8,3,12,12,114,73,1,0,0,
-    99,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,4,0,0,0,64,0,0,0,115,118,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,4,100,4,100,5,132,0,131,1,
-    90,6,101,7,100,6,100,7,132,0,131,1,90,8,101,7,
-    100,8,100,9,132,0,131,1,90,9,101,7,100,19,100,11,
-    100,12,132,1,131,1,90,10,101,7,100,20,100,13,100,14,
-    132,1,131,1,90,11,101,7,100,19,100,15,100,16,132,1,
-    131,1,90,12,101,4,100,17,100,18,132,0,131,1,90,13,
-    100,10,83,0,41,21,218,10,80,97,116,104,70,105,110,100,
-    101,114,122,62,77,101,116,97,32,112,97,116,104,32,102,105,
-    110,100,101,114,32,102,111,114,32,115,121,115,46,112,97,116,
-    104,32,97,110,100,32,112,97,99,107,97,103,101,32,95,95,
-    112,97,116,104,95,95,32,97,116,116,114,105,98,117,116,101,
-    115,46,99,0,0,0,0,0,0,0,0,0,0,0,0,2,
-    0,0,0,4,0,0,0,67,0,0,0,115,64,0,0,0,
-    116,0,116,1,106,2,160,3,161,0,131,1,68,0,93,22,
-    92,2,125,0,125,1,124,1,100,1,117,0,114,20,116,1,
-    106,2,124,0,61,0,113,7,116,4,124,1,100,2,131,2,
-    114,29,124,1,160,5,161,0,1,0,113,7,100,1,83,0,
-    41,3,122,125,67,97,108,108,32,116,104,101,32,105,110,118,
-    97,108,105,100,97,116,101,95,99,97,99,104,101,115,40,41,
-    32,109,101,116,104,111,100,32,111,110,32,97,108,108,32,112,
-    97,116,104,32,101,110,116,114,121,32,102,105,110,100,101,114,
-    115,10,32,32,32,32,32,32,32,32,115,116,111,114,101,100,
-    32,105,110,32,115,121,115,46,112,97,116,104,95,105,109,112,
-    111,114,116,101,114,95,99,97,99,104,101,115,32,40,119,104,
-    101,114,101,32,105,109,112,108,101,109,101,110,116,101,100,41,
-    46,78,218,17,105,110,118,97,108,105,100,97,116,101,95,99,
-    97,99,104,101,115,41,6,218,4,108,105,115,116,114,15,0,
-    0,0,218,19,112,97,116,104,95,105,109,112,111,114,116,101,
-    114,95,99,97,99,104,101,218,5,105,116,101,109,115,114,153,
-    0,0,0,114,78,1,0,0,41,2,114,141,0,0,0,218,
-    6,102,105,110,100,101,114,114,7,0,0,0,114,7,0,0,
-    0,114,8,0,0,0,114,78,1,0,0,44,5,0,0,115,
-    14,0,0,0,22,4,8,1,10,1,10,1,8,1,2,128,
-    4,252,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,
+    0,0,114,18,1,0,0,114,69,0,0,0,114,19,1,0,
+    0,114,21,1,0,0,114,7,0,0,0,114,7,0,0,0,
+    114,8,0,0,0,114,22,1,0,0,147,4,0,0,114,23,
+    1,0,0,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,0,0,0,0,3,0,
+    0,0,5,0,0,0,67,0,0,0,115,36,0,0,0,116,
+    0,160,1,116,2,106,3,124,1,161,2,125,2,116,0,160,
+    4,100,1,124,1,106,5,124,0,106,6,161,3,1,0,124,
+    2,83,0,41,3,122,38,67,114,101,97,116,101,32,97,110,
+    32,117,110,105,116,105,97,108,105,122,101,100,32,101,120,116,
+    101,110,115,105,111,110,32,109,111,100,117,108,101,122,38,101,
+    120,116,101,110,115,105,111,110,32,109,111,100,117,108,101,32,
+    123,33,114,125,32,108,111,97,100,101,100,32,102,114,111,109,
+    32,123,33,114,125,78,41,7,114,159,0,0,0,114,242,0,
+    0,0,114,187,0,0,0,90,14,99,114,101,97,116,101,95,
+    100,121,110,97,109,105,99,114,173,0,0,0,114,141,0,0,
+    0,114,65,0,0,0,41,3,114,143,0,0,0,114,210,0,
+    0,0,114,244,0,0,0,114,7,0,0,0,114,7,0,0,
+    0,114,8,0,0,0,114,239,0,0,0,150,4,0,0,115,
+    14,0,0,0,4,2,6,1,4,255,6,2,8,1,4,255,
+    4,2,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,0,0,0,
+    0,0,2,0,0,0,5,0,0,0,67,0,0,0,115,36,
+    0,0,0,116,0,160,1,116,2,106,3,124,1,161,2,1,
+    0,116,0,160,4,100,1,124,0,106,5,124,0,106,6,161,
+    3,1,0,100,2,83,0,41,3,122,30,73,110,105,116,105,
+    97,108,105,122,101,32,97,110,32,101,120,116,101,110,115,105,
+    111,110,32,109,111,100,117,108,101,122,40,101,120,116,101,110,
+    115,105,111,110,32,109,111,100,117,108,101,32,123,33,114,125,
+    32,101,120,101,99,117,116,101,100,32,102,114,111,109,32,123,
+    33,114,125,78,41,7,114,159,0,0,0,114,242,0,0,0,
+    114,187,0,0,0,90,12,101,120,101,99,95,100,121,110,97,
+    109,105,99,114,173,0,0,0,114,141,0,0,0,114,65,0,
+    0,0,169,2,114,143,0,0,0,114,244,0,0,0,114,7,
+    0,0,0,114,7,0,0,0,114,8,0,0,0,114,245,0,
+    0,0,158,4,0,0,115,8,0,0,0,14,2,6,1,8,
+    1,8,255,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,0,0,0,
+    0,2,0,0,0,4,0,0,0,3,0,0,0,115,36,0,
+    0,0,116,0,124,0,106,1,131,1,100,1,25,0,137,0,
+    116,2,135,0,102,1,100,2,100,3,132,8,116,3,68,0,
+    131,1,131,1,83,0,41,5,122,49,82,101,116,117,114,110,
+    32,84,114,117,101,32,105,102,32,116,104,101,32,101,120,116,
+    101,110,115,105,111,110,32,109,111,100,117,108,101,32,105,115,
+    32,97,32,112,97,99,107,97,103,101,46,114,3,0,0,0,
     99,1,0,0,0,0,0,0,0,0,0,0,0,2,0,0,
-    0,9,0,0,0,67,0,0,0,115,76,0,0,0,116,0,
-    106,1,100,1,117,1,114,14,116,0,106,1,115,14,116,2,
-    160,3,100,2,116,4,161,2,1,0,116,0,106,1,68,0,
-    93,17,125,1,122,7,124,1,124,0,131,1,87,0,2,0,
-    1,0,83,0,4,0,116,5,121,37,1,0,1,0,1,0,
-    89,0,113,17,100,1,83,0,119,0,41,3,122,46,83,101,
-    97,114,99,104,32,115,121,115,46,112,97,116,104,95,104,111,
-    111,107,115,32,102,111,114,32,97,32,102,105,110,100,101,114,
-    32,102,111,114,32,39,112,97,116,104,39,46,78,122,23,115,
-    121,115,46,112,97,116,104,95,104,111,111,107,115,32,105,115,
-    32,101,109,112,116,121,41,6,114,15,0,0,0,218,10,112,
-    97,116,104,95,104,111,111,107,115,114,99,0,0,0,114,100,
-    0,0,0,114,162,0,0,0,114,142,0,0,0,41,2,114,
-    65,0,0,0,90,4,104,111,111,107,114,7,0,0,0,114,
-    7,0,0,0,114,8,0,0,0,218,11,95,112,97,116,104,
-    95,104,111,111,107,115,54,5,0,0,115,18,0,0,0,16,
-    3,12,1,10,1,2,1,14,1,12,1,4,1,4,2,2,
-    253,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,0,0,0,0,3,0,0,0,8,0,0,0,67,0,
-    0,0,115,100,0,0,0,124,1,100,1,107,2,114,20,122,
-    6,116,0,160,1,161,0,125,1,87,0,110,9,4,0,116,
-    2,121,49,1,0,1,0,1,0,89,0,100,2,83,0,122,
-    8,116,3,106,4,124,1,25,0,125,2,87,0,124,2,83,
-    0,4,0,116,5,121,48,1,0,1,0,1,0,124,0,160,
-    6,124,1,161,1,125,2,124,2,116,3,106,4,124,1,60,
-    0,89,0,124,2,83,0,119,0,119,0,41,3,122,210,71,
-    101,116,32,116,104,101,32,102,105,110,100,101,114,32,102,111,
-    114,32,116,104,101,32,112,97,116,104,32,101,110,116,114,121,
-    32,102,114,111,109,32,115,121,115,46,112,97,116,104,95,105,
-    109,112,111,114,116,101,114,95,99,97,99,104,101,46,10,10,
-    32,32,32,32,32,32,32,32,73,102,32,116,104,101,32,112,
-    97,116,104,32,101,110,116,114,121,32,105,115,32,110,111,116,
-    32,105,110,32,116,104,101,32,99,97,99,104,101,44,32,102,
-    105,110,100,32,116,104,101,32,97,112,112,114,111,112,114,105,
-    97,116,101,32,102,105,110,100,101,114,10,32,32,32,32,32,
-    32,32,32,97,110,100,32,99,97,99,104,101,32,105,116,46,
-    32,73,102,32,110,111,32,102,105,110,100,101,114,32,105,115,
-    32,97,118,97,105,108,97,98,108,101,44,32,115,116,111,114,
-    101,32,78,111,110,101,46,10,10,32,32,32,32,32,32,32,
-    32,114,10,0,0,0,78,41,7,114,18,0,0,0,114,82,
-    0,0,0,218,17,70,105,108,101,78,111,116,70,111,117,110,
-    100,69,114,114,111,114,114,15,0,0,0,114,80,1,0,0,
-    218,8,75,101,121,69,114,114,111,114,114,84,1,0,0,41,
-    3,114,221,0,0,0,114,65,0,0,0,114,82,1,0,0,
-    114,7,0,0,0,114,7,0,0,0,114,8,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,67,5,0,0,115,28,0,0,0,8,8,
-    2,1,12,1,12,1,6,3,2,1,12,1,4,4,12,253,
-    10,1,12,1,4,1,2,253,2,250,122,31,80,97,116,104,
-    70,105,110,100,101,114,46,95,112,97,116,104,95,105,109,112,
-    111,114,116,101,114,95,99,97,99,104,101,99,3,0,0,0,
-    0,0,0,0,0,0,0,0,7,0,0,0,4,0,0,0,
-    67,0,0,0,115,138,0,0,0,116,0,124,2,100,1,131,
-    2,114,27,116,1,160,2,124,2,161,1,155,0,100,2,157,
-    2,125,3,116,3,160,4,124,3,116,5,161,2,1,0,124,
-    2,160,6,124,1,161,1,92,2,125,4,125,5,110,21,116,
-    1,160,2,124,2,161,1,155,0,100,3,157,2,125,3,116,
-    3,160,4,124,3,116,5,161,2,1,0,124,2,160,7,124,
-    1,161,1,125,4,103,0,125,5,124,4,100,0,117,1,114,
-    58,116,1,160,8,124,1,124,4,161,2,83,0,116,1,160,
-    9,124,1,100,0,161,2,125,6,124,5,124,6,95,10,124,
-    6,83,0,41,4,78,114,161,0,0,0,122,53,46,102,105,
-    110,100,95,115,112,101,99,40,41,32,110,111,116,32,102,111,
-    117,110,100,59,32,102,97,108,108,105,110,103,32,98,97,99,
-    107,32,116,111,32,102,105,110,100,95,108,111,97,100,101,114,
-    40,41,122,53,46,102,105,110,100,95,115,112,101,99,40,41,
-    32,110,111,116,32,102,111,117,110,100,59,32,102,97,108,108,
-    105,110,103,32,98,97,99,107,32,116,111,32,102,105,110,100,
-    95,109,111,100,117,108,101,40,41,41,11,114,153,0,0,0,
-    114,159,0,0,0,90,12,95,111,98,106,101,99,116,95,110,
-    97,109,101,114,99,0,0,0,114,100,0,0,0,114,162,0,
-    0,0,114,161,0,0,0,114,229,0,0,0,114,224,0,0,
-    0,114,207,0,0,0,114,202,0,0,0,41,7,114,221,0,
-    0,0,114,163,0,0,0,114,82,1,0,0,114,166,0,0,
-    0,114,164,0,0,0,114,165,0,0,0,114,210,0,0,0,
-    114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,218,
-    16,95,108,101,103,97,99,121,95,103,101,116,95,115,112,101,
-    99,89,5,0,0,115,26,0,0,0,10,4,16,1,12,2,
-    16,1,16,2,12,2,10,1,4,1,8,1,12,1,12,1,
-    6,1,4,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,0,0,0,0,0,0,0,0,0,0,9,
-    0,0,0,5,0,0,0,67,0,0,0,115,166,0,0,0,
-    103,0,125,4,124,2,68,0,93,67,125,5,116,0,124,5,
-    116,1,116,2,102,2,131,2,115,14,113,4,124,0,160,3,
-    124,5,161,1,125,6,124,6,100,1,117,1,114,71,116,4,
-    124,6,100,2,131,2,114,35,124,6,160,5,124,1,124,3,
-    161,2,125,7,110,6,124,0,160,6,124,1,124,6,161,2,
-    125,7,124,7,100,1,117,0,114,46,113,4,124,7,106,7,
-    100,1,117,1,114,55,124,7,2,0,1,0,83,0,124,7,
-    106,8,125,8,124,8,100,1,117,0,114,66,116,9,100,3,
-    131,1,130,1,124,4,160,10,124,8,161,1,1,0,113,4,
-    116,11,160,12,124,1,100,1,161,2,125,7,124,4,124,7,
-    95,8,124,7,83,0,41,4,122,63,70,105,110,100,32,116,
-    104,101,32,108,111,97,100,101,114,32,111,114,32,110,97,109,
-    101,115,112,97,99,101,95,112,97,116,104,32,102,111,114,32,
-    116,104,105,115,32,109,111,100,117,108,101,47,112,97,99,107,
-    97,103,101,32,110,97,109,101,46,78,114,226,0,0,0,122,
-    19,115,112,101,99,32,109,105,115,115,105,110,103,32,108,111,
-    97,100,101,114,41,13,114,185,0,0,0,114,109,0,0,0,
-    218,5,98,121,116,101,115,114,87,1,0,0,114,153,0,0,
-    0,114,226,0,0,0,114,88,1,0,0,114,164,0,0,0,
-    114,202,0,0,0,114,142,0,0,0,114,191,0,0,0,114,
-    159,0,0,0,114,207,0,0,0,41,9,114,221,0,0,0,
-    114,163,0,0,0,114,65,0,0,0,114,225,0,0,0,218,
-    14,110,97,109,101,115,112,97,99,101,95,112,97,116,104,90,
-    5,101,110,116,114,121,114,82,1,0,0,114,210,0,0,0,
-    114,165,0,0,0,114,7,0,0,0,114,7,0,0,0,114,
-    8,0,0,0,218,9,95,103,101,116,95,115,112,101,99,110,
-    5,0,0,115,42,0,0,0,4,5,8,1,14,1,2,1,
-    10,1,8,1,10,1,14,1,12,2,8,1,2,1,10,1,
-    8,1,6,1,8,1,8,1,10,5,2,128,12,2,6,1,
-    4,1,122,20,80,97,116,104,70,105,110,100,101,114,46,95,
-    103,101,116,95,115,112,101,99,99,4,0,0,0,0,0,0,
-    0,0,0,0,0,6,0,0,0,5,0,0,0,67,0,0,
-    0,115,94,0,0,0,124,2,100,1,117,0,114,7,116,0,
-    106,1,125,2,124,0,160,2,124,1,124,2,124,3,161,3,
-    125,4,124,4,100,1,117,0,114,20,100,1,83,0,124,4,
-    106,3,100,1,117,0,114,45,124,4,106,4,125,5,124,5,
-    114,43,100,1,124,4,95,5,116,6,124,1,124,5,124,0,
-    106,2,131,3,124,4,95,4,124,4,83,0,100,1,83,0,
-    124,4,83,0,41,2,122,141,84,114,121,32,116,111,32,102,
-    105,110,100,32,97,32,115,112,101,99,32,102,111,114,32,39,
-    102,117,108,108,110,97,109,101,39,32,111,110,32,115,121,115,
-    46,112,97,116,104,32,111,114,32,39,112,97,116,104,39,46,
-    10,10,32,32,32,32,32,32,32,32,84,104,101,32,115,101,
-    97,114,99,104,32,105,115,32,98,97,115,101,100,32,111,110,
-    32,115,121,115,46,112,97,116,104,95,104,111,111,107,115,32,
-    97,110,100,32,115,121,115,46,112,97,116,104,95,105,109,112,
-    111,114,116,101,114,95,99,97,99,104,101,46,10,32,32,32,
-    32,32,32,32,32,78,41,7,114,15,0,0,0,114,65,0,
-    0,0,114,91,1,0,0,114,164,0,0,0,114,202,0,0,
-    0,114,205,0,0,0,114,47,1,0,0,41,6,114,221,0,
-    0,0,114,163,0,0,0,114,65,0,0,0,114,225,0,0,
-    0,114,210,0,0,0,114,90,1,0,0,114,7,0,0,0,
-    114,7,0,0,0,114,8,0,0,0,114,226,0,0,0,142,
-    5,0,0,115,26,0,0,0,8,6,6,1,14,1,8,1,
-    4,1,10,1,6,1,4,1,6,3,16,1,4,1,4,2,
-    4,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,0,0,0,0,0,0,
-    0,0,0,0,0,4,0,0,0,4,0,0,0,67,0,0,
-    0,115,42,0,0,0,116,0,160,1,100,1,116,2,161,2,
-    1,0,124,0,160,3,124,1,124,2,161,2,125,3,124,3,
-    100,2,117,0,114,18,100,2,83,0,124,3,106,4,83,0,
-    41,3,122,170,102,105,110,100,32,116,104,101,32,109,111,100,
-    117,108,101,32,111,110,32,115,121,115,46,112,97,116,104,32,
-    111,114,32,39,112,97,116,104,39,32,98,97,115,101,100,32,
-    111,110,32,115,121,115,46,112,97,116,104,95,104,111,111,107,
-    115,32,97,110,100,10,32,32,32,32,32,32,32,32,115,121,
-    115,46,112,97,116,104,95,105,109,112,111,114,116,101,114,95,
-    99,97,99,104,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,122,101,
-    80,97,116,104,70,105,110,100,101,114,46,102,105,110,100,95,
-    109,111,100,117,108,101,40,41,32,105,115,32,100,101,112,114,
-    101,99,97,116,101,100,32,97,110,100,32,115,108,97,116,101,
-    100,32,102,111,114,32,114,101,109,111,118,97,108,32,105,110,
-    32,80,121,116,104,111,110,32,51,46,49,50,59,32,117,115,
-    101,32,102,105,110,100,95,115,112,101,99,40,41,32,105,110,
-    115,116,101,97,100,78,114,227,0,0,0,114,228,0,0,0,
-    114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,114,
-    229,0,0,0,166,5,0,0,115,14,0,0,0,6,8,2,
-    2,4,254,12,3,8,1,4,1,6,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,99,0,0,0,0,0,0,0,0,0,0,0,0,
-    3,0,0,0,4,0,0,0,79,0,0,0,115,28,0,0,
-    0,100,1,100,2,108,0,109,1,125,2,1,0,124,2,106,
-    2,124,0,105,0,124,1,164,1,142,1,83,0,41,4,97,
-    32,1,0,0,10,32,32,32,32,32,32,32,32,70,105,110,
-    100,32,100,105,115,116,114,105,98,117,116,105,111,110,115,46,
-    10,10,32,32,32,32,32,32,32,32,82,101,116,117,114,110,
-    32,97,110,32,105,116,101,114,97,98,108,101,32,111,102,32,
-    97,108,108,32,68,105,115,116,114,105,98,117,116,105,111,110,
-    32,105,110,115,116,97,110,99,101,115,32,99,97,112,97,98,
-    108,101,32,111,102,10,32,32,32,32,32,32,32,32,108,111,
-    97,100,105,110,103,32,116,104,101,32,109,101,116,97,100,97,
-    116,97,32,102,111,114,32,112,97,99,107,97,103,101,115,32,
-    109,97,116,99,104,105,110,103,32,96,96,99,111,110,116,101,
-    120,116,46,110,97,109,101,96,96,10,32,32,32,32,32,32,
-    32,32,40,111,114,32,97,108,108,32,110,97,109,101,115,32,
-    105,102,32,96,96,78,111,110,101,96,96,32,105,110,100,105,
-    99,97,116,101,100,41,32,97,108,111,110,103,32,116,104,101,
-    32,112,97,116,104,115,32,105,110,32,116,104,101,32,108,105,
-    115,116,10,32,32,32,32,32,32,32,32,111,102,32,100,105,
-    114,101,99,116,111,114,105,101,115,32,96,96,99,111,110,116,
-    101,120,116,46,112,97,116,104,96,96,46,10,32,32,32,32,
-    32,32,32,32,114,0,0,0,0,41,1,218,18,77,101,116,
-    97,100,97,116,97,80,97,116,104,70,105,110,100,101,114,78,
-    41,3,90,18,105,109,112,111,114,116,108,105,98,46,109,101,
-    116,97,100,97,116,97,114,92,1,0,0,218,18,102,105,110,
-    100,95,100,105,115,116,114,105,98,117,116,105,111,110,115,41,
-    3,114,144,0,0,0,114,145,0,0,0,114,92,1,0,0,
+    0,4,0,0,0,51,0,0,0,115,28,0,0,0,129,0,
+    124,0,93,9,125,1,136,0,100,0,124,1,23,0,107,2,
+    86,0,1,0,113,2,100,1,83,0,41,2,114,236,0,0,
+    0,78,114,7,0,0,0,169,2,114,5,0,0,0,218,6,
+    115,117,102,102,105,120,169,1,90,9,102,105,108,101,95,110,
+    97,109,101,114,7,0,0,0,114,8,0,0,0,114,9,0,
+    0,0,167,4,0,0,115,8,0,0,0,2,128,4,0,2,
+    1,20,255,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,60,103,101,
+    110,101,120,112,114,62,78,41,4,114,74,0,0,0,114,65,
+    0,0,0,218,3,97,110,121,114,232,0,0,0,114,247,0,
+    0,0,114,7,0,0,0,114,45,1,0,0,114,8,0,0,
+    0,114,206,0,0,0,164,4,0,0,115,8,0,0,0,14,
+    2,12,1,2,1,8,255,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,
+    0,0,0,0,2,0,0,0,1,0,0,0,67,0,0,0,
+    114,23,0,0,0,41,2,122,63,82,101,116,117,114,110,32,
+    78,111,110,101,32,97,115,32,97,110,32,101,120,116,101,110,
+    115,105,111,110,32,109,111,100,117,108,101,32,99,97,110,110,
+    111,116,32,99,114,101,97,116,101,32,97,32,99,111,100,101,
+    32,111,98,106,101,99,116,46,78,114,7,0,0,0,114,247,
+    0,0,0,114,7,0,0,0,114,7,0,0,0,114,8,0,
+    0,0,114,241,0,0,0,170,4,0,0,114,24,0,0,0,
+    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,0,0,0,0,2,0,0,0,1,
+    0,0,0,67,0,0,0,114,23,0,0,0,41,2,122,53,
+    82,101,116,117,114,110,32,78,111,110,101,32,97,115,32,101,
+    120,116,101,110,115,105,111,110,32,109,111,100,117,108,101,115,
+    32,104,97,118,101,32,110,111,32,115,111,117,114,99,101,32,
+    99,111,100,101,46,78,114,7,0,0,0,114,247,0,0,0,
     114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,114,
-    93,1,0,0,182,5,0,0,115,4,0,0,0,12,10,16,
-    1,122,29,80,97,116,104,70,105,110,100,101,114,46,102,105,
-    110,100,95,100,105,115,116,114,105,98,117,116,105,111,110,115,
-    114,69,0,0,0,114,230,0,0,0,41,14,114,150,0,0,
+    1,1,0,0,174,4,0,0,114,24,0,0,0,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,0,0,0,0,2,0,0,0,1,0,
+    0,0,67,0,0,0,114,26,1,0,0,114,27,1,0,0,
+    114,71,0,0,0,114,247,0,0,0,114,7,0,0,0,114,
+    7,0,0,0,114,8,0,0,0,114,203,0,0,0,178,4,
+    0,0,114,28,1,0,0,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,150,0,0,
     0,114,149,0,0,0,114,151,0,0,0,114,152,0,0,0,
-    114,233,0,0,0,114,78,1,0,0,114,84,1,0,0,114,
-    234,0,0,0,114,87,1,0,0,114,88,1,0,0,114,91,
-    1,0,0,114,226,0,0,0,114,229,0,0,0,114,93,1,
+    114,236,0,0,0,114,16,1,0,0,114,22,1,0,0,114,
+    239,0,0,0,114,245,0,0,0,114,206,0,0,0,114,241,
+    0,0,0,114,1,1,0,0,114,160,0,0,0,114,203,0,
     0,0,114,7,0,0,0,114,7,0,0,0,114,7,0,0,
-    0,114,8,0,0,0,114,77,1,0,0,40,5,0,0,115,
-    36,0,0,0,8,0,4,2,2,2,10,1,2,9,10,1,
-    2,12,10,1,2,21,10,1,2,20,12,1,2,31,12,1,
-    2,23,12,1,2,15,14,1,114,77,1,0,0,99,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,
-    0,0,64,0,0,0,115,90,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,101,6,90,7,100,6,100,7,132,
-    0,90,8,100,8,100,9,132,0,90,9,100,19,100,11,100,
-    12,132,1,90,10,100,13,100,14,132,0,90,11,101,12,100,
-    15,100,16,132,0,131,1,90,13,100,17,100,18,132,0,90,
-    14,100,10,83,0,41,20,218,10,70,105,108,101,70,105,110,
-    100,101,114,122,172,70,105,108,101,45,98,97,115,101,100,32,
-    102,105,110,100,101,114,46,10,10,32,32,32,32,73,110,116,
-    101,114,97,99,116,105,111,110,115,32,119,105,116,104,32,116,
-    104,101,32,102,105,108,101,32,115,121,115,116,101,109,32,97,
-    114,101,32,99,97,99,104,101,100,32,102,111,114,32,112,101,
-    114,102,111,114,109,97,110,99,101,44,32,98,101,105,110,103,
-    10,32,32,32,32,114,101,102,114,101,115,104,101,100,32,119,
-    104,101,110,32,116,104,101,32,100,105,114,101,99,116,111,114,
-    121,32,116,104,101,32,102,105,110,100,101,114,32,105,115,32,
-    104,97,110,100,108,105,110,103,32,104,97,115,32,98,101,101,
-    110,32,109,111,100,105,102,105,101,100,46,10,10,32,32,32,
-    32,99,2,0,0,0,0,0,0,0,0,0,0,0,5,0,
-    0,0,6,0,0,0,7,0,0,0,115,112,0,0,0,103,
-    0,125,3,124,2,68,0,93,16,92,2,137,0,125,4,124,
-    3,160,0,135,0,102,1,100,1,100,2,132,8,124,4,68,
-    0,131,1,161,1,1,0,113,4,124,3,124,0,95,1,124,
-    1,112,27,100,3,124,0,95,2,116,3,124,0,106,2,131,
-    1,115,43,116,4,116,5,160,6,161,0,124,0,106,2,131,
-    2,124,0,95,2,100,4,124,0,95,7,116,8,131,0,124,
-    0,95,9,116,8,131,0,124,0,95,10,100,5,83,0,41,
-    6,122,154,73,110,105,116,105,97,108,105,122,101,32,119,105,
-    116,104,32,116,104,101,32,112,97,116,104,32,116,111,32,115,
-    101,97,114,99,104,32,111,110,32,97,110,100,32,97,32,118,
-    97,114,105,97,98,108,101,32,110,117,109,98,101,114,32,111,
-    102,10,32,32,32,32,32,32,32,32,50,45,116,117,112,108,
-    101,115,32,99,111,110,116,97,105,110,105,110,103,32,116,104,
-    101,32,108,111,97,100,101,114,32,97,110,100,32,116,104,101,
-    32,102,105,108,101,32,115,117,102,102,105,120,101,115,32,116,
-    104,101,32,108,111,97,100,101,114,10,32,32,32,32,32,32,
-    32,32,114,101,99,111,103,110,105,122,101,115,46,99,1,0,
-    0,0,0,0,0,0,0,0,0,0,2,0,0,0,3,0,
-    0,0,51,0,0,0,115,24,0,0,0,129,0,124,0,93,
-    7,125,1,124,1,136,0,102,2,86,0,1,0,113,2,100,
-    0,83,0,114,69,0,0,0,114,7,0,0,0,114,43,1,
-    0,0,169,1,114,164,0,0,0,114,7,0,0,0,114,8,
-    0,0,0,114,9,0,0,0,211,5,0,0,115,4,0,0,
-    0,2,128,22,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,97,0,
-    0,0,114,130,0,0,0,78,41,11,114,191,0,0,0,218,
-    8,95,108,111,97,100,101,114,115,114,65,0,0,0,114,86,
-    0,0,0,114,67,0,0,0,114,18,0,0,0,114,82,0,
-    0,0,218,11,95,112,97,116,104,95,109,116,105,109,101,218,
-    3,115,101,116,218,11,95,112,97,116,104,95,99,97,99,104,
-    101,218,19,95,114,101,108,97,120,101,100,95,112,97,116,104,
-    95,99,97,99,104,101,41,5,114,143,0,0,0,114,65,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,212,0,0,0,
-    114,7,0,0,0,114,95,1,0,0,114,8,0,0,0,114,
-    236,0,0,0,205,5,0,0,115,20,0,0,0,4,4,12,
-    1,26,1,6,1,10,2,10,1,18,1,6,1,8,1,12,
-    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,0,0,0,0,0,0,
-    0,0,0,1,0,0,0,2,0,0,0,67,0,0,0,115,
-    10,0,0,0,100,1,124,0,95,0,100,2,83,0,41,3,
-    122,31,73,110,118,97,108,105,100,97,116,101,32,116,104,101,
-    32,100,105,114,101,99,116,111,114,121,32,109,116,105,109,101,
-    46,114,130,0,0,0,78,41,1,114,97,1,0,0,114,21,
-    1,0,0,114,7,0,0,0,114,7,0,0,0,114,8,0,
-    0,0,114,78,1,0,0,221,5,0,0,114,81,0,0,0,
-    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,114,8,0,0,0,114,30,1,0,0,131,4,0,0,115,
+    24,0,0,0,8,0,4,2,8,6,8,4,8,4,8,3,
+    8,8,8,6,8,6,8,4,2,4,14,1,114,30,1,0,
+    0,99,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,2,0,0,0,64,0,0,0,115,104,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,100,13,132,0,90,9,100,14,100,15,132,
+    0,90,10,100,16,100,17,132,0,90,11,100,18,100,19,132,
+    0,90,12,100,20,100,21,132,0,90,13,100,22,100,23,132,
+    0,90,14,100,24,83,0,41,25,218,14,95,78,97,109,101,
+    115,112,97,99,101,80,97,116,104,97,38,1,0,0,82,101,
+    112,114,101,115,101,110,116,115,32,97,32,110,97,109,101,115,
+    112,97,99,101,32,112,97,99,107,97,103,101,39,115,32,112,
+    97,116,104,46,32,32,73,116,32,117,115,101,115,32,116,104,
+    101,32,109,111,100,117,108,101,32,110,97,109,101,10,32,32,
+    32,32,116,111,32,102,105,110,100,32,105,116,115,32,112,97,
+    114,101,110,116,32,109,111,100,117,108,101,44,32,97,110,100,
+    32,102,114,111,109,32,116,104,101,114,101,32,105,116,32,108,
+    111,111,107,115,32,117,112,32,116,104,101,32,112,97,114,101,
+    110,116,39,115,10,32,32,32,32,95,95,112,97,116,104,95,
+    95,46,32,32,87,104,101,110,32,116,104,105,115,32,99,104,
+    97,110,103,101,115,44,32,116,104,101,32,109,111,100,117,108,
+    101,39,115,32,111,119,110,32,112,97,116,104,32,105,115,32,
+    114,101,99,111,109,112,117,116,101,100,44,10,32,32,32,32,
+    117,115,105,110,103,32,112,97,116,104,95,102,105,110,100,101,
+    114,46,32,32,70,111,114,32,116,111,112,45,108,101,118,101,
+    108,32,109,111,100,117,108,101,115,44,32,116,104,101,32,112,
+    97,114,101,110,116,32,109,111,100,117,108,101,39,115,32,112,
+    97,116,104,10,32,32,32,32,105,115,32,115,121,115,46,112,
+    97,116,104,46,99,4,0,0,0,0,0,0,0,0,0,0,
+    0,4,0,0,0,3,0,0,0,67,0,0,0,115,36,0,
+    0,0,124,1,124,0,95,0,124,2,124,0,95,1,116,2,
+    124,0,160,3,161,0,131,1,124,0,95,4,124,3,124,0,
+    95,5,100,0,83,0,114,69,0,0,0,41,6,218,5,95,
+    110,97,109,101,218,5,95,112,97,116,104,114,136,0,0,0,
+    218,16,95,103,101,116,95,112,97,114,101,110,116,95,112,97,
+    116,104,218,17,95,108,97,115,116,95,112,97,114,101,110,116,
+    95,112,97,116,104,218,12,95,112,97,116,104,95,102,105,110,
+    100,101,114,169,4,114,143,0,0,0,114,141,0,0,0,114,
+    65,0,0,0,90,11,112,97,116,104,95,102,105,110,100,101,
+    114,114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,
+    114,236,0,0,0,191,4,0,0,115,8,0,0,0,6,1,
+    6,1,14,1,10,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,0,0,0,0,4,0,0,0,
+    3,0,0,0,67,0,0,0,115,38,0,0,0,124,0,106,
+    0,160,1,100,1,161,1,92,3,125,1,125,2,125,3,124,
+    2,100,2,107,2,114,15,100,3,83,0,124,1,100,4,102,
+    2,83,0,41,6,122,62,82,101,116,117,114,110,115,32,97,
+    32,116,117,112,108,101,32,111,102,32,40,112,97,114,101,110,
+    116,45,109,111,100,117,108,101,45,110,97,109,101,44,32,112,
+    97,114,101,110,116,45,112,97,116,104,45,97,116,116,114,45,
+    110,97,109,101,41,114,97,0,0,0,114,10,0,0,0,41,
+    2,114,15,0,0,0,114,65,0,0,0,90,8,95,95,112,
+    97,116,104,95,95,78,41,2,114,48,1,0,0,114,104,0,
+    0,0,41,4,114,143,0,0,0,114,40,1,0,0,218,3,
+    100,111,116,90,2,109,101,114,7,0,0,0,114,7,0,0,
+    0,114,8,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,197,
+    4,0,0,115,8,0,0,0,18,2,8,1,4,2,8,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,110,97,109,101,115,99,1,0,0,0,0,0,0,
+    0,0,0,0,0,3,0,0,0,3,0,0,0,67,0,0,
+    0,115,28,0,0,0,124,0,160,0,161,0,92,2,125,1,
+    125,2,116,1,116,2,106,3,124,1,25,0,124,2,131,2,
+    83,0,114,69,0,0,0,41,4,114,55,1,0,0,114,155,
+    0,0,0,114,15,0,0,0,218,7,109,111,100,117,108,101,
+    115,41,3,114,143,0,0,0,90,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,7,0,0,
+    0,114,7,0,0,0,114,8,0,0,0,114,50,1,0,0,
+    207,4,0,0,115,4,0,0,0,12,1,16,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,0,0,0,0,3,0,0,0,4,
-    0,0,0,67,0,0,0,115,54,0,0,0,116,0,160,1,
-    100,1,116,2,161,2,1,0,124,0,160,3,124,1,161,1,
-    125,2,124,2,100,2,117,0,114,19,100,2,103,0,102,2,
-    83,0,124,2,106,4,124,2,106,5,112,25,103,0,102,2,
-    83,0,41,3,122,197,84,114,121,32,116,111,32,102,105,110,
-    100,32,97,32,108,111,97,100,101,114,32,102,111,114,32,116,
-    104,101,32,115,112,101,99,105,102,105,101,100,32,109,111,100,
-    117,108,101,44,32,111,114,32,116,104,101,32,110,97,109,101,
-    115,112,97,99,101,10,32,32,32,32,32,32,32,32,112,97,
-    99,107,97,103,101,32,112,111,114,116,105,111,110,115,46,32,
-    82,101,116,117,114,110,115,32,40,108,111,97,100,101,114,44,
-    32,108,105,115,116,45,111,102,45,112,111,114,116,105,111,110,
-    115,41,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,122,101,70,105,108,
-    101,70,105,110,100,101,114,46,102,105,110,100,95,108,111,97,
-    100,101,114,40,41,32,105,115,32,100,101,112,114,101,99,97,
-    116,101,100,32,97,110,100,32,115,108,97,116,101,100,32,102,
-    111,114,32,114,101,109,111,118,97,108,32,105,110,32,80,121,
-    116,104,111,110,32,51,46,49,50,59,32,117,115,101,32,102,
-    105,110,100,95,115,112,101,99,40,41,32,105,110,115,116,101,
-    97,100,78,41,6,114,99,0,0,0,114,100,0,0,0,114,
-    101,0,0,0,114,226,0,0,0,114,164,0,0,0,114,202,
-    0,0,0,41,3,114,143,0,0,0,114,163,0,0,0,114,
+    0,0,0,67,0,0,0,115,80,0,0,0,116,0,124,0,
+    160,1,161,0,131,1,125,1,124,1,124,0,106,2,107,3,
+    114,37,124,0,160,3,124,0,106,4,124,1,161,2,125,2,
+    124,2,100,0,117,1,114,34,124,2,106,5,100,0,117,0,
+    114,34,124,2,106,6,114,34,124,2,106,6,124,0,95,7,
+    124,1,124,0,95,2,124,0,106,7,83,0,114,69,0,0,
+    0,41,8,114,136,0,0,0,114,50,1,0,0,114,51,1,
+    0,0,114,52,1,0,0,114,48,1,0,0,114,164,0,0,
+    0,114,202,0,0,0,114,49,1,0,0,41,3,114,143,0,
+    0,0,90,11,112,97,114,101,110,116,95,112,97,116,104,114,
     210,0,0,0,114,7,0,0,0,114,7,0,0,0,114,8,
-    0,0,0,114,161,0,0,0,227,5,0,0,115,14,0,0,
-    0,6,7,2,2,4,254,10,3,8,1,8,1,16,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,
-    0,0,0,0,7,0,0,0,6,0,0,0,67,0,0,0,
-    115,26,0,0,0,124,1,124,2,124,3,131,2,125,6,116,
-    0,124,2,124,3,124,6,124,4,100,1,141,4,83,0,41,
-    2,78,114,201,0,0,0,41,1,114,213,0,0,0,41,7,
-    114,143,0,0,0,114,211,0,0,0,114,163,0,0,0,114,
-    65,0,0,0,90,4,115,109,115,108,114,225,0,0,0,114,
-    164,0,0,0,114,7,0,0,0,114,7,0,0,0,114,8,
-    0,0,0,114,91,1,0,0,242,5,0,0,115,8,0,0,
-    0,10,1,8,1,2,1,6,255,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,0,0,0,0,14,0,0,
-    0,9,0,0,0,67,0,0,0,115,120,1,0,0,100,1,
-    125,3,124,1,160,0,100,2,161,1,100,3,25,0,125,4,
-    122,12,116,1,124,0,106,2,112,17,116,3,160,4,161,0,
-    131,1,106,5,125,5,87,0,110,9,4,0,116,6,121,187,
-    1,0,1,0,1,0,100,4,125,5,89,0,124,5,124,0,
-    106,7,107,3,114,43,124,0,160,8,161,0,1,0,124,5,
-    124,0,95,7,116,9,131,0,114,54,124,0,106,10,125,6,
-    124,4,160,11,161,0,125,7,110,5,124,0,106,12,125,6,
-    124,4,125,7,124,7,124,6,118,0,114,106,116,13,124,0,
-    106,2,124,4,131,2,125,8,124,0,106,14,68,0,93,29,
-    92,2,125,9,125,10,100,5,124,9,23,0,125,11,116,13,
-    124,8,124,11,131,2,125,12,116,15,124,12,131,1,114,101,
-    124,0,160,16,124,10,124,1,124,12,124,8,103,1,124,2,
-    161,5,2,0,1,0,83,0,113,72,116,17,124,8,131,1,
-    125,3,124,0,106,14,68,0,93,54,92,2,125,9,125,10,
-    122,10,116,13,124,0,106,2,124,4,124,9,23,0,131,2,
-    125,12,87,0,110,10,4,0,116,18,121,186,1,0,1,0,
-    1,0,89,0,1,0,100,6,83,0,116,19,106,20,100,7,
+    0,0,0,218,12,95,114,101,99,97,108,99,117,108,97,116,
+    101,211,4,0,0,115,16,0,0,0,12,2,10,1,14,1,
+    18,3,6,1,8,1,6,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,0,
+    0,0,0,0,1,0,0,0,3,0,0,0,67,0,0,0,
+    243,12,0,0,0,116,0,124,0,160,1,161,0,131,1,83,
+    0,114,69,0,0,0,41,2,218,4,105,116,101,114,114,57,
+    1,0,0,114,21,1,0,0,114,7,0,0,0,114,7,0,
+    0,0,114,8,0,0,0,218,8,95,95,105,116,101,114,95,
+    95,224,4,0,0,243,2,0,0,0,12,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,2,0,0,0,0,0,0,0,0,0,
+    0,0,2,0,0,0,2,0,0,0,67,0,0,0,115,12,
+    0,0,0,124,0,160,0,161,0,124,1,25,0,83,0,114,
+    69,0,0,0,169,1,114,57,1,0,0,41,2,114,143,0,
+    0,0,218,5,105,110,100,101,120,114,7,0,0,0,114,7,
+    0,0,0,114,8,0,0,0,218,11,95,95,103,101,116,105,
+    116,101,109,95,95,227,4,0,0,114,61,1,0,0,122,26,
+    95,78,97,109,101,115,112,97,99,101,80,97,116,104,46,95,
+    95,103,101,116,105,116,101,109,95,95,99,3,0,0,0,0,
+    0,0,0,0,0,0,0,3,0,0,0,3,0,0,0,67,
+    0,0,0,115,14,0,0,0,124,2,124,0,106,0,124,1,
+    60,0,100,0,83,0,114,69,0,0,0,41,1,114,49,1,
+    0,0,41,3,114,143,0,0,0,114,63,1,0,0,114,65,
+    0,0,0,114,7,0,0,0,114,7,0,0,0,114,8,0,
+    0,0,218,11,95,95,115,101,116,105,116,101,109,95,95,230,
+    4,0,0,115,2,0,0,0,14,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,0,
+    0,0,0,1,0,0,0,3,0,0,0,67,0,0,0,114,
+    58,1,0,0,114,69,0,0,0,41,2,114,4,0,0,0,
+    114,57,1,0,0,114,21,1,0,0,114,7,0,0,0,114,
+    7,0,0,0,114,8,0,0,0,218,7,95,95,108,101,110,
+    95,95,233,4,0,0,114,61,1,0,0,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,0,0,0,0,
+    1,0,0,0,3,0,0,0,67,0,0,0,243,12,0,0,
+    0,100,1,160,0,124,0,106,1,161,1,83,0,41,2,78,
+    122,20,95,78,97,109,101,115,112,97,99,101,80,97,116,104,
+    40,123,33,114,125,41,41,2,114,89,0,0,0,114,49,1,
+    0,0,114,21,1,0,0,114,7,0,0,0,114,7,0,0,
+    0,114,8,0,0,0,218,8,95,95,114,101,112,114,95,95,
+    236,4,0,0,114,61,1,0,0,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,0,0,0,0,2,
+    0,0,0,3,0,0,0,67,0,0,0,115,12,0,0,0,
+    124,1,124,0,160,0,161,0,118,0,83,0,114,69,0,0,
+    0,114,62,1,0,0,169,2,114,143,0,0,0,218,4,105,
+    116,101,109,114,7,0,0,0,114,7,0,0,0,114,8,0,
+    0,0,218,12,95,95,99,111,110,116,97,105,110,115,95,95,
+    239,4,0,0,114,61,1,0,0,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,0,
+    0,0,0,2,0,0,0,3,0,0,0,67,0,0,0,115,
+    16,0,0,0,124,0,106,0,160,1,124,1,161,1,1,0,
+    100,0,83,0,114,69,0,0,0,41,2,114,49,1,0,0,
+    114,61,0,0,0,114,69,1,0,0,114,7,0,0,0,114,
+    7,0,0,0,114,8,0,0,0,114,61,0,0,0,242,4,
+    0,0,243,2,0,0,0,16,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,15,114,150,0,0,0,114,149,0,0,0,114,151,0,
+    0,0,114,152,0,0,0,114,236,0,0,0,114,55,1,0,
+    0,114,50,1,0,0,114,57,1,0,0,114,60,1,0,0,
+    114,64,1,0,0,114,65,1,0,0,114,66,1,0,0,114,
+    68,1,0,0,114,71,1,0,0,114,61,0,0,0,114,7,
+    0,0,0,114,7,0,0,0,114,7,0,0,0,114,8,0,
+    0,0,114,47,1,0,0,184,4,0,0,115,26,0,0,0,
+    8,0,4,1,8,6,8,6,8,10,8,4,8,13,8,3,
+    8,3,8,3,8,3,8,3,12,3,114,47,1,0,0,99,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    3,0,0,0,64,0,0,0,115,88,0,0,0,101,0,90,
+    1,100,0,90,2,100,1,100,2,132,0,90,3,101,4,100,
+    3,100,4,132,0,131,1,90,5,100,5,100,6,132,0,90,
+    6,100,7,100,8,132,0,90,7,100,9,100,10,132,0,90,
+    8,100,11,100,12,132,0,90,9,100,13,100,14,132,0,90,
+    10,100,15,100,16,132,0,90,11,100,17,100,18,132,0,90,
+    12,100,19,83,0,41,20,218,16,95,78,97,109,101,115,112,
+    97,99,101,76,111,97,100,101,114,99,4,0,0,0,0,0,
+    0,0,0,0,0,0,4,0,0,0,4,0,0,0,67,0,
+    0,0,115,18,0,0,0,116,0,124,1,124,2,124,3,131,
+    3,124,0,95,1,100,0,83,0,114,69,0,0,0,41,2,
+    114,47,1,0,0,114,49,1,0,0,114,53,1,0,0,114,
+    7,0,0,0,114,7,0,0,0,114,8,0,0,0,114,236,
+    0,0,0,248,4,0,0,115,2,0,0,0,18,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,1,0,0,0,0,0,
+    0,0,0,0,0,0,1,0,0,0,4,0,0,0,67,0,
+    0,0,115,24,0,0,0,116,0,160,1,100,1,116,2,161,
+    2,1,0,100,2,160,3,124,0,106,4,161,1,83,0,41,
+    4,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,82,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,40,41,32,105,115,32,100,101,112,114,101,99,
+    97,116,101,100,32,97,110,100,32,115,108,97,116,101,100,32,
+    102,111,114,32,114,101,109,111,118,97,108,32,105,110,32,80,
+    121,116,104,111,110,32,51,46,49,50,122,25,60,109,111,100,
+    117,108,101,32,123,33,114,125,32,40,110,97,109,101,115,112,
+    97,99,101,41,62,78,41,5,114,99,0,0,0,114,100,0,
+    0,0,114,101,0,0,0,114,89,0,0,0,114,150,0,0,
+    0,41,1,114,244,0,0,0,114,7,0,0,0,114,7,0,
+    0,0,114,8,0,0,0,218,11,109,111,100,117,108,101,95,
+    114,101,112,114,251,4,0,0,115,8,0,0,0,6,7,2,
+    1,4,255,12,2,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,0,0,0,0,
+    2,0,0,0,1,0,0,0,67,0,0,0,114,23,0,0,
+    0,41,2,78,84,114,7,0,0,0,114,247,0,0,0,114,
+    7,0,0,0,114,7,0,0,0,114,8,0,0,0,114,206,
+    0,0,0,6,5,0,0,243,2,0,0,0,4,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,0,0,0,0,2,0,0,0,1,0,0,0,
+    67,0,0,0,114,23,0,0,0,41,2,78,114,10,0,0,
+    0,114,7,0,0,0,114,247,0,0,0,114,7,0,0,0,
+    114,7,0,0,0,114,8,0,0,0,114,1,1,0,0,9,
+    5,0,0,114,75,1,0,0,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,0,0,
+    0,0,2,0,0,0,6,0,0,0,67,0,0,0,115,16,
+    0,0,0,116,0,100,1,100,2,100,3,100,4,100,5,141,
+    4,83,0,41,6,78,114,10,0,0,0,122,8,60,115,116,
+    114,105,110,103,62,114,243,0,0,0,84,41,1,114,3,1,
+    0,0,41,1,114,4,1,0,0,114,247,0,0,0,114,7,
+    0,0,0,114,7,0,0,0,114,8,0,0,0,114,241,0,
+    0,0,12,5,0,0,114,72,1,0,0,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,0,
+    0,0,0,2,0,0,0,1,0,0,0,67,0,0,0,114,
+    23,0,0,0,114,237,0,0,0,114,7,0,0,0,114,238,
+    0,0,0,114,7,0,0,0,114,7,0,0,0,114,8,0,
+    0,0,114,239,0,0,0,15,5,0,0,114,240,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,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,114,69,0,0,0,114,7,0,0,0,114,42,1,0,
+    0,114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,
+    114,245,0,0,0,18,5,0,0,114,75,1,0,0,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,0,0,0,0,2,0,0,0,4,0,0,
+    0,67,0,0,0,115,26,0,0,0,116,0,160,1,100,1,
+    124,0,106,2,161,2,1,0,116,0,160,3,124,0,124,1,
+    161,2,83,0,41,3,122,98,76,111,97,100,32,97,32,110,
+    97,109,101,115,112,97,99,101,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,122,38,110,97,109,101,
+    115,112,97,99,101,32,109,111,100,117,108,101,32,108,111,97,
+    100,101,100,32,119,105,116,104,32,112,97,116,104,32,123,33,
+    114,125,78,41,4,114,159,0,0,0,114,173,0,0,0,114,
+    49,1,0,0,114,246,0,0,0,114,247,0,0,0,114,7,
+    0,0,0,114,7,0,0,0,114,8,0,0,0,114,248,0,
+    0,0,21,5,0,0,115,8,0,0,0,6,7,4,1,4,
+    255,12,3,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,99,2,0,0,0,0,0,0,0,0,0,0,0,3,0,
+    0,0,2,0,0,0,67,0,0,0,115,22,0,0,0,100,
+    1,100,2,108,0,109,1,125,2,1,0,124,2,124,0,106,
+    2,131,1,83,0,41,3,78,114,0,0,0,0,41,1,218,
+    15,78,97,109,101,115,112,97,99,101,82,101,97,100,101,114,
+    41,3,114,32,1,0,0,114,76,1,0,0,114,49,1,0,
+    0,41,3,114,143,0,0,0,114,244,0,0,0,114,76,1,
+    0,0,114,7,0,0,0,114,7,0,0,0,114,8,0,0,
+    0,114,33,1,0,0,33,5,0,0,115,4,0,0,0,12,
+    1,10,1,122,36,95,78,97,109,101,115,112,97,99,101,76,
+    111,97,100,101,114,46,103,101,116,95,114,101,115,111,117,114,
+    99,101,95,114,101,97,100,101,114,78,41,13,114,150,0,0,
+    0,114,149,0,0,0,114,151,0,0,0,114,236,0,0,0,
+    114,233,0,0,0,114,74,1,0,0,114,206,0,0,0,114,
+    1,1,0,0,114,241,0,0,0,114,239,0,0,0,114,245,
+    0,0,0,114,248,0,0,0,114,33,1,0,0,114,7,0,
+    0,0,114,7,0,0,0,114,7,0,0,0,114,8,0,0,
+    0,114,73,1,0,0,247,4,0,0,115,22,0,0,0,8,
+    0,8,1,2,3,10,1,8,10,8,3,8,3,8,3,8,
+    3,8,3,12,12,114,73,1,0,0,99,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,64,
+    0,0,0,115,118,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,4,100,4,100,5,132,0,131,1,90,6,101,7,100,6,
+    100,7,132,0,131,1,90,8,101,7,100,8,100,9,132,0,
+    131,1,90,9,101,7,100,19,100,11,100,12,132,1,131,1,
+    90,10,101,7,100,20,100,13,100,14,132,1,131,1,90,11,
+    101,7,100,19,100,15,100,16,132,1,131,1,90,12,101,4,
+    100,17,100,18,132,0,131,1,90,13,100,10,83,0,41,21,
+    218,10,80,97,116,104,70,105,110,100,101,114,122,62,77,101,
+    116,97,32,112,97,116,104,32,102,105,110,100,101,114,32,102,
+    111,114,32,115,121,115,46,112,97,116,104,32,97,110,100,32,
+    112,97,99,107,97,103,101,32,95,95,112,97,116,104,95,95,
+    32,97,116,116,114,105,98,117,116,101,115,46,99,0,0,0,
+    0,0,0,0,0,0,0,0,0,2,0,0,0,4,0,0,
+    0,67,0,0,0,115,64,0,0,0,116,0,116,1,106,2,
+    160,3,161,0,131,1,68,0,93,22,92,2,125,0,125,1,
+    124,1,100,1,117,0,114,20,116,1,106,2,124,0,61,0,
+    113,7,116,4,124,1,100,2,131,2,114,29,124,1,160,5,
+    161,0,1,0,113,7,100,1,83,0,41,3,122,125,67,97,
+    108,108,32,116,104,101,32,105,110,118,97,108,105,100,97,116,
+    101,95,99,97,99,104,101,115,40,41,32,109,101,116,104,111,
+    100,32,111,110,32,97,108,108,32,112,97,116,104,32,101,110,
+    116,114,121,32,102,105,110,100,101,114,115,10,32,32,32,32,
+    32,32,32,32,115,116,111,114,101,100,32,105,110,32,115,121,
+    115,46,112,97,116,104,95,105,109,112,111,114,116,101,114,95,
+    99,97,99,104,101,115,32,40,119,104,101,114,101,32,105,109,
+    112,108,101,109,101,110,116,101,100,41,46,78,218,17,105,110,
+    118,97,108,105,100,97,116,101,95,99,97,99,104,101,115,41,
+    6,218,4,108,105,115,116,114,15,0,0,0,218,19,112,97,
+    116,104,95,105,109,112,111,114,116,101,114,95,99,97,99,104,
+    101,218,5,105,116,101,109,115,114,153,0,0,0,114,78,1,
+    0,0,41,2,114,141,0,0,0,218,6,102,105,110,100,101,
+    114,114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,
+    114,78,1,0,0,44,5,0,0,115,14,0,0,0,22,4,
+    8,1,10,1,10,1,8,1,2,128,4,252,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,1,0,0,0,0,
+    0,0,0,0,0,0,0,2,0,0,0,9,0,0,0,67,
+    0,0,0,115,76,0,0,0,116,0,106,1,100,1,117,1,
+    114,14,116,0,106,1,115,14,116,2,160,3,100,2,116,4,
+    161,2,1,0,116,0,106,1,68,0,93,18,125,1,122,7,
+    124,1,124,0,131,1,87,0,2,0,1,0,83,0,4,0,
+    116,5,121,35,1,0,1,0,1,0,89,0,113,17,119,0,
+    100,1,83,0,41,3,122,46,83,101,97,114,99,104,32,115,
+    121,115,46,112,97,116,104,95,104,111,111,107,115,32,102,111,
+    114,32,97,32,102,105,110,100,101,114,32,102,111,114,32,39,
+    112,97,116,104,39,46,78,122,23,115,121,115,46,112,97,116,
+    104,95,104,111,111,107,115,32,105,115,32,101,109,112,116,121,
+    41,6,114,15,0,0,0,218,10,112,97,116,104,95,104,111,
+    111,107,115,114,99,0,0,0,114,100,0,0,0,114,162,0,
+    0,0,114,142,0,0,0,41,2,114,65,0,0,0,90,4,
+    104,111,111,107,114,7,0,0,0,114,7,0,0,0,114,8,
+    0,0,0,218,11,95,112,97,116,104,95,104,111,111,107,115,
+    54,5,0,0,115,18,0,0,0,16,3,12,1,10,1,2,
+    1,14,1,12,1,4,1,2,255,4,3,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,0,0,0,0,
+    3,0,0,0,8,0,0,0,67,0,0,0,115,100,0,0,
+    0,124,1,100,1,107,2,114,21,122,6,116,0,160,1,161,
+    0,125,1,87,0,110,10,4,0,116,2,121,20,1,0,1,
+    0,1,0,89,0,100,2,83,0,119,0,122,8,116,3,106,
+    4,124,1,25,0,125,2,87,0,124,2,83,0,4,0,116,
+    5,121,49,1,0,1,0,1,0,124,0,160,6,124,1,161,
+    1,125,2,124,2,116,3,106,4,124,1,60,0,89,0,124,
+    2,83,0,119,0,41,3,122,210,71,101,116,32,116,104,101,
+    32,102,105,110,100,101,114,32,102,111,114,32,116,104,101,32,
+    112,97,116,104,32,101,110,116,114,121,32,102,114,111,109,32,
+    115,121,115,46,112,97,116,104,95,105,109,112,111,114,116,101,
+    114,95,99,97,99,104,101,46,10,10,32,32,32,32,32,32,
+    32,32,73,102,32,116,104,101,32,112,97,116,104,32,101,110,
+    116,114,121,32,105,115,32,110,111,116,32,105,110,32,116,104,
+    101,32,99,97,99,104,101,44,32,102,105,110,100,32,116,104,
+    101,32,97,112,112,114,111,112,114,105,97,116,101,32,102,105,
+    110,100,101,114,10,32,32,32,32,32,32,32,32,97,110,100,
+    32,99,97,99,104,101,32,105,116,46,32,73,102,32,110,111,
+    32,102,105,110,100,101,114,32,105,115,32,97,118,97,105,108,
+    97,98,108,101,44,32,115,116,111,114,101,32,78,111,110,101,
+    46,10,10,32,32,32,32,32,32,32,32,114,10,0,0,0,
+    78,41,7,114,18,0,0,0,114,82,0,0,0,218,17,70,
+    105,108,101,78,111,116,70,111,117,110,100,69,114,114,111,114,
+    114,15,0,0,0,114,80,1,0,0,218,8,75,101,121,69,
+    114,114,111,114,114,84,1,0,0,41,3,114,221,0,0,0,
+    114,65,0,0,0,114,82,1,0,0,114,7,0,0,0,114,
+    7,0,0,0,114,8,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,67,
+    5,0,0,115,28,0,0,0,8,8,2,1,12,1,12,1,
+    6,3,2,253,2,4,12,1,4,4,12,253,10,1,12,1,
+    4,1,2,253,122,31,80,97,116,104,70,105,110,100,101,114,
+    46,95,112,97,116,104,95,105,109,112,111,114,116,101,114,95,
+    99,97,99,104,101,99,3,0,0,0,0,0,0,0,0,0,
+    0,0,7,0,0,0,4,0,0,0,67,0,0,0,115,138,
+    0,0,0,116,0,124,2,100,1,131,2,114,27,116,1,160,
+    2,124,2,161,1,155,0,100,2,157,2,125,3,116,3,160,
+    4,124,3,116,5,161,2,1,0,124,2,160,6,124,1,161,
+    1,92,2,125,4,125,5,110,21,116,1,160,2,124,2,161,
+    1,155,0,100,3,157,2,125,3,116,3,160,4,124,3,116,
+    5,161,2,1,0,124,2,160,7,124,1,161,1,125,4,103,
+    0,125,5,124,4,100,0,117,1,114,58,116,1,160,8,124,
+    1,124,4,161,2,83,0,116,1,160,9,124,1,100,0,161,
+    2,125,6,124,5,124,6,95,10,124,6,83,0,41,4,78,
+    114,161,0,0,0,122,53,46,102,105,110,100,95,115,112,101,
+    99,40,41,32,110,111,116,32,102,111,117,110,100,59,32,102,
+    97,108,108,105,110,103,32,98,97,99,107,32,116,111,32,102,
+    105,110,100,95,108,111,97,100,101,114,40,41,122,53,46,102,
+    105,110,100,95,115,112,101,99,40,41,32,110,111,116,32,102,
+    111,117,110,100,59,32,102,97,108,108,105,110,103,32,98,97,
+    99,107,32,116,111,32,102,105,110,100,95,109,111,100,117,108,
+    101,40,41,41,11,114,153,0,0,0,114,159,0,0,0,90,
+    12,95,111,98,106,101,99,116,95,110,97,109,101,114,99,0,
+    0,0,114,100,0,0,0,114,162,0,0,0,114,161,0,0,
+    0,114,229,0,0,0,114,224,0,0,0,114,207,0,0,0,
+    114,202,0,0,0,41,7,114,221,0,0,0,114,163,0,0,
+    0,114,82,1,0,0,114,166,0,0,0,114,164,0,0,0,
+    114,165,0,0,0,114,210,0,0,0,114,7,0,0,0,114,
+    7,0,0,0,114,8,0,0,0,218,16,95,108,101,103,97,
+    99,121,95,103,101,116,95,115,112,101,99,89,5,0,0,115,
+    26,0,0,0,10,4,16,1,12,2,16,1,16,2,12,2,
+    10,1,4,1,8,1,12,1,12,1,6,1,4,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,0,
+    0,0,0,0,0,0,0,0,0,9,0,0,0,5,0,0,
+    0,67,0,0,0,115,166,0,0,0,103,0,125,4,124,2,
+    68,0,93,67,125,5,116,0,124,5,116,1,116,2,102,2,
+    131,2,115,14,113,4,124,0,160,3,124,5,161,1,125,6,
+    124,6,100,1,117,1,114,71,116,4,124,6,100,2,131,2,
+    114,35,124,6,160,5,124,1,124,3,161,2,125,7,110,6,
+    124,0,160,6,124,1,124,6,161,2,125,7,124,7,100,1,
+    117,0,114,46,113,4,124,7,106,7,100,1,117,1,114,55,
+    124,7,2,0,1,0,83,0,124,7,106,8,125,8,124,8,
+    100,1,117,0,114,66,116,9,100,3,131,1,130,1,124,4,
+    160,10,124,8,161,1,1,0,113,4,116,11,160,12,124,1,
+    100,1,161,2,125,7,124,4,124,7,95,8,124,7,83,0,
+    41,4,122,63,70,105,110,100,32,116,104,101,32,108,111,97,
+    100,101,114,32,111,114,32,110,97,109,101,115,112,97,99,101,
+    95,112,97,116,104,32,102,111,114,32,116,104,105,115,32,109,
+    111,100,117,108,101,47,112,97,99,107,97,103,101,32,110,97,
+    109,101,46,78,114,226,0,0,0,122,19,115,112,101,99,32,
+    109,105,115,115,105,110,103,32,108,111,97,100,101,114,41,13,
+    114,185,0,0,0,114,109,0,0,0,218,5,98,121,116,101,
+    115,114,87,1,0,0,114,153,0,0,0,114,226,0,0,0,
+    114,88,1,0,0,114,164,0,0,0,114,202,0,0,0,114,
+    142,0,0,0,114,191,0,0,0,114,159,0,0,0,114,207,
+    0,0,0,41,9,114,221,0,0,0,114,163,0,0,0,114,
+    65,0,0,0,114,225,0,0,0,218,14,110,97,109,101,115,
+    112,97,99,101,95,112,97,116,104,90,5,101,110,116,114,121,
+    114,82,1,0,0,114,210,0,0,0,114,165,0,0,0,114,
+    7,0,0,0,114,7,0,0,0,114,8,0,0,0,218,9,
+    95,103,101,116,95,115,112,101,99,110,5,0,0,115,42,0,
+    0,0,4,5,8,1,14,1,2,1,10,1,8,1,10,1,
+    14,1,12,2,8,1,2,1,10,1,8,1,6,1,8,1,
+    8,1,10,5,2,128,12,2,6,1,4,1,122,20,80,97,
+    116,104,70,105,110,100,101,114,46,95,103,101,116,95,115,112,
+    101,99,99,4,0,0,0,0,0,0,0,0,0,0,0,6,
+    0,0,0,5,0,0,0,67,0,0,0,115,94,0,0,0,
+    124,2,100,1,117,0,114,7,116,0,106,1,125,2,124,0,
+    160,2,124,1,124,2,124,3,161,3,125,4,124,4,100,1,
+    117,0,114,20,100,1,83,0,124,4,106,3,100,1,117,0,
+    114,45,124,4,106,4,125,5,124,5,114,43,100,1,124,4,
+    95,5,116,6,124,1,124,5,124,0,106,2,131,3,124,4,
+    95,4,124,4,83,0,100,1,83,0,124,4,83,0,41,2,
+    122,141,84,114,121,32,116,111,32,102,105,110,100,32,97,32,
+    115,112,101,99,32,102,111,114,32,39,102,117,108,108,110,97,
+    109,101,39,32,111,110,32,115,121,115,46,112,97,116,104,32,
+    111,114,32,39,112,97,116,104,39,46,10,10,32,32,32,32,
+    32,32,32,32,84,104,101,32,115,101,97,114,99,104,32,105,
+    115,32,98,97,115,101,100,32,111,110,32,115,121,115,46,112,
+    97,116,104,95,104,111,111,107,115,32,97,110,100,32,115,121,
+    115,46,112,97,116,104,95,105,109,112,111,114,116,101,114,95,
+    99,97,99,104,101,46,10,32,32,32,32,32,32,32,32,78,
+    41,7,114,15,0,0,0,114,65,0,0,0,114,91,1,0,
+    0,114,164,0,0,0,114,202,0,0,0,114,205,0,0,0,
+    114,47,1,0,0,41,6,114,221,0,0,0,114,163,0,0,
+    0,114,65,0,0,0,114,225,0,0,0,114,210,0,0,0,
+    114,90,1,0,0,114,7,0,0,0,114,7,0,0,0,114,
+    8,0,0,0,114,226,0,0,0,142,5,0,0,115,26,0,
+    0,0,8,6,6,1,14,1,8,1,4,1,10,1,6,1,
+    4,1,6,3,16,1,4,1,4,2,4,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,0,0,0,0,0,0,0,0,0,0,0,4,
+    0,0,0,4,0,0,0,67,0,0,0,115,42,0,0,0,
+    116,0,160,1,100,1,116,2,161,2,1,0,124,0,160,3,
+    124,1,124,2,161,2,125,3,124,3,100,2,117,0,114,18,
+    100,2,83,0,124,3,106,4,83,0,41,3,122,170,102,105,
+    110,100,32,116,104,101,32,109,111,100,117,108,101,32,111,110,
+    32,115,121,115,46,112,97,116,104,32,111,114,32,39,112,97,
+    116,104,39,32,98,97,115,101,100,32,111,110,32,115,121,115,
+    46,112,97,116,104,95,104,111,111,107,115,32,97,110,100,10,
+    32,32,32,32,32,32,32,32,115,121,115,46,112,97,116,104,
+    95,105,109,112,111,114,116,101,114,95,99,97,99,104,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,122,101,80,97,116,104,70,105,
+    110,100,101,114,46,102,105,110,100,95,109,111,100,117,108,101,
+    40,41,32,105,115,32,100,101,112,114,101,99,97,116,101,100,
+    32,97,110,100,32,115,108,97,116,101,100,32,102,111,114,32,
+    114,101,109,111,118,97,108,32,105,110,32,80,121,116,104,111,
+    110,32,51,46,49,50,59,32,117,115,101,32,102,105,110,100,
+    95,115,112,101,99,40,41,32,105,110,115,116,101,97,100,78,
+    114,227,0,0,0,114,228,0,0,0,114,7,0,0,0,114,
+    7,0,0,0,114,8,0,0,0,114,229,0,0,0,166,5,
+    0,0,115,14,0,0,0,6,8,2,2,4,254,12,3,8,
+    1,4,1,6,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,99,0,0,
+    0,0,0,0,0,0,0,0,0,0,3,0,0,0,4,0,
+    0,0,79,0,0,0,115,28,0,0,0,100,1,100,2,108,
+    0,109,1,125,2,1,0,124,2,106,2,124,0,105,0,124,
+    1,164,1,142,1,83,0,41,4,97,32,1,0,0,10,32,
+    32,32,32,32,32,32,32,70,105,110,100,32,100,105,115,116,
+    114,105,98,117,116,105,111,110,115,46,10,10,32,32,32,32,
+    32,32,32,32,82,101,116,117,114,110,32,97,110,32,105,116,
+    101,114,97,98,108,101,32,111,102,32,97,108,108,32,68,105,
+    115,116,114,105,98,117,116,105,111,110,32,105,110,115,116,97,
+    110,99,101,115,32,99,97,112,97,98,108,101,32,111,102,10,
+    32,32,32,32,32,32,32,32,108,111,97,100,105,110,103,32,
+    116,104,101,32,109,101,116,97,100,97,116,97,32,102,111,114,
+    32,112,97,99,107,97,103,101,115,32,109,97,116,99,104,105,
+    110,103,32,96,96,99,111,110,116,101,120,116,46,110,97,109,
+    101,96,96,10,32,32,32,32,32,32,32,32,40,111,114,32,
+    97,108,108,32,110,97,109,101,115,32,105,102,32,96,96,78,
+    111,110,101,96,96,32,105,110,100,105,99,97,116,101,100,41,
+    32,97,108,111,110,103,32,116,104,101,32,112,97,116,104,115,
+    32,105,110,32,116,104,101,32,108,105,115,116,10,32,32,32,
+    32,32,32,32,32,111,102,32,100,105,114,101,99,116,111,114,
+    105,101,115,32,96,96,99,111,110,116,101,120,116,46,112,97,
+    116,104,96,96,46,10,32,32,32,32,32,32,32,32,114,0,
+    0,0,0,41,1,218,18,77,101,116,97,100,97,116,97,80,
+    97,116,104,70,105,110,100,101,114,78,41,3,90,18,105,109,
+    112,111,114,116,108,105,98,46,109,101,116,97,100,97,116,97,
+    114,92,1,0,0,218,18,102,105,110,100,95,100,105,115,116,
+    114,105,98,117,116,105,111,110,115,41,3,114,144,0,0,0,
+    114,145,0,0,0,114,92,1,0,0,114,7,0,0,0,114,
+    7,0,0,0,114,8,0,0,0,114,93,1,0,0,182,5,
+    0,0,115,4,0,0,0,12,10,16,1,122,29,80,97,116,
+    104,70,105,110,100,101,114,46,102,105,110,100,95,100,105,115,
+    116,114,105,98,117,116,105,111,110,115,114,69,0,0,0,114,
+    230,0,0,0,41,14,114,150,0,0,0,114,149,0,0,0,
+    114,151,0,0,0,114,152,0,0,0,114,233,0,0,0,114,
+    78,1,0,0,114,84,1,0,0,114,234,0,0,0,114,87,
+    1,0,0,114,88,1,0,0,114,91,1,0,0,114,226,0,
+    0,0,114,229,0,0,0,114,93,1,0,0,114,7,0,0,
+    0,114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,
+    114,77,1,0,0,40,5,0,0,115,36,0,0,0,8,0,
+    4,2,2,2,10,1,2,9,10,1,2,12,10,1,2,21,
+    10,1,2,20,12,1,2,31,12,1,2,23,12,1,2,15,
+    14,1,114,77,1,0,0,99,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,3,0,0,0,64,0,0,0,
+    115,90,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,101,6,90,7,100,6,100,7,132,0,90,8,100,8,100,
+    9,132,0,90,9,100,19,100,11,100,12,132,1,90,10,100,
+    13,100,14,132,0,90,11,101,12,100,15,100,16,132,0,131,
+    1,90,13,100,17,100,18,132,0,90,14,100,10,83,0,41,
+    20,218,10,70,105,108,101,70,105,110,100,101,114,122,172,70,
+    105,108,101,45,98,97,115,101,100,32,102,105,110,100,101,114,
+    46,10,10,32,32,32,32,73,110,116,101,114,97,99,116,105,
+    111,110,115,32,119,105,116,104,32,116,104,101,32,102,105,108,
+    101,32,115,121,115,116,101,109,32,97,114,101,32,99,97,99,
+    104,101,100,32,102,111,114,32,112,101,114,102,111,114,109,97,
+    110,99,101,44,32,98,101,105,110,103,10,32,32,32,32,114,
+    101,102,114,101,115,104,101,100,32,119,104,101,110,32,116,104,
+    101,32,100,105,114,101,99,116,111,114,121,32,116,104,101,32,
+    102,105,110,100,101,114,32,105,115,32,104,97,110,100,108,105,
+    110,103,32,104,97,115,32,98,101,101,110,32,109,111,100,105,
+    102,105,101,100,46,10,10,32,32,32,32,99,2,0,0,0,
+    0,0,0,0,0,0,0,0,5,0,0,0,6,0,0,0,
+    7,0,0,0,115,112,0,0,0,103,0,125,3,124,2,68,
+    0,93,16,92,2,137,0,125,4,124,3,160,0,135,0,102,
+    1,100,1,100,2,132,8,124,4,68,0,131,1,161,1,1,
+    0,113,4,124,3,124,0,95,1,124,1,112,27,100,3,124,
+    0,95,2,116,3,124,0,106,2,131,1,115,43,116,4,116,
+    5,160,6,161,0,124,0,106,2,131,2,124,0,95,2,100,
+    4,124,0,95,7,116,8,131,0,124,0,95,9,116,8,131,
+    0,124,0,95,10,100,5,83,0,41,6,122,154,73,110,105,
+    116,105,97,108,105,122,101,32,119,105,116,104,32,116,104,101,
+    32,112,97,116,104,32,116,111,32,115,101,97,114,99,104,32,
+    111,110,32,97,110,100,32,97,32,118,97,114,105,97,98,108,
+    101,32,110,117,109,98,101,114,32,111,102,10,32,32,32,32,
+    32,32,32,32,50,45,116,117,112,108,101,115,32,99,111,110,
+    116,97,105,110,105,110,103,32,116,104,101,32,108,111,97,100,
+    101,114,32,97,110,100,32,116,104,101,32,102,105,108,101,32,
+    115,117,102,102,105,120,101,115,32,116,104,101,32,108,111,97,
+    100,101,114,10,32,32,32,32,32,32,32,32,114,101,99,111,
+    103,110,105,122,101,115,46,99,1,0,0,0,0,0,0,0,
+    0,0,0,0,2,0,0,0,3,0,0,0,51,0,0,0,
+    115,24,0,0,0,129,0,124,0,93,7,125,1,124,1,136,
+    0,102,2,86,0,1,0,113,2,100,0,83,0,114,69,0,
+    0,0,114,7,0,0,0,114,43,1,0,0,169,1,114,164,
+    0,0,0,114,7,0,0,0,114,8,0,0,0,114,9,0,
+    0,0,211,5,0,0,115,4,0,0,0,2,128,22,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,97,0,0,0,114,130,0,0,
+    0,78,41,11,114,191,0,0,0,218,8,95,108,111,97,100,
+    101,114,115,114,65,0,0,0,114,86,0,0,0,114,67,0,
+    0,0,114,18,0,0,0,114,82,0,0,0,218,11,95,112,
+    97,116,104,95,109,116,105,109,101,218,3,115,101,116,218,11,
+    95,112,97,116,104,95,99,97,99,104,101,218,19,95,114,101,
+    108,97,120,101,100,95,112,97,116,104,95,99,97,99,104,101,
+    41,5,114,143,0,0,0,114,65,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,212,0,0,0,114,7,0,0,0,114,
+    95,1,0,0,114,8,0,0,0,114,236,0,0,0,205,5,
+    0,0,115,20,0,0,0,4,4,12,1,26,1,6,1,10,
+    2,10,1,18,1,6,1,8,1,12,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,0,0,0,0,0,0,0,0,0,1,0,0,
+    0,2,0,0,0,67,0,0,0,115,10,0,0,0,100,1,
+    124,0,95,0,100,2,83,0,41,3,122,31,73,110,118,97,
+    108,105,100,97,116,101,32,116,104,101,32,100,105,114,101,99,
+    116,111,114,121,32,109,116,105,109,101,46,114,130,0,0,0,
+    78,41,1,114,97,1,0,0,114,21,1,0,0,114,7,0,
+    0,0,114,7,0,0,0,114,8,0,0,0,114,78,1,0,
+    0,221,5,0,0,114,81,0,0,0,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,0,0,0,0,3,0,0,0,4,0,0,0,67,0,0,
+    0,115,54,0,0,0,116,0,160,1,100,1,116,2,161,2,
+    1,0,124,0,160,3,124,1,161,1,125,2,124,2,100,2,
+    117,0,114,19,100,2,103,0,102,2,83,0,124,2,106,4,
+    124,2,106,5,112,25,103,0,102,2,83,0,41,3,122,197,
+    84,114,121,32,116,111,32,102,105,110,100,32,97,32,108,111,
+    97,100,101,114,32,102,111,114,32,116,104,101,32,115,112,101,
+    99,105,102,105,101,100,32,109,111,100,117,108,101,44,32,111,
+    114,32,116,104,101,32,110,97,109,101,115,112,97,99,101,10,
+    32,32,32,32,32,32,32,32,112,97,99,107,97,103,101,32,
+    112,111,114,116,105,111,110,115,46,32,82,101,116,117,114,110,
+    115,32,40,108,111,97,100,101,114,44,32,108,105,115,116,45,
+    111,102,45,112,111,114,116,105,111,110,115,41,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,122,101,70,105,108,101,70,105,110,100,101,
+    114,46,102,105,110,100,95,108,111,97,100,101,114,40,41,32,
+    105,115,32,100,101,112,114,101,99,97,116,101,100,32,97,110,
+    100,32,115,108,97,116,101,100,32,102,111,114,32,114,101,109,
+    111,118,97,108,32,105,110,32,80,121,116,104,111,110,32,51,
+    46,49,50,59,32,117,115,101,32,102,105,110,100,95,115,112,
+    101,99,40,41,32,105,110,115,116,101,97,100,78,41,6,114,
+    99,0,0,0,114,100,0,0,0,114,101,0,0,0,114,226,
+    0,0,0,114,164,0,0,0,114,202,0,0,0,41,3,114,
+    143,0,0,0,114,163,0,0,0,114,210,0,0,0,114,7,
+    0,0,0,114,7,0,0,0,114,8,0,0,0,114,161,0,
+    0,0,227,5,0,0,115,14,0,0,0,6,7,2,2,4,
+    254,10,3,8,1,8,1,16,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,0,0,0,0,7,0,
+    0,0,6,0,0,0,67,0,0,0,115,26,0,0,0,124,
+    1,124,2,124,3,131,2,125,6,116,0,124,2,124,3,124,
+    6,124,4,100,1,141,4,83,0,41,2,78,114,201,0,0,
+    0,41,1,114,213,0,0,0,41,7,114,143,0,0,0,114,
+    211,0,0,0,114,163,0,0,0,114,65,0,0,0,90,4,
+    115,109,115,108,114,225,0,0,0,114,164,0,0,0,114,7,
+    0,0,0,114,7,0,0,0,114,8,0,0,0,114,91,1,
+    0,0,242,5,0,0,115,8,0,0,0,10,1,8,1,2,
+    1,6,255,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,0,0,0,0,14,0,0,0,9,0,0,0,67,
+    0,0,0,115,122,1,0,0,100,1,125,3,124,1,160,0,
+    100,2,161,1,100,3,25,0,125,4,122,12,116,1,124,0,
+    106,2,112,17,116,3,160,4,161,0,131,1,106,5,125,5,
+    87,0,110,11,4,0,116,6,121,32,1,0,1,0,1,0,
+    100,4,125,5,89,0,110,1,119,0,124,5,124,0,106,7,
+    107,3,114,45,124,0,160,8,161,0,1,0,124,5,124,0,
+    95,7,116,9,131,0,114,56,124,0,106,10,125,6,124,4,
+    160,11,161,0,125,7,110,5,124,0,106,12,125,6,124,4,
+    125,7,124,7,124,6,118,0,114,108,116,13,124,0,106,2,
+    124,4,131,2,125,8,124,0,106,14,68,0,93,29,92,2,
+    125,9,125,10,100,5,124,9,23,0,125,11,116,13,124,8,
+    124,11,131,2,125,12,116,15,124,12,131,1,114,103,124,0,
+    160,16,124,10,124,1,124,12,124,8,103,1,124,2,161,5,
+    2,0,1,0,83,0,113,74,116,17,124,8,131,1,125,3,
+    124,0,106,14,68,0,93,55,92,2,125,9,125,10,122,10,
+    116,13,124,0,106,2,124,4,124,9,23,0,131,2,125,12,
+    87,0,110,11,4,0,116,18,121,136,1,0,1,0,1,0,
+    89,0,1,0,100,6,83,0,119,0,116,19,106,20,100,7,
     124,12,100,3,100,8,141,3,1,0,124,7,124,9,23,0,
-    124,6,118,0,114,163,116,15,124,12,131,1,114,163,124,0,
+    124,6,118,0,114,166,116,15,124,12,131,1,114,166,124,0,
     160,16,124,10,124,1,124,12,100,6,124,2,161,5,2,0,
-    1,0,83,0,113,109,124,3,114,184,116,19,160,20,100,9,
+    1,0,83,0,113,111,124,3,114,187,116,19,160,20,100,9,
     124,8,161,2,1,0,116,19,160,21,124,1,100,6,161,2,
     125,13,124,8,103,1,124,13,95,22,124,13,83,0,100,6,
-    83,0,119,0,119,0,41,10,122,111,84,114,121,32,116,111,
-    32,102,105,110,100,32,97,32,115,112,101,99,32,102,111,114,
-    32,116,104,101,32,115,112,101,99,105,102,105,101,100,32,109,
-    111,100,117,108,101,46,10,10,32,32,32,32,32,32,32,32,
-    82,101,116,117,114,110,115,32,116,104,101,32,109,97,116,99,
-    104,105,110,103,32,115,112,101,99,44,32,111,114,32,78,111,
-    110,101,32,105,102,32,110,111,116,32,102,111,117,110,100,46,
-    10,32,32,32,32,32,32,32,32,70,114,97,0,0,0,114,
-    44,0,0,0,114,130,0,0,0,114,236,0,0,0,78,122,
-    9,116,114,121,105,110,103,32,123,125,41,1,90,9,118,101,
-    114,98,111,115,105,116,121,122,25,112,111,115,115,105,98,108,
-    101,32,110,97,109,101,115,112,97,99,101,32,102,111,114,32,
-    123,125,41,23,114,104,0,0,0,114,75,0,0,0,114,65,
-    0,0,0,114,18,0,0,0,114,82,0,0,0,114,35,1,
-    0,0,114,76,0,0,0,114,97,1,0,0,218,11,95,102,
-    105,108,108,95,99,97,99,104,101,114,21,0,0,0,114,100,
-    1,0,0,114,131,0,0,0,114,99,1,0,0,114,67,0,
-    0,0,114,96,1,0,0,114,80,0,0,0,114,91,1,0,
-    0,114,83,0,0,0,114,111,0,0,0,114,159,0,0,0,
-    114,173,0,0,0,114,207,0,0,0,114,202,0,0,0,41,
-    14,114,143,0,0,0,114,163,0,0,0,114,225,0,0,0,
-    90,12,105,115,95,110,97,109,101,115,112,97,99,101,90,11,
-    116,97,105,108,95,109,111,100,117,108,101,114,193,0,0,0,
-    90,5,99,97,99,104,101,90,12,99,97,99,104,101,95,109,
-    111,100,117,108,101,90,9,98,97,115,101,95,112,97,116,104,
-    114,44,1,0,0,114,211,0,0,0,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,210,0,0,0,114,7,0,0,0,114,7,
-    0,0,0,114,8,0,0,0,114,226,0,0,0,247,5,0,
-    0,115,86,0,0,0,4,5,14,1,2,1,24,1,12,1,
-    6,1,10,1,8,1,6,1,6,2,6,1,10,1,6,2,
-    4,1,8,2,12,1,14,1,8,1,10,1,8,1,24,1,
-    2,255,8,5,14,2,2,1,20,1,12,1,8,1,16,1,
+    83,0,41,10,122,111,84,114,121,32,116,111,32,102,105,110,
+    100,32,97,32,115,112,101,99,32,102,111,114,32,116,104,101,
+    32,115,112,101,99,105,102,105,101,100,32,109,111,100,117,108,
+    101,46,10,10,32,32,32,32,32,32,32,32,82,101,116,117,
+    114,110,115,32,116,104,101,32,109,97,116,99,104,105,110,103,
+    32,115,112,101,99,44,32,111,114,32,78,111,110,101,32,105,
+    102,32,110,111,116,32,102,111,117,110,100,46,10,32,32,32,
+    32,32,32,32,32,70,114,97,0,0,0,114,44,0,0,0,
+    114,130,0,0,0,114,236,0,0,0,78,122,9,116,114,121,
+    105,110,103,32,123,125,41,1,90,9,118,101,114,98,111,115,
+    105,116,121,122,25,112,111,115,115,105,98,108,101,32,110,97,
+    109,101,115,112,97,99,101,32,102,111,114,32,123,125,41,23,
+    114,104,0,0,0,114,75,0,0,0,114,65,0,0,0,114,
+    18,0,0,0,114,82,0,0,0,114,35,1,0,0,114,76,
+    0,0,0,114,97,1,0,0,218,11,95,102,105,108,108,95,
+    99,97,99,104,101,114,21,0,0,0,114,100,1,0,0,114,
+    131,0,0,0,114,99,1,0,0,114,67,0,0,0,114,96,
+    1,0,0,114,80,0,0,0,114,91,1,0,0,114,83,0,
+    0,0,114,111,0,0,0,114,159,0,0,0,114,173,0,0,
+    0,114,207,0,0,0,114,202,0,0,0,41,14,114,143,0,
+    0,0,114,163,0,0,0,114,225,0,0,0,90,12,105,115,
+    95,110,97,109,101,115,112,97,99,101,90,11,116,97,105,108,
+    95,109,111,100,117,108,101,114,193,0,0,0,90,5,99,97,
+    99,104,101,90,12,99,97,99,104,101,95,109,111,100,117,108,
+    101,90,9,98,97,115,101,95,112,97,116,104,114,44,1,0,
+    0,114,211,0,0,0,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,210,0,0,0,114,7,0,0,0,114,7,0,0,0,114,
+    8,0,0,0,114,226,0,0,0,247,5,0,0,115,86,0,
+    0,0,4,5,14,1,2,1,24,1,12,1,8,1,2,255,
+    10,2,8,1,6,1,6,2,6,1,10,1,6,2,4,1,
+    8,2,12,1,14,1,8,1,10,1,8,1,24,1,2,255,
+    8,5,14,2,2,1,20,1,12,1,8,1,2,255,16,2,
     12,1,8,1,10,1,4,1,8,255,2,128,4,2,12,1,
-    12,1,8,1,4,1,4,1,2,244,2,228,122,20,70,105,
-    108,101,70,105,110,100,101,114,46,102,105,110,100,95,115,112,
-    101,99,99,1,0,0,0,0,0,0,0,0,0,0,0,9,
-    0,0,0,10,0,0,0,67,0,0,0,115,190,0,0,0,
-    124,0,106,0,125,1,122,11,116,1,160,2,124,1,112,11,
-    116,1,160,3,161,0,161,1,125,2,87,0,110,12,4,0,
-    116,4,116,5,116,6,102,3,121,94,1,0,1,0,1,0,
-    103,0,125,2,89,0,116,7,106,8,160,9,100,1,161,1,
-    115,39,116,10,124,2,131,1,124,0,95,11,110,37,116,10,
+    12,1,8,1,4,1,4,1,122,20,70,105,108,101,70,105,
+    110,100,101,114,46,102,105,110,100,95,115,112,101,99,99,1,
+    0,0,0,0,0,0,0,0,0,0,0,9,0,0,0,10,
+    0,0,0,67,0,0,0,115,192,0,0,0,124,0,106,0,
+    125,1,122,11,116,1,160,2,124,1,112,11,116,1,160,3,
+    161,0,161,1,125,2,87,0,110,14,4,0,116,4,116,5,
+    116,6,102,3,121,28,1,0,1,0,1,0,103,0,125,2,
+    89,0,110,1,119,0,116,7,106,8,160,9,100,1,161,1,
+    115,41,116,10,124,2,131,1,124,0,95,11,110,37,116,10,
     131,0,125,3,124,2,68,0,93,28,125,4,124,4,160,12,
-    100,2,161,1,92,3,125,5,125,6,125,7,124,6,114,65,
+    100,2,161,1,92,3,125,5,125,6,125,7,124,6,114,67,
     100,3,160,13,124,5,124,7,160,14,161,0,161,2,125,8,
     110,2,124,5,125,8,124,3,160,15,124,8,161,1,1,0,
-    113,44,124,3,124,0,95,11,116,7,106,8,160,9,116,16,
-    161,1,114,92,100,4,100,5,132,0,124,2,68,0,131,1,
-    124,0,95,17,100,6,83,0,100,6,83,0,119,0,41,7,
-    122,68,70,105,108,108,32,116,104,101,32,99,97,99,104,101,
-    32,111,102,32,112,111,116,101,110,116,105,97,108,32,109,111,
-    100,117,108,101,115,32,97,110,100,32,112,97,99,107,97,103,
-    101,115,32,102,111,114,32,116,104,105,115,32,100,105,114,101,
-    99,116,111,114,121,46,114,14,0,0,0,114,97,0,0,0,
-    114,88,0,0,0,99,1,0,0,0,0,0,0,0,0,0,
-    0,0,2,0,0,0,4,0,0,0,83,0,0,0,115,20,
-    0,0,0,104,0,124,0,93,6,125,1,124,1,160,0,161,
-    0,146,2,113,2,83,0,114,7,0,0,0,41,1,114,131,
-    0,0,0,41,2,114,5,0,0,0,90,2,102,110,114,7,
-    0,0,0,114,7,0,0,0,114,8,0,0,0,114,13,0,
-    0,0,71,6,0,0,115,2,0,0,0,20,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,112,62,78,41,18,114,65,0,0,0,
-    114,18,0,0,0,90,7,108,105,115,116,100,105,114,114,82,
-    0,0,0,114,85,1,0,0,218,15,80,101,114,109,105,115,
-    115,105,111,110,69,114,114,111,114,218,18,78,111,116,65,68,
-    105,114,101,99,116,111,114,121,69,114,114,111,114,114,15,0,
-    0,0,114,25,0,0,0,114,26,0,0,0,114,98,1,0,
-    0,114,99,1,0,0,114,126,0,0,0,114,89,0,0,0,
-    114,131,0,0,0,218,3,97,100,100,114,27,0,0,0,114,
-    100,1,0,0,41,9,114,143,0,0,0,114,65,0,0,0,
-    90,8,99,111,110,116,101,110,116,115,90,21,108,111,119,101,
-    114,95,115,117,102,102,105,120,95,99,111,110,116,101,110,116,
-    115,114,70,1,0,0,114,141,0,0,0,114,54,1,0,0,
-    114,44,1,0,0,90,8,110,101,119,95,110,97,109,101,114,
-    7,0,0,0,114,7,0,0,0,114,8,0,0,0,114,102,
-    1,0,0,42,6,0,0,115,38,0,0,0,6,2,2,1,
-    22,1,18,1,6,3,12,3,12,1,6,7,8,1,16,1,
+    113,46,124,3,124,0,95,11,116,7,106,8,160,9,116,16,
+    161,1,114,94,100,4,100,5,132,0,124,2,68,0,131,1,
+    124,0,95,17,100,6,83,0,100,6,83,0,41,7,122,68,
+    70,105,108,108,32,116,104,101,32,99,97,99,104,101,32,111,
+    102,32,112,111,116,101,110,116,105,97,108,32,109,111,100,117,
+    108,101,115,32,97,110,100,32,112,97,99,107,97,103,101,115,
+    32,102,111,114,32,116,104,105,115,32,100,105,114,101,99,116,
+    111,114,121,46,114,14,0,0,0,114,97,0,0,0,114,88,
+    0,0,0,99,1,0,0,0,0,0,0,0,0,0,0,0,
+    2,0,0,0,4,0,0,0,83,0,0,0,115,20,0,0,
+    0,104,0,124,0,93,6,125,1,124,1,160,0,161,0,146,
+    2,113,2,83,0,114,7,0,0,0,41,1,114,131,0,0,
+    0,41,2,114,5,0,0,0,90,2,102,110,114,7,0,0,
+    0,114,7,0,0,0,114,8,0,0,0,114,13,0,0,0,
+    71,6,0,0,115,2,0,0,0,20,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,112,62,78,41,18,114,65,0,0,0,114,18,
+    0,0,0,90,7,108,105,115,116,100,105,114,114,82,0,0,
+    0,114,85,1,0,0,218,15,80,101,114,109,105,115,115,105,
+    111,110,69,114,114,111,114,218,18,78,111,116,65,68,105,114,
+    101,99,116,111,114,121,69,114,114,111,114,114,15,0,0,0,
+    114,25,0,0,0,114,26,0,0,0,114,98,1,0,0,114,
+    99,1,0,0,114,126,0,0,0,114,89,0,0,0,114,131,
+    0,0,0,218,3,97,100,100,114,27,0,0,0,114,100,1,
+    0,0,41,9,114,143,0,0,0,114,65,0,0,0,90,8,
+    99,111,110,116,101,110,116,115,90,21,108,111,119,101,114,95,
+    115,117,102,102,105,120,95,99,111,110,116,101,110,116,115,114,
+    70,1,0,0,114,141,0,0,0,114,54,1,0,0,114,44,
+    1,0,0,90,8,110,101,119,95,110,97,109,101,114,7,0,
+    0,0,114,7,0,0,0,114,8,0,0,0,114,102,1,0,
+    0,42,6,0,0,115,38,0,0,0,6,2,2,1,22,1,
+    18,1,8,3,2,253,12,6,12,1,6,7,8,1,16,1,
     4,1,18,1,4,2,12,1,6,1,12,1,20,1,4,255,
-    2,233,122,22,70,105,108,101,70,105,110,100,101,114,46,95,
-    102,105,108,108,95,99,97,99,104,101,99,1,0,0,0,0,
-    0,0,0,0,0,0,0,3,0,0,0,3,0,0,0,7,
-    0,0,0,115,18,0,0,0,135,0,135,1,102,2,100,1,
-    100,2,132,8,125,2,124,2,83,0,41,4,97,20,1,0,
-    0,65,32,99,108,97,115,115,32,109,101,116,104,111,100,32,
-    119,104,105,99,104,32,114,101,116,117,114,110,115,32,97,32,
-    99,108,111,115,117,114,101,32,116,111,32,117,115,101,32,111,
-    110,32,115,121,115,46,112,97,116,104,95,104,111,111,107,10,
-    32,32,32,32,32,32,32,32,119,104,105,99,104,32,119,105,
-    108,108,32,114,101,116,117,114,110,32,97,110,32,105,110,115,
-    116,97,110,99,101,32,117,115,105,110,103,32,116,104,101,32,
-    115,112,101,99,105,102,105,101,100,32,108,111,97,100,101,114,
-    115,32,97,110,100,32,116,104,101,32,112,97,116,104,10,32,
-    32,32,32,32,32,32,32,99,97,108,108,101,100,32,111,110,
-    32,116,104,101,32,99,108,111,115,117,114,101,46,10,10,32,
-    32,32,32,32,32,32,32,73,102,32,116,104,101,32,112,97,
-    116,104,32,99,97,108,108,101,100,32,111,110,32,116,104,101,
-    32,99,108,111,115,117,114,101,32,105,115,32,110,111,116,32,
-    97,32,100,105,114,101,99,116,111,114,121,44,32,73,109,112,
-    111,114,116,69,114,114,111,114,32,105,115,10,32,32,32,32,
-    32,32,32,32,114,97,105,115,101,100,46,10,10,32,32,32,
-    32,32,32,32,32,99,1,0,0,0,0,0,0,0,0,0,
-    0,0,1,0,0,0,4,0,0,0,19,0,0,0,115,36,
-    0,0,0,116,0,124,0,131,1,115,10,116,1,100,1,124,
-    0,100,2,141,2,130,1,136,0,124,0,103,1,136,1,162,
-    1,82,0,142,0,83,0,41,4,122,45,80,97,116,104,32,
-    104,111,111,107,32,102,111,114,32,105,109,112,111,114,116,108,
-    105,98,46,109,97,99,104,105,110,101,114,121,46,70,105,108,
-    101,70,105,110,100,101,114,46,122,30,111,110,108,121,32,100,
-    105,114,101,99,116,111,114,105,101,115,32,97,114,101,32,115,
-    117,112,112,111,114,116,101,100,114,71,0,0,0,78,41,2,
-    114,83,0,0,0,114,142,0,0,0,114,71,0,0,0,169,
-    2,114,221,0,0,0,114,101,1,0,0,114,7,0,0,0,
-    114,8,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,83,
-    6,0,0,115,6,0,0,0,8,2,12,1,16,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,104,95,104,111,111,107,95,102,111,114,95,70,105,108,101,
-    70,105,110,100,101,114,78,114,7,0,0,0,41,3,114,221,
-    0,0,0,114,101,1,0,0,114,107,1,0,0,114,7,0,
-    0,0,114,106,1,0,0,114,8,0,0,0,218,9,112,97,
-    116,104,95,104,111,111,107,73,6,0,0,115,4,0,0,0,
-    14,10,4,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,0,0,0,0,1,0,0,0,3,0,0,0,67,
-    0,0,0,114,67,1,0,0,41,2,78,122,16,70,105,108,
-    101,70,105,110,100,101,114,40,123,33,114,125,41,41,2,114,
-    89,0,0,0,114,65,0,0,0,114,21,1,0,0,114,7,
-    0,0,0,114,7,0,0,0,114,8,0,0,0,114,68,1,
-    0,0,91,6,0,0,114,61,1,0,0,122,19,70,105,108,
-    101,70,105,110,100,101,114,46,95,95,114,101,112,114,95,95,
-    114,69,0,0,0,41,15,114,150,0,0,0,114,149,0,0,
-    0,114,151,0,0,0,114,152,0,0,0,114,236,0,0,0,
-    114,78,1,0,0,114,167,0,0,0,114,229,0,0,0,114,
-    161,0,0,0,114,91,1,0,0,114,226,0,0,0,114,102,
-    1,0,0,114,234,0,0,0,114,108,1,0,0,114,68,1,
-    0,0,114,7,0,0,0,114,7,0,0,0,114,7,0,0,
-    0,114,8,0,0,0,114,94,1,0,0,196,5,0,0,115,
-    24,0,0,0,8,0,4,2,8,7,8,16,4,4,8,2,
-    8,15,10,5,8,51,2,31,10,1,12,17,114,94,1,0,
-    0,99,4,0,0,0,0,0,0,0,0,0,0,0,6,0,
-    0,0,8,0,0,0,67,0,0,0,115,144,0,0,0,124,
-    0,160,0,100,1,161,1,125,4,124,0,160,0,100,2,161,
-    1,125,5,124,4,115,33,124,5,114,18,124,5,106,1,125,
-    4,110,15,124,2,124,3,107,2,114,28,116,2,124,1,124,
-    2,131,2,125,4,110,5,116,3,124,1,124,2,131,2,125,
-    4,124,5,115,42,116,4,124,1,124,2,124,4,100,3,141,
-    3,125,5,122,19,124,5,124,0,100,2,60,0,124,4,124,
-    0,100,1,60,0,124,2,124,0,100,4,60,0,124,3,124,
-    0,100,5,60,0,87,0,100,0,83,0,4,0,116,5,121,
-    71,1,0,1,0,1,0,89,0,100,0,83,0,119,0,41,
-    6,78,218,10,95,95,108,111,97,100,101,114,95,95,218,8,
-    95,95,115,112,101,99,95,95,114,95,1,0,0,90,8,95,
-    95,102,105,108,101,95,95,90,10,95,95,99,97,99,104,101,
-    100,95,95,41,6,218,3,103,101,116,114,164,0,0,0,114,
-    41,1,0,0,114,34,1,0,0,114,213,0,0,0,218,9,
-    69,120,99,101,112,116,105,111,110,41,6,90,2,110,115,114,
-    141,0,0,0,90,8,112,97,116,104,110,97,109,101,90,9,
-    99,112,97,116,104,110,97,109,101,114,164,0,0,0,114,210,
-    0,0,0,114,7,0,0,0,114,7,0,0,0,114,8,0,
-    0,0,218,14,95,102,105,120,95,117,112,95,109,111,100,117,
-    108,101,97,6,0,0,115,36,0,0,0,10,2,10,1,4,
-    1,4,1,8,1,8,1,12,1,10,2,4,1,14,1,2,
-    1,8,1,8,1,8,1,14,1,12,1,6,2,2,254,114,
-    113,1,0,0,99,0,0,0,0,0,0,0,0,0,0,0,
-    0,3,0,0,0,3,0,0,0,67,0,0,0,115,38,0,
-    0,0,116,0,116,1,160,2,161,0,102,2,125,0,116,3,
-    116,4,102,2,125,1,116,5,116,6,102,2,125,2,124,0,
-    124,1,124,2,103,3,83,0,41,2,122,95,82,101,116,117,
-    114,110,115,32,97,32,108,105,115,116,32,111,102,32,102,105,
-    108,101,45,98,97,115,101,100,32,109,111,100,117,108,101,32,
-    108,111,97,100,101,114,115,46,10,10,32,32,32,32,69,97,
-    99,104,32,105,116,101,109,32,105,115,32,97,32,116,117,112,
-    108,101,32,40,108,111,97,100,101,114,44,32,115,117,102,102,
-    105,120,101,115,41,46,10,32,32,32,32,78,41,7,114,30,
-    1,0,0,114,187,0,0,0,218,18,101,120,116,101,110,115,
-    105,111,110,95,115,117,102,102,105,120,101,115,114,34,1,0,
-    0,114,127,0,0,0,114,41,1,0,0,114,113,0,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,7,0,0,0,114,7,0,0,0,114,8,0,0,0,114,
-    208,0,0,0,120,6,0,0,115,8,0,0,0,12,5,8,
-    1,8,1,10,1,114,208,0,0,0,99,1,0,0,0,0,
-    0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,67,
-    0,0,0,115,8,0,0,0,124,0,97,0,100,0,83,0,
-    114,69,0,0,0,41,1,114,159,0,0,0,41,1,218,17,
-    95,98,111,111,116,115,116,114,97,112,95,109,111,100,117,108,
-    101,114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,
-    218,21,95,115,101,116,95,98,111,111,116,115,116,114,97,112,
-    95,109,111,100,117,108,101,131,6,0,0,115,2,0,0,0,
-    8,2,114,116,1,0,0,99,1,0,0,0,0,0,0,0,
-    0,0,0,0,2,0,0,0,4,0,0,0,67,0,0,0,
-    115,50,0,0,0,116,0,124,0,131,1,1,0,116,1,131,
-    0,125,1,116,2,106,3,160,4,116,5,106,6,124,1,142,
-    0,103,1,161,1,1,0,116,2,106,7,160,8,116,9,161,
-    1,1,0,100,1,83,0,41,2,122,41,73,110,115,116,97,
-    108,108,32,116,104,101,32,112,97,116,104,45,98,97,115,101,
-    100,32,105,109,112,111,114,116,32,99,111,109,112,111,110,101,
-    110,116,115,46,78,41,10,114,116,1,0,0,114,208,0,0,
-    0,114,15,0,0,0,114,83,1,0,0,114,191,0,0,0,
-    114,94,1,0,0,114,108,1,0,0,218,9,109,101,116,97,
-    95,112,97,116,104,114,61,0,0,0,114,77,1,0,0,41,
-    2,114,115,1,0,0,90,17,115,117,112,112,111,114,116,101,
-    100,95,108,111,97,100,101,114,115,114,7,0,0,0,114,7,
-    0,0,0,114,8,0,0,0,218,8,95,105,110,115,116,97,
-    108,108,136,6,0,0,115,8,0,0,0,8,2,6,1,20,
-    1,16,1,114,118,1,0,0,41,1,114,87,0,0,0,114,
-    69,0,0,0,41,3,78,78,78,41,2,114,0,0,0,0,
-    114,0,0,0,0,41,1,84,41,85,114,152,0,0,0,114,
-    159,0,0,0,114,187,0,0,0,114,91,0,0,0,114,15,
-    0,0,0,114,99,0,0,0,114,184,0,0,0,114,25,0,
-    0,0,114,231,0,0,0,90,2,110,116,114,18,0,0,0,
-    114,215,0,0,0,90,5,112,111,115,105,120,114,50,0,0,
-    0,218,3,97,108,108,114,59,0,0,0,114,136,0,0,0,
-    114,57,0,0,0,114,62,0,0,0,90,20,95,112,97,116,
-    104,115,101,112,115,95,119,105,116,104,95,99,111,108,111,110,
-    114,28,0,0,0,90,37,95,67,65,83,69,95,73,78,83,
-    69,78,83,73,84,73,86,69,95,80,76,65,84,70,79,82,
-    77,83,95,66,89,84,69,83,95,75,69,89,114,27,0,0,
-    0,114,29,0,0,0,114,21,0,0,0,114,36,0,0,0,
-    114,42,0,0,0,114,45,0,0,0,114,67,0,0,0,114,
-    74,0,0,0,114,75,0,0,0,114,79,0,0,0,114,80,
-    0,0,0,114,83,0,0,0,114,86,0,0,0,114,95,0,
-    0,0,218,4,116,121,112,101,218,8,95,95,99,111,100,101,
-    95,95,114,186,0,0,0,114,34,0,0,0,114,172,0,0,
-    0,114,33,0,0,0,114,39,0,0,0,114,8,1,0,0,
-    114,116,0,0,0,114,112,0,0,0,114,127,0,0,0,114,
-    61,0,0,0,114,114,1,0,0,114,232,0,0,0,114,113,
-    0,0,0,90,23,68,69,66,85,71,95,66,89,84,69,67,
-    79,68,69,95,83,85,70,70,73,88,69,83,90,27,79,80,
-    84,73,77,73,90,69,68,95,66,89,84,69,67,79,68,69,
-    95,83,85,70,70,73,88,69,83,114,121,0,0,0,114,128,
-    0,0,0,114,135,0,0,0,114,137,0,0,0,114,139,0,
-    0,0,114,160,0,0,0,114,167,0,0,0,114,176,0,0,
-    0,114,180,0,0,0,114,182,0,0,0,114,189,0,0,0,
-    114,194,0,0,0,114,195,0,0,0,114,200,0,0,0,218,
-    6,111,98,106,101,99,116,114,209,0,0,0,114,213,0,0,
-    0,114,214,0,0,0,114,235,0,0,0,114,249,0,0,0,
-    114,11,1,0,0,114,34,1,0,0,114,41,1,0,0,114,
-    30,1,0,0,114,47,1,0,0,114,73,1,0,0,114,77,
-    1,0,0,114,94,1,0,0,114,113,1,0,0,114,208,0,
-    0,0,114,116,1,0,0,114,118,1,0,0,114,7,0,0,
+    122,22,70,105,108,101,70,105,110,100,101,114,46,95,102,105,
+    108,108,95,99,97,99,104,101,99,1,0,0,0,0,0,0,
+    0,0,0,0,0,3,0,0,0,3,0,0,0,7,0,0,
+    0,115,18,0,0,0,135,0,135,1,102,2,100,1,100,2,
+    132,8,125,2,124,2,83,0,41,4,97,20,1,0,0,65,
+    32,99,108,97,115,115,32,109,101,116,104,111,100,32,119,104,
+    105,99,104,32,114,101,116,117,114,110,115,32,97,32,99,108,
+    111,115,117,114,101,32,116,111,32,117,115,101,32,111,110,32,
+    115,121,115,46,112,97,116,104,95,104,111,111,107,10,32,32,
+    32,32,32,32,32,32,119,104,105,99,104,32,119,105,108,108,
+    32,114,101,116,117,114,110,32,97,110,32,105,110,115,116,97,
+    110,99,101,32,117,115,105,110,103,32,116,104,101,32,115,112,
+    101,99,105,102,105,101,100,32,108,111,97,100,101,114,115,32,
+    97,110,100,32,116,104,101,32,112,97,116,104,10,32,32,32,
+    32,32,32,32,32,99,97,108,108,101,100,32,111,110,32,116,
+    104,101,32,99,108,111,115,117,114,101,46,10,10,32,32,32,
+    32,32,32,32,32,73,102,32,116,104,101,32,112,97,116,104,
+    32,99,97,108,108,101,100,32,111,110,32,116,104,101,32,99,
+    108,111,115,117,114,101,32,105,115,32,110,111,116,32,97,32,
+    100,105,114,101,99,116,111,114,121,44,32,73,109,112,111,114,
+    116,69,114,114,111,114,32,105,115,10,32,32,32,32,32,32,
+    32,32,114,97,105,115,101,100,46,10,10,32,32,32,32,32,
+    32,32,32,99,1,0,0,0,0,0,0,0,0,0,0,0,
+    1,0,0,0,4,0,0,0,19,0,0,0,115,36,0,0,
+    0,116,0,124,0,131,1,115,10,116,1,100,1,124,0,100,
+    2,141,2,130,1,136,0,124,0,103,1,136,1,162,1,82,
+    0,142,0,83,0,41,4,122,45,80,97,116,104,32,104,111,
+    111,107,32,102,111,114,32,105,109,112,111,114,116,108,105,98,
+    46,109,97,99,104,105,110,101,114,121,46,70,105,108,101,70,
+    105,110,100,101,114,46,122,30,111,110,108,121,32,100,105,114,
+    101,99,116,111,114,105,101,115,32,97,114,101,32,115,117,112,
+    112,111,114,116,101,100,114,71,0,0,0,78,41,2,114,83,
+    0,0,0,114,142,0,0,0,114,71,0,0,0,169,2,114,
+    221,0,0,0,114,101,1,0,0,114,7,0,0,0,114,8,
+    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,83,6,0,
+    0,115,6,0,0,0,8,2,12,1,16,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,104,
+    95,104,111,111,107,95,102,111,114,95,70,105,108,101,70,105,
+    110,100,101,114,78,114,7,0,0,0,41,3,114,221,0,0,
+    0,114,101,1,0,0,114,107,1,0,0,114,7,0,0,0,
+    114,106,1,0,0,114,8,0,0,0,218,9,112,97,116,104,
+    95,104,111,111,107,73,6,0,0,115,4,0,0,0,14,10,
+    4,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,0,0,0,0,1,0,0,0,3,0,0,0,67,0,0,
+    0,114,67,1,0,0,41,2,78,122,16,70,105,108,101,70,
+    105,110,100,101,114,40,123,33,114,125,41,41,2,114,89,0,
+    0,0,114,65,0,0,0,114,21,1,0,0,114,7,0,0,
+    0,114,7,0,0,0,114,8,0,0,0,114,68,1,0,0,
+    91,6,0,0,114,61,1,0,0,122,19,70,105,108,101,70,
+    105,110,100,101,114,46,95,95,114,101,112,114,95,95,114,69,
+    0,0,0,41,15,114,150,0,0,0,114,149,0,0,0,114,
+    151,0,0,0,114,152,0,0,0,114,236,0,0,0,114,78,
+    1,0,0,114,167,0,0,0,114,229,0,0,0,114,161,0,
+    0,0,114,91,1,0,0,114,226,0,0,0,114,102,1,0,
+    0,114,234,0,0,0,114,108,1,0,0,114,68,1,0,0,
+    114,7,0,0,0,114,7,0,0,0,114,7,0,0,0,114,
+    8,0,0,0,114,94,1,0,0,196,5,0,0,115,24,0,
+    0,0,8,0,4,2,8,7,8,16,4,4,8,2,8,15,
+    10,5,8,51,2,31,10,1,12,17,114,94,1,0,0,99,
+    4,0,0,0,0,0,0,0,0,0,0,0,6,0,0,0,
+    8,0,0,0,67,0,0,0,115,144,0,0,0,124,0,160,
+    0,100,1,161,1,125,4,124,0,160,0,100,2,161,1,125,
+    5,124,4,115,33,124,5,114,18,124,5,106,1,125,4,110,
+    15,124,2,124,3,107,2,114,28,116,2,124,1,124,2,131,
+    2,125,4,110,5,116,3,124,1,124,2,131,2,125,4,124,
+    5,115,42,116,4,124,1,124,2,124,4,100,3,141,3,125,
+    5,122,19,124,5,124,0,100,2,60,0,124,4,124,0,100,
+    1,60,0,124,2,124,0,100,4,60,0,124,3,124,0,100,
+    5,60,0,87,0,100,0,83,0,4,0,116,5,121,71,1,
+    0,1,0,1,0,89,0,100,0,83,0,119,0,41,6,78,
+    218,10,95,95,108,111,97,100,101,114,95,95,218,8,95,95,
+    115,112,101,99,95,95,114,95,1,0,0,90,8,95,95,102,
+    105,108,101,95,95,90,10,95,95,99,97,99,104,101,100,95,
+    95,41,6,218,3,103,101,116,114,164,0,0,0,114,41,1,
+    0,0,114,34,1,0,0,114,213,0,0,0,218,9,69,120,
+    99,101,112,116,105,111,110,41,6,90,2,110,115,114,141,0,
+    0,0,90,8,112,97,116,104,110,97,109,101,90,9,99,112,
+    97,116,104,110,97,109,101,114,164,0,0,0,114,210,0,0,
     0,114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,
-    218,8,60,109,111,100,117,108,101,62,1,0,0,0,115,180,
-    0,0,0,4,0,4,22,8,3,8,1,8,1,8,1,8,
-    1,10,3,4,1,8,1,10,1,8,2,4,3,10,1,6,
-    2,22,2,8,1,8,1,10,1,14,1,4,4,4,1,2,
-    1,2,1,4,255,8,4,6,16,8,3,8,5,8,5,4,
-    6,10,1,8,30,8,6,8,8,8,10,8,9,8,5,4,
-    7,10,1,8,8,10,5,10,22,0,127,16,30,12,1,4,
-    2,4,1,6,2,4,1,10,1,8,2,6,2,8,2,16,
-    2,8,71,8,40,8,19,8,12,8,12,8,31,8,20,8,
-    33,8,28,10,24,10,13,10,10,8,11,6,14,4,3,2,
-    1,12,255,14,73,14,67,16,30,0,127,14,17,18,50,18,
-    45,18,25,14,53,14,63,14,49,0,127,14,29,0,127,10,
-    30,8,23,8,11,12,5,
+    218,14,95,102,105,120,95,117,112,95,109,111,100,117,108,101,
+    97,6,0,0,115,36,0,0,0,10,2,10,1,4,1,4,
+    1,8,1,8,1,12,1,10,2,4,1,14,1,2,1,8,
+    1,8,1,8,1,14,1,12,1,6,2,2,254,114,113,1,
+    0,0,99,0,0,0,0,0,0,0,0,0,0,0,0,3,
+    0,0,0,3,0,0,0,67,0,0,0,115,38,0,0,0,
+    116,0,116,1,160,2,161,0,102,2,125,0,116,3,116,4,
+    102,2,125,1,116,5,116,6,102,2,125,2,124,0,124,1,
+    124,2,103,3,83,0,41,2,122,95,82,101,116,117,114,110,
+    115,32,97,32,108,105,115,116,32,111,102,32,102,105,108,101,
+    45,98,97,115,101,100,32,109,111,100,117,108,101,32,108,111,
+    97,100,101,114,115,46,10,10,32,32,32,32,69,97,99,104,
+    32,105,116,101,109,32,105,115,32,97,32,116,117,112,108,101,
+    32,40,108,111,97,100,101,114,44,32,115,117,102,102,105,120,
+    101,115,41,46,10,32,32,32,32,78,41,7,114,30,1,0,
+    0,114,187,0,0,0,218,18,101,120,116,101,110,115,105,111,
+    110,95,115,117,102,102,105,120,101,115,114,34,1,0,0,114,
+    127,0,0,0,114,41,1,0,0,114,113,0,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,7,
+    0,0,0,114,7,0,0,0,114,8,0,0,0,114,208,0,
+    0,0,120,6,0,0,115,8,0,0,0,12,5,8,1,8,
+    1,10,1,114,208,0,0,0,99,1,0,0,0,0,0,0,
+    0,0,0,0,0,1,0,0,0,1,0,0,0,67,0,0,
+    0,115,8,0,0,0,124,0,97,0,100,0,83,0,114,69,
+    0,0,0,41,1,114,159,0,0,0,41,1,218,17,95,98,
+    111,111,116,115,116,114,97,112,95,109,111,100,117,108,101,114,
+    7,0,0,0,114,7,0,0,0,114,8,0,0,0,218,21,
+    95,115,101,116,95,98,111,111,116,115,116,114,97,112,95,109,
+    111,100,117,108,101,131,6,0,0,115,2,0,0,0,8,2,
+    114,116,1,0,0,99,1,0,0,0,0,0,0,0,0,0,
+    0,0,2,0,0,0,4,0,0,0,67,0,0,0,115,50,
+    0,0,0,116,0,124,0,131,1,1,0,116,1,131,0,125,
+    1,116,2,106,3,160,4,116,5,106,6,124,1,142,0,103,
+    1,161,1,1,0,116,2,106,7,160,8,116,9,161,1,1,
+    0,100,1,83,0,41,2,122,41,73,110,115,116,97,108,108,
+    32,116,104,101,32,112,97,116,104,45,98,97,115,101,100,32,
+    105,109,112,111,114,116,32,99,111,109,112,111,110,101,110,116,
+    115,46,78,41,10,114,116,1,0,0,114,208,0,0,0,114,
+    15,0,0,0,114,83,1,0,0,114,191,0,0,0,114,94,
+    1,0,0,114,108,1,0,0,218,9,109,101,116,97,95,112,
+    97,116,104,114,61,0,0,0,114,77,1,0,0,41,2,114,
+    115,1,0,0,90,17,115,117,112,112,111,114,116,101,100,95,
+    108,111,97,100,101,114,115,114,7,0,0,0,114,7,0,0,
+    0,114,8,0,0,0,218,8,95,105,110,115,116,97,108,108,
+    136,6,0,0,115,8,0,0,0,8,2,6,1,20,1,16,
+    1,114,118,1,0,0,41,1,114,87,0,0,0,114,69,0,
+    0,0,41,3,78,78,78,41,2,114,0,0,0,0,114,0,
+    0,0,0,41,1,84,41,85,114,152,0,0,0,114,159,0,
+    0,0,114,187,0,0,0,114,91,0,0,0,114,15,0,0,
+    0,114,99,0,0,0,114,184,0,0,0,114,25,0,0,0,
+    114,231,0,0,0,90,2,110,116,114,18,0,0,0,114,215,
+    0,0,0,90,5,112,111,115,105,120,114,50,0,0,0,218,
+    3,97,108,108,114,59,0,0,0,114,136,0,0,0,114,57,
+    0,0,0,114,62,0,0,0,90,20,95,112,97,116,104,115,
+    101,112,115,95,119,105,116,104,95,99,111,108,111,110,114,28,
+    0,0,0,90,37,95,67,65,83,69,95,73,78,83,69,78,
+    83,73,84,73,86,69,95,80,76,65,84,70,79,82,77,83,
+    95,66,89,84,69,83,95,75,69,89,114,27,0,0,0,114,
+    29,0,0,0,114,21,0,0,0,114,36,0,0,0,114,42,
+    0,0,0,114,45,0,0,0,114,67,0,0,0,114,74,0,
+    0,0,114,75,0,0,0,114,79,0,0,0,114,80,0,0,
+    0,114,83,0,0,0,114,86,0,0,0,114,95,0,0,0,
+    218,4,116,121,112,101,218,8,95,95,99,111,100,101,95,95,
+    114,186,0,0,0,114,34,0,0,0,114,172,0,0,0,114,
+    33,0,0,0,114,39,0,0,0,114,8,1,0,0,114,116,
+    0,0,0,114,112,0,0,0,114,127,0,0,0,114,61,0,
+    0,0,114,114,1,0,0,114,232,0,0,0,114,113,0,0,
+    0,90,23,68,69,66,85,71,95,66,89,84,69,67,79,68,
+    69,95,83,85,70,70,73,88,69,83,90,27,79,80,84,73,
+    77,73,90,69,68,95,66,89,84,69,67,79,68,69,95,83,
+    85,70,70,73,88,69,83,114,121,0,0,0,114,128,0,0,
+    0,114,135,0,0,0,114,137,0,0,0,114,139,0,0,0,
+    114,160,0,0,0,114,167,0,0,0,114,176,0,0,0,114,
+    180,0,0,0,114,182,0,0,0,114,189,0,0,0,114,194,
+    0,0,0,114,195,0,0,0,114,200,0,0,0,218,6,111,
+    98,106,101,99,116,114,209,0,0,0,114,213,0,0,0,114,
+    214,0,0,0,114,235,0,0,0,114,249,0,0,0,114,11,
+    1,0,0,114,34,1,0,0,114,41,1,0,0,114,30,1,
+    0,0,114,47,1,0,0,114,73,1,0,0,114,77,1,0,
+    0,114,94,1,0,0,114,113,1,0,0,114,208,0,0,0,
+    114,116,1,0,0,114,118,1,0,0,114,7,0,0,0,114,
+    7,0,0,0,114,7,0,0,0,114,8,0,0,0,218,8,
+    60,109,111,100,117,108,101,62,1,0,0,0,115,180,0,0,
+    0,4,0,4,22,8,3,8,1,8,1,8,1,8,1,10,
+    3,4,1,8,1,10,1,8,2,4,3,10,1,6,2,22,
+    2,8,1,8,1,10,1,14,1,4,4,4,1,2,1,2,
+    1,4,255,8,4,6,16,8,3,8,5,8,5,4,6,10,
+    1,8,30,8,6,8,8,8,10,8,9,8,5,4,7,10,
+    1,8,8,10,5,10,22,0,127,16,30,12,1,4,2,4,
+    1,6,2,4,1,10,1,8,2,6,2,8,2,16,2,8,
+    71,8,40,8,19,8,12,8,12,8,31,8,20,8,33,8,
+    28,10,24,10,13,10,10,8,11,6,14,4,3,2,1,12,
+    255,14,73,14,67,16,30,0,127,14,17,18,50,18,45,18,
+    25,14,53,14,63,14,49,0,127,14,29,0,127,10,30,8,
+    23,8,11,12,5,
 };
diff --git a/Python/importlib_zipimport.h b/Python/importlib_zipimport.h
index fa00ffc89ea26..9db4e0d3bd0c7 100644
--- a/Python/importlib_zipimport.h
+++ b/Python/importlib_zipimport.h
@@ -118,946 +118,946 @@ const unsigned char _Py_M__zipimport[] = {
     101,32,111,102,32,116,104,101,10,32,32,32,32,122,105,112,
     102,105,108,101,32,116,97,114,103,101,116,101,100,46,10,32,
     32,32,32,99,2,0,0,0,0,0,0,0,0,0,0,0,
-    8,0,0,0,9,0,0,0,67,0,0,0,115,34,1,0,
+    8,0,0,0,9,0,0,0,67,0,0,0,115,36,1,0,
     0,116,0,124,1,116,1,131,2,115,14,100,1,100,0,108,
     2,125,2,124,2,160,3,124,1,161,1,125,1,124,1,115,
     22,116,4,100,2,124,1,100,3,141,2,130,1,116,5,114,
     30,124,1,160,6,116,5,116,7,161,2,125,1,103,0,125,
     3,9,0,122,7,116,8,160,9,124,1,161,1,125,4,87,
-    0,110,34,4,0,116,10,116,11,102,2,121,144,1,0,1,
+    0,110,35,4,0,116,10,116,11,102,2,121,75,1,0,1,
     0,1,0,116,8,160,12,124,1,161,1,92,2,125,5,125,
     6,124,5,124,1,107,2,114,66,116,4,100,5,124,1,100,
     3,141,2,130,1,124,5,125,1,124,3,160,13,124,6,161,
-    1,1,0,89,0,110,14,124,4,106,14,100,6,64,0,100,
-    7,107,3,114,88,116,4,100,5,124,1,100,3,141,2,130,
-    1,113,90,113,33,122,6,116,15,124,1,25,0,125,7,87,
-    0,110,15,4,0,116,16,121,143,1,0,1,0,1,0,116,
-    17,124,1,131,1,125,7,124,7,116,15,124,1,60,0,89,
-    0,124,7,124,0,95,18,124,1,124,0,95,19,116,8,106,
-    20,124,3,100,0,100,0,100,8,133,3,25,0,142,0,124,
-    0,95,21,124,0,106,21,114,141,124,0,4,0,106,21,116,
-    7,55,0,2,0,95,21,100,0,83,0,100,0,83,0,119,
-    0,119,0,41,9,78,114,0,0,0,0,122,21,97,114,99,
-    104,105,118,101,32,112,97,116,104,32,105,115,32,101,109,112,
-    116,121,169,1,218,4,112,97,116,104,84,122,14,110,111,116,
-    32,97,32,90,105,112,32,102,105,108,101,105,0,240,0,0,
-    105,0,128,0,0,233,255,255,255,255,41,22,218,10,105,115,
-    105,110,115,116,97,110,99,101,218,3,115,116,114,218,2,111,
-    115,90,8,102,115,100,101,99,111,100,101,114,3,0,0,0,
-    218,12,97,108,116,95,112,97,116,104,95,115,101,112,218,7,
-    114,101,112,108,97,99,101,218,8,112,97,116,104,95,115,101,
-    112,218,19,95,98,111,111,116,115,116,114,97,112,95,101,120,
-    116,101,114,110,97,108,90,10,95,112,97,116,104,95,115,116,
-    97,116,218,7,79,83,69,114,114,111,114,218,10,86,97,108,
-    117,101,69,114,114,111,114,90,11,95,112,97,116,104,95,115,
-    112,108,105,116,218,6,97,112,112,101,110,100,90,7,115,116,
-    95,109,111,100,101,218,20,95,122,105,112,95,100,105,114,101,
-    99,116,111,114,121,95,99,97,99,104,101,218,8,75,101,121,
-    69,114,114,111,114,218,15,95,114,101,97,100,95,100,105,114,
-    101,99,116,111,114,121,218,6,95,102,105,108,101,115,218,7,
-    97,114,99,104,105,118,101,218,10,95,112,97,116,104,95,106,
-    111,105,110,218,6,112,114,101,102,105,120,41,8,218,4,115,
-    101,108,102,114,13,0,0,0,114,17,0,0,0,114,31,0,
-    0,0,90,2,115,116,90,7,100,105,114,110,97,109,101,90,
-    8,98,97,115,101,110,97,109,101,218,5,102,105,108,101,115,
-    114,9,0,0,0,114,9,0,0,0,114,10,0,0,0,218,
-    8,95,95,105,110,105,116,95,95,64,0,0,0,115,68,0,
-    0,0,10,1,8,1,10,1,4,1,12,1,4,1,12,1,
-    4,2,2,1,2,1,14,1,16,1,14,3,8,1,12,1,
-    4,1,14,1,14,3,12,2,2,1,2,240,2,18,12,1,
-    12,1,8,1,10,1,6,1,6,1,22,2,6,1,18,1,
-    4,255,2,249,2,239,122,20,122,105,112,105,109,112,111,114,
-    116,101,114,46,95,95,105,110,105,116,95,95,78,99,3,0,
-    0,0,0,0,0,0,0,0,0,0,5,0,0,0,4,0,
-    0,0,67,0,0,0,115,90,0,0,0,116,0,160,1,100,
-    1,116,2,161,2,1,0,116,3,124,0,124,1,131,2,125,
-    3,124,3,100,2,117,1,114,19,124,0,103,0,102,2,83,
-    0,116,4,124,0,124,1,131,2,125,4,116,5,124,0,124,
-    4,131,2,114,41,100,2,124,0,106,6,155,0,116,7,155,
-    0,124,4,155,0,157,3,103,1,102,2,83,0,100,2,103,
-    0,102,2,83,0,41,3,97,47,2,0,0,102,105,110,100,
-    95,108,111,97,100,101,114,40,102,117,108,108,110,97,109,101,
-    44,32,112,97,116,104,61,78,111,110,101,41,32,45,62,32,
-    115,101,108,102,44,32,115,116,114,32,111,114,32,78,111,110,
-    101,46,10,10,32,32,32,32,32,32,32,32,83,101,97,114,
-    99,104,32,102,111,114,32,97,32,109,111,100,117,108,101,32,
-    115,112,101,99,105,102,105,101,100,32,98,121,32,39,102,117,
-    108,108,110,97,109,101,39,46,32,39,102,117,108,108,110,97,
-    109,101,39,32,109,117,115,116,32,98,101,32,116,104,101,10,
-    32,32,32,32,32,32,32,32,102,117,108,108,121,32,113,117,
-    97,108,105,102,105,101,100,32,40,100,111,116,116,101,100,41,
-    32,109,111,100,117,108,101,32,110,97,109,101,46,32,73,116,
-    32,114,101,116,117,114,110,115,32,116,104,101,32,122,105,112,
-    105,109,112,111,114,116,101,114,10,32,32,32,32,32,32,32,
-    32,105,110,115,116,97,110,99,101,32,105,116,115,101,108,102,
-    32,105,102,32,116,104,101,32,109,111,100,117,108,101,32,119,
-    97,115,32,102,111,117,110,100,44,32,97,32,115,116,114,105,
-    110,103,32,99,111,110,116,97,105,110,105,110,103,32,116,104,
-    101,10,32,32,32,32,32,32,32,32,102,117,108,108,32,112,
-    97,116,104,32,110,97,109,101,32,105,102,32,105,116,39,115,
-    32,112,111,115,115,105,98,108,121,32,97,32,112,111,114,116,
-    105,111,110,32,111,102,32,97,32,110,97,109,101,115,112,97,
-    99,101,32,112,97,99,107,97,103,101,44,10,32,32,32,32,
-    32,32,32,32,111,114,32,78,111,110,101,32,111,116,104,101,
-    114,119,105,115,101,46,32,84,104,101,32,111,112,116,105,111,
-    110,97,108,32,39,112,97,116,104,39,32,97,114,103,117,109,
-    101,110,116,32,105,115,32,105,103,110,111,114,101,100,32,45,
-    45,32,105,116,39,115,10,32,32,32,32,32,32,32,32,116,
-    104,101,114,101,32,102,111,114,32,99,111,109,112,97,116,105,
-    98,105,108,105,116,121,32,119,105,116,104,32,116,104,101,32,
-    105,109,112,111,114,116,101,114,32,112,114,111,116,111,99,111,
-    108,46,10,10,32,32,32,32,32,32,32,32,68,101,112,114,
-    101,99,97,116,101,100,32,115,105,110,99,101,32,80,121,116,
-    104,111,110,32,51,46,49,48,46,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,32,32,32,32,32,32,32,32,122,102,122,105,112,
-    105,109,112,111,114,116,101,114,46,102,105,110,100,95,108,111,
-    97,100,101,114,40,41,32,105,115,32,100,101,112,114,101,99,
-    97,116,101,100,32,97,110,100,32,115,108,97,116,101,100,32,
-    102,111,114,32,114,101,109,111,118,97,108,32,105,110,32,80,
-    121,116,104,111,110,32,51,46,49,50,59,32,117,115,101,32,
+    1,1,0,89,0,110,15,119,0,124,4,106,14,100,6,64,
+    0,100,7,107,3,114,89,116,4,100,5,124,1,100,3,141,
+    2,130,1,113,91,113,33,122,6,116,15,124,1,25,0,125,
+    7,87,0,110,17,4,0,116,16,121,114,1,0,1,0,1,
+    0,116,17,124,1,131,1,125,7,124,7,116,15,124,1,60,
+    0,89,0,110,1,119,0,124,7,124,0,95,18,124,1,124,
+    0,95,19,116,8,106,20,124,3,100,0,100,0,100,8,133,
+    3,25,0,142,0,124,0,95,21,124,0,106,21,114,144,124,
+    0,4,0,106,21,116,7,55,0,2,0,95,21,100,0,83,
+    0,100,0,83,0,41,9,78,114,0,0,0,0,122,21,97,
+    114,99,104,105,118,101,32,112,97,116,104,32,105,115,32,101,
+    109,112,116,121,169,1,218,4,112,97,116,104,84,122,14,110,
+    111,116,32,97,32,90,105,112,32,102,105,108,101,105,0,240,
+    0,0,105,0,128,0,0,233,255,255,255,255,41,22,218,10,
+    105,115,105,110,115,116,97,110,99,101,218,3,115,116,114,218,
+    2,111,115,90,8,102,115,100,101,99,111,100,101,114,3,0,
+    0,0,218,12,97,108,116,95,112,97,116,104,95,115,101,112,
+    218,7,114,101,112,108,97,99,101,218,8,112,97,116,104,95,
+    115,101,112,218,19,95,98,111,111,116,115,116,114,97,112,95,
+    101,120,116,101,114,110,97,108,90,10,95,112,97,116,104,95,
+    115,116,97,116,218,7,79,83,69,114,114,111,114,218,10,86,
+    97,108,117,101,69,114,114,111,114,90,11,95,112,97,116,104,
+    95,115,112,108,105,116,218,6,97,112,112,101,110,100,90,7,
+    115,116,95,109,111,100,101,218,20,95,122,105,112,95,100,105,
+    114,101,99,116,111,114,121,95,99,97,99,104,101,218,8,75,
+    101,121,69,114,114,111,114,218,15,95,114,101,97,100,95,100,
+    105,114,101,99,116,111,114,121,218,6,95,102,105,108,101,115,
+    218,7,97,114,99,104,105,118,101,218,10,95,112,97,116,104,
+    95,106,111,105,110,218,6,112,114,101,102,105,120,41,8,218,
+    4,115,101,108,102,114,13,0,0,0,114,17,0,0,0,114,
+    31,0,0,0,90,2,115,116,90,7,100,105,114,110,97,109,
+    101,90,8,98,97,115,101,110,97,109,101,218,5,102,105,108,
+    101,115,114,9,0,0,0,114,9,0,0,0,114,10,0,0,
+    0,218,8,95,95,105,110,105,116,95,95,64,0,0,0,115,
+    68,0,0,0,10,1,8,1,10,1,4,1,12,1,4,1,
+    12,1,4,2,2,1,2,1,14,1,16,1,14,3,8,1,
+    12,1,4,1,14,1,2,249,14,10,12,2,2,1,2,240,
+    2,18,12,1,12,1,8,1,12,1,2,254,6,3,6,1,
+    22,2,6,1,18,1,4,255,122,20,122,105,112,105,109,112,
+    111,114,116,101,114,46,95,95,105,110,105,116,95,95,78,99,
+    3,0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,
+    4,0,0,0,67,0,0,0,115,90,0,0,0,116,0,160,
+    1,100,1,116,2,161,2,1,0,116,3,124,0,124,1,131,
+    2,125,3,124,3,100,2,117,1,114,19,124,0,103,0,102,
+    2,83,0,116,4,124,0,124,1,131,2,125,4,116,5,124,
+    0,124,4,131,2,114,41,100,2,124,0,106,6,155,0,116,
+    7,155,0,124,4,155,0,157,3,103,1,102,2,83,0,100,
+    2,103,0,102,2,83,0,41,3,97,47,2,0,0,102,105,
+    110,100,95,108,111,97,100,101,114,40,102,117,108,108,110,97,
+    109,101,44,32,112,97,116,104,61,78,111,110,101,41,32,45,
+    62,32,115,101,108,102,44,32,115,116,114,32,111,114,32,78,
+    111,110,101,46,10,10,32,32,32,32,32,32,32,32,83,101,
+    97,114,99,104,32,102,111,114,32,97,32,109,111,100,117,108,
+    101,32,115,112,101,99,105,102,105,101,100,32,98,121,32,39,
+    102,117,108,108,110,97,109,101,39,46,32,39,102,117,108,108,
+    110,97,109,101,39,32,109,117,115,116,32,98,101,32,116,104,
+    101,10,32,32,32,32,32,32,32,32,102,117,108,108,121,32,
+    113,117,97,108,105,102,105,101,100,32,40,100,111,116,116,101,
+    100,41,32,109,111,100,117,108,101,32,110,97,109,101,46,32,
+    73,116,32,114,101,116,117,114,110,115,32,116,104,101,32,122,
+    105,112,105,109,112,111,114,116,101,114,10,32,32,32,32,32,
+    32,32,32,105,110,115,116,97,110,99,101,32,105,116,115,101,
+    108,102,32,105,102,32,116,104,101,32,109,111,100,117,108,101,
+    32,119,97,115,32,102,111,117,110,100,44,32,97,32,115,116,
+    114,105,110,103,32,99,111,110,116,97,105,110,105,110,103,32,
+    116,104,101,10,32,32,32,32,32,32,32,32,102,117,108,108,
+    32,112,97,116,104,32,110,97,109,101,32,105,102,32,105,116,
+    39,115,32,112,111,115,115,105,98,108,121,32,97,32,112,111,
+    114,116,105,111,110,32,111,102,32,97,32,110,97,109,101,115,
+    112,97,99,101,32,112,97,99,107,97,103,101,44,10,32,32,
+    32,32,32,32,32,32,111,114,32,78,111,110,101,32,111,116,
+    104,101,114,119,105,115,101,46,32,84,104,101,32,111,112,116,
+    105,111,110,97,108,32,39,112,97,116,104,39,32,97,114,103,
+    117,109,101,110,116,32,105,115,32,105,103,110,111,114,101,100,
+    32,45,45,32,105,116,39,115,10,32,32,32,32,32,32,32,
+    32,116,104,101,114,101,32,102,111,114,32,99,111,109,112,97,
+    116,105,98,105,108,105,116,121,32,119,105,116,104,32,116,104,
+    101,32,105,109,112,111,114,116,101,114,32,112,114,111,116,111,
+    99,111,108,46,10,10,32,32,32,32,32,32,32,32,68,101,
+    112,114,101,99,97,116,101,100,32,115,105,110,99,101,32,80,
+    121,116,104,111,110,32,51,46,49,48,46,32,85,115,101,32,
     102,105,110,100,95,115,112,101,99,40,41,32,105,110,115,116,
-    101,97,100,78,41,8,218,9,95,119,97,114,110,105,110,103,
-    115,218,4,119,97,114,110,218,18,68,101,112,114,101,99,97,
-    116,105,111,110,87,97,114,110,105,110,103,218,16,95,103,101,
-    116,95,109,111,100,117,108,101,95,105,110,102,111,218,16,95,
-    103,101,116,95,109,111,100,117,108,101,95,112,97,116,104,218,
-    7,95,105,115,95,100,105,114,114,29,0,0,0,114,20,0,
-    0,0,41,5,114,32,0,0,0,218,8,102,117,108,108,110,
-    97,109,101,114,13,0,0,0,218,2,109,105,218,7,109,111,
-    100,112,97,116,104,114,9,0,0,0,114,9,0,0,0,114,
-    10,0,0,0,218,11,102,105,110,100,95,108,111,97,100,101,
-    114,110,0,0,0,115,20,0,0,0,6,12,2,2,4,254,
-    10,3,8,1,8,2,10,7,10,1,24,4,8,2,122,23,
-    122,105,112,105,109,112,111,114,116,101,114,46,102,105,110,100,
-    95,108,111,97,100,101,114,99,3,0,0,0,0,0,0,0,
-    0,0,0,0,3,0,0,0,4,0,0,0,67,0,0,0,
-    115,28,0,0,0,116,0,160,1,100,1,116,2,161,2,1,
-    0,124,0,160,3,124,1,124,2,161,2,100,2,25,0,83,
-    0,41,4,97,203,1,0,0,102,105,110,100,95,109,111,100,
-    117,108,101,40,102,117,108,108,110,97,109,101,44,32,112,97,
-    116,104,61,78,111,110,101,41,32,45,62,32,115,101,108,102,
-    32,111,114,32,78,111,110,101,46,10,10,32,32,32,32,32,
-    32,32,32,83,101,97,114,99,104,32,102,111,114,32,97,32,
-    109,111,100,117,108,101,32,115,112,101,99,105,102,105,101,100,
-    32,98,121,32,39,102,117,108,108,110,97,109,101,39,46,32,
-    39,102,117,108,108,110,97,109,101,39,32,109,117,115,116,32,
-    98,101,32,116,104,101,10,32,32,32,32,32,32,32,32,102,
-    117,108,108,121,32,113,117,97,108,105,102,105,101,100,32,40,
-    100,111,116,116,101,100,41,32,109,111,100,117,108,101,32,110,
-    97,109,101,46,32,73,116,32,114,101,116,117,114,110,115,32,
-    116,104,101,32,122,105,112,105,109,112,111,114,116,101,114,10,
-    32,32,32,32,32,32,32,32,105,110,115,116,97,110,99,101,
-    32,105,116,115,101,108,102,32,105,102,32,116,104,101,32,109,
-    111,100,117,108,101,32,119,97,115,32,102,111,117,110,100,44,
-    32,111,114,32,78,111,110,101,32,105,102,32,105,116,32,119,
-    97,115,110,39,116,46,10,32,32,32,32,32,32,32,32,84,
-    104,101,32,111,112,116,105,111,110,97,108,32,39,112,97,116,
-    104,39,32,97,114,103,117,109,101,110,116,32,105,115,32,105,
-    103,110,111,114,101,100,32,45,45,32,105,116,39,115,32,116,
-    104,101,114,101,32,102,111,114,32,99,111,109,112,97,116,105,
-    98,105,108,105,116,121,10,32,32,32,32,32,32,32,32,119,
-    105,116,104,32,116,104,101,32,105,109,112,111,114,116,101,114,
-    32,112,114,111,116,111,99,111,108,46,10,10,32,32,32,32,
-    32,32,32,32,68,101,112,114,101,99,97,116,101,100,32,115,
-    105,110,99,101,32,80,121,116,104,111,110,32,51,46,49,48,
-    46,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,32,32,32,32,32,
-    32,32,32,122,102,122,105,112,105,109,112,111,114,116,101,114,
-    46,102,105,110,100,95,109,111,100,117,108,101,40,41,32,105,
-    115,32,100,101,112,114,101,99,97,116,101,100,32,97,110,100,
-    32,115,108,97,116,101,100,32,102,111,114,32,114,101,109,111,
-    118,97,108,32,105,110,32,80,121,116,104,111,110,32,51,46,
-    49,50,59,32,117,115,101,32,102,105,110,100,95,115,112,101,
-    99,40,41,32,105,110,115,116,101,97,100,114,0,0,0,0,
-    78,41,4,114,35,0,0,0,114,36,0,0,0,114,37,0,
-    0,0,114,44,0,0,0,41,3,114,32,0,0,0,114,41,
-    0,0,0,114,13,0,0,0,114,9,0,0,0,114,9,0,
-    0,0,114,10,0,0,0,218,11,102,105,110,100,95,109,111,
-    100,117,108,101,147,0,0,0,115,8,0,0,0,6,11,2,
-    2,4,254,16,3,122,23,122,105,112,105,109,112,111,114,116,
-    101,114,46,102,105,110,100,95,109,111,100,117,108,101,99,3,
-    0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,5,
-    0,0,0,67,0,0,0,115,108,0,0,0,116,0,124,0,
-    124,1,131,2,125,3,124,3,100,1,117,1,114,17,116,1,
-    106,2,124,1,124,0,124,3,100,2,141,3,83,0,116,3,
-    124,0,124,1,131,2,125,4,116,4,124,0,124,4,131,2,
-    114,52,124,0,106,5,155,0,116,6,155,0,124,4,155,0,
-    157,3,125,5,116,1,106,7,124,1,100,1,100,3,100,4,
-    141,3,125,6,124,6,106,8,160,9,124,5,161,1,1,0,
-    124,6,83,0,100,1,83,0,41,5,122,107,67,114,101,97,
-    116,101,32,97,32,77,111,100,117,108,101,83,112,101,99,32,
+    101,97,100,46,10,32,32,32,32,32,32,32,32,122,102,122,
+    105,112,105,109,112,111,114,116,101,114,46,102,105,110,100,95,
+    108,111,97,100,101,114,40,41,32,105,115,32,100,101,112,114,
+    101,99,97,116,101,100,32,97,110,100,32,115,108,97,116,101,
+    100,32,102,111,114,32,114,101,109,111,118,97,108,32,105,110,
+    32,80,121,116,104,111,110,32,51,46,49,50,59,32,117,115,
+    101,32,102,105,110,100,95,115,112,101,99,40,41,32,105,110,
+    115,116,101,97,100,78,41,8,218,9,95,119,97,114,110,105,
+    110,103,115,218,4,119,97,114,110,218,18,68,101,112,114,101,
+    99,97,116,105,111,110,87,97,114,110,105,110,103,218,16,95,
+    103,101,116,95,109,111,100,117,108,101,95,105,110,102,111,218,
+    16,95,103,101,116,95,109,111,100,117,108,101,95,112,97,116,
+    104,218,7,95,105,115,95,100,105,114,114,29,0,0,0,114,
+    20,0,0,0,41,5,114,32,0,0,0,218,8,102,117,108,
+    108,110,97,109,101,114,13,0,0,0,218,2,109,105,218,7,
+    109,111,100,112,97,116,104,114,9,0,0,0,114,9,0,0,
+    0,114,10,0,0,0,218,11,102,105,110,100,95,108,111,97,
+    100,101,114,110,0,0,0,115,20,0,0,0,6,12,2,2,
+    4,254,10,3,8,1,8,2,10,7,10,1,24,4,8,2,
+    122,23,122,105,112,105,109,112,111,114,116,101,114,46,102,105,
+    110,100,95,108,111,97,100,101,114,99,3,0,0,0,0,0,
+    0,0,0,0,0,0,3,0,0,0,4,0,0,0,67,0,
+    0,0,115,28,0,0,0,116,0,160,1,100,1,116,2,161,
+    2,1,0,124,0,160,3,124,1,124,2,161,2,100,2,25,
+    0,83,0,41,4,97,203,1,0,0,102,105,110,100,95,109,
+    111,100,117,108,101,40,102,117,108,108,110,97,109,101,44,32,
+    112,97,116,104,61,78,111,110,101,41,32,45,62,32,115,101,
+    108,102,32,111,114,32,78,111,110,101,46,10,10,32,32,32,
+    32,32,32,32,32,83,101,97,114,99,104,32,102,111,114,32,
+    97,32,109,111,100,117,108,101,32,115,112,101,99,105,102,105,
+    101,100,32,98,121,32,39,102,117,108,108,110,97,109,101,39,
+    46,32,39,102,117,108,108,110,97,109,101,39,32,109,117,115,
+    116,32,98,101,32,116,104,101,10,32,32,32,32,32,32,32,
+    32,102,117,108,108,121,32,113,117,97,108,105,102,105,101,100,
+    32,40,100,111,116,116,101,100,41,32,109,111,100,117,108,101,
+    32,110,97,109,101,46,32,73,116,32,114,101,116,117,114,110,
+    115,32,116,104,101,32,122,105,112,105,109,112,111,114,116,101,
+    114,10,32,32,32,32,32,32,32,32,105,110,115,116,97,110,
+    99,101,32,105,116,115,101,108,102,32,105,102,32,116,104,101,
+    32,109,111,100,117,108,101,32,119,97,115,32,102,111,117,110,
+    100,44,32,111,114,32,78,111,110,101,32,105,102,32,105,116,
+    32,119,97,115,110,39,116,46,10,32,32,32,32,32,32,32,
+    32,84,104,101,32,111,112,116,105,111,110,97,108,32,39,112,
+    97,116,104,39,32,97,114,103,117,109,101,110,116,32,105,115,
+    32,105,103,110,111,114,101,100,32,45,45,32,105,116,39,115,
+    32,116,104,101,114,101,32,102,111,114,32,99,111,109,112,97,
+    116,105,98,105,108,105,116,121,10,32,32,32,32,32,32,32,
+    32,119,105,116,104,32,116,104,101,32,105,109,112,111,114,116,
+    101,114,32,112,114,111,116,111,99,111,108,46,10,10,32,32,
+    32,32,32,32,32,32,68,101,112,114,101,99,97,116,101,100,
+    32,115,105,110,99,101,32,80,121,116,104,111,110,32,51,46,
+    49,48,46,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,32,32,32,
+    32,32,32,32,32,122,102,122,105,112,105,109,112,111,114,116,
+    101,114,46,102,105,110,100,95,109,111,100,117,108,101,40,41,
+    32,105,115,32,100,101,112,114,101,99,97,116,101,100,32,97,
+    110,100,32,115,108,97,116,101,100,32,102,111,114,32,114,101,
+    109,111,118,97,108,32,105,110,32,80,121,116,104,111,110,32,
+    51,46,49,50,59,32,117,115,101,32,102,105,110,100,95,115,
+    112,101,99,40,41,32,105,110,115,116,101,97,100,114,0,0,
+    0,0,78,41,4,114,35,0,0,0,114,36,0,0,0,114,
+    37,0,0,0,114,44,0,0,0,41,3,114,32,0,0,0,
+    114,41,0,0,0,114,13,0,0,0,114,9,0,0,0,114,
+    9,0,0,0,114,10,0,0,0,218,11,102,105,110,100,95,
+    109,111,100,117,108,101,147,0,0,0,115,8,0,0,0,6,
+    11,2,2,4,254,16,3,122,23,122,105,112,105,109,112,111,
+    114,116,101,114,46,102,105,110,100,95,109,111,100,117,108,101,
+    99,3,0,0,0,0,0,0,0,0,0,0,0,7,0,0,
+    0,5,0,0,0,67,0,0,0,115,108,0,0,0,116,0,
+    124,0,124,1,131,2,125,3,124,3,100,1,117,1,114,17,
+    116,1,106,2,124,1,124,0,124,3,100,2,141,3,83,0,
+    116,3,124,0,124,1,131,2,125,4,116,4,124,0,124,4,
+    131,2,114,52,124,0,106,5,155,0,116,6,155,0,124,4,
+    155,0,157,3,125,5,116,1,106,7,124,1,100,1,100,3,
+    100,4,141,3,125,6,124,6,106,8,160,9,124,5,161,1,
+    1,0,124,6,83,0,100,1,83,0,41,5,122,107,67,114,
+    101,97,116,101,32,97,32,77,111,100,117,108,101,83,112,101,
+    99,32,102,111,114,32,116,104,101,32,115,112,101,99,105,102,
+    105,101,100,32,109,111,100,117,108,101,46,10,10,32,32,32,
+    32,32,32,32,32,82,101,116,117,114,110,115,32,78,111,110,
+    101,32,105,102,32,116,104,101,32,109,111,100,117,108,101,32,
+    99,97,110,110,111,116,32,98,101,32,102,111,117,110,100,46,
+    10,32,32,32,32,32,32,32,32,78,41,1,218,10,105,115,
+    95,112,97,99,107,97,103,101,84,41,3,218,4,110,97,109,
+    101,90,6,108,111,97,100,101,114,114,46,0,0,0,41,10,
+    114,38,0,0,0,218,10,95,98,111,111,116,115,116,114,97,
+    112,90,16,115,112,101,99,95,102,114,111,109,95,108,111,97,
+    100,101,114,114,39,0,0,0,114,40,0,0,0,114,29,0,
+    0,0,114,20,0,0,0,90,10,77,111,100,117,108,101,83,
+    112,101,99,90,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,114,
+    24,0,0,0,41,7,114,32,0,0,0,114,41,0,0,0,
+    90,6,116,97,114,103,101,116,90,11,109,111,100,117,108,101,
+    95,105,110,102,111,114,43,0,0,0,114,13,0,0,0,90,
+    4,115,112,101,99,114,9,0,0,0,114,9,0,0,0,114,
+    10,0,0,0,218,9,102,105,110,100,95,115,112,101,99,163,
+    0,0,0,115,24,0,0,0,10,5,8,1,16,1,10,7,
+    10,1,18,4,8,1,2,1,6,255,12,2,4,1,4,2,
+    122,21,122,105,112,105,109,112,111,114,116,101,114,46,102,105,
+    110,100,95,115,112,101,99,99,2,0,0,0,0,0,0,0,
+    0,0,0,0,5,0,0,0,3,0,0,0,67,0,0,0,
+    115,20,0,0,0,116,0,124,0,124,1,131,2,92,3,125,
+    2,125,3,125,4,124,2,83,0,41,2,122,166,103,101,116,
+    95,99,111,100,101,40,102,117,108,108,110,97,109,101,41,32,
+    45,62,32,99,111,100,101,32,111,98,106,101,99,116,46,10,
+    10,32,32,32,32,32,32,32,32,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,115,112,101,99,105,102,105,101,
-    100,32,109,111,100,117,108,101,46,10,10,32,32,32,32,32,
-    32,32,32,82,101,116,117,114,110,115,32,78,111,110,101,32,
-    105,102,32,116,104,101,32,109,111,100,117,108,101,32,99,97,
-    110,110,111,116,32,98,101,32,102,111,117,110,100,46,10,32,
-    32,32,32,32,32,32,32,78,41,1,218,10,105,115,95,112,
-    97,99,107,97,103,101,84,41,3,218,4,110,97,109,101,90,
-    6,108,111,97,100,101,114,114,46,0,0,0,41,10,114,38,
-    0,0,0,218,10,95,98,111,111,116,115,116,114,97,112,90,
-    16,115,112,101,99,95,102,114,111,109,95,108,111,97,100,101,
-    114,114,39,0,0,0,114,40,0,0,0,114,29,0,0,0,
-    114,20,0,0,0,90,10,77,111,100,117,108,101,83,112,101,
-    99,90,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,114,24,0,
-    0,0,41,7,114,32,0,0,0,114,41,0,0,0,90,6,
-    116,97,114,103,101,116,90,11,109,111,100,117,108,101,95,105,
-    110,102,111,114,43,0,0,0,114,13,0,0,0,90,4,115,
-    112,101,99,114,9,0,0,0,114,9,0,0,0,114,10,0,
-    0,0,218,9,102,105,110,100,95,115,112,101,99,163,0,0,
-    0,115,24,0,0,0,10,5,8,1,16,1,10,7,10,1,
-    18,4,8,1,2,1,6,255,12,2,4,1,4,2,122,21,
-    122,105,112,105,109,112,111,114,116,101,114,46,102,105,110,100,
-    95,115,112,101,99,99,2,0,0,0,0,0,0,0,0,0,
-    0,0,5,0,0,0,3,0,0,0,67,0,0,0,115,20,
-    0,0,0,116,0,124,0,124,1,131,2,92,3,125,2,125,
-    3,125,4,124,2,83,0,41,2,122,166,103,101,116,95,99,
-    111,100,101,40,102,117,108,108,110,97,109,101,41,32,45,62,
-    32,99,111,100,101,32,111,98,106,101,99,116,46,10,10,32,
-    32,32,32,32,32,32,32,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,115,112,101,99,105,102,105,101,100,32,
-    109,111,100,117,108,101,46,32,82,97,105,115,101,32,90,105,
-    112,73,109,112,111,114,116,69,114,114,111,114,10,32,32,32,
-    32,32,32,32,32,105,102,32,116,104,101,32,109,111,100,117,
-    108,101,32,99,111,117,108,100,110,39,116,32,98,101,32,105,
-    109,112,111,114,116,101,100,46,10,32,32,32,32,32,32,32,
-    32,78,169,1,218,16,95,103,101,116,95,109,111,100,117,108,
-    101,95,99,111,100,101,169,5,114,32,0,0,0,114,41,0,
-    0,0,218,4,99,111,100,101,218,9,105,115,112,97,99,107,
-    97,103,101,114,43,0,0,0,114,9,0,0,0,114,9,0,
-    0,0,114,10,0,0,0,218,8,103,101,116,95,99,111,100,
-    101,190,0,0,0,115,4,0,0,0,16,6,4,1,122,20,
-    122,105,112,105,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,0,0,0,
-    0,4,0,0,0,8,0,0,0,67,0,0,0,115,112,0,
-    0,0,116,0,114,8,124,1,160,1,116,0,116,2,161,2,
-    125,1,124,1,125,2,124,1,160,3,124,0,106,4,116,2,
-    23,0,161,1,114,29,124,1,116,5,124,0,106,4,116,2,
-    23,0,131,1,100,1,133,2,25,0,125,2,122,7,124,0,
-    106,6,124,2,25,0,125,3,87,0,110,12,4,0,116,7,
-    121,55,1,0,1,0,1,0,116,8,100,2,100,3,124,2,
-    131,3,130,1,116,9,124,0,106,4,124,3,131,2,83,0,
-    119,0,41,4,122,154,103,101,116,95,100,97,116,97,40,112,
-    97,116,104,110,97,109,101,41,32,45,62,32,115,116,114,105,
-    110,103,32,119,105,116,104,32,102,105,108,101,32,100,97,116,
-    97,46,10,10,32,32,32,32,32,32,32,32,82,101,116,117,
-    114,110,32,116,104,101,32,100,97,116,97,32,97,115,115,111,
-    99,105,97,116,101,100,32,119,105,116,104,32,39,112,97,116,
-    104,110,97,109,101,39,46,32,82,97,105,115,101,32,79,83,
-    69,114,114,111,114,32,105,102,10,32,32,32,32,32,32,32,
-    32,116,104,101,32,102,105,108,101,32,119,97,115,110,39,116,
-    32,102,111,117,110,100,46,10,32,32,32,32,32,32,32,32,
-    78,114,0,0,0,0,218,0,41,10,114,18,0,0,0,114,
-    19,0,0,0,114,20,0,0,0,218,10,115,116,97,114,116,
-    115,119,105,116,104,114,29,0,0,0,218,3,108,101,110,114,
-    28,0,0,0,114,26,0,0,0,114,22,0,0,0,218,9,
-    95,103,101,116,95,100,97,116,97,41,4,114,32,0,0,0,
-    218,8,112,97,116,104,110,97,109,101,90,3,107,101,121,218,
-    9,116,111,99,95,101,110,116,114,121,114,9,0,0,0,114,
-    9,0,0,0,114,10,0,0,0,218,8,103,101,116,95,100,
-    97,116,97,200,0,0,0,115,22,0,0,0,4,6,12,1,
-    4,2,16,1,22,1,2,2,14,1,12,1,12,1,12,1,
-    2,254,122,20,122,105,112,105,109,112,111,114,116,101,114,46,
-    103,101,116,95,100,97,116,97,99,2,0,0,0,0,0,0,
-    0,0,0,0,0,5,0,0,0,3,0,0,0,67,0,0,
-    0,115,20,0,0,0,116,0,124,0,124,1,131,2,92,3,
-    125,2,125,3,125,4,124,4,83,0,41,2,122,165,103,101,
-    116,95,102,105,108,101,110,97,109,101,40,102,117,108,108,110,
-    97,109,101,41,32,45,62,32,102,105,108,101,110,97,109,101,
-    32,115,116,114,105,110,103,46,10,10,32,32,32,32,32,32,
-    32,32,82,101,116,117,114,110,32,116,104,101,32,102,105,108,
-    101,110,97,109,101,32,102,111,114,32,116,104,101,32,115,112,
-    101,99,105,102,105,101,100,32,109,111,100,117,108,101,32,111,
-    114,32,114,97,105,115,101,32,90,105,112,73,109,112,111,114,
-    116,69,114,114,111,114,10,32,32,32,32,32,32,32,32,105,
-    102,32,105,116,32,99,111,117,108,100,110,39,116,32,98,101,
+    100,32,109,111,100,117,108,101,46,32,82,97,105,115,101,32,
+    90,105,112,73,109,112,111,114,116,69,114,114,111,114,10,32,
+    32,32,32,32,32,32,32,105,102,32,116,104,101,32,109,111,
+    100,117,108,101,32,99,111,117,108,100,110,39,116,32,98,101,
     32,105,109,112,111,114,116,101,100,46,10,32,32,32,32,32,
-    32,32,32,78,114,50,0,0,0,114,52,0,0,0,114,9,
-    0,0,0,114,9,0,0,0,114,10,0,0,0,218,12,103,
-    101,116,95,102,105,108,101,110,97,109,101,221,0,0,0,115,
-    4,0,0,0,16,8,4,1,122,24,122,105,112,105,109,112,
-    111,114,116,101,114,46,103,101,116,95,102,105,108,101,110,97,
-    109,101,99,2,0,0,0,0,0,0,0,0,0,0,0,6,
-    0,0,0,8,0,0,0,67,0,0,0,115,126,0,0,0,
-    116,0,124,0,124,1,131,2,125,2,124,2,100,1,117,0,
-    114,18,116,1,100,2,124,1,155,2,157,2,124,1,100,3,
-    141,2,130,1,116,2,124,0,124,1,131,2,125,3,124,2,
-    114,32,116,3,160,4,124,3,100,4,161,2,125,4,110,5,
-    124,3,155,0,100,5,157,2,125,4,122,7,124,0,106,5,
-    124,4,25,0,125,5,87,0,110,9,4,0,116,6,121,62,
-    1,0,1,0,1,0,89,0,100,1,83,0,116,7,124,0,
-    106,8,124,5,131,2,160,9,161,0,83,0,119,0,41,6,
-    122,253,103,101,116,95,115,111,117,114,99,101,40,102,117,108,
-    108,110,97,109,101,41,32,45,62,32,115,111,117,114,99,101,
-    32,115,116,114,105,110,103,46,10,10,32,32,32,32,32,32,
-    32,32,82,101,116,117,114,110,32,116,104,101,32,115,111,117,
-    114,99,101,32,99,111,100,101,32,102,111,114,32,116,104,101,
-    32,115,112,101,99,105,102,105,101,100,32,109,111,100,117,108,
-    101,46,32,82,97,105,115,101,32,90,105,112,73,109,112,111,
-    114,116,69,114,114,111,114,10,32,32,32,32,32,32,32,32,
-    105,102,32,116,104,101,32,109,111,100,117,108,101,32,99,111,
-    117,108,100,110,39,116,32,98,101,32,102,111,117,110,100,44,
-    32,114,101,116,117,114,110,32,78,111,110,101,32,105,102,32,
-    116,104,101,32,97,114,99,104,105,118,101,32,100,111,101,115,
-    10,32,32,32,32,32,32,32,32,99,111,110,116,97,105,110,
-    32,116,104,101,32,109,111,100,117,108,101,44,32,98,117,116,
-    32,104,97,115,32,110,111,32,115,111,117,114,99,101,32,102,
-    111,114,32,105,116,46,10,32,32,32,32,32,32,32,32,78,
-    250,18,99,97,110,39,116,32,102,105,110,100,32,109,111,100,
-    117,108,101,32,169,1,114,47,0,0,0,250,11,95,95,105,
-    110,105,116,95,95,46,112,121,250,3,46,112,121,41,10,114,
-    38,0,0,0,114,3,0,0,0,114,39,0,0,0,114,21,
-    0,0,0,114,30,0,0,0,114,28,0,0,0,114,26,0,
-    0,0,114,59,0,0,0,114,29,0,0,0,218,6,100,101,
-    99,111,100,101,41,6,114,32,0,0,0,114,41,0,0,0,
-    114,42,0,0,0,114,13,0,0,0,218,8,102,117,108,108,
-    112,97,116,104,114,61,0,0,0,114,9,0,0,0,114,9,
-    0,0,0,114,10,0,0,0,218,10,103,101,116,95,115,111,
-    117,114,99,101,233,0,0,0,115,26,0,0,0,10,7,8,
-    1,18,1,10,2,4,1,14,1,10,2,2,2,14,1,12,
-    1,6,2,16,1,2,253,122,22,122,105,112,105,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,0,0,0,0,3,0,0,0,
-    4,0,0,0,67,0,0,0,115,40,0,0,0,116,0,124,
-    0,124,1,131,2,125,2,124,2,100,1,117,0,114,18,116,
-    1,100,2,124,1,155,2,157,2,124,1,100,3,141,2,130,
-    1,124,2,83,0,41,4,122,171,105,115,95,112,97,99,107,
-    97,103,101,40,102,117,108,108,110,97,109,101,41,32,45,62,
-    32,98,111,111,108,46,10,10,32,32,32,32,32,32,32,32,
-    82,101,116,117,114,110,32,84,114,117,101,32,105,102,32,116,
-    104,101,32,109,111,100,117,108,101,32,115,112,101,99,105,102,
-    105,101,100,32,98,121,32,102,117,108,108,110,97,109,101,32,
-    105,115,32,97,32,112,97,99,107,97,103,101,46,10,32,32,
-    32,32,32,32,32,32,82,97,105,115,101,32,90,105,112,73,
-    109,112,111,114,116,69,114,114,111,114,32,105,102,32,116,104,
-    101,32,109,111,100,117,108,101,32,99,111,117,108,100,110,39,
-    116,32,98,101,32,102,111,117,110,100,46,10,32,32,32,32,
-    32,32,32,32,78,114,64,0,0,0,114,65,0,0,0,41,
-    2,114,38,0,0,0,114,3,0,0,0,41,3,114,32,0,
-    0,0,114,41,0,0,0,114,42,0,0,0,114,9,0,0,
-    0,114,9,0,0,0,114,10,0,0,0,114,46,0,0,0,
-    3,1,0,0,115,8,0,0,0,10,6,8,1,18,1,4,
-    1,122,22,122,105,112,105,109,112,111,114,116,101,114,46,105,
-    115,95,112,97,99,107,97,103,101,99,2,0,0,0,0,0,
-    0,0,0,0,0,0,9,0,0,0,8,0,0,0,67,0,
-    0,0,115,252,0,0,0,100,1,125,2,116,0,160,1,124,
-    2,116,2,161,2,1,0,116,3,124,0,124,1,131,2,92,
-    3,125,3,125,4,125,5,116,4,106,5,160,6,124,1,161,
-    1,125,6,124,6,100,2,117,0,115,31,116,7,124,6,116,
-    8,131,2,115,40,116,8,124,1,131,1,125,6,124,6,116,
-    4,106,5,124,1,60,0,124,0,124,6,95,9,122,42,124,
-    4,114,62,116,10,124,0,124,1,131,2,125,7,116,11,160,
-    12,124,0,106,13,124,7,161,2,125,8,124,8,103,1,124,
-    6,95,14,116,15,124,6,100,3,131,2,115,70,116,16,124,
-    6,95,16,116,11,160,17,124,6,106,18,124,1,124,5,161,
-    3,1,0,116,19,124,3,124,6,106,18,131,2,1,0,87,
-    0,110,8,1,0,1,0,1,0,116,4,106,5,124,1,61,
-    0,130,0,122,7,116,4,106,5,124,1,25,0,125,6,87,
-    0,110,14,4,0,116,20,121,125,1,0,1,0,1,0,116,
-    21,100,4,124,1,155,2,100,5,157,3,131,1,130,1,116,
-    22,160,23,100,6,124,1,124,5,161,3,1,0,124,6,83,
-    0,119,0,41,7,97,64,1,0,0,108,111,97,100,95,109,
-    111,100,117,108,101,40,102,117,108,108,110,97,109,101,41,32,
-    45,62,32,109,111,100,117,108,101,46,10,10,32,32,32,32,
-    32,32,32,32,76,111,97,100,32,116,104,101,32,109,111,100,
-    117,108,101,32,115,112,101,99,105,102,105,101,100,32,98,121,
-    32,39,102,117,108,108,110,97,109,101,39,46,32,39,102,117,
-    108,108,110,97,109,101,39,32,109,117,115,116,32,98,101,32,
-    116,104,101,10,32,32,32,32,32,32,32,32,102,117,108,108,
-    121,32,113,117,97,108,105,102,105,101,100,32,40,100,111,116,
-    116,101,100,41,32,109,111,100,117,108,101,32,110,97,109,101,
-    46,32,73,116,32,114,101,116,117,114,110,115,32,116,104,101,
-    32,105,109,112,111,114,116,101,100,10,32,32,32,32,32,32,
-    32,32,109,111,100,117,108,101,44,32,111,114,32,114,97,105,
-    115,101,115,32,90,105,112,73,109,112,111,114,116,69,114,114,
-    111,114,32,105,102,32,105,116,32,99,111,117,108,100,32,110,
-    111,116,32,98,101,32,105,109,112,111,114,116,101,100,46,10,
-    10,32,32,32,32,32,32,32,32,68,101,112,114,101,99,97,
-    116,101,100,32,115,105,110,99,101,32,80,121,116,104,111,110,
-    32,51,46,49,48,46,32,85,115,101,32,101,120,101,99,95,
+    32,32,32,78,169,1,218,16,95,103,101,116,95,109,111,100,
+    117,108,101,95,99,111,100,101,169,5,114,32,0,0,0,114,
+    41,0,0,0,218,4,99,111,100,101,218,9,105,115,112,97,
+    99,107,97,103,101,114,43,0,0,0,114,9,0,0,0,114,
+    9,0,0,0,114,10,0,0,0,218,8,103,101,116,95,99,
+    111,100,101,190,0,0,0,115,4,0,0,0,16,6,4,1,
+    122,20,122,105,112,105,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,0,
+    0,0,0,4,0,0,0,8,0,0,0,67,0,0,0,115,
+    112,0,0,0,116,0,114,8,124,1,160,1,116,0,116,2,
+    161,2,125,1,124,1,125,2,124,1,160,3,124,0,106,4,
+    116,2,23,0,161,1,114,29,124,1,116,5,124,0,106,4,
+    116,2,23,0,131,1,100,1,133,2,25,0,125,2,122,7,
+    124,0,106,6,124,2,25,0,125,3,87,0,110,13,4,0,
+    116,7,121,49,1,0,1,0,1,0,116,8,100,2,100,3,
+    124,2,131,3,130,1,119,0,116,9,124,0,106,4,124,3,
+    131,2,83,0,41,4,122,154,103,101,116,95,100,97,116,97,
+    40,112,97,116,104,110,97,109,101,41,32,45,62,32,115,116,
+    114,105,110,103,32,119,105,116,104,32,102,105,108,101,32,100,
+    97,116,97,46,10,10,32,32,32,32,32,32,32,32,82,101,
+    116,117,114,110,32,116,104,101,32,100,97,116,97,32,97,115,
+    115,111,99,105,97,116,101,100,32,119,105,116,104,32,39,112,
+    97,116,104,110,97,109,101,39,46,32,82,97,105,115,101,32,
+    79,83,69,114,114,111,114,32,105,102,10,32,32,32,32,32,
+    32,32,32,116,104,101,32,102,105,108,101,32,119,97,115,110,
+    39,116,32,102,111,117,110,100,46,10,32,32,32,32,32,32,
+    32,32,78,114,0,0,0,0,218,0,41,10,114,18,0,0,
+    0,114,19,0,0,0,114,20,0,0,0,218,10,115,116,97,
+    114,116,115,119,105,116,104,114,29,0,0,0,218,3,108,101,
+    110,114,28,0,0,0,114,26,0,0,0,114,22,0,0,0,
+    218,9,95,103,101,116,95,100,97,116,97,41,4,114,32,0,
+    0,0,218,8,112,97,116,104,110,97,109,101,90,3,107,101,
+    121,218,9,116,111,99,95,101,110,116,114,121,114,9,0,0,
+    0,114,9,0,0,0,114,10,0,0,0,218,8,103,101,116,
+    95,100,97,116,97,200,0,0,0,115,22,0,0,0,4,6,
+    12,1,4,2,16,1,22,1,2,2,14,1,12,1,12,1,
+    2,255,12,2,122,20,122,105,112,105,109,112,111,114,116,101,
+    114,46,103,101,116,95,100,97,116,97,99,2,0,0,0,0,
+    0,0,0,0,0,0,0,5,0,0,0,3,0,0,0,67,
+    0,0,0,115,20,0,0,0,116,0,124,0,124,1,131,2,
+    92,3,125,2,125,3,125,4,124,4,83,0,41,2,122,165,
+    103,101,116,95,102,105,108,101,110,97,109,101,40,102,117,108,
+    108,110,97,109,101,41,32,45,62,32,102,105,108,101,110,97,
+    109,101,32,115,116,114,105,110,103,46,10,10,32,32,32,32,
+    32,32,32,32,82,101,116,117,114,110,32,116,104,101,32,102,
+    105,108,101,110,97,109,101,32,102,111,114,32,116,104,101,32,
+    115,112,101,99,105,102,105,101,100,32,109,111,100,117,108,101,
+    32,111,114,32,114,97,105,115,101,32,90,105,112,73,109,112,
+    111,114,116,69,114,114,111,114,10,32,32,32,32,32,32,32,
+    32,105,102,32,105,116,32,99,111,117,108,100,110,39,116,32,
+    98,101,32,105,109,112,111,114,116,101,100,46,10,32,32,32,
+    32,32,32,32,32,78,114,50,0,0,0,114,52,0,0,0,
+    114,9,0,0,0,114,9,0,0,0,114,10,0,0,0,218,
+    12,103,101,116,95,102,105,108,101,110,97,109,101,221,0,0,
+    0,115,4,0,0,0,16,8,4,1,122,24,122,105,112,105,
+    109,112,111,114,116,101,114,46,103,101,116,95,102,105,108,101,
+    110,97,109,101,99,2,0,0,0,0,0,0,0,0,0,0,
+    0,6,0,0,0,8,0,0,0,67,0,0,0,115,126,0,
+    0,0,116,0,124,0,124,1,131,2,125,2,124,2,100,1,
+    117,0,114,18,116,1,100,2,124,1,155,2,157,2,124,1,
+    100,3,141,2,130,1,116,2,124,0,124,1,131,2,125,3,
+    124,2,114,32,116,3,160,4,124,3,100,4,161,2,125,4,
+    110,5,124,3,155,0,100,5,157,2,125,4,122,7,124,0,
+    106,5,124,4,25,0,125,5,87,0,110,10,4,0,116,6,
+    121,54,1,0,1,0,1,0,89,0,100,1,83,0,119,0,
+    116,7,124,0,106,8,124,5,131,2,160,9,161,0,83,0,
+    41,6,122,253,103,101,116,95,115,111,117,114,99,101,40,102,
+    117,108,108,110,97,109,101,41,32,45,62,32,115,111,117,114,
+    99,101,32,115,116,114,105,110,103,46,10,10,32,32,32,32,
+    32,32,32,32,82,101,116,117,114,110,32,116,104,101,32,115,
+    111,117,114,99,101,32,99,111,100,101,32,102,111,114,32,116,
+    104,101,32,115,112,101,99,105,102,105,101,100,32,109,111,100,
+    117,108,101,46,32,82,97,105,115,101,32,90,105,112,73,109,
+    112,111,114,116,69,114,114,111,114,10,32,32,32,32,32,32,
+    32,32,105,102,32,116,104,101,32,109,111,100,117,108,101,32,
+    99,111,117,108,100,110,39,116,32,98,101,32,102,111,117,110,
+    100,44,32,114,101,116,117,114,110,32,78,111,110,101,32,105,
+    102,32,116,104,101,32,97,114,99,104,105,118,101,32,100,111,
+    101,115,10,32,32,32,32,32,32,32,32,99,111,110,116,97,
+    105,110,32,116,104,101,32,109,111,100,117,108,101,44,32,98,
+    117,116,32,104,97,115,32,110,111,32,115,111,117,114,99,101,
+    32,102,111,114,32,105,116,46,10,32,32,32,32,32,32,32,
+    32,78,250,18,99,97,110,39,116,32,102,105,110,100,32,109,
+    111,100,117,108,101,32,169,1,114,47,0,0,0,250,11,95,
+    95,105,110,105,116,95,95,46,112,121,250,3,46,112,121,41,
+    10,114,38,0,0,0,114,3,0,0,0,114,39,0,0,0,
+    114,21,0,0,0,114,30,0,0,0,114,28,0,0,0,114,
+    26,0,0,0,114,59,0,0,0,114,29,0,0,0,218,6,
+    100,101,99,111,100,101,41,6,114,32,0,0,0,114,41,0,
+    0,0,114,42,0,0,0,114,13,0,0,0,218,8,102,117,
+    108,108,112,97,116,104,114,61,0,0,0,114,9,0,0,0,
+    114,9,0,0,0,114,10,0,0,0,218,10,103,101,116,95,
+    115,111,117,114,99,101,233,0,0,0,115,26,0,0,0,10,
+    7,8,1,18,1,10,2,4,1,14,1,10,2,2,2,14,
+    1,12,1,6,2,2,254,16,3,122,22,122,105,112,105,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,0,0,0,0,3,0,
+    0,0,4,0,0,0,67,0,0,0,115,40,0,0,0,116,
+    0,124,0,124,1,131,2,125,2,124,2,100,1,117,0,114,
+    18,116,1,100,2,124,1,155,2,157,2,124,1,100,3,141,
+    2,130,1,124,2,83,0,41,4,122,171,105,115,95,112,97,
+    99,107,97,103,101,40,102,117,108,108,110,97,109,101,41,32,
+    45,62,32,98,111,111,108,46,10,10,32,32,32,32,32,32,
+    32,32,82,101,116,117,114,110,32,84,114,117,101,32,105,102,
+    32,116,104,101,32,109,111,100,117,108,101,32,115,112,101,99,
+    105,102,105,101,100,32,98,121,32,102,117,108,108,110,97,109,
+    101,32,105,115,32,97,32,112,97,99,107,97,103,101,46,10,
+    32,32,32,32,32,32,32,32,82,97,105,115,101,32,90,105,
+    112,73,109,112,111,114,116,69,114,114,111,114,32,105,102,32,
+    116,104,101,32,109,111,100,117,108,101,32,99,111,117,108,100,
+    110,39,116,32,98,101,32,102,111,117,110,100,46,10,32,32,
+    32,32,32,32,32,32,78,114,64,0,0,0,114,65,0,0,
+    0,41,2,114,38,0,0,0,114,3,0,0,0,41,3,114,
+    32,0,0,0,114,41,0,0,0,114,42,0,0,0,114,9,
+    0,0,0,114,9,0,0,0,114,10,0,0,0,114,46,0,
+    0,0,3,1,0,0,115,8,0,0,0,10,6,8,1,18,
+    1,4,1,122,22,122,105,112,105,109,112,111,114,116,101,114,
+    46,105,115,95,112,97,99,107,97,103,101,99,2,0,0,0,
+    0,0,0,0,0,0,0,0,9,0,0,0,8,0,0,0,
+    67,0,0,0,115,252,0,0,0,100,1,125,2,116,0,160,
+    1,124,2,116,2,161,2,1,0,116,3,124,0,124,1,131,
+    2,92,3,125,3,125,4,125,5,116,4,106,5,160,6,124,
+    1,161,1,125,6,124,6,100,2,117,0,115,31,116,7,124,
+    6,116,8,131,2,115,40,116,8,124,1,131,1,125,6,124,
+    6,116,4,106,5,124,1,60,0,124,0,124,6,95,9,122,
+    42,124,4,114,62,116,10,124,0,124,1,131,2,125,7,116,
+    11,160,12,124,0,106,13,124,7,161,2,125,8,124,8,103,
+    1,124,6,95,14,116,15,124,6,100,3,131,2,115,70,116,
+    16,124,6,95,16,116,11,160,17,124,6,106,18,124,1,124,
+    5,161,3,1,0,116,19,124,3,124,6,106,18,131,2,1,
+    0,87,0,110,8,1,0,1,0,1,0,116,4,106,5,124,
+    1,61,0,130,0,122,7,116,4,106,5,124,1,25,0,125,
+    6,87,0,110,15,4,0,116,20,121,116,1,0,1,0,1,
+    0,116,21,100,4,124,1,155,2,100,5,157,3,131,1,130,
+    1,119,0,116,22,160,23,100,6,124,1,124,5,161,3,1,
+    0,124,6,83,0,41,7,97,64,1,0,0,108,111,97,100,
+    95,109,111,100,117,108,101,40,102,117,108,108,110,97,109,101,
+    41,32,45,62,32,109,111,100,117,108,101,46,10,10,32,32,
+    32,32,32,32,32,32,76,111,97,100,32,116,104,101,32,109,
+    111,100,117,108,101,32,115,112,101,99,105,102,105,101,100,32,
+    98,121,32,39,102,117,108,108,110,97,109,101,39,46,32,39,
+    102,117,108,108,110,97,109,101,39,32,109,117,115,116,32,98,
+    101,32,116,104,101,10,32,32,32,32,32,32,32,32,102,117,
+    108,108,121,32,113,117,97,108,105,102,105,101,100,32,40,100,
+    111,116,116,101,100,41,32,109,111,100,117,108,101,32,110,97,
+    109,101,46,32,73,116,32,114,101,116,117,114,110,115,32,116,
+    104,101,32,105,109,112,111,114,116,101,100,10,32,32,32,32,
+    32,32,32,32,109,111,100,117,108,101,44,32,111,114,32,114,
+    97,105,115,101,115,32,90,105,112,73,109,112,111,114,116,69,
+    114,114,111,114,32,105,102,32,105,116,32,99,111,117,108,100,
+    32,110,111,116,32,98,101,32,105,109,112,111,114,116,101,100,
+    46,10,10,32,32,32,32,32,32,32,32,68,101,112,114,101,
+    99,97,116,101,100,32,115,105,110,99,101,32,80,121,116,104,
+    111,110,32,51,46,49,48,46,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,32,32,32,32,32,32,32,32,122,114,122,105,
+    112,105,109,112,111,114,116,46,122,105,112,105,109,112,111,114,
+    116,101,114,46,108,111,97,100,95,109,111,100,117,108,101,40,
+    41,32,105,115,32,100,101,112,114,101,99,97,116,101,100,32,
+    97,110,100,32,115,108,97,116,101,100,32,102,111,114,32,114,
+    101,109,111,118,97,108,32,105,110,32,80,121,116,104,111,110,
+    32,51,46,49,50,59,32,117,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,32,32,32,32,32,32,32,32,122,114,122,105,112,105,
-    109,112,111,114,116,46,122,105,112,105,109,112,111,114,116,101,
-    114,46,108,111,97,100,95,109,111,100,117,108,101,40,41,32,
-    105,115,32,100,101,112,114,101,99,97,116,101,100,32,97,110,
-    100,32,115,108,97,116,101,100,32,102,111,114,32,114,101,109,
-    111,118,97,108,32,105,110,32,80,121,116,104,111,110,32,51,
-    46,49,50,59,32,117,115,101,32,101,120,101,99,95,109,111,
-    100,117,108,101,40,41,32,105,110,115,116,101,97,100,78,218,
-    12,95,95,98,117,105,108,116,105,110,115,95,95,122,14,76,
-    111,97,100,101,100,32,109,111,100,117,108,101,32,122,25,32,
-    110,111,116,32,102,111,117,110,100,32,105,110,32,115,121,115,
-    46,109,111,100,117,108,101,115,122,30,105,109,112,111,114,116,
-    32,123,125,32,35,32,108,111,97,100,101,100,32,102,114,111,
-    109,32,90,105,112,32,123,125,41,24,114,35,0,0,0,114,
-    36,0,0,0,114,37,0,0,0,114,51,0,0,0,218,3,
-    115,121,115,218,7,109,111,100,117,108,101,115,218,3,103,101,
-    116,114,15,0,0,0,218,12,95,109,111,100,117,108,101,95,
-    116,121,112,101,218,10,95,95,108,111,97,100,101,114,95,95,
-    114,39,0,0,0,114,21,0,0,0,114,30,0,0,0,114,
-    29,0,0,0,90,8,95,95,112,97,116,104,95,95,218,7,
-    104,97,115,97,116,116,114,114,71,0,0,0,90,14,95,102,
-    105,120,95,117,112,95,109,111,100,117,108,101,218,8,95,95,
-    100,105,99,116,95,95,218,4,101,120,101,99,114,26,0,0,
-    0,218,11,73,109,112,111,114,116,69,114,114,111,114,114,48,
-    0,0,0,218,16,95,118,101,114,98,111,115,101,95,109,101,
-    115,115,97,103,101,41,9,114,32,0,0,0,114,41,0,0,
-    0,218,3,109,115,103,114,53,0,0,0,114,54,0,0,0,
-    114,43,0,0,0,90,3,109,111,100,114,13,0,0,0,114,
-    69,0,0,0,114,9,0,0,0,114,9,0,0,0,114,10,
-    0,0,0,218,11,108,111,97,100,95,109,111,100,117,108,101,
-    16,1,0,0,115,54,0,0,0,4,9,12,2,16,1,12,
-    1,18,1,8,1,10,1,6,1,2,2,4,1,10,3,14,
-    1,8,1,10,2,6,1,16,1,16,1,6,1,8,1,2,
-    1,2,2,14,1,12,1,16,1,14,1,4,1,2,253,122,
-    23,122,105,112,105,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,0,0,0,0,3,0,0,0,8,0,0,0,67,0,0,
-    0,115,64,0,0,0,122,10,124,0,160,0,124,1,161,1,
-    115,9,87,0,100,1,83,0,87,0,110,9,4,0,116,1,
-    121,31,1,0,1,0,1,0,89,0,100,1,83,0,100,2,
-    100,3,108,2,109,3,125,2,1,0,124,2,124,0,124,1,
-    131,2,83,0,119,0,41,4,122,204,82,101,116,117,114,110,
-    32,116,104,101,32,82,101,115,111,117,114,99,101,82,101,97,
-    100,101,114,32,102,111,114,32,97,32,112,97,99,107,97,103,
-    101,32,105,110,32,97,32,122,105,112,32,102,105,108,101,46,
-    10,10,32,32,32,32,32,32,32,32,73,102,32,39,102,117,
-    108,108,110,97,109,101,39,32,105,115,32,97,32,112,97,99,
-    107,97,103,101,32,119,105,116,104,105,110,32,116,104,101,32,
-    122,105,112,32,102,105,108,101,44,32,114,101,116,117,114,110,
-    32,116,104,101,10,32,32,32,32,32,32,32,32,39,82,101,
-    115,111,117,114,99,101,82,101,97,100,101,114,39,32,111,98,
-    106,101,99,116,32,102,111,114,32,116,104,101,32,112,97,99,
-    107,97,103,101,46,32,32,79,116,104,101,114,119,105,115,101,
-    32,114,101,116,117,114,110,32,78,111,110,101,46,10,32,32,
-    32,32,32,32,32,32,78,114,0,0,0,0,41,1,218,9,
-    90,105,112,82,101,97,100,101,114,41,4,114,46,0,0,0,
-    114,3,0,0,0,90,17,105,109,112,111,114,116,108,105,98,
-    46,114,101,97,100,101,114,115,114,84,0,0,0,41,3,114,
-    32,0,0,0,114,41,0,0,0,114,84,0,0,0,114,9,
-    0,0,0,114,9,0,0,0,114,10,0,0,0,218,19,103,
-    101,116,95,114,101,115,111,117,114,99,101,95,114,101,97,100,
-    101,114,59,1,0,0,115,18,0,0,0,2,6,10,1,6,
-    1,4,255,12,2,6,1,12,1,10,1,2,253,122,31,122,
-    105,112,105,109,112,111,114,116,101,114,46,103,101,116,95,114,
-    101,115,111,117,114,99,101,95,114,101,97,100,101,114,99,1,
-    0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,8,
-    0,0,0,67,0,0,0,115,72,0,0,0,122,15,116,0,
-    124,0,106,1,131,1,124,0,95,2,124,0,106,2,116,3,
-    124,0,106,1,60,0,87,0,100,1,83,0,4,0,116,4,
-    121,35,1,0,1,0,1,0,116,3,160,5,124,0,106,1,
-    100,1,161,2,1,0,100,1,124,0,95,2,89,0,100,1,
-    83,0,119,0,41,2,122,41,82,101,108,111,97,100,32,116,
-    104,101,32,102,105,108,101,32,100,97,116,97,32,111,102,32,
-    116,104,101,32,97,114,99,104,105,118,101,32,112,97,116,104,
-    46,78,41,6,114,27,0,0,0,114,29,0,0,0,114,28,
-    0,0,0,114,25,0,0,0,114,3,0,0,0,218,3,112,
-    111,112,169,1,114,32,0,0,0,114,9,0,0,0,114,9,
-    0,0,0,114,10,0,0,0,218,17,105,110,118,97,108,105,
-    100,97,116,101,95,99,97,99,104,101,115,74,1,0,0,115,
-    14,0,0,0,2,2,12,1,18,1,12,1,14,1,12,1,
-    2,254,122,29,122,105,112,105,109,112,111,114,116,101,114,46,
-    105,110,118,97,108,105,100,97,116,101,95,99,97,99,104,101,
-    115,99,1,0,0,0,0,0,0,0,0,0,0,0,1,0,
-    0,0,5,0,0,0,67,0,0,0,115,24,0,0,0,100,
-    1,124,0,106,0,155,0,116,1,155,0,124,0,106,2,155,
-    0,100,2,157,5,83,0,41,3,78,122,21,60,122,105,112,
-    105,109,112,111,114,116,101,114,32,111,98,106,101,99,116,32,
-    34,122,2,34,62,41,3,114,29,0,0,0,114,20,0,0,
-    0,114,31,0,0,0,114,87,0,0,0,114,9,0,0,0,
-    114,9,0,0,0,114,10,0,0,0,218,8,95,95,114,101,
-    112,114,95,95,84,1,0,0,115,2,0,0,0,24,1,122,
-    20,122,105,112,105,109,112,111,114,116,101,114,46,95,95,114,
-    101,112,114,95,95,169,1,78,41,17,114,6,0,0,0,114,
-    7,0,0,0,114,8,0,0,0,218,7,95,95,100,111,99,
-    95,95,114,34,0,0,0,114,44,0,0,0,114,45,0,0,
-    0,114,49,0,0,0,114,55,0,0,0,114,62,0,0,0,
-    114,63,0,0,0,114,70,0,0,0,114,46,0,0,0,114,
-    83,0,0,0,114,85,0,0,0,114,88,0,0,0,114,89,
-    0,0,0,114,9,0,0,0,114,9,0,0,0,114,9,0,
-    0,0,114,10,0,0,0,114,4,0,0,0,46,0,0,0,
-    115,30,0,0,0,8,0,4,1,8,17,10,46,10,37,10,
-    16,8,27,8,10,8,21,8,12,8,26,8,13,8,43,8,
-    15,12,10,122,12,95,95,105,110,105,116,95,95,46,112,121,
-    99,84,114,66,0,0,0,70,41,3,122,4,46,112,121,99,
-    84,70,41,3,114,67,0,0,0,70,70,99,2,0,0,0,
-    0,0,0,0,0,0,0,0,2,0,0,0,4,0,0,0,
-    67,0,0,0,115,20,0,0,0,124,0,106,0,124,1,160,
-    1,100,1,161,1,100,2,25,0,23,0,83,0,41,3,78,
-    218,1,46,233,2,0,0,0,41,2,114,31,0,0,0,218,
-    10,114,112,97,114,116,105,116,105,111,110,41,2,114,32,0,
-    0,0,114,41,0,0,0,114,9,0,0,0,114,9,0,0,
-    0,114,10,0,0,0,114,39,0,0,0,102,1,0,0,115,
-    2,0,0,0,20,1,114,39,0,0,0,99,2,0,0,0,
-    0,0,0,0,0,0,0,0,3,0,0,0,2,0,0,0,
-    67,0,0,0,115,18,0,0,0,124,1,116,0,23,0,125,
-    2,124,2,124,0,106,1,118,0,83,0,114,90,0,0,0,
-    41,2,114,20,0,0,0,114,28,0,0,0,41,3,114,32,
-    0,0,0,114,13,0,0,0,90,7,100,105,114,112,97,116,
-    104,114,9,0,0,0,114,9,0,0,0,114,10,0,0,0,
-    114,40,0,0,0,106,1,0,0,115,4,0,0,0,8,4,
-    10,2,114,40,0,0,0,99,2,0,0,0,0,0,0,0,
-    0,0,0,0,7,0,0,0,4,0,0,0,67,0,0,0,
-    115,56,0,0,0,116,0,124,0,124,1,131,2,125,2,116,
-    1,68,0,93,18,92,3,125,3,125,4,125,5,124,2,124,
-    3,23,0,125,6,124,6,124,0,106,2,118,0,114,25,124,
-    5,2,0,1,0,83,0,113,7,100,0,83,0,114,90,0,
-    0,0,41,3,114,39,0,0,0,218,16,95,122,105,112,95,
-    115,101,97,114,99,104,111,114,100,101,114,114,28,0,0,0,
-    41,7,114,32,0,0,0,114,41,0,0,0,114,13,0,0,
-    0,218,6,115,117,102,102,105,120,218,10,105,115,98,121,116,
-    101,99,111,100,101,114,54,0,0,0,114,69,0,0,0,114,
-    9,0,0,0,114,9,0,0,0,114,10,0,0,0,114,38,
-    0,0,0,115,1,0,0,115,14,0,0,0,10,1,14,1,
-    8,1,10,1,8,1,2,255,4,2,114,38,0,0,0,99,
-    1,0,0,0,0,0,0,0,0,0,0,0,26,0,0,0,
-    9,0,0,0,67,0,0,0,115,226,4,0,0,122,7,116,
-    0,160,1,124,0,161,1,125,1,87,0,110,16,4,0,116,
-    2,144,2,121,112,1,0,1,0,1,0,116,3,100,1,124,
-    0,155,2,157,2,124,0,100,2,141,2,130,1,124,1,144,
-    2,143,60,1,0,122,18,124,1,160,4,116,5,11,0,100,
-    3,161,2,1,0,124,1,160,6,161,0,125,2,124,1,160,
-    7,116,5,161,1,125,3,87,0,110,16,4,0,116,2,144,
-    2,121,111,1,0,1,0,1,0,116,3,100,4,124,0,155,
-    2,157,2,124,0,100,2,141,2,130,1,116,8,124,3,131,
-    1,116,5,107,3,114,78,116,3,100,4,124,0,155,2,157,
-    2,124,0,100,2,141,2,130,1,124,3,100,0,100,5,133,
-    2,25,0,116,9,107,3,114,201,122,12,124,1,160,4,100,
-    6,100,3,161,2,1,0,124,1,160,6,161,0,125,4,87,
-    0,110,16,4,0,116,2,144,2,121,110,1,0,1,0,1,
+    78,218,12,95,95,98,117,105,108,116,105,110,115,95,95,122,
+    14,76,111,97,100,101,100,32,109,111,100,117,108,101,32,122,
+    25,32,110,111,116,32,102,111,117,110,100,32,105,110,32,115,
+    121,115,46,109,111,100,117,108,101,115,122,30,105,109,112,111,
+    114,116,32,123,125,32,35,32,108,111,97,100,101,100,32,102,
+    114,111,109,32,90,105,112,32,123,125,41,24,114,35,0,0,
+    0,114,36,0,0,0,114,37,0,0,0,114,51,0,0,0,
+    218,3,115,121,115,218,7,109,111,100,117,108,101,115,218,3,
+    103,101,116,114,15,0,0,0,218,12,95,109,111,100,117,108,
+    101,95,116,121,112,101,218,10,95,95,108,111,97,100,101,114,
+    95,95,114,39,0,0,0,114,21,0,0,0,114,30,0,0,
+    0,114,29,0,0,0,90,8,95,95,112,97,116,104,95,95,
+    218,7,104,97,115,97,116,116,114,114,71,0,0,0,90,14,
+    95,102,105,120,95,117,112,95,109,111,100,117,108,101,218,8,
+    95,95,100,105,99,116,95,95,218,4,101,120,101,99,114,26,
+    0,0,0,218,11,73,109,112,111,114,116,69,114,114,111,114,
+    114,48,0,0,0,218,16,95,118,101,114,98,111,115,101,95,
+    109,101,115,115,97,103,101,41,9,114,32,0,0,0,114,41,
+    0,0,0,218,3,109,115,103,114,53,0,0,0,114,54,0,
+    0,0,114,43,0,0,0,90,3,109,111,100,114,13,0,0,
+    0,114,69,0,0,0,114,9,0,0,0,114,9,0,0,0,
+    114,10,0,0,0,218,11,108,111,97,100,95,109,111,100,117,
+    108,101,16,1,0,0,115,54,0,0,0,4,9,12,2,16,
+    1,12,1,18,1,8,1,10,1,6,1,2,2,4,1,10,
+    3,14,1,8,1,10,2,6,1,16,1,16,1,6,1,8,
+    1,2,1,2,2,14,1,12,1,16,1,2,255,14,2,4,
+    1,122,23,122,105,112,105,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,0,0,0,0,3,0,0,0,8,0,0,0,67,
+    0,0,0,115,64,0,0,0,122,10,124,0,160,0,124,1,
+    161,1,115,9,87,0,100,1,83,0,87,0,110,10,4,0,
+    116,1,121,20,1,0,1,0,1,0,89,0,100,1,83,0,
+    119,0,100,2,100,3,108,2,109,3,125,2,1,0,124,2,
+    124,0,124,1,131,2,83,0,41,4,122,204,82,101,116,117,
+    114,110,32,116,104,101,32,82,101,115,111,117,114,99,101,82,
+    101,97,100,101,114,32,102,111,114,32,97,32,112,97,99,107,
+    97,103,101,32,105,110,32,97,32,122,105,112,32,102,105,108,
+    101,46,10,10,32,32,32,32,32,32,32,32,73,102,32,39,
+    102,117,108,108,110,97,109,101,39,32,105,115,32,97,32,112,
+    97,99,107,97,103,101,32,119,105,116,104,105,110,32,116,104,
+    101,32,122,105,112,32,102,105,108,101,44,32,114,101,116,117,
+    114,110,32,116,104,101,10,32,32,32,32,32,32,32,32,39,
+    82,101,115,111,117,114,99,101,82,101,97,100,101,114,39,32,
+    111,98,106,101,99,116,32,102,111,114,32,116,104,101,32,112,
+    97,99,107,97,103,101,46,32,32,79,116,104,101,114,119,105,
+    115,101,32,114,101,116,117,114,110,32,78,111,110,101,46,10,
+    32,32,32,32,32,32,32,32,78,114,0,0,0,0,41,1,
+    218,9,90,105,112,82,101,97,100,101,114,41,4,114,46,0,
+    0,0,114,3,0,0,0,90,17,105,109,112,111,114,116,108,
+    105,98,46,114,101,97,100,101,114,115,114,84,0,0,0,41,
+    3,114,32,0,0,0,114,41,0,0,0,114,84,0,0,0,
+    114,9,0,0,0,114,9,0,0,0,114,10,0,0,0,218,
+    19,103,101,116,95,114,101,115,111,117,114,99,101,95,114,101,
+    97,100,101,114,59,1,0,0,115,18,0,0,0,2,6,10,
+    1,6,1,4,255,12,2,6,1,2,255,12,2,10,1,122,
+    31,122,105,112,105,109,112,111,114,116,101,114,46,103,101,116,
+    95,114,101,115,111,117,114,99,101,95,114,101,97,100,101,114,
+    99,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,
+    0,8,0,0,0,67,0,0,0,115,72,0,0,0,122,15,
+    116,0,124,0,106,1,131,1,124,0,95,2,124,0,106,2,
+    116,3,124,0,106,1,60,0,87,0,100,1,83,0,4,0,
+    116,4,121,35,1,0,1,0,1,0,116,3,160,5,124,0,
+    106,1,100,1,161,2,1,0,100,1,124,0,95,2,89,0,
+    100,1,83,0,119,0,41,2,122,41,82,101,108,111,97,100,
+    32,116,104,101,32,102,105,108,101,32,100,97,116,97,32,111,
+    102,32,116,104,101,32,97,114,99,104,105,118,101,32,112,97,
+    116,104,46,78,41,6,114,27,0,0,0,114,29,0,0,0,
+    114,28,0,0,0,114,25,0,0,0,114,3,0,0,0,218,
+    3,112,111,112,169,1,114,32,0,0,0,114,9,0,0,0,
+    114,9,0,0,0,114,10,0,0,0,218,17,105,110,118,97,
+    108,105,100,97,116,101,95,99,97,99,104,101,115,74,1,0,
+    0,115,14,0,0,0,2,2,12,1,18,1,12,1,14,1,
+    12,1,2,254,122,29,122,105,112,105,109,112,111,114,116,101,
+    114,46,105,110,118,97,108,105,100,97,116,101,95,99,97,99,
+    104,101,115,99,1,0,0,0,0,0,0,0,0,0,0,0,
+    1,0,0,0,5,0,0,0,67,0,0,0,115,24,0,0,
+    0,100,1,124,0,106,0,155,0,116,1,155,0,124,0,106,
+    2,155,0,100,2,157,5,83,0,41,3,78,122,21,60,122,
+    105,112,105,109,112,111,114,116,101,114,32,111,98,106,101,99,
+    116,32,34,122,2,34,62,41,3,114,29,0,0,0,114,20,
+    0,0,0,114,31,0,0,0,114,87,0,0,0,114,9,0,
+    0,0,114,9,0,0,0,114,10,0,0,0,218,8,95,95,
+    114,101,112,114,95,95,84,1,0,0,115,2,0,0,0,24,
+    1,122,20,122,105,112,105,109,112,111,114,116,101,114,46,95,
+    95,114,101,112,114,95,95,169,1,78,41,17,114,6,0,0,
+    0,114,7,0,0,0,114,8,0,0,0,218,7,95,95,100,
+    111,99,95,95,114,34,0,0,0,114,44,0,0,0,114,45,
+    0,0,0,114,49,0,0,0,114,55,0,0,0,114,62,0,
+    0,0,114,63,0,0,0,114,70,0,0,0,114,46,0,0,
+    0,114,83,0,0,0,114,85,0,0,0,114,88,0,0,0,
+    114,89,0,0,0,114,9,0,0,0,114,9,0,0,0,114,
+    9,0,0,0,114,10,0,0,0,114,4,0,0,0,46,0,
+    0,0,115,30,0,0,0,8,0,4,1,8,17,10,46,10,
+    37,10,16,8,27,8,10,8,21,8,12,8,26,8,13,8,
+    43,8,15,12,10,122,12,95,95,105,110,105,116,95,95,46,
+    112,121,99,84,114,66,0,0,0,70,41,3,122,4,46,112,
+    121,99,84,70,41,3,114,67,0,0,0,70,70,99,2,0,
+    0,0,0,0,0,0,0,0,0,0,2,0,0,0,4,0,
+    0,0,67,0,0,0,115,20,0,0,0,124,0,106,0,124,
+    1,160,1,100,1,161,1,100,2,25,0,23,0,83,0,41,
+    3,78,218,1,46,233,2,0,0,0,41,2,114,31,0,0,
+    0,218,10,114,112,97,114,116,105,116,105,111,110,41,2,114,
+    32,0,0,0,114,41,0,0,0,114,9,0,0,0,114,9,
+    0,0,0,114,10,0,0,0,114,39,0,0,0,102,1,0,
+    0,115,2,0,0,0,20,1,114,39,0,0,0,99,2,0,
+    0,0,0,0,0,0,0,0,0,0,3,0,0,0,2,0,
+    0,0,67,0,0,0,115,18,0,0,0,124,1,116,0,23,
+    0,125,2,124,2,124,0,106,1,118,0,83,0,114,90,0,
+    0,0,41,2,114,20,0,0,0,114,28,0,0,0,41,3,
+    114,32,0,0,0,114,13,0,0,0,90,7,100,105,114,112,
+    97,116,104,114,9,0,0,0,114,9,0,0,0,114,10,0,
+    0,0,114,40,0,0,0,106,1,0,0,115,4,0,0,0,
+    8,4,10,2,114,40,0,0,0,99,2,0,0,0,0,0,
+    0,0,0,0,0,0,7,0,0,0,4,0,0,0,67,0,
+    0,0,115,56,0,0,0,116,0,124,0,124,1,131,2,125,
+    2,116,1,68,0,93,18,92,3,125,3,125,4,125,5,124,
+    2,124,3,23,0,125,6,124,6,124,0,106,2,118,0,114,
+    25,124,5,2,0,1,0,83,0,113,7,100,0,83,0,114,
+    90,0,0,0,41,3,114,39,0,0,0,218,16,95,122,105,
+    112,95,115,101,97,114,99,104,111,114,100,101,114,114,28,0,
+    0,0,41,7,114,32,0,0,0,114,41,0,0,0,114,13,
+    0,0,0,218,6,115,117,102,102,105,120,218,10,105,115,98,
+    121,116,101,99,111,100,101,114,54,0,0,0,114,69,0,0,
+    0,114,9,0,0,0,114,9,0,0,0,114,10,0,0,0,
+    114,38,0,0,0,115,1,0,0,115,14,0,0,0,10,1,
+    14,1,8,1,10,1,8,1,2,255,4,2,114,38,0,0,
+    0,99,1,0,0,0,0,0,0,0,0,0,0,0,26,0,
+    0,0,9,0,0,0,67,0,0,0,115,220,4,0,0,122,
+    7,116,0,160,1,124,0,161,1,125,1,87,0,110,16,4,
+    0,116,2,121,23,1,0,1,0,1,0,116,3,100,1,124,
+    0,155,2,157,2,124,0,100,2,141,2,130,1,119,0,124,
+    1,144,2,143,65,1,0,122,18,124,1,160,4,116,5,11,
+    0,100,3,161,2,1,0,124,1,160,6,161,0,125,2,124,
+    1,160,7,116,5,161,1,125,3,87,0,110,16,4,0,116,
+    2,121,62,1,0,1,0,1,0,116,3,100,4,124,0,155,
+    2,157,2,124,0,100,2,141,2,130,1,119,0,116,8,124,
+    3,131,1,116,5,107,3,114,78,116,3,100,4,124,0,155,
+    2,157,2,124,0,100,2,141,2,130,1,124,3,100,0,100,
+    5,133,2,25,0,116,9,107,3,114,201,122,12,124,1,160,
+    4,100,6,100,3,161,2,1,0,124,1,160,6,161,0,125,
+    4,87,0,110,16,4,0,116,2,121,114,1,0,1,0,1,
     0,116,3,100,4,124,0,155,2,157,2,124,0,100,2,141,
-    2,130,1,116,10,124,4,116,11,24,0,116,5,24,0,100,
-    6,131,2,125,5,122,11,124,1,160,4,124,5,161,1,1,
-    0,124,1,160,7,161,0,125,6,87,0,110,16,4,0,116,
-    2,144,2,121,109,1,0,1,0,1,0,116,3,100,4,124,
-    0,155,2,157,2,124,0,100,2,141,2,130,1,124,6,160,
-    12,116,9,161,1,125,7,124,7,100,6,107,0,114,170,116,
-    3,100,7,124,0,155,2,157,2,124,0,100,2,141,2,130,
-    1,124,6,124,7,124,7,116,5,23,0,133,2,25,0,125,
-    3,116,8,124,3,131,1,116,5,107,3,114,193,116,3,100,
-    8,124,0,155,2,157,2,124,0,100,2,141,2,130,1,124,
-    4,116,8,124,6,131,1,24,0,124,7,23,0,125,2,116,
-    13,124,3,100,9,100,10,133,2,25,0,131,1,125,8,116,
-    13,124,3,100,10,100,11,133,2,25,0,131,1,125,9,124,
-    2,124,8,107,0,114,230,116,3,100,12,124,0,155,2,157,
-    2,124,0,100,2,141,2,130,1,124,2,124,9,107,0,114,
-    243,116,3,100,13,124,0,155,2,157,2,124,0,100,2,141,
-    2,130,1,124,2,124,8,56,0,125,2,124,2,124,9,24,
-    0,125,10,124,10,100,6,107,0,144,1,114,9,116,3,100,
-    14,124,0,155,2,157,2,124,0,100,2,141,2,130,1,105,
-    0,125,11,100,6,125,12,122,7,124,1,160,4,124,2,161,
-    1,1,0,87,0,110,16,4,0,116,2,144,2,121,108,1,
-    0,1,0,1,0,116,3,100,4,124,0,155,2,157,2,124,
-    0,100,2,141,2,130,1,9,0,124,1,160,7,100,16,161,
-    1,125,3,116,8,124,3,131,1,100,5,107,0,144,1,114,
-    54,116,14,100,17,131,1,130,1,124,3,100,0,100,5,133,
-    2,25,0,100,18,107,3,144,1,114,65,144,2,113,80,116,
-    8,124,3,131,1,100,16,107,3,144,1,114,76,116,14,100,
-    17,131,1,130,1,116,15,124,3,100,19,100,20,133,2,25,
-    0,131,1,125,13,116,15,124,3,100,20,100,9,133,2,25,
-    0,131,1,125,14,116,15,124,3,100,9,100,21,133,2,25,
-    0,131,1,125,15,116,15,124,3,100,21,100,10,133,2,25,
-    0,131,1,125,16,116,13,124,3,100,10,100,11,133,2,25,
-    0,131,1,125,17,116,13,124,3,100,11,100,22,133,2,25,
-    0,131,1,125,18,116,13,124,3,100,22,100,23,133,2,25,
-    0,131,1,125,4,116,15,124,3,100,23,100,24,133,2,25,
-    0,131,1,125,19,116,15,124,3,100,24,100,25,133,2,25,
-    0,131,1,125,20,116,15,124,3,100,25,100,26,133,2,25,
-    0,131,1,125,21,116,13,124,3,100,27,100,16,133,2,25,
-    0,131,1,125,22,124,19,124,20,23,0,124,21,23,0,125,
-    8,124,22,124,9,107,4,144,1,114,184,116,3,100,28,124,
-    0,155,2,157,2,124,0,100,2,141,2,130,1,124,22,124,
-    10,55,0,125,22,122,7,124,1,160,7,124,19,161,1,125,
-    23,87,0,110,16,4,0,116,2,144,2,121,107,1,0,1,
-    0,1,0,116,3,100,4,124,0,155,2,157,2,124,0,100,
-    2,141,2,130,1,116,8,124,23,131,1,124,19,107,3,144,
-    1,114,228,116,3,100,4,124,0,155,2,157,2,124,0,100,
-    2,141,2,130,1,122,25,116,8,124,1,160,7,124,8,124,
-    19,24,0,161,1,131,1,124,8,124,19,24,0,107,3,144,
-    1,114,252,116,3,100,4,124,0,155,2,157,2,124,0,100,
-    2,141,2,130,1,87,0,110,16,4,0,116,2,144,2,121,
-    106,1,0,1,0,1,0,116,3,100,4,124,0,155,2,157,
-    2,124,0,100,2,141,2,130,1,124,13,100,29,64,0,144,
-    2,114,24,124,23,160,16,161,0,125,23,110,24,122,7,124,
-    23,160,16,100,30,161,1,125,23,87,0,110,16,4,0,116,
-    17,144,2,121,105,1,0,1,0,1,0,124,23,160,16,100,
-    31,161,1,160,18,116,19,161,1,125,23,89,0,124,23,160,
-    20,100,32,116,21,161,2,125,23,116,22,160,23,124,0,124,
-    23,161,2,125,24,124,24,124,14,124,18,124,4,124,22,124,
-    15,124,16,124,17,102,8,125,25,124,25,124,11,124,23,60,
-    0,124,12,100,33,55,0,125,12,144,1,113,38,87,0,100,
-    0,4,0,4,0,131,3,1,0,110,9,49,0,144,2,115,
-    91,119,1,1,0,1,0,1,0,89,0,1,0,116,24,160,
-    25,100,34,124,12,124,0,161,3,1,0,124,11,83,0,119,
-    0,119,0,119,0,119,0,119,0,119,0,119,0,119,0,41,
-    35,78,122,21,99,97,110,39,116,32,111,112,101,110,32,90,
-    105,112,32,102,105,108,101,58,32,114,12,0,0,0,114,93,
-    0,0,0,250,21,99,97,110,39,116,32,114,101,97,100,32,
-    90,105,112,32,102,105,108,101,58,32,233,4,0,0,0,114,
-    0,0,0,0,122,16,110,111,116,32,97,32,90,105,112,32,
-    102,105,108,101,58,32,122,18,99,111,114,114,117,112,116,32,
-    90,105,112,32,102,105,108,101,58,32,233,12,0,0,0,233,
-    16,0,0,0,233,20,0,0,0,122,28,98,97,100,32,99,
-    101,110,116,114,97,108,32,100,105,114,101,99,116,111,114,121,
-    32,115,105,122,101,58,32,122,30,98,97,100,32,99,101,110,
-    116,114,97,108,32,100,105,114,101,99,116,111,114,121,32,111,
-    102,102,115,101,116,58,32,122,38,98,97,100,32,99,101,110,
-    116,114,97,108,32,100,105,114,101,99,116,111,114,121,32,115,
-    105,122,101,32,111,114,32,111,102,102,115,101,116,58,32,84,
-    233,46,0,0,0,250,27,69,79,70,32,114,101,97,100,32,
-    119,104,101,114,101,32,110,111,116,32,101,120,112,101,99,116,
-    101,100,115,4,0,0,0,80,75,1,2,233,8,0,0,0,
-    233,10,0,0,0,233,14,0,0,0,233,24,0,0,0,233,
-    28,0,0,0,233,30,0,0,0,233,32,0,0,0,233,34,
-    0,0,0,233,42,0,0,0,122,25,98,97,100,32,108,111,
-    99,97,108,32,104,101,97,100,101,114,32,111,102,102,115,101,
-    116,58,32,105,0,8,0,0,218,5,97,115,99,105,105,90,
-    6,108,97,116,105,110,49,250,1,47,114,5,0,0,0,122,
-    33,122,105,112,105,109,112,111,114,116,58,32,102,111,117,110,
-    100,32,123,125,32,110,97,109,101,115,32,105,110,32,123,33,
-    114,125,41,26,218,3,95,105,111,218,9,111,112,101,110,95,
-    99,111,100,101,114,22,0,0,0,114,3,0,0,0,218,4,
-    115,101,101,107,218,20,69,78,68,95,67,69,78,84,82,65,
-    76,95,68,73,82,95,83,73,90,69,90,4,116,101,108,108,
-    218,4,114,101,97,100,114,58,0,0,0,218,18,83,84,82,
-    73,78,71,95,69,78,68,95,65,82,67,72,73,86,69,218,
-    3,109,97,120,218,15,77,65,88,95,67,79,77,77,69,78,
-    84,95,76,69,78,218,5,114,102,105,110,100,114,2,0,0,
-    0,218,8,69,79,70,69,114,114,111,114,114,1,0,0,0,
-    114,68,0,0,0,218,18,85,110,105,99,111,100,101,68,101,
-    99,111,100,101,69,114,114,111,114,218,9,116,114,97,110,115,
-    108,97,116,101,218,11,99,112,52,51,55,95,116,97,98,108,
-    101,114,19,0,0,0,114,20,0,0,0,114,21,0,0,0,
-    114,30,0,0,0,114,48,0,0,0,114,81,0,0,0,41,
-    26,114,29,0,0,0,218,2,102,112,90,15,104,101,97,100,
-    101,114,95,112,111,115,105,116,105,111,110,218,6,98,117,102,
-    102,101,114,218,9,102,105,108,101,95,115,105,122,101,90,17,
-    109,97,120,95,99,111,109,109,101,110,116,95,115,116,97,114,
-    116,218,4,100,97,116,97,90,3,112,111,115,218,11,104,101,
-    97,100,101,114,95,115,105,122,101,90,13,104,101,97,100,101,
-    114,95,111,102,102,115,101,116,90,10,97,114,99,95,111,102,
-    102,115,101,116,114,33,0,0,0,218,5,99,111,117,110,116,
-    218,5,102,108,97,103,115,218,8,99,111,109,112,114,101,115,
-    115,218,4,116,105,109,101,218,4,100,97,116,101,218,3,99,
-    114,99,218,9,100,97,116,97,95,115,105,122,101,218,9,110,
-    97,109,101,95,115,105,122,101,218,10,101,120,116,114,97,95,
-    115,105,122,101,90,12,99,111,109,109,101,110,116,95,115,105,
-    122,101,218,11,102,105,108,101,95,111,102,102,115,101,116,114,
-    47,0,0,0,114,13,0,0,0,218,1,116,114,9,0,0,
-    0,114,9,0,0,0,114,10,0,0,0,114,27,0,0,0,
-    146,1,0,0,115,238,0,0,0,2,1,14,1,14,1,18,
-    1,8,2,2,1,14,1,8,1,14,1,14,1,18,1,12,
-    1,18,1,16,1,2,3,12,1,12,1,14,1,10,1,2,
-    1,6,255,8,2,2,1,2,255,2,1,4,255,2,2,10,
-    1,12,1,14,1,10,1,2,1,6,255,10,2,8,1,10,
-    1,2,1,6,255,16,2,12,1,10,1,2,1,6,255,16,
-    2,16,2,16,1,8,1,18,1,8,1,18,1,8,1,8,
-    1,10,1,18,1,4,2,4,2,2,1,14,1,14,1,18,
-    1,2,1,10,1,14,1,8,1,18,2,4,1,14,1,8,
-    1,16,1,16,1,16,1,16,1,16,1,16,1,16,1,16,
-    1,16,1,16,1,16,1,12,1,10,1,18,1,8,1,2,
-    2,14,1,14,1,18,1,14,1,18,1,2,4,28,1,18,
-    1,4,255,14,2,18,1,10,2,10,2,2,3,14,1,14,
-    1,18,1,12,2,12,1,20,1,8,1,8,1,4,202,2,
-    6,30,196,14,109,4,1,2,247,2,246,2,246,2,227,2,
-    227,2,248,2,246,2,248,114,27,0,0,0,117,190,1,0,
-    0,0,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,30,
-    31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,
-    47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,
-    63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,
-    79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,
-    95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,
-    111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,
-    127,195,135,195,188,195,169,195,162,195,164,195,160,195,165,195,
-    167,195,170,195,171,195,168,195,175,195,174,195,172,195,132,195,
-    133,195,137,195,166,195,134,195,180,195,182,195,178,195,187,195,
-    185,195,191,195,150,195,156,194,162,194,163,194,165,226,130,167,
-    198,146,195,161,195,173,195,179,195,186,195,177,195,145,194,170,
-    194,186,194,191,226,140,144,194,172,194,189,194,188,194,161,194,
-    171,194,187,226,150,145,226,150,146,226,150,147,226,148,130,226,
-    148,164,226,149,161,226,149,162,226,149,150,226,149,149,226,149,
-    163,226,149,145,226,149,151,226,149,157,226,149,156,226,149,155,
-    226,148,144,226,148,148,226,148,180,226,148,172,226,148,156,226,
-    148,128,226,148,188,226,149,158,226,149,159,226,149,154,226,149,
-    148,226,149,169,226,149,166,226,149,160,226,149,144,226,149,172,
-    226,149,167,226,149,168,226,149,164,226,149,165,226,149,153,226,
-    149,152,226,149,146,226,149,147,226,149,171,226,149,170,226,148,
-    152,226,148,140,226,150,136,226,150,132,226,150,140,226,150,144,
-    226,150,128,206,177,195,159,206,147,207,128,206,163,207,131,194,
-    181,207,132,206,166,206,152,206,169,206,180,226,136,158,207,134,
-    206,181,226,136,169,226,137,161,194,177,226,137,165,226,137,164,
-    226,140,160,226,140,161,195,183,226,137,136,194,176,226,136,153,
-    194,183,226,136,154,226,129,191,194,178,226,150,160,194,160,99,
-    0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,
-    8,0,0,0,67,0,0,0,115,106,0,0,0,116,0,114,
-    11,116,1,160,2,100,1,161,1,1,0,116,3,100,2,131,
-    1,130,1,100,3,97,0,122,28,122,8,100,4,100,5,108,
-    4,109,5,125,0,1,0,87,0,110,15,4,0,116,6,121,
-    52,1,0,1,0,1,0,116,1,160,2,100,1,161,1,1,
-    0,116,3,100,2,131,1,130,1,87,0,100,6,97,0,110,
-    3,100,6,97,0,119,0,116,1,160,2,100,7,161,1,1,
-    0,124,0,83,0,119,0,41,8,78,122,27,122,105,112,105,
-    109,112,111,114,116,58,32,122,108,105,98,32,85,78,65,86,
-    65,73,76,65,66,76,69,250,41,99,97,110,39,116,32,100,
-    101,99,111,109,112,114,101,115,115,32,100,97,116,97,59,32,
-    122,108,105,98,32,110,111,116,32,97,118,97,105,108,97,98,
-    108,101,84,114,0,0,0,0,169,1,218,10,100,101,99,111,
-    109,112,114,101,115,115,70,122,25,122,105,112,105,109,112,111,
-    114,116,58,32,122,108,105,98,32,97,118,97,105,108,97,98,
-    108,101,41,7,218,15,95,105,109,112,111,114,116,105,110,103,
-    95,122,108,105,98,114,48,0,0,0,114,81,0,0,0,114,
-    3,0,0,0,90,4,122,108,105,98,114,147,0,0,0,218,
-    9,69,120,99,101,112,116,105,111,110,114,146,0,0,0,114,
-    9,0,0,0,114,9,0,0,0,114,10,0,0,0,218,20,
-    95,103,101,116,95,100,101,99,111,109,112,114,101,115,115,95,
-    102,117,110,99,48,2,0,0,115,28,0,0,0,4,2,10,
-    3,8,1,4,2,4,1,16,1,12,1,10,1,8,1,2,
-    253,12,5,10,2,4,1,2,249,114,150,0,0,0,99,2,
-    0,0,0,0,0,0,0,0,0,0,0,17,0,0,0,9,
-    0,0,0,67,0,0,0,115,120,1,0,0,124,1,92,8,
-    125,2,125,3,125,4,125,5,125,6,125,7,125,8,125,9,
-    124,4,100,1,107,0,114,18,116,0,100,2,131,1,130,1,
-    116,1,160,2,124,0,161,1,143,127,125,10,122,7,124,10,
-    160,3,124,6,161,1,1,0,87,0,110,15,4,0,116,4,
-    121,187,1,0,1,0,1,0,116,0,100,3,124,0,155,2,
-    157,2,124,0,100,4,141,2,130,1,124,10,160,5,100,5,
-    161,1,125,11,116,6,124,11,131,1,100,5,107,3,114,62,
-    116,7,100,6,131,1,130,1,124,11,100,0,100,7,133,2,
-    25,0,100,8,107,3,114,79,116,0,100,9,124,0,155,2,
-    157,2,124,0,100,4,141,2,130,1,116,8,124,11,100,10,
-    100,11,133,2,25,0,131,1,125,12,116,8,124,11,100,11,
-    100,5,133,2,25,0,131,1,125,13,100,5,124,12,23,0,
-    124,13,23,0,125,14,124,6,124,14,55,0,125,6,122,7,
-    124,10,160,3,124,6,161,1,1,0,87,0,110,15,4,0,
-    116,4,121,186,1,0,1,0,1,0,116,0,100,3,124,0,
-    155,2,157,2,124,0,100,4,141,2,130,1,124,10,160,5,
+    2,130,1,119,0,116,10,124,4,116,11,24,0,116,5,24,
+    0,100,6,131,2,125,5,122,11,124,1,160,4,124,5,161,
+    1,1,0,124,1,160,7,161,0,125,6,87,0,110,16,4,
+    0,116,2,121,151,1,0,1,0,1,0,116,3,100,4,124,
+    0,155,2,157,2,124,0,100,2,141,2,130,1,119,0,124,
+    6,160,12,116,9,161,1,125,7,124,7,100,6,107,0,114,
+    170,116,3,100,7,124,0,155,2,157,2,124,0,100,2,141,
+    2,130,1,124,6,124,7,124,7,116,5,23,0,133,2,25,
+    0,125,3,116,8,124,3,131,1,116,5,107,3,114,193,116,
+    3,100,8,124,0,155,2,157,2,124,0,100,2,141,2,130,
+    1,124,4,116,8,124,6,131,1,24,0,124,7,23,0,125,
+    2,116,13,124,3,100,9,100,10,133,2,25,0,131,1,125,
+    8,116,13,124,3,100,10,100,11,133,2,25,0,131,1,125,
+    9,124,2,124,8,107,0,114,230,116,3,100,12,124,0,155,
+    2,157,2,124,0,100,2,141,2,130,1,124,2,124,9,107,
+    0,114,243,116,3,100,13,124,0,155,2,157,2,124,0,100,
+    2,141,2,130,1,124,2,124,8,56,0,125,2,124,2,124,
+    9,24,0,125,10,124,10,100,6,107,0,144,1,114,9,116,
+    3,100,14,124,0,155,2,157,2,124,0,100,2,141,2,130,
+    1,105,0,125,11,100,6,125,12,122,7,124,1,160,4,124,
+    2,161,1,1,0,87,0,110,17,4,0,116,2,144,1,121,
+    37,1,0,1,0,1,0,116,3,100,4,124,0,155,2,157,
+    2,124,0,100,2,141,2,130,1,119,0,9,0,124,1,160,
+    7,100,16,161,1,125,3,116,8,124,3,131,1,100,5,107,
+    0,144,1,114,55,116,14,100,17,131,1,130,1,124,3,100,
+    0,100,5,133,2,25,0,100,18,107,3,144,1,114,66,144,
+    2,113,85,116,8,124,3,131,1,100,16,107,3,144,1,114,
+    77,116,14,100,17,131,1,130,1,116,15,124,3,100,19,100,
+    20,133,2,25,0,131,1,125,13,116,15,124,3,100,20,100,
+    9,133,2,25,0,131,1,125,14,116,15,124,3,100,9,100,
+    21,133,2,25,0,131,1,125,15,116,15,124,3,100,21,100,
+    10,133,2,25,0,131,1,125,16,116,13,124,3,100,10,100,
+    11,133,2,25,0,131,1,125,17,116,13,124,3,100,11,100,
+    22,133,2,25,0,131,1,125,18,116,13,124,3,100,22,100,
+    23,133,2,25,0,131,1,125,4,116,15,124,3,100,23,100,
+    24,133,2,25,0,131,1,125,19,116,15,124,3,100,24,100,
+    25,133,2,25,0,131,1,125,20,116,15,124,3,100,25,100,
+    26,133,2,25,0,131,1,125,21,116,13,124,3,100,27,100,
+    16,133,2,25,0,131,1,125,22,124,19,124,20,23,0,124,
+    21,23,0,125,8,124,22,124,9,107,4,144,1,114,185,116,
+    3,100,28,124,0,155,2,157,2,124,0,100,2,141,2,130,
+    1,124,22,124,10,55,0,125,22,122,7,124,1,160,7,124,
+    19,161,1,125,23,87,0,110,17,4,0,116,2,144,1,121,
+    213,1,0,1,0,1,0,116,3,100,4,124,0,155,2,157,
+    2,124,0,100,2,141,2,130,1,119,0,116,8,124,23,131,
+    1,124,19,107,3,144,1,114,230,116,3,100,4,124,0,155,
+    2,157,2,124,0,100,2,141,2,130,1,122,25,116,8,124,
+    1,160,7,124,8,124,19,24,0,161,1,131,1,124,8,124,
+    19,24,0,107,3,144,1,114,254,116,3,100,4,124,0,155,
+    2,157,2,124,0,100,2,141,2,130,1,87,0,110,17,4,
+    0,116,2,144,2,121,16,1,0,1,0,1,0,116,3,100,
+    4,124,0,155,2,157,2,124,0,100,2,141,2,130,1,119,
+    0,124,13,100,29,64,0,144,2,114,27,124,23,160,16,161,
+    0,125,23,110,26,122,7,124,23,160,16,100,30,161,1,125,
+    23,87,0,110,18,4,0,116,17,144,2,121,52,1,0,1,
+    0,1,0,124,23,160,16,100,31,161,1,160,18,116,19,161,
+    1,125,23,89,0,110,1,119,0,124,23,160,20,100,32,116,
+    21,161,2,125,23,116,22,160,23,124,0,124,23,161,2,125,
+    24,124,24,124,14,124,18,124,4,124,22,124,15,124,16,124,
+    17,102,8,125,25,124,25,124,11,124,23,60,0,124,12,100,
+    33,55,0,125,12,144,1,113,39,87,0,100,0,4,0,4,
+    0,131,3,1,0,110,9,49,0,144,2,115,96,119,1,1,
+    0,1,0,1,0,89,0,1,0,116,24,160,25,100,34,124,
+    12,124,0,161,3,1,0,124,11,83,0,41,35,78,122,21,
+    99,97,110,39,116,32,111,112,101,110,32,90,105,112,32,102,
+    105,108,101,58,32,114,12,0,0,0,114,93,0,0,0,250,
+    21,99,97,110,39,116,32,114,101,97,100,32,90,105,112,32,
+    102,105,108,101,58,32,233,4,0,0,0,114,0,0,0,0,
+    122,16,110,111,116,32,97,32,90,105,112,32,102,105,108,101,
+    58,32,122,18,99,111,114,114,117,112,116,32,90,105,112,32,
+    102,105,108,101,58,32,233,12,0,0,0,233,16,0,0,0,
+    233,20,0,0,0,122,28,98,97,100,32,99,101,110,116,114,
+    97,108,32,100,105,114,101,99,116,111,114,121,32,115,105,122,
+    101,58,32,122,30,98,97,100,32,99,101,110,116,114,97,108,
+    32,100,105,114,101,99,116,111,114,121,32,111,102,102,115,101,
+    116,58,32,122,38,98,97,100,32,99,101,110,116,114,97,108,
+    32,100,105,114,101,99,116,111,114,121,32,115,105,122,101,32,
+    111,114,32,111,102,102,115,101,116,58,32,84,233,46,0,0,
+    0,250,27,69,79,70,32,114,101,97,100,32,119,104,101,114,
+    101,32,110,111,116,32,101,120,112,101,99,116,101,100,115,4,
+    0,0,0,80,75,1,2,233,8,0,0,0,233,10,0,0,
+    0,233,14,0,0,0,233,24,0,0,0,233,28,0,0,0,
+    233,30,0,0,0,233,32,0,0,0,233,34,0,0,0,233,
+    42,0,0,0,122,25,98,97,100,32,108,111,99,97,108,32,
+    104,101,97,100,101,114,32,111,102,102,115,101,116,58,32,105,
+    0,8,0,0,218,5,97,115,99,105,105,90,6,108,97,116,
+    105,110,49,250,1,47,114,5,0,0,0,122,33,122,105,112,
+    105,109,112,111,114,116,58,32,102,111,117,110,100,32,123,125,
+    32,110,97,109,101,115,32,105,110,32,123,33,114,125,41,26,
+    218,3,95,105,111,218,9,111,112,101,110,95,99,111,100,101,
+    114,22,0,0,0,114,3,0,0,0,218,4,115,101,101,107,
+    218,20,69,78,68,95,67,69,78,84,82,65,76,95,68,73,
+    82,95,83,73,90,69,90,4,116,101,108,108,218,4,114,101,
+    97,100,114,58,0,0,0,218,18,83,84,82,73,78,71,95,
+    69,78,68,95,65,82,67,72,73,86,69,218,3,109,97,120,
+    218,15,77,65,88,95,67,79,77,77,69,78,84,95,76,69,
+    78,218,5,114,102,105,110,100,114,2,0,0,0,218,8,69,
+    79,70,69,114,114,111,114,114,1,0,0,0,114,68,0,0,
+    0,218,18,85,110,105,99,111,100,101,68,101,99,111,100,101,
+    69,114,114,111,114,218,9,116,114,97,110,115,108,97,116,101,
+    218,11,99,112,52,51,55,95,116,97,98,108,101,114,19,0,
+    0,0,114,20,0,0,0,114,21,0,0,0,114,30,0,0,
+    0,114,48,0,0,0,114,81,0,0,0,41,26,114,29,0,
+    0,0,218,2,102,112,90,15,104,101,97,100,101,114,95,112,
+    111,115,105,116,105,111,110,218,6,98,117,102,102,101,114,218,
+    9,102,105,108,101,95,115,105,122,101,90,17,109,97,120,95,
+    99,111,109,109,101,110,116,95,115,116,97,114,116,218,4,100,
+    97,116,97,90,3,112,111,115,218,11,104,101,97,100,101,114,
+    95,115,105,122,101,90,13,104,101,97,100,101,114,95,111,102,
+    102,115,101,116,90,10,97,114,99,95,111,102,102,115,101,116,
+    114,33,0,0,0,218,5,99,111,117,110,116,218,5,102,108,
+    97,103,115,218,8,99,111,109,112,114,101,115,115,218,4,116,
+    105,109,101,218,4,100,97,116,101,218,3,99,114,99,218,9,
+    100,97,116,97,95,115,105,122,101,218,9,110,97,109,101,95,
+    115,105,122,101,218,10,101,120,116,114,97,95,115,105,122,101,
+    90,12,99,111,109,109,101,110,116,95,115,105,122,101,218,11,
+    102,105,108,101,95,111,102,102,115,101,116,114,47,0,0,0,
+    114,13,0,0,0,218,1,116,114,9,0,0,0,114,9,0,
+    0,0,114,10,0,0,0,114,27,0,0,0,146,1,0,0,
+    115,238,0,0,0,2,1,14,1,12,1,18,1,2,255,8,
+    3,2,1,14,1,8,1,14,1,12,1,18,1,2,255,12,
+    2,18,1,16,1,2,3,12,1,12,1,12,1,10,1,2,
+    1,6,255,2,255,8,3,2,1,2,255,2,1,4,255,2,
+    2,10,1,12,1,12,1,10,1,2,1,6,255,2,255,10,
+    3,8,1,10,1,2,1,6,255,16,2,12,1,10,1,2,
+    1,6,255,16,2,16,2,16,1,8,1,18,1,8,1,18,
+    1,8,1,8,1,10,1,18,1,4,2,4,2,2,1,14,
+    1,14,1,18,1,2,255,2,2,10,1,14,1,8,1,18,
+    2,4,1,14,1,8,1,16,1,16,1,16,1,16,1,16,
+    1,16,1,16,1,16,1,16,1,16,1,16,1,12,1,10,
+    1,18,1,8,1,2,2,14,1,14,1,18,1,2,255,14,
+    2,18,1,2,4,28,1,18,1,4,255,14,2,18,1,2,
+    255,10,3,10,2,2,3,14,1,14,1,20,1,2,255,12,
+    3,12,1,20,1,8,1,8,1,4,202,2,6,30,196,14,
+    109,4,1,114,27,0,0,0,117,190,1,0,0,0,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,30,31,32,33,34,
+    35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,
+    51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,
+    67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,
+    83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,
+    99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,
+    115,116,117,118,119,120,121,122,123,124,125,126,127,195,135,195,
+    188,195,169,195,162,195,164,195,160,195,165,195,167,195,170,195,
+    171,195,168,195,175,195,174,195,172,195,132,195,133,195,137,195,
+    166,195,134,195,180,195,182,195,178,195,187,195,185,195,191,195,
+    150,195,156,194,162,194,163,194,165,226,130,167,198,146,195,161,
+    195,173,195,179,195,186,195,177,195,145,194,170,194,186,194,191,
+    226,140,144,194,172,194,189,194,188,194,161,194,171,194,187,226,
+    150,145,226,150,146,226,150,147,226,148,130,226,148,164,226,149,
+    161,226,149,162,226,149,150,226,149,149,226,149,163,226,149,145,
+    226,149,151,226,149,157,226,149,156,226,149,155,226,148,144,226,
+    148,148,226,148,180,226,148,172,226,148,156,226,148,128,226,148,
+    188,226,149,158,226,149,159,226,149,154,226,149,148,226,149,169,
+    226,149,166,226,149,160,226,149,144,226,149,172,226,149,167,226,
+    149,168,226,149,164,226,149,165,226,149,153,226,149,152,226,149,
+    146,226,149,147,226,149,171,226,149,170,226,148,152,226,148,140,
+    226,150,136,226,150,132,226,150,140,226,150,144,226,150,128,206,
+    177,195,159,206,147,207,128,206,163,207,131,194,181,207,132,206,
+    166,206,152,206,169,206,180,226,136,158,207,134,206,181,226,136,
+    169,226,137,161,194,177,226,137,165,226,137,164,226,140,160,226,
+    140,161,195,183,226,137,136,194,176,226,136,153,194,183,226,136,
+    154,226,129,191,194,178,226,150,160,194,160,99,0,0,0,0,
+    0,0,0,0,0,0,0,0,1,0,0,0,8,0,0,0,
+    67,0,0,0,115,106,0,0,0,116,0,114,11,116,1,160,
+    2,100,1,161,1,1,0,116,3,100,2,131,1,130,1,100,
+    3,97,0,122,29,122,8,100,4,100,5,108,4,109,5,125,
+    0,1,0,87,0,110,16,4,0,116,6,121,38,1,0,1,
+    0,1,0,116,1,160,2,100,1,161,1,1,0,116,3,100,
+    2,131,1,130,1,119,0,87,0,100,6,97,0,110,3,100,
+    6,97,0,119,0,116,1,160,2,100,7,161,1,1,0,124,
+    0,83,0,41,8,78,122,27,122,105,112,105,109,112,111,114,
+    116,58,32,122,108,105,98,32,85,78,65,86,65,73,76,65,
+    66,76,69,250,41,99,97,110,39,116,32,100,101,99,111,109,
+    112,114,101,115,115,32,100,97,116,97,59,32,122,108,105,98,
+    32,110,111,116,32,97,118,97,105,108,97,98,108,101,84,114,
+    0,0,0,0,169,1,218,10,100,101,99,111,109,112,114,101,
+    115,115,70,122,25,122,105,112,105,109,112,111,114,116,58,32,
+    122,108,105,98,32,97,118,97,105,108,97,98,108,101,41,7,
+    218,15,95,105,109,112,111,114,116,105,110,103,95,122,108,105,
+    98,114,48,0,0,0,114,81,0,0,0,114,3,0,0,0,
+    90,4,122,108,105,98,114,147,0,0,0,218,9,69,120,99,
+    101,112,116,105,111,110,114,146,0,0,0,114,9,0,0,0,
+    114,9,0,0,0,114,10,0,0,0,218,20,95,103,101,116,
+    95,100,101,99,111,109,112,114,101,115,115,95,102,117,110,99,
+    48,2,0,0,115,28,0,0,0,4,2,10,3,8,1,4,
+    2,4,1,16,1,12,1,10,1,8,1,2,254,2,255,12,
+    5,10,2,4,1,114,150,0,0,0,99,2,0,0,0,0,
+    0,0,0,0,0,0,0,17,0,0,0,9,0,0,0,67,
+    0,0,0,115,120,1,0,0,124,1,92,8,125,2,125,3,
+    125,4,125,5,125,6,125,7,125,8,125,9,124,4,100,1,
+    107,0,114,18,116,0,100,2,131,1,130,1,116,1,160,2,
+    124,0,161,1,143,129,125,10,122,7,124,10,160,3,124,6,
+    161,1,1,0,87,0,110,16,4,0,116,4,121,47,1,0,
+    1,0,1,0,116,0,100,3,124,0,155,2,157,2,124,0,
+    100,4,141,2,130,1,119,0,124,10,160,5,100,5,161,1,
+    125,11,116,6,124,11,131,1,100,5,107,3,114,63,116,7,
+    100,6,131,1,130,1,124,11,100,0,100,7,133,2,25,0,
+    100,8,107,3,114,80,116,0,100,9,124,0,155,2,157,2,
+    124,0,100,4,141,2,130,1,116,8,124,11,100,10,100,11,
+    133,2,25,0,131,1,125,12,116,8,124,11,100,11,100,5,
+    133,2,25,0,131,1,125,13,100,5,124,12,23,0,124,13,
+    23,0,125,14,124,6,124,14,55,0,125,6,122,7,124,10,
+    160,3,124,6,161,1,1,0,87,0,110,16,4,0,116,4,
+    121,129,1,0,1,0,1,0,116,0,100,3,124,0,155,2,
+    157,2,124,0,100,4,141,2,130,1,119,0,124,10,160,5,
     124,4,161,1,125,15,116,6,124,15,131,1,124,4,107,3,
-    114,143,116,4,100,12,131,1,130,1,87,0,100,0,4,0,
-    4,0,131,3,1,0,110,8,49,0,115,153,119,1,1,0,
-    1,0,1,0,89,0,1,0,124,3,100,1,107,2,114,164,
-    124,15,83,0,122,5,116,9,131,0,125,16,87,0,110,10,
-    4,0,116,10,121,185,1,0,1,0,1,0,116,0,100,13,
-    131,1,130,1,124,16,124,15,100,14,131,2,83,0,119,0,
-    119,0,119,0,41,15,78,114,0,0,0,0,122,18,110,101,
-    103,97,116,105,118,101,32,100,97,116,97,32,115,105,122,101,
-    114,98,0,0,0,114,12,0,0,0,114,110,0,0,0,114,
-    104,0,0,0,114,99,0,0,0,115,4,0,0,0,80,75,
-    3,4,122,23,98,97,100,32,108,111,99,97,108,32,102,105,
-    108,101,32,104,101,97,100,101,114,58,32,233,26,0,0,0,
-    114,109,0,0,0,122,26,122,105,112,105,109,112,111,114,116,
-    58,32,99,97,110,39,116,32,114,101,97,100,32,100,97,116,
-    97,114,145,0,0,0,105,241,255,255,255,41,11,114,3,0,
-    0,0,114,116,0,0,0,114,117,0,0,0,114,118,0,0,
-    0,114,22,0,0,0,114,120,0,0,0,114,58,0,0,0,
-    114,125,0,0,0,114,1,0,0,0,114,150,0,0,0,114,
-    149,0,0,0,41,17,114,29,0,0,0,114,61,0,0,0,
-    90,8,100,97,116,97,112,97,116,104,114,136,0,0,0,114,
-    140,0,0,0,114,131,0,0,0,114,143,0,0,0,114,137,
-    0,0,0,114,138,0,0,0,114,139,0,0,0,114,129,0,
-    0,0,114,130,0,0,0,114,141,0,0,0,114,142,0,0,
-    0,114,133,0,0,0,90,8,114,97,119,95,100,97,116,97,
-    114,147,0,0,0,114,9,0,0,0,114,9,0,0,0,114,
-    10,0,0,0,114,59,0,0,0,69,2,0,0,115,72,0,
-    0,0,20,1,8,1,8,1,12,2,2,2,14,1,12,1,
-    18,1,10,1,12,1,8,1,16,2,18,2,16,2,16,1,
-    12,1,8,1,2,1,14,1,12,1,18,1,10,1,12,1,
+    114,145,116,4,100,12,131,1,130,1,87,0,100,0,4,0,
+    4,0,131,3,1,0,110,8,49,0,115,155,119,1,1,0,
+    1,0,1,0,89,0,1,0,124,3,100,1,107,2,114,166,
+    124,15,83,0,122,5,116,9,131,0,125,16,87,0,110,11,
+    4,0,116,10,121,182,1,0,1,0,1,0,116,0,100,13,
+    131,1,130,1,119,0,124,16,124,15,100,14,131,2,83,0,
+    41,15,78,114,0,0,0,0,122,18,110,101,103,97,116,105,
+    118,101,32,100,97,116,97,32,115,105,122,101,114,98,0,0,
+    0,114,12,0,0,0,114,110,0,0,0,114,104,0,0,0,
+    114,99,0,0,0,115,4,0,0,0,80,75,3,4,122,23,
+    98,97,100,32,108,111,99,97,108,32,102,105,108,101,32,104,
+    101,97,100,101,114,58,32,233,26,0,0,0,114,109,0,0,
+    0,122,26,122,105,112,105,109,112,111,114,116,58,32,99,97,
+    110,39,116,32,114,101,97,100,32,100,97,116,97,114,145,0,
+    0,0,105,241,255,255,255,41,11,114,3,0,0,0,114,116,
+    0,0,0,114,117,0,0,0,114,118,0,0,0,114,22,0,
+    0,0,114,120,0,0,0,114,58,0,0,0,114,125,0,0,
+    0,114,1,0,0,0,114,150,0,0,0,114,149,0,0,0,
+    41,17,114,29,0,0,0,114,61,0,0,0,90,8,100,97,
+    116,97,112,97,116,104,114,136,0,0,0,114,140,0,0,0,
+    114,131,0,0,0,114,143,0,0,0,114,137,0,0,0,114,
+    138,0,0,0,114,139,0,0,0,114,129,0,0,0,114,130,
+    0,0,0,114,141,0,0,0,114,142,0,0,0,114,133,0,
+    0,0,90,8,114,97,119,95,100,97,116,97,114,147,0,0,
+    0,114,9,0,0,0,114,9,0,0,0,114,10,0,0,0,
+    114,59,0,0,0,69,2,0,0,115,72,0,0,0,20,1,
+    8,1,8,1,12,2,2,2,14,1,12,1,18,1,2,255,
+    10,2,12,1,8,1,16,2,18,2,16,2,16,1,12,1,
+    8,1,2,1,14,1,12,1,18,1,2,255,10,2,12,1,
     8,1,2,255,28,233,8,26,4,2,2,3,10,1,12,1,
-    8,1,10,1,2,254,2,243,2,240,114,59,0,0,0,99,
-    2,0,0,0,0,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,124,
-    0,124,1,24,0,131,1,100,1,107,1,83,0,41,2,78,
-    114,5,0,0,0,41,1,218,3,97,98,115,41,2,90,2,
-    116,49,90,2,116,50,114,9,0,0,0,114,9,0,0,0,
-    114,10,0,0,0,218,9,95,101,113,95,109,116,105,109,101,
-    115,2,0,0,115,2,0,0,0,16,2,114,153,0,0,0,
-    99,5,0,0,0,0,0,0,0,0,0,0,0,14,0,0,
-    0,6,0,0,0,67,0,0,0,115,254,0,0,0,124,3,
-    124,2,100,1,156,2,125,5,116,0,160,1,124,4,124,3,
-    124,5,161,3,125,6,124,6,100,2,64,0,100,3,107,3,
-    125,7,124,7,114,63,124,6,100,4,64,0,100,3,107,3,
-    125,8,116,2,106,3,100,5,107,3,114,62,124,8,115,38,
-    116,2,106,3,100,6,107,2,114,62,116,4,124,0,124,2,
-    131,2,125,9,124,9,100,0,117,1,114,62,116,2,160,5,
-    116,0,106,6,124,9,161,2,125,10,116,0,160,7,124,4,
-    124,10,124,3,124,5,161,4,1,0,110,40,116,8,124,0,
-    124,2,131,2,92,2,125,11,125,12,124,11,114,103,116,9,
-    116,10,124,4,100,7,100,8,133,2,25,0,131,1,124,11,
-    131,2,114,93,116,10,124,4,100,8,100,9,133,2,25,0,
-    131,1,124,12,107,3,114,103,116,11,160,12,100,10,124,3,
-    155,2,157,2,161,1,1,0,100,0,83,0,116,13,160,14,
-    124,4,100,9,100,0,133,2,25,0,161,1,125,13,116,15,
-    124,13,116,16,131,2,115,125,116,17,100,11,124,1,155,2,
-    100,12,157,3,131,1,130,1,124,13,83,0,41,13,78,41,
-    2,114,47,0,0,0,114,13,0,0,0,114,5,0,0,0,
-    114,0,0,0,0,114,93,0,0,0,90,5,110,101,118,101,
-    114,90,6,97,108,119,97,121,115,114,105,0,0,0,114,100,
-    0,0,0,114,101,0,0,0,122,22,98,121,116,101,99,111,
-    100,101,32,105,115,32,115,116,97,108,101,32,102,111,114,32,
-    122,16,99,111,109,112,105,108,101,100,32,109,111,100,117,108,
-    101,32,122,21,32,105,115,32,110,111,116,32,97,32,99,111,
-    100,101,32,111,98,106,101,99,116,41,18,114,21,0,0,0,
-    90,13,95,99,108,97,115,115,105,102,121,95,112,121,99,218,
-    4,95,105,109,112,90,21,99,104,101,99,107,95,104,97,115,
-    104,95,98,97,115,101,100,95,112,121,99,115,218,15,95,103,
-    101,116,95,112,121,99,95,115,111,117,114,99,101,218,11,115,
-    111,117,114,99,101,95,104,97,115,104,90,17,95,82,65,87,
-    95,77,65,71,73,67,95,78,85,77,66,69,82,90,18,95,
-    118,97,108,105,100,97,116,101,95,104,97,115,104,95,112,121,
-    99,218,29,95,103,101,116,95,109,116,105,109,101,95,97,110,
-    100,95,115,105,122,101,95,111,102,95,115,111,117,114,99,101,
-    114,153,0,0,0,114,2,0,0,0,114,48,0,0,0,114,
-    81,0,0,0,218,7,109,97,114,115,104,97,108,90,5,108,
-    111,97,100,115,114,15,0,0,0,218,10,95,99,111,100,101,
-    95,116,121,112,101,218,9,84,121,112,101,69,114,114,111,114,
-    41,14,114,32,0,0,0,114,60,0,0,0,114,69,0,0,
-    0,114,41,0,0,0,114,132,0,0,0,90,11,101,120,99,
-    95,100,101,116,97,105,108,115,114,135,0,0,0,90,10,104,
-    97,115,104,95,98,97,115,101,100,90,12,99,104,101,99,107,
-    95,115,111,117,114,99,101,90,12,115,111,117,114,99,101,95,
-    98,121,116,101,115,114,156,0,0,0,90,12,115,111,117,114,
-    99,101,95,109,116,105,109,101,90,11,115,111,117,114,99,101,
-    95,115,105,122,101,114,53,0,0,0,114,9,0,0,0,114,
-    9,0,0,0,114,10,0,0,0,218,15,95,117,110,109,97,
-    114,115,104,97,108,95,99,111,100,101,123,2,0,0,115,72,
-    0,0,0,2,2,2,1,6,254,14,5,12,2,4,1,12,
-    1,10,1,2,1,2,255,8,1,2,255,10,2,8,1,4,
-    1,4,1,2,1,4,254,4,5,8,1,4,255,2,128,8,
-    4,6,255,4,3,22,3,18,1,2,255,4,2,8,1,4,
-    255,4,2,18,2,10,1,16,1,4,1,114,161,0,0,0,
-    99,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,
-    0,4,0,0,0,67,0,0,0,115,28,0,0,0,124,0,
-    160,0,100,1,100,2,161,2,125,0,124,0,160,0,100,3,
-    100,2,161,2,125,0,124,0,83,0,41,4,78,115,2,0,
-    0,0,13,10,243,1,0,0,0,10,243,1,0,0,0,13,
-    41,1,114,19,0,0,0,41,1,218,6,115,111,117,114,99,
-    101,114,9,0,0,0,114,9,0,0,0,114,10,0,0,0,
-    218,23,95,110,111,114,109,97,108,105,122,101,95,108,105,110,
-    101,95,101,110,100,105,110,103,115,168,2,0,0,115,6,0,
-    0,0,12,1,12,1,4,1,114,165,0,0,0,99,2,0,
-    0,0,0,0,0,0,0,0,0,0,2,0,0,0,6,0,
-    0,0,67,0,0,0,115,24,0,0,0,116,0,124,1,131,
-    1,125,1,116,1,124,1,124,0,100,1,100,2,100,3,141,
-    4,83,0,41,4,78,114,79,0,0,0,84,41,1,90,12,
-    100,111,110,116,95,105,110,104,101,114,105,116,41,2,114,165,
-    0,0,0,218,7,99,111,109,112,105,108,101,41,2,114,60,
-    0,0,0,114,164,0,0,0,114,9,0,0,0,114,9,0,
-    0,0,114,10,0,0,0,218,15,95,99,111,109,112,105,108,
-    101,95,115,111,117,114,99,101,175,2,0,0,115,4,0,0,
-    0,8,1,16,1,114,167,0,0,0,99,2,0,0,0,0,
-    0,0,0,0,0,0,0,2,0,0,0,11,0,0,0,67,
-    0,0,0,115,68,0,0,0,116,0,160,1,124,0,100,1,
-    63,0,100,2,23,0,124,0,100,3,63,0,100,4,64,0,
-    124,0,100,5,64,0,124,1,100,6,63,0,124,1,100,3,
-    63,0,100,7,64,0,124,1,100,5,64,0,100,8,20,0,
-    100,9,100,9,100,9,102,9,161,1,83,0,41,10,78,233,
-    9,0,0,0,105,188,7,0,0,233,5,0,0,0,233,15,
-    0,0,0,233,31,0,0,0,233,11,0,0,0,233,63,0,
-    0,0,114,93,0,0,0,114,14,0,0,0,41,2,114,137,
-    0,0,0,90,6,109,107,116,105,109,101,41,2,218,1,100,
-    114,144,0,0,0,114,9,0,0,0,114,9,0,0,0,114,
-    10,0,0,0,218,14,95,112,97,114,115,101,95,100,111,115,
-    116,105,109,101,181,2,0,0,115,18,0,0,0,4,1,10,
-    1,10,1,6,1,6,1,10,1,10,1,6,1,6,249,114,
-    175,0,0,0,99,2,0,0,0,0,0,0,0,0,0,0,
-    0,6,0,0,0,10,0,0,0,67,0,0,0,115,110,0,
-    0,0,122,41,124,1,100,1,100,0,133,2,25,0,100,2,
-    118,0,115,11,74,0,130,1,124,1,100,0,100,1,133,2,
-    25,0,125,1,124,0,106,0,124,1,25,0,125,2,124,2,
-    100,3,25,0,125,3,124,2,100,4,25,0,125,4,124,2,
-    100,5,25,0,125,5,116,1,124,4,124,3,131,2,124,5,
-    102,2,87,0,83,0,4,0,116,2,116,3,116,4,102,3,
-    121,54,1,0,1,0,1,0,89,0,100,6,83,0,119,0,
-    41,7,78,114,14,0,0,0,169,2,218,1,99,218,1,111,
-    114,169,0,0,0,233,6,0,0,0,233,3,0,0,0,41,
-    2,114,0,0,0,0,114,0,0,0,0,41,5,114,28,0,
-    0,0,114,175,0,0,0,114,26,0,0,0,218,10,73,110,
-    100,101,120,69,114,114,111,114,114,160,0,0,0,41,6,114,
-    32,0,0,0,114,13,0,0,0,114,61,0,0,0,114,137,
-    0,0,0,114,138,0,0,0,90,17,117,110,99,111,109,112,
-    114,101,115,115,101,100,95,115,105,122,101,114,9,0,0,0,
-    114,9,0,0,0,114,10,0,0,0,114,157,0,0,0,194,
-    2,0,0,115,22,0,0,0,2,1,20,2,12,1,10,1,
-    8,3,8,1,8,1,16,1,18,1,6,1,2,255,114,157,
+    8,1,2,255,10,2,114,59,0,0,0,99,2,0,0,0,
+    0,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,124,0,124,1,24,
+    0,131,1,100,1,107,1,83,0,41,2,78,114,5,0,0,
+    0,41,1,218,3,97,98,115,41,2,90,2,116,49,90,2,
+    116,50,114,9,0,0,0,114,9,0,0,0,114,10,0,0,
+    0,218,9,95,101,113,95,109,116,105,109,101,115,2,0,0,
+    115,2,0,0,0,16,2,114,153,0,0,0,99,5,0,0,
+    0,0,0,0,0,0,0,0,0,14,0,0,0,6,0,0,
+    0,67,0,0,0,115,254,0,0,0,124,3,124,2,100,1,
+    156,2,125,5,116,0,160,1,124,4,124,3,124,5,161,3,
+    125,6,124,6,100,2,64,0,100,3,107,3,125,7,124,7,
+    114,63,124,6,100,4,64,0,100,3,107,3,125,8,116,2,
+    106,3,100,5,107,3,114,62,124,8,115,38,116,2,106,3,
+    100,6,107,2,114,62,116,4,124,0,124,2,131,2,125,9,
+    124,9,100,0,117,1,114,62,116,2,160,5,116,0,106,6,
+    124,9,161,2,125,10,116,0,160,7,124,4,124,10,124,3,
+    124,5,161,4,1,0,110,40,116,8,124,0,124,2,131,2,
+    92,2,125,11,125,12,124,11,114,103,116,9,116,10,124,4,
+    100,7,100,8,133,2,25,0,131,1,124,11,131,2,114,93,
+    116,10,124,4,100,8,100,9,133,2,25,0,131,1,124,12,
+    107,3,114,103,116,11,160,12,100,10,124,3,155,2,157,2,
+    161,1,1,0,100,0,83,0,116,13,160,14,124,4,100,9,
+    100,0,133,2,25,0,161,1,125,13,116,15,124,13,116,16,
+    131,2,115,125,116,17,100,11,124,1,155,2,100,12,157,3,
+    131,1,130,1,124,13,83,0,41,13,78,41,2,114,47,0,
+    0,0,114,13,0,0,0,114,5,0,0,0,114,0,0,0,
+    0,114,93,0,0,0,90,5,110,101,118,101,114,90,6,97,
+    108,119,97,121,115,114,105,0,0,0,114,100,0,0,0,114,
+    101,0,0,0,122,22,98,121,116,101,99,111,100,101,32,105,
+    115,32,115,116,97,108,101,32,102,111,114,32,122,16,99,111,
+    109,112,105,108,101,100,32,109,111,100,117,108,101,32,122,21,
+    32,105,115,32,110,111,116,32,97,32,99,111,100,101,32,111,
+    98,106,101,99,116,41,18,114,21,0,0,0,90,13,95,99,
+    108,97,115,115,105,102,121,95,112,121,99,218,4,95,105,109,
+    112,90,21,99,104,101,99,107,95,104,97,115,104,95,98,97,
+    115,101,100,95,112,121,99,115,218,15,95,103,101,116,95,112,
+    121,99,95,115,111,117,114,99,101,218,11,115,111,117,114,99,
+    101,95,104,97,115,104,90,17,95,82,65,87,95,77,65,71,
+    73,67,95,78,85,77,66,69,82,90,18,95,118,97,108,105,
+    100,97,116,101,95,104,97,115,104,95,112,121,99,218,29,95,
+    103,101,116,95,109,116,105,109,101,95,97,110,100,95,115,105,
+    122,101,95,111,102,95,115,111,117,114,99,101,114,153,0,0,
+    0,114,2,0,0,0,114,48,0,0,0,114,81,0,0,0,
+    218,7,109,97,114,115,104,97,108,90,5,108,111,97,100,115,
+    114,15,0,0,0,218,10,95,99,111,100,101,95,116,121,112,
+    101,218,9,84,121,112,101,69,114,114,111,114,41,14,114,32,
+    0,0,0,114,60,0,0,0,114,69,0,0,0,114,41,0,
+    0,0,114,132,0,0,0,90,11,101,120,99,95,100,101,116,
+    97,105,108,115,114,135,0,0,0,90,10,104,97,115,104,95,
+    98,97,115,101,100,90,12,99,104,101,99,107,95,115,111,117,
+    114,99,101,90,12,115,111,117,114,99,101,95,98,121,116,101,
+    115,114,156,0,0,0,90,12,115,111,117,114,99,101,95,109,
+    116,105,109,101,90,11,115,111,117,114,99,101,95,115,105,122,
+    101,114,53,0,0,0,114,9,0,0,0,114,9,0,0,0,
+    114,10,0,0,0,218,15,95,117,110,109,97,114,115,104,97,
+    108,95,99,111,100,101,123,2,0,0,115,72,0,0,0,2,
+    2,2,1,6,254,14,5,12,2,4,1,12,1,10,1,2,
+    1,2,255,8,1,2,255,10,2,8,1,4,1,4,1,2,
+    1,4,254,4,5,8,1,4,255,2,128,8,4,6,255,4,
+    3,22,3,18,1,2,255,4,2,8,1,4,255,4,2,18,
+    2,10,1,16,1,4,1,114,161,0,0,0,99,1,0,0,
+    0,0,0,0,0,0,0,0,0,1,0,0,0,4,0,0,
+    0,67,0,0,0,115,28,0,0,0,124,0,160,0,100,1,
+    100,2,161,2,125,0,124,0,160,0,100,3,100,2,161,2,
+    125,0,124,0,83,0,41,4,78,115,2,0,0,0,13,10,
+    243,1,0,0,0,10,243,1,0,0,0,13,41,1,114,19,
+    0,0,0,41,1,218,6,115,111,117,114,99,101,114,9,0,
+    0,0,114,9,0,0,0,114,10,0,0,0,218,23,95,110,
+    111,114,109,97,108,105,122,101,95,108,105,110,101,95,101,110,
+    100,105,110,103,115,168,2,0,0,115,6,0,0,0,12,1,
+    12,1,4,1,114,165,0,0,0,99,2,0,0,0,0,0,
+    0,0,0,0,0,0,2,0,0,0,6,0,0,0,67,0,
+    0,0,115,24,0,0,0,116,0,124,1,131,1,125,1,116,
+    1,124,1,124,0,100,1,100,2,100,3,141,4,83,0,41,
+    4,78,114,79,0,0,0,84,41,1,90,12,100,111,110,116,
+    95,105,110,104,101,114,105,116,41,2,114,165,0,0,0,218,
+    7,99,111,109,112,105,108,101,41,2,114,60,0,0,0,114,
+    164,0,0,0,114,9,0,0,0,114,9,0,0,0,114,10,
+    0,0,0,218,15,95,99,111,109,112,105,108,101,95,115,111,
+    117,114,99,101,175,2,0,0,115,4,0,0,0,8,1,16,
+    1,114,167,0,0,0,99,2,0,0,0,0,0,0,0,0,
+    0,0,0,2,0,0,0,11,0,0,0,67,0,0,0,115,
+    68,0,0,0,116,0,160,1,124,0,100,1,63,0,100,2,
+    23,0,124,0,100,3,63,0,100,4,64,0,124,0,100,5,
+    64,0,124,1,100,6,63,0,124,1,100,3,63,0,100,7,
+    64,0,124,1,100,5,64,0,100,8,20,0,100,9,100,9,
+    100,9,102,9,161,1,83,0,41,10,78,233,9,0,0,0,
+    105,188,7,0,0,233,5,0,0,0,233,15,0,0,0,233,
+    31,0,0,0,233,11,0,0,0,233,63,0,0,0,114,93,
+    0,0,0,114,14,0,0,0,41,2,114,137,0,0,0,90,
+    6,109,107,116,105,109,101,41,2,218,1,100,114,144,0,0,
+    0,114,9,0,0,0,114,9,0,0,0,114,10,0,0,0,
+    218,14,95,112,97,114,115,101,95,100,111,115,116,105,109,101,
+    181,2,0,0,115,18,0,0,0,4,1,10,1,10,1,6,
+    1,6,1,10,1,10,1,6,1,6,249,114,175,0,0,0,
+    99,2,0,0,0,0,0,0,0,0,0,0,0,6,0,0,
+    0,10,0,0,0,67,0,0,0,115,110,0,0,0,122,41,
+    124,1,100,1,100,0,133,2,25,0,100,2,118,0,115,11,
+    74,0,130,1,124,1,100,0,100,1,133,2,25,0,125,1,
+    124,0,106,0,124,1,25,0,125,2,124,2,100,3,25,0,
+    125,3,124,2,100,4,25,0,125,4,124,2,100,5,25,0,
+    125,5,116,1,124,4,124,3,131,2,124,5,102,2,87,0,
+    83,0,4,0,116,2,116,3,116,4,102,3,121,54,1,0,
+    1,0,1,0,89,0,100,6,83,0,119,0,41,7,78,114,
+    14,0,0,0,169,2,218,1,99,218,1,111,114,169,0,0,
+    0,233,6,0,0,0,233,3,0,0,0,41,2,114,0,0,
+    0,0,114,0,0,0,0,41,5,114,28,0,0,0,114,175,
+    0,0,0,114,26,0,0,0,218,10,73,110,100,101,120,69,
+    114,114,111,114,114,160,0,0,0,41,6,114,32,0,0,0,
+    114,13,0,0,0,114,61,0,0,0,114,137,0,0,0,114,
+    138,0,0,0,90,17,117,110,99,111,109,112,114,101,115,115,
+    101,100,95,115,105,122,101,114,9,0,0,0,114,9,0,0,
+    0,114,10,0,0,0,114,157,0,0,0,194,2,0,0,115,
+    22,0,0,0,2,1,20,2,12,1,10,1,8,3,8,1,
+    8,1,16,1,18,1,6,1,2,255,114,157,0,0,0,99,
+    2,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,
+    8,0,0,0,67,0,0,0,115,80,0,0,0,124,1,100,
+    1,100,0,133,2,25,0,100,2,118,0,115,10,74,0,130,
+    1,124,1,100,0,100,1,133,2,25,0,125,1,122,7,124,
+    0,106,0,124,1,25,0,125,2,87,0,110,10,4,0,116,
+    1,121,33,1,0,1,0,1,0,89,0,100,0,83,0,119,
+    0,116,2,124,0,106,3,124,2,131,2,83,0,41,3,78,
+    114,14,0,0,0,114,176,0,0,0,41,4,114,28,0,0,
+    0,114,26,0,0,0,114,59,0,0,0,114,29,0,0,0,
+    41,3,114,32,0,0,0,114,13,0,0,0,114,61,0,0,
+    0,114,9,0,0,0,114,9,0,0,0,114,10,0,0,0,
+    114,155,0,0,0,213,2,0,0,115,16,0,0,0,20,2,
+    12,1,2,2,14,1,12,1,6,1,2,255,12,3,114,155,
     0,0,0,99,2,0,0,0,0,0,0,0,0,0,0,0,
-    3,0,0,0,8,0,0,0,67,0,0,0,115,80,0,0,
-    0,124,1,100,1,100,0,133,2,25,0,100,2,118,0,115,
-    10,74,0,130,1,124,1,100,0,100,1,133,2,25,0,125,
-    1,122,7,124,0,106,0,124,1,25,0,125,2,87,0,110,
-    9,4,0,116,1,121,39,1,0,1,0,1,0,89,0,100,
-    0,83,0,116,2,124,0,106,3,124,2,131,2,83,0,119,
-    0,41,3,78,114,14,0,0,0,114,176,0,0,0,41,4,
-    114,28,0,0,0,114,26,0,0,0,114,59,0,0,0,114,
-    29,0,0,0,41,3,114,32,0,0,0,114,13,0,0,0,
-    114,61,0,0,0,114,9,0,0,0,114,9,0,0,0,114,
-    10,0,0,0,114,155,0,0,0,213,2,0,0,115,16,0,
-    0,0,20,2,12,1,2,2,14,1,12,1,6,1,12,2,
-    2,253,114,155,0,0,0,99,2,0,0,0,0,0,0,0,
-    0,0,0,0,14,0,0,0,11,0,0,0,67,0,0,0,
-    115,14,1,0,0,116,0,124,0,124,1,131,2,125,2,100,
-    0,125,3,116,1,68,0,93,100,92,3,125,4,125,5,125,
-    6,124,2,124,4,23,0,125,7,116,2,106,3,100,1,124,
-    0,106,4,116,5,124,7,100,2,100,3,141,5,1,0,122,
-    7,124,0,106,6,124,7,25,0,125,8,87,0,110,8,4,
-    0,116,7,121,134,1,0,1,0,1,0,89,0,113,9,124,
-    8,100,4,25,0,125,9,116,8,124,0,106,4,124,8,131,
-    2,125,10,100,0,125,11,124,5,114,89,122,10,116,9,124,
-    0,124,9,124,7,124,1,124,10,131,5,125,11,87,0,110,
-    24,4,0,116,10,121,133,1,0,125,12,1,0,122,8,124,
-    12,125,3,87,0,89,0,100,0,125,12,126,12,110,9,100,
-    0,125,12,126,12,119,1,116,11,124,9,124,10,131,2,125,
-    11,124,11,100,0,117,0,114,99,113,9,124,8,100,4,25,
+    14,0,0,0,11,0,0,0,67,0,0,0,115,14,1,0,
+    0,116,0,124,0,124,1,131,2,125,2,100,0,125,3,116,
+    1,68,0,93,102,92,3,125,4,125,5,125,6,124,2,124,
+    4,23,0,125,7,116,2,106,3,100,1,124,0,106,4,116,
+    5,124,7,100,2,100,3,141,5,1,0,122,7,124,0,106,
+    6,124,7,25,0,125,8,87,0,110,9,4,0,116,7,121,
+    45,1,0,1,0,1,0,89,0,113,9,119,0,124,8,100,
+    4,25,0,125,9,116,8,124,0,106,4,124,8,131,2,125,
+    10,100,0,125,11,124,5,114,91,122,10,116,9,124,0,124,
+    9,124,7,124,1,124,10,131,5,125,11,87,0,110,25,4,
+    0,116,10,121,90,1,0,125,12,1,0,122,8,124,12,125,
+    3,87,0,89,0,100,0,125,12,126,12,110,10,100,0,125,
+    12,126,12,119,1,119,0,116,11,124,9,124,10,131,2,125,
+    11,124,11,100,0,117,0,114,101,113,9,124,8,100,4,25,
     0,125,9,124,11,124,6,124,9,102,3,2,0,1,0,83,
-    0,124,3,114,124,100,5,124,3,155,0,157,2,125,13,116,
+    0,124,3,114,126,100,5,124,3,155,0,157,2,125,13,116,
     12,124,13,124,1,100,6,141,2,124,3,130,2,116,12,100,
-    7,124,1,155,2,157,2,124,1,100,6,141,2,130,1,119,
-    0,119,0,41,8,78,122,13,116,114,121,105,110,103,32,123,
-    125,123,125,123,125,114,93,0,0,0,41,1,90,9,118,101,
-    114,98,111,115,105,116,121,114,0,0,0,0,122,20,109,111,
-    100,117,108,101,32,108,111,97,100,32,102,97,105,108,101,100,
-    58,32,114,65,0,0,0,114,64,0,0,0,41,13,114,39,
-    0,0,0,114,95,0,0,0,114,48,0,0,0,114,81,0,
-    0,0,114,29,0,0,0,114,20,0,0,0,114,28,0,0,
-    0,114,26,0,0,0,114,59,0,0,0,114,161,0,0,0,
-    114,80,0,0,0,114,167,0,0,0,114,3,0,0,0,41,
-    14,114,32,0,0,0,114,41,0,0,0,114,13,0,0,0,
-    90,12,105,109,112,111,114,116,95,101,114,114,111,114,114,96,
-    0,0,0,114,97,0,0,0,114,54,0,0,0,114,69,0,
-    0,0,114,61,0,0,0,114,43,0,0,0,114,132,0,0,
-    0,114,53,0,0,0,90,3,101,120,99,114,82,0,0,0,
-    114,9,0,0,0,114,9,0,0,0,114,10,0,0,0,114,
-    51,0,0,0,228,2,0,0,115,58,0,0,0,10,1,4,
-    1,14,1,8,1,22,1,2,1,14,1,12,1,4,1,8,
-    2,12,1,4,1,4,1,2,1,20,1,14,1,16,1,8,
-    128,10,2,8,1,2,3,8,1,14,1,4,2,10,1,14,
-    1,18,2,2,241,2,247,114,51,0,0,0,41,46,114,91,
-    0,0,0,90,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,
-    21,0,0,0,114,1,0,0,0,114,2,0,0,0,90,17,
-    95,102,114,111,122,101,110,95,105,109,112,111,114,116,108,105,
-    98,114,48,0,0,0,114,154,0,0,0,114,116,0,0,0,
-    114,158,0,0,0,114,72,0,0,0,114,137,0,0,0,114,
-    35,0,0,0,90,7,95,95,97,108,108,95,95,114,20,0,
-    0,0,90,15,112,97,116,104,95,115,101,112,97,114,97,116,
-    111,114,115,114,18,0,0,0,114,80,0,0,0,114,3,0,
-    0,0,114,25,0,0,0,218,4,116,121,112,101,114,75,0,
-    0,0,114,119,0,0,0,114,121,0,0,0,114,123,0,0,
-    0,90,13,95,76,111,97,100,101,114,66,97,115,105,99,115,
-    114,4,0,0,0,114,95,0,0,0,114,39,0,0,0,114,
-    40,0,0,0,114,38,0,0,0,114,27,0,0,0,114,128,
-    0,0,0,114,148,0,0,0,114,150,0,0,0,114,59,0,
-    0,0,114,153,0,0,0,114,161,0,0,0,218,8,95,95,
-    99,111,100,101,95,95,114,159,0,0,0,114,165,0,0,0,
-    114,167,0,0,0,114,175,0,0,0,114,157,0,0,0,114,
-    155,0,0,0,114,51,0,0,0,114,9,0,0,0,114,9,
-    0,0,0,114,9,0,0,0,114,10,0,0,0,218,8,60,
-    109,111,100,117,108,101,62,1,0,0,0,115,90,0,0,0,
-    4,0,8,16,16,1,8,1,8,1,8,1,8,1,8,1,
-    8,1,8,1,8,2,6,3,14,1,16,3,4,4,8,2,
-    4,2,4,1,4,1,18,2,0,127,0,127,12,50,12,1,
-    2,1,2,1,4,252,8,9,8,4,8,9,8,31,2,126,
-    2,254,4,29,8,5,8,21,8,46,8,8,10,40,8,5,
-    8,7,8,6,8,13,8,19,12,15,
+    7,124,1,155,2,157,2,124,1,100,6,141,2,130,1,41,
+    8,78,122,13,116,114,121,105,110,103,32,123,125,123,125,123,
+    125,114,93,0,0,0,41,1,90,9,118,101,114,98,111,115,
+    105,116,121,114,0,0,0,0,122,20,109,111,100,117,108,101,
+    32,108,111,97,100,32,102,97,105,108,101,100,58,32,114,65,
+    0,0,0,114,64,0,0,0,41,13,114,39,0,0,0,114,
+    95,0,0,0,114,48,0,0,0,114,81,0,0,0,114,29,
+    0,0,0,114,20,0,0,0,114,28,0,0,0,114,26,0,
+    0,0,114,59,0,0,0,114,161,0,0,0,114,80,0,0,
+    0,114,167,0,0,0,114,3,0,0,0,41,14,114,32,0,
+    0,0,114,41,0,0,0,114,13,0,0,0,90,12,105,109,
+    112,111,114,116,95,101,114,114,111,114,114,96,0,0,0,114,
+    97,0,0,0,114,54,0,0,0,114,69,0,0,0,114,61,
+    0,0,0,114,43,0,0,0,114,132,0,0,0,114,53,0,
+    0,0,90,3,101,120,99,114,82,0,0,0,114,9,0,0,
+    0,114,9,0,0,0,114,10,0,0,0,114,51,0,0,0,
+    228,2,0,0,115,58,0,0,0,10,1,4,1,14,1,8,
+    1,22,1,2,1,14,1,12,1,4,1,2,255,8,3,12,
+    1,4,1,4,1,2,1,20,1,14,1,16,1,8,128,2,
+    255,10,3,8,1,2,3,8,1,14,1,4,2,10,1,14,
+    1,18,2,114,51,0,0,0,41,46,114,91,0,0,0,90,
+    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,21,0,0,0,
+    114,1,0,0,0,114,2,0,0,0,90,17,95,102,114,111,
+    122,101,110,95,105,109,112,111,114,116,108,105,98,114,48,0,
+    0,0,114,154,0,0,0,114,116,0,0,0,114,158,0,0,
+    0,114,72,0,0,0,114,137,0,0,0,114,35,0,0,0,
+    90,7,95,95,97,108,108,95,95,114,20,0,0,0,90,15,
+    112,97,116,104,95,115,101,112,97,114,97,116,111,114,115,114,
+    18,0,0,0,114,80,0,0,0,114,3,0,0,0,114,25,
+    0,0,0,218,4,116,121,112,101,114,75,0,0,0,114,119,
+    0,0,0,114,121,0,0,0,114,123,0,0,0,90,13,95,
+    76,111,97,100,101,114,66,97,115,105,99,115,114,4,0,0,
+    0,114,95,0,0,0,114,39,0,0,0,114,40,0,0,0,
+    114,38,0,0,0,114,27,0,0,0,114,128,0,0,0,114,
+    148,0,0,0,114,150,0,0,0,114,59,0,0,0,114,153,
+    0,0,0,114,161,0,0,0,218,8,95,95,99,111,100,101,
+    95,95,114,159,0,0,0,114,165,0,0,0,114,167,0,0,
+    0,114,175,0,0,0,114,157,0,0,0,114,155,0,0,0,
+    114,51,0,0,0,114,9,0,0,0,114,9,0,0,0,114,
+    9,0,0,0,114,10,0,0,0,218,8,60,109,111,100,117,
+    108,101,62,1,0,0,0,115,90,0,0,0,4,0,8,16,
+    16,1,8,1,8,1,8,1,8,1,8,1,8,1,8,1,
+    8,2,6,3,14,1,16,3,4,4,8,2,4,2,4,1,
+    4,1,18,2,0,127,0,127,12,50,12,1,2,1,2,1,
+    4,252,8,9,8,4,8,9,8,31,2,126,2,254,4,29,
+    8,5,8,21,8,46,8,8,10,40,8,5,8,7,8,6,
+    8,13,8,19,12,15,
 };


From webhook-mailer at python.org  Mon Aug  9 06:05:35 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 09 Aug 2021 10:05:35 -0000
Subject: [Python-checkins] bpo-32695: Docs and tests for compresslevel and
 preset kwargs in tarfile (GH-21470)
Message-ID: <mailman.950.1628503536.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/eb2d4a66ff07aa6e51cfaaa31afed31addf76936
commit: eb2d4a66ff07aa6e51cfaaa31afed31addf76936
branch: main
author: Zackery Spytz <zspytz at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-09T12:05:31+02:00
summary:

bpo-32695: Docs and tests for compresslevel and preset kwargs in tarfile (GH-21470)

Co-Authored-By: Bo Bayles <bbayles at gmail.com>

files:
A Misc/NEWS.d/next/Library/2020-07-13-23-46-59.bpo-32695.tTqqXe.rst
M Doc/library/tarfile.rst
M Lib/test/test_tarfile.py

diff --git a/Doc/library/tarfile.rst b/Doc/library/tarfile.rst
index 13088a10d77c5..6afb8397b7866 100644
--- a/Doc/library/tarfile.rst
+++ b/Doc/library/tarfile.rst
@@ -102,6 +102,9 @@ Some facts and figures:
    ``'x:bz2'``, :func:`tarfile.open` accepts the keyword argument
    *compresslevel* (default ``9``) to specify the compression level of the file.
 
+   For modes ``'w:xz'`` and ``'x:xz'``, :func:`tarfile.open` accepts the
+   keyword argument *preset* to specify the compression level of the file.
+
    For special purposes, there is a second format for *mode*:
    ``'filemode|[compression]'``.  :func:`tarfile.open` will return a :class:`TarFile`
    object that processes its data as a stream of blocks.  No random seeking will
diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
index 817e6f1799712..cfdda24a269f5 100644
--- a/Lib/test/test_tarfile.py
+++ b/Lib/test/test_tarfile.py
@@ -1706,15 +1706,30 @@ def test_create_taropen_pathlike_name(self):
 
 
 class GzipCreateTest(GzipTest, CreateTest):
-    pass
+
+    def test_create_with_compresslevel(self):
+        with tarfile.open(tmpname, self.mode, compresslevel=1) as tobj:
+            tobj.add(self.file_path)
+        with tarfile.open(tmpname, 'r:gz', compresslevel=1) as tobj:
+            pass
 
 
 class Bz2CreateTest(Bz2Test, CreateTest):
-    pass
+
+    def test_create_with_compresslevel(self):
+        with tarfile.open(tmpname, self.mode, compresslevel=1) as tobj:
+            tobj.add(self.file_path)
+        with tarfile.open(tmpname, 'r:bz2', compresslevel=1) as tobj:
+            pass
 
 
 class LzmaCreateTest(LzmaTest, CreateTest):
-    pass
+
+    # Unlike gz and bz2, xz uses the preset keyword instead of compresslevel.
+    # It does not allow for preset to be specified when reading.
+    def test_create_with_preset(self):
+        with tarfile.open(tmpname, self.mode, preset=1) as tobj:
+            tobj.add(self.file_path)
 
 
 class CreateWithXModeTest(CreateTest):
diff --git a/Misc/NEWS.d/next/Library/2020-07-13-23-46-59.bpo-32695.tTqqXe.rst b/Misc/NEWS.d/next/Library/2020-07-13-23-46-59.bpo-32695.tTqqXe.rst
new file mode 100644
index 0000000000000..c71316ed656a2
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-07-13-23-46-59.bpo-32695.tTqqXe.rst
@@ -0,0 +1,2 @@
+The *compresslevel* and *preset* keyword arguments of :func:`tarfile.open`
+are now both documented and tested.


From webhook-mailer at python.org  Mon Aug  9 06:30:27 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 09 Aug 2021 10:30:27 -0000
Subject: [Python-checkins] bpo-32695: Docs and tests for compresslevel and
 preset kwargs in tarfile (GH-21470) (GH-27674)
Message-ID: <mailman.951.1628505028.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/ede221e51796f3f5471278aabd9105870f79dfb5
commit: ede221e51796f3f5471278aabd9105870f79dfb5
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-09T12:30:00+02:00
summary:

bpo-32695: Docs and tests for compresslevel and preset kwargs in tarfile (GH-21470) (GH-27674)

Co-Authored-By: Bo Bayles <bbayles at gmail.com>
(cherry picked from commit eb2d4a66ff07aa6e51cfaaa31afed31addf76936)

Co-authored-by: Zackery Spytz <zspytz at gmail.com>

files:
A Misc/NEWS.d/next/Library/2020-07-13-23-46-59.bpo-32695.tTqqXe.rst
M Doc/library/tarfile.rst
M Lib/test/test_tarfile.py

diff --git a/Doc/library/tarfile.rst b/Doc/library/tarfile.rst
index 13088a10d77c5..6afb8397b7866 100644
--- a/Doc/library/tarfile.rst
+++ b/Doc/library/tarfile.rst
@@ -102,6 +102,9 @@ Some facts and figures:
    ``'x:bz2'``, :func:`tarfile.open` accepts the keyword argument
    *compresslevel* (default ``9``) to specify the compression level of the file.
 
+   For modes ``'w:xz'`` and ``'x:xz'``, :func:`tarfile.open` accepts the
+   keyword argument *preset* to specify the compression level of the file.
+
    For special purposes, there is a second format for *mode*:
    ``'filemode|[compression]'``.  :func:`tarfile.open` will return a :class:`TarFile`
    object that processes its data as a stream of blocks.  No random seeking will
diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
index 29cde91bf7fc1..6279309ed3bf1 100644
--- a/Lib/test/test_tarfile.py
+++ b/Lib/test/test_tarfile.py
@@ -1705,15 +1705,30 @@ def test_create_taropen_pathlike_name(self):
 
 
 class GzipCreateTest(GzipTest, CreateTest):
-    pass
+
+    def test_create_with_compresslevel(self):
+        with tarfile.open(tmpname, self.mode, compresslevel=1) as tobj:
+            tobj.add(self.file_path)
+        with tarfile.open(tmpname, 'r:gz', compresslevel=1) as tobj:
+            pass
 
 
 class Bz2CreateTest(Bz2Test, CreateTest):
-    pass
+
+    def test_create_with_compresslevel(self):
+        with tarfile.open(tmpname, self.mode, compresslevel=1) as tobj:
+            tobj.add(self.file_path)
+        with tarfile.open(tmpname, 'r:bz2', compresslevel=1) as tobj:
+            pass
 
 
 class LzmaCreateTest(LzmaTest, CreateTest):
-    pass
+
+    # Unlike gz and bz2, xz uses the preset keyword instead of compresslevel.
+    # It does not allow for preset to be specified when reading.
+    def test_create_with_preset(self):
+        with tarfile.open(tmpname, self.mode, preset=1) as tobj:
+            tobj.add(self.file_path)
 
 
 class CreateWithXModeTest(CreateTest):
diff --git a/Misc/NEWS.d/next/Library/2020-07-13-23-46-59.bpo-32695.tTqqXe.rst b/Misc/NEWS.d/next/Library/2020-07-13-23-46-59.bpo-32695.tTqqXe.rst
new file mode 100644
index 0000000000000..c71316ed656a2
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-07-13-23-46-59.bpo-32695.tTqqXe.rst
@@ -0,0 +1,2 @@
+The *compresslevel* and *preset* keyword arguments of :func:`tarfile.open`
+are now both documented and tested.


From webhook-mailer at python.org  Mon Aug  9 06:30:35 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 09 Aug 2021 10:30:35 -0000
Subject: [Python-checkins] bpo-32695: Docs and tests for compresslevel and
 preset kwargs in tarfile (GH-21470)
Message-ID: <mailman.952.1628505036.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/d5c8ad24716d146ffa025e09dad85e5a1bac5c77
commit: d5c8ad24716d146ffa025e09dad85e5a1bac5c77
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-09T03:30:30-07:00
summary:

bpo-32695: Docs and tests for compresslevel and preset kwargs in tarfile (GH-21470)


Co-Authored-By: Bo Bayles <bbayles at gmail.com>
(cherry picked from commit eb2d4a66ff07aa6e51cfaaa31afed31addf76936)

Co-authored-by: Zackery Spytz <zspytz at gmail.com>

files:
A Misc/NEWS.d/next/Library/2020-07-13-23-46-59.bpo-32695.tTqqXe.rst
M Doc/library/tarfile.rst
M Lib/test/test_tarfile.py

diff --git a/Doc/library/tarfile.rst b/Doc/library/tarfile.rst
index 13088a10d77c5..6afb8397b7866 100644
--- a/Doc/library/tarfile.rst
+++ b/Doc/library/tarfile.rst
@@ -102,6 +102,9 @@ Some facts and figures:
    ``'x:bz2'``, :func:`tarfile.open` accepts the keyword argument
    *compresslevel* (default ``9``) to specify the compression level of the file.
 
+   For modes ``'w:xz'`` and ``'x:xz'``, :func:`tarfile.open` accepts the
+   keyword argument *preset* to specify the compression level of the file.
+
    For special purposes, there is a second format for *mode*:
    ``'filemode|[compression]'``.  :func:`tarfile.open` will return a :class:`TarFile`
    object that processes its data as a stream of blocks.  No random seeking will
diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
index 817e6f1799712..cfdda24a269f5 100644
--- a/Lib/test/test_tarfile.py
+++ b/Lib/test/test_tarfile.py
@@ -1706,15 +1706,30 @@ def test_create_taropen_pathlike_name(self):
 
 
 class GzipCreateTest(GzipTest, CreateTest):
-    pass
+
+    def test_create_with_compresslevel(self):
+        with tarfile.open(tmpname, self.mode, compresslevel=1) as tobj:
+            tobj.add(self.file_path)
+        with tarfile.open(tmpname, 'r:gz', compresslevel=1) as tobj:
+            pass
 
 
 class Bz2CreateTest(Bz2Test, CreateTest):
-    pass
+
+    def test_create_with_compresslevel(self):
+        with tarfile.open(tmpname, self.mode, compresslevel=1) as tobj:
+            tobj.add(self.file_path)
+        with tarfile.open(tmpname, 'r:bz2', compresslevel=1) as tobj:
+            pass
 
 
 class LzmaCreateTest(LzmaTest, CreateTest):
-    pass
+
+    # Unlike gz and bz2, xz uses the preset keyword instead of compresslevel.
+    # It does not allow for preset to be specified when reading.
+    def test_create_with_preset(self):
+        with tarfile.open(tmpname, self.mode, preset=1) as tobj:
+            tobj.add(self.file_path)
 
 
 class CreateWithXModeTest(CreateTest):
diff --git a/Misc/NEWS.d/next/Library/2020-07-13-23-46-59.bpo-32695.tTqqXe.rst b/Misc/NEWS.d/next/Library/2020-07-13-23-46-59.bpo-32695.tTqqXe.rst
new file mode 100644
index 0000000000000..c71316ed656a2
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-07-13-23-46-59.bpo-32695.tTqqXe.rst
@@ -0,0 +1,2 @@
+The *compresslevel* and *preset* keyword arguments of :func:`tarfile.open`
+are now both documented and tested.


From webhook-mailer at python.org  Mon Aug  9 08:01:57 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 09 Aug 2021 12:01:57 -0000
Subject: [Python-checkins] bpo-44702: Remove ambiguity in sentence (GH-27676)
Message-ID: <mailman.953.1628510518.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/03e5647ab07c7d2a05094fc3b5ed6eba6fc01349
commit: 03e5647ab07c7d2a05094fc3b5ed6eba6fc01349
branch: main
author: meowmeowmeowcat <meowmeowcat1211 at gmail.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-09T05:01:30-07:00
summary:

bpo-44702: Remove ambiguity in sentence (GH-27676)



Automerge-Triggered-By: GH:pablogsal

files:
M Doc/library/weakref.rst

diff --git a/Doc/library/weakref.rst b/Doc/library/weakref.rst
index b88543e445372..5a8df4c27dc37 100644
--- a/Doc/library/weakref.rst
+++ b/Doc/library/weakref.rst
@@ -63,9 +63,9 @@ or :class:`finalize` is all they need -- it's not usually necessary to
 create your own weak references directly.  The low-level machinery is
 exposed by the :mod:`weakref` module for the benefit of advanced uses.
 
-Not all objects can be weakly referenced; those objects which can include class
-instances, functions written in Python (but not in C), instance methods, sets,
-frozensets, some :term:`file objects <file object>`, :term:`generators <generator>`,
+Not all objects can be weakly referenced. Objects which support weak references
+include class instances, functions written in Python (but not in C), instance methods,
+sets, frozensets, some :term:`file objects <file object>`, :term:`generators <generator>`,
 type objects, sockets, arrays, deques, regular expression pattern objects, and code
 objects.
 


From webhook-mailer at python.org  Mon Aug  9 09:44:34 2021
From: webhook-mailer at python.org (markshannon)
Date: Mon, 09 Aug 2021 13:44:34 -0000
Subject: [Python-checkins] Remove unused variable. (GH-27677)
Message-ID: <mailman.954.1628516675.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/41bb564cd6ba38c06476de36bc31c3c3568eed63
commit: 41bb564cd6ba38c06476de36bc31c3c3568eed63
branch: main
author: Mark Shannon <mark at hotpy.org>
committer: markshannon <mark at hotpy.org>
date: 2021-08-09T14:44:26+01:00
summary:

Remove unused variable. (GH-27677)

files:
M Python/compile.c

diff --git a/Python/compile.c b/Python/compile.c
index d65f7a849a5b7..e651ca535191a 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -8610,11 +8610,9 @@ is_exit_without_lineno(basicblock *b) {
 static int
 duplicate_exits_without_lineno(struct compiler *c)
 {
-    basicblock *entry = NULL;
     /* Copy all exit blocks without line number that are targets of a jump.
      */
     for (basicblock *b = c->u->u_blocks; b != NULL; b = b->b_list) {
-        entry = b;
         if (b->b_iused > 0 && is_jump(&b->b_instr[b->b_iused-1])) {
             switch (b->b_instr[b->b_iused-1].i_opcode) {
                 /* Note: Only actual jumps, not exception handlers */
@@ -8638,7 +8636,6 @@ duplicate_exits_without_lineno(struct compiler *c)
             }
         }
     }
-    assert(entry != NULL);
     /* Eliminate empty blocks */
     for (basicblock *b = c->u->u_blocks; b != NULL; b = b->b_list) {
         while (b->b_next && b->b_next->b_iused == 0) {


From webhook-mailer at python.org  Mon Aug  9 10:15:03 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 09 Aug 2021 14:15:03 -0000
Subject: [Python-checkins] bpo-44522: Fix inaccurate information in open()
 function (GH-27650)
Message-ID: <mailman.955.1628518504.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/b05e9b63fcfcd4bd7a6434fa9f9a7028d12f91c4
commit: b05e9b63fcfcd4bd7a6434fa9f9a7028d12f91c4
branch: main
author: meowmeowmeowcat <meowmeowcat1211 at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-09T16:14:54+02:00
summary:

bpo-44522: Fix inaccurate information in open() function (GH-27650)

- Use "Low surrogate code units" instead of "Unicode Private Use Area"

files:
M Doc/library/functions.rst

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index f99ea889ffe1e..652e30c6088ad 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -1208,9 +1208,9 @@ are always available.  They are listed here in alphabetical order.
    * ``'replace'`` causes a replacement marker (such as ``'?'``) to be inserted
      where there is malformed data.
 
-   * ``'surrogateescape'`` will represent any incorrect bytes as code
-     points in the Unicode Private Use Area ranging from U+DC80 to
-     U+DCFF.  These private code points will then be turned back into
+   * ``'surrogateescape'`` will represent any incorrect bytes as low
+     surrogate code units ranging from U+DC80 to U+DCFF.
+     These surrogate code units will then be turned back into
      the same bytes when the ``surrogateescape`` error handler is used
      when writing data.  This is useful for processing files in an
      unknown encoding.


From webhook-mailer at python.org  Mon Aug  9 10:25:50 2021
From: webhook-mailer at python.org (pablogsal)
Date: Mon, 09 Aug 2021 14:25:50 -0000
Subject: [Python-checkins] Remove unused variable. (GH-27677) (#27680)
Message-ID: <mailman.956.1628519151.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/0f02993b2c7b3343df05fcf8b5f0e6a900f195b3
commit: 0f02993b2c7b3343df05fcf8b5f0e6a900f195b3
branch: 3.10
author: Mark Shannon <mark at hotpy.org>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-08-09T15:25:40+01:00
summary:

Remove unused variable. (GH-27677) (#27680)

files:
M Python/compile.c

diff --git a/Python/compile.c b/Python/compile.c
index edc77e50c9b6c..a2378992fd408 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -7820,7 +7820,6 @@ is_exit_without_lineno(basicblock *b) {
 static int
 duplicate_exits_without_lineno(struct compiler *c)
 {
-    basicblock *entry = NULL;
     /* Copy all exit blocks without line number that are targets of a jump.
      */
     for (basicblock *b = c->u->u_blocks; b != NULL; b = b->b_list) {
@@ -7846,9 +7845,7 @@ duplicate_exits_without_lineno(struct compiler *c)
                 target->b_next = new_target;
             }
         }
-        entry = b;
     }
-    assert(entry != NULL);
     /* Eliminate empty blocks */
     for (basicblock *b = c->u->u_blocks; b != NULL; b = b->b_list) {
         while (b->b_next && b->b_next->b_iused == 0) {


From webhook-mailer at python.org  Mon Aug  9 10:35:15 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 09 Aug 2021 14:35:15 -0000
Subject: [Python-checkins] bpo-44522: Fix inaccurate information in open()
 function (GH-27650)
Message-ID: <mailman.957.1628519716.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/c79aa427c0b0c8a09e5c22a5420baf837054f509
commit: c79aa427c0b0c8a09e5c22a5420baf837054f509
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-09T07:35:11-07:00
summary:

bpo-44522: Fix inaccurate information in open() function (GH-27650)


- Use "Low surrogate code units" instead of "Unicode Private Use Area"
(cherry picked from commit b05e9b63fcfcd4bd7a6434fa9f9a7028d12f91c4)

Co-authored-by: meowmeowmeowcat <meowmeowcat1211 at gmail.com>

files:
M Doc/library/functions.rst

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index f99ea889ffe1e..652e30c6088ad 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -1208,9 +1208,9 @@ are always available.  They are listed here in alphabetical order.
    * ``'replace'`` causes a replacement marker (such as ``'?'``) to be inserted
      where there is malformed data.
 
-   * ``'surrogateescape'`` will represent any incorrect bytes as code
-     points in the Unicode Private Use Area ranging from U+DC80 to
-     U+DCFF.  These private code points will then be turned back into
+   * ``'surrogateescape'`` will represent any incorrect bytes as low
+     surrogate code units ranging from U+DC80 to U+DCFF.
+     These surrogate code units will then be turned back into
      the same bytes when the ``surrogateescape`` error handler is used
      when writing data.  This is useful for processing files in an
      unknown encoding.


From webhook-mailer at python.org  Mon Aug  9 10:39:40 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 09 Aug 2021 14:39:40 -0000
Subject: [Python-checkins] bpo-44522: Fix inaccurate information in open()
 function (GH-27650) (GH-27682)
Message-ID: <mailman.958.1628519981.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/037ef8d6d9cc8225d6db0305cee2d8d0ee5bee74
commit: 037ef8d6d9cc8225d6db0305cee2d8d0ee5bee74
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-09T16:39:31+02:00
summary:

bpo-44522: Fix inaccurate information in open() function (GH-27650) (GH-27682)

- Use "Low surrogate code units" instead of "Unicode Private Use Area"
(cherry picked from commit b05e9b63fcfcd4bd7a6434fa9f9a7028d12f91c4)

Co-authored-by: meowmeowmeowcat <meowmeowcat1211 at gmail.com>

files:
M Doc/library/functions.rst

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 784bb62e64a16..c5c1c161293f6 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -1150,9 +1150,9 @@ are always available.  They are listed here in alphabetical order.
    * ``'replace'`` causes a replacement marker (such as ``'?'``) to be inserted
      where there is malformed data.
 
-   * ``'surrogateescape'`` will represent any incorrect bytes as code
-     points in the Unicode Private Use Area ranging from U+DC80 to
-     U+DCFF.  These private code points will then be turned back into
+   * ``'surrogateescape'`` will represent any incorrect bytes as low
+     surrogate code units ranging from U+DC80 to U+DCFF.
+     These surrogate code units will then be turned back into
      the same bytes when the ``surrogateescape`` error handler is used
      when writing data.  This is useful for processing files in an
      unknown encoding.


From webhook-mailer at python.org  Mon Aug  9 10:46:24 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 09 Aug 2021 14:46:24 -0000
Subject: [Python-checkins] [3.9] Upgrade bundled pip and setuptools
 (GH-27625) (GH-27658)
Message-ID: <mailman.959.1628520385.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/26539cea8ad3256f5385268a1a70847f64b1865d
commit: 26539cea8ad3256f5385268a1a70847f64b1865d
branch: 3.9
author: Tzu-ping Chung <uranusjr at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-09T16:46:15+02:00
summary:

[3.9] Upgrade bundled pip and setuptools (GH-27625) (GH-27658)

pip is now 21.2.3
setuptools is now 57.4.0.
(cherry picked from commit 738ac00a08cb6a9d104ec85ccb1a44c2399d6baa)

Co-authored-by: Tzu-ping Chung <uranusjr at gmail.com>

files:
A Lib/ensurepip/_bundled/pip-21.2.3-py3-none-any.whl
A Lib/ensurepip/_bundled/setuptools-57.4.0-py3-none-any.whl
A Misc/NEWS.d/next/Library/2021-08-06-19-15-52.bpo-44581.oFDBTB.rst
D Lib/ensurepip/_bundled/pip-21.1.3-py3-none-any.whl
D Lib/ensurepip/_bundled/setuptools-56.0.0-py3-none-any.whl
M Lib/ensurepip/__init__.py

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 14a39037e0c771..7b03970c93ec07 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -13,9 +13,9 @@
 __all__ = ["version", "bootstrap"]
 
 
-_SETUPTOOLS_VERSION = "56.0.0"
+_SETUPTOOLS_VERSION = "57.4.0"
 
-_PIP_VERSION = "21.1.3"
+_PIP_VERSION = "21.2.3"
 
 _PROJECTS = [
     ("setuptools", _SETUPTOOLS_VERSION, "py3"),
diff --git a/Lib/ensurepip/_bundled/pip-21.1.3-py3-none-any.whl b/Lib/ensurepip/_bundled/pip-21.1.3-py3-none-any.whl
deleted file mode 100644
index d96a40a9291fb2..00000000000000
Binary files a/Lib/ensurepip/_bundled/pip-21.1.3-py3-none-any.whl and /dev/null differ
diff --git a/Lib/ensurepip/_bundled/pip-21.2.3-py3-none-any.whl b/Lib/ensurepip/_bundled/pip-21.2.3-py3-none-any.whl
new file mode 100644
index 00000000000000..d417df63d9ec19
Binary files /dev/null and b/Lib/ensurepip/_bundled/pip-21.2.3-py3-none-any.whl differ
diff --git a/Lib/ensurepip/_bundled/setuptools-56.0.0-py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-57.4.0-py3-none-any.whl
similarity index 65%
rename from Lib/ensurepip/_bundled/setuptools-56.0.0-py3-none-any.whl
rename to Lib/ensurepip/_bundled/setuptools-57.4.0-py3-none-any.whl
index 264ef10e826679..af8f8ba21003b1 100644
Binary files a/Lib/ensurepip/_bundled/setuptools-56.0.0-py3-none-any.whl and b/Lib/ensurepip/_bundled/setuptools-57.4.0-py3-none-any.whl differ
diff --git a/Misc/NEWS.d/next/Library/2021-08-06-19-15-52.bpo-44581.oFDBTB.rst b/Misc/NEWS.d/next/Library/2021-08-06-19-15-52.bpo-44581.oFDBTB.rst
new file mode 100644
index 00000000000000..99f08065b9d2f0
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-06-19-15-52.bpo-44581.oFDBTB.rst
@@ -0,0 +1 @@
+Upgrade bundled pip to 21.2.3 and setuptools to 57.4.0


From webhook-mailer at python.org  Mon Aug  9 12:45:03 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 09 Aug 2021 16:45:03 -0000
Subject: [Python-checkins] bpo-38840: Incorrect __all__ in
 multiprocessing.managers (GH-18034)
Message-ID: <mailman.960.1628527504.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/d0978761118856e8ca8ea7b162a6585b8da83df9
commit: d0978761118856e8ca8ea7b162a6585b8da83df9
branch: main
author: Zackery Spytz <zspytz at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-09T18:44:55+02:00
summary:

bpo-38840: Incorrect __all__ in multiprocessing.managers (GH-18034)

This was causing test___all__ to fail on platforms lacking a shared
memory implementation.

Co-Authored-By: Xavier de Gaye <xdegaye at gmail.com>
Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Misc/NEWS.d/next/Library/2020-01-16-23-41-16.bpo-38840.VzzYZz.rst
M Lib/multiprocessing/managers.py

diff --git a/Lib/multiprocessing/managers.py b/Lib/multiprocessing/managers.py
index 9c7e92faec9427..cf637c6cbbe8d1 100644
--- a/Lib/multiprocessing/managers.py
+++ b/Lib/multiprocessing/managers.py
@@ -8,8 +8,7 @@
 # Licensed to PSF under a Contributor Agreement.
 #
 
-__all__ = [ 'BaseManager', 'SyncManager', 'BaseProxy', 'Token',
-            'SharedMemoryManager' ]
+__all__ = [ 'BaseManager', 'SyncManager', 'BaseProxy', 'Token' ]
 
 #
 # Imports
@@ -35,9 +34,11 @@
 from . import get_context
 try:
     from . import shared_memory
-    HAS_SHMEM = True
 except ImportError:
     HAS_SHMEM = False
+else:
+    HAS_SHMEM = True
+    __all__.append('SharedMemoryManager')
 
 #
 # Register some things for pickling
diff --git a/Misc/NEWS.d/next/Library/2020-01-16-23-41-16.bpo-38840.VzzYZz.rst b/Misc/NEWS.d/next/Library/2020-01-16-23-41-16.bpo-38840.VzzYZz.rst
new file mode 100644
index 00000000000000..727f62b52a710b
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-01-16-23-41-16.bpo-38840.VzzYZz.rst
@@ -0,0 +1 @@
+Fix ``test___all__`` on platforms lacking a shared memory implementation.


From webhook-mailer at python.org  Mon Aug  9 12:45:45 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 09 Aug 2021 16:45:45 -0000
Subject: [Python-checkins] bpo-41402: Fix email ContentManager calling
 .encode() on bytes (GH-21631)
Message-ID: <mailman.961.1628527546.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/b33186bc43bb5aaf652dd9d093a08fdde796d499
commit: b33186bc43bb5aaf652dd9d093a08fdde796d499
branch: main
author: Johannes Reiff <mail at jreiff.de>
committer: ambv <lukasz at langa.pl>
date: 2021-08-09T18:45:41+02:00
summary:

bpo-41402: Fix email ContentManager calling .encode() on bytes (GH-21631)

files:
A Misc/NEWS.d/next/Library/2020-07-26-18-17-30.bpo-41402.YRkVkp.rst
M Lib/email/contentmanager.py
M Lib/test/test_email/test_contentmanager.py

diff --git a/Lib/email/contentmanager.py b/Lib/email/contentmanager.py
index b91fb0e5bca7a8..3cf62dc8621cd9 100644
--- a/Lib/email/contentmanager.py
+++ b/Lib/email/contentmanager.py
@@ -238,9 +238,7 @@ def set_bytes_content(msg, data, maintype, subtype, cte='base64',
         data = binascii.b2a_qp(data, istext=False, header=False, quotetabs=True)
         data = data.decode('ascii')
     elif cte == '7bit':
-        # Make sure it really is only ASCII.  The early warning here seems
-        # worth the overhead...if you care write your own content manager :).
-        data.encode('ascii')
+        data = data.decode('ascii')
     elif cte in ('8bit', 'binary'):
         data = data.decode('ascii', 'surrogateescape')
     msg.set_payload(data)
diff --git a/Lib/test/test_email/test_contentmanager.py b/Lib/test/test_email/test_contentmanager.py
index f4f6bb715acdce..694cef4ba7e413 100644
--- a/Lib/test/test_email/test_contentmanager.py
+++ b/Lib/test/test_email/test_contentmanager.py
@@ -776,6 +776,18 @@ def test_set_non_ascii_filename(self):
             foo
             """).encode('ascii'))
 
+    def test_set_content_bytes_cte_7bit(self):
+        m = self._make_message()
+        m.set_content(b'ASCII-only message.\n',
+            maintype='application', subtype='octet-stream', cte='7bit')
+        self.assertEqual(str(m), textwrap.dedent("""\
+            Content-Type: application/octet-stream
+            Content-Transfer-Encoding: 7bit
+            MIME-Version: 1.0
+
+            ASCII-only message.
+            """))
+
     content_object_params = {
         'text_plain': ('content', ()),
         'text_html': ('content', ('html',)),
diff --git a/Misc/NEWS.d/next/Library/2020-07-26-18-17-30.bpo-41402.YRkVkp.rst b/Misc/NEWS.d/next/Library/2020-07-26-18-17-30.bpo-41402.YRkVkp.rst
new file mode 100644
index 00000000000000..45585a469e7247
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-07-26-18-17-30.bpo-41402.YRkVkp.rst
@@ -0,0 +1 @@
+Fix :meth:`email.message.EmailMessage.set_content` when called with binary data and ``7bit`` content transfer encoding.


From webhook-mailer at python.org  Mon Aug  9 13:11:47 2021
From: webhook-mailer at python.org (iritkatriel)
Date: Mon, 09 Aug 2021 17:11:47 -0000
Subject: [Python-checkins] bpo-44872: use new trashcan macros in
 framobject.c (#27683)
Message-ID: <mailman.962.1628529109.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/7d14fdb03c3e8384c01da1b21647ce837ed6a29c
commit: 7d14fdb03c3e8384c01da1b21647ce837ed6a29c
branch: main
author: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
committer: iritkatriel <1055913+iritkatriel at users.noreply.github.com>
date: 2021-08-09T18:11:38+01:00
summary:

bpo-44872: use new trashcan macros in framobject.c (#27683)

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-09-16-16-03.bpo-44872.OKRlhK.rst
M Objects/frameobject.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-09-16-16-03.bpo-44872.OKRlhK.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-09-16-16-03.bpo-44872.OKRlhK.rst
new file mode 100644
index 00000000000000..9a0d00018b2a7c
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-09-16-16-03.bpo-44872.OKRlhK.rst	
@@ -0,0 +1 @@
+Use new trashcan macros (Py_TRASHCAN_BEGIN/END) in frameobject.c instead of the old ones (Py_TRASHCAN_SAFE_BEGIN/END).
\ No newline at end of file
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index d1b8048fceadf7..2af69597c396ee 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -619,7 +619,7 @@ frame_dealloc(PyFrameObject *f)
         _PyObject_GC_UNTRACK(f);
     }
 
-    Py_TRASHCAN_SAFE_BEGIN(f)
+    Py_TRASHCAN_BEGIN(f, frame_dealloc);
     PyCodeObject *co = NULL;
 
     /* Kill all local variables including specials, if we own them */
@@ -659,7 +659,7 @@ frame_dealloc(PyFrameObject *f)
     }
 
     Py_XDECREF(co);
-    Py_TRASHCAN_SAFE_END(f)
+    Py_TRASHCAN_END;
 }
 
 static int


From webhook-mailer at python.org  Mon Aug  9 13:31:18 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 09 Aug 2021 17:31:18 -0000
Subject: [Python-checkins] bpo-38840: Incorrect __all__ in
 multiprocessing.managers (GH-18034) (GH-27684)
Message-ID: <mailman.963.1628530279.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/40b353bc079b990cf0d6259a5720fb9729c1b81e
commit: 40b353bc079b990cf0d6259a5720fb9729c1b81e
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-09T19:31:10+02:00
summary:

bpo-38840: Incorrect __all__ in multiprocessing.managers (GH-18034) (GH-27684)

This was causing test___all__ to fail on platforms lacking a shared
memory implementation.

Co-Authored-By: Xavier de Gaye <xdegaye at gmail.com>
Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit d0978761118856e8ca8ea7b162a6585b8da83df9)

Co-authored-by: Zackery Spytz <zspytz at gmail.com>

files:
A Misc/NEWS.d/next/Library/2020-01-16-23-41-16.bpo-38840.VzzYZz.rst
M Lib/multiprocessing/managers.py

diff --git a/Lib/multiprocessing/managers.py b/Lib/multiprocessing/managers.py
index f8d3cef110fa58..dfa566c6fc386f 100644
--- a/Lib/multiprocessing/managers.py
+++ b/Lib/multiprocessing/managers.py
@@ -8,8 +8,7 @@
 # Licensed to PSF under a Contributor Agreement.
 #
 
-__all__ = [ 'BaseManager', 'SyncManager', 'BaseProxy', 'Token',
-            'SharedMemoryManager' ]
+__all__ = [ 'BaseManager', 'SyncManager', 'BaseProxy', 'Token' ]
 
 #
 # Imports
@@ -35,9 +34,11 @@
 from . import get_context
 try:
     from . import shared_memory
-    HAS_SHMEM = True
 except ImportError:
     HAS_SHMEM = False
+else:
+    HAS_SHMEM = True
+    __all__.append('SharedMemoryManager')
 
 #
 # Register some things for pickling
diff --git a/Misc/NEWS.d/next/Library/2020-01-16-23-41-16.bpo-38840.VzzYZz.rst b/Misc/NEWS.d/next/Library/2020-01-16-23-41-16.bpo-38840.VzzYZz.rst
new file mode 100644
index 00000000000000..727f62b52a710b
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-01-16-23-41-16.bpo-38840.VzzYZz.rst
@@ -0,0 +1 @@
+Fix ``test___all__`` on platforms lacking a shared memory implementation.


From webhook-mailer at python.org  Mon Aug  9 13:39:14 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 09 Aug 2021 17:39:14 -0000
Subject: [Python-checkins] bpo-38840: Incorrect __all__ in
 multiprocessing.managers (GH-18034)
Message-ID: <mailman.964.1628530755.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/8ece98a7e418c3c68a4c61bc47a2d0931b59a889
commit: 8ece98a7e418c3c68a4c61bc47a2d0931b59a889
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-09T10:39:05-07:00
summary:

bpo-38840: Incorrect __all__ in multiprocessing.managers (GH-18034)


This was causing test___all__ to fail on platforms lacking a shared
memory implementation.

Co-Authored-By: Xavier de Gaye <xdegaye at gmail.com>
Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit d0978761118856e8ca8ea7b162a6585b8da83df9)

Co-authored-by: Zackery Spytz <zspytz at gmail.com>

files:
A Misc/NEWS.d/next/Library/2020-01-16-23-41-16.bpo-38840.VzzYZz.rst
M Lib/multiprocessing/managers.py

diff --git a/Lib/multiprocessing/managers.py b/Lib/multiprocessing/managers.py
index b981b0e1cb8ed8..b6b4cdd9ac15eb 100644
--- a/Lib/multiprocessing/managers.py
+++ b/Lib/multiprocessing/managers.py
@@ -8,8 +8,7 @@
 # Licensed to PSF under a Contributor Agreement.
 #
 
-__all__ = [ 'BaseManager', 'SyncManager', 'BaseProxy', 'Token',
-            'SharedMemoryManager' ]
+__all__ = [ 'BaseManager', 'SyncManager', 'BaseProxy', 'Token' ]
 
 #
 # Imports
@@ -35,9 +34,11 @@
 from . import get_context
 try:
     from . import shared_memory
-    HAS_SHMEM = True
 except ImportError:
     HAS_SHMEM = False
+else:
+    HAS_SHMEM = True
+    __all__.append('SharedMemoryManager')
 
 #
 # Register some things for pickling
diff --git a/Misc/NEWS.d/next/Library/2020-01-16-23-41-16.bpo-38840.VzzYZz.rst b/Misc/NEWS.d/next/Library/2020-01-16-23-41-16.bpo-38840.VzzYZz.rst
new file mode 100644
index 00000000000000..727f62b52a710b
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-01-16-23-41-16.bpo-38840.VzzYZz.rst
@@ -0,0 +1 @@
+Fix ``test___all__`` on platforms lacking a shared memory implementation.


From webhook-mailer at python.org  Mon Aug  9 14:33:03 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Mon, 09 Aug 2021 18:33:03 -0000
Subject: [Python-checkins] bpo-44854: Remove trailing whitespaces (GH-27689)
Message-ID: <mailman.965.1628533984.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/058fb35b57ca8c5063d16ec818e668b3babfea65
commit: 058fb35b57ca8c5063d16ec818e668b3babfea65
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-09T21:32:54+03:00
summary:

bpo-44854: Remove trailing whitespaces (GH-27689)

files:
M .github/SECURITY.md
M .github/problem-matchers/sphinx.json
M Doc/tools/templates/search.html
M Modules/_bisectmodule.c
M Modules/_ctypes/_ctypes_test.c
M Modules/_json.c
M Modules/termios.c
M Objects/exceptions.c
M Objects/genericaliasobject.c
M Parser/tokenizer.h
M Python/adaptive.md
M Tools/c-analyzer/c_parser/_state_machine.py
M Tools/c-analyzer/c_parser/preprocessor/__init__.py

diff --git a/.github/SECURITY.md b/.github/SECURITY.md
index 82ae4ca8c30977..2aebc5a0bf717f 100644
--- a/.github/SECURITY.md
+++ b/.github/SECURITY.md
@@ -14,4 +14,4 @@ official website](https://www.python.org/dev/security/) for
 instructions on how to report a security-related problem to
 the Python team responsibly.
 
-To reach the response team, email `security at python dot org`. 
+To reach the response team, email `security at python dot org`.
diff --git a/.github/problem-matchers/sphinx.json b/.github/problem-matchers/sphinx.json
index 228415f5b7b03f..09848608a7b034 100644
--- a/.github/problem-matchers/sphinx.json
+++ b/.github/problem-matchers/sphinx.json
@@ -34,7 +34,7 @@
                     "line": 2,
                     "message": 3
                 }
-            ]           
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Doc/tools/templates/search.html b/Doc/tools/templates/search.html
index cf20c2e1d4ff83..f2ac2ea0f09873 100644
--- a/Doc/tools/templates/search.html
+++ b/Doc/tools/templates/search.html
@@ -6,7 +6,7 @@
 
         jQuery(function() {
             $.getJSON("_static/glossary.json", function(glossary) {
-                var RESULT_TEMPLATE = '<div style="display: none" class="admonition seealso" id="glossary-result">' + 
+                var RESULT_TEMPLATE = '<div style="display: none" class="admonition seealso" id="glossary-result">' +
                                       '  <p class="topic-title">' +
                                       '    <a class="glossary-title" href="#"></a>' +
                                       '  </p>' +
@@ -20,7 +20,7 @@
                     var glossary_item = glossary[search_param];
                     if (glossary_item) {
                         var resultDiv = $("#glossary-result");
-                        
+
                         // set up the title text with a link to the glossary page
                         resultDiv.find(".glossary-title").text('Glossary: ' + glossary_item.title);
                         var link_target = search_param.replace(/ /g, '-');
diff --git a/Modules/_bisectmodule.c b/Modules/_bisectmodule.c
index aa63b685609cc0..26c4b9bfb26b22 100644
--- a/Modules/_bisectmodule.c
+++ b/Modules/_bisectmodule.c
@@ -240,7 +240,7 @@ _bisect_insort_left_impl(PyObject *module, PyObject *a, PyObject *x,
 {
     PyObject *result, *key_x;
     Py_ssize_t index;
-    
+
     if (key == Py_None) {
         index = internal_bisect_left(a, x, lo, hi, key);
     } else {
diff --git a/Modules/_ctypes/_ctypes_test.c b/Modules/_ctypes/_ctypes_test.c
index 1ccad8e0e3d64d..a33d15de9c0d41 100644
--- a/Modules/_ctypes/_ctypes_test.c
+++ b/Modules/_ctypes/_ctypes_test.c
@@ -1034,7 +1034,7 @@ EXPORT (HRESULT) KeepObject(IUnknown *punk)
 
 static struct PyModuleDef_Slot _ctypes_test_slots[] = {
     {0, NULL}
-}; 
+};
 
 static struct PyModuleDef _ctypes_testmodule = {
     PyModuleDef_HEAD_INIT,
diff --git a/Modules/_json.c b/Modules/_json.c
index e10f83c96c565f..6f68c1f7f9b715 100644
--- a/Modules/_json.c
+++ b/Modules/_json.c
@@ -321,7 +321,7 @@ raise_errmsg(const char *msg, PyObject *s, Py_ssize_t end)
     if (decoder == NULL) {
         return;
     }
-    
+
     _Py_IDENTIFIER(JSONDecodeError);
     PyObject *JSONDecodeError = _PyObject_GetAttrId(decoder, &PyId_JSONDecodeError);
     Py_DECREF(decoder);
diff --git a/Modules/termios.c b/Modules/termios.c
index a6649598ec1710..fdfe589eb80c1a 100644
--- a/Modules/termios.c
+++ b/Modules/termios.c
@@ -1004,7 +1004,7 @@ static void termiosmodule_free(void *m) {
     termiosmodule_clear((PyObject *)m);
 }
 
-static int 
+static int
 termios_exec(PyObject *mod)
 {
     struct constant *constant = termios_constants;
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index 76772fbed214d7..c6a7aa4aeccf04 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -1503,7 +1503,7 @@ SyntaxError_init(PySyntaxErrorObject *self, PyObject *args, PyObject *kwds)
                               &self->end_lineno, &self->end_offset)) {
             Py_DECREF(info);
             return -1;
-        } 
+        }
 
         Py_INCREF(self->filename);
         Py_INCREF(self->lineno);
diff --git a/Objects/genericaliasobject.c b/Objects/genericaliasobject.c
index dda53cb5338645..38b68e410c443c 100644
--- a/Objects/genericaliasobject.c
+++ b/Objects/genericaliasobject.c
@@ -576,7 +576,7 @@ static PyGetSetDef ga_properties[] = {
 };
 
 /* A helper function to create GenericAlias' args tuple and set its attributes.
- * Returns 1 on success, 0 on failure. 
+ * Returns 1 on success, 0 on failure.
  */
 static inline int
 setup_ga(gaobject *alias, PyObject *origin, PyObject *args) {
diff --git a/Parser/tokenizer.h b/Parser/tokenizer.h
index ff563d57fa8b15..a40f7d9687b440 100644
--- a/Parser/tokenizer.h
+++ b/Parser/tokenizer.h
@@ -83,7 +83,7 @@ struct tok_state {
     int async_def_nl;     /* =1 if the outermost 'async def' had at least one
                              NEWLINE token after it. */
     /* How to proceed when asked for a new token in interactive mode */
-    enum interactive_underflow_t interactive_underflow; 
+    enum interactive_underflow_t interactive_underflow;
 };
 
 extern struct tok_state *PyTokenizer_FromString(const char *, int);
diff --git a/Python/adaptive.md b/Python/adaptive.md
index 66b80a17464bfb..81880ce8cf2426 100644
--- a/Python/adaptive.md
+++ b/Python/adaptive.md
@@ -12,7 +12,7 @@ A family of instructions has the following fundamental properties:
 * It has a single adaptive instruction that records an execution count and,
   at regular intervals, attempts to specialize itself. If not specializing,
   it executes the non-adaptive instruction.
-* It has at least one specialized form of the instruction that is tailored 
+* It has at least one specialized form of the instruction that is tailored
   for a particular value or set of values at runtime.
 * All members of the family have access to the same number of cache entries.
   Individual family members do not need to use all of the entries.
@@ -80,7 +80,7 @@ requiring judgement and experimentation to design the family of instructions.
 
 Before choosing how to specialize an instruction, it is important to gather
 some data. What are the patterns of usage of the base instruction?
-Data can best be gathered by instrumenting the interpreter. Since a 
+Data can best be gathered by instrumenting the interpreter. Since a
 specialization function and adaptive instruction are going to be required,
 instrumentation can most easily be added in the specialization function.
 
diff --git a/Tools/c-analyzer/c_parser/_state_machine.py b/Tools/c-analyzer/c_parser/_state_machine.py
index b505b4e3e47240..53cbb13e7c4edb 100644
--- a/Tools/c-analyzer/c_parser/_state_machine.py
+++ b/Tools/c-analyzer/c_parser/_state_machine.py
@@ -23,7 +23,7 @@ def parse(srclines):
     if isinstance(srclines, str):  # a filename
         raise NotImplementedError
 
-    
+
 
 # This only handles at most 10 nested levels.
 #MATCHED_PARENS = textwrap.dedent(rf'''
diff --git a/Tools/c-analyzer/c_parser/preprocessor/__init__.py b/Tools/c-analyzer/c_parser/preprocessor/__init__.py
index f206f694db5a88..8da4d8cadf7d0e 100644
--- a/Tools/c-analyzer/c_parser/preprocessor/__init__.py
+++ b/Tools/c-analyzer/c_parser/preprocessor/__init__.py
@@ -91,7 +91,7 @@ def get_file_preprocessor(filename):
             macros = list(_resolve_file_values(filename, file_macros))
         if file_incldirs:
             incldirs = [v for v, in _resolve_file_values(filename, file_incldirs)]
-    
+
         def preprocess(**kwargs):
             if file_macros and 'macros' not in kwargs:
                 kwargs['macros'] = macros


From webhook-mailer at python.org  Mon Aug  9 18:35:07 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 09 Aug 2021 22:35:07 -0000
Subject: [Python-checkins] bpo-41402: Fix email ContentManager calling
 .encode() on bytes (GH-21631) (GH-27687)
Message-ID: <mailman.966.1628548508.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/395f4c7fbfb89b8724a4abf84410b5e1e374932d
commit: 395f4c7fbfb89b8724a4abf84410b5e1e374932d
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-10T00:34:58+02:00
summary:

bpo-41402: Fix email ContentManager calling .encode() on bytes (GH-21631) (GH-27687)

(cherry picked from commit b33186bc43bb5aaf652dd9d093a08fdde796d499)

Co-authored-by: Johannes Reiff <mail at jreiff.de>

files:
A Misc/NEWS.d/next/Library/2020-07-26-18-17-30.bpo-41402.YRkVkp.rst
M Lib/email/contentmanager.py
M Lib/test/test_email/test_contentmanager.py

diff --git a/Lib/email/contentmanager.py b/Lib/email/contentmanager.py
index b91fb0e5bca7a8..3cf62dc8621cd9 100644
--- a/Lib/email/contentmanager.py
+++ b/Lib/email/contentmanager.py
@@ -238,9 +238,7 @@ def set_bytes_content(msg, data, maintype, subtype, cte='base64',
         data = binascii.b2a_qp(data, istext=False, header=False, quotetabs=True)
         data = data.decode('ascii')
     elif cte == '7bit':
-        # Make sure it really is only ASCII.  The early warning here seems
-        # worth the overhead...if you care write your own content manager :).
-        data.encode('ascii')
+        data = data.decode('ascii')
     elif cte in ('8bit', 'binary'):
         data = data.decode('ascii', 'surrogateescape')
     msg.set_payload(data)
diff --git a/Lib/test/test_email/test_contentmanager.py b/Lib/test/test_email/test_contentmanager.py
index f4f6bb715acdce..694cef4ba7e413 100644
--- a/Lib/test/test_email/test_contentmanager.py
+++ b/Lib/test/test_email/test_contentmanager.py
@@ -776,6 +776,18 @@ def test_set_non_ascii_filename(self):
             foo
             """).encode('ascii'))
 
+    def test_set_content_bytes_cte_7bit(self):
+        m = self._make_message()
+        m.set_content(b'ASCII-only message.\n',
+            maintype='application', subtype='octet-stream', cte='7bit')
+        self.assertEqual(str(m), textwrap.dedent("""\
+            Content-Type: application/octet-stream
+            Content-Transfer-Encoding: 7bit
+            MIME-Version: 1.0
+
+            ASCII-only message.
+            """))
+
     content_object_params = {
         'text_plain': ('content', ()),
         'text_html': ('content', ('html',)),
diff --git a/Misc/NEWS.d/next/Library/2020-07-26-18-17-30.bpo-41402.YRkVkp.rst b/Misc/NEWS.d/next/Library/2020-07-26-18-17-30.bpo-41402.YRkVkp.rst
new file mode 100644
index 00000000000000..45585a469e7247
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-07-26-18-17-30.bpo-41402.YRkVkp.rst
@@ -0,0 +1 @@
+Fix :meth:`email.message.EmailMessage.set_content` when called with binary data and ``7bit`` content transfer encoding.


From webhook-mailer at python.org  Mon Aug  9 18:35:56 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 09 Aug 2021 22:35:56 -0000
Subject: [Python-checkins] bpo-39498 Start linking the security warnings in
 the stdlib modules (GH-18272)
Message-ID: <mailman.967.1628548557.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/c5c5326d4799fe4ae566aff32ed3461af95859cc
commit: c5c5326d4799fe4ae566aff32ed3461af95859cc
branch: main
author: Anthony Shaw <anthony.p.shaw at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-10T00:35:51+02:00
summary:

bpo-39498 Start linking the security warnings in the stdlib modules (GH-18272)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Doc/library/security_warnings.rst
A Misc/NEWS.d/next/Documentation/2020-01-30-05-18-48.bpo-39498.Nu3sFL.rst
M Doc/library/hashlib.rst
M Doc/library/index.rst
M Doc/library/logging.config.rst
M Doc/library/multiprocessing.rst
M Doc/library/shelve.rst
M Doc/library/subprocess.rst
M Doc/library/tempfile.rst
M Doc/library/zipfile.rst

diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst
index d22efa23015c6..37addee6cda80 100644
--- a/Doc/library/hashlib.rst
+++ b/Doc/library/hashlib.rst
@@ -80,6 +80,8 @@ library that Python uses on your platform. On most platforms the
 .. versionadded:: 3.6
    :func:`blake2b` and :func:`blake2s` were added.
 
+.. _hashlib-usedforsecurity:
+
 .. versionchanged:: 3.9
    All hashlib constructors take a keyword-only argument *usedforsecurity*
    with default value ``True``. A false value allows the use of insecure and
diff --git a/Doc/library/index.rst b/Doc/library/index.rst
index 1a9e52ec5ccfb..db8f0d9bdfb8f 100644
--- a/Doc/library/index.rst
+++ b/Doc/library/index.rst
@@ -75,3 +75,4 @@ the `Python Package Index <https://pypi.org>`_.
    unix.rst
    superseded.rst
    undoc.rst
+   security_warnings.rst
diff --git a/Doc/library/logging.config.rst b/Doc/library/logging.config.rst
index f833bcdd1fcf5..d3478a94345f0 100644
--- a/Doc/library/logging.config.rst
+++ b/Doc/library/logging.config.rst
@@ -152,6 +152,8 @@ in :mod:`logging` itself) and defining handlers which are declared either in
    send it to the socket as a sequence of bytes preceded by a four-byte length
    string packed in binary using ``struct.pack('>L', n)``.
 
+   .. _logging-eval-security:
+
    .. note::
 
       Because portions of the configuration are passed through
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index b9396c3c7531c..c9b2a3716ff32 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -1187,6 +1187,7 @@ For example:
     >>> arr2
     array('i', [0, 1, 2, 3, 4, 0, 0, 0, 0, 0])
 
+.. _multiprocessing-recv-pickle-security:
 
 .. warning::
 
diff --git a/Doc/library/security_warnings.rst b/Doc/library/security_warnings.rst
new file mode 100644
index 0000000000000..61fd4e6e487f7
--- /dev/null
+++ b/Doc/library/security_warnings.rst
@@ -0,0 +1,32 @@
+.. _security-warnings:
+
+.. index:: single: security considerations
+
+Security Considerations
+=======================
+
+The following modules have specific security considerations:
+
+* :mod:`cgi`: :ref:`CGI security considerations <cgi-security>`
+* :mod:`hashlib`: :ref:`all constructors take a "usedforsecurity" keyword-only
+  argument disabling known insecure and blocked algorithms
+  <hashlib-usedforsecurity>`
+* :mod:`http.server` is not suitable for production use, only implementing
+  basic security checks
+* :mod:`logging`: :ref:`Logging configuration uses eval()
+  <logging-eval-security>`
+* :mod:`multiprocessing`: :ref:`Connection.recv() uses pickle
+  <multiprocessing-recv-pickle-security>`
+* :mod:`pickle`: :ref:`Restricting globals in pickle <pickle-restrict>`
+* :mod:`random` shouldn't be used for security purposes, use :mod:`secrets`
+  instead
+* :mod:`shelve`: :ref:`shelve is based on pickle and thus unsuitable for
+  dealing with untrusted sources <shelve-security>`
+* :mod:`ssl`: :ref:`SSL/TLS security considerations <ssl-security>`
+* :mod:`subprocess`: :ref:`Subprocess security considerations
+  <subprocess-security>`
+* :mod:`tempfile`: :ref:`mktemp is deprecated due to vulnerability to race
+  conditions <tempfile-mktemp-deprecated>`
+* :mod:`xml`: :ref:`XML vulnerabilities <xml-vulnerabilities>`
+* :mod:`zipfile`: :ref:`maliciously prepared .zip files can cause disk volume
+  exhaustion <zipfile-resources-limitations>`
diff --git a/Doc/library/shelve.rst b/Doc/library/shelve.rst
index 1031888a5889b..684f239ef06fa 100644
--- a/Doc/library/shelve.rst
+++ b/Doc/library/shelve.rst
@@ -54,6 +54,8 @@ lots of shared  sub-objects.  The keys are ordinary strings.
           with shelve.open('spam') as db:
               db['eggs'] = 'eggs'
 
+.. _shelve-security:
+
 .. warning::
 
    Because the :mod:`shelve` module is backed by :mod:`pickle`, it is insecure
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
index a95047433d240..af5463364c44b 100644
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -710,6 +710,7 @@ Exceptions defined in this module all inherit from :exc:`SubprocessError`.
    .. versionadded:: 3.3
       The :exc:`SubprocessError` base class was added.
 
+.. _subprocess-security:
 
 Security Considerations
 -----------------------
diff --git a/Doc/library/tempfile.rst b/Doc/library/tempfile.rst
index 49396b5f4bdc4..3e904d04642d8 100644
--- a/Doc/library/tempfile.rst
+++ b/Doc/library/tempfile.rst
@@ -344,6 +344,7 @@ Here are some examples of typical usage of the :mod:`tempfile` module::
     >>>
     # directory and contents have been removed
 
+.. _tempfile-mktemp-deprecated:
 
 Deprecated functions and variables
 ----------------------------------
diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst
index a0bbdbf595aa8..9d0d894c05b57 100644
--- a/Doc/library/zipfile.rst
+++ b/Doc/library/zipfile.rst
@@ -886,6 +886,8 @@ Exceeding limitations on different file systems can cause decompression failed.
 Such as allowable characters in the directory entries, length of the file name,
 length of the pathname, size of a single file, and number of files, etc.
 
+.. _zipfile-resources-limitations:
+
 Resources limitations
 ~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/Misc/NEWS.d/next/Documentation/2020-01-30-05-18-48.bpo-39498.Nu3sFL.rst b/Misc/NEWS.d/next/Documentation/2020-01-30-05-18-48.bpo-39498.Nu3sFL.rst
new file mode 100644
index 0000000000000..a3e899a80a0fc
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2020-01-30-05-18-48.bpo-39498.Nu3sFL.rst
@@ -0,0 +1 @@
+Add a "Security Considerations" index which links to standard library modules that have explicitly documented security considerations.


From webhook-mailer at python.org  Mon Aug  9 18:38:30 2021
From: webhook-mailer at python.org (iritkatriel)
Date: Mon, 09 Aug 2021 22:38:30 -0000
Subject: [Python-checkins] bpo-14853: add back the stdin test,
 skip if stdin is redirected (GH-27694)
Message-ID: <mailman.968.1628548711.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/8ed183391241f0c73e7ba7f42b1d49fc02985f7b
commit: 8ed183391241f0c73e7ba7f42b1d49fc02985f7b
branch: main
author: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
committer: iritkatriel <1055913+iritkatriel at users.noreply.github.com>
date: 2021-08-09T23:38:26+01:00
summary:

bpo-14853: add back the stdin test, skip if stdin is redirected (GH-27694)

files:
M Lib/test/test_file.py

diff --git a/Lib/test/test_file.py b/Lib/test/test_file.py
index fbfba64759a1e..1ec756f334d28 100644
--- a/Lib/test/test_file.py
+++ b/Lib/test/test_file.py
@@ -154,6 +154,22 @@ def testModeStrings(self):
                 f.close()
                 self.fail('%r is an invalid file mode' % mode)
 
+    def testStdin(self):
+        if sys.platform == 'osf1V5':
+            # This causes the interpreter to exit on OSF1 v5.1.
+            self.skipTest(
+                ' sys.stdin.seek(-1) may crash the interpreter on OSF1.'
+                ' Test manually.')
+
+        if not sys.stdin.isatty():
+            # Issue 14853: stdin becomes seekable when redirected to a file
+            self.skipTest('stdin must be a TTY in this test')
+
+        with self.assertRaises((IOError, ValueError)):
+            sys.stdin.seek(-1)
+        with self.assertRaises((IOError, ValueError)):
+            sys.stdin.truncate()
+
     def testBadModeArgument(self):
         # verify that we get a sensible error message for bad mode argument
         bad_mode = "qwerty"


From webhook-mailer at python.org  Mon Aug  9 19:44:26 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 09 Aug 2021 23:44:26 -0000
Subject: [Python-checkins] bpo-41402: Fix email ContentManager calling
 .encode() on bytes (GH-21631)
Message-ID: <mailman.969.1628552667.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/a3185da26f8c818907c297d92c533deaa96f40fd
commit: a3185da26f8c818907c297d92c533deaa96f40fd
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-09T16:44:17-07:00
summary:

bpo-41402: Fix email ContentManager calling .encode() on bytes (GH-21631)

(cherry picked from commit b33186bc43bb5aaf652dd9d093a08fdde796d499)

Co-authored-by: Johannes Reiff <mail at jreiff.de>

files:
A Misc/NEWS.d/next/Library/2020-07-26-18-17-30.bpo-41402.YRkVkp.rst
M Lib/email/contentmanager.py
M Lib/test/test_email/test_contentmanager.py

diff --git a/Lib/email/contentmanager.py b/Lib/email/contentmanager.py
index b91fb0e5bca7a8..3cf62dc8621cd9 100644
--- a/Lib/email/contentmanager.py
+++ b/Lib/email/contentmanager.py
@@ -238,9 +238,7 @@ def set_bytes_content(msg, data, maintype, subtype, cte='base64',
         data = binascii.b2a_qp(data, istext=False, header=False, quotetabs=True)
         data = data.decode('ascii')
     elif cte == '7bit':
-        # Make sure it really is only ASCII.  The early warning here seems
-        # worth the overhead...if you care write your own content manager :).
-        data.encode('ascii')
+        data = data.decode('ascii')
     elif cte in ('8bit', 'binary'):
         data = data.decode('ascii', 'surrogateescape')
     msg.set_payload(data)
diff --git a/Lib/test/test_email/test_contentmanager.py b/Lib/test/test_email/test_contentmanager.py
index f4f6bb715acdce..694cef4ba7e413 100644
--- a/Lib/test/test_email/test_contentmanager.py
+++ b/Lib/test/test_email/test_contentmanager.py
@@ -776,6 +776,18 @@ def test_set_non_ascii_filename(self):
             foo
             """).encode('ascii'))
 
+    def test_set_content_bytes_cte_7bit(self):
+        m = self._make_message()
+        m.set_content(b'ASCII-only message.\n',
+            maintype='application', subtype='octet-stream', cte='7bit')
+        self.assertEqual(str(m), textwrap.dedent("""\
+            Content-Type: application/octet-stream
+            Content-Transfer-Encoding: 7bit
+            MIME-Version: 1.0
+
+            ASCII-only message.
+            """))
+
     content_object_params = {
         'text_plain': ('content', ()),
         'text_html': ('content', ('html',)),
diff --git a/Misc/NEWS.d/next/Library/2020-07-26-18-17-30.bpo-41402.YRkVkp.rst b/Misc/NEWS.d/next/Library/2020-07-26-18-17-30.bpo-41402.YRkVkp.rst
new file mode 100644
index 00000000000000..45585a469e7247
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-07-26-18-17-30.bpo-41402.YRkVkp.rst
@@ -0,0 +1 @@
+Fix :meth:`email.message.EmailMessage.set_content` when called with binary data and ``7bit`` content transfer encoding.


From webhook-mailer at python.org  Tue Aug 10 03:51:36 2021
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 10 Aug 2021 07:51:36 -0000
Subject: [Python-checkins] bpo-39498 Start linking the security warnings in
 the stdlib modules (GH-18272)
Message-ID: <mailman.970.1628581898.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/d657da8155cc9611b901ea052f3eac28f99122b4
commit: d657da8155cc9611b901ea052f3eac28f99122b4
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-10T00:51:06-07:00
summary:

bpo-39498 Start linking the security warnings in the stdlib modules (GH-18272)


Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit c5c5326d4799fe4ae566aff32ed3461af95859cc)

Co-authored-by: Anthony Shaw <anthony.p.shaw at gmail.com>

files:
A Doc/library/security_warnings.rst
A Misc/NEWS.d/next/Documentation/2020-01-30-05-18-48.bpo-39498.Nu3sFL.rst
M Doc/library/hashlib.rst
M Doc/library/index.rst
M Doc/library/logging.config.rst
M Doc/library/multiprocessing.rst
M Doc/library/shelve.rst
M Doc/library/subprocess.rst
M Doc/library/tempfile.rst
M Doc/library/zipfile.rst

diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst
index d22efa23015c6..37addee6cda80 100644
--- a/Doc/library/hashlib.rst
+++ b/Doc/library/hashlib.rst
@@ -80,6 +80,8 @@ library that Python uses on your platform. On most platforms the
 .. versionadded:: 3.6
    :func:`blake2b` and :func:`blake2s` were added.
 
+.. _hashlib-usedforsecurity:
+
 .. versionchanged:: 3.9
    All hashlib constructors take a keyword-only argument *usedforsecurity*
    with default value ``True``. A false value allows the use of insecure and
diff --git a/Doc/library/index.rst b/Doc/library/index.rst
index 1a9e52ec5ccfb..db8f0d9bdfb8f 100644
--- a/Doc/library/index.rst
+++ b/Doc/library/index.rst
@@ -75,3 +75,4 @@ the `Python Package Index <https://pypi.org>`_.
    unix.rst
    superseded.rst
    undoc.rst
+   security_warnings.rst
diff --git a/Doc/library/logging.config.rst b/Doc/library/logging.config.rst
index f833bcdd1fcf5..d3478a94345f0 100644
--- a/Doc/library/logging.config.rst
+++ b/Doc/library/logging.config.rst
@@ -152,6 +152,8 @@ in :mod:`logging` itself) and defining handlers which are declared either in
    send it to the socket as a sequence of bytes preceded by a four-byte length
    string packed in binary using ``struct.pack('>L', n)``.
 
+   .. _logging-eval-security:
+
    .. note::
 
       Because portions of the configuration are passed through
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index ae4f7bf3b9621..945ac42b2fbb3 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -1187,6 +1187,7 @@ For example:
     >>> arr2
     array('i', [0, 1, 2, 3, 4, 0, 0, 0, 0, 0])
 
+.. _multiprocessing-recv-pickle-security:
 
 .. warning::
 
diff --git a/Doc/library/security_warnings.rst b/Doc/library/security_warnings.rst
new file mode 100644
index 0000000000000..61fd4e6e487f7
--- /dev/null
+++ b/Doc/library/security_warnings.rst
@@ -0,0 +1,32 @@
+.. _security-warnings:
+
+.. index:: single: security considerations
+
+Security Considerations
+=======================
+
+The following modules have specific security considerations:
+
+* :mod:`cgi`: :ref:`CGI security considerations <cgi-security>`
+* :mod:`hashlib`: :ref:`all constructors take a "usedforsecurity" keyword-only
+  argument disabling known insecure and blocked algorithms
+  <hashlib-usedforsecurity>`
+* :mod:`http.server` is not suitable for production use, only implementing
+  basic security checks
+* :mod:`logging`: :ref:`Logging configuration uses eval()
+  <logging-eval-security>`
+* :mod:`multiprocessing`: :ref:`Connection.recv() uses pickle
+  <multiprocessing-recv-pickle-security>`
+* :mod:`pickle`: :ref:`Restricting globals in pickle <pickle-restrict>`
+* :mod:`random` shouldn't be used for security purposes, use :mod:`secrets`
+  instead
+* :mod:`shelve`: :ref:`shelve is based on pickle and thus unsuitable for
+  dealing with untrusted sources <shelve-security>`
+* :mod:`ssl`: :ref:`SSL/TLS security considerations <ssl-security>`
+* :mod:`subprocess`: :ref:`Subprocess security considerations
+  <subprocess-security>`
+* :mod:`tempfile`: :ref:`mktemp is deprecated due to vulnerability to race
+  conditions <tempfile-mktemp-deprecated>`
+* :mod:`xml`: :ref:`XML vulnerabilities <xml-vulnerabilities>`
+* :mod:`zipfile`: :ref:`maliciously prepared .zip files can cause disk volume
+  exhaustion <zipfile-resources-limitations>`
diff --git a/Doc/library/shelve.rst b/Doc/library/shelve.rst
index 1031888a5889b..684f239ef06fa 100644
--- a/Doc/library/shelve.rst
+++ b/Doc/library/shelve.rst
@@ -54,6 +54,8 @@ lots of shared  sub-objects.  The keys are ordinary strings.
           with shelve.open('spam') as db:
               db['eggs'] = 'eggs'
 
+.. _shelve-security:
+
 .. warning::
 
    Because the :mod:`shelve` module is backed by :mod:`pickle`, it is insecure
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
index a95047433d240..af5463364c44b 100644
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -710,6 +710,7 @@ Exceptions defined in this module all inherit from :exc:`SubprocessError`.
    .. versionadded:: 3.3
       The :exc:`SubprocessError` base class was added.
 
+.. _subprocess-security:
 
 Security Considerations
 -----------------------
diff --git a/Doc/library/tempfile.rst b/Doc/library/tempfile.rst
index 2970252036780..b8a5fa0027ffb 100644
--- a/Doc/library/tempfile.rst
+++ b/Doc/library/tempfile.rst
@@ -341,6 +341,7 @@ Here are some examples of typical usage of the :mod:`tempfile` module::
     >>>
     # directory and contents have been removed
 
+.. _tempfile-mktemp-deprecated:
 
 Deprecated functions and variables
 ----------------------------------
diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst
index 4888838db2c4b..43520b697c9d2 100644
--- a/Doc/library/zipfile.rst
+++ b/Doc/library/zipfile.rst
@@ -861,6 +861,8 @@ Exceeding limitations on different file systems can cause decompression failed.
 Such as allowable characters in the directory entries, length of the file name,
 length of the pathname, size of a single file, and number of files, etc.
 
+.. _zipfile-resources-limitations:
+
 Resources limitations
 ~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/Misc/NEWS.d/next/Documentation/2020-01-30-05-18-48.bpo-39498.Nu3sFL.rst b/Misc/NEWS.d/next/Documentation/2020-01-30-05-18-48.bpo-39498.Nu3sFL.rst
new file mode 100644
index 0000000000000..a3e899a80a0fc
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2020-01-30-05-18-48.bpo-39498.Nu3sFL.rst
@@ -0,0 +1 @@
+Add a "Security Considerations" index which links to standard library modules that have explicitly documented security considerations.


From webhook-mailer at python.org  Tue Aug 10 03:51:38 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 10 Aug 2021 07:51:38 -0000
Subject: [Python-checkins] bpo-39498 Start linking the security warnings in
 the stdlib modules (GH-18272) (GH-27699)
Message-ID: <mailman.971.1628581899.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/fcbe8c63d78b5dd59470b5808d898b87d8ba0350
commit: fcbe8c63d78b5dd59470b5808d898b87d8ba0350
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-10T09:51:33+02:00
summary:

bpo-39498 Start linking the security warnings in the stdlib modules (GH-18272) (GH-27699)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit c5c5326d4799fe4ae566aff32ed3461af95859cc)

Co-authored-by: Anthony Shaw <anthony.p.shaw at gmail.com>

files:
A Doc/library/security_warnings.rst
A Misc/NEWS.d/next/Documentation/2020-01-30-05-18-48.bpo-39498.Nu3sFL.rst
M Doc/library/hashlib.rst
M Doc/library/index.rst
M Doc/library/logging.config.rst
M Doc/library/multiprocessing.rst
M Doc/library/shelve.rst
M Doc/library/subprocess.rst
M Doc/library/tempfile.rst
M Doc/library/zipfile.rst

diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst
index 5a507c12d7f12..615ee116bbb0b 100644
--- a/Doc/library/hashlib.rst
+++ b/Doc/library/hashlib.rst
@@ -80,6 +80,8 @@ library that Python uses on your platform. On most platforms the
 .. versionadded:: 3.6
    :func:`blake2b` and :func:`blake2s` were added.
 
+.. _hashlib-usedforsecurity:
+
 .. versionchanged:: 3.9
    All hashlib constructors take a keyword-only argument *usedforsecurity*
    with default value ``True``. A false value allows the use of insecure and
diff --git a/Doc/library/index.rst b/Doc/library/index.rst
index 2cddb417da82e..0fd6e4c0d0b01 100644
--- a/Doc/library/index.rst
+++ b/Doc/library/index.rst
@@ -76,3 +76,4 @@ the `Python Package Index <https://pypi.org>`_.
    unix.rst
    superseded.rst
    undoc.rst
+   security_warnings.rst
diff --git a/Doc/library/logging.config.rst b/Doc/library/logging.config.rst
index 0b5e2fc2a658d..ab44850549c0c 100644
--- a/Doc/library/logging.config.rst
+++ b/Doc/library/logging.config.rst
@@ -147,6 +147,8 @@ in :mod:`logging` itself) and defining handlers which are declared either in
    send it to the socket as a sequence of bytes preceded by a four-byte length
    string packed in binary using ``struct.pack('>L', n)``.
 
+   .. _logging-eval-security:
+
    .. note::
 
       Because portions of the configuration are passed through
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index def27bf07a03e..952a5b40a0d1f 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -1187,6 +1187,7 @@ For example:
     >>> arr2
     array('i', [0, 1, 2, 3, 4, 0, 0, 0, 0, 0])
 
+.. _multiprocessing-recv-pickle-security:
 
 .. warning::
 
diff --git a/Doc/library/security_warnings.rst b/Doc/library/security_warnings.rst
new file mode 100644
index 0000000000000..61fd4e6e487f7
--- /dev/null
+++ b/Doc/library/security_warnings.rst
@@ -0,0 +1,32 @@
+.. _security-warnings:
+
+.. index:: single: security considerations
+
+Security Considerations
+=======================
+
+The following modules have specific security considerations:
+
+* :mod:`cgi`: :ref:`CGI security considerations <cgi-security>`
+* :mod:`hashlib`: :ref:`all constructors take a "usedforsecurity" keyword-only
+  argument disabling known insecure and blocked algorithms
+  <hashlib-usedforsecurity>`
+* :mod:`http.server` is not suitable for production use, only implementing
+  basic security checks
+* :mod:`logging`: :ref:`Logging configuration uses eval()
+  <logging-eval-security>`
+* :mod:`multiprocessing`: :ref:`Connection.recv() uses pickle
+  <multiprocessing-recv-pickle-security>`
+* :mod:`pickle`: :ref:`Restricting globals in pickle <pickle-restrict>`
+* :mod:`random` shouldn't be used for security purposes, use :mod:`secrets`
+  instead
+* :mod:`shelve`: :ref:`shelve is based on pickle and thus unsuitable for
+  dealing with untrusted sources <shelve-security>`
+* :mod:`ssl`: :ref:`SSL/TLS security considerations <ssl-security>`
+* :mod:`subprocess`: :ref:`Subprocess security considerations
+  <subprocess-security>`
+* :mod:`tempfile`: :ref:`mktemp is deprecated due to vulnerability to race
+  conditions <tempfile-mktemp-deprecated>`
+* :mod:`xml`: :ref:`XML vulnerabilities <xml-vulnerabilities>`
+* :mod:`zipfile`: :ref:`maliciously prepared .zip files can cause disk volume
+  exhaustion <zipfile-resources-limitations>`
diff --git a/Doc/library/shelve.rst b/Doc/library/shelve.rst
index 87bacb6c32442..98ad408252861 100644
--- a/Doc/library/shelve.rst
+++ b/Doc/library/shelve.rst
@@ -49,6 +49,8 @@ lots of shared  sub-objects.  The keys are ordinary strings.
           with shelve.open('spam') as db:
               db['eggs'] = 'eggs'
 
+.. _shelve-security:
+
 .. warning::
 
    Because the :mod:`shelve` module is backed by :mod:`pickle`, it is insecure
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
index 2e9540ec48ce1..57a3285f8f4d8 100644
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -683,6 +683,7 @@ Exceptions defined in this module all inherit from :exc:`SubprocessError`.
    .. versionadded:: 3.3
       The :exc:`SubprocessError` base class was added.
 
+.. _subprocess-security:
 
 Security Considerations
 -----------------------
diff --git a/Doc/library/tempfile.rst b/Doc/library/tempfile.rst
index f9421da5fe7df..915489fadd401 100644
--- a/Doc/library/tempfile.rst
+++ b/Doc/library/tempfile.rst
@@ -315,6 +315,7 @@ Here are some examples of typical usage of the :mod:`tempfile` module::
     >>>
     # directory and contents have been removed
 
+.. _tempfile-mktemp-deprecated:
 
 Deprecated functions and variables
 ----------------------------------
diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst
index d55a308be7651..3d1e8d8c468dc 100644
--- a/Doc/library/zipfile.rst
+++ b/Doc/library/zipfile.rst
@@ -848,6 +848,8 @@ Exceeding limitations on different file systems can cause decompression failed.
 Such as allowable characters in the directory entries, length of the file name,
 length of the pathname, size of a single file, and number of files, etc.
 
+.. _zipfile-resources-limitations:
+
 Resources limitations
 ~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/Misc/NEWS.d/next/Documentation/2020-01-30-05-18-48.bpo-39498.Nu3sFL.rst b/Misc/NEWS.d/next/Documentation/2020-01-30-05-18-48.bpo-39498.Nu3sFL.rst
new file mode 100644
index 0000000000000..a3e899a80a0fc
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2020-01-30-05-18-48.bpo-39498.Nu3sFL.rst
@@ -0,0 +1 @@
+Add a "Security Considerations" index which links to standard library modules that have explicitly documented security considerations.


From webhook-mailer at python.org  Tue Aug 10 03:55:46 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 10 Aug 2021 07:55:46 -0000
Subject: [Python-checkins] bpo-44872: use new trashcan macros in
 framobject.c (GH-27683) (GH-27691)
Message-ID: <mailman.972.1628582147.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/ede1dc416de5eece02170e03387dc8496c2d00ae
commit: ede1dc416de5eece02170e03387dc8496c2d00ae
branch: 3.9
author: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-10T09:55:39+02:00
summary:

bpo-44872: use new trashcan macros in framobject.c (GH-27683) (GH-27691)

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-09-16-16-03.bpo-44872.OKRlhK.rst
M Objects/frameobject.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-09-16-16-03.bpo-44872.OKRlhK.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-09-16-16-03.bpo-44872.OKRlhK.rst
new file mode 100644
index 00000000000000..9a0d00018b2a7c
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-09-16-16-03.bpo-44872.OKRlhK.rst	
@@ -0,0 +1 @@
+Use new trashcan macros (Py_TRASHCAN_BEGIN/END) in frameobject.c instead of the old ones (Py_TRASHCAN_SAFE_BEGIN/END).
\ No newline at end of file
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 50846dec50e8ec..4ae17bcfc2109e 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -575,7 +575,7 @@ frame_dealloc(PyFrameObject *f)
     if (_PyObject_GC_IS_TRACKED(f))
         _PyObject_GC_UNTRACK(f);
 
-    Py_TRASHCAN_SAFE_BEGIN(f)
+    Py_TRASHCAN_BEGIN(f, frame_dealloc);
     /* Kill all local variables */
     valuestack = f->f_valuestack;
     for (p = f->f_localsplus; p < valuestack; p++)
@@ -609,7 +609,7 @@ frame_dealloc(PyFrameObject *f)
     }
 
     Py_DECREF(co);
-    Py_TRASHCAN_SAFE_END(f)
+    Py_TRASHCAN_END;
 }
 
 static inline Py_ssize_t


From webhook-mailer at python.org  Tue Aug 10 03:55:50 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 10 Aug 2021 07:55:50 -0000
Subject: [Python-checkins] bpo-44872: use new trashcan macros in
 framobject.c (GH-27683) (GH-27692)
Message-ID: <mailman.973.1628582151.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/b019ffed5debb13358a946a8e2d20594c7c181f3
commit: b019ffed5debb13358a946a8e2d20594c7c181f3
branch: 3.8
author: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-10T09:55:46+02:00
summary:

bpo-44872: use new trashcan macros in framobject.c (GH-27683) (GH-27692)

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-09-16-16-03.bpo-44872.OKRlhK.rst
M Objects/frameobject.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-09-16-16-03.bpo-44872.OKRlhK.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-09-16-16-03.bpo-44872.OKRlhK.rst
new file mode 100644
index 00000000000000..9a0d00018b2a7c
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-09-16-16-03.bpo-44872.OKRlhK.rst	
@@ -0,0 +1 @@
+Use new trashcan macros (Py_TRASHCAN_BEGIN/END) in frameobject.c instead of the old ones (Py_TRASHCAN_SAFE_BEGIN/END).
\ No newline at end of file
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 3abd8e52d859d9..5ca5e06b03f7ed 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -423,7 +423,7 @@ frame_dealloc(PyFrameObject *f)
     if (_PyObject_GC_IS_TRACKED(f))
         _PyObject_GC_UNTRACK(f);
 
-    Py_TRASHCAN_SAFE_BEGIN(f)
+    Py_TRASHCAN_BEGIN(f, frame_dealloc);
     /* Kill all local variables */
     valuestack = f->f_valuestack;
     for (p = f->f_localsplus; p < valuestack; p++)
@@ -453,7 +453,7 @@ frame_dealloc(PyFrameObject *f)
         PyObject_GC_Del(f);
 
     Py_DECREF(co);
-    Py_TRASHCAN_SAFE_END(f)
+    Py_TRASHCAN_END;
 }
 
 static int


From webhook-mailer at python.org  Tue Aug 10 03:56:18 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 10 Aug 2021 07:56:18 -0000
Subject: [Python-checkins] bpo-44872: use new trashcan macros in
 framobject.c (GH-27683) (GH-27690)
Message-ID: <mailman.974.1628582179.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/e9ec71ad2c7a1c83f03e172ba7c9f534912b8ba6
commit: e9ec71ad2c7a1c83f03e172ba7c9f534912b8ba6
branch: 3.10
author: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-10T09:56:14+02:00
summary:

bpo-44872: use new trashcan macros in framobject.c (GH-27683) (GH-27690)

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-09-16-16-03.bpo-44872.OKRlhK.rst
M Objects/frameobject.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-09-16-16-03.bpo-44872.OKRlhK.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-09-16-16-03.bpo-44872.OKRlhK.rst
new file mode 100644
index 00000000000000..9a0d00018b2a7c
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-09-16-16-03.bpo-44872.OKRlhK.rst	
@@ -0,0 +1 @@
+Use new trashcan macros (Py_TRASHCAN_BEGIN/END) in frameobject.c instead of the old ones (Py_TRASHCAN_SAFE_BEGIN/END).
\ No newline at end of file
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 034b908ade31cc..aa973016aefeac 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -581,7 +581,7 @@ frame_dealloc(PyFrameObject *f)
         _PyObject_GC_UNTRACK(f);
     }
 
-    Py_TRASHCAN_SAFE_BEGIN(f)
+    Py_TRASHCAN_BEGIN(f, frame_dealloc);
     /* Kill all local variables */
     PyObject **valuestack = f->f_valuestack;
     for (PyObject **p = f->f_localsplus; p < valuestack; p++) {
@@ -621,7 +621,7 @@ frame_dealloc(PyFrameObject *f)
     }
 
     Py_DECREF(co);
-    Py_TRASHCAN_SAFE_END(f)
+    Py_TRASHCAN_END;
 }
 
 static inline Py_ssize_t


From webhook-mailer at python.org  Tue Aug 10 05:31:36 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 10 Aug 2021 09:31:36 -0000
Subject: [Python-checkins] make lib2to3 parse async generators everywhere
 (GH-6588)
Message-ID: <mailman.975.1628587898.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/149addd4960d634ce672ab5fc17e0e785a0cdcd0
commit: 149addd4960d634ce672ab5fc17e0e785a0cdcd0
branch: main
author: Zsolt Dollenstein <zsol.zsol at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-10T11:31:32+02:00
summary:

make lib2to3 parse async generators everywhere (GH-6588)

files:
A Misc/NEWS.d/next/Library/2018-04-24-14-25-07.bpo-33349.Y_0LIr.rst
M Lib/lib2to3/pgen2/tokenize.py
M Lib/lib2to3/tests/test_parser.py

diff --git a/Lib/lib2to3/pgen2/tokenize.py b/Lib/lib2to3/pgen2/tokenize.py
index 0e2685d40433d7..099dfa7798afd4 100644
--- a/Lib/lib2to3/pgen2/tokenize.py
+++ b/Lib/lib2to3/pgen2/tokenize.py
@@ -512,13 +512,14 @@ def generate_tokens(readline):
                         stashed = tok
                         continue
 
-                    if token == 'def':
+                    if token in ('def', 'for'):
                         if (stashed
                                 and stashed[0] == NAME
                                 and stashed[1] == 'async'):
 
-                            async_def = True
-                            async_def_indent = indents[-1]
+                            if token == 'def':
+                                async_def = True
+                                async_def_indent = indents[-1]
 
                             yield (ASYNC, stashed[1],
                                    stashed[2], stashed[3],
diff --git a/Lib/lib2to3/tests/test_parser.py b/Lib/lib2to3/tests/test_parser.py
index 1aba0e88945a40..5eefb5aad7d49e 100644
--- a/Lib/lib2to3/tests/test_parser.py
+++ b/Lib/lib2to3/tests/test_parser.py
@@ -200,20 +200,27 @@ def test_async_var(self):
         self.validate("""await = 1""")
         self.validate("""def async(): pass""")
 
-    def test_async_with(self):
+    def test_async_for(self):
         self.validate("""async def foo():
                              async for a in b: pass""")
 
-        self.invalid_syntax("""def foo():
-                                   async for a in b: pass""")
-
-    def test_async_for(self):
+    def test_async_with(self):
         self.validate("""async def foo():
                              async with a: pass""")
 
         self.invalid_syntax("""def foo():
                                    async with a: pass""")
 
+    def test_async_generator(self):
+        self.validate(
+            """async def foo():
+                   return (i * 2 async for i in arange(42))"""
+        )
+        self.validate(
+            """def foo():
+                   return (i * 2 async for i in arange(42))"""
+        )
+
 
 class TestRaiseChanges(GrammarTest):
     def test_2x_style_1(self):
diff --git a/Misc/NEWS.d/next/Library/2018-04-24-14-25-07.bpo-33349.Y_0LIr.rst b/Misc/NEWS.d/next/Library/2018-04-24-14-25-07.bpo-33349.Y_0LIr.rst
new file mode 100644
index 00000000000000..be68b3ea7c4a2a
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2018-04-24-14-25-07.bpo-33349.Y_0LIr.rst
@@ -0,0 +1 @@
+lib2to3 now recognizes async generators everywhere.


From webhook-mailer at python.org  Tue Aug 10 05:32:25 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 10 Aug 2021 09:32:25 -0000
Subject: [Python-checkins] bpo-33479: Remove unqualified tkinter threadsafe
 claim. (GH-6990)
Message-ID: <mailman.976.1628587947.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/6b37d0d5300813de31d66df1c77dad7e1027e4d8
commit: 6b37d0d5300813de31d66df1c77dad7e1027e4d8
branch: main
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: ambv <lukasz at langa.pl>
date: 2021-08-10T11:32:21+02:00
summary:

bpo-33479: Remove unqualified tkinter threadsafe claim. (GH-6990)

It has not been true for several years and likely never was.

files:
A Misc/NEWS.d/next/Documentation/2018-05-19-15-59-29.bpo-33479.4cLlxo.rst
M Doc/library/tk.rst

diff --git a/Doc/library/tk.rst b/Doc/library/tk.rst
index c6c73f057cab1..691c9df5e8f80 100644
--- a/Doc/library/tk.rst
+++ b/Doc/library/tk.rst
@@ -19,8 +19,7 @@ The :mod:`tkinter` package is a thin object-oriented layer on top of Tcl/Tk. To
 use :mod:`tkinter`, you don't need to write Tcl code, but you will need to
 consult the Tk documentation, and occasionally the Tcl documentation.
 :mod:`tkinter` is a set of wrappers that implement the Tk widgets as Python
-classes.  In addition, the internal module :mod:`_tkinter` provides a threadsafe
-mechanism which allows Python and Tcl to interact.
+classes.
 
 :mod:`tkinter`'s chief virtues are that it is fast, and that it usually comes
 bundled with Python. Although its standard documentation is weak, good
diff --git a/Misc/NEWS.d/next/Documentation/2018-05-19-15-59-29.bpo-33479.4cLlxo.rst b/Misc/NEWS.d/next/Documentation/2018-05-19-15-59-29.bpo-33479.4cLlxo.rst
new file mode 100644
index 0000000000000..db4973d392395
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2018-05-19-15-59-29.bpo-33479.4cLlxo.rst
@@ -0,0 +1,4 @@
+Remove the unqualified claim that tkinter is threadsafe. It has not been
+true for several years and likely never was. An explanation of what is true
+may be added later, after more discussion, and possibly after patching
+_tkinter.c,


From webhook-mailer at python.org  Tue Aug 10 05:37:34 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 10 Aug 2021 09:37:34 -0000
Subject: [Python-checkins] bpo-25782: avoid hang in PyErr_SetObject when
 current exception has a cycle in its context chain (GH-27626)
Message-ID: <mailman.977.1628588255.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/d5c217475c4957a8084ac3f92ae012ece5edc7cb
commit: d5c217475c4957a8084ac3f92ae012ece5edc7cb
branch: main
author: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-10T11:37:25+02:00
summary:

bpo-25782: avoid hang in PyErr_SetObject when current exception has a cycle in its context chain (GH-27626)

Co-authored-by: Dennis Sweeney 36520290+sweeneyde at users.noreply.github.com

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-07-21-39-19.bpo-25782.B22lMx.rst
M Lib/test/test_exceptions.py
M Python/errors.c

diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index b280cfea435fd..593107f290dc5 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -953,6 +953,148 @@ def __del__(self):
             pass
         self.assertEqual(e, (None, None, None))
 
+    def test_raise_does_not_create_context_chain_cycle(self):
+        class A(Exception):
+            pass
+        class B(Exception):
+            pass
+        class C(Exception):
+            pass
+
+        # Create a context chain:
+        # C -> B -> A
+        # Then raise A in context of C.
+        try:
+            try:
+                raise A
+            except A as a_:
+                a = a_
+                try:
+                    raise B
+                except B as b_:
+                    b = b_
+                    try:
+                        raise C
+                    except C as c_:
+                        c = c_
+                        self.assertIsInstance(a, A)
+                        self.assertIsInstance(b, B)
+                        self.assertIsInstance(c, C)
+                        self.assertIsNone(a.__context__)
+                        self.assertIs(b.__context__, a)
+                        self.assertIs(c.__context__, b)
+                        raise a
+        except A as e:
+            exc = e
+
+        # Expect A -> C -> B, without cycle
+        self.assertIs(exc, a)
+        self.assertIs(a.__context__, c)
+        self.assertIs(c.__context__, b)
+        self.assertIsNone(b.__context__)
+
+    def test_no_hang_on_context_chain_cycle1(self):
+        # See issue 25782. Cycle in context chain.
+
+        def cycle():
+            try:
+                raise ValueError(1)
+            except ValueError as ex:
+                ex.__context__ = ex
+                raise TypeError(2)
+
+        try:
+            cycle()
+        except Exception as e:
+            exc = e
+
+        self.assertIsInstance(exc, TypeError)
+        self.assertIsInstance(exc.__context__, ValueError)
+        self.assertIs(exc.__context__.__context__, exc.__context__)
+
+    def test_no_hang_on_context_chain_cycle2(self):
+        # See issue 25782. Cycle at head of context chain.
+
+        class A(Exception):
+            pass
+        class B(Exception):
+            pass
+        class C(Exception):
+            pass
+
+        # Context cycle:
+        # +-----------+
+        # V           |
+        # C --> B --> A
+        with self.assertRaises(C) as cm:
+            try:
+                raise A()
+            except A as _a:
+                a = _a
+                try:
+                    raise B()
+                except B as _b:
+                    b = _b
+                    try:
+                        raise C()
+                    except C as _c:
+                        c = _c
+                        a.__context__ = c
+                        raise c
+
+        self.assertIs(cm.exception, c)
+        # Verify the expected context chain cycle
+        self.assertIs(c.__context__, b)
+        self.assertIs(b.__context__, a)
+        self.assertIs(a.__context__, c)
+
+    def test_no_hang_on_context_chain_cycle3(self):
+        # See issue 25782. Longer context chain with cycle.
+
+        class A(Exception):
+            pass
+        class B(Exception):
+            pass
+        class C(Exception):
+            pass
+        class D(Exception):
+            pass
+        class E(Exception):
+            pass
+
+        # Context cycle:
+        #             +-----------+
+        #             V           |
+        # E --> D --> C --> B --> A
+        with self.assertRaises(E) as cm:
+            try:
+                raise A()
+            except A as _a:
+                a = _a
+                try:
+                    raise B()
+                except B as _b:
+                    b = _b
+                    try:
+                        raise C()
+                    except C as _c:
+                        c = _c
+                        a.__context__ = c
+                        try:
+                            raise D()
+                        except D as _d:
+                            d = _d
+                            e = E()
+                            raise e
+
+        self.assertIs(cm.exception, e)
+        # Verify the expected context chain cycle
+        self.assertIs(e.__context__, d)
+        self.assertIs(d.__context__, c)
+        self.assertIs(c.__context__, b)
+        self.assertIs(b.__context__, a)
+        self.assertIs(a.__context__, c)
+
     def test_unicode_change_attributes(self):
         # See issue 7309. This was a crasher.
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-07-21-39-19.bpo-25782.B22lMx.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-07-21-39-19.bpo-25782.B22lMx.rst
new file mode 100644
index 0000000000000..1c52059f76c8f
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-07-21-39-19.bpo-25782.B22lMx.rst	
@@ -0,0 +1 @@
+Fix bug where ``PyErr_SetObject`` hangs when the current exception has a cycle in its context chain.
\ No newline at end of file
diff --git a/Python/errors.c b/Python/errors.c
index eeb84e83835e9..ae1cde690eafa 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -148,12 +148,16 @@ _PyErr_SetObject(PyThreadState *tstate, PyObject *exception, PyObject *value)
             value = fixed_value;
         }
 
-        /* Avoid reference cycles through the context chain.
+        /* Avoid creating new reference cycles through the
+           context chain, while taking care not to hang on
+           pre-existing ones.
            This is O(chain length) but context chains are
            usually very short. Sensitive readers may try
            to inline the call to PyException_GetContext. */
         if (exc_value != value) {
             PyObject *o = exc_value, *context;
+            PyObject *slow_o = o;  /* Floyd's cycle detection algo */
+            int slow_update_toggle = 0;
             while ((context = PyException_GetContext(o))) {
                 Py_DECREF(context);
                 if (context == value) {
@@ -161,6 +165,16 @@ _PyErr_SetObject(PyThreadState *tstate, PyObject *exception, PyObject *value)
                     break;
                 }
                 o = context;
+                if (o == slow_o) {
+                    /* pre-existing cycle - all exceptions on the
+                       path were visited and checked.  */
+                    break;
+                }
+                if (slow_update_toggle) {
+                    slow_o = PyException_GetContext(slow_o);
+                    Py_DECREF(slow_o);
+                }
+                slow_update_toggle = !slow_update_toggle;
             }
             PyException_SetContext(value, exc_value);
         }


From webhook-mailer at python.org  Tue Aug 10 05:55:14 2021
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 10 Aug 2021 09:55:14 -0000
Subject: [Python-checkins] bpo-33479: Remove unqualified tkinter threadsafe
 claim. (GH-6990)
Message-ID: <mailman.978.1628589315.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/2e1fef541c4a0a227af7bf1b59bfbccd3fb1a45e
commit: 2e1fef541c4a0a227af7bf1b59bfbccd3fb1a45e
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-10T02:55:08-07:00
summary:

bpo-33479: Remove unqualified tkinter threadsafe claim. (GH-6990)


It has not been true for several years and likely never was.
(cherry picked from commit 6b37d0d5300813de31d66df1c77dad7e1027e4d8)

Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>

files:
A Misc/NEWS.d/next/Documentation/2018-05-19-15-59-29.bpo-33479.4cLlxo.rst
M Doc/library/tk.rst

diff --git a/Doc/library/tk.rst b/Doc/library/tk.rst
index c6c73f057cab1..691c9df5e8f80 100644
--- a/Doc/library/tk.rst
+++ b/Doc/library/tk.rst
@@ -19,8 +19,7 @@ The :mod:`tkinter` package is a thin object-oriented layer on top of Tcl/Tk. To
 use :mod:`tkinter`, you don't need to write Tcl code, but you will need to
 consult the Tk documentation, and occasionally the Tcl documentation.
 :mod:`tkinter` is a set of wrappers that implement the Tk widgets as Python
-classes.  In addition, the internal module :mod:`_tkinter` provides a threadsafe
-mechanism which allows Python and Tcl to interact.
+classes.
 
 :mod:`tkinter`'s chief virtues are that it is fast, and that it usually comes
 bundled with Python. Although its standard documentation is weak, good
diff --git a/Misc/NEWS.d/next/Documentation/2018-05-19-15-59-29.bpo-33479.4cLlxo.rst b/Misc/NEWS.d/next/Documentation/2018-05-19-15-59-29.bpo-33479.4cLlxo.rst
new file mode 100644
index 0000000000000..db4973d392395
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2018-05-19-15-59-29.bpo-33479.4cLlxo.rst
@@ -0,0 +1,4 @@
+Remove the unqualified claim that tkinter is threadsafe. It has not been
+true for several years and likely never was. An explanation of what is true
+may be added later, after more discussion, and possibly after patching
+_tkinter.c,


From webhook-mailer at python.org  Tue Aug 10 05:56:55 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 10 Aug 2021 09:56:55 -0000
Subject: [Python-checkins] make lib2to3 parse async generators everywhere
 (GH-6588) (GH-27703)
Message-ID: <mailman.979.1628589416.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/0e63776c4f3d0b972344368f62b91eb96be69fe3
commit: 0e63776c4f3d0b972344368f62b91eb96be69fe3
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-10T11:56:50+02:00
summary:

make lib2to3 parse async generators everywhere (GH-6588) (GH-27703)

(cherry picked from commit 149addd4960d634ce672ab5fc17e0e785a0cdcd0)

Co-authored-by: Zsolt Dollenstein <zsol.zsol at gmail.com>

files:
A Misc/NEWS.d/next/Library/2018-04-24-14-25-07.bpo-33349.Y_0LIr.rst
M Lib/lib2to3/pgen2/tokenize.py
M Lib/lib2to3/tests/test_parser.py

diff --git a/Lib/lib2to3/pgen2/tokenize.py b/Lib/lib2to3/pgen2/tokenize.py
index 0e2685d40433d7..099dfa7798afd4 100644
--- a/Lib/lib2to3/pgen2/tokenize.py
+++ b/Lib/lib2to3/pgen2/tokenize.py
@@ -512,13 +512,14 @@ def generate_tokens(readline):
                         stashed = tok
                         continue
 
-                    if token == 'def':
+                    if token in ('def', 'for'):
                         if (stashed
                                 and stashed[0] == NAME
                                 and stashed[1] == 'async'):
 
-                            async_def = True
-                            async_def_indent = indents[-1]
+                            if token == 'def':
+                                async_def = True
+                                async_def_indent = indents[-1]
 
                             yield (ASYNC, stashed[1],
                                    stashed[2], stashed[3],
diff --git a/Lib/lib2to3/tests/test_parser.py b/Lib/lib2to3/tests/test_parser.py
index d5db66b9b1e7b9..034b5039cf00c4 100644
--- a/Lib/lib2to3/tests/test_parser.py
+++ b/Lib/lib2to3/tests/test_parser.py
@@ -196,20 +196,27 @@ def test_async_var(self):
         self.validate("""await = 1""")
         self.validate("""def async(): pass""")
 
-    def test_async_with(self):
+    def test_async_for(self):
         self.validate("""async def foo():
                              async for a in b: pass""")
 
-        self.invalid_syntax("""def foo():
-                                   async for a in b: pass""")
-
-    def test_async_for(self):
+    def test_async_with(self):
         self.validate("""async def foo():
                              async with a: pass""")
 
         self.invalid_syntax("""def foo():
                                    async with a: pass""")
 
+    def test_async_generator(self):
+        self.validate(
+            """async def foo():
+                   return (i * 2 async for i in arange(42))"""
+        )
+        self.validate(
+            """def foo():
+                   return (i * 2 async for i in arange(42))"""
+        )
+
 
 class TestRaiseChanges(GrammarTest):
     def test_2x_style_1(self):
diff --git a/Misc/NEWS.d/next/Library/2018-04-24-14-25-07.bpo-33349.Y_0LIr.rst b/Misc/NEWS.d/next/Library/2018-04-24-14-25-07.bpo-33349.Y_0LIr.rst
new file mode 100644
index 00000000000000..be68b3ea7c4a2a
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2018-04-24-14-25-07.bpo-33349.Y_0LIr.rst
@@ -0,0 +1 @@
+lib2to3 now recognizes async generators everywhere.


From webhook-mailer at python.org  Tue Aug 10 05:58:09 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 10 Aug 2021 09:58:09 -0000
Subject: [Python-checkins] bpo-33479: Remove unqualified tkinter threadsafe
 claim. (GH-6990) (GH-27705)
Message-ID: <mailman.980.1628589490.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/c7dfbd2f413eb76cdbd44f44d698e9a399fdcbd5
commit: c7dfbd2f413eb76cdbd44f44d698e9a399fdcbd5
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-10T11:58:05+02:00
summary:

bpo-33479: Remove unqualified tkinter threadsafe claim. (GH-6990) (GH-27705)

It has not been true for several years and likely never was.
(cherry picked from commit 6b37d0d5300813de31d66df1c77dad7e1027e4d8)

Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>

files:
A Misc/NEWS.d/next/Documentation/2018-05-19-15-59-29.bpo-33479.4cLlxo.rst
M Doc/library/tk.rst

diff --git a/Doc/library/tk.rst b/Doc/library/tk.rst
index c6c73f057cab1..691c9df5e8f80 100644
--- a/Doc/library/tk.rst
+++ b/Doc/library/tk.rst
@@ -19,8 +19,7 @@ The :mod:`tkinter` package is a thin object-oriented layer on top of Tcl/Tk. To
 use :mod:`tkinter`, you don't need to write Tcl code, but you will need to
 consult the Tk documentation, and occasionally the Tcl documentation.
 :mod:`tkinter` is a set of wrappers that implement the Tk widgets as Python
-classes.  In addition, the internal module :mod:`_tkinter` provides a threadsafe
-mechanism which allows Python and Tcl to interact.
+classes.
 
 :mod:`tkinter`'s chief virtues are that it is fast, and that it usually comes
 bundled with Python. Although its standard documentation is weak, good
diff --git a/Misc/NEWS.d/next/Documentation/2018-05-19-15-59-29.bpo-33479.4cLlxo.rst b/Misc/NEWS.d/next/Documentation/2018-05-19-15-59-29.bpo-33479.4cLlxo.rst
new file mode 100644
index 0000000000000..db4973d392395
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2018-05-19-15-59-29.bpo-33479.4cLlxo.rst
@@ -0,0 +1,4 @@
+Remove the unqualified claim that tkinter is threadsafe. It has not been
+true for several years and likely never was. An explanation of what is true
+may be added later, after more discussion, and possibly after patching
+_tkinter.c,


From webhook-mailer at python.org  Tue Aug 10 06:40:56 2021
From: webhook-mailer at python.org (markshannon)
Date: Tue, 10 Aug 2021 10:40:56 -0000
Subject: [Python-checkins] Fix stats for STORE_ATTR specialization.
 (GH-27708)
Message-ID: <mailman.981.1628592058.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/c7ea1e3dcea6fbc9842463ce2b785b43501b1eaa
commit: c7ea1e3dcea6fbc9842463ce2b785b43501b1eaa
branch: main
author: Mark Shannon <mark at hotpy.org>
committer: markshannon <mark at hotpy.org>
date: 2021-08-10T11:40:37+01:00
summary:

Fix stats for STORE_ATTR specialization. (GH-27708)

files:
M Python/ceval.c

diff --git a/Python/ceval.c b/Python/ceval.c
index b7b63856c61c8..f685c79b4cac0 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -2767,6 +2767,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
 
         case TARGET(STORE_ATTR): {
             PREDICTED(STORE_ATTR);
+            STAT_INC(STORE_ATTR, unquickened);
             PyObject *name = GETITEM(names, oparg);
             PyObject *owner = TOP();
             PyObject *v = SECOND();
@@ -3503,6 +3504,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
                 STAT_INC(STORE_ATTR, deferred);
                 cache->adaptive.counter--;
                 oparg = cache->adaptive.original_oparg;
+                STAT_DEC(STORE_ATTR, unquickened);
                 JUMP_TO_INSTRUCTION(STORE_ATTR);
             }
         }


From webhook-mailer at python.org  Tue Aug 10 07:09:04 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 10 Aug 2021 11:09:04 -0000
Subject: [Python-checkins] bpo-25782: avoid hang in PyErr_SetObject when
 current exception has a cycle in its context chain (GH-27626) (GH-27707)
Message-ID: <mailman.982.1628593745.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/6f4cdeddb97532144f93ca37b8b21451f445c7bf
commit: 6f4cdeddb97532144f93ca37b8b21451f445c7bf
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-10T13:08:41+02:00
summary:

bpo-25782: avoid hang in PyErr_SetObject when current exception has a cycle in its context chain (GH-27626) (GH-27707)

Co-authored-by: Dennis Sweeney 36520290+sweeneyde at users.noreply.github.com
(cherry picked from commit d5c217475c4957a8084ac3f92ae012ece5edc7cb)

Co-authored-by: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-07-21-39-19.bpo-25782.B22lMx.rst
M Lib/test/test_exceptions.py
M Python/errors.c

diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 0f7b7f84809d9..cd7050bb20b03 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -923,6 +923,148 @@ def __del__(self):
             pass
         self.assertEqual(e, (None, None, None))
 
+    def test_raise_does_not_create_context_chain_cycle(self):
+        class A(Exception):
+            pass
+        class B(Exception):
+            pass
+        class C(Exception):
+            pass
+
+        # Create a context chain:
+        # C -> B -> A
+        # Then raise A in context of C.
+        try:
+            try:
+                raise A
+            except A as a_:
+                a = a_
+                try:
+                    raise B
+                except B as b_:
+                    b = b_
+                    try:
+                        raise C
+                    except C as c_:
+                        c = c_
+                        self.assertIsInstance(a, A)
+                        self.assertIsInstance(b, B)
+                        self.assertIsInstance(c, C)
+                        self.assertIsNone(a.__context__)
+                        self.assertIs(b.__context__, a)
+                        self.assertIs(c.__context__, b)
+                        raise a
+        except A as e:
+            exc = e
+
+        # Expect A -> C -> B, without cycle
+        self.assertIs(exc, a)
+        self.assertIs(a.__context__, c)
+        self.assertIs(c.__context__, b)
+        self.assertIsNone(b.__context__)
+
+    def test_no_hang_on_context_chain_cycle1(self):
+        # See issue 25782. Cycle in context chain.
+
+        def cycle():
+            try:
+                raise ValueError(1)
+            except ValueError as ex:
+                ex.__context__ = ex
+                raise TypeError(2)
+
+        try:
+            cycle()
+        except Exception as e:
+            exc = e
+
+        self.assertIsInstance(exc, TypeError)
+        self.assertIsInstance(exc.__context__, ValueError)
+        self.assertIs(exc.__context__.__context__, exc.__context__)
+
+    def test_no_hang_on_context_chain_cycle2(self):
+        # See issue 25782. Cycle at head of context chain.
+
+        class A(Exception):
+            pass
+        class B(Exception):
+            pass
+        class C(Exception):
+            pass
+
+        # Context cycle:
+        # +-----------+
+        # V           |
+        # C --> B --> A
+        with self.assertRaises(C) as cm:
+            try:
+                raise A()
+            except A as _a:
+                a = _a
+                try:
+                    raise B()
+                except B as _b:
+                    b = _b
+                    try:
+                        raise C()
+                    except C as _c:
+                        c = _c
+                        a.__context__ = c
+                        raise c
+
+        self.assertIs(cm.exception, c)
+        # Verify the expected context chain cycle
+        self.assertIs(c.__context__, b)
+        self.assertIs(b.__context__, a)
+        self.assertIs(a.__context__, c)
+
+    def test_no_hang_on_context_chain_cycle3(self):
+        # See issue 25782. Longer context chain with cycle.
+
+        class A(Exception):
+            pass
+        class B(Exception):
+            pass
+        class C(Exception):
+            pass
+        class D(Exception):
+            pass
+        class E(Exception):
+            pass
+
+        # Context cycle:
+        #             +-----------+
+        #             V           |
+        # E --> D --> C --> B --> A
+        with self.assertRaises(E) as cm:
+            try:
+                raise A()
+            except A as _a:
+                a = _a
+                try:
+                    raise B()
+                except B as _b:
+                    b = _b
+                    try:
+                        raise C()
+                    except C as _c:
+                        c = _c
+                        a.__context__ = c
+                        try:
+                            raise D()
+                        except D as _d:
+                            d = _d
+                            e = E()
+                            raise e
+
+        self.assertIs(cm.exception, e)
+        # Verify the expected context chain cycle
+        self.assertIs(e.__context__, d)
+        self.assertIs(d.__context__, c)
+        self.assertIs(c.__context__, b)
+        self.assertIs(b.__context__, a)
+        self.assertIs(a.__context__, c)
+
     def test_unicode_change_attributes(self):
         # See issue 7309. This was a crasher.
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-07-21-39-19.bpo-25782.B22lMx.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-07-21-39-19.bpo-25782.B22lMx.rst
new file mode 100644
index 0000000000000..1c52059f76c8f
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-07-21-39-19.bpo-25782.B22lMx.rst	
@@ -0,0 +1 @@
+Fix bug where ``PyErr_SetObject`` hangs when the current exception has a cycle in its context chain.
\ No newline at end of file
diff --git a/Python/errors.c b/Python/errors.c
index 2c020cd2660c5..8a2ba8f9d7163 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -148,12 +148,16 @@ _PyErr_SetObject(PyThreadState *tstate, PyObject *exception, PyObject *value)
             value = fixed_value;
         }
 
-        /* Avoid reference cycles through the context chain.
+        /* Avoid creating new reference cycles through the
+           context chain, while taking care not to hang on
+           pre-existing ones.
            This is O(chain length) but context chains are
            usually very short. Sensitive readers may try
            to inline the call to PyException_GetContext. */
         if (exc_value != value) {
             PyObject *o = exc_value, *context;
+            PyObject *slow_o = o;  /* Floyd's cycle detection algo */
+            int slow_update_toggle = 0;
             while ((context = PyException_GetContext(o))) {
                 Py_DECREF(context);
                 if (context == value) {
@@ -161,6 +165,16 @@ _PyErr_SetObject(PyThreadState *tstate, PyObject *exception, PyObject *value)
                     break;
                 }
                 o = context;
+                if (o == slow_o) {
+                    /* pre-existing cycle - all exceptions on the
+                       path were visited and checked.  */
+                    break;
+                }
+                if (slow_update_toggle) {
+                    slow_o = PyException_GetContext(slow_o);
+                    Py_DECREF(slow_o);
+                }
+                slow_update_toggle = !slow_update_toggle;
             }
             PyException_SetContext(value, exc_value);
         }


From webhook-mailer at python.org  Tue Aug 10 09:10:02 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 10 Aug 2021 13:10:02 -0000
Subject: [Python-checkins] bpo-14853: add back the stdin test,
 skip if stdin is redirected (GH-27694) (GH-27698)
Message-ID: <mailman.983.1628601003.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/897c87045c7435254fd330c6ea48204f056e4afc
commit: 897c87045c7435254fd330c6ea48204f056e4afc
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-10T15:09:42+02:00
summary:

bpo-14853: add back the stdin test, skip if stdin is redirected (GH-27694) (GH-27698)

(cherry picked from commit 8ed183391241f0c73e7ba7f42b1d49fc02985f7b)

Co-authored-by: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>

files:
M Lib/test/test_file.py

diff --git a/Lib/test/test_file.py b/Lib/test/test_file.py
index cd642e7aaf8bb..6504aa0707053 100644
--- a/Lib/test/test_file.py
+++ b/Lib/test/test_file.py
@@ -153,6 +153,22 @@ def testModeStrings(self):
                 f.close()
                 self.fail('%r is an invalid file mode' % mode)
 
+    def testStdin(self):
+        if sys.platform == 'osf1V5':
+            # This causes the interpreter to exit on OSF1 v5.1.
+            self.skipTest(
+                ' sys.stdin.seek(-1) may crash the interpreter on OSF1.'
+                ' Test manually.')
+
+        if not sys.stdin.isatty():
+            # Issue 14853: stdin becomes seekable when redirected to a file
+            self.skipTest('stdin must be a TTY in this test')
+
+        with self.assertRaises((IOError, ValueError)):
+            sys.stdin.seek(-1)
+        with self.assertRaises((IOError, ValueError)):
+            sys.stdin.truncate()
+
     def testBadModeArgument(self):
         # verify that we get a sensible error message for bad mode argument
         bad_mode = "qwerty"


From webhook-mailer at python.org  Tue Aug 10 09:47:21 2021
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 10 Aug 2021 13:47:21 -0000
Subject: [Python-checkins] make lib2to3 parse async generators everywhere
 (GH-6588)
Message-ID: <mailman.984.1628603242.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/52d481f15c953e06155e65ca823c8f6cae7a6b65
commit: 52d481f15c953e06155e65ca823c8f6cae7a6b65
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-10T06:47:11-07:00
summary:

make lib2to3 parse async generators everywhere (GH-6588)

(cherry picked from commit 149addd4960d634ce672ab5fc17e0e785a0cdcd0)

Co-authored-by: Zsolt Dollenstein <zsol.zsol at gmail.com>

files:
A Misc/NEWS.d/next/Library/2018-04-24-14-25-07.bpo-33349.Y_0LIr.rst
M Lib/lib2to3/pgen2/tokenize.py
M Lib/lib2to3/tests/test_parser.py

diff --git a/Lib/lib2to3/pgen2/tokenize.py b/Lib/lib2to3/pgen2/tokenize.py
index 0e2685d40433d7..099dfa7798afd4 100644
--- a/Lib/lib2to3/pgen2/tokenize.py
+++ b/Lib/lib2to3/pgen2/tokenize.py
@@ -512,13 +512,14 @@ def generate_tokens(readline):
                         stashed = tok
                         continue
 
-                    if token == 'def':
+                    if token in ('def', 'for'):
                         if (stashed
                                 and stashed[0] == NAME
                                 and stashed[1] == 'async'):
 
-                            async_def = True
-                            async_def_indent = indents[-1]
+                            if token == 'def':
+                                async_def = True
+                                async_def_indent = indents[-1]
 
                             yield (ASYNC, stashed[1],
                                    stashed[2], stashed[3],
diff --git a/Lib/lib2to3/tests/test_parser.py b/Lib/lib2to3/tests/test_parser.py
index 1aba0e88945a40..5eefb5aad7d49e 100644
--- a/Lib/lib2to3/tests/test_parser.py
+++ b/Lib/lib2to3/tests/test_parser.py
@@ -200,20 +200,27 @@ def test_async_var(self):
         self.validate("""await = 1""")
         self.validate("""def async(): pass""")
 
-    def test_async_with(self):
+    def test_async_for(self):
         self.validate("""async def foo():
                              async for a in b: pass""")
 
-        self.invalid_syntax("""def foo():
-                                   async for a in b: pass""")
-
-    def test_async_for(self):
+    def test_async_with(self):
         self.validate("""async def foo():
                              async with a: pass""")
 
         self.invalid_syntax("""def foo():
                                    async with a: pass""")
 
+    def test_async_generator(self):
+        self.validate(
+            """async def foo():
+                   return (i * 2 async for i in arange(42))"""
+        )
+        self.validate(
+            """def foo():
+                   return (i * 2 async for i in arange(42))"""
+        )
+
 
 class TestRaiseChanges(GrammarTest):
     def test_2x_style_1(self):
diff --git a/Misc/NEWS.d/next/Library/2018-04-24-14-25-07.bpo-33349.Y_0LIr.rst b/Misc/NEWS.d/next/Library/2018-04-24-14-25-07.bpo-33349.Y_0LIr.rst
new file mode 100644
index 00000000000000..be68b3ea7c4a2a
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2018-04-24-14-25-07.bpo-33349.Y_0LIr.rst
@@ -0,0 +1 @@
+lib2to3 now recognizes async generators everywhere.


From webhook-mailer at python.org  Tue Aug 10 09:47:27 2021
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 10 Aug 2021 13:47:27 -0000
Subject: [Python-checkins] bpo-25782: avoid hang in PyErr_SetObject when
 current exception has a cycle in its context chain (GH-27626)
Message-ID: <mailman.985.1628603248.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/d86bbe3cff0abefc13e5462cca1fb3344d4a5b52
commit: d86bbe3cff0abefc13e5462cca1fb3344d4a5b52
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-10T06:47:23-07:00
summary:

bpo-25782: avoid hang in PyErr_SetObject when current exception has a cycle in its context chain (GH-27626)


Co-authored-by: Dennis Sweeney 36520290+sweeneyde at users.noreply.github.com
(cherry picked from commit d5c217475c4957a8084ac3f92ae012ece5edc7cb)

Co-authored-by: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-07-21-39-19.bpo-25782.B22lMx.rst
M Lib/test/test_exceptions.py
M Python/errors.c

diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 339801ebaeaef..f50a246d849e1 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -953,6 +953,148 @@ def __del__(self):
             pass
         self.assertEqual(e, (None, None, None))
 
+    def test_raise_does_not_create_context_chain_cycle(self):
+        class A(Exception):
+            pass
+        class B(Exception):
+            pass
+        class C(Exception):
+            pass
+
+        # Create a context chain:
+        # C -> B -> A
+        # Then raise A in context of C.
+        try:
+            try:
+                raise A
+            except A as a_:
+                a = a_
+                try:
+                    raise B
+                except B as b_:
+                    b = b_
+                    try:
+                        raise C
+                    except C as c_:
+                        c = c_
+                        self.assertIsInstance(a, A)
+                        self.assertIsInstance(b, B)
+                        self.assertIsInstance(c, C)
+                        self.assertIsNone(a.__context__)
+                        self.assertIs(b.__context__, a)
+                        self.assertIs(c.__context__, b)
+                        raise a
+        except A as e:
+            exc = e
+
+        # Expect A -> C -> B, without cycle
+        self.assertIs(exc, a)
+        self.assertIs(a.__context__, c)
+        self.assertIs(c.__context__, b)
+        self.assertIsNone(b.__context__)
+
+    def test_no_hang_on_context_chain_cycle1(self):
+        # See issue 25782. Cycle in context chain.
+
+        def cycle():
+            try:
+                raise ValueError(1)
+            except ValueError as ex:
+                ex.__context__ = ex
+                raise TypeError(2)
+
+        try:
+            cycle()
+        except Exception as e:
+            exc = e
+
+        self.assertIsInstance(exc, TypeError)
+        self.assertIsInstance(exc.__context__, ValueError)
+        self.assertIs(exc.__context__.__context__, exc.__context__)
+
+    def test_no_hang_on_context_chain_cycle2(self):
+        # See issue 25782. Cycle at head of context chain.
+
+        class A(Exception):
+            pass
+        class B(Exception):
+            pass
+        class C(Exception):
+            pass
+
+        # Context cycle:
+        # +-----------+
+        # V           |
+        # C --> B --> A
+        with self.assertRaises(C) as cm:
+            try:
+                raise A()
+            except A as _a:
+                a = _a
+                try:
+                    raise B()
+                except B as _b:
+                    b = _b
+                    try:
+                        raise C()
+                    except C as _c:
+                        c = _c
+                        a.__context__ = c
+                        raise c
+
+        self.assertIs(cm.exception, c)
+        # Verify the expected context chain cycle
+        self.assertIs(c.__context__, b)
+        self.assertIs(b.__context__, a)
+        self.assertIs(a.__context__, c)
+
+    def test_no_hang_on_context_chain_cycle3(self):
+        # See issue 25782. Longer context chain with cycle.
+
+        class A(Exception):
+            pass
+        class B(Exception):
+            pass
+        class C(Exception):
+            pass
+        class D(Exception):
+            pass
+        class E(Exception):
+            pass
+
+        # Context cycle:
+        #             +-----------+
+        #             V           |
+        # E --> D --> C --> B --> A
+        with self.assertRaises(E) as cm:
+            try:
+                raise A()
+            except A as _a:
+                a = _a
+                try:
+                    raise B()
+                except B as _b:
+                    b = _b
+                    try:
+                        raise C()
+                    except C as _c:
+                        c = _c
+                        a.__context__ = c
+                        try:
+                            raise D()
+                        except D as _d:
+                            d = _d
+                            e = E()
+                            raise e
+
+        self.assertIs(cm.exception, e)
+        # Verify the expected context chain cycle
+        self.assertIs(e.__context__, d)
+        self.assertIs(d.__context__, c)
+        self.assertIs(c.__context__, b)
+        self.assertIs(b.__context__, a)
+        self.assertIs(a.__context__, c)
+
     def test_unicode_change_attributes(self):
         # See issue 7309. This was a crasher.
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-07-21-39-19.bpo-25782.B22lMx.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-07-21-39-19.bpo-25782.B22lMx.rst
new file mode 100644
index 0000000000000..1c52059f76c8f
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-07-21-39-19.bpo-25782.B22lMx.rst	
@@ -0,0 +1 @@
+Fix bug where ``PyErr_SetObject`` hangs when the current exception has a cycle in its context chain.
\ No newline at end of file
diff --git a/Python/errors.c b/Python/errors.c
index d4b9db1aba34e..9944c3a6007c6 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -148,12 +148,16 @@ _PyErr_SetObject(PyThreadState *tstate, PyObject *exception, PyObject *value)
             value = fixed_value;
         }
 
-        /* Avoid reference cycles through the context chain.
+        /* Avoid creating new reference cycles through the
+           context chain, while taking care not to hang on
+           pre-existing ones.
            This is O(chain length) but context chains are
            usually very short. Sensitive readers may try
            to inline the call to PyException_GetContext. */
         if (exc_value != value) {
             PyObject *o = exc_value, *context;
+            PyObject *slow_o = o;  /* Floyd's cycle detection algo */
+            int slow_update_toggle = 0;
             while ((context = PyException_GetContext(o))) {
                 Py_DECREF(context);
                 if (context == value) {
@@ -161,6 +165,16 @@ _PyErr_SetObject(PyThreadState *tstate, PyObject *exception, PyObject *value)
                     break;
                 }
                 o = context;
+                if (o == slow_o) {
+                    /* pre-existing cycle - all exceptions on the
+                       path were visited and checked.  */
+                    break;
+                }
+                if (slow_update_toggle) {
+                    slow_o = PyException_GetContext(slow_o);
+                    Py_DECREF(slow_o);
+                }
+                slow_update_toggle = !slow_update_toggle;
             }
             PyException_SetContext(value, exc_value);
         }


From webhook-mailer at python.org  Tue Aug 10 09:53:10 2021
From: webhook-mailer at python.org (markshannon)
Date: Tue, 10 Aug 2021 13:53:10 -0000
Subject: [Python-checkins] Classify specialization failures. Provides more
 useful stats, with lower overhead. (GH-27701)
Message-ID: <mailman.986.1628603590.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/9816777861a3f19ea9faa5b98c9b7024f13c6b73
commit: 9816777861a3f19ea9faa5b98c9b7024f13c6b73
branch: main
author: Mark Shannon <mark at hotpy.org>
committer: markshannon <mark at hotpy.org>
date: 2021-08-10T14:53:05+01:00
summary:

Classify specialization failures. Provides more useful stats, with lower overhead. (GH-27701)

files:
M Include/internal/pycore_code.h
M Lib/test/test__opcode.py
M Python/specialize.c
M Tools/scripts/summarize_specialization_stats.py

diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
index 3d8f9c2d228e7f..7ae7aee961c3a0 100644
--- a/Include/internal/pycore_code.h
+++ b/Include/internal/pycore_code.h
@@ -305,6 +305,8 @@ int _Py_Specialize_BinarySubscr(PyObject *sub, PyObject *container, _Py_CODEUNIT
 #define SPECIALIZATION_STATS_DETAILED 0
 #define SPECIALIZATION_STATS_TO_FILE 0
 
+#define SPECIALIZATION_FAILURE_KINDS 20
+
 #if SPECIALIZATION_STATS
 
 typedef struct _stats {
@@ -316,7 +318,7 @@ typedef struct _stats {
     uint64_t deopt;
     uint64_t unquickened;
 #if SPECIALIZATION_STATS_DETAILED
-    PyObject *miss_types;
+    uint64_t specialization_failure_kinds[SPECIALIZATION_FAILURE_KINDS];
 #endif
 } SpecializationStats;
 
diff --git a/Lib/test/test__opcode.py b/Lib/test/test__opcode.py
index 928198ae123b57..f6d8c730645c19 100644
--- a/Lib/test/test__opcode.py
+++ b/Lib/test/test__opcode.py
@@ -85,9 +85,8 @@ def test_specialization_stats(self):
                 stat_names + ['fails'])
             for sn in stat_names:
                 self.assertIsInstance(stats['load_attr'][sn], int)
-            self.assertIsInstance(stats['load_attr']['fails'], dict)
-            for k,v in stats['load_attr']['fails'].items():
-                self.assertIsInstance(k, tuple)
+            self.assertIsInstance(stats['load_attr']['specialization_failure_kinds'], tuple)
+            for v in stats['load_attr']['specialization_failure_kinds']:
                 self.assertIsInstance(v, int)
 
 
diff --git a/Python/specialize.c b/Python/specialize.c
index effbca269bff1b..d0e45d70c08801 100644
--- a/Python/specialize.c
+++ b/Python/specialize.c
@@ -70,12 +70,26 @@ stats_to_dict(SpecializationStats *stats)
     ADD_STAT_TO_DICT(res, deopt);
     ADD_STAT_TO_DICT(res, unquickened);
 #if SPECIALIZATION_STATS_DETAILED
-    if (stats->miss_types != NULL) {
-        if (PyDict_SetItemString(res, "fails", stats->miss_types) == -1) {
+    PyObject *failure_kinds = PyTuple_New(SPECIALIZATION_FAILURE_KINDS);
+    if (failure_kinds == NULL) {
+        Py_DECREF(res);
+        return NULL;
+    }
+    for (int i = 0; i < SPECIALIZATION_FAILURE_KINDS; i++) {
+        PyObject *stat = PyLong_FromUnsignedLongLong(stats->specialization_failure_kinds[i]);
+        if (stat == NULL) {
             Py_DECREF(res);
+            Py_DECREF(failure_kinds);
             return NULL;
         }
+        PyTuple_SET_ITEM(failure_kinds, i, stat);
+    }
+    if (PyDict_SetItemString(res, "specialization_failure_kinds", failure_kinds)) {
+        Py_DECREF(res);
+        Py_DECREF(failure_kinds);
+        return NULL;
     }
+    Py_DECREF(failure_kinds);
 #endif
     return res;
 }
@@ -130,21 +144,9 @@ print_stats(FILE *out, SpecializationStats *stats, const char *name)
     PRINT_STAT(name, deopt);
     PRINT_STAT(name, unquickened);
 #if SPECIALIZATION_STATS_DETAILED
-    if (stats->miss_types == NULL) {
-        return;
-    }
-    fprintf(out, "    %s.fails:\n", name);
-    PyObject *key, *count;
-    Py_ssize_t pos = 0;
-    while (PyDict_Next(stats->miss_types, &pos, &key, &count)) {
-        PyObject *type = PyTuple_GetItem(key, 0);
-        PyObject *name = PyTuple_GetItem(key, 1);
-        PyObject *kind = PyTuple_GetItem(key, 2);
-        fprintf(out, "        %s.", ((PyTypeObject *)type)->tp_name);
-        PyObject_Print(name, out, Py_PRINT_RAW);
-        fprintf(out, " (");
-        PyObject_Print(kind, out, Py_PRINT_RAW);
-        fprintf(out, "): %ld\n", PyLong_AsLong(count));
+    for (int i = 0; i < SPECIALIZATION_FAILURE_KINDS; i++) {
+        fprintf(out, "    %s.specialization_failure_kinds[%d] : %" PRIu64 "\n",
+            name, i, stats->specialization_failure_kinds[i]);
     }
 #endif
 }
@@ -180,57 +182,15 @@ _Py_PrintSpecializationStats(void)
 }
 
 #if SPECIALIZATION_STATS_DETAILED
-void
-_Py_IncrementTypeCounter(int opcode, PyObject *type, PyObject *name, const char *kind)
-{
-    PyObject *counter = _specialization_stats[opcode].miss_types;
-    if (counter == NULL) {
-        _specialization_stats[opcode].miss_types = PyDict_New();
-        counter = _specialization_stats[opcode].miss_types;
-        if (counter == NULL) {
-            return;
-        }
-    }
-    PyObject *key = NULL;
-    PyObject *kind_object = _PyUnicode_FromASCII(kind, strlen(kind));
-    if (kind_object == NULL) {
-        PyErr_Clear();
-        goto done;
-    }
-    key = PyTuple_Pack(3, type, name, kind_object);
-    if (key == NULL) {
-        PyErr_Clear();
-        goto done;
-    }
-    PyObject *count = PyDict_GetItem(counter, key);
-    if (count == NULL) {
-        count = _PyLong_GetZero();
-        if (PyDict_SetItem(counter, key, count) < 0) {
-            PyErr_Clear();
-            goto done;
-        }
-    }
-    count = PyNumber_Add(count, _PyLong_GetOne());
-    if (count == NULL) {
-        PyErr_Clear();
-        goto done;
-    }
-    if (PyDict_SetItem(counter, key, count)) {
-        PyErr_Clear();
-    }
-done:
-    Py_XDECREF(kind_object);
-    Py_XDECREF(key);
-}
 
-#define SPECIALIZATION_FAIL(opcode, type, attribute, kind) _Py_IncrementTypeCounter(opcode, (PyObject *)(type), (PyObject *)(attribute), kind)
+#define SPECIALIZATION_FAIL(opcode, kind) _specialization_stats[opcode].specialization_failure_kinds[kind]++
 
 
 #endif
 #endif
 
 #ifndef SPECIALIZATION_FAIL
-#define SPECIALIZATION_FAIL(opcode, type, attribute, kind) ((void)0)
+#define SPECIALIZATION_FAIL(opcode, kind) ((void)0)
 #endif
 
 static SpecializedCacheOrInstruction *
@@ -415,6 +375,34 @@ _Py_Quicken(PyCodeObject *code) {
 }
 
 
+/* Common */
+
+#define SPEC_FAIL_NO_DICT 1
+#define SPEC_FAIL_OVERRIDDEN 2
+#define SPEC_FAIL_OUT_OF_VERSIONS 3
+#define SPEC_FAIL_OUT_OF_RANGE 4
+#define SPEC_FAIL_EXPECTED_ERROR 5
+
+/* Attributes */
+
+#define SPEC_FAIL_NON_STRING_OR_SPLIT 6
+#define SPEC_FAIL_MODULE_ATTR_NOT_FOUND 7
+#define SPEC_FAIL_OVERRIDING_DESCRIPTOR 8
+#define SPEC_FAIL_NON_OVERRIDING_DESCRIPTOR 9
+#define SPEC_FAIL_NOT_DESCRIPTOR 10
+#define SPEC_FAIL_METHOD 11
+#define SPEC_FAIL_MUTABLE_CLASS 12
+#define SPEC_FAIL_PROPERTY 13
+#define SPEC_FAIL_NON_OBJECT_SLOT 14
+#define SPEC_FAIL_READ_ONLY 15
+#define SPEC_FAIL_AUDITED_SLOT 16
+
+/* Binary subscr */
+
+#define SPEC_FAIL_LIST_NON_INT_SUBSCRIPT 8
+#define SPEC_FAIL_TUPLE_NON_INT_SUBSCRIPT 9
+#define SPEC_FAIL_NOT_TUPLE_LIST_OR_DICT 10
+
 
 static int
 specialize_module_load_attr(
@@ -427,34 +415,34 @@ specialize_module_load_attr(
     _Py_IDENTIFIER(__getattr__);
     PyDictObject *dict = (PyDictObject *)m->md_dict;
     if (dict == NULL) {
-        SPECIALIZATION_FAIL(LOAD_ATTR, Py_TYPE(owner), name, "no __dict__");
+        SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_NO_DICT);
         return -1;
     }
     if (dict->ma_keys->dk_kind != DICT_KEYS_UNICODE) {
-        SPECIALIZATION_FAIL(LOAD_ATTR, Py_TYPE(owner), name, "non-string keys (or split)");
+        SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_NON_STRING_OR_SPLIT);
         return -1;
     }
     getattr = _PyUnicode_FromId(&PyId___getattr__); /* borrowed */
     if (getattr == NULL) {
-        SPECIALIZATION_FAIL(LOAD_ATTR, Py_TYPE(owner), name, "module.__getattr__ overridden");
+        SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_OVERRIDDEN);
         PyErr_Clear();
         return -1;
     }
     Py_ssize_t index = _PyDict_GetItemHint(dict, getattr, -1,  &value);
     assert(index != DKIX_ERROR);
     if (index != DKIX_EMPTY) {
-        SPECIALIZATION_FAIL(LOAD_ATTR, Py_TYPE(owner), name, "module attribute not found");
+        SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_MODULE_ATTR_NOT_FOUND);
         return -1;
     }
     index = _PyDict_GetItemHint(dict, name, -1, &value);
     assert (index != DKIX_ERROR);
     if (index != (uint16_t)index) {
-        SPECIALIZATION_FAIL(LOAD_ATTR, Py_TYPE(owner), name, "index out of range");
+        SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_OUT_OF_RANGE);
         return -1;
     }
     uint32_t keys_version = _PyDictKeys_GetVersionForCurrentState(dict);
     if (keys_version == 0) {
-        SPECIALIZATION_FAIL(LOAD_ATTR, Py_TYPE(owner), name, "no more key versions");
+        SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_OUT_OF_VERSIONS);
         return -1;
     }
     cache1->dk_version_or_hint = keys_version;
@@ -544,13 +532,13 @@ specialize_dict_access(
     assert(kind == NON_OVERRIDING || kind == NON_DESCRIPTOR || kind == ABSENT);
     // No desciptor, or non overriding.
     if (type->tp_dictoffset < 0) {
-        SPECIALIZATION_FAIL(base_op, type, name, "negative offset");
+        SPECIALIZATION_FAIL(base_op, SPEC_FAIL_OUT_OF_RANGE);
         return 0;
     }
     if (type->tp_dictoffset > 0) {
         PyObject **dictptr = (PyObject **) ((char *)owner + type->tp_dictoffset);
         if (*dictptr == NULL || !PyDict_CheckExact(*dictptr)) {
-            SPECIALIZATION_FAIL(base_op, type, name, "no dict or not a dict");
+            SPECIALIZATION_FAIL(base_op, SPEC_FAIL_NO_DICT);
             return 0;
         }
         // We found an instance with a __dict__.
@@ -568,13 +556,12 @@ specialize_dict_access(
             Py_ssize_t index = _Py_dict_lookup(dict, name, hash, &value);
             assert (index != DKIX_ERROR);
             if (index != (uint16_t)index) {
-                SPECIALIZATION_FAIL(base_op, type, name,
-                                    index < 0 ? "attribute not in dict" : "index out of range");
+                SPECIALIZATION_FAIL(base_op, SPEC_FAIL_OUT_OF_RANGE);
                 return 0;
             }
             uint32_t keys_version = _PyDictKeys_GetVersionForCurrentState(dict);
             if (keys_version == 0) {
-                SPECIALIZATION_FAIL(base_op, type, name, "no more key versions");
+                SPECIALIZATION_FAIL(base_op, SPEC_FAIL_OUT_OF_VERSIONS);
                 return 0;
             }
             cache1->dk_version_or_hint = keys_version;
@@ -588,7 +575,7 @@ specialize_dict_access(
             Py_ssize_t hint =
                 _PyDict_GetItemHint(dict, name, -1, &value);
             if (hint != (uint32_t)hint) {
-                SPECIALIZATION_FAIL(base_op, type, name, "hint out of range");
+                SPECIALIZATION_FAIL(base_op, SPEC_FAIL_OUT_OF_RANGE);
                 return 0;
             }
             cache1->dk_version_or_hint = (uint32_t)hint;
@@ -601,14 +588,14 @@ specialize_dict_access(
     /* No attribute in instance dictionary */
     switch(kind) {
         case NON_OVERRIDING:
-            SPECIALIZATION_FAIL(base_op, type, name, "non-overriding descriptor");
+            SPECIALIZATION_FAIL(base_op, SPEC_FAIL_NON_OVERRIDING_DESCRIPTOR);
             return 0;
         case NON_DESCRIPTOR:
             /* To do -- Optimize this case */
-            SPECIALIZATION_FAIL(base_op, type, name, "non descriptor");
+            SPECIALIZATION_FAIL(base_op, SPEC_FAIL_NOT_DESCRIPTOR);
             return 0;
         case ABSENT:
-            SPECIALIZATION_FAIL(base_op, type, name, "no attribute");
+            SPECIALIZATION_FAIL(base_op, SPEC_FAIL_EXPECTED_ERROR);
             return 0;
         default:
             Py_UNREACHABLE();
@@ -637,13 +624,13 @@ _Py_Specialize_LoadAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name, Sp
     DesciptorClassification kind = analyze_descriptor(type, name, &descr, 0);
     switch(kind) {
         case OVERRIDING:
-            SPECIALIZATION_FAIL(LOAD_ATTR, type, name, "overriding descriptor");
+            SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_OVERRIDING_DESCRIPTOR);
             goto fail;
         case METHOD:
-            SPECIALIZATION_FAIL(LOAD_ATTR, type, name, "method");
+            SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_METHOD);
             goto fail;
         case PROPERTY:
-            SPECIALIZATION_FAIL(LOAD_ATTR, type, name, "property");
+            SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_PROPERTY);
             goto fail;
         case OBJECT_SLOT:
         {
@@ -651,11 +638,11 @@ _Py_Specialize_LoadAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name, Sp
             struct PyMemberDef *dmem = member->d_member;
             Py_ssize_t offset = dmem->offset;
             if (dmem->flags & PY_AUDIT_READ) {
-                SPECIALIZATION_FAIL(LOAD_ATTR, type, name, "audit read");
+                SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_AUDITED_SLOT);
                 goto fail;
             }
             if (offset != (uint16_t)offset) {
-                SPECIALIZATION_FAIL(LOAD_ATTR, type, name, "offset out of range");
+                SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_OUT_OF_RANGE);
                 goto fail;
             }
             assert(dmem->type == T_OBJECT_EX);
@@ -675,13 +662,13 @@ _Py_Specialize_LoadAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name, Sp
             goto success;
         }
         case OTHER_SLOT:
-            SPECIALIZATION_FAIL(LOAD_ATTR, type, name, "non-object slot");
+            SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_NON_OBJECT_SLOT);
             goto fail;
         case MUTABLE:
-            SPECIALIZATION_FAIL(LOAD_ATTR, type, name, "mutable class attribute");
+            SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_MUTABLE_CLASS);
             goto fail;
         case GETSET_OVERRIDDEN:
-            SPECIALIZATION_FAIL(LOAD_ATTR, type, name, "__getattribute__ overridden");
+            SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_OVERRIDDEN);
             goto fail;
         case NON_OVERRIDING:
         case NON_DESCRIPTOR:
@@ -717,20 +704,20 @@ _Py_Specialize_StoreAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name, S
     _PyAttrCache *cache1 = &cache[-1].attr;
     PyTypeObject *type = Py_TYPE(owner);
     if (PyModule_CheckExact(owner)) {
-        SPECIALIZATION_FAIL(STORE_ATTR, type, name, "module attribute");
+        SPECIALIZATION_FAIL(STORE_ATTR, SPEC_FAIL_OVERRIDDEN);
         goto fail;
     }
     PyObject *descr;
     DesciptorClassification kind = analyze_descriptor(type, name, &descr, 1);
     switch(kind) {
         case OVERRIDING:
-            SPECIALIZATION_FAIL(STORE_ATTR, type, name, "overriding descriptor");
+            SPECIALIZATION_FAIL(STORE_ATTR, SPEC_FAIL_OVERRIDING_DESCRIPTOR);
             goto fail;
         case METHOD:
-            SPECIALIZATION_FAIL(STORE_ATTR, type, name, "method");
+            SPECIALIZATION_FAIL(STORE_ATTR, SPEC_FAIL_METHOD);
             goto fail;
         case PROPERTY:
-            SPECIALIZATION_FAIL(STORE_ATTR, type, name, "property");
+            SPECIALIZATION_FAIL(STORE_ATTR, SPEC_FAIL_PROPERTY);
             goto fail;
         case OBJECT_SLOT:
         {
@@ -738,11 +725,11 @@ _Py_Specialize_StoreAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name, S
             struct PyMemberDef *dmem = member->d_member;
             Py_ssize_t offset = dmem->offset;
             if (dmem->flags & READONLY) {
-                SPECIALIZATION_FAIL(STORE_ATTR, type, name, "read only");
+                SPECIALIZATION_FAIL(STORE_ATTR, SPEC_FAIL_READ_ONLY);
                 goto fail;
             }
             if (offset != (uint16_t)offset) {
-                SPECIALIZATION_FAIL(STORE_ATTR, type, name, "offset out of range");
+                SPECIALIZATION_FAIL(STORE_ATTR, SPEC_FAIL_OUT_OF_RANGE);
                 goto fail;
             }
             assert(dmem->type == T_OBJECT_EX);
@@ -754,13 +741,13 @@ _Py_Specialize_StoreAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name, S
         }
         case DUNDER_CLASS:
         case OTHER_SLOT:
-            SPECIALIZATION_FAIL(STORE_ATTR, type, name, "other slot");
+            SPECIALIZATION_FAIL(STORE_ATTR, SPEC_FAIL_NON_OBJECT_SLOT);
             goto fail;
         case MUTABLE:
-            SPECIALIZATION_FAIL(STORE_ATTR, type, name, "mutable class attribute");
+            SPECIALIZATION_FAIL(STORE_ATTR, SPEC_FAIL_MUTABLE_CLASS);
             goto fail;
         case GETSET_OVERRIDDEN:
-            SPECIALIZATION_FAIL(STORE_ATTR, type, name, "__setattr__ overridden");
+            SPECIALIZATION_FAIL(STORE_ATTR, SPEC_FAIL_OVERRIDDEN);
             goto fail;
         case NON_OVERRIDING:
         case NON_DESCRIPTOR:
@@ -869,7 +856,7 @@ _Py_Specialize_BinarySubscr(
             *instr = _Py_MAKECODEUNIT(BINARY_SUBSCR_LIST_INT, saturating_start());
             goto success;
         } else {
-            SPECIALIZATION_FAIL(BINARY_SUBSCR, Py_TYPE(container), Py_TYPE(sub), "list; non-integer subscr");
+            SPECIALIZATION_FAIL(BINARY_SUBSCR, SPEC_FAIL_LIST_NON_INT_SUBSCRIPT);
             goto fail;
         }
     }
@@ -878,7 +865,7 @@ _Py_Specialize_BinarySubscr(
             *instr = _Py_MAKECODEUNIT(BINARY_SUBSCR_TUPLE_INT, saturating_start());
             goto success;
         } else {
-            SPECIALIZATION_FAIL(BINARY_SUBSCR, Py_TYPE(container), Py_TYPE(sub), "tuple; non-integer subscr");
+            SPECIALIZATION_FAIL(BINARY_SUBSCR, SPEC_FAIL_TUPLE_NON_INT_SUBSCRIPT);
             goto fail;
         }
     }
@@ -886,7 +873,7 @@ _Py_Specialize_BinarySubscr(
         *instr = _Py_MAKECODEUNIT(BINARY_SUBSCR_DICT, saturating_start());
         goto success;
     }
-    SPECIALIZATION_FAIL(BINARY_SUBSCR, Py_TYPE(container), Py_TYPE(sub), "not list|tuple|dict");
+    SPECIALIZATION_FAIL(BINARY_SUBSCR,SPEC_FAIL_NOT_TUPLE_LIST_OR_DICT);
     goto fail;
 fail:
     STAT_INC(BINARY_SUBSCR, specialization_failure);
diff --git a/Tools/scripts/summarize_specialization_stats.py b/Tools/scripts/summarize_specialization_stats.py
index 1a13ae8cb6ce5a..cc3ef85933c026 100644
--- a/Tools/scripts/summarize_specialization_stats.py
+++ b/Tools/scripts/summarize_specialization_stats.py
@@ -23,6 +23,18 @@ def print_stats(name, family_stats):
             print(f"{key:>12}:{family_stats[key]:>12} {100*family_stats[key]/total:0.1f}%")
     for key in ("specialization_success",  "specialization_failure"):
         print(f"  {key}:{family_stats[key]:>12}")
+    total_failures = family_stats["specialization_failure"]
+    failure_kinds = [ 0 ] * 20
+    for key in family_stats:
+        if not key.startswith("specialization_failure_kind"):
+            continue
+        _, index = key[:-1].split("[")
+        index =  int(index)
+        failure_kinds[index] = family_stats[key]
+    for index, value in enumerate(failure_kinds):
+        if not value:
+            continue
+        print(f"    kind {index:>2}: {value:>8} {100*value/total_failures:0.1f}%")
 
 def main():
     stats = collections.defaultdict(collections.Counter)


From webhook-mailer at python.org  Tue Aug 10 10:31:08 2021
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 10 Aug 2021 14:31:08 -0000
Subject: [Python-checkins] bpo-14853: add back the stdin test,
 skip if stdin is redirected (GH-27694)
Message-ID: <mailman.987.1628605869.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/4e0147ec50aa62315c5a9aa7c88c181f57aadf42
commit: 4e0147ec50aa62315c5a9aa7c88c181f57aadf42
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-10T07:31:00-07:00
summary:

bpo-14853: add back the stdin test, skip if stdin is redirected (GH-27694)

(cherry picked from commit 8ed183391241f0c73e7ba7f42b1d49fc02985f7b)

Co-authored-by: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>

files:
M Lib/test/test_file.py

diff --git a/Lib/test/test_file.py b/Lib/test/test_file.py
index fbfba64759a1e..1ec756f334d28 100644
--- a/Lib/test/test_file.py
+++ b/Lib/test/test_file.py
@@ -154,6 +154,22 @@ def testModeStrings(self):
                 f.close()
                 self.fail('%r is an invalid file mode' % mode)
 
+    def testStdin(self):
+        if sys.platform == 'osf1V5':
+            # This causes the interpreter to exit on OSF1 v5.1.
+            self.skipTest(
+                ' sys.stdin.seek(-1) may crash the interpreter on OSF1.'
+                ' Test manually.')
+
+        if not sys.stdin.isatty():
+            # Issue 14853: stdin becomes seekable when redirected to a file
+            self.skipTest('stdin must be a TTY in this test')
+
+        with self.assertRaises((IOError, ValueError)):
+            sys.stdin.seek(-1)
+        with self.assertRaises((IOError, ValueError)):
+            sys.stdin.truncate()
+
     def testBadModeArgument(self):
         # verify that we get a sensible error message for bad mode argument
         bad_mode = "qwerty"


From webhook-mailer at python.org  Tue Aug 10 12:31:07 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 10 Aug 2021 16:31:07 -0000
Subject: [Python-checkins] bpo-44854: Add .editorconfig file to help enforce
 `make patchcheck` (GH-27638)
Message-ID: <mailman.988.1628613068.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/c0ab59f7de1906feee21c057ad433fad924d1e38
commit: c0ab59f7de1906feee21c057ad433fad924d1e38
branch: main
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2021-08-10T18:30:57+02:00
summary:

bpo-44854: Add .editorconfig file to help enforce `make patchcheck` (GH-27638)

files:
A .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000000..81445d2d79c73
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+root = true
+
+[*.{py,c,cpp,h,rst,md,yml}]
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+
+[*.{py,c,cpp,h}]
+indent_size = 4
+
+[*.yml]
+indent_size = 2


From webhook-mailer at python.org  Tue Aug 10 13:06:27 2021
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 10 Aug 2021 17:06:27 -0000
Subject: [Python-checkins] bpo-44854: Add .editorconfig file to help enforce
 `make patchcheck` (GH-27638)
Message-ID: <mailman.989.1628615188.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/a6808c6378ccfd732285ee20319658ac29eacf4c
commit: a6808c6378ccfd732285ee20319658ac29eacf4c
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-10T10:06:18-07:00
summary:

bpo-44854: Add .editorconfig file to help enforce `make patchcheck` (GH-27638)

(cherry picked from commit c0ab59f7de1906feee21c057ad433fad924d1e38)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000000..81445d2d79c73
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+root = true
+
+[*.{py,c,cpp,h,rst,md,yml}]
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+
+[*.{py,c,cpp,h}]
+indent_size = 4
+
+[*.yml]
+indent_size = 2


From webhook-mailer at python.org  Tue Aug 10 13:09:03 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 10 Aug 2021 17:09:03 -0000
Subject: [Python-checkins] bpo-44854: Add .editorconfig file to help enforce
 `make patchcheck` (GH-27638) (GH-27713)
Message-ID: <mailman.990.1628615344.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/7f88aeadc19b1d3ece4723efb240e6d6753570b9
commit: 7f88aeadc19b1d3ece4723efb240e6d6753570b9
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-10T19:08:59+02:00
summary:

bpo-44854: Add .editorconfig file to help enforce `make patchcheck` (GH-27638) (GH-27713)

(cherry picked from commit c0ab59f7de1906feee21c057ad433fad924d1e38)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000000..81445d2d79c73
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+root = true
+
+[*.{py,c,cpp,h,rst,md,yml}]
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+
+[*.{py,c,cpp,h}]
+indent_size = 4
+
+[*.yml]
+indent_size = 2


From webhook-mailer at python.org  Tue Aug 10 13:22:24 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 10 Aug 2021 17:22:24 -0000
Subject: [Python-checkins] bpo-44854: Add .editorconfig file to help enforce
 `make patchcheck` (GH-27638) (GH-27714)
Message-ID: <mailman.991.1628616146.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/d27e2f4d118e7a9909b6a3e5da06c5ff95806a85
commit: d27e2f4d118e7a9909b6a3e5da06c5ff95806a85
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-10T19:22:15+02:00
summary:

bpo-44854: Add .editorconfig file to help enforce `make patchcheck` (GH-27638) (GH-27714)

(cherry picked from commit c0ab59f7de1906feee21c057ad433fad924d1e38)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000000..81445d2d79c73
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+root = true
+
+[*.{py,c,cpp,h,rst,md,yml}]
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+
+[*.{py,c,cpp,h}]
+indent_size = 4
+
+[*.yml]
+indent_size = 2


From webhook-mailer at python.org  Tue Aug 10 19:34:40 2021
From: webhook-mailer at python.org (pablogsal)
Date: Tue, 10 Aug 2021 23:34:40 -0000
Subject: [Python-checkins] bpo-33930: Fix segfault with deep recursion when
 cleaning method objects (GH-27678)
Message-ID: <mailman.992.1628638482.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/bfc2d5a5c4550ab3a2fadeb9459b4bd948ff61a2
commit: bfc2d5a5c4550ab3a2fadeb9459b4bd948ff61a2
branch: main
author: Pablo Galindo Salgado <Pablogsal at gmail.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-08-11T00:34:14+01:00
summary:

bpo-33930: Fix segfault with deep recursion when cleaning method objects (GH-27678)

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-09-14-29-52.bpo-33930.--5LQ-.rst
M Lib/test/test_exceptions.py
M Objects/methodobject.c

diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 593107f290dc5..8bcb4b0f789a8 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -1169,6 +1169,21 @@ def g():
         self.assertIsInstance(v, RecursionError, type(v))
         self.assertIn("maximum recursion depth exceeded", str(v))
 
+
+    @cpython_only
+    def test_crashcan_recursion(self):
+        # See bpo-33930
+
+        def foo():
+            o = object()
+            for x in range(1_000_000):
+                # Create a big chain of method objects that will trigger
+                # a deep chain of calls when they need to be destructed.
+                o = o.__dir__
+
+        foo()
+        support.gc_collect()
+
     @cpython_only
     def test_recursion_normalizing_exception(self):
         # Issue #22898.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-09-14-29-52.bpo-33930.--5LQ-.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-09-14-29-52.bpo-33930.--5LQ-.rst
new file mode 100644
index 0000000000000..827dd3f8b6513
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-09-14-29-52.bpo-33930.--5LQ-.rst	
@@ -0,0 +1,2 @@
+Fix segmentation fault with deep recursion when cleaning method objects.
+Patch by Augusto Goulart and Pablo Galindo.
diff --git a/Objects/methodobject.c b/Objects/methodobject.c
index 7b430416c5a04..2df63cfdf6a81 100644
--- a/Objects/methodobject.c
+++ b/Objects/methodobject.c
@@ -160,7 +160,10 @@ PyCMethod_GetClass(PyObject *op)
 static void
 meth_dealloc(PyCFunctionObject *m)
 {
-    _PyObject_GC_UNTRACK(m);
+    // The Py_TRASHCAN mechanism requires that we be able to
+    // call PyObject_GC_UnTrack twice on an object.
+    PyObject_GC_UnTrack(m);
+    Py_TRASHCAN_BEGIN(m, meth_dealloc);
     if (m->m_weakreflist != NULL) {
         PyObject_ClearWeakRefs((PyObject*) m);
     }
@@ -170,6 +173,7 @@ meth_dealloc(PyCFunctionObject *m)
     Py_XDECREF(m->m_self);
     Py_XDECREF(m->m_module);
     PyObject_GC_Del(m);
+    Py_TRASHCAN_END;
 }
 
 static PyObject *


From webhook-mailer at python.org  Wed Aug 11 04:25:37 2021
From: webhook-mailer at python.org (markshannon)
Date: Wed, 11 Aug 2021 08:25:37 -0000
Subject: [Python-checkins] Add missing DISPATCH() (GH-27715)
Message-ID: <mailman.993.1628670338.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/c174eafc33999b9e773a5ea9561ad38886f1a0e6
commit: c174eafc33999b9e773a5ea9561ad38886f1a0e6
branch: main
author: Mark Shannon <mark at hotpy.org>
committer: markshannon <mark at hotpy.org>
date: 2021-08-11T09:25:26+01:00
summary:

Add missing DISPATCH() (GH-27715)

files:
M Python/ceval.c

diff --git a/Python/ceval.c b/Python/ceval.c
index f685c79b4cac0..104dbe44ecf2e 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1583,6 +1583,8 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
              }
         }
 
+    DISPATCH();
+
     tracing_dispatch:
     {
         int instr_prev = frame->f_lasti;


From webhook-mailer at python.org  Wed Aug 11 04:32:29 2021
From: webhook-mailer at python.org (vstinner)
Date: Wed, 11 Aug 2021 08:32:29 -0000
Subject: [Python-checkins] bpo-33930: Fix segfault with deep recursion when
 cleaning method objects (GH-27678) (GH-27720)
Message-ID: <mailman.994.1628670750.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/15f0a45b2822607f2c38685a72d06f050e24b215
commit: 15f0a45b2822607f2c38685a72d06f050e24b215
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: vstinner <vstinner at python.org>
date: 2021-08-11T10:32:24+02:00
summary:

bpo-33930: Fix segfault with deep recursion when cleaning method objects (GH-27678) (GH-27720)

(cherry picked from commit bfc2d5a5c4550ab3a2fadeb9459b4bd948ff61a2)

Co-authored-by: Pablo Galindo Salgado <Pablogsal at gmail.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-09-14-29-52.bpo-33930.--5LQ-.rst
M Lib/test/test_exceptions.py
M Objects/methodobject.c

diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index cd7050bb20b03..abb90001718a3 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -1139,6 +1139,21 @@ def g():
         self.assertIsInstance(v, RecursionError, type(v))
         self.assertIn("maximum recursion depth exceeded", str(v))
 
+
+    @cpython_only
+    def test_crashcan_recursion(self):
+        # See bpo-33930
+
+        def foo():
+            o = object()
+            for x in range(1_000_000):
+                # Create a big chain of method objects that will trigger
+                # a deep chain of calls when they need to be destructed.
+                o = o.__dir__
+
+        foo()
+        support.gc_collect()
+
     @cpython_only
     def test_recursion_normalizing_exception(self):
         # Issue #22898.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-09-14-29-52.bpo-33930.--5LQ-.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-09-14-29-52.bpo-33930.--5LQ-.rst
new file mode 100644
index 0000000000000..827dd3f8b6513
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-09-14-29-52.bpo-33930.--5LQ-.rst	
@@ -0,0 +1,2 @@
+Fix segmentation fault with deep recursion when cleaning method objects.
+Patch by Augusto Goulart and Pablo Galindo.
diff --git a/Objects/methodobject.c b/Objects/methodobject.c
index 7b430416c5a04..2df63cfdf6a81 100644
--- a/Objects/methodobject.c
+++ b/Objects/methodobject.c
@@ -160,7 +160,10 @@ PyCMethod_GetClass(PyObject *op)
 static void
 meth_dealloc(PyCFunctionObject *m)
 {
-    _PyObject_GC_UNTRACK(m);
+    // The Py_TRASHCAN mechanism requires that we be able to
+    // call PyObject_GC_UnTrack twice on an object.
+    PyObject_GC_UnTrack(m);
+    Py_TRASHCAN_BEGIN(m, meth_dealloc);
     if (m->m_weakreflist != NULL) {
         PyObject_ClearWeakRefs((PyObject*) m);
     }
@@ -170,6 +173,7 @@ meth_dealloc(PyCFunctionObject *m)
     Py_XDECREF(m->m_self);
     Py_XDECREF(m->m_module);
     PyObject_GC_Del(m);
+    Py_TRASHCAN_END;
 }
 
 static PyObject *


From webhook-mailer at python.org  Wed Aug 11 04:32:49 2021
From: webhook-mailer at python.org (vstinner)
Date: Wed, 11 Aug 2021 08:32:49 -0000
Subject: [Python-checkins] bpo-33930: Fix segfault with deep recursion when
 cleaning method objects (GH-27678) (GH-27719)
Message-ID: <mailman.995.1628670770.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/d6d2d549972422ccc6fa335ebf9907e4b3d71817
commit: d6d2d549972422ccc6fa335ebf9907e4b3d71817
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: vstinner <vstinner at python.org>
date: 2021-08-11T10:32:44+02:00
summary:

bpo-33930: Fix segfault with deep recursion when cleaning method objects (GH-27678) (GH-27719)

(cherry picked from commit bfc2d5a5c4550ab3a2fadeb9459b4bd948ff61a2)

Co-authored-by: Pablo Galindo Salgado <Pablogsal at gmail.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-09-14-29-52.bpo-33930.--5LQ-.rst
M Lib/test/test_exceptions.py
M Objects/methodobject.c

diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index f50a246d849e1..10d48ebc076c3 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -1169,6 +1169,21 @@ def g():
         self.assertIsInstance(v, RecursionError, type(v))
         self.assertIn("maximum recursion depth exceeded", str(v))
 
+
+    @cpython_only
+    def test_crashcan_recursion(self):
+        # See bpo-33930
+
+        def foo():
+            o = object()
+            for x in range(1_000_000):
+                # Create a big chain of method objects that will trigger
+                # a deep chain of calls when they need to be destructed.
+                o = o.__dir__
+
+        foo()
+        support.gc_collect()
+
     @cpython_only
     def test_recursion_normalizing_exception(self):
         # Issue #22898.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-09-14-29-52.bpo-33930.--5LQ-.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-09-14-29-52.bpo-33930.--5LQ-.rst
new file mode 100644
index 0000000000000..827dd3f8b6513
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-09-14-29-52.bpo-33930.--5LQ-.rst	
@@ -0,0 +1,2 @@
+Fix segmentation fault with deep recursion when cleaning method objects.
+Patch by Augusto Goulart and Pablo Galindo.
diff --git a/Objects/methodobject.c b/Objects/methodobject.c
index 7b430416c5a04..2df63cfdf6a81 100644
--- a/Objects/methodobject.c
+++ b/Objects/methodobject.c
@@ -160,7 +160,10 @@ PyCMethod_GetClass(PyObject *op)
 static void
 meth_dealloc(PyCFunctionObject *m)
 {
-    _PyObject_GC_UNTRACK(m);
+    // The Py_TRASHCAN mechanism requires that we be able to
+    // call PyObject_GC_UnTrack twice on an object.
+    PyObject_GC_UnTrack(m);
+    Py_TRASHCAN_BEGIN(m, meth_dealloc);
     if (m->m_weakreflist != NULL) {
         PyObject_ClearWeakRefs((PyObject*) m);
     }
@@ -170,6 +173,7 @@ meth_dealloc(PyCFunctionObject *m)
     Py_XDECREF(m->m_self);
     Py_XDECREF(m->m_module);
     PyObject_GC_Del(m);
+    Py_TRASHCAN_END;
 }
 
 static PyObject *


From webhook-mailer at python.org  Wed Aug 11 05:32:35 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 11 Aug 2021 09:32:35 -0000
Subject: [Python-checkins] Add .DS_Store on ignore (GH-27711)
Message-ID: <mailman.996.1628674356.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/1841c70f2bdab9d29c1c74a8afffa45d5555af98
commit: 1841c70f2bdab9d29c1c74a8afffa45d5555af98
branch: main
author: 180909 <wjh180909 at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-11T11:32:25+02:00
summary:

Add .DS_Store on ignore (GH-27711)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
M .gitignore

diff --git a/.gitignore b/.gitignore
index 80dcf34bf47a6..a96be67962217 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,7 @@ gmon.out
 .coverage
 .mypy_cache/
 .pytest_cache/
+.DS_Store
 
 *.exe
 !Lib/distutils/command/*.exe


From webhook-mailer at python.org  Wed Aug 11 06:48:23 2021
From: webhook-mailer at python.org (markshannon)
Date: Wed, 11 Aug 2021 10:48:23 -0000
Subject: [Python-checkins] bpo-44878: _PyEval_EvalFrameDefault readability
 improvements (GH-27725)
Message-ID: <mailman.997.1628678904.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/3f3d5dcac336463bd0eed64ba0bd7666ff2da1e1
commit: 3f3d5dcac336463bd0eed64ba0bd7666ff2da1e1
branch: main
author: Mark Shannon <mark at hotpy.org>
committer: markshannon <mark at hotpy.org>
date: 2021-08-11T11:47:52+01:00
summary:

bpo-44878:  _PyEval_EvalFrameDefault readability improvements (GH-27725)

* Move a few variable declarations to point of definition.

* Factor out tracing of function entry into helper function.

files:
M Python/ceval.c

diff --git a/Python/ceval.c b/Python/ceval.c
index 104dbe44ecf2e..6bfbf68324184 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1392,6 +1392,45 @@ eval_frame_handle_pending(PyThreadState *tstate)
 #define BUILTINS() frame->f_builtins
 #define LOCALS() frame->f_locals
 
+static int
+trace_function_entry(PyThreadState *tstate, InterpreterFrame *frame)
+{
+    if (tstate->c_tracefunc != NULL) {
+        /* tstate->c_tracefunc, if defined, is a
+            function that will be called on *every* entry
+            to a code block.  Its return value, if not
+            None, is a function that will be called at
+            the start of each executed line of code.
+            (Actually, the function must return itself
+            in order to continue tracing.)  The trace
+            functions are called with three arguments:
+            a pointer to the current frame, a string
+            indicating why the function is called, and
+            an argument which depends on the situation.
+            The global trace function is also called
+            whenever an exception is detected. */
+        if (call_trace_protected(tstate->c_tracefunc,
+                                    tstate->c_traceobj,
+                                    tstate, frame,
+                                    PyTrace_CALL, Py_None)) {
+            /* Trace function raised an error */
+            return -1;
+        }
+    }
+    if (tstate->c_profilefunc != NULL) {
+        /* Similar for c_profilefunc, except it needn't
+            return itself and isn't called for "line" events */
+        if (call_trace_protected(tstate->c_profilefunc,
+                                    tstate->c_profileobj,
+                                    tstate, frame,
+                                    PyTrace_CALL, Py_None)) {
+            /* Profile function raised an error */
+            return -1;
+        }
+    }
+    return 0;
+}
+
 PyObject* _Py_HOT_FUNCTION
 _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int throwflag)
 {
@@ -1405,22 +1444,10 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
 #ifdef DXPAIRS
     int lastopcode = 0;
 #endif
-    PyObject **stack_pointer;  /* Next free slot in value stack */
-    _Py_CODEUNIT *next_instr;
     int opcode;        /* Current opcode */
     int oparg;         /* Current opcode argument, if any */
-    PyObject **localsplus;
     PyObject *retval = NULL;            /* Return value */
     _Py_atomic_int * const eval_breaker = &tstate->interp->ceval.eval_breaker;
-    PyCodeObject *co;
-
-    _Py_CODEUNIT *first_instr;
-    PyObject *names;
-    PyObject *consts;
-
-#ifdef LLTRACE
-    _Py_IDENTIFIER(__ltrace__);
-#endif
 
     if (_Py_EnterRecursiveCall(tstate, "")) {
         return NULL;
@@ -1439,47 +1466,17 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
 
     /* push frame */
     tstate->frame = frame;
-    co = frame->f_code;
 
     if (cframe.use_tracing) {
-        if (tstate->c_tracefunc != NULL) {
-            /* tstate->c_tracefunc, if defined, is a
-               function that will be called on *every* entry
-               to a code block.  Its return value, if not
-               None, is a function that will be called at
-               the start of each executed line of code.
-               (Actually, the function must return itself
-               in order to continue tracing.)  The trace
-               functions are called with three arguments:
-               a pointer to the current frame, a string
-               indicating why the function is called, and
-               an argument which depends on the situation.
-               The global trace function is also called
-               whenever an exception is detected. */
-            if (call_trace_protected(tstate->c_tracefunc,
-                                     tstate->c_traceobj,
-                                     tstate, frame,
-                                     PyTrace_CALL, Py_None)) {
-                /* Trace function raised an error */
-                goto exit_eval_frame;
-            }
-        }
-        if (tstate->c_profilefunc != NULL) {
-            /* Similar for c_profilefunc, except it needn't
-               return itself and isn't called for "line" events */
-            if (call_trace_protected(tstate->c_profilefunc,
-                                     tstate->c_profileobj,
-                                     tstate, frame,
-                                     PyTrace_CALL, Py_None)) {
-                /* Profile function raised an error */
-                goto exit_eval_frame;
-            }
+        if (trace_function_entry(tstate, frame)) {
+            goto exit_eval_frame;
         }
     }
 
     if (PyDTrace_FUNCTION_ENTRY_ENABLED())
         dtrace_function_entry(frame);
 
+    PyCodeObject *co = frame->f_code;
     /* Increment the warmup counter and quicken if warm enough
      * _Py_Quicken is idempotent so we don't worry about overflow */
     if (!PyCodeObject_IsWarmedUp(co)) {
@@ -1492,10 +1489,10 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
     }
 
 
-    names = co->co_names;
-    consts = co->co_consts;
-    localsplus = _PyFrame_GetLocalsArray(frame);
-    first_instr = co->co_firstinstr;
+    PyObject *names = co->co_names;
+    PyObject *consts = co->co_consts;
+    PyObject **localsplus = _PyFrame_GetLocalsArray(frame);
+    _Py_CODEUNIT *first_instr = co->co_firstinstr;
     /*
        frame->f_lasti refers to the index of the last instruction,
        unless it's -1 in which case next_instr should be first_instr.
@@ -1512,8 +1509,8 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
        to the beginning of the combined pair.)
     */
     assert(frame->f_lasti >= -1);
-    next_instr = first_instr + frame->f_lasti + 1;
-    stack_pointer = frame->stack + frame->stackdepth;
+    _Py_CODEUNIT *next_instr = first_instr + frame->f_lasti + 1;
+    PyObject **stack_pointer = frame->stack + frame->stackdepth;
     /* Set stackdepth to -1.
      * Update when returning or calling trace function.
        Having f_stackdepth <= 0 ensures that invalid
@@ -1524,6 +1521,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
     frame->f_state = FRAME_EXECUTING;
 
 #ifdef LLTRACE
+    _Py_IDENTIFIER(__ltrace__);
     {
         int r = _PyDict_ContainsId(GLOBALS(), &PyId___ltrace__);
         if (r < 0) {


From webhook-mailer at python.org  Wed Aug 11 07:09:52 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 11 Aug 2021 11:09:52 -0000
Subject: [Python-checkins] Add .DS_Store on ignore (GH-27711) (GH-27724)
Message-ID: <mailman.998.1628680192.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/8c93a63c03ddc789040a6ad50a18af1df7764884
commit: 8c93a63c03ddc789040a6ad50a18af1df7764884
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-11T13:09:43+02:00
summary:

Add .DS_Store on ignore (GH-27711) (GH-27724)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 1841c70f2bdab9d29c1c74a8afffa45d5555af98)

Co-authored-by: 180909 <wjh180909 at gmail.com>

files:
M .gitignore

diff --git a/.gitignore b/.gitignore
index 80dcf34bf47a6..a96be67962217 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,7 @@ gmon.out
 .coverage
 .mypy_cache/
 .pytest_cache/
+.DS_Store
 
 *.exe
 !Lib/distutils/command/*.exe


From webhook-mailer at python.org  Wed Aug 11 09:02:20 2021
From: webhook-mailer at python.org (markshannon)
Date: Wed, 11 Aug 2021 13:02:20 -0000
Subject: [Python-checkins] bpo-44878: Remove the switch from the main
 interpreter loop when using computed gotos. (GH-27726)
Message-ID: <mailman.999.1628686941.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/f66d00fdd7e9a333accc6bf0e37173051aaa55d0
commit: f66d00fdd7e9a333accc6bf0e37173051aaa55d0
branch: main
author: Mark Shannon <mark at hotpy.org>
committer: markshannon <mark at hotpy.org>
date: 2021-08-11T14:02:11+01:00
summary:

bpo-44878: Remove the switch from the main interpreter loop when using computed gotos. (GH-27726)

* Refactor dispatch logic to make flow of control clearer. Moves lltrace and dxprofile instrumentation into DISPATCH macro.

* Remove switch in interpreter loop when using computed gotos. There is no need for two nearly-duplicate dispatch tables.

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-11-12-03-52.bpo-44878.nEhjLi.rst
M Python/ceval.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-11-12-03-52.bpo-44878.nEhjLi.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-11-12-03-52.bpo-44878.nEhjLi.rst
new file mode 100644
index 0000000000000..7998140d4aab0
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-11-12-03-52.bpo-44878.nEhjLi.rst	
@@ -0,0 +1,2 @@
+Remove switch statement for interpreter loop when using computed gotos. This
+makes sure that we only have one dispatch table in the interpreter.
diff --git a/Python/ceval.c b/Python/ceval.c
index 6bfbf68324184..e8c4e4c8c07eb 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -60,6 +60,17 @@ static PyObject * do_call_core(
 #ifdef LLTRACE
 static int lltrace;
 static int prtrace(PyThreadState *, PyObject *, const char *);
+static void lltrace_instruction(InterpreterFrame *frame, int opcode, int oparg)
+{
+    if (HAS_ARG(opcode)) {
+        printf("%d: %d, %d\n",
+                frame->f_lasti, opcode, oparg);
+    }
+    else {
+        printf("%d: %d\n",
+                frame->f_lasti, opcode);
+    }
+}
 #endif
 static int call_trace(Py_tracefunc, PyObject *,
                       PyThreadState *, InterpreterFrame *,
@@ -1190,9 +1201,9 @@ eval_frame_handle_pending(PyThreadState *tstate)
  * the CFG.
  */
 #ifdef LLTRACE
-#define OR_LLTRACE || lltrace
+#define LLTRACE_INSTR() if (lltrace) { lltrace_instruction(frame, opcode, oparg); }
 #else
-#define OR_LLTRACE
+#define LLTRACE_INSTR() ((void)0)
 #endif
 
 #ifdef WITH_DTRACE
@@ -1219,20 +1230,51 @@ eval_frame_handle_pending(PyThreadState *tstate)
 #endif
 
 #if USE_COMPUTED_GOTOS
-#define TARGET(op) op: TARGET_##op
+#define TARGET(op) TARGET_##op
 #define DISPATCH_GOTO() goto *opcode_targets[opcode]
 #else
-#define TARGET(op) op
+#define TARGET(op) case op
 #define DISPATCH_GOTO() goto dispatch_opcode
 #endif
 
+/* RECORD_DXPROFILE()  records the dxprofile information, if enabled. Normally a no-op */
+#ifdef DYNAMIC_EXECUTION_PROFILE
+#ifdef DXPAIRS
+#define RECORD_DXPROFILE() \
+    do { \
+        dxpairs[lastopcode][opcode]++; \
+        lastopcode = opcode; \
+        dxp[opcode]++; \
+    } while (0)
+#else
+  #define RECORD_DXPROFILE() \
+    do { \
+        dxp[opcode]++; \
+    } while (0)
+#endif
+#else
+#define RECORD_DXPROFILE() ((void)0)
+#endif
+
+/* PRE_DISPATCH_GOTO() does lltrace and dxprofile if either is enabled. Normally a no-op */
+#ifndef LLTRACE
+#ifndef DYNAMIC_EXECUTION_PROFILE
+#define PRE_DISPATCH_GOTO() ((void)0)
+#endif
+#endif
+#ifndef PRE_DISPATCH_GOTO
+#define PRE_DISPATCH_GOTO() do { LLTRACE_INSTR();  RECORD_DXPROFILE(); } while (0)
+#endif
+
+/* Do interpreter dispatch accounting for tracing and instrumentation */
 #define DISPATCH() \
     { \
-        if (cframe.use_tracing OR_DTRACE_LINE OR_LLTRACE) { \
+        if (cframe.use_tracing OR_DTRACE_LINE) { \
             goto tracing_dispatch; \
         } \
         frame->f_lasti = INSTR_OFFSET(); \
         NEXTOPARG(); \
+        PRE_DISPATCH_GOTO(); \
         DISPATCH_GOTO(); \
     }
 
@@ -1614,45 +1656,29 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             frame->stackdepth = -1;
             TRACING_NEXTOPARG();
         }
+        PRE_DISPATCH_GOTO();
+        DISPATCH_GOTO();
     }
 
-#ifdef LLTRACE
-        /* Instruction tracing */
-
-        if (lltrace) {
-            if (HAS_ARG(opcode)) {
-                printf("%d: %d, %d\n",
-                       frame->f_lasti, opcode, oparg);
-            }
-            else {
-                printf("%d: %d\n",
-                       frame->f_lasti, opcode);
-            }
-        }
-#endif
-
+    /* Start instructions */
+#if USE_COMPUTED_GOTOS
+    {
+#else
     dispatch_opcode:
-#ifdef DYNAMIC_EXECUTION_PROFILE
-#ifdef DXPAIRS
-        dxpairs[lastopcode][opcode]++;
-        lastopcode = opcode;
-#endif
-        dxp[opcode]++;
-#endif
-
         switch (opcode) {
+#endif
 
         /* BEWARE!
            It is essential that any operation that fails must goto error
            and that all operation that succeed call DISPATCH() ! */
 
-        case TARGET(NOP): {
+        TARGET(NOP): {
             DISPATCH();
         }
 
         /* We keep LOAD_CLOSURE so that the bytecode stays more readable. */
-        case TARGET(LOAD_CLOSURE):
-        case TARGET(LOAD_FAST): {
+        TARGET(LOAD_CLOSURE):
+        TARGET(LOAD_FAST): {
             PyObject *value = GETLOCAL(oparg);
             if (value == NULL) {
                 format_exc_check_arg(tstate, PyExc_UnboundLocalError,
@@ -1666,7 +1692,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(LOAD_CONST): {
+        TARGET(LOAD_CONST): {
             PREDICTED(LOAD_CONST);
             PyObject *value = GETITEM(consts, oparg);
             Py_INCREF(value);
@@ -1674,20 +1700,20 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(STORE_FAST): {
+        TARGET(STORE_FAST): {
             PREDICTED(STORE_FAST);
             PyObject *value = POP();
             SETLOCAL(oparg, value);
             DISPATCH();
         }
 
-        case TARGET(POP_TOP): {
+        TARGET(POP_TOP): {
             PyObject *value = POP();
             Py_DECREF(value);
             DISPATCH();
         }
 
-        case TARGET(ROT_TWO): {
+        TARGET(ROT_TWO): {
             PyObject *top = TOP();
             PyObject *second = SECOND();
             SET_TOP(second);
@@ -1695,7 +1721,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(ROT_THREE): {
+        TARGET(ROT_THREE): {
             PyObject *top = TOP();
             PyObject *second = SECOND();
             PyObject *third = THIRD();
@@ -1705,7 +1731,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(ROT_FOUR): {
+        TARGET(ROT_FOUR): {
             PyObject *top = TOP();
             PyObject *second = SECOND();
             PyObject *third = THIRD();
@@ -1717,14 +1743,14 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(DUP_TOP): {
+        TARGET(DUP_TOP): {
             PyObject *top = TOP();
             Py_INCREF(top);
             PUSH(top);
             DISPATCH();
         }
 
-        case TARGET(DUP_TOP_TWO): {
+        TARGET(DUP_TOP_TWO): {
             PyObject *top = TOP();
             PyObject *second = SECOND();
             Py_INCREF(top);
@@ -1735,7 +1761,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(UNARY_POSITIVE): {
+        TARGET(UNARY_POSITIVE): {
             PyObject *value = TOP();
             PyObject *res = PyNumber_Positive(value);
             Py_DECREF(value);
@@ -1745,7 +1771,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(UNARY_NEGATIVE): {
+        TARGET(UNARY_NEGATIVE): {
             PyObject *value = TOP();
             PyObject *res = PyNumber_Negative(value);
             Py_DECREF(value);
@@ -1755,7 +1781,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(UNARY_NOT): {
+        TARGET(UNARY_NOT): {
             PyObject *value = TOP();
             int err = PyObject_IsTrue(value);
             Py_DECREF(value);
@@ -1773,7 +1799,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             goto error;
         }
 
-        case TARGET(UNARY_INVERT): {
+        TARGET(UNARY_INVERT): {
             PyObject *value = TOP();
             PyObject *res = PyNumber_Invert(value);
             Py_DECREF(value);
@@ -1783,7 +1809,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(BINARY_POWER): {
+        TARGET(BINARY_POWER): {
             PyObject *exp = POP();
             PyObject *base = TOP();
             PyObject *res = PyNumber_Power(base, exp, Py_None);
@@ -1795,7 +1821,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(BINARY_MULTIPLY): {
+        TARGET(BINARY_MULTIPLY): {
             PyObject *right = POP();
             PyObject *left = TOP();
             PyObject *res = PyNumber_Multiply(left, right);
@@ -1807,7 +1833,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(BINARY_MATRIX_MULTIPLY): {
+        TARGET(BINARY_MATRIX_MULTIPLY): {
             PyObject *right = POP();
             PyObject *left = TOP();
             PyObject *res = PyNumber_MatrixMultiply(left, right);
@@ -1819,7 +1845,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(BINARY_TRUE_DIVIDE): {
+        TARGET(BINARY_TRUE_DIVIDE): {
             PyObject *divisor = POP();
             PyObject *dividend = TOP();
             PyObject *quotient = PyNumber_TrueDivide(dividend, divisor);
@@ -1831,7 +1857,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(BINARY_FLOOR_DIVIDE): {
+        TARGET(BINARY_FLOOR_DIVIDE): {
             PyObject *divisor = POP();
             PyObject *dividend = TOP();
             PyObject *quotient = PyNumber_FloorDivide(dividend, divisor);
@@ -1843,7 +1869,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(BINARY_MODULO): {
+        TARGET(BINARY_MODULO): {
             PyObject *divisor = POP();
             PyObject *dividend = TOP();
             PyObject *res;
@@ -1863,7 +1889,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(BINARY_ADD): {
+        TARGET(BINARY_ADD): {
             PyObject *right = POP();
             PyObject *left = TOP();
             PyObject *sum;
@@ -1889,7 +1915,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(BINARY_SUBTRACT): {
+        TARGET(BINARY_SUBTRACT): {
             PyObject *right = POP();
             PyObject *left = TOP();
             PyObject *diff = PyNumber_Subtract(left, right);
@@ -1901,7 +1927,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(BINARY_SUBSCR): {
+        TARGET(BINARY_SUBSCR): {
             PREDICTED(BINARY_SUBSCR);
             STAT_INC(BINARY_SUBSCR, unquickened);
             PyObject *sub = POP();
@@ -1915,7 +1941,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(BINARY_SUBSCR_ADAPTIVE): {
+        TARGET(BINARY_SUBSCR_ADAPTIVE): {
             if (oparg == 0) {
                 PyObject *sub = TOP();
                 PyObject *container = SECOND();
@@ -1936,7 +1962,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             }
         }
 
-        case TARGET(BINARY_SUBSCR_LIST_INT): {
+        TARGET(BINARY_SUBSCR_LIST_INT): {
             PyObject *sub = TOP();
             PyObject *list = SECOND();
             DEOPT_IF(!PyLong_CheckExact(sub), BINARY_SUBSCR);
@@ -1960,7 +1986,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(BINARY_SUBSCR_TUPLE_INT): {
+        TARGET(BINARY_SUBSCR_TUPLE_INT): {
             PyObject *sub = TOP();
             PyObject *tuple = SECOND();
             DEOPT_IF(!PyLong_CheckExact(sub), BINARY_SUBSCR);
@@ -1984,7 +2010,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(BINARY_SUBSCR_DICT): {
+        TARGET(BINARY_SUBSCR_DICT): {
             PyObject *dict = SECOND();
             DEOPT_IF(!PyDict_CheckExact(SECOND()), BINARY_SUBSCR);
             STAT_INC(BINARY_SUBSCR, hit);
@@ -2001,7 +2027,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(BINARY_LSHIFT): {
+        TARGET(BINARY_LSHIFT): {
             PyObject *right = POP();
             PyObject *left = TOP();
             PyObject *res = PyNumber_Lshift(left, right);
@@ -2013,7 +2039,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(BINARY_RSHIFT): {
+        TARGET(BINARY_RSHIFT): {
             PyObject *right = POP();
             PyObject *left = TOP();
             PyObject *res = PyNumber_Rshift(left, right);
@@ -2025,7 +2051,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(BINARY_AND): {
+        TARGET(BINARY_AND): {
             PyObject *right = POP();
             PyObject *left = TOP();
             PyObject *res = PyNumber_And(left, right);
@@ -2037,7 +2063,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(BINARY_XOR): {
+        TARGET(BINARY_XOR): {
             PyObject *right = POP();
             PyObject *left = TOP();
             PyObject *res = PyNumber_Xor(left, right);
@@ -2049,7 +2075,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(BINARY_OR): {
+        TARGET(BINARY_OR): {
             PyObject *right = POP();
             PyObject *left = TOP();
             PyObject *res = PyNumber_Or(left, right);
@@ -2061,7 +2087,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(LIST_APPEND): {
+        TARGET(LIST_APPEND): {
             PyObject *v = POP();
             PyObject *list = PEEK(oparg);
             int err;
@@ -2073,7 +2099,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(SET_ADD): {
+        TARGET(SET_ADD): {
             PyObject *v = POP();
             PyObject *set = PEEK(oparg);
             int err;
@@ -2085,7 +2111,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(INPLACE_POWER): {
+        TARGET(INPLACE_POWER): {
             PyObject *exp = POP();
             PyObject *base = TOP();
             PyObject *res = PyNumber_InPlacePower(base, exp, Py_None);
@@ -2097,7 +2123,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(INPLACE_MULTIPLY): {
+        TARGET(INPLACE_MULTIPLY): {
             PyObject *right = POP();
             PyObject *left = TOP();
             PyObject *res = PyNumber_InPlaceMultiply(left, right);
@@ -2109,7 +2135,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(INPLACE_MATRIX_MULTIPLY): {
+        TARGET(INPLACE_MATRIX_MULTIPLY): {
             PyObject *right = POP();
             PyObject *left = TOP();
             PyObject *res = PyNumber_InPlaceMatrixMultiply(left, right);
@@ -2121,7 +2147,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(INPLACE_TRUE_DIVIDE): {
+        TARGET(INPLACE_TRUE_DIVIDE): {
             PyObject *divisor = POP();
             PyObject *dividend = TOP();
             PyObject *quotient = PyNumber_InPlaceTrueDivide(dividend, divisor);
@@ -2133,7 +2159,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(INPLACE_FLOOR_DIVIDE): {
+        TARGET(INPLACE_FLOOR_DIVIDE): {
             PyObject *divisor = POP();
             PyObject *dividend = TOP();
             PyObject *quotient = PyNumber_InPlaceFloorDivide(dividend, divisor);
@@ -2145,7 +2171,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(INPLACE_MODULO): {
+        TARGET(INPLACE_MODULO): {
             PyObject *right = POP();
             PyObject *left = TOP();
             PyObject *mod = PyNumber_InPlaceRemainder(left, right);
@@ -2157,7 +2183,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(INPLACE_ADD): {
+        TARGET(INPLACE_ADD): {
             PyObject *right = POP();
             PyObject *left = TOP();
             PyObject *sum;
@@ -2176,7 +2202,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(INPLACE_SUBTRACT): {
+        TARGET(INPLACE_SUBTRACT): {
             PyObject *right = POP();
             PyObject *left = TOP();
             PyObject *diff = PyNumber_InPlaceSubtract(left, right);
@@ -2188,7 +2214,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(INPLACE_LSHIFT): {
+        TARGET(INPLACE_LSHIFT): {
             PyObject *right = POP();
             PyObject *left = TOP();
             PyObject *res = PyNumber_InPlaceLshift(left, right);
@@ -2200,7 +2226,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(INPLACE_RSHIFT): {
+        TARGET(INPLACE_RSHIFT): {
             PyObject *right = POP();
             PyObject *left = TOP();
             PyObject *res = PyNumber_InPlaceRshift(left, right);
@@ -2212,7 +2238,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(INPLACE_AND): {
+        TARGET(INPLACE_AND): {
             PyObject *right = POP();
             PyObject *left = TOP();
             PyObject *res = PyNumber_InPlaceAnd(left, right);
@@ -2224,7 +2250,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(INPLACE_XOR): {
+        TARGET(INPLACE_XOR): {
             PyObject *right = POP();
             PyObject *left = TOP();
             PyObject *res = PyNumber_InPlaceXor(left, right);
@@ -2236,7 +2262,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(INPLACE_OR): {
+        TARGET(INPLACE_OR): {
             PyObject *right = POP();
             PyObject *left = TOP();
             PyObject *res = PyNumber_InPlaceOr(left, right);
@@ -2248,7 +2274,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(STORE_SUBSCR): {
+        TARGET(STORE_SUBSCR): {
             PyObject *sub = TOP();
             PyObject *container = SECOND();
             PyObject *v = THIRD();
@@ -2264,7 +2290,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(DELETE_SUBSCR): {
+        TARGET(DELETE_SUBSCR): {
             PyObject *sub = TOP();
             PyObject *container = SECOND();
             int err;
@@ -2278,7 +2304,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(PRINT_EXPR): {
+        TARGET(PRINT_EXPR): {
             _Py_IDENTIFIER(displayhook);
             PyObject *value = POP();
             PyObject *hook = _PySys_GetObjectId(&PyId_displayhook);
@@ -2297,7 +2323,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(RAISE_VARARGS): {
+        TARGET(RAISE_VARARGS): {
             PyObject *cause = NULL, *exc = NULL;
             switch (oparg) {
             case 2:
@@ -2319,7 +2345,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             goto error;
         }
 
-        case TARGET(RETURN_VALUE): {
+        TARGET(RETURN_VALUE): {
             retval = POP();
             assert(EMPTY());
             frame->f_state = FRAME_RETURNED;
@@ -2327,7 +2353,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             goto exiting;
         }
 
-        case TARGET(GET_AITER): {
+        TARGET(GET_AITER): {
             unaryfunc getter = NULL;
             PyObject *iter = NULL;
             PyObject *obj = TOP();
@@ -2371,7 +2397,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(GET_ANEXT): {
+        TARGET(GET_ANEXT): {
             unaryfunc getter = NULL;
             PyObject *next_iter = NULL;
             PyObject *awaitable = NULL;
@@ -2422,7 +2448,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(GET_AWAITABLE): {
+        TARGET(GET_AWAITABLE): {
             PREDICTED(GET_AWAITABLE);
             PyObject *iterable = TOP();
             PyObject *iter = _PyCoro_GetAwaitableIter(iterable);
@@ -2463,7 +2489,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(YIELD_FROM): {
+        TARGET(YIELD_FROM): {
             PyObject *v = POP();
             PyObject *receiver = TOP();
             PySendResult gen_status;
@@ -2515,7 +2541,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             goto exiting;
         }
 
-        case TARGET(YIELD_VALUE): {
+        TARGET(YIELD_VALUE): {
             retval = POP();
 
             if (co->co_flags & CO_ASYNC_GENERATOR) {
@@ -2532,7 +2558,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             goto exiting;
         }
 
-        case TARGET(GEN_START): {
+        TARGET(GEN_START): {
             PyObject *none = POP();
             Py_DECREF(none);
             if (!Py_IsNone(none)) {
@@ -2556,7 +2582,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(POP_EXCEPT): {
+        TARGET(POP_EXCEPT): {
             PyObject *type, *value, *traceback;
             _PyErr_StackItem *exc_info;
             exc_info = tstate->exc_info;
@@ -2572,7 +2598,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(POP_EXCEPT_AND_RERAISE): {
+        TARGET(POP_EXCEPT_AND_RERAISE): {
             PyObject *lasti = PEEK(4);
             if (PyLong_Check(lasti)) {
                 frame->f_lasti = PyLong_AsLong(lasti);
@@ -2602,7 +2628,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             goto exception_unwind;
         }
 
-        case TARGET(RERAISE): {
+        TARGET(RERAISE): {
             if (oparg) {
                 PyObject *lasti = PEEK(oparg+3);
                 if (PyLong_Check(lasti)) {
@@ -2623,7 +2649,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             goto exception_unwind;
         }
 
-        case TARGET(END_ASYNC_FOR): {
+        TARGET(END_ASYNC_FOR): {
             PyObject *exc = POP();
             PyObject *val = POP();
             PyObject *tb = POP();
@@ -2641,14 +2667,14 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             }
         }
 
-        case TARGET(LOAD_ASSERTION_ERROR): {
+        TARGET(LOAD_ASSERTION_ERROR): {
             PyObject *value = PyExc_AssertionError;
             Py_INCREF(value);
             PUSH(value);
             DISPATCH();
         }
 
-        case TARGET(LOAD_BUILD_CLASS): {
+        TARGET(LOAD_BUILD_CLASS): {
             _Py_IDENTIFIER(__build_class__);
 
             PyObject *bc;
@@ -2679,7 +2705,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(STORE_NAME): {
+        TARGET(STORE_NAME): {
             PyObject *name = GETITEM(names, oparg);
             PyObject *v = POP();
             PyObject *ns = LOCALS();
@@ -2700,7 +2726,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(DELETE_NAME): {
+        TARGET(DELETE_NAME): {
             PyObject *name = GETITEM(names, oparg);
             PyObject *ns = LOCALS();
             int err;
@@ -2719,7 +2745,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(UNPACK_SEQUENCE): {
+        TARGET(UNPACK_SEQUENCE): {
             PREDICTED(UNPACK_SEQUENCE);
             PyObject *seq = POP(), *item, **items;
             if (PyTuple_CheckExact(seq) &&
@@ -2750,7 +2776,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(UNPACK_EX): {
+        TARGET(UNPACK_EX): {
             int totalargs = 1 + (oparg & 0xFF) + (oparg >> 8);
             PyObject *seq = POP();
 
@@ -2765,7 +2791,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(STORE_ATTR): {
+        TARGET(STORE_ATTR): {
             PREDICTED(STORE_ATTR);
             STAT_INC(STORE_ATTR, unquickened);
             PyObject *name = GETITEM(names, oparg);
@@ -2781,7 +2807,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(DELETE_ATTR): {
+        TARGET(DELETE_ATTR): {
             PyObject *name = GETITEM(names, oparg);
             PyObject *owner = POP();
             int err;
@@ -2792,7 +2818,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(STORE_GLOBAL): {
+        TARGET(STORE_GLOBAL): {
             PyObject *name = GETITEM(names, oparg);
             PyObject *v = POP();
             int err;
@@ -2803,7 +2829,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(DELETE_GLOBAL): {
+        TARGET(DELETE_GLOBAL): {
             PyObject *name = GETITEM(names, oparg);
             int err;
             err = PyDict_DelItem(GLOBALS(), name);
@@ -2817,7 +2843,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(LOAD_NAME): {
+        TARGET(LOAD_NAME): {
             PyObject *name = GETITEM(names, oparg);
             PyObject *locals = LOCALS();
             PyObject *v;
@@ -2881,7 +2907,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(LOAD_GLOBAL): {
+        TARGET(LOAD_GLOBAL): {
             PREDICTED(LOAD_GLOBAL);
             STAT_INC(LOAD_GLOBAL, unquickened);
             PyObject *name = GETITEM(names, oparg);
@@ -2931,7 +2957,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(LOAD_GLOBAL_ADAPTIVE): {
+        TARGET(LOAD_GLOBAL_ADAPTIVE): {
             assert(cframe.use_tracing == 0);
             SpecializedCacheEntry *cache = GET_CACHE();
             if (cache->adaptive.counter == 0) {
@@ -2951,7 +2977,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             }
         }
 
-        case TARGET(LOAD_GLOBAL_MODULE): {
+        TARGET(LOAD_GLOBAL_MODULE): {
             assert(cframe.use_tracing == 0);
             DEOPT_IF(!PyDict_CheckExact(GLOBALS()), LOAD_GLOBAL);
             PyDictObject *dict = (PyDictObject *)GLOBALS();
@@ -2969,7 +2995,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(LOAD_GLOBAL_BUILTIN): {
+        TARGET(LOAD_GLOBAL_BUILTIN): {
             assert(cframe.use_tracing == 0);
             DEOPT_IF(!PyDict_CheckExact(GLOBALS()), LOAD_GLOBAL);
             DEOPT_IF(!PyDict_CheckExact(BUILTINS()), LOAD_GLOBAL);
@@ -2990,7 +3016,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(DELETE_FAST): {
+        TARGET(DELETE_FAST): {
             PyObject *v = GETLOCAL(oparg);
             if (v != NULL) {
                 SETLOCAL(oparg, NULL);
@@ -3004,7 +3030,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             goto error;
         }
 
-        case TARGET(MAKE_CELL): {
+        TARGET(MAKE_CELL): {
             // "initial" is probably NULL but not if it's an arg (or set
             // via PyFrame_LocalsToFast() before MAKE_CELL has run).
             PyObject *initial = GETLOCAL(oparg);
@@ -3016,7 +3042,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(DELETE_DEREF): {
+        TARGET(DELETE_DEREF): {
             PyObject *cell = GETLOCAL(oparg);
             PyObject *oldobj = PyCell_GET(cell);
             if (oldobj != NULL) {
@@ -3028,7 +3054,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             goto error;
         }
 
-        case TARGET(LOAD_CLASSDEREF): {
+        TARGET(LOAD_CLASSDEREF): {
             PyObject *name, *value, *locals = LOCALS();
             assert(locals);
             assert(oparg >= 0 && oparg < co->co_nlocalsplus);
@@ -3064,7 +3090,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(LOAD_DEREF): {
+        TARGET(LOAD_DEREF): {
             PyObject *cell = GETLOCAL(oparg);
             PyObject *value = PyCell_GET(cell);
             if (value == NULL) {
@@ -3076,7 +3102,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(STORE_DEREF): {
+        TARGET(STORE_DEREF): {
             PyObject *v = POP();
             PyObject *cell = GETLOCAL(oparg);
             PyObject *oldobj = PyCell_GET(cell);
@@ -3085,7 +3111,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(BUILD_STRING): {
+        TARGET(BUILD_STRING): {
             PyObject *str;
             PyObject *empty = PyUnicode_New(0, 0);
             if (empty == NULL) {
@@ -3103,7 +3129,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(BUILD_TUPLE): {
+        TARGET(BUILD_TUPLE): {
             PyObject *tup = PyTuple_New(oparg);
             if (tup == NULL)
                 goto error;
@@ -3115,7 +3141,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(BUILD_LIST): {
+        TARGET(BUILD_LIST): {
             PyObject *list =  PyList_New(oparg);
             if (list == NULL)
                 goto error;
@@ -3127,7 +3153,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(LIST_TO_TUPLE): {
+        TARGET(LIST_TO_TUPLE): {
             PyObject *list = POP();
             PyObject *tuple = PyList_AsTuple(list);
             Py_DECREF(list);
@@ -3138,7 +3164,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(LIST_EXTEND): {
+        TARGET(LIST_EXTEND): {
             PyObject *iterable = POP();
             PyObject *list = PEEK(oparg);
             PyObject *none_val = _PyList_Extend((PyListObject *)list, iterable);
@@ -3159,7 +3185,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(SET_UPDATE): {
+        TARGET(SET_UPDATE): {
             PyObject *iterable = POP();
             PyObject *set = PEEK(oparg);
             int err = _PySet_Update(set, iterable);
@@ -3170,7 +3196,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(BUILD_SET): {
+        TARGET(BUILD_SET): {
             PyObject *set = PySet_New(NULL);
             int err = 0;
             int i;
@@ -3191,7 +3217,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(BUILD_MAP): {
+        TARGET(BUILD_MAP): {
             Py_ssize_t i;
             PyObject *map = _PyDict_NewPresized((Py_ssize_t)oparg);
             if (map == NULL)
@@ -3215,7 +3241,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(SETUP_ANNOTATIONS): {
+        TARGET(SETUP_ANNOTATIONS): {
             _Py_IDENTIFIER(__annotations__);
             int err;
             PyObject *ann_dict;
@@ -3274,7 +3300,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(BUILD_CONST_KEY_MAP): {
+        TARGET(BUILD_CONST_KEY_MAP): {
             Py_ssize_t i;
             PyObject *map;
             PyObject *keys = TOP();
@@ -3307,7 +3333,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(DICT_UPDATE): {
+        TARGET(DICT_UPDATE): {
             PyObject *update = POP();
             PyObject *dict = PEEK(oparg);
             if (PyDict_Update(dict, update) < 0) {
@@ -3323,7 +3349,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(DICT_MERGE): {
+        TARGET(DICT_MERGE): {
             PyObject *update = POP();
             PyObject *dict = PEEK(oparg);
 
@@ -3337,7 +3363,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(MAP_ADD): {
+        TARGET(MAP_ADD): {
             PyObject *value = TOP();
             PyObject *key = SECOND();
             PyObject *map;
@@ -3354,7 +3380,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(LOAD_ATTR): {
+        TARGET(LOAD_ATTR): {
             PREDICTED(LOAD_ATTR);
             STAT_INC(LOAD_ATTR, unquickened);
             PyObject *name = GETITEM(names, oparg);
@@ -3368,7 +3394,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(LOAD_ATTR_ADAPTIVE): {
+        TARGET(LOAD_ATTR_ADAPTIVE): {
             assert(cframe.use_tracing == 0);
             SpecializedCacheEntry *cache = GET_CACHE();
             if (cache->adaptive.counter == 0) {
@@ -3389,7 +3415,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             }
         }
 
-        case TARGET(LOAD_ATTR_SPLIT_KEYS): {
+        TARGET(LOAD_ATTR_SPLIT_KEYS): {
             assert(cframe.use_tracing == 0);
             PyObject *owner = TOP();
             PyObject *res;
@@ -3414,7 +3440,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(LOAD_ATTR_MODULE): {
+        TARGET(LOAD_ATTR_MODULE): {
             assert(cframe.use_tracing == 0);
             PyObject *owner = TOP();
             PyObject *res;
@@ -3438,7 +3464,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(LOAD_ATTR_WITH_HINT): {
+        TARGET(LOAD_ATTR_WITH_HINT): {
             assert(cframe.use_tracing == 0);
             PyObject *owner = TOP();
             PyObject *res;
@@ -3467,7 +3493,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(LOAD_ATTR_SLOT): {
+        TARGET(LOAD_ATTR_SLOT): {
             assert(cframe.use_tracing == 0);
             PyObject *owner = TOP();
             PyObject *res;
@@ -3488,7 +3514,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(STORE_ATTR_ADAPTIVE): {
+        TARGET(STORE_ATTR_ADAPTIVE): {
             assert(cframe.use_tracing == 0);
             SpecializedCacheEntry *cache = GET_CACHE();
             if (cache->adaptive.counter == 0) {
@@ -3509,7 +3535,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             }
         }
 
-        case TARGET(STORE_ATTR_SPLIT_KEYS): {
+        TARGET(STORE_ATTR_SPLIT_KEYS): {
             assert(cframe.use_tracing == 0);
             PyObject *owner = TOP();
             PyTypeObject *tp = Py_TYPE(owner);
@@ -3547,7 +3573,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(STORE_ATTR_WITH_HINT): {
+        TARGET(STORE_ATTR_WITH_HINT): {
             assert(cframe.use_tracing == 0);
             PyObject *owner = TOP();
             PyTypeObject *tp = Py_TYPE(owner);
@@ -3583,7 +3609,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(STORE_ATTR_SLOT): {
+        TARGET(STORE_ATTR_SLOT): {
             assert(cframe.use_tracing == 0);
             PyObject *owner = TOP();
             PyTypeObject *tp = Py_TYPE(owner);
@@ -3604,7 +3630,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(COMPARE_OP): {
+        TARGET(COMPARE_OP): {
             assert(oparg <= Py_GE);
             PyObject *right = POP();
             PyObject *left = TOP();
@@ -3619,7 +3645,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(IS_OP): {
+        TARGET(IS_OP): {
             PyObject *right = POP();
             PyObject *left = TOP();
             int res = Py_Is(left, right) ^ oparg;
@@ -3633,7 +3659,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(CONTAINS_OP): {
+        TARGET(CONTAINS_OP): {
             PyObject *right = POP();
             PyObject *left = POP();
             int res = PySequence_Contains(right, left);
@@ -3653,7 +3679,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
 #define CANNOT_CATCH_MSG "catching classes that do not inherit from "\
                          "BaseException is not allowed"
 
-        case TARGET(JUMP_IF_NOT_EXC_MATCH): {
+        TARGET(JUMP_IF_NOT_EXC_MATCH): {
             PyObject *right = POP();
             PyObject *left = POP();
             if (PyTuple_Check(right)) {
@@ -3694,7 +3720,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(IMPORT_NAME): {
+        TARGET(IMPORT_NAME): {
             PyObject *name = GETITEM(names, oparg);
             PyObject *fromlist = POP();
             PyObject *level = TOP();
@@ -3708,7 +3734,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(IMPORT_STAR): {
+        TARGET(IMPORT_STAR): {
             PyObject *from = POP(), *locals;
             int err;
             if (_PyFrame_FastToLocalsWithError(frame) < 0) {
@@ -3731,7 +3757,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(IMPORT_FROM): {
+        TARGET(IMPORT_FROM): {
             PyObject *name = GETITEM(names, oparg);
             PyObject *from = TOP();
             PyObject *res;
@@ -3742,12 +3768,12 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(JUMP_FORWARD): {
+        TARGET(JUMP_FORWARD): {
             JUMPBY(oparg);
             DISPATCH();
         }
 
-        case TARGET(POP_JUMP_IF_FALSE): {
+        TARGET(POP_JUMP_IF_FALSE): {
             PREDICTED(POP_JUMP_IF_FALSE);
             PyObject *cond = POP();
             int err;
@@ -3774,7 +3800,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(POP_JUMP_IF_TRUE): {
+        TARGET(POP_JUMP_IF_TRUE): {
             PREDICTED(POP_JUMP_IF_TRUE);
             PyObject *cond = POP();
             int err;
@@ -3801,7 +3827,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(JUMP_IF_FALSE_OR_POP): {
+        TARGET(JUMP_IF_FALSE_OR_POP): {
             PyObject *cond = TOP();
             int err;
             if (Py_IsTrue(cond)) {
@@ -3825,7 +3851,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(JUMP_IF_TRUE_OR_POP): {
+        TARGET(JUMP_IF_TRUE_OR_POP): {
             PyObject *cond = TOP();
             int err;
             if (Py_IsFalse(cond)) {
@@ -3850,7 +3876,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(JUMP_ABSOLUTE): {
+        TARGET(JUMP_ABSOLUTE): {
             PREDICTED(JUMP_ABSOLUTE);
             if (oparg < INSTR_OFFSET()) {
                 /* Increment the warmup counter and quicken if warm enough
@@ -3872,13 +3898,13 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(JUMP_ABSOLUTE_QUICK): {
+        TARGET(JUMP_ABSOLUTE_QUICK): {
             JUMPTO(oparg);
             CHECK_EVAL_BREAKER();
             DISPATCH();
         }
 
-        case TARGET(GET_LEN): {
+        TARGET(GET_LEN): {
             // PUSH(len(TOS))
             Py_ssize_t len_i = PyObject_Length(TOP());
             if (len_i < 0) {
@@ -3892,7 +3918,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(MATCH_CLASS): {
+        TARGET(MATCH_CLASS): {
             // Pop TOS. On success, set TOS to True and TOS1 to a tuple of
             // attributes. On failure, set TOS to False.
             PyObject *names = POP();
@@ -3915,7 +3941,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(MATCH_MAPPING): {
+        TARGET(MATCH_MAPPING): {
             PyObject *subject = TOP();
             int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_MAPPING;
             PyObject *res = match ? Py_True : Py_False;
@@ -3924,7 +3950,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(MATCH_SEQUENCE): {
+        TARGET(MATCH_SEQUENCE): {
             PyObject *subject = TOP();
             int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_SEQUENCE;
             PyObject *res = match ? Py_True : Py_False;
@@ -3933,7 +3959,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(MATCH_KEYS): {
+        TARGET(MATCH_KEYS): {
             // On successful match for all keys, PUSH(values) and PUSH(True).
             // Otherwise, PUSH(None) and PUSH(False).
             PyObject *keys = TOP();
@@ -3954,7 +3980,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(COPY_DICT_WITHOUT_KEYS): {
+        TARGET(COPY_DICT_WITHOUT_KEYS): {
             // rest = dict(TOS1)
             // for key in TOS:
             //     del rest[key]
@@ -3980,7 +4006,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(GET_ITER): {
+        TARGET(GET_ITER): {
             /* before: [obj]; after [getiter(obj)] */
             PyObject *iterable = TOP();
             PyObject *iter = PyObject_GetIter(iterable);
@@ -3993,7 +4019,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(GET_YIELD_FROM_ITER): {
+        TARGET(GET_YIELD_FROM_ITER): {
             /* before: [obj]; after [getiter(obj)] */
             PyObject *iterable = TOP();
             PyObject *iter;
@@ -4022,7 +4048,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(FOR_ITER): {
+        TARGET(FOR_ITER): {
             PREDICTED(FOR_ITER);
             /* before: [iter]; after: [iter, iter()] *or* [] */
             PyObject *iter = TOP();
@@ -4049,7 +4075,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(BEFORE_ASYNC_WITH): {
+        TARGET(BEFORE_ASYNC_WITH): {
             _Py_IDENTIFIER(__aenter__);
             _Py_IDENTIFIER(__aexit__);
             PyObject *mgr = TOP();
@@ -4087,7 +4113,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(BEFORE_WITH): {
+        TARGET(BEFORE_WITH): {
             _Py_IDENTIFIER(__enter__);
             _Py_IDENTIFIER(__exit__);
             PyObject *mgr = TOP();
@@ -4125,7 +4151,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(WITH_EXCEPT_START): {
+        TARGET(WITH_EXCEPT_START): {
             /* At the top of the stack are 8 values:
                - (TOP, SECOND, THIRD) = exc_info()
                - (FOURTH, FIFTH, SIXTH) = previous exception
@@ -4155,7 +4181,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(PUSH_EXC_INFO): {
+        TARGET(PUSH_EXC_INFO): {
             PyObject *type = TOP();
             PyObject *value = SECOND();
             PyObject *tb = THIRD();
@@ -4186,7 +4212,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(LOAD_METHOD): {
+        TARGET(LOAD_METHOD): {
             /* Designed to work in tandem with CALL_METHOD. */
             PyObject *name = GETITEM(names, oparg);
             PyObject *obj = TOP();
@@ -4223,7 +4249,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(CALL_METHOD): {
+        TARGET(CALL_METHOD): {
             /* Designed to work in tamdem with LOAD_METHOD. */
             PyObject **sp, *res;
             int meth_found;
@@ -4266,7 +4292,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             CHECK_EVAL_BREAKER();
             DISPATCH();
         }
-        case TARGET(CALL_METHOD_KW): {
+        TARGET(CALL_METHOD_KW): {
             /* Designed to work in tandem with LOAD_METHOD. Same as CALL_METHOD
             but pops TOS to get a tuple of keyword names. */
             PyObject **sp, *res;
@@ -4289,7 +4315,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             CHECK_EVAL_BREAKER();
             DISPATCH();
         }
-        case TARGET(CALL_FUNCTION): {
+        TARGET(CALL_FUNCTION): {
             PREDICTED(CALL_FUNCTION);
             PyObject **sp, *res;
             sp = stack_pointer;
@@ -4303,7 +4329,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(CALL_FUNCTION_KW): {
+        TARGET(CALL_FUNCTION_KW): {
             PyObject **sp, *res, *names;
 
             names = POP();
@@ -4323,7 +4349,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(CALL_FUNCTION_EX): {
+        TARGET(CALL_FUNCTION_EX): {
             PREDICTED(CALL_FUNCTION_EX);
             PyObject *func, *callargs, *kwargs = NULL, *result;
             if (oparg & 0x01) {
@@ -4370,7 +4396,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(MAKE_FUNCTION): {
+        TARGET(MAKE_FUNCTION): {
             PyObject *codeobj = POP();
             PyFunctionObject *func = (PyFunctionObject *)
                 PyFunction_New(codeobj, GLOBALS());
@@ -4401,7 +4427,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(BUILD_SLICE): {
+        TARGET(BUILD_SLICE): {
             PyObject *start, *stop, *step, *slice;
             if (oparg == 3)
                 step = POP();
@@ -4419,7 +4445,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(FORMAT_VALUE): {
+        TARGET(FORMAT_VALUE): {
             /* Handles f-string value formatting. */
             PyObject *result;
             PyObject *fmt_spec;
@@ -4479,7 +4505,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(ROT_N): {
+        TARGET(ROT_N): {
             PyObject *top = TOP();
             memmove(&PEEK(oparg - 1), &PEEK(oparg),
                     sizeof(PyObject*) * (oparg - 1));
@@ -4487,18 +4513,20 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
-        case TARGET(EXTENDED_ARG): {
+        TARGET(EXTENDED_ARG): {
             int oldoparg = oparg;
             NEXTOPARG();
             oparg |= oldoparg << 8;
-            goto dispatch_opcode;
+            PRE_DISPATCH_GOTO();
+            DISPATCH_GOTO();
         }
 
 
 #if USE_COMPUTED_GOTOS
         _unknown_opcode:
-#endif
+#else
         default:
+#endif
             fprintf(stderr,
                 "XXX lineno: %d, opcode: %d\n",
                 PyCode_Addr2Line(frame->f_code, frame->f_lasti*2),
@@ -4506,7 +4534,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             _PyErr_SetString(tstate, PyExc_SystemError, "unknown opcode");
             goto error;
 
-        } /* switch */
+        } /* End instructions */
 
         /* This should never be reached. Every opcode should end with DISPATCH()
            or goto error. */
@@ -4631,7 +4659,8 @@ MISS_WITH_OPARG_COUNTER(BINARY_SUBSCR)
         frame->f_state = FRAME_EXECUTING;
         frame->f_lasti = handler;
         NEXTOPARG();
-        goto dispatch_opcode;
+        PRE_DISPATCH_GOTO();
+        DISPATCH_GOTO();
     } /* main loop */
 
     assert(retval == NULL);


From webhook-mailer at python.org  Wed Aug 11 09:06:50 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 11 Aug 2021 13:06:50 -0000
Subject: [Python-checkins] Add .DS_Store on ignore (GH-27711) (GH-27723)
Message-ID: <mailman.1000.1628687210.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/e8a43efcee61e7c29045fa8038335eaa6e786556
commit: e8a43efcee61e7c29045fa8038335eaa6e786556
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-11T15:06:43+02:00
summary:

Add .DS_Store on ignore (GH-27711) (GH-27723)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 1841c70f2bdab9d29c1c74a8afffa45d5555af98)

Co-authored-by: 180909 <wjh180909 at gmail.com>

files:
M .gitignore

diff --git a/.gitignore b/.gitignore
index 80dcf34bf47a6..a96be67962217 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,7 @@ gmon.out
 .coverage
 .mypy_cache/
 .pytest_cache/
+.DS_Store
 
 *.exe
 !Lib/distutils/command/*.exe


From webhook-mailer at python.org  Wed Aug 11 11:35:46 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 11 Aug 2021 15:35:46 -0000
Subject: [Python-checkins] [3.8] bpo-33930: Fix segfault with deep recursion
 when cleaning method objects (GH-27678) (GH-27721)
Message-ID: <mailman.1001.1628696147.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/09d814b3833c2c852f4f233297b4561028782d2a
commit: 09d814b3833c2c852f4f233297b4561028782d2a
branch: 3.8
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2021-08-11T17:35:38+02:00
summary:

[3.8] bpo-33930: Fix segfault with deep recursion when cleaning method objects (GH-27678) (GH-27721)

(cherry picked from commit bfc2d5a5c4550ab3a2fadeb9459b4bd948ff61a2)

Co-authored-by: Pablo Galindo Salgado <Pablogsal at gmail.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-09-14-29-52.bpo-33930.--5LQ-.rst
M Lib/test/test_exceptions.py
M Objects/methodobject.c

diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 457b46e01ce317..a29a1a7a523946 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -982,6 +982,21 @@ def g():
         self.assertIsInstance(v, RecursionError, type(v))
         self.assertIn("maximum recursion depth exceeded", str(v))
 
+
+    @cpython_only
+    def test_crashcan_recursion(self):
+        # See bpo-33930
+
+        def foo():
+            o = object()
+            for x in range(1_000_000):
+                # Create a big chain of method objects that will trigger
+                # a deep chain of calls when they need to be destructed.
+                o = o.__dir__
+
+        foo()
+        support.gc_collect()
+
     @cpython_only
     def test_recursion_normalizing_exception(self):
         # Issue #22898.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-09-14-29-52.bpo-33930.--5LQ-.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-09-14-29-52.bpo-33930.--5LQ-.rst
new file mode 100644
index 00000000000000..827dd3f8b65131
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-09-14-29-52.bpo-33930.--5LQ-.rst	
@@ -0,0 +1,2 @@
+Fix segmentation fault with deep recursion when cleaning method objects.
+Patch by Augusto Goulart and Pablo Galindo.
diff --git a/Objects/methodobject.c b/Objects/methodobject.c
index 3604a55e5a1dc9..940de8c326f153 100644
--- a/Objects/methodobject.c
+++ b/Objects/methodobject.c
@@ -125,7 +125,10 @@ PyCFunction_GetFlags(PyObject *op)
 static void
 meth_dealloc(PyCFunctionObject *m)
 {
-    _PyObject_GC_UNTRACK(m);
+    // The Py_TRASHCAN mechanism requires that we be able to
+    // call PyObject_GC_UnTrack twice on an object.
+    PyObject_GC_UnTrack(m);
+    Py_TRASHCAN_BEGIN(m, meth_dealloc);
     if (m->m_weakreflist != NULL) {
         PyObject_ClearWeakRefs((PyObject*) m);
     }
@@ -139,6 +142,7 @@ meth_dealloc(PyCFunctionObject *m)
     else {
         PyObject_GC_Del(m);
     }
+    Py_TRASHCAN_END;
 }
 
 static PyObject *


From webhook-mailer at python.org  Wed Aug 11 12:29:27 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 11 Aug 2021 16:29:27 -0000
Subject: [Python-checkins] bpo-33479: Add architecture and threading model
 sections to Tkinter module docs (GH-27717)
Message-ID: <mailman.1002.1628699368.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/08caf2d5d4a9994976e9eafaf345b5a1a4012a81
commit: 08caf2d5d4a9994976e9eafaf345b5a1a4012a81
branch: main
author: Mark Roseman <mark at markroseman.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-11T18:29:15+02:00
summary:

bpo-33479: Add architecture and threading model sections to Tkinter module docs (GH-27717)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Misc/NEWS.d/next/Documentation/2021-08-11-18-02-06.bpo-33479.rCe4c5.rst
M Doc/library/tkinter.rst

diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index beeffb8a548ee5..39766486f64f91 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -20,6 +20,16 @@ demonstrating a simple Tk interface, letting you know that :mod:`tkinter` is
 properly installed on your system, and also showing what version of Tcl/Tk is
 installed, so you can read the Tcl/Tk documentation specific to that version.
 
+Tkinter supports a range of Tcl/Tk versions, built either with or
+without thread support. The official Python binary release bundles Tcl/Tk 8.6
+threaded. See the source code for the :mod:`_tkinter` module
+for more information about supported versions.
+
+Tkinter is not a thin wrapper, but adds a fair amount of its own logic to
+make the experience more pythonic. This documentation will concentrate on these
+additions and changes, and refer to the official Tcl/Tk documentation for
+details that are unchanged.
+
 .. seealso::
 
    Tkinter documentation:
@@ -62,6 +72,47 @@ installed, so you can read the Tcl/Tk documentation specific to that version.
       Brent Welch's encyclopedic book.
 
 
+Architecture
+------------
+
+Tcl/Tk is not a single library but rather consists of a few distinct
+modules, each with a separate functionality and its own official
+documentation. Python's binary releases also ship an add-on module
+together with it.
+
+Tcl
+   Tcl is a dynamic interpreted programming language, just like Python. Though
+   it can be used on its own as a general-purpose programming language, it is
+   most commonly embedded into C applications as a scripting engine or an
+   interface to the Tk toolkit. The Tcl library has a C interface to
+   create and manage one or more instances of a Tcl interpreter, run Tcl
+   commands and scripts in those instances, and add custom commands
+   implemented in either Tcl or C. Each interpreter has an event queue,
+   and there are facilities to send events to it and process them.
+   Unlike Python, Tcl's execution model is designed around cooperative
+   multitasking, and Tkinter bridges this difference
+   (see `Threading model`_ for details).
+
+Tk
+   Tk is a `Tcl package <http://wiki.tcl.tk/37432>`_ implemented in C
+   that adds custom commands to create and manipulate GUI widgets. Each
+   :class:`Tk` object embeds its own Tcl interpreter instance with Tk loaded into
+   it. Tk's widgets are very customizable, though at the cost of a dated appearance.
+   Tk uses Tcl's event queue to generate and process GUI events.
+
+Ttk
+   Themed Tk (Ttk) is a newer family of Tk widgets that provide a much better
+   appearance on different platforms than many of the classic Tk widgets.
+   Ttk is distributed as part of Tk, starting with Tk version 8.5. Python
+   bindings are provided in a separate module, :mod:`tkinter.ttk`.
+
+Tix
+   `Tix <https://core.tcl.tk/jenglish/gutter/packages/tix.html>`_ is an older
+   third-party Tcl package, an add-on for Tk that adds several new widgets.
+   Python bindings are found in the :mod:`tkinter.tix` module.
+   It's deprecated in favor of Ttk.
+
+
 Tkinter Modules
 ---------------
 
@@ -377,6 +428,59 @@ Xlib (C)
    the Xlib library to draw graphics on the screen.
 
 
+Threading model
+---------------
+
+Python and Tcl/Tk have very different threading models, which :mod:`tkinter`
+tries to bridge. If you use threads, you may need to be aware of this.
+
+A Python interpreter may have many threads associated with it. In Tcl, multiple
+threads can be created, but each thread has a separate Tcl interpreter instance
+associated with it. Threads can also create more than one interpreter instance,
+though each interpreter instance can be used only by the one thread that created it.
+
+Each :class:`Tk` object created by :mod:`tkinter` contains a Tcl interpreter.
+It also keeps track of which thread created that interpreter. Calls to
+:mod:`tkinter` can be made from any Python thread. Internally, if a call comes
+from a thread other than the one that created the :class:`Tk` object, an event
+is posted to the interpreter's event queue, and when executed, the result is
+returned to the calling Python thread.
+
+Tcl/Tk applications are normally event-driven, meaning that after initialization,
+the interpreter runs an event loop (i.e. :func:`Tk.mainloop`) and responds to events.
+Because it is single-threaded, event handlers must respond quickly, otherwise they
+will block other events from being processed. To avoid this, any long-running
+computations should not run in an event handler, but are either broken into smaller
+pieces using timers, or run in another thread. This is different from many GUI
+toolkits where the GUI runs in a completely separate thread from all application
+code including event handlers.
+
+If the Tcl interpreter is not running the event loop and processing events, any
+:mod:`tkinter` calls made from threads other than the one running the Tcl
+interpreter will fail.
+
+A number of special cases exist:
+
+  * Tcl/Tk libraries can be built so they are not thread-aware. In this case,
+    :mod:`tkinter` calls the library from the originating Python thread, even
+    if this is different than the thread that created the Tcl interpreter. A global
+    lock ensures only one call occurs at a time.
+
+  * While :mod:`tkinter` allows you to create more than one instance of a :class:`Tk`
+    object (with its own interpreter), all interpreters that are part of the same
+    thread share a common event queue, which gets ugly fast. In practice, don't create
+    more than one instance of :class:`Tk` at a time. Otherwise, it's best to create
+    them in separate threads and ensure you're running a thread-aware Tcl/Tk build.
+
+  * Blocking event handlers are not the only way to prevent the Tcl interpreter from
+    reentering the event loop. It is even possible to run multiple nested event loops
+    or abandon the event loop entirely. If you're doing anything tricky when it comes
+    to events or threads, be aware of these possibilities.
+
+  * There are a few select :mod:`tkinter` functions that presently work only when
+    called from the thread that created the Tcl interpreter.
+
+
 Handy Reference
 ---------------
 
diff --git a/Misc/NEWS.d/next/Documentation/2021-08-11-18-02-06.bpo-33479.rCe4c5.rst b/Misc/NEWS.d/next/Documentation/2021-08-11-18-02-06.bpo-33479.rCe4c5.rst
new file mode 100644
index 00000000000000..c4a8a981939dec
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2021-08-11-18-02-06.bpo-33479.rCe4c5.rst
@@ -0,0 +1,2 @@
+Tkinter documentation has been greatly expanded with new "Architecture" and
+"Threading model" sections.


From webhook-mailer at python.org  Wed Aug 11 12:34:11 2021
From: webhook-mailer at python.org (iritkatriel)
Date: Wed, 11 Aug 2021 16:34:11 -0000
Subject: [Python-checkins] Update test__opcode and
 _Py_GetSpecializationStats with recent specialization stat changes
 (GH-27728)
Message-ID: <mailman.1003.1628699652.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/64a7812c170f5d46ef16a1517afddc7cd92c5240
commit: 64a7812c170f5d46ef16a1517afddc7cd92c5240
branch: main
author: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
committer: iritkatriel <1055913+iritkatriel at users.noreply.github.com>
date: 2021-08-11T17:34:01+01:00
summary:

Update test__opcode and _Py_GetSpecializationStats with recent specialization stat changes (GH-27728)

files:
M Lib/test/test__opcode.py
M Python/specialize.c

diff --git a/Lib/test/test__opcode.py b/Lib/test/test__opcode.py
index f6d8c730645c19..6bbab539903ce6 100644
--- a/Lib/test/test__opcode.py
+++ b/Lib/test/test__opcode.py
@@ -82,10 +82,12 @@ def test_specialization_stats(self):
             self.assertCountEqual(stats.keys(), specialized_opcodes)
             self.assertCountEqual(
                 stats['load_attr'].keys(),
-                stat_names + ['fails'])
+                stat_names + ['specialization_failure_kinds'])
             for sn in stat_names:
                 self.assertIsInstance(stats['load_attr'][sn], int)
-            self.assertIsInstance(stats['load_attr']['specialization_failure_kinds'], tuple)
+            self.assertIsInstance(
+                stats['load_attr']['specialization_failure_kinds'],
+                tuple)
             for v in stats['load_attr']['specialization_failure_kinds']:
                 self.assertIsInstance(v, int)
 
diff --git a/Python/specialize.c b/Python/specialize.c
index d0e45d70c08801..f0d68f027d6464 100644
--- a/Python/specialize.c
+++ b/Python/specialize.c
@@ -122,6 +122,7 @@ _Py_GetSpecializationStats(void) {
     err += add_stat_dict(stats, LOAD_ATTR, "load_attr");
     err += add_stat_dict(stats, LOAD_GLOBAL, "load_global");
     err += add_stat_dict(stats, BINARY_SUBSCR, "binary_subscr");
+    err += add_stat_dict(stats, STORE_ATTR, "store_attr");
     if (err < 0) {
         Py_DECREF(stats);
         return NULL;


From webhook-mailer at python.org  Wed Aug 11 13:16:28 2021
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 11 Aug 2021 17:16:28 -0000
Subject: [Python-checkins] bpo-33479: Add architecture and threading model
 sections to Tkinter module docs (GH-27717)
Message-ID: <mailman.1004.1628702189.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/2666d702e49aa0e4975553bec2e92ca4a2dba4ea
commit: 2666d702e49aa0e4975553bec2e92ca4a2dba4ea
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-11T10:16:10-07:00
summary:

bpo-33479: Add architecture and threading model sections to Tkinter module docs (GH-27717)


Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 08caf2d5d4a9994976e9eafaf345b5a1a4012a81)

Co-authored-by: Mark Roseman <mark at markroseman.com>

files:
A Misc/NEWS.d/next/Documentation/2021-08-11-18-02-06.bpo-33479.rCe4c5.rst
M Doc/library/tkinter.rst

diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index 7739f2f60a7980..7483ccd6f40e1d 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -20,6 +20,16 @@ demonstrating a simple Tk interface, letting you know that :mod:`tkinter` is
 properly installed on your system, and also showing what version of Tcl/Tk is
 installed, so you can read the Tcl/Tk documentation specific to that version.
 
+Tkinter supports a range of Tcl/Tk versions, built either with or
+without thread support. The official Python binary release bundles Tcl/Tk 8.6
+threaded. See the source code for the :mod:`_tkinter` module
+for more information about supported versions.
+
+Tkinter is not a thin wrapper, but adds a fair amount of its own logic to
+make the experience more pythonic. This documentation will concentrate on these
+additions and changes, and refer to the official Tcl/Tk documentation for
+details that are unchanged.
+
 .. seealso::
 
    Tkinter documentation:
@@ -65,6 +75,47 @@ installed, so you can read the Tcl/Tk documentation specific to that version.
       Brent Welch's encyclopedic book.
 
 
+Architecture
+------------
+
+Tcl/Tk is not a single library but rather consists of a few distinct
+modules, each with a separate functionality and its own official
+documentation. Python's binary releases also ship an add-on module
+together with it.
+
+Tcl
+   Tcl is a dynamic interpreted programming language, just like Python. Though
+   it can be used on its own as a general-purpose programming language, it is
+   most commonly embedded into C applications as a scripting engine or an
+   interface to the Tk toolkit. The Tcl library has a C interface to
+   create and manage one or more instances of a Tcl interpreter, run Tcl
+   commands and scripts in those instances, and add custom commands
+   implemented in either Tcl or C. Each interpreter has an event queue,
+   and there are facilities to send events to it and process them.
+   Unlike Python, Tcl's execution model is designed around cooperative
+   multitasking, and Tkinter bridges this difference
+   (see `Threading model`_ for details).
+
+Tk
+   Tk is a `Tcl package <http://wiki.tcl.tk/37432>`_ implemented in C
+   that adds custom commands to create and manipulate GUI widgets. Each
+   :class:`Tk` object embeds its own Tcl interpreter instance with Tk loaded into
+   it. Tk's widgets are very customizable, though at the cost of a dated appearance.
+   Tk uses Tcl's event queue to generate and process GUI events.
+
+Ttk
+   Themed Tk (Ttk) is a newer family of Tk widgets that provide a much better
+   appearance on different platforms than many of the classic Tk widgets.
+   Ttk is distributed as part of Tk, starting with Tk version 8.5. Python
+   bindings are provided in a separate module, :mod:`tkinter.ttk`.
+
+Tix
+   `Tix <https://core.tcl.tk/jenglish/gutter/packages/tix.html>`_ is an older
+   third-party Tcl package, an add-on for Tk that adds several new widgets.
+   Python bindings are found in the :mod:`tkinter.tix` module.
+   It's deprecated in favor of Ttk.
+
+
 Tkinter Modules
 ---------------
 
@@ -380,6 +431,59 @@ Xlib (C)
    the Xlib library to draw graphics on the screen.
 
 
+Threading model
+---------------
+
+Python and Tcl/Tk have very different threading models, which :mod:`tkinter`
+tries to bridge. If you use threads, you may need to be aware of this.
+
+A Python interpreter may have many threads associated with it. In Tcl, multiple
+threads can be created, but each thread has a separate Tcl interpreter instance
+associated with it. Threads can also create more than one interpreter instance,
+though each interpreter instance can be used only by the one thread that created it.
+
+Each :class:`Tk` object created by :mod:`tkinter` contains a Tcl interpreter.
+It also keeps track of which thread created that interpreter. Calls to
+:mod:`tkinter` can be made from any Python thread. Internally, if a call comes
+from a thread other than the one that created the :class:`Tk` object, an event
+is posted to the interpreter's event queue, and when executed, the result is
+returned to the calling Python thread.
+
+Tcl/Tk applications are normally event-driven, meaning that after initialization,
+the interpreter runs an event loop (i.e. :func:`Tk.mainloop`) and responds to events.
+Because it is single-threaded, event handlers must respond quickly, otherwise they
+will block other events from being processed. To avoid this, any long-running
+computations should not run in an event handler, but are either broken into smaller
+pieces using timers, or run in another thread. This is different from many GUI
+toolkits where the GUI runs in a completely separate thread from all application
+code including event handlers.
+
+If the Tcl interpreter is not running the event loop and processing events, any
+:mod:`tkinter` calls made from threads other than the one running the Tcl
+interpreter will fail.
+
+A number of special cases exist:
+
+  * Tcl/Tk libraries can be built so they are not thread-aware. In this case,
+    :mod:`tkinter` calls the library from the originating Python thread, even
+    if this is different than the thread that created the Tcl interpreter. A global
+    lock ensures only one call occurs at a time.
+
+  * While :mod:`tkinter` allows you to create more than one instance of a :class:`Tk`
+    object (with its own interpreter), all interpreters that are part of the same
+    thread share a common event queue, which gets ugly fast. In practice, don't create
+    more than one instance of :class:`Tk` at a time. Otherwise, it's best to create
+    them in separate threads and ensure you're running a thread-aware Tcl/Tk build.
+
+  * Blocking event handlers are not the only way to prevent the Tcl interpreter from
+    reentering the event loop. It is even possible to run multiple nested event loops
+    or abandon the event loop entirely. If you're doing anything tricky when it comes
+    to events or threads, be aware of these possibilities.
+
+  * There are a few select :mod:`tkinter` functions that presently work only when
+    called from the thread that created the Tcl interpreter.
+
+
 Handy Reference
 ---------------
 
diff --git a/Misc/NEWS.d/next/Documentation/2021-08-11-18-02-06.bpo-33479.rCe4c5.rst b/Misc/NEWS.d/next/Documentation/2021-08-11-18-02-06.bpo-33479.rCe4c5.rst
new file mode 100644
index 00000000000000..c4a8a981939dec
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2021-08-11-18-02-06.bpo-33479.rCe4c5.rst
@@ -0,0 +1,2 @@
+Tkinter documentation has been greatly expanded with new "Architecture" and
+"Threading model" sections.


From webhook-mailer at python.org  Wed Aug 11 18:22:00 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 11 Aug 2021 22:22:00 -0000
Subject: [Python-checkins] bpo-26228: Fix pty EOF handling (GH-12049)
Message-ID: <mailman.1005.1628720521.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/81ab8db235580317edcb0e559cd4c983f70883f5
commit: 81ab8db235580317edcb0e559cd4c983f70883f5
branch: main
author: Zephyr Shannon <geoffpshannon at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-12T00:21:46+02:00
summary:

bpo-26228: Fix pty EOF handling (GH-12049)

On non-Linux POSIX platforms, like FreeBSD or macOS,
the FD used to read a forked PTY may signal its exit not
by raising an error but by sending empty data to the read
syscall. This case wasn't handled, leading to hanging
`pty.spawn` calls.

Co-authored-by: Reilly Tucker Siemens <reilly at tuckersiemens.com>
Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Misc/NEWS.d/next/Library/2019-02-26-09-31-59.bpo-26228.wyrHKc.rst
M Doc/library/pty.rst
M Lib/pty.py
M Lib/test/test_pty.py
M Misc/ACKS

diff --git a/Doc/library/pty.rst b/Doc/library/pty.rst
index 73d4f102fd4d8e..4b49d244038eb7 100644
--- a/Doc/library/pty.rst
+++ b/Doc/library/pty.rst
@@ -50,7 +50,7 @@ The :mod:`pty` module defines the following functions:
    The functions *master_read* and *stdin_read* are passed a file descriptor
    which they should read from, and they should always return a byte string. In
    order to force spawn to return before the child process exits an
-   :exc:`OSError` should be thrown.
+   empty byte array should be returned to signal end of file.
 
    The default implementation for both functions will read and return up to 1024
    bytes each time the function is called. The *master_read* callback is passed
@@ -65,10 +65,6 @@ The :mod:`pty` module defines the following functions:
    process will quit without any input, *spawn* will then loop forever. If
    *master_read* signals EOF the same behavior results (on linux at least).
 
-   If both callbacks signal EOF then *spawn* will probably never return, unless
-   *select* throws an error on your platform when passed three empty lists. This
-   is a bug, documented in `issue 26228 <https://bugs.python.org/issue26228>`_.
-
    Return the exit status value from :func:`os.waitpid` on the child process.
 
    :func:`waitstatus_to_exitcode` can be used to convert the exit status into
diff --git a/Lib/pty.py b/Lib/pty.py
index a32432041fa1db..43e974fff1c908 100644
--- a/Lib/pty.py
+++ b/Lib/pty.py
@@ -11,7 +11,11 @@
 import sys
 import tty
 
-__all__ = ["openpty","fork","spawn"]
+# names imported directly for test mocking purposes
+from os import close, waitpid
+from tty import setraw, tcgetattr, tcsetattr
+
+__all__ = ["openpty", "fork", "spawn"]
 
 STDIN_FILENO = 0
 STDOUT_FILENO = 1
@@ -105,8 +109,8 @@ def fork():
         os.dup2(slave_fd, STDIN_FILENO)
         os.dup2(slave_fd, STDOUT_FILENO)
         os.dup2(slave_fd, STDERR_FILENO)
-        if (slave_fd > STDERR_FILENO):
-            os.close (slave_fd)
+        if slave_fd > STDERR_FILENO:
+            os.close(slave_fd)
 
         # Explicitly open the tty to make it become a controlling tty.
         tmp_fd = os.open(os.ttyname(STDOUT_FILENO), os.O_RDWR)
@@ -133,14 +137,22 @@ def _copy(master_fd, master_read=_read, stdin_read=_read):
             pty master -> standard output   (master_read)
             standard input -> pty master    (stdin_read)"""
     fds = [master_fd, STDIN_FILENO]
-    while True:
-        rfds, wfds, xfds = select(fds, [], [])
+    while fds:
+        rfds, _wfds, _xfds = select(fds, [], [])
+
         if master_fd in rfds:
-            data = master_read(master_fd)
+            # Some OSes signal EOF by returning an empty byte string,
+            # some throw OSErrors.
+            try:
+                data = master_read(master_fd)
+            except OSError:
+                data = b""
             if not data:  # Reached EOF.
-                fds.remove(master_fd)
+                return    # Assume the child process has exited and is
+                          # unreachable, so we clean up.
             else:
                 os.write(STDOUT_FILENO, data)
+
         if STDIN_FILENO in rfds:
             data = stdin_read(STDIN_FILENO)
             if not data:
@@ -153,20 +165,23 @@ def spawn(argv, master_read=_read, stdin_read=_read):
     if type(argv) == type(''):
         argv = (argv,)
     sys.audit('pty.spawn', argv)
+
     pid, master_fd = fork()
     if pid == CHILD:
         os.execlp(argv[0], *argv)
+
     try:
-        mode = tty.tcgetattr(STDIN_FILENO)
-        tty.setraw(STDIN_FILENO)
-        restore = 1
+        mode = tcgetattr(STDIN_FILENO)
+        setraw(STDIN_FILENO)
+        restore = True
     except tty.error:    # This is the same as termios.error
-        restore = 0
+        restore = False
+
     try:
         _copy(master_fd, master_read, stdin_read)
-    except OSError:
+    finally:
         if restore:
-            tty.tcsetattr(STDIN_FILENO, tty.TCSAFLUSH, mode)
+            tcsetattr(STDIN_FILENO, tty.TCSAFLUSH, mode)
 
-    os.close(master_fd)
-    return os.waitpid(pid, 0)[1]
+    close(master_fd)
+    return waitpid(pid, 0)[1]
diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py
index 7585c42bf01338..e2e9475b5d337d 100644
--- a/Lib/test/test_pty.py
+++ b/Lib/test/test_pty.py
@@ -5,8 +5,9 @@
 import_module('termios')
 
 import errno
-import pty
 import os
+import pty
+import tty
 import sys
 import select
 import signal
@@ -123,12 +124,6 @@ def handle_sig(self, sig, frame):
 
     @staticmethod
     def handle_sighup(signum, frame):
-        # bpo-38547: if the process is the session leader, os.close(master_fd)
-        # of "master_fd, slave_name = pty.master_open()" raises SIGHUP
-        # signal: just ignore the signal.
-        #
-        # NOTE: the above comment is from an older version of the test;
-        # master_open() is not being used anymore.
         pass
 
     @expectedFailureIfStdinIsTTY
@@ -190,13 +185,6 @@ def test_openpty(self):
             self.assertEqual(_get_term_winsz(slave_fd), new_stdin_winsz,
                              "openpty() failed to set slave window size")
 
-        # Solaris requires reading the fd before anything is returned.
-        # My guess is that since we open and close the slave fd
-        # in master_open(), we need to read the EOF.
-        #
-        # NOTE: the above comment is from an older version of the test;
-        # master_open() is not being used anymore.
-
         # Ensure the fd is non-blocking in case there's nothing to read.
         blocking = os.get_blocking(master_fd)
         try:
@@ -324,22 +312,40 @@ def test_master_read(self):
 
         self.assertEqual(data, b"")
 
+    def test_spawn_doesnt_hang(self):
+        pty.spawn([sys.executable, '-c', 'print("hi there")'])
+
 class SmallPtyTests(unittest.TestCase):
     """These tests don't spawn children or hang."""
 
     def setUp(self):
         self.orig_stdin_fileno = pty.STDIN_FILENO
         self.orig_stdout_fileno = pty.STDOUT_FILENO
+        self.orig_pty_close = pty.close
+        self.orig_pty__copy = pty._copy
+        self.orig_pty_fork = pty.fork
         self.orig_pty_select = pty.select
+        self.orig_pty_setraw = pty.setraw
+        self.orig_pty_tcgetattr = pty.tcgetattr
+        self.orig_pty_tcsetattr = pty.tcsetattr
+        self.orig_pty_waitpid = pty.waitpid
         self.fds = []  # A list of file descriptors to close.
         self.files = []
         self.select_rfds_lengths = []
         self.select_rfds_results = []
+        self.tcsetattr_mode_setting = None
 
     def tearDown(self):
         pty.STDIN_FILENO = self.orig_stdin_fileno
         pty.STDOUT_FILENO = self.orig_stdout_fileno
+        pty.close = self.orig_pty_close
+        pty._copy = self.orig_pty__copy
+        pty.fork = self.orig_pty_fork
         pty.select = self.orig_pty_select
+        pty.setraw = self.orig_pty_setraw
+        pty.tcgetattr = self.orig_pty_tcgetattr
+        pty.tcsetattr = self.orig_pty_tcsetattr
+        pty.waitpid = self.orig_pty_waitpid
         for file in self.files:
             try:
                 file.close()
@@ -367,6 +373,14 @@ def _mock_select(self, rfds, wfds, xfds, timeout=0):
         self.assertEqual(self.select_rfds_lengths.pop(0), len(rfds))
         return self.select_rfds_results.pop(0), [], []
 
+    def _make_mock_fork(self, pid):
+        def mock_fork():
+            return (pid, 12)
+        return mock_fork
+
+    def _mock_tcsetattr(self, fileno, opt, mode):
+        self.tcsetattr_mode_setting = mode
+
     def test__copy_to_each(self):
         """Test the normal data case on both master_fd and stdin."""
         read_from_stdout_fd, mock_stdout_fd = self._pipe()
@@ -407,7 +421,6 @@ def test__copy_eof_on_all(self):
         socketpair[1].close()
         os.close(write_to_stdin_fd)
 
-        # Expect two select calls, the last one will cause IndexError
         pty.select = self._mock_select
         self.select_rfds_lengths.append(2)
         self.select_rfds_results.append([mock_stdin_fd, masters[0]])
@@ -415,12 +428,34 @@ def test__copy_eof_on_all(self):
         # both encountered an EOF before the second select call.
         self.select_rfds_lengths.append(0)
 
-        with self.assertRaises(IndexError):
-            pty._copy(masters[0])
+        # We expect the function to return without error.
+        self.assertEqual(pty._copy(masters[0]), None)
+
+    def test__restore_tty_mode_normal_return(self):
+        """Test that spawn resets the tty mode no when _copy returns normally."""
+
+        # PID 1 is returned from mocked fork to run the parent branch
+        # of code
+        pty.fork = self._make_mock_fork(1)
+
+        status_sentinel = object()
+        pty.waitpid = lambda _1, _2: [None, status_sentinel]
+        pty.close = lambda _: None
+
+        pty._copy = lambda _1, _2, _3: None
+
+        mode_sentinel = object()
+        pty.tcgetattr = lambda fd: mode_sentinel
+        pty.tcsetattr = self._mock_tcsetattr
+        pty.setraw = lambda _: None
+
+        self.assertEqual(pty.spawn([]), status_sentinel, "pty.waitpid process status not returned by pty.spawn")
+        self.assertEqual(self.tcsetattr_mode_setting, mode_sentinel, "pty.tcsetattr not called with original mode value")
 
 
 def tearDownModule():
     reap_children()
 
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/Misc/ACKS b/Misc/ACKS
index f845c1c5a48982..7829feebc49b0c 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1622,6 +1622,7 @@ Yue Shuaijie
 Jaysinh Shukla
 Terrel Shumway
 Eric Siegerman
+Reilly Tucker Siemens
 Paul Sijben
 SilentGhost
 Tim Silk
diff --git a/Misc/NEWS.d/next/Library/2019-02-26-09-31-59.bpo-26228.wyrHKc.rst b/Misc/NEWS.d/next/Library/2019-02-26-09-31-59.bpo-26228.wyrHKc.rst
new file mode 100644
index 00000000000000..43ff580bcfaf63
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-02-26-09-31-59.bpo-26228.wyrHKc.rst
@@ -0,0 +1 @@
+pty.spawn no longer hangs on FreeBSD, OS X, and Solaris.
\ No newline at end of file


From webhook-mailer at python.org  Wed Aug 11 21:56:51 2021
From: webhook-mailer at python.org (benjaminp)
Date: Thu, 12 Aug 2021 01:56:51 -0000
Subject: [Python-checkins] bpo-33930: Fix typo in the test name. (#27733)
Message-ID: <mailman.1006.1628733412.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/f08e6d1bb3c5655f184af88c6793e90908bb6338
commit: f08e6d1bb3c5655f184af88c6793e90908bb6338
branch: main
author: Benjamin Peterson <benjamin at python.org>
committer: benjaminp <benjamin at locrian.net>
date: 2021-08-11T18:56:43-07:00
summary:

bpo-33930: Fix typo in the test name. (#27733)

bpo-33930: Fix typo in the test name. (GH-27733)

files:
M Lib/test/test_exceptions.py

diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 8bcb4b0f789a8..efeca6de822fb 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -1171,7 +1171,7 @@ def g():
 
 
     @cpython_only
-    def test_crashcan_recursion(self):
+    def test_trashcan_recursion(self):
         # See bpo-33930
 
         def foo():


From webhook-mailer at python.org  Wed Aug 11 22:17:32 2021
From: webhook-mailer at python.org (benjaminp)
Date: Thu, 12 Aug 2021 02:17:32 -0000
Subject: [Python-checkins] bpo-33930: Fix typo in the test name. (GH-27735)
Message-ID: <mailman.1007.1628734653.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/d7f5796a1ec7ba223f6a844d7580559abef05238
commit: d7f5796a1ec7ba223f6a844d7580559abef05238
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: benjaminp <benjamin at locrian.net>
date: 2021-08-11T19:17:23-07:00
summary:

bpo-33930: Fix typo in the test name. (GH-27735)

bpo-33930: Fix typo in the test name. (GH-27733)
(cherry picked from commit f08e6d1bb3c5655f184af88c6793e90908bb6338)

Co-authored-by: Benjamin Peterson <benjamin at python.org>

Co-authored-by: Benjamin Peterson <benjamin at python.org>

files:
M Lib/test/test_exceptions.py

diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index a29a1a7a52394..f92d76aab746a 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -984,7 +984,7 @@ def g():
 
 
     @cpython_only
-    def test_crashcan_recursion(self):
+    def test_trashcan_recursion(self):
         # See bpo-33930
 
         def foo():


From webhook-mailer at python.org  Wed Aug 11 22:20:29 2021
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 12 Aug 2021 02:20:29 -0000
Subject: [Python-checkins] [3.9] bpo-33930: Fix typo in the test name.
 (GH-27733) (GH-27734)
Message-ID: <mailman.1008.1628734831.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/f7635f0e542c916bfd62542e7b60ee23ff681d0d
commit: f7635f0e542c916bfd62542e7b60ee23ff681d0d
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-11T19:20:21-07:00
summary:

[3.9] bpo-33930: Fix typo in the test name. (GH-27733) (GH-27734)



[bpo-33930](): Fix typo in the test name. (GH-27733)
(cherry picked from commit f08e6d1bb3c5655f184af88c6793e90908bb6338)


Co-authored-by: Benjamin Peterson <benjamin at python.org>

Automerge-Triggered-By: GH:benjaminp

files:
M Lib/test/test_exceptions.py

diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index abb90001718a3..6dd3d5d909422 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -1141,7 +1141,7 @@ def g():
 
 
     @cpython_only
-    def test_crashcan_recursion(self):
+    def test_trashcan_recursion(self):
         # See bpo-33930
 
         def foo():


From webhook-mailer at python.org  Thu Aug 12 06:47:47 2021
From: webhook-mailer at python.org (markshannon)
Date: Thu, 12 Aug 2021 10:47:47 -0000
Subject: [Python-checkins] bpo-44878: Remove loop from interpreter. All
 dispatching is done by gotos. (GH-27727)
Message-ID: <mailman.1009.1628765268.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/a530a9538f3f444bebd2d2b71fe5f2e747e76d73
commit: a530a9538f3f444bebd2d2b71fe5f2e747e76d73
branch: main
author: Mark Shannon <mark at hotpy.org>
committer: markshannon <mark at hotpy.org>
date: 2021-08-12T11:47:38+01:00
summary:

bpo-44878: Remove loop from interpreter. All dispatching is done by gotos. (GH-27727)

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-11-14-12-41.bpo-44878.pAbBfc.rst
M Python/ceval.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-11-14-12-41.bpo-44878.pAbBfc.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-11-14-12-41.bpo-44878.pAbBfc.rst
new file mode 100644
index 0000000000000..9e07fa8a25df0
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-11-14-12-41.bpo-44878.pAbBfc.rst	
@@ -0,0 +1,2 @@
+Remove the loop from the bytecode interpreter. All instructions end with a
+DISPATCH macro, so the loop is now redundant.
diff --git a/Python/ceval.c b/Python/ceval.c
index e8c4e4c8c07eb..f494e8477fac7 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1280,7 +1280,7 @@ eval_frame_handle_pending(PyThreadState *tstate)
 
 #define CHECK_EVAL_BREAKER() \
     if (_Py_atomic_load_relaxed(eval_breaker)) { \
-        continue; \
+        goto check_eval_breaker; \
     }
 
 
@@ -1584,7 +1584,8 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
     assert(!_PyErr_Occurred(tstate));
 #endif
 
-    for (;;) {
+check_eval_breaker:
+    {
         assert(STACK_LEVEL() >= 0); /* else underflow */
         assert(STACK_LEVEL() <= co->co_stacksize);  /* else overflow */
         assert(!_PyErr_Occurred(tstate));
@@ -4292,6 +4293,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             CHECK_EVAL_BREAKER();
             DISPATCH();
         }
+
         TARGET(CALL_METHOD_KW): {
             /* Designed to work in tandem with LOAD_METHOD. Same as CALL_METHOD
             but pops TOS to get a tuple of keyword names. */
@@ -4315,6 +4317,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             CHECK_EVAL_BREAKER();
             DISPATCH();
         }
+
         TARGET(CALL_FUNCTION): {
             PREDICTED(CALL_FUNCTION);
             PyObject **sp, *res;
@@ -4621,7 +4624,17 @@ MISS_WITH_OPARG_COUNTER(BINARY_SUBSCR)
         int level, handler, lasti;
         if (get_exception_handler(co, offset, &level, &handler, &lasti) == 0) {
             // No handlers, so exit.
-            break;
+            assert(retval == NULL);
+            assert(_PyErr_Occurred(tstate));
+
+            /* Pop remaining stack entries. */
+            while (!EMPTY()) {
+                PyObject *o = POP();
+                Py_XDECREF(o);
+            }
+            frame->stackdepth = 0;
+            frame->f_state = FRAME_RAISED;
+            goto exiting;
         }
 
         assert(STACK_LEVEL() >= level);
@@ -4661,18 +4674,8 @@ MISS_WITH_OPARG_COUNTER(BINARY_SUBSCR)
         NEXTOPARG();
         PRE_DISPATCH_GOTO();
         DISPATCH_GOTO();
-    } /* main loop */
-
-    assert(retval == NULL);
-    assert(_PyErr_Occurred(tstate));
-
-    /* Pop remaining stack entries. */
-    while (!EMPTY()) {
-        PyObject *o = POP();
-        Py_XDECREF(o);
     }
-    frame->stackdepth = 0;
-    frame->f_state = FRAME_RAISED;
+
 exiting:
     if (cframe.use_tracing) {
         if (tstate->c_tracefunc) {


From webhook-mailer at python.org  Thu Aug 12 07:15:15 2021
From: webhook-mailer at python.org (markshannon)
Date: Thu, 12 Aug 2021 11:15:15 -0000
Subject: [Python-checkins] bpo-44890: collect specialization stats if
 Py_DEBUG (GH-27731)
Message-ID: <mailman.1010.1628766916.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/8ac0886091c27bf4b6bb0a9b571e174b554d31a4
commit: 8ac0886091c27bf4b6bb0a9b571e174b554d31a4
branch: main
author: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
committer: markshannon <mark at hotpy.org>
date: 2021-08-12T12:15:06+01:00
summary:

bpo-44890: collect specialization stats if Py_DEBUG (GH-27731)

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-11-16-46-27.bpo-44890.PwNg8N.rst
M Include/internal/pycore_code.h
M Modules/_opcode.c
M Python/ceval.c
M Python/specialize.c

diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
index 7ae7aee961c3a0..85f09544d4a091 100644
--- a/Include/internal/pycore_code.h
+++ b/Include/internal/pycore_code.h
@@ -301,13 +301,16 @@ int _Py_Specialize_StoreAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *nam
 int _Py_Specialize_LoadGlobal(PyObject *globals, PyObject *builtins, _Py_CODEUNIT *instr, PyObject *name, SpecializedCacheEntry *cache);
 int _Py_Specialize_BinarySubscr(PyObject *sub, PyObject *container, _Py_CODEUNIT *instr);
 
-#define SPECIALIZATION_STATS 0
-#define SPECIALIZATION_STATS_DETAILED 0
-#define SPECIALIZATION_STATS_TO_FILE 0
+#define PRINT_SPECIALIZATION_STATS 0
+#define PRINT_SPECIALIZATION_STATS_DETAILED 0
+#define PRINT_SPECIALIZATION_STATS_TO_FILE 0
+
+#define COLLECT_SPECIALIZATION_STATS (Py_DEBUG || PRINT_SPECIALIZATION_STATS)
+#define COLLECT_SPECIALIZATION_STATS_DETAILED (Py_DEBUG || PRINT_SPECIALIZATION_STATS_DETAILED)
 
 #define SPECIALIZATION_FAILURE_KINDS 20
 
-#if SPECIALIZATION_STATS
+#if COLLECT_SPECIALIZATION_STATS
 
 typedef struct _stats {
     uint64_t specialization_success;
@@ -317,7 +320,7 @@ typedef struct _stats {
     uint64_t miss;
     uint64_t deopt;
     uint64_t unquickened;
-#if SPECIALIZATION_STATS_DETAILED
+#if COLLECT_SPECIALIZATION_STATS_DETAILED
     uint64_t specialization_failure_kinds[SPECIALIZATION_FAILURE_KINDS];
 #endif
 } SpecializationStats;
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-11-16-46-27.bpo-44890.PwNg8N.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-11-16-46-27.bpo-44890.PwNg8N.rst
new file mode 100644
index 00000000000000..48a1c8b690e65d
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-11-16-46-27.bpo-44890.PwNg8N.rst	
@@ -0,0 +1 @@
+Specialization stats are always collected in debug builds.
\ No newline at end of file
diff --git a/Modules/_opcode.c b/Modules/_opcode.c
index d440b5c51adc39..39e30669559518 100644
--- a/Modules/_opcode.c
+++ b/Modules/_opcode.c
@@ -85,7 +85,7 @@ static PyObject *
 _opcode_get_specialization_stats_impl(PyObject *module)
 /*[clinic end generated code: output=fcbc32fdfbec5c17 input=e1f60db68d8ce5f6]*/
 {
-#if SPECIALIZATION_STATS
+#if COLLECT_SPECIALIZATION_STATS
     return _Py_GetSpecializationStats();
 #else
     Py_RETURN_NONE;
diff --git a/Python/ceval.c b/Python/ceval.c
index f494e8477fac71..111689ff629802 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -341,7 +341,7 @@ PyEval_InitThreads(void)
 void
 _PyEval_Fini(void)
 {
-#if SPECIALIZATION_STATS
+#if PRINT_SPECIALIZATION_STATS
     _Py_PrintSpecializationStats();
 #endif
 }
diff --git a/Python/specialize.c b/Python/specialize.c
index f0d68f027d6464..e653ae41c57780 100644
--- a/Python/specialize.c
+++ b/Python/specialize.c
@@ -37,7 +37,7 @@
 */
 
 Py_ssize_t _Py_QuickenedCount = 0;
-#if SPECIALIZATION_STATS
+#if COLLECT_SPECIALIZATION_STATS
 SpecializationStats _specialization_stats[256] = { 0 };
 
 #define ADD_STAT_TO_DICT(res, field) \
@@ -69,7 +69,7 @@ stats_to_dict(SpecializationStats *stats)
     ADD_STAT_TO_DICT(res, miss);
     ADD_STAT_TO_DICT(res, deopt);
     ADD_STAT_TO_DICT(res, unquickened);
-#if SPECIALIZATION_STATS_DETAILED
+#if COLLECT_SPECIALIZATION_STATS_DETAILED
     PyObject *failure_kinds = PyTuple_New(SPECIALIZATION_FAILURE_KINDS);
     if (failure_kinds == NULL) {
         Py_DECREF(res);
@@ -111,7 +111,7 @@ add_stat_dict(
     return err;
 }
 
-#if SPECIALIZATION_STATS
+#if COLLECT_SPECIALIZATION_STATS
 PyObject*
 _Py_GetSpecializationStats(void) {
     PyObject *stats = PyDict_New();
@@ -144,7 +144,7 @@ print_stats(FILE *out, SpecializationStats *stats, const char *name)
     PRINT_STAT(name, miss);
     PRINT_STAT(name, deopt);
     PRINT_STAT(name, unquickened);
-#if SPECIALIZATION_STATS_DETAILED
+#if PRINT_SPECIALIZATION_STATS_DETAILED
     for (int i = 0; i < SPECIALIZATION_FAILURE_KINDS; i++) {
         fprintf(out, "    %s.specialization_failure_kinds[%d] : %" PRIu64 "\n",
             name, i, stats->specialization_failure_kinds[i]);
@@ -157,7 +157,7 @@ void
 _Py_PrintSpecializationStats(void)
 {
     FILE *out = stderr;
-#if SPECIALIZATION_STATS_TO_FILE
+#if PRINT_SPECIALIZATION_STATS_TO_FILE
     /* Write to a file instead of stderr. */
 # ifdef MS_WINDOWS
     const char *dirname = "c:\\temp\\py_stats\\";
@@ -182,7 +182,7 @@ _Py_PrintSpecializationStats(void)
     }
 }
 
-#if SPECIALIZATION_STATS_DETAILED
+#if COLLECT_SPECIALIZATION_STATS_DETAILED
 
 #define SPECIALIZATION_FAIL(opcode, kind) _specialization_stats[opcode].specialization_failure_kinds[kind]++
 


From webhook-mailer at python.org  Thu Aug 12 08:36:31 2021
From: webhook-mailer at python.org (ambv)
Date: Thu, 12 Aug 2021 12:36:31 -0000
Subject: [Python-checkins] bpo-26228: Fix pty EOF handling (GH-12049)
 (GH-27732)
Message-ID: <mailman.1011.1628771792.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/5d444434ad4e1943a88c9d3aadd300fd0f05dab7
commit: 5d444434ad4e1943a88c9d3aadd300fd0f05dab7
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-12T14:36:04+02:00
summary:

bpo-26228: Fix pty EOF handling (GH-12049) (GH-27732)

On non-Linux POSIX platforms, like FreeBSD or macOS,
the FD used to read a forked PTY may signal its exit not
by raising an error but by sending empty data to the read
syscall. This case wasn't handled, leading to hanging
`pty.spawn` calls.

Co-authored-by: Reilly Tucker Siemens <reilly at tuckersiemens.com>
Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 81ab8db235580317edcb0e559cd4c983f70883f5)

Co-authored-by: Zephyr Shannon <geoffpshannon at gmail.com>

files:
A Misc/NEWS.d/next/Library/2019-02-26-09-31-59.bpo-26228.wyrHKc.rst
M Doc/library/pty.rst
M Lib/pty.py
M Lib/test/test_pty.py
M Misc/ACKS

diff --git a/Doc/library/pty.rst b/Doc/library/pty.rst
index 73d4f102fd4d8e..4b49d244038eb7 100644
--- a/Doc/library/pty.rst
+++ b/Doc/library/pty.rst
@@ -50,7 +50,7 @@ The :mod:`pty` module defines the following functions:
    The functions *master_read* and *stdin_read* are passed a file descriptor
    which they should read from, and they should always return a byte string. In
    order to force spawn to return before the child process exits an
-   :exc:`OSError` should be thrown.
+   empty byte array should be returned to signal end of file.
 
    The default implementation for both functions will read and return up to 1024
    bytes each time the function is called. The *master_read* callback is passed
@@ -65,10 +65,6 @@ The :mod:`pty` module defines the following functions:
    process will quit without any input, *spawn* will then loop forever. If
    *master_read* signals EOF the same behavior results (on linux at least).
 
-   If both callbacks signal EOF then *spawn* will probably never return, unless
-   *select* throws an error on your platform when passed three empty lists. This
-   is a bug, documented in `issue 26228 <https://bugs.python.org/issue26228>`_.
-
    Return the exit status value from :func:`os.waitpid` on the child process.
 
    :func:`waitstatus_to_exitcode` can be used to convert the exit status into
diff --git a/Lib/pty.py b/Lib/pty.py
index a32432041fa1db..43e974fff1c908 100644
--- a/Lib/pty.py
+++ b/Lib/pty.py
@@ -11,7 +11,11 @@
 import sys
 import tty
 
-__all__ = ["openpty","fork","spawn"]
+# names imported directly for test mocking purposes
+from os import close, waitpid
+from tty import setraw, tcgetattr, tcsetattr
+
+__all__ = ["openpty", "fork", "spawn"]
 
 STDIN_FILENO = 0
 STDOUT_FILENO = 1
@@ -105,8 +109,8 @@ def fork():
         os.dup2(slave_fd, STDIN_FILENO)
         os.dup2(slave_fd, STDOUT_FILENO)
         os.dup2(slave_fd, STDERR_FILENO)
-        if (slave_fd > STDERR_FILENO):
-            os.close (slave_fd)
+        if slave_fd > STDERR_FILENO:
+            os.close(slave_fd)
 
         # Explicitly open the tty to make it become a controlling tty.
         tmp_fd = os.open(os.ttyname(STDOUT_FILENO), os.O_RDWR)
@@ -133,14 +137,22 @@ def _copy(master_fd, master_read=_read, stdin_read=_read):
             pty master -> standard output   (master_read)
             standard input -> pty master    (stdin_read)"""
     fds = [master_fd, STDIN_FILENO]
-    while True:
-        rfds, wfds, xfds = select(fds, [], [])
+    while fds:
+        rfds, _wfds, _xfds = select(fds, [], [])
+
         if master_fd in rfds:
-            data = master_read(master_fd)
+            # Some OSes signal EOF by returning an empty byte string,
+            # some throw OSErrors.
+            try:
+                data = master_read(master_fd)
+            except OSError:
+                data = b""
             if not data:  # Reached EOF.
-                fds.remove(master_fd)
+                return    # Assume the child process has exited and is
+                          # unreachable, so we clean up.
             else:
                 os.write(STDOUT_FILENO, data)
+
         if STDIN_FILENO in rfds:
             data = stdin_read(STDIN_FILENO)
             if not data:
@@ -153,20 +165,23 @@ def spawn(argv, master_read=_read, stdin_read=_read):
     if type(argv) == type(''):
         argv = (argv,)
     sys.audit('pty.spawn', argv)
+
     pid, master_fd = fork()
     if pid == CHILD:
         os.execlp(argv[0], *argv)
+
     try:
-        mode = tty.tcgetattr(STDIN_FILENO)
-        tty.setraw(STDIN_FILENO)
-        restore = 1
+        mode = tcgetattr(STDIN_FILENO)
+        setraw(STDIN_FILENO)
+        restore = True
     except tty.error:    # This is the same as termios.error
-        restore = 0
+        restore = False
+
     try:
         _copy(master_fd, master_read, stdin_read)
-    except OSError:
+    finally:
         if restore:
-            tty.tcsetattr(STDIN_FILENO, tty.TCSAFLUSH, mode)
+            tcsetattr(STDIN_FILENO, tty.TCSAFLUSH, mode)
 
-    os.close(master_fd)
-    return os.waitpid(pid, 0)[1]
+    close(master_fd)
+    return waitpid(pid, 0)[1]
diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py
index 7585c42bf01338..e2e9475b5d337d 100644
--- a/Lib/test/test_pty.py
+++ b/Lib/test/test_pty.py
@@ -5,8 +5,9 @@
 import_module('termios')
 
 import errno
-import pty
 import os
+import pty
+import tty
 import sys
 import select
 import signal
@@ -123,12 +124,6 @@ def handle_sig(self, sig, frame):
 
     @staticmethod
     def handle_sighup(signum, frame):
-        # bpo-38547: if the process is the session leader, os.close(master_fd)
-        # of "master_fd, slave_name = pty.master_open()" raises SIGHUP
-        # signal: just ignore the signal.
-        #
-        # NOTE: the above comment is from an older version of the test;
-        # master_open() is not being used anymore.
         pass
 
     @expectedFailureIfStdinIsTTY
@@ -190,13 +185,6 @@ def test_openpty(self):
             self.assertEqual(_get_term_winsz(slave_fd), new_stdin_winsz,
                              "openpty() failed to set slave window size")
 
-        # Solaris requires reading the fd before anything is returned.
-        # My guess is that since we open and close the slave fd
-        # in master_open(), we need to read the EOF.
-        #
-        # NOTE: the above comment is from an older version of the test;
-        # master_open() is not being used anymore.
-
         # Ensure the fd is non-blocking in case there's nothing to read.
         blocking = os.get_blocking(master_fd)
         try:
@@ -324,22 +312,40 @@ def test_master_read(self):
 
         self.assertEqual(data, b"")
 
+    def test_spawn_doesnt_hang(self):
+        pty.spawn([sys.executable, '-c', 'print("hi there")'])
+
 class SmallPtyTests(unittest.TestCase):
     """These tests don't spawn children or hang."""
 
     def setUp(self):
         self.orig_stdin_fileno = pty.STDIN_FILENO
         self.orig_stdout_fileno = pty.STDOUT_FILENO
+        self.orig_pty_close = pty.close
+        self.orig_pty__copy = pty._copy
+        self.orig_pty_fork = pty.fork
         self.orig_pty_select = pty.select
+        self.orig_pty_setraw = pty.setraw
+        self.orig_pty_tcgetattr = pty.tcgetattr
+        self.orig_pty_tcsetattr = pty.tcsetattr
+        self.orig_pty_waitpid = pty.waitpid
         self.fds = []  # A list of file descriptors to close.
         self.files = []
         self.select_rfds_lengths = []
         self.select_rfds_results = []
+        self.tcsetattr_mode_setting = None
 
     def tearDown(self):
         pty.STDIN_FILENO = self.orig_stdin_fileno
         pty.STDOUT_FILENO = self.orig_stdout_fileno
+        pty.close = self.orig_pty_close
+        pty._copy = self.orig_pty__copy
+        pty.fork = self.orig_pty_fork
         pty.select = self.orig_pty_select
+        pty.setraw = self.orig_pty_setraw
+        pty.tcgetattr = self.orig_pty_tcgetattr
+        pty.tcsetattr = self.orig_pty_tcsetattr
+        pty.waitpid = self.orig_pty_waitpid
         for file in self.files:
             try:
                 file.close()
@@ -367,6 +373,14 @@ def _mock_select(self, rfds, wfds, xfds, timeout=0):
         self.assertEqual(self.select_rfds_lengths.pop(0), len(rfds))
         return self.select_rfds_results.pop(0), [], []
 
+    def _make_mock_fork(self, pid):
+        def mock_fork():
+            return (pid, 12)
+        return mock_fork
+
+    def _mock_tcsetattr(self, fileno, opt, mode):
+        self.tcsetattr_mode_setting = mode
+
     def test__copy_to_each(self):
         """Test the normal data case on both master_fd and stdin."""
         read_from_stdout_fd, mock_stdout_fd = self._pipe()
@@ -407,7 +421,6 @@ def test__copy_eof_on_all(self):
         socketpair[1].close()
         os.close(write_to_stdin_fd)
 
-        # Expect two select calls, the last one will cause IndexError
         pty.select = self._mock_select
         self.select_rfds_lengths.append(2)
         self.select_rfds_results.append([mock_stdin_fd, masters[0]])
@@ -415,12 +428,34 @@ def test__copy_eof_on_all(self):
         # both encountered an EOF before the second select call.
         self.select_rfds_lengths.append(0)
 
-        with self.assertRaises(IndexError):
-            pty._copy(masters[0])
+        # We expect the function to return without error.
+        self.assertEqual(pty._copy(masters[0]), None)
+
+    def test__restore_tty_mode_normal_return(self):
+        """Test that spawn resets the tty mode no when _copy returns normally."""
+
+        # PID 1 is returned from mocked fork to run the parent branch
+        # of code
+        pty.fork = self._make_mock_fork(1)
+
+        status_sentinel = object()
+        pty.waitpid = lambda _1, _2: [None, status_sentinel]
+        pty.close = lambda _: None
+
+        pty._copy = lambda _1, _2, _3: None
+
+        mode_sentinel = object()
+        pty.tcgetattr = lambda fd: mode_sentinel
+        pty.tcsetattr = self._mock_tcsetattr
+        pty.setraw = lambda _: None
+
+        self.assertEqual(pty.spawn([]), status_sentinel, "pty.waitpid process status not returned by pty.spawn")
+        self.assertEqual(self.tcsetattr_mode_setting, mode_sentinel, "pty.tcsetattr not called with original mode value")
 
 
 def tearDownModule():
     reap_children()
 
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/Misc/ACKS b/Misc/ACKS
index 3e750c08bfd001..4590145a87abe7 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1621,6 +1621,7 @@ Yue Shuaijie
 Jaysinh Shukla
 Terrel Shumway
 Eric Siegerman
+Reilly Tucker Siemens
 Paul Sijben
 SilentGhost
 Tim Silk
diff --git a/Misc/NEWS.d/next/Library/2019-02-26-09-31-59.bpo-26228.wyrHKc.rst b/Misc/NEWS.d/next/Library/2019-02-26-09-31-59.bpo-26228.wyrHKc.rst
new file mode 100644
index 00000000000000..43ff580bcfaf63
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-02-26-09-31-59.bpo-26228.wyrHKc.rst
@@ -0,0 +1 @@
+pty.spawn no longer hangs on FreeBSD, OS X, and Solaris.
\ No newline at end of file


From webhook-mailer at python.org  Thu Aug 12 10:20:49 2021
From: webhook-mailer at python.org (iritkatriel)
Date: Thu, 12 Aug 2021 14:20:49 -0000
Subject: [Python-checkins] bpo-44890: Fix AMD build error (GH-27740)
Message-ID: <mailman.1012.1628778050.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/789a6af29f531f78abd2e2f6af80084ccabf80b1
commit: 789a6af29f531f78abd2e2f6af80084ccabf80b1
branch: main
author: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
committer: iritkatriel <1055913+iritkatriel at users.noreply.github.com>
date: 2021-08-12T15:20:44+01:00
summary:

bpo-44890: Fix AMD build error (GH-27740)

files:
M Include/internal/pycore_code.h

diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
index 85f09544d4a09..282089c08379e 100644
--- a/Include/internal/pycore_code.h
+++ b/Include/internal/pycore_code.h
@@ -305,8 +305,13 @@ int _Py_Specialize_BinarySubscr(PyObject *sub, PyObject *container, _Py_CODEUNIT
 #define PRINT_SPECIALIZATION_STATS_DETAILED 0
 #define PRINT_SPECIALIZATION_STATS_TO_FILE 0
 
-#define COLLECT_SPECIALIZATION_STATS (Py_DEBUG || PRINT_SPECIALIZATION_STATS)
-#define COLLECT_SPECIALIZATION_STATS_DETAILED (Py_DEBUG || PRINT_SPECIALIZATION_STATS_DETAILED)
+#ifdef Py_DEBUG
+#define COLLECT_SPECIALIZATION_STATS 1
+#define COLLECT_SPECIALIZATION_STATS_DETAILED 1
+#else
+#define COLLECT_SPECIALIZATION_STATS PRINT_SPECIALIZATION_STATS
+#define COLLECT_SPECIALIZATION_STATS_DETAILED PRINT_SPECIALIZATION_STATS_DETAILED
+#endif
 
 #define SPECIALIZATION_FAILURE_KINDS 20
 


From webhook-mailer at python.org  Thu Aug 12 12:13:41 2021
From: webhook-mailer at python.org (pablogsal)
Date: Thu, 12 Aug 2021 16:13:41 -0000
Subject: [Python-checkins] bpo-44885: Correct the ast locations of f-strings
 with format specs and repeated expressions (GH-27729)
Message-ID: <mailman.1013.1628784821.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/8e832fb2a2cb54d7262148b6ec15563dffb48d63
commit: 8e832fb2a2cb54d7262148b6ec15563dffb48d63
branch: main
author: Pablo Galindo Salgado <Pablogsal at gmail.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-08-12T17:13:30+01:00
summary:

bpo-44885: Correct the ast locations of f-strings with format specs and repeated expressions (GH-27729)

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-11-15-39-57.bpo-44885.i4noUO.rst
M Lib/test/test_fstring.py
M Parser/string_parser.c
M Python/importlib.h
M Python/importlib_external.h
M Python/importlib_zipimport.h

diff --git a/Lib/test/test_fstring.py b/Lib/test/test_fstring.py
index caae1b7c4f8535..14a4c678fc9097 100644
--- a/Lib/test/test_fstring.py
+++ b/Lib/test/test_fstring.py
@@ -212,11 +212,6 @@ def test_ast_line_numbers_nested(self):
         self.assertEqual(call.col_offset, 11)
 
     def test_ast_line_numbers_duplicate_expression(self):
-        """Duplicate expression
-
-        NOTE: this is currently broken, always sets location of the first
-        expression.
-        """
         expr = """
 a = 10
 f'{a * x()} {a * x()} {a * x()}'
@@ -266,9 +261,9 @@ def test_ast_line_numbers_duplicate_expression(self):
         self.assertEqual(binop.lineno, 3)
         self.assertEqual(binop.left.lineno, 3)
         self.assertEqual(binop.right.lineno, 3)
-        self.assertEqual(binop.col_offset, 3)  # FIXME: this is wrong
-        self.assertEqual(binop.left.col_offset, 3)  # FIXME: this is wrong
-        self.assertEqual(binop.right.col_offset, 7)  # FIXME: this is wrong
+        self.assertEqual(binop.col_offset, 13)
+        self.assertEqual(binop.left.col_offset, 13)
+        self.assertEqual(binop.right.col_offset, 17)
         # check the third binop location
         binop = t.body[1].value.values[4].value
         self.assertEqual(type(binop), ast.BinOp)
@@ -278,9 +273,32 @@ def test_ast_line_numbers_duplicate_expression(self):
         self.assertEqual(binop.lineno, 3)
         self.assertEqual(binop.left.lineno, 3)
         self.assertEqual(binop.right.lineno, 3)
-        self.assertEqual(binop.col_offset, 3)  # FIXME: this is wrong
-        self.assertEqual(binop.left.col_offset, 3)  # FIXME: this is wrong
-        self.assertEqual(binop.right.col_offset, 7)  # FIXME: this is wrong
+        self.assertEqual(binop.col_offset, 23)
+        self.assertEqual(binop.left.col_offset, 23)
+        self.assertEqual(binop.right.col_offset, 27)
+
+    def test_ast_numbers_fstring_with_formatting(self):
+
+        t = ast.parse('f"Here is that pesky {xxx:.3f} again"')
+        self.assertEqual(len(t.body), 1)
+        self.assertEqual(t.body[0].lineno, 1)
+
+        self.assertEqual(type(t.body[0]), ast.Expr)
+        self.assertEqual(type(t.body[0].value), ast.JoinedStr)
+        self.assertEqual(len(t.body[0].value.values), 3)
+
+        self.assertEqual(type(t.body[0].value.values[0]), ast.Constant)
+        self.assertEqual(type(t.body[0].value.values[1]), ast.FormattedValue)
+        self.assertEqual(type(t.body[0].value.values[2]), ast.Constant)
+
+        _, expr, _ = t.body[0].value.values
+
+        name = expr.value
+        self.assertEqual(type(name), ast.Name)
+        self.assertEqual(name.lineno, 1)
+        self.assertEqual(name.end_lineno, 1)
+        self.assertEqual(name.col_offset, 22)
+        self.assertEqual(name.end_col_offset, 25)
 
     def test_ast_line_numbers_multiline_fstring(self):
         # See bpo-30465 for details.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-11-15-39-57.bpo-44885.i4noUO.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-11-15-39-57.bpo-44885.i4noUO.rst
new file mode 100644
index 00000000000000..c6abd7363af711
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-11-15-39-57.bpo-44885.i4noUO.rst	
@@ -0,0 +1,2 @@
+Correct the ast locations of f-strings with format specs and repeated
+expressions. Patch by Pablo Galindo
diff --git a/Parser/string_parser.c b/Parser/string_parser.c
index 66405b26f37e4c..fb37d37553a552 100644
--- a/Parser/string_parser.c
+++ b/Parser/string_parser.c
@@ -279,49 +279,48 @@ _PyPegen_parsestr(Parser *p, int *bytesmode, int *rawmode, PyObject **result,
 /* Fix locations for the given node and its children.
 
    `parent` is the enclosing node.
+   `expr_start` is the starting position of the expression (pointing to the open brace).
    `n` is the node which locations are going to be fixed relative to parent.
    `expr_str` is the child node's string representation, including braces.
 */
 static bool
-fstring_find_expr_location(Token *parent, char *expr_str, int *p_lines, int *p_cols)
+fstring_find_expr_location(Token *parent, const char* expr_start, char *expr_str, int *p_lines, int *p_cols)
 {
     *p_lines = 0;
     *p_cols = 0;
+    assert(expr_start != NULL && *expr_start == '{');
     if (parent && parent->bytes) {
         const char *parent_str = PyBytes_AsString(parent->bytes);
         if (!parent_str) {
             return false;
         }
-        const char *substr = strstr(parent_str, expr_str);
-        if (substr) {
-            // The following is needed, in order to correctly shift the column
-            // offset, in the case that (disregarding any whitespace) a newline
-            // immediately follows the opening curly brace of the fstring expression.
-            bool newline_after_brace = 1;
-            const char *start = substr + 1;
-            while (start && *start != '}' && *start != '\n') {
-                if (*start != ' ' && *start != '\t' && *start != '\f') {
-                    newline_after_brace = 0;
-                    break;
-                }
-                start++;
+        // The following is needed, in order to correctly shift the column
+        // offset, in the case that (disregarding any whitespace) a newline
+        // immediately follows the opening curly brace of the fstring expression.
+        bool newline_after_brace = 1;
+        const char *start = expr_start + 1;
+        while (start && *start != '}' && *start != '\n') {
+            if (*start != ' ' && *start != '\t' && *start != '\f') {
+                newline_after_brace = 0;
+                break;
             }
+            start++;
+        }
 
-            // Account for the characters from the last newline character to our
-            // left until the beginning of substr.
-            if (!newline_after_brace) {
-                start = substr;
-                while (start > parent_str && *start != '\n') {
-                    start--;
-                }
-                *p_cols += (int)(substr - start);
+        // Account for the characters from the last newline character to our
+        // left until the beginning of expr_start.
+        if (!newline_after_brace) {
+            start = expr_start;
+            while (start > parent_str && *start != '\n') {
+                start--;
             }
-            /* adjust the start based on the number of newlines encountered
-               before the f-string expression */
-            for (const char *p = parent_str; p < substr; p++) {
-                if (*p == '\n') {
-                    (*p_lines)++;
-                }
+            *p_cols += (int)(expr_start - start);
+        }
+        /* adjust the start based on the number of newlines encountered
+           before the f-string expression */
+        for (const char *p = parent_str; p < expr_start; p++) {
+            if (*p == '\n') {
+                (*p_lines)++;
             }
         }
     }
@@ -365,7 +364,7 @@ fstring_compile_expr(Parser *p, const char *expr_start, const char *expr_end,
 
     len = expr_end - expr_start;
     /* Allocate 3 extra bytes: open paren, close paren, null byte. */
-    str = PyMem_Malloc(len + 3);
+    str = PyMem_Calloc(len + 3, sizeof(char));
     if (str == NULL) {
         PyErr_NoMemory();
         return NULL;
@@ -373,17 +372,10 @@ fstring_compile_expr(Parser *p, const char *expr_start, const char *expr_end,
 
     // The call to fstring_find_expr_location is responsible for finding the column offset
     // the generated AST nodes need to be shifted to the right, which is equal to the number
-    // of the f-string characters before the expression starts. In order to correctly compute
-    // this offset, strstr gets called in fstring_find_expr_location which only succeeds
-    // if curly braces appear before and after the f-string expression (exactly like they do
-    // in the f-string itself), hence the following lines.
-    str[0] = '{';
+    // of the f-string characters before the expression starts.
     memcpy(str+1, expr_start, len);
-    str[len+1] = '}';
-    str[len+2] = 0;
-
     int lines, cols;
-    if (!fstring_find_expr_location(t, str, &lines, &cols)) {
+    if (!fstring_find_expr_location(t, expr_start-1, str+1, &lines, &cols)) {
         PyMem_Free(str);
         return NULL;
     }
diff --git a/Python/importlib.h b/Python/importlib.h
index b62cc9db179168..da94fc35c7f06f 100644
--- a/Python/importlib.h
+++ b/Python/importlib.h
@@ -1518,7 +1518,7 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     109,111,100,117,108,101,95,114,101,112,114,224,2,0,0,115,
     8,0,0,0,6,7,2,1,4,255,22,2,115,6,0,0,
     0,2,7,10,1,22,1,115,34,0,0,0,9,18,9,80,
-    24,59,61,79,9,80,9,80,16,75,17,23,17,32,16,75,
+    24,59,61,79,9,80,9,80,16,75,27,33,27,42,16,75,
     16,75,48,63,48,71,16,75,16,75,16,75,9,75,114,17,
     0,0,0,78,99,4,0,0,0,0,0,0,0,0,0,0,
     0,5,0,0,0,3,0,0,0,115,42,0,0,0,124,2,
@@ -2127,7 +2127,7 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     60,13,60,0,0,8,14,5,47,25,28,25,36,37,43,25,
     44,9,22,9,47,13,20,21,34,36,41,43,49,13,50,13,
     50,12,18,5,18,0,0,9,47,16,30,9,47,9,47,9,
-    47,9,47,19,86,20,26,19,86,19,86,20,25,19,86,19,
+    47,9,47,19,86,49,55,19,86,19,86,77,82,19,86,19,
     86,13,16,13,22,13,47,28,31,33,46,13,47,13,47,13,
     47,12,18,5,18,9,47,0,0,12,18,5,18,115,39,0,
     0,0,167,3,43,0,171,23,65,2,7,193,40,4,65,52,
@@ -2323,7 +2323,7 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     0,15,22,15,41,27,40,15,41,5,12,12,19,12,35,24,
     34,12,35,5,9,8,15,23,27,8,27,5,49,12,16,24,
     28,12,28,9,56,33,40,44,48,44,55,33,55,9,56,13,
-    22,13,56,28,63,29,36,28,63,28,63,29,33,29,40,28,
+    22,13,56,28,63,32,39,28,63,28,63,47,51,47,58,28,
     63,28,63,28,63,28,41,54,55,13,56,13,56,13,56,16,
     23,9,23,10,14,22,26,10,26,5,49,16,20,16,27,9,
     27,9,18,9,52,24,63,24,37,50,51,9,52,9,52,9,
diff --git a/Python/importlib_external.h b/Python/importlib_external.h
index 1572d0d4d9bca0..c49fa5516eb26c 100644
--- a/Python/importlib_external.h
+++ b/Python/importlib_external.h
@@ -685,15 +685,15 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
     41,44,52,28,52,12,53,9,43,20,24,25,28,29,42,25,
     43,25,44,25,44,20,45,13,17,39,43,13,36,12,35,5,
     42,25,36,37,41,25,42,9,22,9,13,15,22,12,19,23,
-    31,12,31,9,42,19,29,33,41,30,41,30,41,31,35,30,
+    31,12,31,9,42,19,29,33,41,30,41,30,41,33,37,30,
     41,30,41,19,42,13,42,17,33,17,44,40,43,17,44,5,
-    14,8,17,25,31,8,31,5,51,15,25,26,78,27,43,26,
+    14,8,17,25,31,8,31,5,51,15,25,26,78,58,74,26,
     78,26,78,15,79,9,79,10,19,23,24,10,24,5,51,24,
     40,24,55,48,51,53,54,24,55,56,58,24,59,9,21,16,
-    28,16,45,40,44,16,45,9,47,19,29,30,46,31,35,30,
+    28,16,45,40,44,16,45,9,47,19,29,30,46,38,42,30,
     46,30,46,19,47,13,47,21,33,34,37,38,42,34,43,34,
     44,34,44,21,45,9,18,16,25,16,35,16,35,9,51,19,
-    29,30,50,31,43,30,50,30,50,30,50,19,51,13,51,21,
+    29,30,50,52,64,30,50,30,50,30,50,19,51,13,51,21,
     37,21,52,48,51,21,52,53,54,21,55,5,18,12,22,23,
     27,29,42,45,60,61,62,45,63,29,63,12,64,5,64,114,
     10,0,0,0,99,1,0,0,0,0,0,0,0,0,0,0,
@@ -974,15 +974,15 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
     16,6,1,2,3,16,254,12,1,16,1,10,1,2,3,10,
     254,12,1,8,1,16,1,6,2,2,2,16,255,16,1,4,
     1,115,166,0,0,0,13,17,18,20,19,20,18,20,13,21,
-    5,10,8,13,17,29,8,29,5,50,19,61,20,24,19,61,
-    19,61,20,25,19,61,19,61,9,16,9,19,9,51,37,41,
+    5,10,8,13,17,29,8,29,5,50,19,61,42,46,19,61,
+    19,61,52,57,19,61,19,61,9,16,9,19,9,51,37,41,
     43,50,9,51,9,51,15,26,27,34,15,50,15,50,38,49,
     15,50,15,50,9,50,8,11,12,16,8,17,20,22,8,22,
-    5,32,19,70,20,24,19,70,19,70,9,16,9,19,9,51,
+    5,32,19,70,62,66,19,70,19,70,9,16,9,19,9,51,
     37,41,43,50,9,51,9,51,15,23,24,31,15,32,9,32,
     13,27,28,32,33,34,35,36,33,36,28,37,13,38,5,10,
-    8,13,16,21,8,21,5,50,19,57,20,25,19,57,19,57,
-    20,24,19,57,19,57,9,16,15,26,27,34,15,50,15,50,
+    8,13,16,21,8,21,5,50,19,57,36,41,19,57,19,57,
+    49,53,19,57,19,57,9,16,15,26,27,34,15,50,15,50,
     38,49,15,50,15,50,9,50,12,17,5,17,114,10,0,0,
     0,99,5,0,0,0,0,0,0,0,0,0,0,0,4,0,
     0,0,3,0,0,0,115,124,0,0,0,116,0,124,0,100,
@@ -1041,12 +1041,12 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
     1,2,255,22,2,8,254,115,18,0,0,0,22,19,2,3,
     10,254,12,1,16,1,6,1,2,2,22,255,32,1,115,124,
     0,0,0,8,22,23,27,28,29,30,32,28,32,23,33,8,
-    34,39,51,54,64,39,64,8,65,5,50,19,52,20,24,19,
+    34,39,51,54,64,39,64,8,65,5,50,19,52,44,48,19,
     52,19,52,9,16,9,19,9,51,37,41,43,50,9,51,9,
     51,15,26,27,34,15,50,15,50,38,49,15,50,15,50,9,
     50,9,20,28,32,9,32,5,76,9,23,24,28,29,31,32,
     34,29,34,24,35,9,36,41,52,55,65,41,65,9,66,5,
-    76,15,26,27,60,28,32,27,60,27,60,15,76,15,76,64,
+    76,15,26,27,60,52,56,27,60,27,60,15,76,15,76,64,
     75,15,76,15,76,9,76,5,76,5,76,5,76,5,76,114,
     10,0,0,0,99,4,0,0,0,0,0,0,0,0,0,0,
     0,4,0,0,0,3,0,0,0,115,42,0,0,0,124,0,
@@ -1096,7 +1096,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
     0,0,16,17,2,1,8,1,4,255,2,2,6,254,4,255,
     115,14,0,0,0,14,17,2,4,2,253,8,1,4,2,2,
     255,10,1,115,42,0,0,0,8,12,13,14,15,17,13,17,
-    8,18,22,33,8,33,5,10,15,26,13,71,14,18,13,71,
+    8,18,22,33,8,33,5,10,15,26,13,71,63,67,13,71,
     13,71,15,10,15,10,15,26,15,10,15,10,9,10,5,10,
     5,10,114,10,0,0,0,99,4,0,0,0,0,0,0,0,
     0,0,0,0,5,0,0,0,3,0,0,0,115,76,0,0,
diff --git a/Python/importlib_zipimport.h b/Python/importlib_zipimport.h
index 370c980c8fe73b..c12ed5215b3f88 100644
--- a/Python/importlib_zipimport.h
+++ b/Python/importlib_zipimport.h
@@ -481,7 +481,7 @@ const unsigned char _Py_M__zipimport[] = {
     0,0,10,7,6,1,20,1,10,2,2,1,2,3,14,254,
     10,2,2,6,12,253,2,128,2,3,2,254,16,2,2,128,
     16,1,115,128,0,0,0,14,30,31,35,37,45,14,46,9,
-    11,12,14,18,22,12,22,9,83,19,33,34,67,35,43,34,
+    11,12,14,18,22,12,22,9,83,19,33,34,67,55,63,34,
     67,34,67,74,82,19,83,19,83,13,83,16,32,33,37,39,
     47,16,48,9,13,12,14,9,36,24,43,24,54,55,59,61,
     74,24,75,13,21,13,21,27,31,24,36,24,36,24,36,13,
@@ -513,7 +513,7 @@ const unsigned char _Py_M__zipimport[] = {
     8,0,0,0,10,6,8,1,18,1,4,1,115,8,0,0,
     0,10,6,6,1,20,1,4,1,115,40,0,0,0,14,30,
     31,35,37,45,14,46,9,11,12,14,18,22,12,22,9,83,
-    19,33,34,67,35,43,34,67,34,67,74,82,19,83,19,83,
+    19,33,34,67,55,63,34,67,34,67,74,82,19,83,19,83,
     13,83,16,18,9,18,114,10,0,0,0,99,2,0,0,0,
     0,0,0,0,0,0,0,0,8,0,0,0,3,0,0,0,
     115,0,1,0,0,100,1,125,2,116,0,106,1,124,2,116,
@@ -607,7 +607,7 @@ const unsigned char _Py_M__zipimport[] = {
     13,37,0,0,9,18,9,18,9,18,17,20,17,28,29,37,
     17,38,13,18,0,0,9,86,19,22,19,30,31,39,19,40,
     13,16,13,16,0,0,9,86,16,24,9,86,9,86,9,86,
-    9,86,19,30,31,85,32,40,31,85,31,85,31,85,19,86,
+    9,86,19,30,31,85,48,56,31,85,31,85,31,85,19,86,
     13,86,9,86,0,0,9,19,9,36,37,69,71,79,81,88,
     9,89,9,89,16,19,9,19,115,23,0,0,0,172,40,65,
     21,0,193,21,9,65,30,7,193,32,5,65,38,0,193,38,
@@ -918,42 +918,42 @@ const unsigned char _Py_M__zipimport[] = {
     2,128,12,2,12,1,20,1,8,1,8,1,4,202,2,6,
     22,48,2,128,12,0,14,1,4,1,115,240,4,0,0,5,
     80,14,17,14,27,28,35,14,36,9,11,9,11,0,0,5,
-    80,12,19,5,80,5,80,5,80,5,80,15,29,30,65,31,
-    38,30,65,30,65,72,79,15,80,15,80,9,80,5,80,0,
+    80,12,19,5,80,5,80,5,80,5,80,15,29,30,65,54,
+    61,30,65,30,65,72,79,15,80,15,80,9,80,5,80,0,
     0,10,12,5,23,5,23,9,84,13,15,13,46,22,42,21,
     42,44,45,13,46,13,46,31,33,31,40,31,40,13,28,22,
     24,22,51,30,50,22,51,13,19,13,19,0,0,9,84,16,
-    23,9,84,9,84,9,84,9,84,19,33,34,69,35,42,34,
+    23,9,84,9,84,9,84,9,84,19,33,34,69,58,65,34,
     69,34,69,76,83,19,84,19,84,13,84,9,84,0,0,12,
-    15,16,22,12,23,27,47,12,47,9,84,19,33,34,69,35,
-    42,34,69,34,69,76,83,19,84,19,84,13,84,12,18,19,
+    15,16,22,12,23,27,47,12,47,9,84,19,33,34,69,58,
+    65,34,69,34,69,76,83,19,84,19,84,13,84,12,18,19,
     21,20,21,19,21,12,22,26,44,12,44,9,58,13,51,17,
     19,17,30,25,26,28,29,17,30,17,30,29,31,29,38,29,
     38,17,26,17,26,0,0,13,51,20,27,13,51,13,51,13,
-    51,13,51,23,37,38,73,39,46,38,73,38,73,43,50,23,
+    51,13,51,23,37,38,73,62,69,38,73,38,73,43,50,23,
     51,23,51,17,51,13,51,0,0,33,36,37,46,49,64,37,
     64,37,57,37,57,59,60,33,61,13,30,13,51,17,19,17,
     43,25,42,17,43,17,43,24,26,24,33,24,33,17,21,17,
     21,0,0,13,51,20,27,13,51,13,51,13,51,13,51,23,
-    37,38,73,39,46,38,73,38,73,43,50,23,51,23,51,17,
+    37,38,73,62,69,38,73,38,73,43,50,23,51,23,51,17,
     51,13,51,0,0,19,23,19,49,30,48,19,49,13,16,16,
-    19,22,23,16,23,13,51,23,37,38,68,39,46,38,68,38,
+    19,22,23,16,23,13,51,23,37,38,68,57,64,38,68,38,
     68,43,50,23,51,23,51,17,51,22,26,27,30,31,34,35,
     55,31,55,27,55,22,56,13,19,16,19,20,26,16,27,31,
-    51,16,51,13,51,23,37,38,70,39,46,38,70,38,70,43,
+    51,16,51,13,51,23,37,38,70,59,66,38,70,38,70,43,
     50,23,51,23,51,17,51,31,40,43,46,47,51,43,52,31,
     52,55,58,31,58,13,28,23,37,38,44,45,47,48,50,45,
     50,38,51,23,52,9,20,25,39,40,46,47,49,50,52,47,
     52,40,53,25,54,9,22,12,27,30,41,12,41,9,91,19,
-    33,34,76,35,42,34,76,34,76,83,90,19,91,19,91,13,
-    91,12,27,30,43,12,43,9,93,19,33,34,78,35,42,34,
+    33,34,76,65,72,34,76,34,76,83,90,19,91,19,91,13,
+    91,12,27,30,43,12,43,9,93,19,33,34,78,67,74,34,
     78,34,78,85,92,19,93,19,93,13,93,9,24,28,39,9,
     39,9,24,22,37,40,53,22,53,9,19,12,22,25,26,12,
-    26,9,101,9,101,19,33,34,86,35,42,34,86,34,86,93,
+    26,9,101,9,101,19,33,34,86,75,82,34,86,34,86,93,
     100,19,101,19,101,13,101,17,19,9,14,17,18,9,14,9,
     84,13,15,13,37,21,36,13,37,13,37,13,37,0,0,9,
     84,16,23,9,84,9,84,9,84,9,84,9,84,19,33,34,
-    69,35,42,34,69,34,69,76,83,19,84,19,84,13,84,9,
+    69,58,65,34,69,34,69,76,83,19,84,19,84,13,84,9,
     84,0,0,15,19,22,24,22,33,30,32,22,33,13,19,16,
     19,20,26,16,27,30,31,16,31,13,62,13,62,23,31,32,
     61,23,62,17,62,16,22,23,25,24,25,23,25,16,26,30,
@@ -971,18 +971,18 @@ const unsigned char _Py_M__zipimport[] = {
     23,28,42,43,49,50,52,53,55,50,55,43,56,28,57,13,
     25,27,41,42,48,49,51,52,54,49,54,42,55,27,56,13,
     24,27,36,39,49,27,49,52,64,27,64,13,24,16,27,30,
-    43,16,43,13,92,13,92,23,37,38,77,39,46,38,77,38,
+    43,16,43,13,92,13,92,23,37,38,77,66,73,38,77,38,
     77,84,91,23,92,23,92,17,92,13,24,28,38,13,38,13,
     24,13,88,24,26,24,42,32,41,24,42,17,21,17,21,0,
     0,13,88,20,27,13,88,13,88,13,88,13,88,13,88,23,
-    37,38,73,39,46,38,73,38,73,80,87,23,88,23,88,17,
+    37,38,73,62,69,38,73,38,73,80,87,23,88,23,88,17,
     88,13,88,0,0,16,19,20,24,16,25,29,38,16,38,13,
-    88,13,88,23,37,38,73,39,46,38,73,38,73,80,87,23,
+    88,13,88,23,37,38,73,62,69,38,73,38,73,80,87,23,
     88,23,88,17,88,13,88,20,23,24,26,24,56,32,43,46,
     55,32,55,24,56,20,57,61,72,75,84,61,84,20,84,17,
-    92,17,92,27,41,42,77,43,50,42,77,42,77,84,91,27,
+    92,17,92,27,41,42,77,66,73,42,77,42,77,84,91,27,
     92,27,92,21,92,17,92,0,0,13,88,20,27,13,88,13,
-    88,13,88,13,88,13,88,23,37,38,73,39,46,38,73,38,
+    88,13,88,13,88,13,88,23,37,38,73,62,69,38,73,38,
     73,80,87,23,88,23,88,17,88,13,88,0,0,16,21,24,
     29,16,29,13,72,13,72,24,28,24,37,24,37,17,21,17,
     21,17,72,28,32,28,48,40,47,28,48,21,25,21,25,0,
@@ -1137,17 +1137,17 @@ const unsigned char _Py_M__zipimport[] = {
     29,30,50,15,51,9,51,10,13,10,23,24,31,10,32,5,
     56,36,38,9,84,13,15,13,33,21,32,13,33,13,33,13,
     33,0,0,9,84,16,23,9,84,9,84,9,84,9,84,19,
-    33,34,69,35,42,34,69,34,69,76,83,19,84,19,84,13,
+    33,34,69,58,65,34,69,34,69,76,83,19,84,19,84,13,
     84,9,84,0,0,18,20,18,29,26,28,18,29,9,15,12,
     15,16,22,12,23,27,29,12,29,9,58,19,27,28,57,19,
     58,13,58,12,18,19,21,20,21,19,21,12,22,26,39,12,
-    39,9,86,19,33,34,71,35,42,34,71,34,71,78,85,19,
+    39,9,86,19,33,34,71,60,67,34,71,34,71,78,85,19,
     86,19,86,13,86,21,35,36,42,43,45,46,48,43,48,36,
     49,21,50,9,18,22,36,37,43,44,46,47,49,44,49,37,
     50,22,51,9,19,23,25,28,37,23,37,40,50,23,50,9,
     20,9,20,24,35,9,35,9,20,9,84,13,15,13,33,21,
     32,13,33,13,33,13,33,0,0,9,84,16,23,9,84,9,
-    84,9,84,9,84,19,33,34,69,35,42,34,69,34,69,76,
+    84,9,84,9,84,19,33,34,69,58,65,34,69,34,69,76,
     83,19,84,19,84,13,84,9,84,0,0,20,22,20,38,28,
     37,20,38,9,17,12,15,16,24,12,25,29,38,12,38,9,
     56,19,26,27,55,19,56,13,56,9,56,5,56,5,56,5,
@@ -1241,10 +1241,10 @@ const unsigned char _Py_M__zipimport[] = {
     57,13,58,9,34,9,21,23,34,12,24,9,28,21,30,31,
     45,46,50,51,52,53,55,51,55,46,56,31,57,59,71,21,
     72,13,28,21,35,36,40,41,43,44,46,41,46,36,47,21,
-    48,52,63,21,63,13,28,17,27,17,44,21,58,22,30,21,
+    48,52,63,21,63,13,28,17,27,17,44,21,58,46,54,21,
     58,21,58,17,59,17,59,24,28,24,28,12,19,12,25,26,
     30,31,33,31,34,31,34,26,35,12,36,5,9,12,22,23,
-    27,29,39,12,40,5,78,15,24,25,77,26,34,25,77,25,
+    27,29,39,12,40,5,78,15,24,25,77,44,52,25,77,25,
     77,25,77,15,78,9,78,12,16,5,16,114,10,0,0,0,
     99,1,0,0,0,0,0,0,0,0,0,0,0,4,0,0,
     0,3,0,0,0,115,28,0,0,0,124,0,160,0,100,1,
@@ -1402,7 +1402,7 @@ const unsigned char _Py_M__zipimport[] = {
     25,23,32,33,34,23,35,13,20,20,24,26,35,37,44,20,
     44,13,44,13,44,13,44,12,24,9,83,19,56,42,54,19,
     56,19,56,13,16,19,33,34,37,44,52,19,53,19,53,59,
-    71,13,71,19,33,34,67,35,43,34,67,34,67,74,82,19,
+    71,13,71,19,33,34,67,55,63,34,67,34,67,74,82,19,
     83,19,83,13,83,115,35,0,0,0,158,5,36,2,164,7,
     46,9,173,1,46,9,190,8,65,7,2,193,7,7,65,26,
     9,193,14,2,65,21,9,193,21,5,65,26,9,41,46,114,


From webhook-mailer at python.org  Thu Aug 12 12:37:39 2021
From: webhook-mailer at python.org (pablogsal)
Date: Thu, 12 Aug 2021 16:37:39 -0000
Subject: [Python-checkins] Update pegen to use the latest upstream
 developments (GH-27586)
Message-ID: <mailman.1014.1628786260.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/953d27261e455066b17a106d9e07bab3bf12983b
commit: 953d27261e455066b17a106d9e07bab3bf12983b
branch: main
author: Pablo Galindo Salgado <Pablogsal at gmail.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-08-12T17:37:30+01:00
summary:

Update pegen to use the latest upstream developments (GH-27586)

files:
M Lib/test/test_peg_generator/test_c_parser.py
M Lib/test/test_peg_generator/test_first_sets.py
M Lib/test/test_peg_generator/test_grammar_validator.py
M Lib/test/test_peg_generator/test_pegen.py
M Parser/parser.c
M Parser/pegen.c
M Parser/pegen.h
M Tools/peg_generator/mypy.ini
M Tools/peg_generator/pegen/__main__.py
M Tools/peg_generator/pegen/ast_dump.py
M Tools/peg_generator/pegen/build.py
M Tools/peg_generator/pegen/c_generator.py
M Tools/peg_generator/pegen/first_sets.py
M Tools/peg_generator/pegen/grammar_parser.py
M Tools/peg_generator/pegen/keywordgen.py
M Tools/peg_generator/pegen/metagrammar.gram
M Tools/peg_generator/pegen/parser.py
M Tools/peg_generator/pegen/parser_generator.py
M Tools/peg_generator/pegen/python_generator.py
M Tools/peg_generator/pegen/testutil.py
M Tools/peg_generator/pegen/tokenizer.py
M Tools/peg_generator/pegen/validator.py
M Tools/peg_generator/scripts/benchmark.py
M Tools/peg_generator/scripts/download_pypi_packages.py
M Tools/peg_generator/scripts/grammar_grapher.py
M Tools/peg_generator/scripts/test_pypi_packages.py

diff --git a/Lib/test/test_peg_generator/test_c_parser.py b/Lib/test/test_peg_generator/test_c_parser.py
index 013b3afd594392..b761bd493f52c7 100644
--- a/Lib/test/test_peg_generator/test_c_parser.py
+++ b/Lib/test/test_peg_generator/test_c_parser.py
@@ -11,8 +11,8 @@
 from test.support import os_helper
 from test.support.script_helper import assert_python_ok
 
-_py_cflags_nodist = sysconfig.get_config_var('PY_CFLAGS_NODIST')
-_pgo_flag = sysconfig.get_config_var('PGO_PROF_USE_FLAG')
+_py_cflags_nodist = sysconfig.get_config_var("PY_CFLAGS_NODIST")
+_pgo_flag = sysconfig.get_config_var("PGO_PROF_USE_FLAG")
 if _pgo_flag and _py_cflags_nodist and _pgo_flag in _py_cflags_nodist:
     raise unittest.SkipTest("peg_generator test disabled under PGO build")
 
@@ -458,3 +458,28 @@ def test_soft_keywords_lookahead(self) -> None:
         self.check_input_strings_for_grammar(valid_cases, invalid_cases)
         """
         self.run_test(grammar_source, test_source)
+
+    def test_forced(self) -> None:
+        grammar_source = """
+        start: NAME &&':' | NAME
+        """
+        test_source = """
+        self.assertEqual(parse.parse_string("number :", mode=0), None)
+        with self.assertRaises(SyntaxError) as e:
+            parse.parse_string("a", mode=0)
+        self.assertIn("expected ':'", str(e.exception))
+        """
+        self.run_test(grammar_source, test_source)
+
+    def test_forced_with_group(self) -> None:
+        grammar_source = """
+        start: NAME &&(':' | ';') | NAME
+        """
+        test_source = """
+        self.assertEqual(parse.parse_string("number :", mode=0), None)
+        self.assertEqual(parse.parse_string("number ;", mode=0), None)
+        with self.assertRaises(SyntaxError) as e:
+            parse.parse_string("a", mode=0)
+        self.assertIn("expected (':' | ';')", e.exception.args[0])
+        """
+        self.run_test(grammar_source, test_source)
diff --git a/Lib/test/test_peg_generator/test_first_sets.py b/Lib/test/test_peg_generator/test_first_sets.py
index 425ee23aa1ab5d..d6f8322f034f74 100644
--- a/Lib/test/test_peg_generator/test_first_sets.py
+++ b/Lib/test/test_peg_generator/test_first_sets.py
@@ -3,8 +3,8 @@
 from test import test_tools
 from typing import Dict, Set
 
-test_tools.skip_if_missing('peg_generator')
-with test_tools.imports_under_tool('peg_generator'):
+test_tools.skip_if_missing("peg_generator")
+with test_tools.imports_under_tool("peg_generator"):
     from pegen.grammar_parser import GeneratedParser as GrammarParser
     from pegen.testutil import parse_string
     from pegen.first_sets import FirstSetCalculator
@@ -23,29 +23,38 @@ def test_alternatives(self) -> None:
             A: 'a' | '-'
             B: 'b' | '+'
         """
-        self.assertEqual(self.calculate_first_sets(grammar), {
-            "A": {"'a'", "'-'"},
-            "B": {"'+'", "'b'"},
-            "expr": {"'+'", "'a'", "'b'", "'-'"},
-            "start": {"'+'", "'a'", "'b'", "'-'"},
-        })
+        self.assertEqual(
+            self.calculate_first_sets(grammar),
+            {
+                "A": {"'a'", "'-'"},
+                "B": {"'+'", "'b'"},
+                "expr": {"'+'", "'a'", "'b'", "'-'"},
+                "start": {"'+'", "'a'", "'b'", "'-'"},
+            },
+        )
 
     def test_optionals(self) -> None:
         grammar = """
             start: expr NEWLINE
             expr: ['a'] ['b'] 'c'
         """
-        self.assertEqual(self.calculate_first_sets(grammar), {
-            "expr": {"'c'", "'a'", "'b'"},
-            "start": {"'c'", "'a'", "'b'"},
-        })
+        self.assertEqual(
+            self.calculate_first_sets(grammar),
+            {
+                "expr": {"'c'", "'a'", "'b'"},
+                "start": {"'c'", "'a'", "'b'"},
+            },
+        )
 
     def test_repeat_with_separator(self) -> None:
         grammar = """
         start: ','.thing+ NEWLINE
         thing: NUMBER
         """
-        self.assertEqual(self.calculate_first_sets(grammar), {"thing": {"NUMBER"}, "start": {"NUMBER"}})
+        self.assertEqual(
+            self.calculate_first_sets(grammar),
+            {"thing": {"NUMBER"}, "start": {"NUMBER"}},
+        )
 
     def test_optional_operator(self) -> None:
         grammar = """
@@ -53,11 +62,14 @@ def test_optional_operator(self) -> None:
         sum: (term)? 'b'
         term: NUMBER
         """
-        self.assertEqual(self.calculate_first_sets(grammar), {
-            "term": {"NUMBER"},
-            "sum": {"NUMBER", "'b'"},
-            "start": {"'b'", "NUMBER"},
-        })
+        self.assertEqual(
+            self.calculate_first_sets(grammar),
+            {
+                "term": {"NUMBER"},
+                "sum": {"NUMBER", "'b'"},
+                "start": {"'b'", "NUMBER"},
+            },
+        )
 
     def test_optional_literal(self) -> None:
         grammar = """
@@ -65,60 +77,83 @@ def test_optional_literal(self) -> None:
         sum: '+' ? term
         term: NUMBER
         """
-        self.assertEqual(self.calculate_first_sets(grammar), {
-            "term": {"NUMBER"},
-            "sum": {"'+'", "NUMBER"},
-            "start": {"'+'", "NUMBER"},
-        })
+        self.assertEqual(
+            self.calculate_first_sets(grammar),
+            {
+                "term": {"NUMBER"},
+                "sum": {"'+'", "NUMBER"},
+                "start": {"'+'", "NUMBER"},
+            },
+        )
 
     def test_optional_after(self) -> None:
         grammar = """
         start: term NEWLINE
         term: NUMBER ['+']
         """
-        self.assertEqual(self.calculate_first_sets(grammar), {"term": {"NUMBER"}, "start": {"NUMBER"}})
+        self.assertEqual(
+            self.calculate_first_sets(grammar),
+            {"term": {"NUMBER"}, "start": {"NUMBER"}},
+        )
 
     def test_optional_before(self) -> None:
         grammar = """
         start: term NEWLINE
         term: ['+'] NUMBER
         """
-        self.assertEqual(self.calculate_first_sets(grammar), {"term": {"NUMBER", "'+'"}, "start": {"NUMBER", "'+'"}})
+        self.assertEqual(
+            self.calculate_first_sets(grammar),
+            {"term": {"NUMBER", "'+'"}, "start": {"NUMBER", "'+'"}},
+        )
 
     def test_repeat_0(self) -> None:
         grammar = """
         start: thing* "+" NEWLINE
         thing: NUMBER
         """
-        self.assertEqual(self.calculate_first_sets(grammar), {"thing": {"NUMBER"}, "start": {'"+"', "NUMBER"}})
+        self.assertEqual(
+            self.calculate_first_sets(grammar),
+            {"thing": {"NUMBER"}, "start": {'"+"', "NUMBER"}},
+        )
 
     def test_repeat_0_with_group(self) -> None:
         grammar = """
         start: ('+' '-')* term NEWLINE
         term: NUMBER
         """
-        self.assertEqual(self.calculate_first_sets(grammar), {"term": {"NUMBER"}, "start": {"'+'", "NUMBER"}})
+        self.assertEqual(
+            self.calculate_first_sets(grammar),
+            {"term": {"NUMBER"}, "start": {"'+'", "NUMBER"}},
+        )
 
     def test_repeat_1(self) -> None:
         grammar = """
         start: thing+ '-' NEWLINE
         thing: NUMBER
         """
-        self.assertEqual(self.calculate_first_sets(grammar), {"thing": {"NUMBER"}, "start": {"NUMBER"}})
+        self.assertEqual(
+            self.calculate_first_sets(grammar),
+            {"thing": {"NUMBER"}, "start": {"NUMBER"}},
+        )
 
     def test_repeat_1_with_group(self) -> None:
         grammar = """
         start: ('+' term)+ term NEWLINE
         term: NUMBER
         """
-        self.assertEqual(self.calculate_first_sets(grammar), {"term": {"NUMBER"}, "start": {"'+'"}})
+        self.assertEqual(
+            self.calculate_first_sets(grammar), {"term": {"NUMBER"}, "start": {"'+'"}}
+        )
 
     def test_gather(self) -> None:
         grammar = """
         start: ','.thing+ NEWLINE
         thing: NUMBER
         """
-        self.assertEqual(self.calculate_first_sets(grammar), {"thing": {"NUMBER"}, "start": {"NUMBER"}})
+        self.assertEqual(
+            self.calculate_first_sets(grammar),
+            {"thing": {"NUMBER"}, "start": {"NUMBER"}},
+        )
 
     def test_positive_lookahead(self) -> None:
         grammar = """
@@ -126,11 +161,14 @@ def test_positive_lookahead(self) -> None:
         expr: &'a' opt
         opt: 'a' | 'b' | 'c'
         """
-        self.assertEqual(self.calculate_first_sets(grammar), {
-            "expr": {"'a'"},
-            "start": {"'a'"},
-            "opt": {"'b'", "'c'", "'a'"},
-        })
+        self.assertEqual(
+            self.calculate_first_sets(grammar),
+            {
+                "expr": {"'a'"},
+                "start": {"'a'"},
+                "opt": {"'b'", "'c'", "'a'"},
+            },
+        )
 
     def test_negative_lookahead(self) -> None:
         grammar = """
@@ -138,11 +176,14 @@ def test_negative_lookahead(self) -> None:
         expr: !'a' opt
         opt: 'a' | 'b' | 'c'
         """
-        self.assertEqual(self.calculate_first_sets(grammar), {
-            "opt": {"'b'", "'a'", "'c'"},
-            "expr": {"'b'", "'c'"},
-            "start": {"'b'", "'c'"},
-        })
+        self.assertEqual(
+            self.calculate_first_sets(grammar),
+            {
+                "opt": {"'b'", "'a'", "'c'"},
+                "expr": {"'b'", "'c'"},
+                "start": {"'b'", "'c'"},
+            },
+        )
 
     def test_left_recursion(self) -> None:
         grammar = """
@@ -153,21 +194,27 @@ def test_left_recursion(self) -> None:
         bar: 'bar'
         baz: 'baz'
         """
-        self.assertEqual(self.calculate_first_sets(grammar), {
-            "expr": {"NUMBER", "'-'"},
-            "term": {"NUMBER"},
-            "start": {"NUMBER", "'-'"},
-            "foo": {"'foo'"},
-            "bar": {"'bar'"},
-            "baz": {"'baz'"},
-        })
+        self.assertEqual(
+            self.calculate_first_sets(grammar),
+            {
+                "expr": {"NUMBER", "'-'"},
+                "term": {"NUMBER"},
+                "start": {"NUMBER", "'-'"},
+                "foo": {"'foo'"},
+                "bar": {"'bar'"},
+                "baz": {"'baz'"},
+            },
+        )
 
     def test_advance_left_recursion(self) -> None:
         grammar = """
         start: NUMBER | sign start
         sign: ['-']
         """
-        self.assertEqual(self.calculate_first_sets(grammar), {"sign": {"'-'", ""}, "start": {"'-'", "NUMBER"}})
+        self.assertEqual(
+            self.calculate_first_sets(grammar),
+            {"sign": {"'-'", ""}, "start": {"'-'", "NUMBER"}},
+        )
 
     def test_mutual_left_recursion(self) -> None:
         grammar = """
@@ -175,11 +222,14 @@ def test_mutual_left_recursion(self) -> None:
         foo: bar 'A' | 'B'
         bar: foo 'C' | 'D'
         """
-        self.assertEqual(self.calculate_first_sets(grammar), {
-            "foo": {"'D'", "'B'"},
-            "bar": {"'D'"},
-            "start": {"'D'", "'B'"},
-        })
+        self.assertEqual(
+            self.calculate_first_sets(grammar),
+            {
+                "foo": {"'D'", "'B'"},
+                "bar": {"'D'"},
+                "start": {"'D'", "'B'"},
+            },
+        )
 
     def test_nasty_left_recursion(self) -> None:
         # TODO: Validate this
@@ -188,7 +238,10 @@ def test_nasty_left_recursion(self) -> None:
         target: maybe '+' | NAME
         maybe: maybe '-' | target
         """
-        self.assertEqual(self.calculate_first_sets(grammar), {"maybe": set(), "target": {"NAME"}, "start": {"NAME"}})
+        self.assertEqual(
+            self.calculate_first_sets(grammar),
+            {"maybe": set(), "target": {"NAME"}, "start": {"NAME"}},
+        )
 
     def test_nullable_rule(self) -> None:
         grammar = """
@@ -196,17 +249,22 @@ def test_nullable_rule(self) -> None:
         sign: ['-']
         thing: NUMBER
         """
-        self.assertEqual(self.calculate_first_sets(grammar), {
-            "sign": {"", "'-'"},
-            "thing": {"NUMBER"},
-            "start": {"NUMBER", "'-'"},
-        })
+        self.assertEqual(
+            self.calculate_first_sets(grammar),
+            {
+                "sign": {"", "'-'"},
+                "thing": {"NUMBER"},
+                "start": {"NUMBER", "'-'"},
+            },
+        )
 
     def test_epsilon_production_in_start_rule(self) -> None:
         grammar = """
         start: ['-'] $
         """
-        self.assertEqual(self.calculate_first_sets(grammar), {"start": {"ENDMARKER", "'-'"}})
+        self.assertEqual(
+            self.calculate_first_sets(grammar), {"start": {"ENDMARKER", "'-'"}}
+        )
 
     def test_multiple_nullable_rules(self) -> None:
         grammar = """
@@ -216,10 +274,13 @@ def test_multiple_nullable_rules(self) -> None:
         other: '*'
         another: '/'
         """
-        self.assertEqual(self.calculate_first_sets(grammar), {
-            "sign": {"", "'-'"},
-            "thing": {"'+'", ""},
-            "start": {"'+'", "'-'", "'*'"},
-            "other": {"'*'"},
-            "another": {"'/'"},
-        })
+        self.assertEqual(
+            self.calculate_first_sets(grammar),
+            {
+                "sign": {"", "'-'"},
+                "thing": {"'+'", ""},
+                "start": {"'+'", "'-'", "'*'"},
+                "other": {"'*'"},
+                "another": {"'/'"},
+            },
+        )
diff --git a/Lib/test/test_peg_generator/test_grammar_validator.py b/Lib/test/test_peg_generator/test_grammar_validator.py
index 2e72ff8df280ba..72c3d2054fa8f9 100644
--- a/Lib/test/test_peg_generator/test_grammar_validator.py
+++ b/Lib/test/test_peg_generator/test_grammar_validator.py
@@ -1,8 +1,8 @@
 import unittest
 from test import test_tools
 
-test_tools.skip_if_missing('peg_generator')
-with test_tools.imports_under_tool('peg_generator'):
+test_tools.skip_if_missing("peg_generator")
+with test_tools.imports_under_tool("peg_generator"):
     from pegen.grammar_parser import GeneratedParser as GrammarParser
     from pegen.validator import SubRuleValidator, ValidationError
     from pegen.testutil import parse_string
diff --git a/Lib/test/test_peg_generator/test_pegen.py b/Lib/test/test_peg_generator/test_pegen.py
index bcfee3f2c5f8c3..71b0fdc56465bf 100644
--- a/Lib/test/test_peg_generator/test_pegen.py
+++ b/Lib/test/test_peg_generator/test_pegen.py
@@ -1,3 +1,5 @@
+import ast
+import difflib
 import io
 import textwrap
 import unittest
@@ -6,14 +8,10 @@
 from typing import Dict, Any
 from tokenize import TokenInfo, NAME, NEWLINE, NUMBER, OP
 
-test_tools.skip_if_missing('peg_generator')
-with test_tools.imports_under_tool('peg_generator'):
+test_tools.skip_if_missing("peg_generator")
+with test_tools.imports_under_tool("peg_generator"):
     from pegen.grammar_parser import GeneratedParser as GrammarParser
-    from pegen.testutil import (
-        parse_string,
-        generate_parser,
-        make_parser
-    )
+    from pegen.testutil import parse_string, generate_parser, make_parser
     from pegen.grammar import GrammarVisitor, GrammarError, Grammar
     from pegen.grammar_visualizer import ASTGrammarPrinter
     from pegen.parser import Parser
@@ -38,7 +36,9 @@ def test_parse_grammar(self) -> None:
         # Check the str() and repr() of a few rules; AST nodes don't support ==.
         self.assertEqual(str(rules["start"]), "start: sum NEWLINE")
         self.assertEqual(str(rules["sum"]), "sum: term '+' term | term")
-        expected_repr = "Rule('term', None, Rhs([Alt([NamedItem(None, NameLeaf('NUMBER'))])]))"
+        expected_repr = (
+            "Rule('term', None, Rhs([Alt([NamedItem(None, NameLeaf('NUMBER'))])]))"
+        )
         self.assertEqual(repr(rules["term"]), expected_repr)
 
     def test_long_rule_str(self) -> None:
@@ -71,7 +71,7 @@ def test_typed_rules(self) -> None:
         self.assertEqual(str(rules["sum"]), "sum: term '+' term | term")
         self.assertEqual(
             repr(rules["term"]),
-            "Rule('term', 'int', Rhs([Alt([NamedItem(None, NameLeaf('NUMBER'))])]))"
+            "Rule('term', 'int', Rhs([Alt([NamedItem(None, NameLeaf('NUMBER'))])]))",
         )
 
     def test_gather(self) -> None:
@@ -81,24 +81,31 @@ def test_gather(self) -> None:
         """
         rules = parse_string(grammar, GrammarParser).rules
         self.assertEqual(str(rules["start"]), "start: ','.thing+ NEWLINE")
-        self.assertTrue(repr(rules["start"]).startswith(
-            "Rule('start', None, Rhs([Alt([NamedItem(None, Gather(StringLeaf(\"','\"), NameLeaf('thing'"
-        ))
+        self.assertTrue(
+            repr(rules["start"]).startswith(
+                "Rule('start', None, Rhs([Alt([NamedItem(None, Gather(StringLeaf(\"','\"), NameLeaf('thing'"
+            )
+        )
         self.assertEqual(str(rules["thing"]), "thing: NUMBER")
         parser_class = make_parser(grammar)
         node = parse_string("42\n", parser_class)
-        assert node == [
-            [[TokenInfo(NUMBER, string="42", start=(1, 0), end=(1, 2), line="42\n")]],
-            TokenInfo(NEWLINE, string="\n", start=(1, 2), end=(1, 3), line="42\n"),
-        ]
         node = parse_string("1, 2\n", parser_class)
-        assert node == [
+        self.assertEqual(
+            node,
             [
-                [TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1, 2\n")],
-                [TokenInfo(NUMBER, string="2", start=(1, 3), end=(1, 4), line="1, 2\n")],
+                [
+                    TokenInfo(
+                        NUMBER, string="1", start=(1, 0), end=(1, 1), line="1, 2\n"
+                    ),
+                    TokenInfo(
+                        NUMBER, string="2", start=(1, 3), end=(1, 4), line="1, 2\n"
+                    ),
+                ],
+                TokenInfo(
+                    NEWLINE, string="\n", start=(1, 4), end=(1, 5), line="1, 2\n"
+                ),
             ],
-            TokenInfo(NEWLINE, string="\n", start=(1, 4), end=(1, 5), line="1, 2\n"),
-        ]
+        )
 
     def test_expr_grammar(self) -> None:
         grammar = """
@@ -108,10 +115,13 @@ def test_expr_grammar(self) -> None:
         """
         parser_class = make_parser(grammar)
         node = parse_string("42\n", parser_class)
-        self.assertEqual(node, [
-            [[TokenInfo(NUMBER, string="42", start=(1, 0), end=(1, 2), line="42\n")]],
-            TokenInfo(NEWLINE, string="\n", start=(1, 2), end=(1, 3), line="42\n"),
-        ])
+        self.assertEqual(
+            node,
+            [
+                TokenInfo(NUMBER, string="42", start=(1, 0), end=(1, 2), line="42\n"),
+                TokenInfo(NEWLINE, string="\n", start=(1, 2), end=(1, 3), line="42\n"),
+            ],
+        )
 
     def test_optional_operator(self) -> None:
         grammar = """
@@ -120,22 +130,39 @@ def test_optional_operator(self) -> None:
         term: NUMBER
         """
         parser_class = make_parser(grammar)
-        node = parse_string("1+2\n", parser_class)
-        self.assertEqual(node, [
+        node = parse_string("1 + 2\n", parser_class)
+        self.assertEqual(
+            node,
             [
-                [TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1+2\n")],
                 [
-                    TokenInfo(OP, string="+", start=(1, 1), end=(1, 2), line="1+2\n"),
-                    [TokenInfo(NUMBER, string="2", start=(1, 2), end=(1, 3), line="1+2\n")],
+                    TokenInfo(
+                        NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 + 2\n"
+                    ),
+                    [
+                        TokenInfo(
+                            OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2\n"
+                        ),
+                        TokenInfo(
+                            NUMBER, string="2", start=(1, 4), end=(1, 5), line="1 + 2\n"
+                        ),
+                    ],
                 ],
+                TokenInfo(
+                    NEWLINE, string="\n", start=(1, 5), end=(1, 6), line="1 + 2\n"
+                ),
             ],
-            TokenInfo(NEWLINE, string="\n", start=(1, 3), end=(1, 4), line="1+2\n"),
-        ])
+        )
         node = parse_string("1\n", parser_class)
-        self.assertEqual(node, [
-            [[TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1\n")], None],
-            TokenInfo(NEWLINE, string="\n", start=(1, 1), end=(1, 2), line="1\n"),
-        ])
+        self.assertEqual(
+            node,
+            [
+                [
+                    TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1\n"),
+                    None,
+                ],
+                TokenInfo(NEWLINE, string="\n", start=(1, 1), end=(1, 2), line="1\n"),
+            ],
+        )
 
     def test_optional_literal(self) -> None:
         grammar = """
@@ -145,18 +172,29 @@ def test_optional_literal(self) -> None:
         """
         parser_class = make_parser(grammar)
         node = parse_string("1+\n", parser_class)
-        self.assertEqual(node, [
+        self.assertEqual(
+            node,
             [
-                [TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1+\n")],
-                TokenInfo(OP, string="+", start=(1, 1), end=(1, 2), line="1+\n"),
+                [
+                    TokenInfo(
+                        NUMBER, string="1", start=(1, 0), end=(1, 1), line="1+\n"
+                    ),
+                    TokenInfo(OP, string="+", start=(1, 1), end=(1, 2), line="1+\n"),
+                ],
+                TokenInfo(NEWLINE, string="\n", start=(1, 2), end=(1, 3), line="1+\n"),
             ],
-            TokenInfo(NEWLINE, string="\n", start=(1, 2), end=(1, 3), line="1+\n"),
-        ])
+        )
         node = parse_string("1\n", parser_class)
-        self.assertEqual(node, [
-            [[TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1\n")], None],
-            TokenInfo(NEWLINE, string="\n", start=(1, 1), end=(1, 2), line="1\n"),
-        ])
+        self.assertEqual(
+            node,
+            [
+                [
+                    TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1\n"),
+                    None,
+                ],
+                TokenInfo(NEWLINE, string="\n", start=(1, 1), end=(1, 2), line="1\n"),
+            ],
+        )
 
     def test_alt_optional_operator(self) -> None:
         grammar = """
@@ -166,21 +204,38 @@ def test_alt_optional_operator(self) -> None:
         """
         parser_class = make_parser(grammar)
         node = parse_string("1 + 2\n", parser_class)
-        self.assertEqual(node, [
+        self.assertEqual(
+            node,
             [
-                [TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 + 2\n")],
                 [
-                    TokenInfo(OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2\n"),
-                    [TokenInfo(NUMBER, string="2", start=(1, 4), end=(1, 5), line="1 + 2\n")],
+                    TokenInfo(
+                        NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 + 2\n"
+                    ),
+                    [
+                        TokenInfo(
+                            OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2\n"
+                        ),
+                        TokenInfo(
+                            NUMBER, string="2", start=(1, 4), end=(1, 5), line="1 + 2\n"
+                        ),
+                    ],
                 ],
+                TokenInfo(
+                    NEWLINE, string="\n", start=(1, 5), end=(1, 6), line="1 + 2\n"
+                ),
             ],
-            TokenInfo(NEWLINE, string="\n", start=(1, 5), end=(1, 6), line="1 + 2\n"),
-        ])
+        )
         node = parse_string("1\n", parser_class)
-        self.assertEqual(node, [
-            [[TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1\n")], None],
-            TokenInfo(NEWLINE, string="\n", start=(1, 1), end=(1, 2), line="1\n"),
-        ])
+        self.assertEqual(
+            node,
+            [
+                [
+                    TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1\n"),
+                    None,
+                ],
+                TokenInfo(NEWLINE, string="\n", start=(1, 1), end=(1, 2), line="1\n"),
+            ],
+        )
 
     def test_repeat_0_simple(self) -> None:
         grammar = """
@@ -189,20 +244,32 @@ def test_repeat_0_simple(self) -> None:
         """
         parser_class = make_parser(grammar)
         node = parse_string("1 2 3\n", parser_class)
-        self.assertEqual(node, [
-            [TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 2 3\n")],
+        self.assertEqual(
+            node,
             [
-                [[TokenInfo(NUMBER, string="2", start=(1, 2), end=(1, 3), line="1 2 3\n")]],
-                [[TokenInfo(NUMBER, string="3", start=(1, 4), end=(1, 5), line="1 2 3\n")]],
+                TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 2 3\n"),
+                [
+                    TokenInfo(
+                        NUMBER, string="2", start=(1, 2), end=(1, 3), line="1 2 3\n"
+                    ),
+                    TokenInfo(
+                        NUMBER, string="3", start=(1, 4), end=(1, 5), line="1 2 3\n"
+                    ),
+                ],
+                TokenInfo(
+                    NEWLINE, string="\n", start=(1, 5), end=(1, 6), line="1 2 3\n"
+                ),
             ],
-            TokenInfo(NEWLINE, string="\n", start=(1, 5), end=(1, 6), line="1 2 3\n"),
-        ])
+        )
         node = parse_string("1\n", parser_class)
-        self.assertEqual(node, [
-            [TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1\n")],
-            [],
-            TokenInfo(NEWLINE, string="\n", start=(1, 1), end=(1, 2), line="1\n"),
-        ])
+        self.assertEqual(
+            node,
+            [
+                TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1\n"),
+                [],
+                TokenInfo(NEWLINE, string="\n", start=(1, 1), end=(1, 2), line="1\n"),
+            ],
+        )
 
     def test_repeat_0_complex(self) -> None:
         grammar = """
@@ -211,24 +278,43 @@ def test_repeat_0_complex(self) -> None:
         """
         parser_class = make_parser(grammar)
         node = parse_string("1 + 2 + 3\n", parser_class)
-        self.assertEqual(node, [
-            [TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 + 2 + 3\n")],
+        self.assertEqual(
+            node,
             [
+                TokenInfo(
+                    NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 + 2 + 3\n"
+                ),
                 [
                     [
-                        TokenInfo(OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2 + 3\n"),
-                        [TokenInfo(NUMBER, string="2", start=(1, 4), end=(1, 5), line="1 + 2 + 3\n")],
-                    ]
-                ],
-                [
+                        TokenInfo(
+                            OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2 + 3\n"
+                        ),
+                        TokenInfo(
+                            NUMBER,
+                            string="2",
+                            start=(1, 4),
+                            end=(1, 5),
+                            line="1 + 2 + 3\n",
+                        ),
+                    ],
                     [
-                        TokenInfo(OP, string="+", start=(1, 6), end=(1, 7), line="1 + 2 + 3\n"),
-                        [TokenInfo(NUMBER, string="3", start=(1, 8), end=(1, 9), line="1 + 2 + 3\n")],
-                    ]
+                        TokenInfo(
+                            OP, string="+", start=(1, 6), end=(1, 7), line="1 + 2 + 3\n"
+                        ),
+                        TokenInfo(
+                            NUMBER,
+                            string="3",
+                            start=(1, 8),
+                            end=(1, 9),
+                            line="1 + 2 + 3\n",
+                        ),
+                    ],
                 ],
+                TokenInfo(
+                    NEWLINE, string="\n", start=(1, 9), end=(1, 10), line="1 + 2 + 3\n"
+                ),
             ],
-            TokenInfo(NEWLINE, string="\n", start=(1, 9), end=(1, 10), line="1 + 2 + 3\n"),
-        ])
+        )
 
     def test_repeat_1_simple(self) -> None:
         grammar = """
@@ -237,14 +323,23 @@ def test_repeat_1_simple(self) -> None:
         """
         parser_class = make_parser(grammar)
         node = parse_string("1 2 3\n", parser_class)
-        self.assertEqual(node, [
-            [TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 2 3\n")],
+        self.assertEqual(
+            node,
             [
-                [[TokenInfo(NUMBER, string="2", start=(1, 2), end=(1, 3), line="1 2 3\n")]],
-                [[TokenInfo(NUMBER, string="3", start=(1, 4), end=(1, 5), line="1 2 3\n")]],
+                TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 2 3\n"),
+                [
+                    TokenInfo(
+                        NUMBER, string="2", start=(1, 2), end=(1, 3), line="1 2 3\n"
+                    ),
+                    TokenInfo(
+                        NUMBER, string="3", start=(1, 4), end=(1, 5), line="1 2 3\n"
+                    ),
+                ],
+                TokenInfo(
+                    NEWLINE, string="\n", start=(1, 5), end=(1, 6), line="1 2 3\n"
+                ),
             ],
-            TokenInfo(NEWLINE, string="\n", start=(1, 5), end=(1, 6), line="1 2 3\n"),
-        ])
+        )
         with self.assertRaises(SyntaxError):
             parse_string("1\n", parser_class)
 
@@ -255,24 +350,43 @@ def test_repeat_1_complex(self) -> None:
         """
         parser_class = make_parser(grammar)
         node = parse_string("1 + 2 + 3\n", parser_class)
-        self.assertEqual(node, [
-            [TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 + 2 + 3\n")],
+        self.assertEqual(
+            node,
             [
+                TokenInfo(
+                    NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 + 2 + 3\n"
+                ),
                 [
                     [
-                        TokenInfo(OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2 + 3\n"),
-                        [TokenInfo(NUMBER, string="2", start=(1, 4), end=(1, 5), line="1 + 2 + 3\n")],
-                    ]
-                ],
-                [
+                        TokenInfo(
+                            OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2 + 3\n"
+                        ),
+                        TokenInfo(
+                            NUMBER,
+                            string="2",
+                            start=(1, 4),
+                            end=(1, 5),
+                            line="1 + 2 + 3\n",
+                        ),
+                    ],
                     [
-                        TokenInfo(OP, string="+", start=(1, 6), end=(1, 7), line="1 + 2 + 3\n"),
-                        [TokenInfo(NUMBER, string="3", start=(1, 8), end=(1, 9), line="1 + 2 + 3\n")],
-                    ]
+                        TokenInfo(
+                            OP, string="+", start=(1, 6), end=(1, 7), line="1 + 2 + 3\n"
+                        ),
+                        TokenInfo(
+                            NUMBER,
+                            string="3",
+                            start=(1, 8),
+                            end=(1, 9),
+                            line="1 + 2 + 3\n",
+                        ),
+                    ],
                 ],
+                TokenInfo(
+                    NEWLINE, string="\n", start=(1, 9), end=(1, 10), line="1 + 2 + 3\n"
+                ),
             ],
-            TokenInfo(NEWLINE, string="\n", start=(1, 9), end=(1, 10), line="1 + 2 + 3\n"),
-        ])
+        )
         with self.assertRaises(SyntaxError):
             parse_string("1\n", parser_class)
 
@@ -283,14 +397,25 @@ def test_repeat_with_sep_simple(self) -> None:
         """
         parser_class = make_parser(grammar)
         node = parse_string("1, 2, 3\n", parser_class)
-        self.assertEqual(node, [
+        self.assertEqual(
+            node,
             [
-                [TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1, 2, 3\n")],
-                [TokenInfo(NUMBER, string="2", start=(1, 3), end=(1, 4), line="1, 2, 3\n")],
-                [TokenInfo(NUMBER, string="3", start=(1, 6), end=(1, 7), line="1, 2, 3\n")],
+                [
+                    TokenInfo(
+                        NUMBER, string="1", start=(1, 0), end=(1, 1), line="1, 2, 3\n"
+                    ),
+                    TokenInfo(
+                        NUMBER, string="2", start=(1, 3), end=(1, 4), line="1, 2, 3\n"
+                    ),
+                    TokenInfo(
+                        NUMBER, string="3", start=(1, 6), end=(1, 7), line="1, 2, 3\n"
+                    ),
+                ],
+                TokenInfo(
+                    NEWLINE, string="\n", start=(1, 7), end=(1, 8), line="1, 2, 3\n"
+                ),
             ],
-            TokenInfo(NEWLINE, string="\n", start=(1, 7), end=(1, 8), line="1, 2, 3\n"),
-        ])
+        )
 
     def test_left_recursive(self) -> None:
         grammar_source = """
@@ -311,18 +436,41 @@ def test_left_recursive(self) -> None:
         self.assertFalse(rules["bar"].left_recursive)
         self.assertFalse(rules["baz"].left_recursive)
         node = parse_string("1 + 2 + 3\n", parser_class)
-        self.assertEqual(node, [
+        self.assertEqual(
+            node,
             [
                 [
-                    [[TokenInfo(NUMBER, string="1", start=(1, 0), end=(1, 1), line="1 + 2 + 3\n")]],
-                    TokenInfo(OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2 + 3\n"),
-                    [TokenInfo(NUMBER, string="2", start=(1, 4), end=(1, 5), line="1 + 2 + 3\n")],
+                    [
+                        TokenInfo(
+                            NUMBER,
+                            string="1",
+                            start=(1, 0),
+                            end=(1, 1),
+                            line="1 + 2 + 3\n",
+                        ),
+                        TokenInfo(
+                            OP, string="+", start=(1, 2), end=(1, 3), line="1 + 2 + 3\n"
+                        ),
+                        TokenInfo(
+                            NUMBER,
+                            string="2",
+                            start=(1, 4),
+                            end=(1, 5),
+                            line="1 + 2 + 3\n",
+                        ),
+                    ],
+                    TokenInfo(
+                        OP, string="+", start=(1, 6), end=(1, 7), line="1 + 2 + 3\n"
+                    ),
+                    TokenInfo(
+                        NUMBER, string="3", start=(1, 8), end=(1, 9), line="1 + 2 + 3\n"
+                    ),
                 ],
-                TokenInfo(OP, string="+", start=(1, 6), end=(1, 7), line="1 + 2 + 3\n"),
-                [TokenInfo(NUMBER, string="3", start=(1, 8), end=(1, 9), line="1 + 2 + 3\n")],
+                TokenInfo(
+                    NEWLINE, string="\n", start=(1, 9), end=(1, 10), line="1 + 2 + 3\n"
+                ),
             ],
-            TokenInfo(NEWLINE, string="\n", start=(1, 9), end=(1, 10), line="1 + 2 + 3\n"),
-        ])
+        )
 
     def test_python_expr(self) -> None:
         grammar = """
@@ -392,31 +540,79 @@ def test_mutually_left_recursive(self) -> None:
         exec(out.getvalue(), ns)
         parser_class: Type[Parser] = ns["GeneratedParser"]
         node = parse_string("D A C A E", parser_class)
-        self.assertEqual(node, [
+
+        self.assertEqual(
+            node,
             [
                 [
                     [
-                        [TokenInfo(type=NAME, string="D", start=(1, 0), end=(1, 1), line="D A C A E")],
-                        TokenInfo(type=NAME, string="A", start=(1, 2), end=(1, 3), line="D A C A E"),
+                        [
+                            TokenInfo(
+                                type=NAME,
+                                string="D",
+                                start=(1, 0),
+                                end=(1, 1),
+                                line="D A C A E",
+                            ),
+                            TokenInfo(
+                                type=NAME,
+                                string="A",
+                                start=(1, 2),
+                                end=(1, 3),
+                                line="D A C A E",
+                            ),
+                        ],
+                        TokenInfo(
+                            type=NAME,
+                            string="C",
+                            start=(1, 4),
+                            end=(1, 5),
+                            line="D A C A E",
+                        ),
                     ],
-                    TokenInfo(type=NAME, string="C", start=(1, 4), end=(1, 5), line="D A C A E"),
+                    TokenInfo(
+                        type=NAME,
+                        string="A",
+                        start=(1, 6),
+                        end=(1, 7),
+                        line="D A C A E",
+                    ),
                 ],
-                TokenInfo(type=NAME, string="A", start=(1, 6), end=(1, 7), line="D A C A E"),
+                TokenInfo(
+                    type=NAME, string="E", start=(1, 8), end=(1, 9), line="D A C A E"
+                ),
             ],
-            TokenInfo(type=NAME, string="E", start=(1, 8), end=(1, 9), line="D A C A E"),
-        ])
+        )
         node = parse_string("B C A E", parser_class)
-        self.assertIsNotNone(node)
-        self.assertEqual(node, [
+        self.assertEqual(
+            node,
             [
                 [
-                    [TokenInfo(type=NAME, string="B", start=(1, 0), end=(1, 1), line="B C A E")],
-                    TokenInfo(type=NAME, string="C", start=(1, 2), end=(1, 3), line="B C A E"),
+                    [
+                        TokenInfo(
+                            type=NAME,
+                            string="B",
+                            start=(1, 0),
+                            end=(1, 1),
+                            line="B C A E",
+                        ),
+                        TokenInfo(
+                            type=NAME,
+                            string="C",
+                            start=(1, 2),
+                            end=(1, 3),
+                            line="B C A E",
+                        ),
+                    ],
+                    TokenInfo(
+                        type=NAME, string="A", start=(1, 4), end=(1, 5), line="B C A E"
+                    ),
                 ],
-                TokenInfo(type=NAME, string="A", start=(1, 4), end=(1, 5), line="B C A E"),
+                TokenInfo(
+                    type=NAME, string="E", start=(1, 6), end=(1, 7), line="B C A E"
+                ),
             ],
-            TokenInfo(type=NAME, string="E", start=(1, 6), end=(1, 7), line="B C A E"),
-        ])
+        )
 
     def test_nasty_mutually_left_recursive(self) -> None:
         # This grammar does not recognize 'x - + =', much to my chagrin.
@@ -454,43 +650,44 @@ def test_lookahead(self) -> None:
         """
         parser_class = make_parser(grammar)
         node = parse_string("foo = 12 + 12 .", parser_class)
-        self.assertEqual(node, [
+        self.assertEqual(
+            node,
             [
+                TokenInfo(
+                    NAME, string="foo", start=(1, 0), end=(1, 3), line="foo = 12 + 12 ."
+                ),
+                TokenInfo(
+                    OP, string="=", start=(1, 4), end=(1, 5), line="foo = 12 + 12 ."
+                ),
                 [
-                    [TokenInfo(NAME, string="foo", start=(1, 0), end=(1, 3), line="foo = 12 + 12 .")],
-                    TokenInfo(OP, string="=", start=(1, 4), end=(1, 5), line="foo = 12 + 12 ."),
+                    TokenInfo(
+                        NUMBER,
+                        string="12",
+                        start=(1, 6),
+                        end=(1, 8),
+                        line="foo = 12 + 12 .",
+                    ),
                     [
                         [
                             TokenInfo(
-                                NUMBER, string="12", start=(1, 6), end=(1, 8), line="foo = 12 + 12 ."
-                            )
-                        ],
-                        [
-                            [
-                                [
-                                    TokenInfo(
-                                        OP,
-                                        string="+",
-                                        start=(1, 9),
-                                        end=(1, 10),
-                                        line="foo = 12 + 12 .",
-                                    ),
-                                    [
-                                        TokenInfo(
-                                            NUMBER,
-                                            string="12",
-                                            start=(1, 11),
-                                            end=(1, 13),
-                                            line="foo = 12 + 12 .",
-                                        )
-                                    ],
-                                ]
-                            ]
-                        ],
+                                OP,
+                                string="+",
+                                start=(1, 9),
+                                end=(1, 10),
+                                line="foo = 12 + 12 .",
+                            ),
+                            TokenInfo(
+                                NUMBER,
+                                string="12",
+                                start=(1, 11),
+                                end=(1, 13),
+                                line="foo = 12 + 12 .",
+                            ),
+                        ]
                     ],
-                ]
-            ]
-        ])
+                ],
+            ],
+        )
 
     def test_named_lookahead_error(self) -> None:
         grammar = """
@@ -533,11 +730,14 @@ def test_cut(self) -> None:
         """
         parser_class = make_parser(grammar)
         node = parse_string("(1)", parser_class)
-        self.assertEqual(node, [
-            TokenInfo(OP, string="(", start=(1, 0), end=(1, 1), line="(1)"),
-            [TokenInfo(NUMBER, string="1", start=(1, 1), end=(1, 2), line="(1)")],
-            TokenInfo(OP, string=")", start=(1, 2), end=(1, 3), line="(1)"),
-        ])
+        self.assertEqual(
+            node,
+            [
+                TokenInfo(OP, string="(", start=(1, 0), end=(1, 1), line="(1)"),
+                TokenInfo(NUMBER, string="1", start=(1, 1), end=(1, 2), line="(1)"),
+                TokenInfo(OP, string=")", start=(1, 2), end=(1, 3), line="(1)"),
+            ],
+        )
 
     def test_dangling_reference(self) -> None:
         grammar = """
@@ -589,6 +789,124 @@ def test_invalid_variable_name_in_temporal_rule(self) -> None:
         with self.assertRaisesRegex(GrammarError, "cannot start with underscore: '_x'"):
             parser_class = make_parser(grammar)
 
+    def test_soft_keyword(self) -> None:
+        grammar = """
+        start:
+            | "number" n=NUMBER { eval(n.string) }
+            | "string" n=STRING { n.string }
+            | SOFT_KEYWORD l=NAME n=(NUMBER | NAME | STRING) { f"{l.string} = {n.string}"}
+        """
+        parser_class = make_parser(grammar)
+        self.assertEqual(parse_string("number 1", parser_class, verbose=True), 1)
+        self.assertEqual(parse_string("string 'b'", parser_class, verbose=True), "'b'")
+        self.assertEqual(
+            parse_string("number test 1", parser_class, verbose=True), "test = 1"
+        )
+        assert (
+            parse_string("string test 'b'", parser_class, verbose=True) == "test = 'b'"
+        )
+        with self.assertRaises(SyntaxError):
+            parse_string("test 1", parser_class, verbose=True)
+
+    def test_forced(self) -> None:
+        grammar = """
+        start: NAME &&':' | NAME
+        """
+        parser_class = make_parser(grammar)
+        self.assertTrue(parse_string("number :", parser_class, verbose=True))
+        with self.assertRaises(SyntaxError) as e:
+            parse_string("a", parser_class, verbose=True)
+
+        self.assertIn("expected ':'", str(e.exception))
+
+    def test_forced_with_group(self) -> None:
+        grammar = """
+        start: NAME &&(':' | ';') | NAME
+        """
+        parser_class = make_parser(grammar)
+        self.assertTrue(parse_string("number :", parser_class, verbose=True))
+        self.assertTrue(parse_string("number ;", parser_class, verbose=True))
+        with self.assertRaises(SyntaxError) as e:
+            parse_string("a", parser_class, verbose=True)
+        self.assertIn("expected (':' | ';')", e.exception.args[0])
+
+    def test_unreachable_explicit(self) -> None:
+        source = """
+        start: NAME { UNREACHABLE }
+        """
+        grammar = parse_string(source, GrammarParser)
+        out = io.StringIO()
+        genr = PythonParserGenerator(
+            grammar, out, unreachable_formatting="This is a test"
+        )
+        genr.generate("<string>")
+        self.assertIn("This is a test", out.getvalue())
+
+    def test_unreachable_implicit1(self) -> None:
+        source = """
+        start: NAME | invalid_input
+        invalid_input: NUMBER { None }
+        """
+        grammar = parse_string(source, GrammarParser)
+        out = io.StringIO()
+        genr = PythonParserGenerator(
+            grammar, out, unreachable_formatting="This is a test"
+        )
+        genr.generate("<string>")
+        self.assertIn("This is a test", out.getvalue())
+
+    def test_unreachable_implicit2(self) -> None:
+        source = """
+        start: NAME | '(' invalid_input ')'
+        invalid_input: NUMBER { None }
+        """
+        grammar = parse_string(source, GrammarParser)
+        out = io.StringIO()
+        genr = PythonParserGenerator(
+            grammar, out, unreachable_formatting="This is a test"
+        )
+        genr.generate("<string>")
+        self.assertIn("This is a test", out.getvalue())
+
+    def test_unreachable_implicit3(self) -> None:
+        source = """
+        start: NAME | invalid_input { None }
+        invalid_input: NUMBER
+        """
+        grammar = parse_string(source, GrammarParser)
+        out = io.StringIO()
+        genr = PythonParserGenerator(
+            grammar, out, unreachable_formatting="This is a test"
+        )
+        genr.generate("<string>")
+        self.assertNotIn("This is a test", out.getvalue())
+
+    def test_locations_in_alt_action_and_group(self) -> None:
+        grammar = """
+        start: t=term NEWLINE? $ { ast.Expression(t, LOCATIONS) }
+        term:
+            | l=term '*' r=factor { ast.BinOp(l, ast.Mult(), r, LOCATIONS) }
+            | l=term '/' r=factor { ast.BinOp(l, ast.Div(), r, LOCATIONS) }
+            | factor
+        factor:
+            | (
+                n=NAME { ast.Name(id=n.string, ctx=ast.Load(), LOCATIONS) } |
+                n=NUMBER { ast.Constant(value=ast.literal_eval(n.string), LOCATIONS) }
+            )
+        """
+        parser_class = make_parser(grammar)
+        source = "2*3\n"
+        o = ast.dump(parse_string(source, parser_class).body, include_attributes=True)
+        p = ast.dump(ast.parse(source).body[0].value, include_attributes=True).replace(
+            " kind=None,", ""
+        )
+        diff = "\n".join(
+            difflib.unified_diff(
+                o.split("\n"), p.split("\n"), "cpython", "python-pegen"
+            )
+        )
+        self.assertFalse(diff)
+
 
 class TestGrammarVisitor:
     class Visitor(GrammarVisitor):
diff --git a/Parser/parser.c b/Parser/parser.c
index 543827a7e0aa5a..01082fa1d774ab 100644
--- a/Parser/parser.c
+++ b/Parser/parser.c
@@ -1176,7 +1176,7 @@ statements_rule(Parser *p)
         )
         {
             D(fprintf(stderr, "%*c+ statements[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "statement+"));
-            _res = ( asdl_stmt_seq * ) _PyPegen_seq_flatten ( p , a );
+            _res = ( asdl_stmt_seq* ) _PyPegen_seq_flatten ( p , a );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -1217,7 +1217,7 @@ statement_rule(Parser *p)
         )
         {
             D(fprintf(stderr, "%*c+ statement[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "compound_stmt"));
-            _res = ( asdl_stmt_seq * ) _PyPegen_singleton_seq ( p , a );
+            _res = ( asdl_stmt_seq* ) _PyPegen_singleton_seq ( p , a );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -1294,7 +1294,7 @@ statement_newline_rule(Parser *p)
         )
         {
             D(fprintf(stderr, "%*c+ statement_newline[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "compound_stmt NEWLINE"));
-            _res = ( asdl_stmt_seq * ) _PyPegen_singleton_seq ( p , a );
+            _res = ( asdl_stmt_seq* ) _PyPegen_singleton_seq ( p , a );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -1346,7 +1346,7 @@ statement_newline_rule(Parser *p)
             UNUSED(_end_lineno); // Only used by EXTRA macro
             int _end_col_offset = _token->end_col_offset;
             UNUSED(_end_col_offset); // Only used by EXTRA macro
-            _res = ( asdl_stmt_seq * ) _PyPegen_singleton_seq ( p , CHECK ( stmt_ty , _PyAST_Pass ( EXTRA ) ) );
+            _res = ( asdl_stmt_seq* ) _PyPegen_singleton_seq ( p , CHECK ( stmt_ty , _PyAST_Pass ( EXTRA ) ) );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -1416,7 +1416,7 @@ simple_stmts_rule(Parser *p)
         )
         {
             D(fprintf(stderr, "%*c+ simple_stmts[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "simple_stmt !';' NEWLINE"));
-            _res = ( asdl_stmt_seq * ) _PyPegen_singleton_seq ( p , a );
+            _res = ( asdl_stmt_seq* ) _PyPegen_singleton_seq ( p , a );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -2403,7 +2403,7 @@ augassign_rule(Parser *p)
         )
         {
             D(fprintf(stderr, "%*c+ augassign[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'@='"));
-            _res = CHECK_VERSION ( AugOperator * , 5 , "The '@' operator is" , _PyPegen_augoperator ( p , MatMult ) );
+            _res = CHECK_VERSION ( AugOperator* , 5 , "The '@' operator is" , _PyPegen_augoperator ( p , MatMult ) );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -2841,7 +2841,7 @@ global_stmt_rule(Parser *p)
             UNUSED(_end_lineno); // Only used by EXTRA macro
             int _end_col_offset = _token->end_col_offset;
             UNUSED(_end_col_offset); // Only used by EXTRA macro
-            _res = _PyAST_Global ( CHECK ( asdl_identifier_seq * , _PyPegen_map_names_to_ids ( p , a ) ) , EXTRA );
+            _res = _PyAST_Global ( CHECK ( asdl_identifier_seq* , _PyPegen_map_names_to_ids ( p , a ) ) , EXTRA );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -2903,7 +2903,7 @@ nonlocal_stmt_rule(Parser *p)
             UNUSED(_end_lineno); // Only used by EXTRA macro
             int _end_col_offset = _token->end_col_offset;
             UNUSED(_end_col_offset); // Only used by EXTRA macro
-            _res = _PyAST_Nonlocal ( CHECK ( asdl_identifier_seq * , _PyPegen_map_names_to_ids ( p , a ) ) , EXTRA );
+            _res = _PyAST_Nonlocal ( CHECK ( asdl_identifier_seq* , _PyPegen_map_names_to_ids ( p , a ) ) , EXTRA );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -3460,7 +3460,7 @@ import_from_targets_rule(Parser *p)
             UNUSED(_end_lineno); // Only used by EXTRA macro
             int _end_col_offset = _token->end_col_offset;
             UNUSED(_end_col_offset); // Only used by EXTRA macro
-            _res = ( asdl_alias_seq * ) _PyPegen_singleton_seq ( p , CHECK ( alias_ty , _PyPegen_alias_for_star ( p , EXTRA ) ) );
+            _res = ( asdl_alias_seq* ) _PyPegen_singleton_seq ( p , CHECK ( alias_ty , _PyPegen_alias_for_star ( p , EXTRA ) ) );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -4649,7 +4649,7 @@ slash_with_default_rule(Parser *p)
         )
         {
             D(fprintf(stderr, "%*c+ slash_with_default[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "param_no_default* param_with_default+ '/' ','"));
-            _res = _PyPegen_slash_with_default ( p , ( asdl_arg_seq * ) a , b );
+            _res = _PyPegen_slash_with_default ( p , ( asdl_arg_seq* ) a , b );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -4681,7 +4681,7 @@ slash_with_default_rule(Parser *p)
         )
         {
             D(fprintf(stderr, "%*c+ slash_with_default[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "param_no_default* param_with_default+ '/' &')'"));
-            _res = _PyPegen_slash_with_default ( p , ( asdl_arg_seq * ) a , b );
+            _res = _PyPegen_slash_with_default ( p , ( asdl_arg_seq* ) a , b );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -5340,7 +5340,7 @@ if_stmt_rule(Parser *p)
             UNUSED(_end_lineno); // Only used by EXTRA macro
             int _end_col_offset = _token->end_col_offset;
             UNUSED(_end_col_offset); // Only used by EXTRA macro
-            _res = _PyAST_If ( a , b , CHECK ( asdl_stmt_seq * , _PyPegen_singleton_seq ( p , c ) ) , EXTRA );
+            _res = _PyAST_If ( a , b , CHECK ( asdl_stmt_seq* , _PyPegen_singleton_seq ( p , c ) ) , EXTRA );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -5478,7 +5478,7 @@ elif_stmt_rule(Parser *p)
             UNUSED(_end_lineno); // Only used by EXTRA macro
             int _end_col_offset = _token->end_col_offset;
             UNUSED(_end_col_offset); // Only used by EXTRA macro
-            _res = _PyAST_If ( a , b , CHECK ( asdl_stmt_seq * , _PyPegen_singleton_seq ( p , c ) ) , EXTRA );
+            _res = _PyAST_If ( a , b , CHECK ( asdl_stmt_seq* , _PyPegen_singleton_seq ( p , c ) ) , EXTRA );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -6756,7 +6756,7 @@ subject_expr_rule(Parser *p)
             UNUSED(_end_lineno); // Only used by EXTRA macro
             int _end_col_offset = _token->end_col_offset;
             UNUSED(_end_col_offset); // Only used by EXTRA macro
-            _res = _PyAST_Tuple ( CHECK ( asdl_expr_seq * , _PyPegen_seq_insert_in_front ( p , value , values ) ) , Load , EXTRA );
+            _res = _PyAST_Tuple ( CHECK ( asdl_expr_seq* , _PyPegen_seq_insert_in_front ( p , value , values ) ) , Load , EXTRA );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -9049,7 +9049,7 @@ mapping_pattern_rule(Parser *p)
             UNUSED(_end_lineno); // Only used by EXTRA macro
             int _end_col_offset = _token->end_col_offset;
             UNUSED(_end_col_offset); // Only used by EXTRA macro
-            _res = _PyAST_MatchMapping ( CHECK ( asdl_expr_seq * , _PyPegen_get_pattern_keys ( p , items ) ) , CHECK ( asdl_pattern_seq * , _PyPegen_get_patterns ( p , items ) ) , rest -> v . Name . id , EXTRA );
+            _res = _PyAST_MatchMapping ( CHECK ( asdl_expr_seq* , _PyPegen_get_pattern_keys ( p , items ) ) , CHECK ( asdl_pattern_seq* , _PyPegen_get_patterns ( p , items ) ) , rest -> v . Name . id , EXTRA );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -9092,7 +9092,7 @@ mapping_pattern_rule(Parser *p)
             UNUSED(_end_lineno); // Only used by EXTRA macro
             int _end_col_offset = _token->end_col_offset;
             UNUSED(_end_col_offset); // Only used by EXTRA macro
-            _res = _PyAST_MatchMapping ( CHECK ( asdl_expr_seq * , _PyPegen_get_pattern_keys ( p , items ) ) , CHECK ( asdl_pattern_seq * , _PyPegen_get_patterns ( p , items ) ) , NULL , EXTRA );
+            _res = _PyAST_MatchMapping ( CHECK ( asdl_expr_seq* , _PyPegen_get_pattern_keys ( p , items ) ) , CHECK ( asdl_pattern_seq* , _PyPegen_get_patterns ( p , items ) ) , NULL , EXTRA );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -9381,7 +9381,7 @@ class_pattern_rule(Parser *p)
             UNUSED(_end_lineno); // Only used by EXTRA macro
             int _end_col_offset = _token->end_col_offset;
             UNUSED(_end_col_offset); // Only used by EXTRA macro
-            _res = _PyAST_MatchClass ( cls , NULL , CHECK ( asdl_identifier_seq * , _PyPegen_map_names_to_ids ( p , CHECK ( asdl_expr_seq * , _PyPegen_get_pattern_keys ( p , keywords ) ) ) ) , CHECK ( asdl_pattern_seq * , _PyPegen_get_patterns ( p , keywords ) ) , EXTRA );
+            _res = _PyAST_MatchClass ( cls , NULL , CHECK ( asdl_identifier_seq* , _PyPegen_map_names_to_ids ( p , CHECK ( asdl_expr_seq* , _PyPegen_get_pattern_keys ( p , keywords ) ) ) ) , CHECK ( asdl_pattern_seq* , _PyPegen_get_patterns ( p , keywords ) ) , EXTRA );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -9433,7 +9433,7 @@ class_pattern_rule(Parser *p)
             UNUSED(_end_lineno); // Only used by EXTRA macro
             int _end_col_offset = _token->end_col_offset;
             UNUSED(_end_col_offset); // Only used by EXTRA macro
-            _res = _PyAST_MatchClass ( cls , patterns , CHECK ( asdl_identifier_seq * , _PyPegen_map_names_to_ids ( p , CHECK ( asdl_expr_seq * , _PyPegen_get_pattern_keys ( p , keywords ) ) ) ) , CHECK ( asdl_pattern_seq * , _PyPegen_get_patterns ( p , keywords ) ) , EXTRA );
+            _res = _PyAST_MatchClass ( cls , patterns , CHECK ( asdl_identifier_seq* , _PyPegen_map_names_to_ids ( p , CHECK ( asdl_expr_seq* , _PyPegen_get_pattern_keys ( p , keywords ) ) ) ) , CHECK ( asdl_pattern_seq* , _PyPegen_get_patterns ( p , keywords ) ) , EXTRA );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -9642,7 +9642,7 @@ expressions_rule(Parser *p)
             UNUSED(_end_lineno); // Only used by EXTRA macro
             int _end_col_offset = _token->end_col_offset;
             UNUSED(_end_col_offset); // Only used by EXTRA macro
-            _res = _PyAST_Tuple ( CHECK ( asdl_expr_seq * , _PyPegen_seq_insert_in_front ( p , a , b ) ) , Load , EXTRA );
+            _res = _PyAST_Tuple ( CHECK ( asdl_expr_seq* , _PyPegen_seq_insert_in_front ( p , a , b ) ) , Load , EXTRA );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -9678,7 +9678,7 @@ expressions_rule(Parser *p)
             UNUSED(_end_lineno); // Only used by EXTRA macro
             int _end_col_offset = _token->end_col_offset;
             UNUSED(_end_col_offset); // Only used by EXTRA macro
-            _res = _PyAST_Tuple ( CHECK ( asdl_expr_seq * , _PyPegen_singleton_seq ( p , a ) ) , Load , EXTRA );
+            _res = _PyAST_Tuple ( CHECK ( asdl_expr_seq* , _PyPegen_singleton_seq ( p , a ) ) , Load , EXTRA );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -10004,7 +10004,7 @@ star_expressions_rule(Parser *p)
             UNUSED(_end_lineno); // Only used by EXTRA macro
             int _end_col_offset = _token->end_col_offset;
             UNUSED(_end_col_offset); // Only used by EXTRA macro
-            _res = _PyAST_Tuple ( CHECK ( asdl_expr_seq * , _PyPegen_seq_insert_in_front ( p , a , b ) ) , Load , EXTRA );
+            _res = _PyAST_Tuple ( CHECK ( asdl_expr_seq* , _PyPegen_seq_insert_in_front ( p , a , b ) ) , Load , EXTRA );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -10040,7 +10040,7 @@ star_expressions_rule(Parser *p)
             UNUSED(_end_lineno); // Only used by EXTRA macro
             int _end_col_offset = _token->end_col_offset;
             UNUSED(_end_col_offset); // Only used by EXTRA macro
-            _res = _PyAST_Tuple ( CHECK ( asdl_expr_seq * , _PyPegen_singleton_seq ( p , a ) ) , Load , EXTRA );
+            _res = _PyAST_Tuple ( CHECK ( asdl_expr_seq* , _PyPegen_singleton_seq ( p , a ) ) , Load , EXTRA );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -10485,7 +10485,7 @@ disjunction_rule(Parser *p)
             UNUSED(_end_lineno); // Only used by EXTRA macro
             int _end_col_offset = _token->end_col_offset;
             UNUSED(_end_col_offset); // Only used by EXTRA macro
-            _res = _PyAST_BoolOp ( Or , CHECK ( asdl_expr_seq * , _PyPegen_seq_insert_in_front ( p , a , b ) ) , EXTRA );
+            _res = _PyAST_BoolOp ( Or , CHECK ( asdl_expr_seq* , _PyPegen_seq_insert_in_front ( p , a , b ) ) , EXTRA );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -10571,7 +10571,7 @@ conjunction_rule(Parser *p)
             UNUSED(_end_lineno); // Only used by EXTRA macro
             int _end_col_offset = _token->end_col_offset;
             UNUSED(_end_col_offset); // Only used by EXTRA macro
-            _res = _PyAST_BoolOp ( And , CHECK ( asdl_expr_seq * , _PyPegen_seq_insert_in_front ( p , a , b ) ) , EXTRA );
+            _res = _PyAST_BoolOp ( And , CHECK ( asdl_expr_seq* , _PyPegen_seq_insert_in_front ( p , a , b ) ) , EXTRA );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -10739,7 +10739,7 @@ comparison_rule(Parser *p)
             UNUSED(_end_lineno); // Only used by EXTRA macro
             int _end_col_offset = _token->end_col_offset;
             UNUSED(_end_col_offset); // Only used by EXTRA macro
-            _res = _PyAST_Compare ( a , CHECK ( asdl_int_seq * , _PyPegen_get_cmpops ( p , b ) ) , CHECK ( asdl_expr_seq * , _PyPegen_get_exprs ( p , b ) ) , EXTRA );
+            _res = _PyAST_Compare ( a , CHECK ( asdl_int_seq* , _PyPegen_get_cmpops ( p , b ) ) , CHECK ( asdl_expr_seq* , _PyPegen_get_exprs ( p , b ) ) , EXTRA );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -12837,7 +12837,7 @@ primary_raw(Parser *p)
             UNUSED(_end_lineno); // Only used by EXTRA macro
             int _end_col_offset = _token->end_col_offset;
             UNUSED(_end_col_offset); // Only used by EXTRA macro
-            _res = _PyAST_Call ( a , CHECK ( asdl_expr_seq * , ( asdl_expr_seq * ) _PyPegen_singleton_seq ( p , b ) ) , NULL , EXTRA );
+            _res = _PyAST_Call ( a , CHECK ( asdl_expr_seq* , ( asdl_expr_seq* ) _PyPegen_singleton_seq ( p , b ) ) , NULL , EXTRA );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -13896,7 +13896,7 @@ lambda_slash_with_default_rule(Parser *p)
         )
         {
             D(fprintf(stderr, "%*c+ lambda_slash_with_default[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "lambda_param_no_default* lambda_param_with_default+ '/' ','"));
-            _res = _PyPegen_slash_with_default ( p , ( asdl_arg_seq * ) a , b );
+            _res = _PyPegen_slash_with_default ( p , ( asdl_arg_seq* ) a , b );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -13928,7 +13928,7 @@ lambda_slash_with_default_rule(Parser *p)
         )
         {
             D(fprintf(stderr, "%*c+ lambda_slash_with_default[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "lambda_param_no_default* lambda_param_with_default+ '/' &':'"));
-            _res = _PyPegen_slash_with_default ( p , ( asdl_arg_seq * ) a , b );
+            _res = _PyPegen_slash_with_default ( p , ( asdl_arg_seq* ) a , b );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -14689,7 +14689,7 @@ dict_rule(Parser *p)
             UNUSED(_end_lineno); // Only used by EXTRA macro
             int _end_col_offset = _token->end_col_offset;
             UNUSED(_end_col_offset); // Only used by EXTRA macro
-            _res = _PyAST_Dict ( CHECK ( asdl_expr_seq * , _PyPegen_get_keys ( p , a ) ) , CHECK ( asdl_expr_seq * , _PyPegen_get_values ( p , a ) ) , EXTRA );
+            _res = _PyAST_Dict ( CHECK ( asdl_expr_seq* , _PyPegen_get_keys ( p , a ) ) , CHECK ( asdl_expr_seq* , _PyPegen_get_values ( p , a ) ) , EXTRA );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -15556,7 +15556,7 @@ args_rule(Parser *p)
             UNUSED(_end_lineno); // Only used by EXTRA macro
             int _end_col_offset = _token->end_col_offset;
             UNUSED(_end_col_offset); // Only used by EXTRA macro
-            _res = _PyAST_Call ( _PyPegen_dummy_name ( p ) , CHECK_NULL_ALLOWED ( asdl_expr_seq * , _PyPegen_seq_extract_starred_exprs ( p , a ) ) , CHECK_NULL_ALLOWED ( asdl_keyword_seq * , _PyPegen_seq_delete_starred_exprs ( p , a ) ) , EXTRA );
+            _res = _PyAST_Call ( _PyPegen_dummy_name ( p ) , CHECK_NULL_ALLOWED ( asdl_expr_seq* , _PyPegen_seq_extract_starred_exprs ( p , a ) ) , CHECK_NULL_ALLOWED ( asdl_keyword_seq* , _PyPegen_seq_delete_starred_exprs ( p , a ) ) , EXTRA );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -16026,7 +16026,7 @@ star_targets_rule(Parser *p)
             UNUSED(_end_lineno); // Only used by EXTRA macro
             int _end_col_offset = _token->end_col_offset;
             UNUSED(_end_col_offset); // Only used by EXTRA macro
-            _res = _PyAST_Tuple ( CHECK ( asdl_expr_seq * , _PyPegen_seq_insert_in_front ( p , a , b ) ) , Store , EXTRA );
+            _res = _PyAST_Tuple ( CHECK ( asdl_expr_seq* , _PyPegen_seq_insert_in_front ( p , a , b ) ) , Store , EXTRA );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -16119,7 +16119,7 @@ star_targets_tuple_seq_rule(Parser *p)
         )
         {
             D(fprintf(stderr, "%*c+ star_targets_tuple_seq[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "star_target ((',' star_target))+ ','?"));
-            _res = ( asdl_expr_seq * ) _PyPegen_seq_insert_in_front ( p , a , b );
+            _res = ( asdl_expr_seq* ) _PyPegen_seq_insert_in_front ( p , a , b );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -16146,7 +16146,7 @@ star_targets_tuple_seq_rule(Parser *p)
         )
         {
             D(fprintf(stderr, "%*c+ star_targets_tuple_seq[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "star_target ','"));
-            _res = ( asdl_expr_seq * ) _PyPegen_singleton_seq ( p , a );
+            _res = ( asdl_expr_seq* ) _PyPegen_singleton_seq ( p , a );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -16923,7 +16923,7 @@ t_primary_raw(Parser *p)
             UNUSED(_end_lineno); // Only used by EXTRA macro
             int _end_col_offset = _token->end_col_offset;
             UNUSED(_end_col_offset); // Only used by EXTRA macro
-            _res = _PyAST_Call ( a , CHECK ( asdl_expr_seq * , ( asdl_expr_seq * ) _PyPegen_singleton_seq ( p , b ) ) , NULL , EXTRA );
+            _res = _PyAST_Call ( a , CHECK ( asdl_expr_seq* , ( asdl_expr_seq* ) _PyPegen_singleton_seq ( p , b ) ) , NULL , EXTRA );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -17474,7 +17474,7 @@ type_expressions_rule(Parser *p)
         )
         {
             D(fprintf(stderr, "%*c+ type_expressions[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "','.expression+ ',' '*' expression ',' '**' expression"));
-            _res = ( asdl_expr_seq * ) _PyPegen_seq_append_to_end ( p , CHECK ( asdl_seq * , _PyPegen_seq_append_to_end ( p , a , b ) ) , c );
+            _res = ( asdl_expr_seq* ) _PyPegen_seq_append_to_end ( p , CHECK ( asdl_seq* , _PyPegen_seq_append_to_end ( p , a , b ) ) , c );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -17507,7 +17507,7 @@ type_expressions_rule(Parser *p)
         )
         {
             D(fprintf(stderr, "%*c+ type_expressions[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "','.expression+ ',' '*' expression"));
-            _res = ( asdl_expr_seq * ) _PyPegen_seq_append_to_end ( p , a , b );
+            _res = ( asdl_expr_seq* ) _PyPegen_seq_append_to_end ( p , a , b );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -17540,7 +17540,7 @@ type_expressions_rule(Parser *p)
         )
         {
             D(fprintf(stderr, "%*c+ type_expressions[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "','.expression+ ',' '**' expression"));
-            _res = ( asdl_expr_seq * ) _PyPegen_seq_append_to_end ( p , a , b );
+            _res = ( asdl_expr_seq* ) _PyPegen_seq_append_to_end ( p , a , b );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -17576,7 +17576,7 @@ type_expressions_rule(Parser *p)
         )
         {
             D(fprintf(stderr, "%*c+ type_expressions[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'*' expression ',' '**' expression"));
-            _res = ( asdl_expr_seq * ) _PyPegen_seq_append_to_end ( p , CHECK ( asdl_seq * , _PyPegen_singleton_seq ( p , a ) ) , b );
+            _res = ( asdl_expr_seq* ) _PyPegen_seq_append_to_end ( p , CHECK ( asdl_seq* , _PyPegen_singleton_seq ( p , a ) ) , b );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -17603,7 +17603,7 @@ type_expressions_rule(Parser *p)
         )
         {
             D(fprintf(stderr, "%*c+ type_expressions[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'*' expression"));
-            _res = ( asdl_expr_seq * ) _PyPegen_singleton_seq ( p , a );
+            _res = ( asdl_expr_seq* ) _PyPegen_singleton_seq ( p , a );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -17630,7 +17630,7 @@ type_expressions_rule(Parser *p)
         )
         {
             D(fprintf(stderr, "%*c+ type_expressions[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'**' expression"));
-            _res = ( asdl_expr_seq * ) _PyPegen_singleton_seq ( p , a );
+            _res = ( asdl_expr_seq* ) _PyPegen_singleton_seq ( p , a );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
@@ -20149,7 +20149,7 @@ invalid_match_stmt_rule(Parser *p)
         )
         {
             D(fprintf(stderr, "%*c+ invalid_match_stmt[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "\"match\" subject_expr !':'"));
-            _res = CHECK_VERSION ( void * , 10 , "Pattern matching is" , RAISE_SYNTAX_ERROR ( "expected ':'" ) );
+            _res = CHECK_VERSION ( void* , 10 , "Pattern matching is" , RAISE_SYNTAX_ERROR ( "expected ':'" ) );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 D(p->level--);
diff --git a/Parser/pegen.c b/Parser/pegen.c
index f697f007bbcfc1..c77c534ff090b2 100644
--- a/Parser/pegen.c
+++ b/Parser/pegen.c
@@ -897,6 +897,19 @@ _PyPegen_expect_token(Parser *p, int type)
     return t;
 }
 
+void*
+_PyPegen_expect_forced_result(Parser *p, void* result, const char* expected) {
+
+    if (p->error_indicator == 1) {
+        return NULL;
+    }
+    if (result == NULL) {
+        RAISE_SYNTAX_ERROR("expected (%s)", expected);
+        return NULL;
+    }
+    return result;
+}
+
 Token *
 _PyPegen_expect_forced_token(Parser *p, int type, const char* expected) {
 
diff --git a/Parser/pegen.h b/Parser/pegen.h
index f4b68760e6317b..57d11779efafe7 100644
--- a/Parser/pegen.h
+++ b/Parser/pegen.h
@@ -130,6 +130,7 @@ int _PyPegen_lookahead_with_string(int , expr_ty (func)(Parser *, const char*),
 int _PyPegen_lookahead(int, void *(func)(Parser *), Parser *);
 
 Token *_PyPegen_expect_token(Parser *p, int type);
+void* _PyPegen_expect_forced_result(Parser *p, void* result, const char* expected);
 Token *_PyPegen_expect_forced_token(Parser *p, int type, const char* expected);
 expr_ty _PyPegen_expect_soft_keyword(Parser *p, const char *keyword);
 expr_ty _PyPegen_soft_keyword_token(Parser *p);
diff --git a/Tools/peg_generator/mypy.ini b/Tools/peg_generator/mypy.ini
index 80d5c057ca1a9a..17323722c85ad0 100644
--- a/Tools/peg_generator/mypy.ini
+++ b/Tools/peg_generator/mypy.ini
@@ -1,5 +1,5 @@
 [mypy]
-files = pegen, scripts
+files = pegen
 
 follow_imports = error
 no_implicit_optional = True
diff --git a/Tools/peg_generator/pegen/__main__.py b/Tools/peg_generator/pegen/__main__.py
index c0f3b687587a05..a12fe787f427db 100755
--- a/Tools/peg_generator/pegen/__main__.py
+++ b/Tools/peg_generator/pegen/__main__.py
@@ -100,7 +100,9 @@ def generate_python_code(
     "--optimized", action="store_true", help="Compile the extension in optimized mode"
 )
 c_parser.add_argument(
-    "--skip-actions", action="store_true", help="Suppress code emission for rule actions",
+    "--skip-actions",
+    action="store_true",
+    help="Suppress code emission for rule actions",
 )
 
 python_parser = subparsers.add_parser("python", help="Generate Python code")
@@ -114,7 +116,9 @@ def generate_python_code(
     help="Where to write the generated parser",
 )
 python_parser.add_argument(
-    "--skip-actions", action="store_true", help="Suppress code emission for rule actions",
+    "--skip-actions",
+    action="store_true",
+    help="Suppress code emission for rule actions",
 )
 
 
diff --git a/Tools/peg_generator/pegen/ast_dump.py b/Tools/peg_generator/pegen/ast_dump.py
index 93dfbfd963ca6d..2c57d0932fda37 100644
--- a/Tools/peg_generator/pegen/ast_dump.py
+++ b/Tools/peg_generator/pegen/ast_dump.py
@@ -6,9 +6,17 @@
 TODO: Remove the above-described hack.
 """
 
+from typing import Any, Optional, Tuple
 
-def ast_dump(node, annotate_fields=True, include_attributes=False, *, indent=None):
-    def _format(node, level=0):
+
+def ast_dump(
+    node: Any,
+    annotate_fields: bool = True,
+    include_attributes: bool = False,
+    *,
+    indent: Optional[str] = None,
+) -> str:
+    def _format(node: Any, level: int = 0) -> Tuple[str, bool]:
         if indent is not None:
             level += 1
             prefix = "\n" + indent * level
diff --git a/Tools/peg_generator/pegen/build.py b/Tools/peg_generator/pegen/build.py
index b80fc854239195..6f0a091ff47bd0 100644
--- a/Tools/peg_generator/pegen/build.py
+++ b/Tools/peg_generator/pegen/build.py
@@ -58,7 +58,7 @@ def compile_c_extension(
     extra_compile_args = get_extra_flags("CFLAGS", "PY_CFLAGS_NODIST")
     extra_compile_args.append("-DPy_BUILD_CORE_MODULE")
     # Define _Py_TEST_PEGEN to not call PyAST_Validate() in Parser/pegen.c
-    extra_compile_args.append('-D_Py_TEST_PEGEN')
+    extra_compile_args.append("-D_Py_TEST_PEGEN")
     extra_link_args = get_extra_flags("LDFLAGS", "PY_LDFLAGS_NODIST")
     if keep_asserts:
         extra_compile_args.append("-UNDEBUG")
@@ -175,7 +175,10 @@ def build_c_generator(
 
 
 def build_python_generator(
-    grammar: Grammar, grammar_file: str, output_file: str, skip_actions: bool = False,
+    grammar: Grammar,
+    grammar_file: str,
+    output_file: str,
+    skip_actions: bool = False,
 ) -> ParserGenerator:
     with open(output_file, "w") as file:
         gen: ParserGenerator = PythonParserGenerator(grammar, file)  # TODO: skip_actions
@@ -246,5 +249,10 @@ def build_python_parser_and_generator(
         skip_actions (bool, optional): Whether to pretend no rule has any actions.
     """
     grammar, parser, tokenizer = build_parser(grammar_file, verbose_tokenizer, verbose_parser)
-    gen = build_python_generator(grammar, grammar_file, output_file, skip_actions=skip_actions,)
+    gen = build_python_generator(
+        grammar,
+        grammar_file,
+        output_file,
+        skip_actions=skip_actions,
+    )
     return grammar, parser, tokenizer, gen
diff --git a/Tools/peg_generator/pegen/c_generator.py b/Tools/peg_generator/pegen/c_generator.py
index 7a2edbb0fe55ff..e928fd3de1704f 100644
--- a/Tools/peg_generator/pegen/c_generator.py
+++ b/Tools/peg_generator/pegen/c_generator.py
@@ -12,6 +12,7 @@
     Gather,
     GrammarVisitor,
     Group,
+    Leaf,
     Lookahead,
     NamedItem,
     NameLeaf,
@@ -91,7 +92,16 @@ def __str__(self) -> str:
             parts.append(", 1")
         if self.assigned_variable:
             if self.assigned_variable_type:
-                parts = ["(", self.assigned_variable, " = ", '(', self.assigned_variable_type, ')', *parts, ")"]
+                parts = [
+                    "(",
+                    self.assigned_variable,
+                    " = ",
+                    "(",
+                    self.assigned_variable_type,
+                    ")",
+                    *parts,
+                    ")",
+                ]
             else:
                 parts = ["(", self.assigned_variable, " = ", *parts, ")"]
         if self.comment:
@@ -256,9 +266,10 @@ def visit_NegativeLookahead(self, node: NegativeLookahead) -> FunctionCall:
 
     def visit_Forced(self, node: Forced) -> FunctionCall:
         call = self.generate_call(node.node)
-        if call.nodetype == NodeTypes.GENERIC_TOKEN:
+        if isinstance(node.node, Leaf):
+            assert isinstance(node.node, Leaf)
             val = ast.literal_eval(node.node.value)
-            assert val in self.exact_tokens, f"{node.value} is not a known literal"
+            assert val in self.exact_tokens, f"{node.node.value} is not a known literal"
             type = self.exact_tokens[val]
             return FunctionCall(
                 assigned_variable="_literal",
@@ -268,9 +279,19 @@ def visit_Forced(self, node: Forced) -> FunctionCall:
                 return_type="Token *",
                 comment=f"forced_token='{val}'",
             )
+        if isinstance(node.node, Group):
+            call = self.visit(node.node.rhs)
+            call.assigned_variable = None
+            call.comment = None
+            return FunctionCall(
+                assigned_variable="_literal",
+                function=f"_PyPegen_expect_forced_result",
+                arguments=["p", str(call), f'"{node.node.rhs!s}"'],
+                return_type="void *",
+                comment=f"forced_token=({node.node.rhs!s})",
+            )
         else:
-            raise NotImplementedError(
-                    f"Forced tokens don't work with {call.nodetype} tokens")
+            raise NotImplementedError(f"Forced tokens don't work with {node.node} nodes")
 
     def visit_Opt(self, node: Opt) -> FunctionCall:
         call = self.generate_call(node.node)
@@ -347,7 +368,7 @@ def __init__(
         debug: bool = False,
         skip_actions: bool = False,
     ):
-        super().__init__(grammar, tokens, file)
+        super().__init__(grammar, set(tokens.values()), file)
         self.callmakervisitor: CCallMakerVisitor = CCallMakerVisitor(
             self, exact_tokens, non_exact_tokens
         )
@@ -386,7 +407,11 @@ def call_with_errorcheck_goto(self, call_text: str, goto_target: str) -> None:
             self.print(f"goto {goto_target};")
         self.print(f"}}")
 
-    def out_of_memory_return(self, expr: str, cleanup_code: Optional[str] = None,) -> None:
+    def out_of_memory_return(
+        self,
+        expr: str,
+        cleanup_code: Optional[str] = None,
+    ) -> None:
         self.print(f"if ({expr}) {{")
         with self.indent():
             if cleanup_code is not None:
@@ -568,7 +593,10 @@ def _handle_default_rule_body(self, node: Rule, rhs: Rhs, result_type: str) -> N
             if any(alt.action and "EXTRA" in alt.action for alt in rhs.alts):
                 self._set_up_token_start_metadata_extraction()
             self.visit(
-                rhs, is_loop=False, is_gather=node.is_gather(), rulename=node.name,
+                rhs,
+                is_loop=False,
+                is_gather=node.is_gather(),
+                rulename=node.name,
             )
             if self.debug:
                 self.print(f'D(fprintf(stderr, "Fail at %d: {node.name}\\n", p->mark));')
@@ -601,7 +629,10 @@ def _handle_loop_rule_body(self, node: Rule, rhs: Rhs) -> None:
             if any(alt.action and "EXTRA" in alt.action for alt in rhs.alts):
                 self._set_up_token_start_metadata_extraction()
             self.visit(
-                rhs, is_loop=True, is_gather=node.is_gather(), rulename=node.name,
+                rhs,
+                is_loop=True,
+                is_gather=node.is_gather(),
+                rulename=node.name,
             )
             if is_repeat1:
                 self.print("if (_n == 0 || p->error_indicator) {")
@@ -771,7 +802,7 @@ def handle_alt_loop(self, node: Alt, is_gather: bool, rulename: Optional[str]) -
     def visit_Alt(
         self, node: Alt, is_loop: bool, is_gather: bool, rulename: Optional[str]
     ) -> None:
-        if len(node.items) == 1 and str(node.items[0]).startswith('invalid_'):
+        if len(node.items) == 1 and str(node.items[0]).startswith("invalid_"):
             self.print(f"if (p->call_invalid_rules) {{ // {node}")
         else:
             self.print(f"{{ // {node}")
@@ -791,7 +822,7 @@ def visit_Alt(
                 if v == "_cut_var":
                     v += " = 0"  # cut_var must be initialized
                 self.print(f"{var_type}{v};")
-                if v.startswith("_opt_var"):
+                if v and v.startswith("_opt_var"):
                     self.print(f"UNUSED({v}); // Silence compiler warnings")
 
             with self.local_variable_context():
diff --git a/Tools/peg_generator/pegen/first_sets.py b/Tools/peg_generator/pegen/first_sets.py
index 71be5a2e7cbf4c..50ced22c2a5cf2 100755
--- a/Tools/peg_generator/pegen/first_sets.py
+++ b/Tools/peg_generator/pegen/first_sets.py
@@ -29,7 +29,8 @@
 )
 
 argparser = argparse.ArgumentParser(
-    prog="calculate_first_sets", description="Calculate the first sets of a grammar",
+    prog="calculate_first_sets",
+    description="Calculate the first sets of a grammar",
 )
 argparser.add_argument("grammar_file", help="The grammar file")
 
diff --git a/Tools/peg_generator/pegen/grammar_parser.py b/Tools/peg_generator/pegen/grammar_parser.py
index 70fa5b001b5c1c..6e9f7d3d11d290 100644
--- a/Tools/peg_generator/pegen/grammar_parser.py
+++ b/Tools/peg_generator/pegen/grammar_parser.py
@@ -2,7 +2,10 @@
 # @generated by pegen from ./Tools/peg_generator/pegen/metagrammar.gram
 
 import ast
-from typing import Optional, Any
+import sys
+import tokenize
+
+from typing import Any, Optional
 
 from pegen.parser import memoize, memoize_left_rec, logger, Parser
 from ast import literal_eval
@@ -35,83 +38,71 @@
     StringLeaf,
 )
 
+# Keywords and soft keywords are listed at the end of the parser definition.
 class GeneratedParser(Parser):
 
     @memoize
     def start(self) -> Optional[Grammar]:
         # start: grammar $
-        mark = self.mark()
-        cut = False
+        mark = self._mark()
         if (
             (grammar := self.grammar())
             and
-            (endmarker := self.expect('ENDMARKER'))
+            (_endmarker := self.expect('ENDMARKER'))
         ):
             return grammar
-        self.reset(mark)
-        if cut: return None
+        self._reset(mark)
         return None
 
     @memoize
     def grammar(self) -> Optional[Grammar]:
         # grammar: metas rules | rules
-        mark = self.mark()
-        cut = False
+        mark = self._mark()
         if (
             (metas := self.metas())
             and
             (rules := self.rules())
         ):
             return Grammar ( rules , metas )
-        self.reset(mark)
-        if cut: return None
-        cut = False
+        self._reset(mark)
         if (
             (rules := self.rules())
         ):
-            return Grammar ( rules , [ ] )
-        self.reset(mark)
-        if cut: return None
+            return Grammar ( rules , [] )
+        self._reset(mark)
         return None
 
     @memoize
     def metas(self) -> Optional[MetaList]:
         # metas: meta metas | meta
-        mark = self.mark()
-        cut = False
+        mark = self._mark()
         if (
             (meta := self.meta())
             and
             (metas := self.metas())
         ):
-            return [ meta ] + metas
-        self.reset(mark)
-        if cut: return None
-        cut = False
+            return [meta] + metas
+        self._reset(mark)
         if (
             (meta := self.meta())
         ):
-            return [ meta ]
-        self.reset(mark)
-        if cut: return None
+            return [meta]
+        self._reset(mark)
         return None
 
     @memoize
     def meta(self) -> Optional[MetaTuple]:
         # meta: "@" NAME NEWLINE | "@" NAME NAME NEWLINE | "@" NAME STRING NEWLINE
-        mark = self.mark()
-        cut = False
+        mark = self._mark()
         if (
             (literal := self.expect("@"))
             and
             (name := self.name())
             and
-            (newline := self.expect('NEWLINE'))
+            (_newline := self.expect('NEWLINE'))
         ):
             return ( name . string , None )
-        self.reset(mark)
-        if cut: return None
-        cut = False
+        self._reset(mark)
         if (
             (literal := self.expect("@"))
             and
@@ -119,12 +110,10 @@ def meta(self) -> Optional[MetaTuple]:
             and
             (b := self.name())
             and
-            (newline := self.expect('NEWLINE'))
+            (_newline := self.expect('NEWLINE'))
         ):
             return ( a . string , b . string )
-        self.reset(mark)
-        if cut: return None
-        cut = False
+        self._reset(mark)
         if (
             (literal := self.expect("@"))
             and
@@ -132,40 +121,34 @@ def meta(self) -> Optional[MetaTuple]:
             and
             (string := self.string())
             and
-            (newline := self.expect('NEWLINE'))
+            (_newline := self.expect('NEWLINE'))
         ):
             return ( name . string , literal_eval ( string . string ) )
-        self.reset(mark)
-        if cut: return None
+        self._reset(mark)
         return None
 
     @memoize
     def rules(self) -> Optional[RuleList]:
         # rules: rule rules | rule
-        mark = self.mark()
-        cut = False
+        mark = self._mark()
         if (
             (rule := self.rule())
             and
             (rules := self.rules())
         ):
-            return [ rule ] + rules
-        self.reset(mark)
-        if cut: return None
-        cut = False
+            return [rule] + rules
+        self._reset(mark)
         if (
             (rule := self.rule())
         ):
-            return [ rule ]
-        self.reset(mark)
-        if cut: return None
+            return [rule]
+        self._reset(mark)
         return None
 
     @memoize
     def rule(self) -> Optional[Rule]:
         # rule: rulename memoflag? ":" alts NEWLINE INDENT more_alts DEDENT | rulename memoflag? ":" NEWLINE INDENT more_alts DEDENT | rulename memoflag? ":" alts NEWLINE
-        mark = self.mark()
-        cut = False
+        mark = self._mark()
         if (
             (rulename := self.rulename())
             and
@@ -175,18 +158,16 @@ def rule(self) -> Optional[Rule]:
             and
             (alts := self.alts())
             and
-            (newline := self.expect('NEWLINE'))
+            (_newline := self.expect('NEWLINE'))
             and
-            (indent := self.expect('INDENT'))
+            (_indent := self.expect('INDENT'))
             and
             (more_alts := self.more_alts())
             and
-            (dedent := self.expect('DEDENT'))
+            (_dedent := self.expect('DEDENT'))
         ):
-            return Rule ( rulename [ 0 ] , rulename [ 1 ] , Rhs ( alts . alts + more_alts . alts ) , memo = opt )
-        self.reset(mark)
-        if cut: return None
-        cut = False
+            return Rule ( rulename [0] , rulename [1] , Rhs ( alts . alts + more_alts . alts ) , memo = opt )
+        self._reset(mark)
         if (
             (rulename := self.rulename())
             and
@@ -194,18 +175,16 @@ def rule(self) -> Optional[Rule]:
             and
             (literal := self.expect(":"))
             and
-            (newline := self.expect('NEWLINE'))
+            (_newline := self.expect('NEWLINE'))
             and
-            (indent := self.expect('INDENT'))
+            (_indent := self.expect('INDENT'))
             and
             (more_alts := self.more_alts())
             and
-            (dedent := self.expect('DEDENT'))
+            (_dedent := self.expect('DEDENT'))
         ):
-            return Rule ( rulename [ 0 ] , rulename [ 1 ] , more_alts , memo = opt )
-        self.reset(mark)
-        if cut: return None
-        cut = False
+            return Rule ( rulename [0] , rulename [1] , more_alts , memo = opt )
+        self._reset(mark)
         if (
             (rulename := self.rulename())
             and
@@ -215,76 +194,49 @@ def rule(self) -> Optional[Rule]:
             and
             (alts := self.alts())
             and
-            (newline := self.expect('NEWLINE'))
+            (_newline := self.expect('NEWLINE'))
         ):
-            return Rule ( rulename [ 0 ] , rulename [ 1 ] , alts , memo = opt )
-        self.reset(mark)
-        if cut: return None
+            return Rule ( rulename [0] , rulename [1] , alts , memo = opt )
+        self._reset(mark)
         return None
 
     @memoize
     def rulename(self) -> Optional[RuleName]:
-        # rulename: NAME '[' NAME '*' ']' | NAME '[' NAME ']' | NAME
-        mark = self.mark()
-        cut = False
-        if (
-            (name := self.name())
-            and
-            (literal := self.expect('['))
-            and
-            (type := self.name())
-            and
-            (literal_1 := self.expect('*'))
-            and
-            (literal_2 := self.expect(']'))
-        ):
-            return ( name . string , type . string + "*" )
-        self.reset(mark)
-        if cut: return None
-        cut = False
+        # rulename: NAME annotation | NAME
+        mark = self._mark()
         if (
             (name := self.name())
             and
-            (literal := self.expect('['))
-            and
-            (type := self.name())
-            and
-            (literal_1 := self.expect(']'))
+            (annotation := self.annotation())
         ):
-            return ( name . string , type . string )
-        self.reset(mark)
-        if cut: return None
-        cut = False
+            return ( name . string , annotation )
+        self._reset(mark)
         if (
             (name := self.name())
         ):
             return ( name . string , None )
-        self.reset(mark)
-        if cut: return None
+        self._reset(mark)
         return None
 
     @memoize
     def memoflag(self) -> Optional[str]:
-        # memoflag: '(' 'memo' ')'
-        mark = self.mark()
-        cut = False
+        # memoflag: '(' "memo" ')'
+        mark = self._mark()
         if (
             (literal := self.expect('('))
             and
-            (literal_1 := self.expect('memo'))
+            (literal_1 := self.expect("memo"))
             and
             (literal_2 := self.expect(')'))
         ):
             return "memo"
-        self.reset(mark)
-        if cut: return None
+        self._reset(mark)
         return None
 
     @memoize
     def alts(self) -> Optional[Rhs]:
         # alts: alt "|" alts | alt
-        mark = self.mark()
-        cut = False
+        mark = self._mark()
         if (
             (alt := self.alt())
             and
@@ -292,53 +244,45 @@ def alts(self) -> Optional[Rhs]:
             and
             (alts := self.alts())
         ):
-            return Rhs ( [ alt ] + alts . alts )
-        self.reset(mark)
-        if cut: return None
-        cut = False
+            return Rhs ( [alt] + alts . alts )
+        self._reset(mark)
         if (
             (alt := self.alt())
         ):
-            return Rhs ( [ alt ] )
-        self.reset(mark)
-        if cut: return None
+            return Rhs ( [alt] )
+        self._reset(mark)
         return None
 
     @memoize
     def more_alts(self) -> Optional[Rhs]:
         # more_alts: "|" alts NEWLINE more_alts | "|" alts NEWLINE
-        mark = self.mark()
-        cut = False
+        mark = self._mark()
         if (
             (literal := self.expect("|"))
             and
             (alts := self.alts())
             and
-            (newline := self.expect('NEWLINE'))
+            (_newline := self.expect('NEWLINE'))
             and
             (more_alts := self.more_alts())
         ):
             return Rhs ( alts . alts + more_alts . alts )
-        self.reset(mark)
-        if cut: return None
-        cut = False
+        self._reset(mark)
         if (
             (literal := self.expect("|"))
             and
             (alts := self.alts())
             and
-            (newline := self.expect('NEWLINE'))
+            (_newline := self.expect('NEWLINE'))
         ):
             return Rhs ( alts . alts )
-        self.reset(mark)
-        if cut: return None
+        self._reset(mark)
         return None
 
     @memoize
     def alt(self) -> Optional[Alt]:
         # alt: items '$' action | items '$' | items action | items
-        mark = self.mark()
-        cut = False
+        mark = self._mark()
         if (
             (items := self.items())
             and
@@ -346,101 +290,65 @@ def alt(self) -> Optional[Alt]:
             and
             (action := self.action())
         ):
-            return Alt ( items + [ NamedItem ( None , NameLeaf ( 'ENDMARKER' ) ) ] , action = action )
-        self.reset(mark)
-        if cut: return None
-        cut = False
+            return Alt ( items + [NamedItem ( None , NameLeaf ( 'ENDMARKER' ) )] , action = action )
+        self._reset(mark)
         if (
             (items := self.items())
             and
             (literal := self.expect('$'))
         ):
-            return Alt ( items + [ NamedItem ( None , NameLeaf ( 'ENDMARKER' ) ) ] , action = None )
-        self.reset(mark)
-        if cut: return None
-        cut = False
+            return Alt ( items + [NamedItem ( None , NameLeaf ( 'ENDMARKER' ) )] , action = None )
+        self._reset(mark)
         if (
             (items := self.items())
             and
             (action := self.action())
         ):
             return Alt ( items , action = action )
-        self.reset(mark)
-        if cut: return None
-        cut = False
+        self._reset(mark)
         if (
             (items := self.items())
         ):
             return Alt ( items , action = None )
-        self.reset(mark)
-        if cut: return None
+        self._reset(mark)
         return None
 
     @memoize
     def items(self) -> Optional[NamedItemList]:
         # items: named_item items | named_item
-        mark = self.mark()
-        cut = False
+        mark = self._mark()
         if (
             (named_item := self.named_item())
             and
             (items := self.items())
         ):
-            return [ named_item ] + items
-        self.reset(mark)
-        if cut: return None
-        cut = False
+            return [named_item] + items
+        self._reset(mark)
         if (
             (named_item := self.named_item())
         ):
-            return [ named_item ]
-        self.reset(mark)
-        if cut: return None
+            return [named_item]
+        self._reset(mark)
         return None
 
     @memoize
     def named_item(self) -> Optional[NamedItem]:
-        # named_item: NAME '[' NAME '*' ']' '=' ~ item | NAME '[' NAME ']' '=' ~ item | NAME '=' ~ item | item | forced_atom | lookahead
-        mark = self.mark()
-        cut = False
-        if (
-            (name := self.name())
-            and
-            (literal := self.expect('['))
-            and
-            (type := self.name())
-            and
-            (literal_1 := self.expect('*'))
-            and
-            (literal_2 := self.expect(']'))
-            and
-            (literal_3 := self.expect('='))
-            and
-            (cut := True)
-            and
-            (item := self.item())
-        ):
-            return NamedItem ( name . string , item , f"{type.string}*" )
-        self.reset(mark)
-        if cut: return None
+        # named_item: NAME annotation '=' ~ item | NAME '=' ~ item | item | forced_atom | lookahead
+        mark = self._mark()
         cut = False
         if (
             (name := self.name())
             and
-            (literal := self.expect('['))
-            and
-            (type := self.name())
-            and
-            (literal_1 := self.expect(']'))
+            (annotation := self.annotation())
             and
-            (literal_2 := self.expect('='))
+            (literal := self.expect('='))
             and
             (cut := True)
             and
             (item := self.item())
         ):
-            return NamedItem ( name . string , item , type . string )
-        self.reset(mark)
+            return NamedItem ( name . string , item , annotation )
+        self._reset(mark)
         if cut: return None
         cut = False
         if (
@@ -453,35 +361,29 @@ def named_item(self) -> Optional[NamedItem]:
             (item := self.item())
         ):
             return NamedItem ( name . string , item )
-        self.reset(mark)
+        self._reset(mark)
         if cut: return None
-        cut = False
         if (
             (item := self.item())
         ):
             return NamedItem ( None , item )
-        self.reset(mark)
-        if cut: return None
-        cut = False
+        self._reset(mark)
         if (
-            (it := self.forced_atom())
+            (forced := self.forced_atom())
         ):
-            return NamedItem ( None , it )
-        self.reset(mark)
-        if cut: return None
-        cut = False
+            return NamedItem ( None , forced )
+        self._reset(mark)
         if (
             (it := self.lookahead())
         ):
             return NamedItem ( None , it )
-        self.reset(mark)
-        if cut: return None
+        self._reset(mark)
         return None
 
     @memoize
-    def forced_atom(self) -> Optional[NamedItem]:
+    def forced_atom(self) -> Optional[Forced]:
         # forced_atom: '&' '&' ~ atom
-        mark = self.mark()
+        mark = self._mark()
         cut = False
         if (
             (literal := self.expect('&'))
@@ -493,14 +395,14 @@ def forced_atom(self) -> Optional[NamedItem]:
             (atom := self.atom())
         ):
             return Forced ( atom )
-        self.reset(mark)
+        self._reset(mark)
         if cut: return None
         return None
 
     @memoize
     def lookahead(self) -> Optional[LookaheadOrCut]:
         # lookahead: '&' ~ atom | '!' ~ atom | '~'
-        mark = self.mark()
+        mark = self._mark()
         cut = False
         if (
             (literal := self.expect('&'))
@@ -510,7 +412,7 @@ def lookahead(self) -> Optional[LookaheadOrCut]:
             (atom := self.atom())
         ):
             return PositiveLookahead ( atom )
-        self.reset(mark)
+        self._reset(mark)
         if cut: return None
         cut = False
         if (
@@ -521,21 +423,19 @@ def lookahead(self) -> Optional[LookaheadOrCut]:
             (atom := self.atom())
         ):
             return NegativeLookahead ( atom )
-        self.reset(mark)
+        self._reset(mark)
         if cut: return None
-        cut = False
         if (
             (literal := self.expect('~'))
         ):
             return Cut ( )
-        self.reset(mark)
-        if cut: return None
+        self._reset(mark)
         return None
 
     @memoize
     def item(self) -> Optional[Item]:
         # item: '[' ~ alts ']' | atom '?' | atom '*' | atom '+' | atom '.' atom '+' | atom
-        mark = self.mark()
+        mark = self._mark()
         cut = False
         if (
             (literal := self.expect('['))
@@ -547,36 +447,29 @@ def item(self) -> Optional[Item]:
             (literal_1 := self.expect(']'))
         ):
             return Opt ( alts )
-        self.reset(mark)
+        self._reset(mark)
         if cut: return None
-        cut = False
         if (
             (atom := self.atom())
             and
             (literal := self.expect('?'))
         ):
             return Opt ( atom )
-        self.reset(mark)
-        if cut: return None
-        cut = False
+        self._reset(mark)
         if (
             (atom := self.atom())
             and
             (literal := self.expect('*'))
         ):
             return Repeat0 ( atom )
-        self.reset(mark)
-        if cut: return None
-        cut = False
+        self._reset(mark)
         if (
             (atom := self.atom())
             and
             (literal := self.expect('+'))
         ):
             return Repeat1 ( atom )
-        self.reset(mark)
-        if cut: return None
-        cut = False
+        self._reset(mark)
         if (
             (sep := self.atom())
             and
@@ -587,21 +480,18 @@ def item(self) -> Optional[Item]:
             (literal_1 := self.expect('+'))
         ):
             return Gather ( sep , node )
-        self.reset(mark)
-        if cut: return None
-        cut = False
+        self._reset(mark)
         if (
             (atom := self.atom())
         ):
             return atom
-        self.reset(mark)
-        if cut: return None
+        self._reset(mark)
         return None
 
     @memoize
     def atom(self) -> Optional[Plain]:
         # atom: '(' ~ alts ')' | NAME | STRING
-        mark = self.mark()
+        mark = self._mark()
         cut = False
         if (
             (literal := self.expect('('))
@@ -613,28 +503,24 @@ def atom(self) -> Optional[Plain]:
             (literal_1 := self.expect(')'))
         ):
             return Group ( alts )
-        self.reset(mark)
+        self._reset(mark)
         if cut: return None
-        cut = False
         if (
             (name := self.name())
         ):
             return NameLeaf ( name . string )
-        self.reset(mark)
-        if cut: return None
-        cut = False
+        self._reset(mark)
         if (
             (string := self.string())
         ):
             return StringLeaf ( string . string )
-        self.reset(mark)
-        if cut: return None
+        self._reset(mark)
         return None
 
     @memoize
     def action(self) -> Optional[str]:
         # action: "{" ~ target_atoms "}"
-        mark = self.mark()
+        mark = self._mark()
         cut = False
         if (
             (literal := self.expect("{"))
@@ -646,95 +532,123 @@ def action(self) -> Optional[str]:
             (literal_1 := self.expect("}"))
         ):
             return target_atoms
-        self.reset(mark)
+        self._reset(mark)
+        if cut: return None
+        return None
+
+    @memoize
+    def annotation(self) -> Optional[str]:
+        # annotation: "[" ~ target_atoms "]"
+        mark = self._mark()
+        cut = False
+        if (
+            (literal := self.expect("["))
+            and
+            (cut := True)
+            and
+            (target_atoms := self.target_atoms())
+            and
+            (literal_1 := self.expect("]"))
+        ):
+            return target_atoms
+        self._reset(mark)
         if cut: return None
         return None
 
     @memoize
     def target_atoms(self) -> Optional[str]:
         # target_atoms: target_atom target_atoms | target_atom
-        mark = self.mark()
-        cut = False
+        mark = self._mark()
         if (
             (target_atom := self.target_atom())
             and
             (target_atoms := self.target_atoms())
         ):
             return target_atom + " " + target_atoms
-        self.reset(mark)
-        if cut: return None
-        cut = False
+        self._reset(mark)
         if (
             (target_atom := self.target_atom())
         ):
             return target_atom
-        self.reset(mark)
-        if cut: return None
+        self._reset(mark)
         return None
 
     @memoize
     def target_atom(self) -> Optional[str]:
-        # target_atom: "{" ~ target_atoms "}" | NAME | NUMBER | STRING | "?" | ":" | !"}" OP
-        mark = self.mark()
+        # target_atom: "{" ~ target_atoms? "}" | "[" ~ target_atoms? "]" | NAME "*" | NAME | NUMBER | STRING | "?" | ":" | !"}" !"]" OP
+        mark = self._mark()
         cut = False
         if (
             (literal := self.expect("{"))
             and
             (cut := True)
             and
-            (target_atoms := self.target_atoms())
+            (atoms := self.target_atoms(),)
             and
             (literal_1 := self.expect("}"))
         ):
-            return "{" + target_atoms + "}"
-        self.reset(mark)
+            return "{" + ( atoms or "" ) + "}"
+        self._reset(mark)
         if cut: return None
         cut = False
+        if (
+            (literal := self.expect("["))
+            and
+            (cut := True)
+            and
+            (atoms := self.target_atoms(),)
+            and
+            (literal_1 := self.expect("]"))
+        ):
+            return "[" + ( atoms or "" ) + "]"
+        self._reset(mark)
+        if cut: return None
+        if (
+            (name := self.name())
+            and
+            (literal := self.expect("*"))
+        ):
+            return name . string + "*"
+        self._reset(mark)
         if (
             (name := self.name())
         ):
             return name . string
-        self.reset(mark)
-        if cut: return None
-        cut = False
+        self._reset(mark)
         if (
             (number := self.number())
         ):
             return number . string
-        self.reset(mark)
-        if cut: return None
-        cut = False
+        self._reset(mark)
         if (
             (string := self.string())
         ):
             return string . string
-        self.reset(mark)
-        if cut: return None
-        cut = False
+        self._reset(mark)
         if (
             (literal := self.expect("?"))
         ):
             return "?"
-        self.reset(mark)
-        if cut: return None
-        cut = False
+        self._reset(mark)
         if (
             (literal := self.expect(":"))
         ):
             return ":"
-        self.reset(mark)
-        if cut: return None
-        cut = False
+        self._reset(mark)
         if (
             self.negative_lookahead(self.expect, "}")
             and
+            self.negative_lookahead(self.expect, "]")
+            and
             (op := self.op())
         ):
             return op . string
-        self.reset(mark)
-        if cut: return None
+        self._reset(mark)
         return None
 
+    KEYWORDS = ()
+    SOFT_KEYWORDS = ('memo',)
+
 
 if __name__ == '__main__':
     from pegen.parser import simple_parser_main
diff --git a/Tools/peg_generator/pegen/keywordgen.py b/Tools/peg_generator/pegen/keywordgen.py
index 2937ddb512aa8f..6a07f6e8b7bfe3 100644
--- a/Tools/peg_generator/pegen/keywordgen.py
+++ b/Tools/peg_generator/pegen/keywordgen.py
@@ -38,7 +38,7 @@
 EXTRA_KEYWORDS = ["async", "await"]
 
 
-def main():
+def main() -> None:
     parser = argparse.ArgumentParser(
         description="Generate the Lib/keywords.py file from the grammar."
     )
@@ -58,9 +58,7 @@ def main():
     grammar, _, _ = build_parser(args.grammar)
     with args.tokens_file as tok_file:
         all_tokens, exact_tok, non_exact_tok = generate_token_definitions(tok_file)
-    gen: ParserGenerator = CParserGenerator(
-        grammar, all_tokens, exact_tok, non_exact_tok, file=None
-    )
+    gen = CParserGenerator(grammar, all_tokens, exact_tok, non_exact_tok, file=None)
     gen.collect_todo()
 
     with args.keyword_file as thefile:
@@ -68,7 +66,9 @@ def main():
         all_soft_keywords = sorted(gen.callmakervisitor.soft_keywords)
 
         keywords = "" if not all_keywords else "    " + ",\n    ".join(map(repr, all_keywords))
-        soft_keywords = "" if not all_soft_keywords else "    " + ",\n    ".join(map(repr, all_soft_keywords))
+        soft_keywords = (
+            "" if not all_soft_keywords else "    " + ",\n    ".join(map(repr, all_soft_keywords))
+        )
         thefile.write(TEMPLATE.format(keywords=keywords, soft_keywords=soft_keywords))
 
 
diff --git a/Tools/peg_generator/pegen/metagrammar.gram b/Tools/peg_generator/pegen/metagrammar.gram
index bb4355fd189e05..f22c334ca371b2 100644
--- a/Tools/peg_generator/pegen/metagrammar.gram
+++ b/Tools/peg_generator/pegen/metagrammar.gram
@@ -57,13 +57,12 @@ rule[Rule]:
     | rulename memoflag? ":" alts NEWLINE { Rule(rulename[0], rulename[1], alts, memo=opt) }
 
 rulename[RuleName]:
-    | NAME '[' type=NAME '*' ']' { (name.string, type.string+"*") }
-    | NAME '[' type=NAME ']' { (name.string, type.string) }
+    | NAME annotation { (name.string, annotation) }
     | NAME { (name.string, None) }
 
 # In the future this may return something more complicated
 memoflag[str]:
-    | '(' 'memo' ')' { "memo" }
+    | '(' "memo" ')' { "memo" }
 
 alts[Rhs]:
     | alt "|" alts { Rhs([alt] + alts.alts)}
@@ -84,14 +83,13 @@ items[NamedItemList]:
     | named_item { [named_item] }
 
 named_item[NamedItem]:
-    | NAME '[' type=NAME '*' ']' '=' ~ item {NamedItem(name.string, item, f"{type.string}*")}
-    | NAME '[' type=NAME ']' '=' ~ item {NamedItem(name.string, item, type.string)}
+    | NAME annotation '=' ~ item {NamedItem(name.string, item, annotation)}
     | NAME '=' ~ item {NamedItem(name.string, item)}
     | item {NamedItem(None, item)}
-    | it=forced_atom {NamedItem(None, it)}
+    | forced=forced_atom {NamedItem(None, forced)}
     | it=lookahead {NamedItem(None, it)}
 
-forced_atom[NamedItem]:
+forced_atom[Forced]:
     | '&''&' ~ atom {Forced(atom)}
 
 lookahead[LookaheadOrCut]:
@@ -112,19 +110,22 @@ atom[Plain]:
     | NAME {NameLeaf(name.string) }
     | STRING {StringLeaf(string.string)}
 
-# Mini-grammar for the actions
+# Mini-grammar for the actions and annotations
 
 action[str]: "{" ~ target_atoms "}" { target_atoms }
+annotation[str]: "[" ~ target_atoms "]" { target_atoms }
 
 target_atoms[str]:
     | target_atom target_atoms { target_atom + " " + target_atoms }
     | target_atom { target_atom }
 
 target_atom[str]:
-    | "{" ~ target_atoms "}" { "{" + target_atoms + "}" }
+    | "{" ~ atoms=target_atoms? "}" { "{" + (atoms or "") + "}" }
+    | "[" ~ atoms=target_atoms? "]" { "[" + (atoms or "") + "]" }
+    | NAME "*" { name.string + "*" }
     | NAME { name.string }
     | NUMBER { number.string }
     | STRING { string.string }
     | "?" { "?" }
     | ":" { ":" }
-    | !"}" OP { op.string }
+    | !"}" !"]" OP { op.string }
diff --git a/Tools/peg_generator/pegen/parser.py b/Tools/peg_generator/pegen/parser.py
index 16d954dce89f7e..4ce60e35dd0e0f 100644
--- a/Tools/peg_generator/pegen/parser.py
+++ b/Tools/peg_generator/pegen/parser.py
@@ -4,13 +4,10 @@
 import token
 import tokenize
 import traceback
-
 from abc import abstractmethod
-from typing import Any, Callable, cast, Dict, Optional, Tuple, Type, TypeVar
+from typing import Any, Callable, ClassVar, Dict, Optional, Tuple, Type, TypeVar, cast
 
-from pegen.tokenizer import exact_token_types
-from pegen.tokenizer import Mark
-from pegen.tokenizer import Tokenizer
+from pegen.tokenizer import Mark, Tokenizer, exact_token_types
 
 T = TypeVar("T")
 P = TypeVar("P", bound="Parser")
@@ -45,12 +42,12 @@ def memoize(method: F) -> F:
     method_name = method.__name__
 
     def memoize_wrapper(self: P, *args: object) -> T:
-        mark = self.mark()
+        mark = self._mark()
         key = mark, method_name, args
         # Fast path: cache hit, and not verbose.
         if key in self._cache and not self._verbose:
             tree, endmark = self._cache[key]
-            self.reset(endmark)
+            self._reset(endmark)
             return tree
         # Slow path: no cache hit, or verbose.
         verbose = self._verbose
@@ -64,13 +61,13 @@ def memoize_wrapper(self: P, *args: object) -> T:
             self._level -= 1
             if verbose:
                 print(f"{fill}... {method_name}({argsr}) -> {tree!s:.200}")
-            endmark = self.mark()
+            endmark = self._mark()
             self._cache[key] = tree, endmark
         else:
             tree, endmark = self._cache[key]
             if verbose:
                 print(f"{fill}{method_name}({argsr}) -> {tree!s:.200}")
-            self.reset(endmark)
+            self._reset(endmark)
         return tree
 
     memoize_wrapper.__wrapped__ = method  # type: ignore
@@ -82,12 +79,12 @@ def memoize_left_rec(method: Callable[[P], Optional[T]]) -> Callable[[P], Option
     method_name = method.__name__
 
     def memoize_left_rec_wrapper(self: P) -> Optional[T]:
-        mark = self.mark()
+        mark = self._mark()
         key = mark, method_name, ()
         # Fast path: cache hit, and not verbose.
         if key in self._cache and not self._verbose:
             tree, endmark = self._cache[key]
-            self.reset(endmark)
+            self._reset(endmark)
             return tree
         # Slow path: no cache hit, or verbose.
         verbose = self._verbose
@@ -113,9 +110,13 @@ def memoize_left_rec_wrapper(self: P) -> Optional[T]:
                 print(f"{fill}Recursive {method_name} at {mark} depth {depth}")
 
             while True:
-                self.reset(mark)
-                result = method(self)
-                endmark = self.mark()
+                self._reset(mark)
+                self.in_recursive_rule += 1
+                try:
+                    result = method(self)
+                finally:
+                    self.in_recursive_rule -= 1
+                endmark = self._mark()
                 depth += 1
                 if verbose:
                     print(
@@ -131,24 +132,24 @@ def memoize_left_rec_wrapper(self: P) -> Optional[T]:
                     break
                 self._cache[key] = lastresult, lastmark = result, endmark
 
-            self.reset(lastmark)
+            self._reset(lastmark)
             tree = lastresult
 
             self._level -= 1
             if verbose:
                 print(f"{fill}{method_name}() -> {tree!s:.200} [cached]")
             if tree:
-                endmark = self.mark()
+                endmark = self._mark()
             else:
                 endmark = mark
-                self.reset(endmark)
+                self._reset(endmark)
             self._cache[key] = tree, endmark
         else:
             tree, endmark = self._cache[key]
             if verbose:
                 print(f"{fill}{method_name}() -> {tree!s:.200} [fresh]")
             if tree:
-                self.reset(endmark)
+                self._reset(endmark)
         return tree
 
     memoize_left_rec_wrapper.__wrapped__ = method  # type: ignore
@@ -158,15 +159,21 @@ def memoize_left_rec_wrapper(self: P) -> Optional[T]:
 class Parser:
     """Parsing base class."""
 
+    KEYWORDS: ClassVar[Tuple[str, ...]]
+
+    SOFT_KEYWORDS: ClassVar[Tuple[str, ...]]
+
     def __init__(self, tokenizer: Tokenizer, *, verbose: bool = False):
         self._tokenizer = tokenizer
         self._verbose = verbose
         self._level = 0
         self._cache: Dict[Tuple[Mark, str, Tuple[Any, ...]], Tuple[Any, Mark]] = {}
+        # Integer tracking wether we are in a left recursive rule or not. Can be useful
+        # for error reporting.
+        self.in_recursive_rule = 0
         # Pass through common tokenizer methods.
-        # TODO: Rename to _mark and _reset.
-        self.mark = self._tokenizer.mark
-        self.reset = self._tokenizer.reset
+        self._mark = self._tokenizer.mark
+        self._reset = self._tokenizer.reset
 
     @abstractmethod
     def start(self) -> Any:
@@ -179,7 +186,7 @@ def showpeek(self) -> str:
     @memoize
     def name(self) -> Optional[tokenize.TokenInfo]:
         tok = self._tokenizer.peek()
-        if tok.type == token.NAME:
+        if tok.type == token.NAME and tok.string not in self.KEYWORDS:
             return self._tokenizer.getnext()
         return None
 
@@ -204,6 +211,20 @@ def op(self) -> Optional[tokenize.TokenInfo]:
             return self._tokenizer.getnext()
         return None
 
+    @memoize
+    def type_comment(self) -> Optional[tokenize.TokenInfo]:
+        tok = self._tokenizer.peek()
+        if tok.type == token.TYPE_COMMENT:
+            return self._tokenizer.getnext()
+        return None
+
+    @memoize
+    def soft_keyword(self) -> Optional[tokenize.TokenInfo]:
+        tok = self._tokenizer.peek()
+        if tok.type == token.NAME and tok.string in self.SOFT_KEYWORDS:
+            return self._tokenizer.getnext()
+        return None
+
     @memoize
     def expect(self, type: str) -> Optional[tokenize.TokenInfo]:
         tok = self._tokenizer.peek()
@@ -219,23 +240,26 @@ def expect(self, type: str) -> Optional[tokenize.TokenInfo]:
             return self._tokenizer.getnext()
         return None
 
+    def expect_forced(self, res: Any, expectation: str) -> Optional[tokenize.TokenInfo]:
+        if res is None:
+            raise self.make_syntax_error(f"expected {expectation}")
+        return res
+
     def positive_lookahead(self, func: Callable[..., T], *args: object) -> T:
-        mark = self.mark()
+        mark = self._mark()
         ok = func(*args)
-        self.reset(mark)
+        self._reset(mark)
         return ok
 
     def negative_lookahead(self, func: Callable[..., object], *args: object) -> bool:
-        mark = self.mark()
+        mark = self._mark()
         ok = func(*args)
-        self.reset(mark)
+        self._reset(mark)
         return not ok
 
-    def make_syntax_error(self, filename: str = "<unknown>") -> SyntaxError:
+    def make_syntax_error(self, message: str, filename: str = "<unknown>") -> SyntaxError:
         tok = self._tokenizer.diagnose()
-        return SyntaxError(
-            "pegen parse failure", (filename, tok.start[0], 1 + tok.start[1], tok.line)
-        )
+        return SyntaxError(message, (filename, tok.start[0], 1 + tok.start[1], tok.line))
 
 
 def simple_parser_main(parser_class: Type[Parser]) -> None:
diff --git a/Tools/peg_generator/pegen/parser_generator.py b/Tools/peg_generator/pegen/parser_generator.py
index 364eccb84f4792..33ecee1ed441f9 100644
--- a/Tools/peg_generator/pegen/parser_generator.py
+++ b/Tools/peg_generator/pegen/parser_generator.py
@@ -1,30 +1,29 @@
 import contextlib
 from abc import abstractmethod
-
-from typing import AbstractSet, Dict, IO, Iterator, List, Optional, Set, Text, Tuple
+from typing import IO, AbstractSet, Dict, Iterator, List, Optional, Set, Text, Tuple
 
 from pegen import sccutils
 from pegen.grammar import (
-    Grammar,
-    Rule,
-    Rhs,
     Alt,
+    Gather,
+    Grammar,
+    GrammarError,
+    GrammarVisitor,
     NamedItem,
-    Plain,
     NameLeaf,
-    Gather,
+    Plain,
+    Rhs,
+    Rule,
 )
-from pegen.grammar import GrammarError, GrammarVisitor
 
 
 class RuleCheckingVisitor(GrammarVisitor):
-    def __init__(self, rules: Dict[str, Rule], tokens: Dict[int, str]):
+    def __init__(self, rules: Dict[str, Rule], tokens: Set[str]):
         self.rules = rules
         self.tokens = tokens
 
     def visit_NameLeaf(self, node: NameLeaf) -> None:
-        if node.value not in self.rules and node.value not in self.tokens.values():
-            # TODO: Add line/col info to (leaf) nodes
+        if node.value not in self.rules and node.value not in self.tokens:
             raise GrammarError(f"Dangling reference to rule {node.value!r}")
 
     def visit_NamedItem(self, node: NamedItem) -> None:
@@ -37,7 +36,7 @@ class ParserGenerator:
 
     callmakervisitor: GrammarVisitor
 
-    def __init__(self, grammar: Grammar, tokens: Dict[int, str], file: Optional[IO[Text]]):
+    def __init__(self, grammar: Grammar, tokens: Set[str], file: Optional[IO[Text]]):
         self.grammar = grammar
         self.tokens = tokens
         self.rules = grammar.rules
@@ -133,13 +132,22 @@ def name_gather(self, node: Gather) -> str:
         self.counter += 1
         extra_function_name = f"_loop0_{self.counter}"
         extra_function_alt = Alt(
-            [NamedItem(None, node.separator), NamedItem("elem", node.node)], action="elem",
+            [NamedItem(None, node.separator), NamedItem("elem", node.node)],
+            action="elem",
         )
         self.todo[extra_function_name] = Rule(
-            extra_function_name, None, Rhs([extra_function_alt]),
+            extra_function_name,
+            None,
+            Rhs([extra_function_alt]),
+        )
+        alt = Alt(
+            [NamedItem("elem", node.node), NamedItem("seq", NameLeaf(extra_function_name))],
+        )
+        self.todo[name] = Rule(
+            name,
+            None,
+            Rhs([alt]),
         )
-        alt = Alt([NamedItem("elem", node.node), NamedItem("seq", NameLeaf(extra_function_name))],)
-        self.todo[name] = Rule(name, None, Rhs([alt]),)
         return name
 
     def dedupe(self, name: str) -> str:
diff --git a/Tools/peg_generator/pegen/python_generator.py b/Tools/peg_generator/pegen/python_generator.py
index b500e3e204a5d4..201bf2baa805ff 100644
--- a/Tools/peg_generator/pegen/python_generator.py
+++ b/Tools/peg_generator/pegen/python_generator.py
@@ -1,25 +1,28 @@
+import ast
+import re
 import token
-from typing import Any, Dict, Optional, IO, Text, Tuple
+from typing import IO, Any, Dict, Optional, Sequence, Set, Text, Tuple
 
+from pegen import grammar
 from pegen.grammar import (
+    Alt,
     Cut,
+    Forced,
+    Gather,
     GrammarVisitor,
-    NameLeaf,
-    StringLeaf,
-    Rhs,
-    NamedItem,
+    Group,
     Lookahead,
-    PositiveLookahead,
+    NamedItem,
+    NameLeaf,
     NegativeLookahead,
     Opt,
+    PositiveLookahead,
     Repeat0,
     Repeat1,
-    Gather,
-    Group,
+    Rhs,
     Rule,
-    Alt,
+    StringLeaf,
 )
-from pegen import grammar
 from pegen.parser_generator import ParserGenerator
 
 MODULE_PREFIX = """\
@@ -27,7 +30,10 @@
 # @generated by pegen from {filename}
 
 import ast
-from typing import Optional, Any
+import sys
+import tokenize
+
+from typing import Any, Optional
 
 from pegen.parser import memoize, memoize_left_rec, logger, Parser
 
@@ -36,25 +42,81 @@
 
 if __name__ == '__main__':
     from pegen.parser import simple_parser_main
-    simple_parser_main(GeneratedParser)
+    simple_parser_main({class_name})
 """
 
 
+class InvalidNodeVisitor(GrammarVisitor):
+    def visit_NameLeaf(self, node: NameLeaf) -> bool:
+        name = node.value
+        return name.startswith("invalid")
+
+    def visit_StringLeaf(self, node: StringLeaf) -> bool:
+        return False
+
+    def visit_NamedItem(self, node: NamedItem) -> bool:
+        return self.visit(node.item)
+
+    def visit_Rhs(self, node: Rhs) -> bool:
+        return any(self.visit(alt) for alt in node.alts)
+
+    def visit_Alt(self, node: Alt) -> bool:
+        return any(self.visit(item) for item in node.items)
+
+    def lookahead_call_helper(self, node: Lookahead) -> bool:
+        return self.visit(node.node)
+
+    def visit_PositiveLookahead(self, node: PositiveLookahead) -> bool:
+        return self.lookahead_call_helper(node)
+
+    def visit_NegativeLookahead(self, node: NegativeLookahead) -> bool:
+        return self.lookahead_call_helper(node)
+
+    def visit_Opt(self, node: Opt) -> bool:
+        return self.visit(node.node)
+
+    def visit_Repeat(self, node: Repeat0) -> Tuple[str, str]:
+        return self.visit(node.node)
+
+    def visit_Gather(self, node: Gather) -> Tuple[str, str]:
+        return self.visit(node.node)
+
+    def visit_Group(self, node: Group) -> bool:
+        return self.visit(node.rhs)
+
+    def visit_Cut(self, node: Cut) -> bool:
+        return False
+
+    def visit_Forced(self, node: Forced) -> bool:
+        return self.visit(node.node)
+
+
 class PythonCallMakerVisitor(GrammarVisitor):
     def __init__(self, parser_generator: ParserGenerator):
         self.gen = parser_generator
         self.cache: Dict[Any, Any] = {}
+        self.keywords: Set[str] = set()
+        self.soft_keywords: Set[str] = set()
 
     def visit_NameLeaf(self, node: NameLeaf) -> Tuple[Optional[str], str]:
         name = node.value
-        if name in ("NAME", "NUMBER", "STRING", "OP"):
+        if name == "SOFT_KEYWORD":
+            return "soft_keyword", "self.soft_keyword()"
+        if name in ("NAME", "NUMBER", "STRING", "OP", "TYPE_COMMENT"):
             name = name.lower()
             return name, f"self.{name}()"
         if name in ("NEWLINE", "DEDENT", "INDENT", "ENDMARKER", "ASYNC", "AWAIT"):
-            return name.lower(), f"self.expect({name!r})"
+            # Avoid using names that can be Python keywords
+            return "_" + name.lower(), f"self.expect({name!r})"
         return name, f"self.{name}()"
 
     def visit_StringLeaf(self, node: StringLeaf) -> Tuple[str, str]:
+        val = ast.literal_eval(node.value)
+        if re.match(r"[a-zA-Z_]\w*\Z", val):  # This is a keyword
+            if node.value.endswith("'"):
+                self.keywords.add(val)
+            else:
+                self.soft_keywords.add(val)
         return "literal", f"self.expect({node.value})"
 
     def visit_Rhs(self, node: Rhs) -> Tuple[Optional[str], str]:
@@ -125,16 +187,36 @@ def visit_Group(self, node: Group) -> Tuple[Optional[str], str]:
     def visit_Cut(self, node: Cut) -> Tuple[str, str]:
         return "cut", "True"
 
+    def visit_Forced(self, node: Forced) -> Tuple[str, str]:
+        if isinstance(node.node, Group):
+            _, val = self.visit(node.node.rhs)
+            return "forced", f"self.expect_forced({val}, '''({node.node.rhs!s})''')"
+        else:
+            return (
+                "forced",
+                f"self.expect_forced(self.expect({node.node.value}), {node.node.value!r})",
+            )
+
 
 class PythonParserGenerator(ParserGenerator, GrammarVisitor):
     def __init__(
         self,
         grammar: grammar.Grammar,
         file: Optional[IO[Text]],
-        tokens: Dict[int, str] = token.tok_name,
+        tokens: Set[str] = set(token.tok_name.values()),
+        location_formatting: Optional[str] = None,
+        unreachable_formatting: Optional[str] = None,
     ):
+        tokens.add("SOFT_KEYWORD")
         super().__init__(grammar, tokens, file)
-        self.callmakervisitor = PythonCallMakerVisitor(self)
+        self.callmakervisitor: PythonCallMakerVisitor = PythonCallMakerVisitor(self)
+        self.invalidvisitor: InvalidNodeVisitor = InvalidNodeVisitor()
+        self.unreachable_formatting = unreachable_formatting or "None  # pragma: no cover"
+        self.location_formatting = (
+            location_formatting
+            or "lineno=start_lineno, col_offset=start_col_offset, "
+            "end_lineno=end_lineno, end_col_offset=end_col_offset"
+        )
 
     def generate(self, filename: str) -> None:
         header = self.grammar.metas.get("header", MODULE_PREFIX)
@@ -142,18 +224,35 @@ def generate(self, filename: str) -> None:
             self.print(header.rstrip("\n").format(filename=filename))
         subheader = self.grammar.metas.get("subheader", "")
         if subheader:
-            self.print(subheader.format(filename=filename))
-        self.print("class GeneratedParser(Parser):")
+            self.print(subheader)
+        cls_name = self.grammar.metas.get("class", "GeneratedParser")
+        self.print("# Keywords and soft keywords are listed at the end of the parser definition.")
+        self.print(f"class {cls_name}(Parser):")
         while self.todo:
             for rulename, rule in list(self.todo.items()):
                 del self.todo[rulename]
                 self.print()
                 with self.indent():
                     self.visit(rule)
-        trailer = self.grammar.metas.get("trailer", MODULE_SUFFIX)
+
+        self.print()
+        with self.indent():
+            self.print(f"KEYWORDS = {tuple(self.callmakervisitor.keywords)}")
+            self.print(f"SOFT_KEYWORDS = {tuple(self.callmakervisitor.soft_keywords)}")
+
+        trailer = self.grammar.metas.get("trailer", MODULE_SUFFIX.format(class_name=cls_name))
         if trailer is not None:
             self.print(trailer.rstrip("\n"))
 
+    def alts_uses_locations(self, alts: Sequence[Alt]) -> bool:
+        for alt in alts:
+            if alt.action and "LOCATIONS" in alt.action:
+                return True
+            for n in alt.items:
+                if isinstance(n.item, Group) and self.alts_uses_locations(n.item.rhs.alts):
+                    return True
+        return False
+
     def visit_Rule(self, node: Rule) -> None:
         is_loop = node.is_loop()
         is_gather = node.is_gather()
@@ -173,7 +272,10 @@ def visit_Rule(self, node: Rule) -> None:
             self.print(f"# {node.name}: {rhs}")
             if node.nullable:
                 self.print(f"# nullable={node.nullable}")
-            self.print("mark = self.mark()")
+            self.print("mark = self._mark()")
+            if self.alts_uses_locations(node.rhs.alts):
+                self.print("tok = self._tokenizer.peek()")
+                self.print("start_lineno, start_col_offset = tok.start")
             if is_loop:
                 self.print("children = []")
             self.visit(rhs, is_loop=is_loop, is_gather=is_gather)
@@ -200,8 +302,10 @@ def visit_Rhs(self, node: Rhs, is_loop: bool = False, is_gather: bool = False) -
             self.visit(alt, is_loop=is_loop, is_gather=is_gather)
 
     def visit_Alt(self, node: Alt, is_loop: bool, is_gather: bool) -> None:
+        has_cut = any(isinstance(item.item, Cut) for item in node.items)
         with self.local_variable_context():
-            self.print("cut = False")  # TODO: Only if needed.
+            if has_cut:
+                self.print("cut = False")
             if is_loop:
                 self.print("while (")
             else:
@@ -227,12 +331,26 @@ def visit_Alt(self, node: Alt, is_loop: bool, is_gather: bool) -> None:
                             f"[{self.local_variable_names[0]}] + {self.local_variable_names[1]}"
                         )
                     else:
-                        action = f"[{', '.join(self.local_variable_names)}]"
+                        if self.invalidvisitor.visit(node):
+                            action = "UNREACHABLE"
+                        elif len(self.local_variable_names) == 1:
+                            action = f"{self.local_variable_names[0]}"
+                        else:
+                            action = f"[{', '.join(self.local_variable_names)}]"
+                elif "LOCATIONS" in action:
+                    self.print("tok = self._tokenizer.get_last_non_whitespace_token()")
+                    self.print("end_lineno, end_col_offset = tok.end")
+                    action = action.replace("LOCATIONS", self.location_formatting)
+
                 if is_loop:
                     self.print(f"children.append({action})")
-                    self.print(f"mark = self.mark()")
+                    self.print(f"mark = self._mark()")
                 else:
+                    if "UNREACHABLE" in action:
+                        action = action.replace("UNREACHABLE", self.unreachable_formatting)
                     self.print(f"return {action}")
-            self.print("self.reset(mark)")
+
+            self.print("self._reset(mark)")
             # Skip remaining alternatives if a cut was reached.
-            self.print("if cut: return None")  # TODO: Only if needed.
+            if has_cut:
+                self.print("if cut: return None")
diff --git a/Tools/peg_generator/pegen/testutil.py b/Tools/peg_generator/pegen/testutil.py
index 920d24657c5edf..e0928a4af701d8 100644
--- a/Tools/peg_generator/pegen/testutil.py
+++ b/Tools/peg_generator/pegen/testutil.py
@@ -18,7 +18,7 @@
 from pegen.tokenizer import Tokenizer
 
 ALL_TOKENS = token.tok_name
-EXACT_TOKENS = token.EXACT_TOKEN_TYPES  # type: ignore
+EXACT_TOKENS = token.EXACT_TOKEN_TYPES
 NON_EXACT_TOKENS = {
     name for index, name in token.tok_name.items() if index not in EXACT_TOKENS.values()
 }
@@ -42,7 +42,7 @@ def run_parser(file: IO[bytes], parser_class: Type[Parser], *, verbose: bool = F
     parser = parser_class(tokenizer, verbose=verbose)
     result = parser.start()
     if result is None:
-        raise parser.make_syntax_error()
+        raise parser.make_syntax_error("invalid syntax")
     return result
 
 
@@ -66,6 +66,7 @@ def import_file(full_name: str, path: str) -> Any:
     """Import a python module from a path"""
 
     spec = importlib.util.spec_from_file_location(full_name, path)
+    assert spec is not None
     mod = importlib.util.module_from_spec(spec)
 
     # We assume this is not None and has an exec_module() method.
diff --git a/Tools/peg_generator/pegen/tokenizer.py b/Tools/peg_generator/pegen/tokenizer.py
index 61a28efc84b62b..7ee49e1432b77a 100644
--- a/Tools/peg_generator/pegen/tokenizer.py
+++ b/Tools/peg_generator/pegen/tokenizer.py
@@ -1,10 +1,10 @@
 import token
 import tokenize
-from typing import List, Iterator
+from typing import Dict, Iterator, List
 
 Mark = int  # NewType('Mark', int)
 
-exact_token_types = token.EXACT_TOKEN_TYPES  # type: ignore
+exact_token_types = token.EXACT_TOKEN_TYPES
 
 
 def shorttok(tok: tokenize.TokenInfo) -> str:
@@ -19,26 +19,22 @@ class Tokenizer:
 
     _tokens: List[tokenize.TokenInfo]
 
-    def __init__(self, tokengen: Iterator[tokenize.TokenInfo], *, verbose: bool = False):
+    def __init__(
+        self, tokengen: Iterator[tokenize.TokenInfo], *, path: str = "", verbose: bool = False
+    ):
         self._tokengen = tokengen
         self._tokens = []
         self._index = 0
         self._verbose = verbose
+        self._lines: Dict[int, str] = {}
+        self._path = path
         if verbose:
             self.report(False, False)
 
     def getnext(self) -> tokenize.TokenInfo:
         """Return the next token and updates the index."""
-        cached = True
-        while self._index == len(self._tokens):
-            tok = next(self._tokengen)
-            if tok.type in (tokenize.NL, tokenize.COMMENT):
-                continue
-            if tok.type == token.ERRORTOKEN and tok.string.isspace():
-                continue
-            self._tokens.append(tok)
-            cached = False
-        tok = self._tokens[self._index]
+        cached = not self._index == len(self._tokens)
+        tok = self.peek()
         self._index += 1
         if self._verbose:
             self.report(cached, False)
@@ -52,7 +48,15 @@ def peek(self) -> tokenize.TokenInfo:
                 continue
             if tok.type == token.ERRORTOKEN and tok.string.isspace():
                 continue
+            if (
+                tok.type == token.NEWLINE
+                and self._tokens
+                and self._tokens[-1].type == token.NEWLINE
+            ):
+                continue
             self._tokens.append(tok)
+            if not self._path:
+                self._lines[tok.start[0]] = tok.line
         return self._tokens[self._index]
 
     def diagnose(self) -> tokenize.TokenInfo:
@@ -60,6 +64,34 @@ def diagnose(self) -> tokenize.TokenInfo:
             self.getnext()
         return self._tokens[-1]
 
+    def get_last_non_whitespace_token(self) -> tokenize.TokenInfo:
+        for tok in reversed(self._tokens[: self._index]):
+            if tok.type != tokenize.ENDMARKER and (
+                tok.type < tokenize.NEWLINE or tok.type > tokenize.DEDENT
+            ):
+                break
+        return tok
+
+    def get_lines(self, line_numbers: List[int]) -> List[str]:
+        """Retrieve source lines corresponding to line numbers."""
+        if self._lines:
+            lines = self._lines
+        else:
+            n = len(line_numbers)
+            lines = {}
+            count = 0
+            seen = 0
+            with open(self._path) as f:
+                for l in f:
+                    count += 1
+                    if count in line_numbers:
+                        seen += 1
+                        lines[count] = l
+                        if seen == n:
+                            break
+
+        return [lines[n] for n in line_numbers]
+
     def mark(self) -> Mark:
         return self._index
 
diff --git a/Tools/peg_generator/pegen/validator.py b/Tools/peg_generator/pegen/validator.py
index 0e3dd41cca4edd..e7d6980d8b2dda 100644
--- a/Tools/peg_generator/pegen/validator.py
+++ b/Tools/peg_generator/pegen/validator.py
@@ -1,51 +1,45 @@
+from typing import Optional
+
 from pegen import grammar
 from pegen.grammar import (
     Alt,
-    Cut,
-    Gather,
     GrammarVisitor,
-    Group,
-    Lookahead,
-    NamedItem,
-    NameLeaf,
-    NegativeLookahead,
-    Opt,
-    PositiveLookahead,
-    Repeat0,
-    Repeat1,
-    Rhs,
     Rule,
-    StringLeaf,
+    Rhs,
 )
 
+
 class ValidationError(Exception):
     pass
 
+
 class GrammarValidator(GrammarVisitor):
-    def __init__(self, grammar: grammar.Grammar):
+    def __init__(self, grammar: grammar.Grammar) -> None:
         self.grammar = grammar
-        self.rulename = None
+        self.rulename: Optional[str] = None
 
-    def validate_rule(self, rulename: str, node: Rule):
+    def validate_rule(self, rulename: str, node: Rule) -> None:
         self.rulename = rulename
         self.visit(node)
         self.rulename = None
 
 
 class SubRuleValidator(GrammarValidator):
-    def visit_Rhs(self, node: Rule):
+    def visit_Rhs(self, node: Rhs) -> None:
         for index, alt in enumerate(node.alts):
-            alts_to_consider = node.alts[index+1:]
+            alts_to_consider = node.alts[index + 1 :]
             for other_alt in alts_to_consider:
                 self.check_intersection(alt, other_alt)
 
-    def check_intersection(self, first_alt: Alt, second_alt: Alt) -> bool:
+    def check_intersection(self, first_alt: Alt, second_alt: Alt) -> None:
         if str(second_alt).startswith(str(first_alt)):
             raise ValidationError(
-                    f"In {self.rulename} there is an alternative that will "
-                    f"never be visited:\n{second_alt}")
+                f"In {self.rulename} there is an alternative that will "
+                f"never be visited:\n{second_alt}"
+            )
+
 
-def validate_grammar(the_grammar: grammar.Grammar):
+def validate_grammar(the_grammar: grammar.Grammar) -> None:
     for validator_cls in GrammarValidator.__subclasses__():
         validator = validator_cls(the_grammar)
         for rule_name, rule in the_grammar.rules.items():
diff --git a/Tools/peg_generator/scripts/benchmark.py b/Tools/peg_generator/scripts/benchmark.py
index 5fbedaa3b0ed11..4a063bf10034c8 100644
--- a/Tools/peg_generator/scripts/benchmark.py
+++ b/Tools/peg_generator/scripts/benchmark.py
@@ -76,7 +76,10 @@ def run_benchmark_stdlib(subcommand):
         parse_directory(
             "../../Lib",
             verbose=False,
-            excluded_files=["*/bad*", "*/lib2to3/tests/data/*",],
+            excluded_files=[
+                "*/bad*",
+                "*/lib2to3/tests/data/*",
+            ],
             short=True,
             mode=modes[subcommand],
         )
diff --git a/Tools/peg_generator/scripts/download_pypi_packages.py b/Tools/peg_generator/scripts/download_pypi_packages.py
index 9874202d379eef..0af876c3ecad4d 100755
--- a/Tools/peg_generator/scripts/download_pypi_packages.py
+++ b/Tools/peg_generator/scripts/download_pypi_packages.py
@@ -8,7 +8,8 @@
 from urllib.request import urlretrieve
 
 argparser = argparse.ArgumentParser(
-    prog="download_pypi_packages", description="Helper program to download PyPI packages",
+    prog="download_pypi_packages",
+    description="Helper program to download PyPI packages",
 )
 argparser.add_argument(
     "-n", "--number", type=int, default=100, help="Number of packages to download"
diff --git a/Tools/peg_generator/scripts/grammar_grapher.py b/Tools/peg_generator/scripts/grammar_grapher.py
index 4afdbce8f966f2..4d771239c2954d 100755
--- a/Tools/peg_generator/scripts/grammar_grapher.py
+++ b/Tools/peg_generator/scripts/grammar_grapher.py
@@ -41,7 +41,10 @@
     Rhs,
 )
 
-argparser = argparse.ArgumentParser(prog="graph_grammar", description="Graph a grammar tree",)
+argparser = argparse.ArgumentParser(
+    prog="graph_grammar",
+    description="Graph a grammar tree",
+)
 argparser.add_argument(
     "-s",
     "--start",
diff --git a/Tools/peg_generator/scripts/test_pypi_packages.py b/Tools/peg_generator/scripts/test_pypi_packages.py
index f014753b3cd23e..e2eaef9de26f73 100755
--- a/Tools/peg_generator/scripts/test_pypi_packages.py
+++ b/Tools/peg_generator/scripts/test_pypi_packages.py
@@ -19,7 +19,8 @@
 HERE = pathlib.Path(__file__).resolve().parent
 
 argparser = argparse.ArgumentParser(
-    prog="test_pypi_packages", description="Helper program to test parsing PyPI packages",
+    prog="test_pypi_packages",
+    description="Helper program to test parsing PyPI packages",
 )
 argparser.add_argument(
     "-t", "--tree", action="count", help="Compare parse tree to official AST", default=0


From webhook-mailer at python.org  Thu Aug 12 12:41:26 2021
From: webhook-mailer at python.org (pablogsal)
Date: Thu, 12 Aug 2021 16:41:26 -0000
Subject: [Python-checkins] [3.10] bpo-44885: Correct the ast locations of
 f-strings with format specs and repeated expressions (GH-27729) (GH-27743)
Message-ID: <mailman.1015.1628786487.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/c28c2e1cb0dd5fc8b17514e2c4ee17415af733a4
commit: c28c2e1cb0dd5fc8b17514e2c4ee17415af733a4
branch: 3.10
author: Pablo Galindo Salgado <Pablogsal at gmail.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-08-12T17:41:21+01:00
summary:

[3.10] bpo-44885: Correct the ast locations of f-strings with format specs and repeated expressions (GH-27729) (GH-27743)

(cherry picked from commit 8e832fb2a2cb54d7262148b6ec15563dffb48d63)

Co-authored-by: Pablo Galindo Salgado <Pablogsal at gmail.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-11-15-39-57.bpo-44885.i4noUO.rst
M Lib/test/test_fstring.py
M Parser/string_parser.c

diff --git a/Lib/test/test_fstring.py b/Lib/test/test_fstring.py
index caae1b7c4f8535..14a4c678fc9097 100644
--- a/Lib/test/test_fstring.py
+++ b/Lib/test/test_fstring.py
@@ -212,11 +212,6 @@ def test_ast_line_numbers_nested(self):
         self.assertEqual(call.col_offset, 11)
 
     def test_ast_line_numbers_duplicate_expression(self):
-        """Duplicate expression
-
-        NOTE: this is currently broken, always sets location of the first
-        expression.
-        """
         expr = """
 a = 10
 f'{a * x()} {a * x()} {a * x()}'
@@ -266,9 +261,9 @@ def test_ast_line_numbers_duplicate_expression(self):
         self.assertEqual(binop.lineno, 3)
         self.assertEqual(binop.left.lineno, 3)
         self.assertEqual(binop.right.lineno, 3)
-        self.assertEqual(binop.col_offset, 3)  # FIXME: this is wrong
-        self.assertEqual(binop.left.col_offset, 3)  # FIXME: this is wrong
-        self.assertEqual(binop.right.col_offset, 7)  # FIXME: this is wrong
+        self.assertEqual(binop.col_offset, 13)
+        self.assertEqual(binop.left.col_offset, 13)
+        self.assertEqual(binop.right.col_offset, 17)
         # check the third binop location
         binop = t.body[1].value.values[4].value
         self.assertEqual(type(binop), ast.BinOp)
@@ -278,9 +273,32 @@ def test_ast_line_numbers_duplicate_expression(self):
         self.assertEqual(binop.lineno, 3)
         self.assertEqual(binop.left.lineno, 3)
         self.assertEqual(binop.right.lineno, 3)
-        self.assertEqual(binop.col_offset, 3)  # FIXME: this is wrong
-        self.assertEqual(binop.left.col_offset, 3)  # FIXME: this is wrong
-        self.assertEqual(binop.right.col_offset, 7)  # FIXME: this is wrong
+        self.assertEqual(binop.col_offset, 23)
+        self.assertEqual(binop.left.col_offset, 23)
+        self.assertEqual(binop.right.col_offset, 27)
+
+    def test_ast_numbers_fstring_with_formatting(self):
+
+        t = ast.parse('f"Here is that pesky {xxx:.3f} again"')
+        self.assertEqual(len(t.body), 1)
+        self.assertEqual(t.body[0].lineno, 1)
+
+        self.assertEqual(type(t.body[0]), ast.Expr)
+        self.assertEqual(type(t.body[0].value), ast.JoinedStr)
+        self.assertEqual(len(t.body[0].value.values), 3)
+
+        self.assertEqual(type(t.body[0].value.values[0]), ast.Constant)
+        self.assertEqual(type(t.body[0].value.values[1]), ast.FormattedValue)
+        self.assertEqual(type(t.body[0].value.values[2]), ast.Constant)
+
+        _, expr, _ = t.body[0].value.values
+
+        name = expr.value
+        self.assertEqual(type(name), ast.Name)
+        self.assertEqual(name.lineno, 1)
+        self.assertEqual(name.end_lineno, 1)
+        self.assertEqual(name.col_offset, 22)
+        self.assertEqual(name.end_col_offset, 25)
 
     def test_ast_line_numbers_multiline_fstring(self):
         # See bpo-30465 for details.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-11-15-39-57.bpo-44885.i4noUO.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-11-15-39-57.bpo-44885.i4noUO.rst
new file mode 100644
index 00000000000000..c6abd7363af711
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-11-15-39-57.bpo-44885.i4noUO.rst	
@@ -0,0 +1,2 @@
+Correct the ast locations of f-strings with format specs and repeated
+expressions. Patch by Pablo Galindo
diff --git a/Parser/string_parser.c b/Parser/string_parser.c
index 66405b26f37e4c..fb37d37553a552 100644
--- a/Parser/string_parser.c
+++ b/Parser/string_parser.c
@@ -279,49 +279,48 @@ _PyPegen_parsestr(Parser *p, int *bytesmode, int *rawmode, PyObject **result,
 /* Fix locations for the given node and its children.
 
    `parent` is the enclosing node.
+   `expr_start` is the starting position of the expression (pointing to the open brace).
    `n` is the node which locations are going to be fixed relative to parent.
    `expr_str` is the child node's string representation, including braces.
 */
 static bool
-fstring_find_expr_location(Token *parent, char *expr_str, int *p_lines, int *p_cols)
+fstring_find_expr_location(Token *parent, const char* expr_start, char *expr_str, int *p_lines, int *p_cols)
 {
     *p_lines = 0;
     *p_cols = 0;
+    assert(expr_start != NULL && *expr_start == '{');
     if (parent && parent->bytes) {
         const char *parent_str = PyBytes_AsString(parent->bytes);
         if (!parent_str) {
             return false;
         }
-        const char *substr = strstr(parent_str, expr_str);
-        if (substr) {
-            // The following is needed, in order to correctly shift the column
-            // offset, in the case that (disregarding any whitespace) a newline
-            // immediately follows the opening curly brace of the fstring expression.
-            bool newline_after_brace = 1;
-            const char *start = substr + 1;
-            while (start && *start != '}' && *start != '\n') {
-                if (*start != ' ' && *start != '\t' && *start != '\f') {
-                    newline_after_brace = 0;
-                    break;
-                }
-                start++;
+        // The following is needed, in order to correctly shift the column
+        // offset, in the case that (disregarding any whitespace) a newline
+        // immediately follows the opening curly brace of the fstring expression.
+        bool newline_after_brace = 1;
+        const char *start = expr_start + 1;
+        while (start && *start != '}' && *start != '\n') {
+            if (*start != ' ' && *start != '\t' && *start != '\f') {
+                newline_after_brace = 0;
+                break;
             }
+            start++;
+        }
 
-            // Account for the characters from the last newline character to our
-            // left until the beginning of substr.
-            if (!newline_after_brace) {
-                start = substr;
-                while (start > parent_str && *start != '\n') {
-                    start--;
-                }
-                *p_cols += (int)(substr - start);
+        // Account for the characters from the last newline character to our
+        // left until the beginning of expr_start.
+        if (!newline_after_brace) {
+            start = expr_start;
+            while (start > parent_str && *start != '\n') {
+                start--;
             }
-            /* adjust the start based on the number of newlines encountered
-               before the f-string expression */
-            for (const char *p = parent_str; p < substr; p++) {
-                if (*p == '\n') {
-                    (*p_lines)++;
-                }
+            *p_cols += (int)(expr_start - start);
+        }
+        /* adjust the start based on the number of newlines encountered
+           before the f-string expression */
+        for (const char *p = parent_str; p < expr_start; p++) {
+            if (*p == '\n') {
+                (*p_lines)++;
             }
         }
     }
@@ -365,7 +364,7 @@ fstring_compile_expr(Parser *p, const char *expr_start, const char *expr_end,
 
     len = expr_end - expr_start;
     /* Allocate 3 extra bytes: open paren, close paren, null byte. */
-    str = PyMem_Malloc(len + 3);
+    str = PyMem_Calloc(len + 3, sizeof(char));
     if (str == NULL) {
         PyErr_NoMemory();
         return NULL;
@@ -373,17 +372,10 @@ fstring_compile_expr(Parser *p, const char *expr_start, const char *expr_end,
 
     // The call to fstring_find_expr_location is responsible for finding the column offset
     // the generated AST nodes need to be shifted to the right, which is equal to the number
-    // of the f-string characters before the expression starts. In order to correctly compute
-    // this offset, strstr gets called in fstring_find_expr_location which only succeeds
-    // if curly braces appear before and after the f-string expression (exactly like they do
-    // in the f-string itself), hence the following lines.
-    str[0] = '{';
+    // of the f-string characters before the expression starts.
     memcpy(str+1, expr_start, len);
-    str[len+1] = '}';
-    str[len+2] = 0;
-
     int lines, cols;
-    if (!fstring_find_expr_location(t, str, &lines, &cols)) {
+    if (!fstring_find_expr_location(t, expr_start-1, str+1, &lines, &cols)) {
         PyMem_Free(str);
         return NULL;
     }


From webhook-mailer at python.org  Thu Aug 12 13:46:50 2021
From: webhook-mailer at python.org (pablogsal)
Date: Thu, 12 Aug 2021 17:46:50 -0000
Subject: [Python-checkins] [3.9] bpo-44885: Correct the ast locations of
 f-strings with format specs and repeated expressions (GH-27729) (GH-27744)
Message-ID: <mailman.1016.1628790412.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/4b86c9c5146c339c689830619be9d29b8f7bf417
commit: 4b86c9c5146c339c689830619be9d29b8f7bf417
branch: 3.9
author: Pablo Galindo Salgado <Pablogsal at gmail.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-08-12T18:46:35+01:00
summary:

[3.9] bpo-44885: Correct the ast locations of f-strings with format specs and repeated expressions (GH-27729) (GH-27744)

(cherry picked from commit 8e832fb2a2cb54d7262148b6ec15563dffb48d63)

Co-authored-by: Pablo Galindo Salgado <Pablogsal at gmail.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-11-15-39-57.bpo-44885.i4noUO.rst
M Lib/test/test_fstring.py
M Lib/test/test_peg_parser.py
M Parser/pegen/parse_string.c

diff --git a/Lib/test/test_fstring.py b/Lib/test/test_fstring.py
index 05e7102d624f3e..fbd97ffbdec80c 100644
--- a/Lib/test/test_fstring.py
+++ b/Lib/test/test_fstring.py
@@ -212,11 +212,6 @@ def test_ast_line_numbers_nested(self):
         self.assertEqual(call.col_offset, 11)
 
     def test_ast_line_numbers_duplicate_expression(self):
-        """Duplicate expression
-
-        NOTE: this is currently broken, always sets location of the first
-        expression.
-        """
         expr = """
 a = 10
 f'{a * x()} {a * x()} {a * x()}'
@@ -266,9 +261,9 @@ def test_ast_line_numbers_duplicate_expression(self):
         self.assertEqual(binop.lineno, 3)
         self.assertEqual(binop.left.lineno, 3)
         self.assertEqual(binop.right.lineno, 3)
-        self.assertEqual(binop.col_offset, 3)  # FIXME: this is wrong
-        self.assertEqual(binop.left.col_offset, 3)  # FIXME: this is wrong
-        self.assertEqual(binop.right.col_offset, 7)  # FIXME: this is wrong
+        self.assertEqual(binop.col_offset, 13)
+        self.assertEqual(binop.left.col_offset, 13)
+        self.assertEqual(binop.right.col_offset, 17)
         # check the third binop location
         binop = t.body[1].value.values[4].value
         self.assertEqual(type(binop), ast.BinOp)
@@ -278,9 +273,32 @@ def test_ast_line_numbers_duplicate_expression(self):
         self.assertEqual(binop.lineno, 3)
         self.assertEqual(binop.left.lineno, 3)
         self.assertEqual(binop.right.lineno, 3)
-        self.assertEqual(binop.col_offset, 3)  # FIXME: this is wrong
-        self.assertEqual(binop.left.col_offset, 3)  # FIXME: this is wrong
-        self.assertEqual(binop.right.col_offset, 7)  # FIXME: this is wrong
+        self.assertEqual(binop.col_offset, 23)
+        self.assertEqual(binop.left.col_offset, 23)
+        self.assertEqual(binop.right.col_offset, 27)
+
+    def test_ast_numbers_fstring_with_formatting(self):
+
+        t = ast.parse('f"Here is that pesky {xxx:.3f} again"')
+        self.assertEqual(len(t.body), 1)
+        self.assertEqual(t.body[0].lineno, 1)
+
+        self.assertEqual(type(t.body[0]), ast.Expr)
+        self.assertEqual(type(t.body[0].value), ast.JoinedStr)
+        self.assertEqual(len(t.body[0].value.values), 3)
+
+        self.assertEqual(type(t.body[0].value.values[0]), ast.Constant)
+        self.assertEqual(type(t.body[0].value.values[1]), ast.FormattedValue)
+        self.assertEqual(type(t.body[0].value.values[2]), ast.Constant)
+
+        _, expr, _ = t.body[0].value.values
+
+        name = expr.value
+        self.assertEqual(type(name), ast.Name)
+        self.assertEqual(name.lineno, 1)
+        self.assertEqual(name.end_lineno, 1)
+        self.assertEqual(name.col_offset, 22)
+        self.assertEqual(name.end_col_offset, 25)
 
     def test_ast_line_numbers_multiline_fstring(self):
         # See bpo-30465 for details.
diff --git a/Lib/test/test_peg_parser.py b/Lib/test/test_peg_parser.py
index f4aaef848d54fe..b7bd86395d92d3 100644
--- a/Lib/test/test_peg_parser.py
+++ b/Lib/test/test_peg_parser.py
@@ -231,11 +231,6 @@ def f() -> Any:
     ('f-string_doublestarred', "f'{ {**x} }'"),
     ('f-string_escape_brace', "f'{{Escape'"),
     ('f-string_escape_closing_brace', "f'Escape}}'"),
-    ('f-string_repr', "f'{a!r}'"),
-    ('f-string_str', "f'{a!s}'"),
-    ('f-string_ascii', "f'{a!a}'"),
-    ('f-string_debug', "f'{a=}'"),
-    ('f-string_padding', "f'{a:03d}'"),
     ('f-string_multiline',
      """
         f'''
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-11-15-39-57.bpo-44885.i4noUO.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-11-15-39-57.bpo-44885.i4noUO.rst
new file mode 100644
index 00000000000000..c6abd7363af711
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-11-15-39-57.bpo-44885.i4noUO.rst	
@@ -0,0 +1,2 @@
+Correct the ast locations of f-strings with format specs and repeated
+expressions. Patch by Pablo Galindo
diff --git a/Parser/pegen/parse_string.c b/Parser/pegen/parse_string.c
index c852e5b827c0cc..41fdc2d81d92bc 100644
--- a/Parser/pegen/parse_string.c
+++ b/Parser/pegen/parse_string.c
@@ -284,49 +284,48 @@ _PyPegen_parsestr(Parser *p, int *bytesmode, int *rawmode, PyObject **result,
 /* Fix locations for the given node and its children.
 
    `parent` is the enclosing node.
+   `expr_start` is the starting position of the expression (pointing to the open brace).
    `n` is the node which locations are going to be fixed relative to parent.
    `expr_str` is the child node's string representation, including braces.
 */
 static bool
-fstring_find_expr_location(Token *parent, char *expr_str, int *p_lines, int *p_cols)
+fstring_find_expr_location(Token *parent, const char* expr_start, char *expr_str, int *p_lines, int *p_cols)
 {
     *p_lines = 0;
     *p_cols = 0;
+    assert(expr_start != NULL && *expr_start == '{');
     if (parent && parent->bytes) {
         char *parent_str = PyBytes_AsString(parent->bytes);
         if (!parent_str) {
             return false;
         }
-        char *substr = strstr(parent_str, expr_str);
-        if (substr) {
-            // The following is needed, in order to correctly shift the column
-            // offset, in the case that (disregarding any whitespace) a newline
-            // immediately follows the opening curly brace of the fstring expression.
-            bool newline_after_brace = 1;
-            char *start = substr + 1;
-            while (start && *start != '}' && *start != '\n') {
-                if (*start != ' ' && *start != '\t' && *start != '\f') {
-                    newline_after_brace = 0;
-                    break;
-                }
-                start++;
+        // The following is needed, in order to correctly shift the column
+        // offset, in the case that (disregarding any whitespace) a newline
+        // immediately follows the opening curly brace of the fstring expression.
+        bool newline_after_brace = 1;
+        const char *start = expr_start + 1;
+        while (start && *start != '}' && *start != '\n') {
+            if (*start != ' ' && *start != '\t' && *start != '\f') {
+                newline_after_brace = 0;
+                break;
             }
+            start++;
+        }
 
-            // Account for the characters from the last newline character to our
-            // left until the beginning of substr.
-            if (!newline_after_brace) {
-                start = substr;
-                while (start > parent_str && *start != '\n') {
-                    start--;
-                }
-                *p_cols += (int)(substr - start);
+        // Account for the characters from the last newline character to our
+        // left until the beginning of expr_start.
+        if (!newline_after_brace) {
+            start = expr_start;
+            while (start > parent_str && *start != '\n') {
+                start--;
             }
-            /* adjust the start based on the number of newlines encountered
-               before the f-string expression */
-            for (char* p = parent_str; p < substr; p++) {
-                if (*p == '\n') {
-                    (*p_lines)++;
-                }
+            *p_cols += (int)(expr_start - start);
+        }
+        /* adjust the start based on the number of newlines encountered
+           before the f-string expression */
+        for (const char *p = parent_str; p < expr_start; p++) {
+            if (*p == '\n') {
+                (*p_lines)++;
             }
         }
     }
@@ -370,7 +369,7 @@ fstring_compile_expr(Parser *p, const char *expr_start, const char *expr_end,
 
     len = expr_end - expr_start;
     /* Allocate 3 extra bytes: open paren, close paren, null byte. */
-    str = PyMem_Malloc(len + 3);
+    str = PyMem_Calloc(len + 3, sizeof(char));
     if (str == NULL) {
         PyErr_NoMemory();
         return NULL;
@@ -378,18 +377,11 @@ fstring_compile_expr(Parser *p, const char *expr_start, const char *expr_end,
 
     // The call to fstring_find_expr_location is responsible for finding the column offset
     // the generated AST nodes need to be shifted to the right, which is equal to the number
-    // of the f-string characters before the expression starts. In order to correctly compute
-    // this offset, strstr gets called in fstring_find_expr_location which only succeeds
-    // if curly braces appear before and after the f-string expression (exactly like they do
-    // in the f-string itself), hence the following lines.
-    str[0] = '{';
+    // of the f-string characters before the expression starts.
     memcpy(str+1, expr_start, len);
-    str[len+1] = '}';
-    str[len+2] = 0;
-
     int lines, cols;
-    if (!fstring_find_expr_location(t, str, &lines, &cols)) {
-        PyMem_FREE(str);
+    if (!fstring_find_expr_location(t, expr_start-1, str+1, &lines, &cols)) {
+        PyMem_Free(str);
         return NULL;
     }
 


From webhook-mailer at python.org  Thu Aug 12 14:23:44 2021
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 12 Aug 2021 18:23:44 -0000
Subject: [Python-checkins] bpo-43392: Optimize repeated calls to
 `__import__()` (GH-24735)
Message-ID: <mailman.1017.1628792626.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/03648a2a91f9f1091cd21bd4cd6ca092ddb25640
commit: 03648a2a91f9f1091cd21bd4cd6ca092ddb25640
branch: main
author: Germ?n M?ndez Bravo <kronuz at fb.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-12T11:23:29-07:00
summary:

bpo-43392: Optimize repeated calls to `__import__()` (GH-24735)



Implements a two steps check in `importlib._bootstrap._find_and_load()` to avoid locking when the module has been already imported and it's ready.

---

Using `importlib.__import__()`, after this, does show a big difference:

Before:
```
$ ./python -c 'import timeit; print(timeit.timeit("__import__(\"timeit\")", setup="from importlib import __import__"))'
15.92248619502061
```

After:
```
$ ./python -c 'import timeit; print(timeit.timeit("__import__(\"timeit\")", setup="from importlib import __import__"))'
1.206068897008663
```

---

files:
A Misc/NEWS.d/next/Library/2021-03-03-13-32-37.bpo-43392.QQumou.rst
M Lib/importlib/_bootstrap.py
M Python/importlib.h

diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
index f8b77e3b59d8eb..e64f7ad151755d 100644
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -1032,17 +1032,28 @@ def _find_and_load_unlocked(name, import_):
 
 def _find_and_load(name, import_):
     """Find and load the module."""
-    with _ModuleLockManager(name):
-        module = sys.modules.get(name, _NEEDS_LOADING)
-        if module is _NEEDS_LOADING:
-            return _find_and_load_unlocked(name, import_)
+
+    # Optimization: we avoid unneeded module locking if the module
+    # already exists in sys.modules and is fully initialized.
+    module = sys.modules.get(name, _NEEDS_LOADING)
+    if (module is _NEEDS_LOADING or
+        getattr(getattr(module, "__spec__", None), "_initializing", False)):
+        with _ModuleLockManager(name):
+            module = sys.modules.get(name, _NEEDS_LOADING)
+            if module is _NEEDS_LOADING:
+                return _find_and_load_unlocked(name, import_)
+
+        # Optimization: only call _bootstrap._lock_unlock_module() if
+        # module.__spec__._initializing is True.
+        # NOTE: because of this, initializing must be set *before*
+        # putting the new module in sys.modules.
+        _lock_unlock_module(name)
 
     if module is None:
         message = ('import of {} halted; '
                    'None in sys.modules'.format(name))
         raise ModuleNotFoundError(message, name=name)
 
-    _lock_unlock_module(name)
     return module
 
 
diff --git a/Misc/NEWS.d/next/Library/2021-03-03-13-32-37.bpo-43392.QQumou.rst b/Misc/NEWS.d/next/Library/2021-03-03-13-32-37.bpo-43392.QQumou.rst
new file mode 100644
index 00000000000000..175836b89170aa
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-03-03-13-32-37.bpo-43392.QQumou.rst
@@ -0,0 +1,4 @@
+:func:`importlib._bootstrap._find_and_load` now implements a two-step
+check to avoid locking when modules have been already imported and are
+ready. This improves performance of repeated calls to
+:func:`importlib.import_module` and :func:`importlib.__import__`.
diff --git a/Python/importlib.h b/Python/importlib.h
index da94fc35c7f06f..69bd9727237f17 100644
--- a/Python/importlib.h
+++ b/Python/importlib.h
@@ -1408,13 +1408,13 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     35,32,123,33,114,125,70,41,18,114,130,0,0,0,114,10,
     0,0,0,114,6,0,0,0,114,109,0,0,0,114,110,0,
     0,0,114,182,0,0,0,114,185,0,0,0,114,178,0,0,
-    0,90,13,95,105,110,105,116,105,97,108,105,122,105,110,103,
+    0,218,13,95,105,110,105,116,105,97,108,105,122,105,110,103,
     114,18,0,0,0,114,113,0,0,0,114,20,0,0,0,114,
     137,0,0,0,114,94,0,0,0,114,176,0,0,0,114,76,
     0,0,0,114,184,0,0,0,114,90,0,0,0,41,3,114,
     117,0,0,0,114,116,0,0,0,114,118,0,0,0,115,3,
     0,0,0,32,32,32,114,5,0,0,0,218,14,95,108,111,
-    97,100,95,117,110,108,111,99,107,101,100,114,186,0,0,0,
+    97,100,95,117,110,108,111,99,107,101,100,114,187,0,0,0,
     153,2,0,0,115,66,0,0,0,10,2,12,2,16,1,12,
     2,8,1,8,2,6,5,2,1,12,1,2,1,10,1,10,
     1,14,1,2,255,12,4,4,128,6,1,2,1,10,1,2,
@@ -1463,7 +1463,7 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     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,61,
-    0,0,0,114,20,0,0,0,114,186,0,0,0,169,1,114,
+    0,0,0,114,20,0,0,0,114,187,0,0,0,169,1,114,
     117,0,0,0,115,1,0,0,0,32,114,5,0,0,0,114,
     115,0,0,0,114,115,0,0,0,198,2,0,0,115,10,0,
     0,0,12,9,6,1,22,255,2,128,16,0,115,8,0,0,
@@ -1511,7 +1511,7 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     109,111,118,97,108,32,105,110,32,80,121,116,104,111,110,32,
     51,46,49,50,122,8,60,109,111,100,117,108,101,32,122,2,
     32,40,122,2,41,62,78,41,6,114,109,0,0,0,114,110,
-    0,0,0,114,111,0,0,0,114,8,0,0,0,114,188,0,
+    0,0,0,114,111,0,0,0,114,8,0,0,0,114,189,0,
     0,0,114,164,0,0,0,169,1,114,118,0,0,0,115,1,
     0,0,0,32,114,5,0,0,0,114,122,0,0,0,122,27,
     66,117,105,108,116,105,110,73,109,112,111,114,116,101,114,46,
@@ -1560,8 +1560,8 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     110,32,80,121,116,104,111,110,32,51,46,49,50,59,32,117,
     115,101,32,102,105,110,100,95,115,112,101,99,40,41,32,105,
     110,115,116,101,97,100,78,41,5,114,109,0,0,0,114,110,
-    0,0,0,114,111,0,0,0,114,196,0,0,0,114,130,0,
-    0,0,41,4,114,193,0,0,0,114,96,0,0,0,114,194,
+    0,0,0,114,111,0,0,0,114,197,0,0,0,114,130,0,
+    0,0,41,4,114,194,0,0,0,114,96,0,0,0,114,195,
     0,0,0,114,117,0,0,0,115,4,0,0,0,32,32,32,
     32,114,5,0,0,0,218,11,102,105,110,100,95,109,111,100,
     117,108,101,122,27,66,117,105,108,116,105,110,73,109,112,111,
@@ -1581,7 +1581,7 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     0,114,19,0,0,0,78,41,8,114,20,0,0,0,114,18,
     0,0,0,114,93,0,0,0,114,94,0,0,0,114,53,0,
     0,0,114,80,0,0,0,114,70,0,0,0,90,14,99,114,
-    101,97,116,101,95,98,117,105,108,116,105,110,114,187,0,0,
+    101,97,116,101,95,98,117,105,108,116,105,110,114,188,0,0,
     0,115,1,0,0,0,32,114,5,0,0,0,114,175,0,0,
     0,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,
@@ -1596,11 +1596,11 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     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,80,0,0,0,114,70,0,0,0,90,12,101,120,101,
-    99,95,98,117,105,108,116,105,110,114,190,0,0,0,115,1,
+    99,95,98,117,105,108,116,105,110,114,191,0,0,0,115,1,
     0,0,0,32,114,5,0,0,0,114,176,0,0,0,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,11,3,0,0,243,
-    2,0,0,0,16,3,114,198,0,0,0,115,16,0,0,0,
+    2,0,0,0,16,3,114,199,0,0,0,115,16,0,0,0,
     9,34,35,39,35,52,54,60,9,61,9,61,9,61,9,61,
     114,17,0,0,0,99,2,0,0,0,0,0,0,0,0,0,
     0,0,1,0,0,0,3,0,0,0,243,4,0,0,0,100,
@@ -1608,43 +1608,43 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     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,24,0,0,0,169,2,114,193,0,0,0,114,96,0,
+    78,114,24,0,0,0,169,2,114,194,0,0,0,114,96,0,
     0,0,115,2,0,0,0,32,32,114,5,0,0,0,218,8,
     103,101,116,95,99,111,100,101,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,16,3,0,0,243,2,0,0,0,4,4,114,202,0,
+    100,101,16,3,0,0,243,2,0,0,0,4,4,114,203,0,
     0,0,115,4,0,0,0,16,20,16,20,114,17,0,0,0,
     99,2,0,0,0,0,0,0,0,0,0,0,0,1,0,0,
-    0,3,0,0,0,114,199,0,0,0,41,2,122,56,82,101,
+    0,3,0,0,0,114,200,0,0,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,24,0,0,0,114,200,0,0,
+    32,99,111,100,101,46,78,114,24,0,0,0,114,201,0,0,
     0,115,2,0,0,0,32,32,114,5,0,0,0,218,10,103,
     101,116,95,115,111,117,114,99,101,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,22,3,0,0,114,202,0,0,0,114,202,
+    111,117,114,99,101,22,3,0,0,114,203,0,0,0,114,203,
     0,0,0,115,4,0,0,0,16,20,16,20,114,17,0,0,
     0,99,2,0,0,0,0,0,0,0,0,0,0,0,1,0,
-    0,0,3,0,0,0,114,199,0,0,0,41,3,122,52,82,
+    0,0,3,0,0,0,114,200,0,0,0,41,3,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,78,114,24,0,0,0,114,200,0,0,0,115,
+    101,115,46,70,78,114,24,0,0,0,114,201,0,0,0,115,
     2,0,0,0,32,32,114,5,0,0,0,114,136,0,0,0,
     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,28,3,0,0,
-    114,202,0,0,0,114,202,0,0,0,115,4,0,0,0,16,
+    114,203,0,0,0,114,203,0,0,0,115,4,0,0,0,16,
     21,16,21,114,17,0,0,0,169,2,78,78,114,0,0,0,
     0,41,18,114,8,0,0,0,114,7,0,0,0,114,1,0,
     0,0,114,9,0,0,0,114,164,0,0,0,218,12,115,116,
     97,116,105,99,109,101,116,104,111,100,114,122,0,0,0,218,
-    11,99,108,97,115,115,109,101,116,104,111,100,114,196,0,0,
-    0,114,197,0,0,0,114,175,0,0,0,114,176,0,0,0,
-    114,102,0,0,0,114,201,0,0,0,114,203,0,0,0,114,
+    11,99,108,97,115,115,109,101,116,104,111,100,114,197,0,0,
+    0,114,198,0,0,0,114,175,0,0,0,114,176,0,0,0,
+    114,102,0,0,0,114,202,0,0,0,114,204,0,0,0,114,
     136,0,0,0,114,119,0,0,0,114,183,0,0,0,114,24,
-    0,0,0,114,17,0,0,0,114,5,0,0,0,114,188,0,
-    0,0,114,188,0,0,0,213,2,0,0,115,46,0,0,0,
+    0,0,0,114,17,0,0,0,114,5,0,0,0,114,189,0,
+    0,0,114,189,0,0,0,213,2,0,0,115,46,0,0,0,
     8,0,4,2,4,7,2,2,8,1,2,10,10,1,2,8,
     10,1,2,14,8,1,2,7,8,1,2,4,2,1,10,1,
     2,4,2,1,10,1,2,4,2,1,10,1,12,4,115,92,
@@ -1662,7 +1662,7 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     5,20,5,20,5,20,5,20,6,17,6,23,5,20,5,20,
     5,20,5,20,5,20,6,17,6,23,5,21,5,21,5,21,
     5,21,5,21,19,30,31,48,19,49,5,16,5,16,5,16,
-    114,17,0,0,0,114,188,0,0,0,99,0,0,0,0,0,
+    114,17,0,0,0,114,189,0,0,0,99,0,0,0,0,0,
     0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,115,
     126,0,0,0,101,0,90,1,100,0,90,2,100,1,90,3,
     100,2,90,4,101,5,100,3,132,0,131,1,90,6,101,7,
@@ -1686,14 +1686,14 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     0,0,0,0,0,0,0,0,0,4,0,0,0,3,0,0,
     0,115,28,0,0,0,116,0,160,1,100,1,116,2,161,2,
     1,0,100,2,160,3,124,0,106,4,116,5,106,6,161,2,
-    83,0,41,4,114,189,0,0,0,122,80,70,114,111,122,101,
+    83,0,41,4,114,190,0,0,0,122,80,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,40,41,32,105,115,32,100,101,112,114,101,
     99,97,116,101,100,32,97,110,100,32,115,108,97,116,101,100,
     32,102,111,114,32,114,101,109,111,118,97,108,32,105,110,32,
     80,121,116,104,111,110,32,51,46,49,50,114,179,0,0,0,
     78,41,7,114,109,0,0,0,114,110,0,0,0,114,111,0,
-    0,0,114,53,0,0,0,114,8,0,0,0,114,207,0,0,
+    0,0,114,53,0,0,0,114,8,0,0,0,114,208,0,0,
     0,114,164,0,0,0,41,1,218,1,109,115,1,0,0,0,
     32,114,5,0,0,0,114,122,0,0,0,122,26,70,114,111,
     122,101,110,73,109,112,111,114,116,101,114,46,109,111,100,117,
@@ -1705,10 +1705,10 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     0,0,0,0,0,0,0,5,0,0,0,3,0,0,0,115,
     30,0,0,0,116,0,160,1,124,1,161,1,114,13,116,2,
     124,1,124,0,124,0,106,3,100,1,141,3,83,0,100,0,
-    83,0,114,191,0,0,0,41,4,114,70,0,0,0,114,106,
-    0,0,0,114,112,0,0,0,114,164,0,0,0,114,192,0,
+    83,0,114,192,0,0,0,41,4,114,70,0,0,0,114,106,
+    0,0,0,114,112,0,0,0,114,164,0,0,0,114,193,0,
     0,0,115,4,0,0,0,32,32,32,32,114,5,0,0,0,
-    114,196,0,0,0,122,24,70,114,111,122,101,110,73,109,112,
+    114,197,0,0,0,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,59,
     3,0,0,115,6,0,0,0,10,2,16,1,4,2,115,8,
     0,0,0,8,2,2,3,16,254,4,2,115,30,0,0,0,
@@ -1732,9 +1732,9 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     117,115,101,32,102,105,110,100,95,115,112,101,99,40,41,32,
     105,110,115,116,101,97,100,78,41,5,114,109,0,0,0,114,
     110,0,0,0,114,111,0,0,0,114,70,0,0,0,114,106,
-    0,0,0,41,3,114,193,0,0,0,114,96,0,0,0,114,
-    194,0,0,0,115,3,0,0,0,32,32,32,114,5,0,0,
-    0,114,197,0,0,0,122,26,70,114,111,122,101,110,73,109,
+    0,0,0,41,3,114,194,0,0,0,114,96,0,0,0,114,
+    195,0,0,0,115,3,0,0,0,32,32,32,114,5,0,0,
+    0,114,198,0,0,0,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,66,3,0,0,115,8,0,0,0,6,7,2,2,4,
     254,18,3,115,10,0,0,0,2,7,2,2,2,255,6,1,
@@ -1742,10 +1742,10 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     43,9,43,23,27,23,47,38,46,23,47,16,57,16,19,9,
     57,53,57,9,57,114,17,0,0,0,99,1,0,0,0,0,
     0,0,0,0,0,0,0,1,0,0,0,3,0,0,0,114,
-    199,0,0,0,41,2,122,42,85,115,101,32,100,101,102,97,
+    200,0,0,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,24,0,0,0,114,187,0,0,0,115,1,0,
+    110,46,78,114,24,0,0,0,114,188,0,0,0,115,1,0,
     0,0,32,114,5,0,0,0,114,175,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,78,3,0,0,115,
@@ -1781,10 +1781,10 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     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,78,41,1,114,119,0,0,0,
-    114,200,0,0,0,115,2,0,0,0,32,32,114,5,0,0,
+    114,201,0,0,0,115,2,0,0,0,32,32,114,5,0,0,
     0,114,183,0,0,0,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,91,3,0,0,243,2,0,0,0,10,8,114,212,0,
+    108,101,91,3,0,0,243,2,0,0,0,10,8,114,213,0,
     0,0,115,10,0,0,0,16,33,34,37,39,47,16,48,9,
     48,114,17,0,0,0,99,2,0,0,0,0,0,0,0,0,
     0,0,0,3,0,0,0,3,0,0,0,243,10,0,0,0,
@@ -1792,42 +1792,42 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     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,78,41,2,114,70,
-    0,0,0,114,209,0,0,0,114,200,0,0,0,115,2,0,
-    0,0,32,32,114,5,0,0,0,114,201,0,0,0,122,23,
+    0,0,0,114,210,0,0,0,114,201,0,0,0,115,2,0,
+    0,0,32,32,114,5,0,0,0,114,202,0,0,0,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,101,3,0,0,243,2,0,0,0,
-    10,4,114,214,0,0,0,115,10,0,0,0,16,20,16,48,
+    10,4,114,215,0,0,0,115,10,0,0,0,16,20,16,48,
     39,47,16,48,9,48,114,17,0,0,0,99,2,0,0,0,
     0,0,0,0,0,0,0,0,1,0,0,0,3,0,0,0,
-    114,199,0,0,0,41,2,122,54,82,101,116,117,114,110,32,
+    114,200,0,0,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,24,0,0,0,114,200,0,0,0,115,2,0,0,0,32,
-    32,114,5,0,0,0,114,203,0,0,0,122,25,70,114,111,
+    114,24,0,0,0,114,201,0,0,0,115,2,0,0,0,32,
+    32,114,5,0,0,0,114,204,0,0,0,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,107,3,0,0,114,202,0,0,0,114,
-    202,0,0,0,115,4,0,0,0,16,20,16,20,114,17,0,
+    115,111,117,114,99,101,107,3,0,0,114,203,0,0,0,114,
+    203,0,0,0,115,4,0,0,0,16,20,16,20,114,17,0,
     0,0,99,2,0,0,0,0,0,0,0,0,0,0,0,3,
-    0,0,0,3,0,0,0,114,213,0,0,0,41,2,122,46,
+    0,0,0,3,0,0,0,114,214,0,0,0,41,2,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,78,41,
     2,114,70,0,0,0,90,17,105,115,95,102,114,111,122,101,
-    110,95,112,97,99,107,97,103,101,114,200,0,0,0,115,2,
+    110,95,112,97,99,107,97,103,101,114,201,0,0,0,115,2,
     0,0,0,32,32,114,5,0,0,0,114,136,0,0,0,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,113,3,0,0,114,214,
-    0,0,0,114,214,0,0,0,115,10,0,0,0,16,20,16,
-    48,39,47,16,48,9,48,114,17,0,0,0,114,204,0,0,
+    105,115,95,112,97,99,107,97,103,101,113,3,0,0,114,215,
+    0,0,0,114,215,0,0,0,115,10,0,0,0,16,20,16,
+    48,39,47,16,48,9,48,114,17,0,0,0,114,205,0,0,
     0,114,0,0,0,0,41,17,114,8,0,0,0,114,7,0,
     0,0,114,1,0,0,0,114,9,0,0,0,114,164,0,0,
-    0,114,205,0,0,0,114,122,0,0,0,114,206,0,0,0,
-    114,196,0,0,0,114,197,0,0,0,114,175,0,0,0,114,
-    176,0,0,0,114,183,0,0,0,114,108,0,0,0,114,201,
-    0,0,0,114,203,0,0,0,114,136,0,0,0,114,24,0,
-    0,0,114,17,0,0,0,114,5,0,0,0,114,207,0,0,
-    0,114,207,0,0,0,37,3,0,0,115,48,0,0,0,8,
+    0,114,206,0,0,0,114,122,0,0,0,114,207,0,0,0,
+    114,197,0,0,0,114,198,0,0,0,114,175,0,0,0,114,
+    176,0,0,0,114,183,0,0,0,114,108,0,0,0,114,202,
+    0,0,0,114,204,0,0,0,114,136,0,0,0,114,24,0,
+    0,0,114,17,0,0,0,114,5,0,0,0,114,208,0,0,
+    0,114,208,0,0,0,37,3,0,0,115,48,0,0,0,8,
     0,4,2,4,7,2,2,8,1,2,10,10,1,2,6,10,
     1,2,11,8,1,2,3,8,1,2,8,8,1,2,9,2,
     1,10,1,2,4,2,1,10,1,2,4,2,1,14,1,115,
@@ -1846,7 +1846,7 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     17,6,22,5,48,5,48,5,48,5,48,5,48,6,17,6,
     22,5,20,5,20,5,20,5,20,5,20,6,17,6,22,5,
     48,5,48,5,48,5,48,5,48,5,48,5,48,114,17,0,
-    0,0,114,207,0,0,0,99,0,0,0,0,0,0,0,0,
+    0,0,114,208,0,0,0,99,0,0,0,0,0,0,0,0,
     0,0,0,0,1,0,0,0,0,0,0,0,115,28,0,0,
     0,101,0,90,1,100,0,90,2,100,1,90,3,100,2,132,
     0,90,4,100,3,132,0,90,5,100,4,83,0,41,5,218,
@@ -1862,10 +1862,10 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     0,0,32,114,5,0,0,0,114,65,0,0,0,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,126,3,0,0,243,
-    2,0,0,0,12,2,114,217,0,0,0,115,12,0,0,0,
+    2,0,0,0,12,2,114,218,0,0,0,115,12,0,0,0,
     9,13,9,28,9,28,9,28,9,28,9,28,114,17,0,0,
     0,99,4,0,0,0,0,0,0,0,0,0,0,0,2,0,
-    0,0,3,0,0,0,114,216,0,0,0,41,2,122,60,82,
+    0,0,3,0,0,0,114,217,0,0,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,
@@ -1876,12 +1876,12 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     97,99,107,115,4,0,0,0,32,32,32,32,114,5,0,0,
     0,114,68,0,0,0,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,130,3,0,0,114,217,0,0,0,114,217,0,0,
+    116,95,95,130,3,0,0,114,218,0,0,0,114,218,0,0,
     0,115,12,0,0,0,9,13,9,28,9,28,9,28,9,28,
     9,28,114,17,0,0,0,78,41,6,114,8,0,0,0,114,
     7,0,0,0,114,1,0,0,0,114,9,0,0,0,114,65,
     0,0,0,114,68,0,0,0,114,24,0,0,0,114,17,0,
-    0,0,114,5,0,0,0,114,215,0,0,0,114,215,0,0,
+    0,0,114,5,0,0,0,114,216,0,0,0,114,216,0,0,
     0,122,3,0,0,115,8,0,0,0,8,0,4,2,6,2,
     10,4,115,66,0,0,0,0,129,0,129,0,129,0,129,0,
     129,0,129,0,129,8,255,0,127,0,127,0,127,0,127,0,
@@ -1890,7 +1890,7 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     127,0,127,0,127,6,7,10,4,115,28,0,0,0,1,1,
     1,1,1,1,1,1,5,47,1,1,5,28,5,28,5,28,
     5,28,5,28,5,28,5,28,5,28,114,17,0,0,0,114,
-    215,0,0,0,99,3,0,0,0,0,0,0,0,0,0,0,
+    216,0,0,0,99,3,0,0,0,0,0,0,0,0,0,0,
     0,5,0,0,0,3,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,18,116,2,100,3,131,1,
@@ -1909,7 +1909,7 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     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,115,5,0,0,0,
     32,32,32,32,32,114,5,0,0,0,218,13,95,114,101,115,
-    111,108,118,101,95,110,97,109,101,114,226,0,0,0,135,3,
+    111,108,118,101,95,110,97,109,101,114,227,0,0,0,135,3,
     0,0,115,10,0,0,0,16,2,12,1,8,1,8,1,20,
     1,115,10,0,0,0,16,2,10,1,10,1,8,1,20,1,
     115,64,0,0,0,12,19,12,42,27,30,32,37,40,41,32,
@@ -1927,11 +1927,11 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     108,105,110,103,32,98,97,99,107,32,116,111,32,102,105,110,
     100,95,109,111,100,117,108,101,40,41,41,6,114,6,0,0,
     0,114,109,0,0,0,114,110,0,0,0,114,182,0,0,0,
-    114,197,0,0,0,114,112,0,0,0,41,5,218,6,102,105,
-    110,100,101,114,114,20,0,0,0,114,194,0,0,0,114,116,
+    114,198,0,0,0,114,112,0,0,0,41,5,218,6,102,105,
+    110,100,101,114,114,20,0,0,0,114,195,0,0,0,114,116,
     0,0,0,114,130,0,0,0,115,5,0,0,0,32,32,32,
     32,32,114,5,0,0,0,218,17,95,102,105,110,100,95,115,
-    112,101,99,95,108,101,103,97,99,121,114,228,0,0,0,144,
+    112,101,99,95,108,101,103,97,99,121,114,229,0,0,0,144,
     3,0,0,115,12,0,0,0,14,1,12,2,12,1,8,1,
     4,1,10,1,115,16,0,0,0,6,1,6,1,2,255,12,
     2,12,1,6,1,6,1,10,1,115,60,0,0,0,15,27,
@@ -1967,14 +1967,14 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     116,97,95,112,97,116,104,32,105,115,32,101,109,112,116,121,
     41,12,114,18,0,0,0,218,9,109,101,116,97,95,112,97,
     116,104,114,94,0,0,0,114,109,0,0,0,114,110,0,0,
-    0,114,182,0,0,0,114,113,0,0,0,114,215,0,0,0,
-    114,196,0,0,0,114,2,0,0,0,114,228,0,0,0,114,
-    121,0,0,0,41,10,114,20,0,0,0,114,194,0,0,0,
-    114,195,0,0,0,114,229,0,0,0,90,9,105,115,95,114,
-    101,108,111,97,100,114,227,0,0,0,114,196,0,0,0,114,
+    0,114,182,0,0,0,114,113,0,0,0,114,216,0,0,0,
+    114,197,0,0,0,114,2,0,0,0,114,229,0,0,0,114,
+    121,0,0,0,41,10,114,20,0,0,0,114,195,0,0,0,
+    114,196,0,0,0,114,230,0,0,0,90,9,105,115,95,114,
+    101,108,111,97,100,114,228,0,0,0,114,197,0,0,0,114,
     117,0,0,0,114,118,0,0,0,114,121,0,0,0,115,10,
     0,0,0,32,32,32,32,32,32,32,32,32,32,114,5,0,
-    0,0,218,10,95,102,105,110,100,95,115,112,101,99,114,230,
+    0,0,218,10,95,102,105,110,100,95,115,112,101,99,114,231,
     0,0,0,154,3,0,0,115,78,0,0,0,6,2,8,1,
     8,2,4,3,12,1,10,5,8,1,8,1,2,1,8,1,
     2,128,12,1,12,1,8,1,2,1,12,250,4,5,2,254,
@@ -2034,10 +2034,10 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     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,53,0,0,0,114,3,0,
     0,0,218,10,86,97,108,117,101,69,114,114,111,114,114,94,
-    0,0,0,169,3,114,20,0,0,0,114,224,0,0,0,114,
-    225,0,0,0,115,3,0,0,0,32,32,32,114,5,0,0,
+    0,0,0,169,3,114,20,0,0,0,114,225,0,0,0,114,
+    226,0,0,0,115,3,0,0,0,32,32,32,114,5,0,0,
     0,218,13,95,115,97,110,105,116,121,95,99,104,101,99,107,
-    114,236,0,0,0,201,3,0,0,115,24,0,0,0,10,2,
+    114,237,0,0,0,201,3,0,0,115,24,0,0,0,10,2,
     18,1,8,1,8,1,8,1,10,1,8,1,4,1,8,1,
     12,2,8,1,8,255,115,34,0,0,0,8,2,20,1,6,
     1,10,1,6,1,2,5,8,252,2,4,8,253,2,1,2,
@@ -2084,17 +2084,17 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     80,0,0,0,114,167,0,0,0,114,2,0,0,0,218,8,
     95,69,82,82,95,77,83,71,114,53,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,121,0,0,0,114,230,0,0,0,114,138,0,0,
-    0,114,142,0,0,0,114,186,0,0,0,114,184,0,0,0,
+    111,114,114,121,0,0,0,114,231,0,0,0,114,138,0,0,
+    0,114,142,0,0,0,114,187,0,0,0,114,184,0,0,0,
     114,11,0,0,0,114,109,0,0,0,114,110,0,0,0,114,
     182,0,0,0,41,10,114,20,0,0,0,218,7,105,109,112,
-    111,114,116,95,114,194,0,0,0,114,154,0,0,0,90,11,
+    111,114,116,95,114,195,0,0,0,114,154,0,0,0,90,11,
     112,97,114,101,110,116,95,115,112,101,99,90,13,112,97,114,
     101,110,116,95,109,111,100,117,108,101,114,116,0,0,0,90,
     5,99,104,105,108,100,114,117,0,0,0,114,118,0,0,0,
     115,10,0,0,0,32,32,32,32,32,32,32,32,32,32,114,
     5,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,114,241,0,
+    108,111,97,100,95,117,110,108,111,99,107,101,100,114,242,0,
     0,0,220,3,0,0,115,92,0,0,0,4,1,14,1,4,
     1,4,1,10,1,10,1,10,2,10,1,10,1,2,1,8,
     1,2,128,12,1,16,1,14,1,2,254,2,128,6,3,14,
@@ -2133,442 +2133,449 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
     0,0,167,3,43,0,171,23,65,2,7,193,40,4,65,52,
     0,193,52,10,65,62,7,194,7,6,66,15,0,194,15,21,
     66,40,7,194,39,1,66,40,7,99,2,0,0,0,0,0,
-    0,0,0,0,0,0,9,0,0,0,3,0,0,0,115,132,
-    0,0,0,116,0,124,0,131,1,53,0,1,0,116,1,106,
-    2,160,3,124,0,116,4,161,2,125,2,124,2,116,4,117,
-    0,114,27,116,5,124,0,124,1,131,2,2,0,100,1,4,
-    0,4,0,131,3,1,0,83,0,9,0,100,1,4,0,4,
-    0,131,3,1,0,110,11,35,0,49,0,115,39,119,4,37,
-    0,1,0,1,0,1,0,89,0,1,0,1,0,124,2,100,
-    1,117,0,114,60,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,114,
-    19,0,0,0,41,9,114,61,0,0,0,114,18,0,0,0,
+    0,0,0,0,0,0,9,0,0,0,3,0,0,0,115,174,
+    0,0,0,116,0,106,1,160,2,124,0,116,3,161,2,125,
+    2,124,2,116,3,117,0,115,21,116,4,116,4,124,2,100,
+    1,100,2,131,3,100,3,100,4,131,3,114,70,116,5,124,
+    0,131,1,53,0,1,0,116,0,106,1,160,2,124,0,116,
+    3,161,2,125,2,124,2,116,3,117,0,114,48,116,6,124,
+    0,124,1,131,2,2,0,100,2,4,0,4,0,131,3,1,
+    0,83,0,9,0,100,2,4,0,4,0,131,3,1,0,110,
+    11,35,0,49,0,115,60,119,4,37,0,1,0,1,0,1,
+    0,89,0,1,0,1,0,116,7,124,0,131,1,1,0,124,
+    2,100,2,117,0,114,85,100,5,160,8,124,0,161,1,125,
+    3,116,9,124,3,124,0,100,6,141,2,130,1,124,2,83,
+    0,41,7,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,114,121,
+    0,0,0,78,114,186,0,0,0,70,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,114,19,0,0,0,41,10,114,18,0,0,0,
     114,113,0,0,0,114,41,0,0,0,218,14,95,78,69,69,
-    68,83,95,76,79,65,68,73,78,71,114,241,0,0,0,114,
-    53,0,0,0,114,239,0,0,0,114,78,0,0,0,41,4,
-    114,20,0,0,0,114,240,0,0,0,114,118,0,0,0,114,
-    89,0,0,0,115,4,0,0,0,32,32,32,32,114,5,0,
-    0,0,218,14,95,102,105,110,100,95,97,110,100,95,108,111,
-    97,100,114,243,0,0,0,9,4,0,0,115,32,0,0,0,
-    10,2,14,1,8,1,8,1,14,253,2,2,20,254,2,128,
-    12,0,8,5,2,1,6,1,2,255,12,2,8,2,4,1,
-    115,28,0,0,0,6,2,4,3,14,254,6,1,46,1,2,
-    128,12,0,6,2,2,3,8,255,2,255,12,2,8,2,4,
-    1,115,132,0,0,0,10,28,29,33,10,34,5,58,5,58,
-    18,21,18,29,18,55,34,38,40,54,18,55,9,15,12,18,
-    22,36,12,36,9,58,20,43,44,48,50,57,20,58,5,58,
-    5,58,5,58,5,58,5,58,5,58,5,58,9,58,5,58,
-    5,58,5,58,5,58,5,58,5,58,5,58,5,58,5,58,
-    5,58,0,0,5,58,5,58,5,58,5,58,5,58,5,58,
-    8,14,18,22,8,22,5,54,20,41,20,54,49,53,20,54,
-    9,16,15,34,35,42,49,53,15,54,15,54,9,54,5,24,
-    25,29,5,30,5,30,12,18,5,18,115,12,0,0,0,132,
-    16,34,3,162,4,38,11,167,3,38,11,114,27,0,0,0,
-    99,3,0,0,0,0,0,0,0,0,0,0,0,4,0,0,
-    0,3,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,16,116,1,
-    124,0,124,1,124,2,131,3,125,0,116,2,124,0,116,3,
-    131,2,83,0,41,3,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,27,0,
-    0,0,78,41,4,114,236,0,0,0,114,226,0,0,0,114,
-    243,0,0,0,218,11,95,103,99,100,95,105,109,112,111,114,
-    116,114,235,0,0,0,115,3,0,0,0,32,32,32,114,5,
-    0,0,0,114,244,0,0,0,114,244,0,0,0,25,4,0,
-    0,115,8,0,0,0,12,9,8,1,12,1,10,1,115,8,
-    0,0,0,12,9,6,1,14,1,10,1,115,42,0,0,0,
-    5,18,19,23,25,32,34,39,5,40,5,40,8,13,16,17,
-    8,17,5,51,16,29,30,34,36,43,45,50,16,51,9,13,
-    12,26,27,31,33,44,12,45,5,45,114,17,0,0,0,169,
-    1,218,9,114,101,99,117,114,115,105,118,101,99,3,0,0,
-    0,0,0,0,0,1,0,0,0,9,0,0,0,3,0,0,
-    0,115,216,0,0,0,124,1,68,0,93,103,125,4,116,0,
-    124,4,116,1,131,2,115,32,124,3,114,17,124,0,106,2,
-    100,1,23,0,125,5,110,2,100,2,125,5,116,3,100,3,
-    124,5,155,0,100,4,116,4,124,4,131,1,106,2,155,0,
-    157,4,131,1,130,1,124,4,100,5,107,2,114,53,124,3,
-    115,52,116,5,124,0,100,6,131,2,114,52,116,6,124,0,
-    124,0,106,7,124,2,100,7,100,8,141,4,1,0,113,2,
-    116,5,124,0,124,4,131,2,115,105,100,9,160,8,124,0,
-    106,2,124,4,161,2,125,6,9,0,116,9,124,2,124,6,
-    131,2,1,0,113,2,35,0,4,0,116,10,121,103,1,0,
-    125,7,1,0,124,7,106,11,124,6,107,2,114,98,116,12,
-    106,13,160,14,124,6,116,15,161,2,100,10,117,1,114,98,
-    89,0,100,10,125,7,126,7,113,2,130,0,100,10,125,7,
-    126,7,119,1,119,0,37,0,113,2,124,0,83,0,41,11,
-    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,
-    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,114,245,0,0,0,114,221,0,0,0,78,41,
-    16,114,231,0,0,0,114,232,0,0,0,114,8,0,0,0,
-    114,233,0,0,0,114,3,0,0,0,114,10,0,0,0,218,
-    16,95,104,97,110,100,108,101,95,102,114,111,109,108,105,115,
-    116,114,248,0,0,0,114,53,0,0,0,114,80,0,0,0,
-    114,239,0,0,0,114,20,0,0,0,114,18,0,0,0,114,
-    113,0,0,0,114,41,0,0,0,114,242,0,0,0,41,8,
-    114,118,0,0,0,218,8,102,114,111,109,108,105,115,116,114,
-    240,0,0,0,114,246,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,115,8,0,0,0,32,32,32,32,32,32,32,32,
-    114,5,0,0,0,114,249,0,0,0,114,249,0,0,0,40,
-    4,0,0,115,60,0,0,0,8,10,10,1,4,1,12,1,
-    4,2,10,1,8,1,8,255,8,2,14,1,10,1,2,1,
-    6,255,2,128,10,2,14,1,2,1,12,1,2,128,12,1,
-    10,4,16,1,2,255,10,2,2,1,8,128,2,249,2,128,
-    2,252,4,12,115,82,0,0,0,2,10,4,23,2,233,8,
-    1,2,22,2,235,2,3,12,254,4,2,2,1,2,1,2,
-    255,20,1,6,1,2,15,2,242,2,2,8,254,2,2,10,
-    255,8,1,2,128,8,1,2,11,14,246,2,10,12,248,2,
-    128,2,8,2,249,8,7,8,253,2,2,16,255,12,1,2,
-    1,8,128,2,0,2,128,2,0,4,1,115,216,0,0,0,
-    14,22,5,22,5,22,9,10,16,26,27,28,30,33,16,34,
-    9,22,16,25,13,40,25,31,25,40,43,53,25,53,17,22,
-    17,22,25,40,17,22,19,28,29,54,40,45,29,54,29,54,
-    36,40,41,42,36,43,36,52,29,54,29,54,19,55,13,55,
-    14,15,19,22,14,22,9,22,20,29,13,49,34,41,42,48,
-    50,59,34,60,13,49,17,33,34,40,42,48,42,56,58,65,
-    44,48,17,49,17,49,17,49,0,0,18,25,26,32,34,35,
-    18,36,9,22,25,32,25,59,40,46,40,55,57,58,25,59,
-    13,22,13,22,17,42,43,50,52,61,17,62,17,62,17,62,
-    0,0,13,22,20,39,13,22,13,22,13,22,13,22,21,24,
-    21,29,33,42,21,42,17,29,21,24,21,32,21,63,37,46,
-    48,62,21,63,71,75,21,75,17,29,21,29,21,29,21,29,
-    21,29,21,29,17,22,0,0,0,0,0,0,0,0,13,22,
-    0,0,9,22,12,18,5,18,115,30,0,0,0,193,2,5,
-    65,8,2,193,8,7,65,40,9,193,15,14,65,35,9,193,
-    34,1,65,35,9,193,35,5,65,40,9,99,1,0,0,0,
-    0,0,0,0,0,0,0,0,7,0,0,0,3,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,117,1,114,
-    41,124,2,100,3,117,1,114,39,124,1,124,2,106,1,107,
-    3,114,39,116,2,160,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,166,
-    3,1,0,124,1,83,0,124,2,100,3,117,1,114,48,124,
-    2,106,1,83,0,116,2,160,3,100,9,116,4,100,7,100,
-    8,166,3,1,0,124,0,100,10,25,0,125,1,100,11,124,
-    0,118,1,114,71,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,171,0,0,0,114,121,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,8,0,0,0,114,167,0,0,0,
-    114,152,0,0,0,114,27,0,0,0,41,6,114,41,0,0,
-    0,114,154,0,0,0,114,109,0,0,0,114,110,0,0,0,
-    114,182,0,0,0,114,153,0,0,0,41,3,218,7,103,108,
-    111,98,97,108,115,114,224,0,0,0,114,117,0,0,0,115,
-    3,0,0,0,32,32,32,114,5,0,0,0,218,17,95,99,
-    97,108,99,95,95,95,112,97,99,107,97,103,101,95,95,114,
-    255,0,0,0,77,4,0,0,115,42,0,0,0,10,7,10,
-    1,8,1,18,1,6,1,2,1,4,255,4,1,6,255,4,
-    2,6,254,4,3,8,1,6,1,6,2,4,2,6,254,8,
-    3,8,1,14,1,4,1,115,48,0,0,0,10,7,10,1,
-    6,1,2,14,6,243,2,3,8,253,2,3,2,254,2,2,
-    18,255,10,1,4,1,6,1,2,8,6,249,2,2,2,2,
-    2,255,10,1,8,1,6,1,16,1,4,1,115,146,0,0,
-    0,15,22,15,41,27,40,15,41,5,12,12,19,12,35,24,
-    34,12,35,5,9,8,15,23,27,8,27,5,49,12,16,24,
-    28,12,28,9,56,33,40,44,48,44,55,33,55,9,56,13,
-    22,13,56,28,63,32,39,28,63,28,63,47,51,47,58,28,
-    63,28,63,28,63,28,41,54,55,13,56,13,56,13,56,16,
-    23,9,23,10,14,22,26,10,26,5,49,16,20,16,27,9,
-    27,9,18,9,52,24,63,24,37,50,51,9,52,9,52,9,
-    52,19,26,27,37,19,38,9,16,12,22,30,37,12,37,9,
-    49,23,30,23,46,42,45,23,46,47,48,23,49,13,20,12,
-    19,5,19,114,17,0,0,0,114,24,0,0,0,99,5,0,
-    0,0,0,0,0,0,0,0,0,0,5,0,0,0,3,0,
-    0,0,115,174,0,0,0,124,4,100,1,107,2,114,9,116,
-    0,124,0,131,1,125,5,110,18,124,1,100,2,117,1,114,
-    15,124,1,110,1,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,
-    74,124,4,100,1,107,2,114,42,116,0,124,0,160,2,100,
-    3,161,1,100,1,25,0,131,1,83,0,124,0,115,46,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,116,7,124,5,100,
-    4,131,2,114,85,116,8,124,5,124,3,116,0,131,3,83,
-    0,124,5,83,0,41,5,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,27,0,0,0,78,114,152,0,0,0,114,167,
-    0,0,0,41,9,114,244,0,0,0,114,255,0,0,0,218,
-    9,112,97,114,116,105,116,105,111,110,114,223,0,0,0,114,
-    18,0,0,0,114,113,0,0,0,114,8,0,0,0,114,10,
-    0,0,0,114,249,0,0,0,41,9,114,20,0,0,0,114,
-    254,0,0,0,218,6,108,111,99,97,108,115,114,250,0,0,
-    0,114,225,0,0,0,114,118,0,0,0,90,8,103,108,111,
-    98,97,108,115,95,114,224,0,0,0,90,7,99,117,116,95,
-    111,102,102,115,9,0,0,0,32,32,32,32,32,32,32,32,
-    32,114,5,0,0,0,218,10,95,95,105,109,112,111,114,116,
-    95,95,114,2,1,0,0,104,4,0,0,115,30,0,0,0,
-    8,11,10,1,16,2,8,1,12,1,4,1,8,3,18,1,
-    4,1,4,1,26,4,30,3,10,1,12,1,4,2,115,40,
-    0,0,0,6,11,2,5,10,252,16,2,8,1,12,1,2,
-    1,2,17,6,242,2,10,18,247,2,1,2,8,4,249,26,
-    4,30,3,8,1,2,3,12,254,4,2,115,174,0,0,0,
-    8,13,17,18,8,18,5,51,18,29,30,34,18,35,9,15,
-    9,15,31,38,46,50,31,50,20,58,20,27,20,27,56,58,
-    9,17,19,36,37,45,19,46,9,16,18,29,30,34,36,43,
-    45,50,18,51,9,15,12,20,5,22,12,17,21,22,12,22,
-    9,79,20,31,32,36,32,51,47,50,32,51,52,53,32,54,
-    20,55,13,55,18,22,9,79,20,26,13,26,23,26,27,31,
-    23,32,35,38,39,43,39,58,54,57,39,58,59,60,39,61,
-    35,62,23,62,13,20,20,23,20,31,32,38,32,47,48,77,
-    49,52,53,59,53,68,49,69,70,77,49,77,48,77,32,78,
-    20,79,13,79,10,17,18,24,26,36,10,37,5,22,16,32,
-    33,39,41,49,51,62,16,63,9,63,16,22,9,22,114,17,
-    0,0,0,99,1,0,0,0,0,0,0,0,0,0,0,0,
-    3,0,0,0,3,0,0,0,115,38,0,0,0,116,0,160,
-    1,124,0,161,1,125,1,124,1,100,0,117,0,114,15,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,188,0,0,0,114,196,0,0,0,114,94,0,
-    0,0,114,186,0,0,0,41,2,114,20,0,0,0,114,117,
-    0,0,0,115,2,0,0,0,32,32,114,5,0,0,0,218,
-    18,95,98,117,105,108,116,105,110,95,102,114,111,109,95,110,
-    97,109,101,114,3,1,0,0,141,4,0,0,115,8,0,0,
-    0,10,1,8,1,12,1,8,1,115,8,0,0,0,10,1,
-    6,1,14,1,8,1,115,38,0,0,0,12,27,12,43,38,
-    42,12,43,5,9,8,12,16,20,8,20,5,62,15,26,27,
-    54,57,61,27,61,15,62,9,62,12,26,27,31,12,32,5,
-    32,114,17,0,0,0,99,2,0,0,0,0,0,0,0,0,
-    0,0,0,5,0,0,0,3,0,0,0,115,166,0,0,0,
-    124,1,97,0,124,0,97,1,116,2,116,1,131,1,125,2,
-    116,1,106,3,160,4,161,0,68,0,93,36,92,2,125,3,
-    125,4,116,5,124,4,124,2,131,2,114,49,124,3,116,1,
-    106,6,118,0,114,30,116,7,125,5,110,9,116,0,160,8,
-    124,3,161,1,114,38,116,9,125,5,110,1,113,13,116,10,
-    124,4,124,5,131,2,125,6,116,11,124,6,124,4,131,2,
-    1,0,113,13,116,1,106,3,116,12,25,0,125,7,100,1,
-    68,0,93,23,125,8,124,8,116,1,106,3,118,1,114,69,
-    116,13,124,8,131,1,125,9,110,5,116,1,106,3,124,8,
-    25,0,125,9,116,14,124,7,124,8,124,9,131,3,1,0,
-    113,57,100,2,83,0,41,3,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,41,3,114,28,0,0,0,114,109,0,0,0,
-    114,77,0,0,0,78,41,15,114,70,0,0,0,114,18,0,
-    0,0,114,3,0,0,0,114,113,0,0,0,218,5,105,116,
-    101,109,115,114,231,0,0,0,114,93,0,0,0,114,188,0,
-    0,0,114,106,0,0,0,114,207,0,0,0,114,168,0,0,
-    0,114,174,0,0,0,114,8,0,0,0,114,3,1,0,0,
-    114,11,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,20,0,
-    0,0,114,118,0,0,0,114,130,0,0,0,114,117,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,115,10,0,0,
-    0,32,32,32,32,32,32,32,32,32,32,114,5,0,0,0,
-    218,6,95,115,101,116,117,112,114,7,1,0,0,148,4,0,
-    0,115,40,0,0,0,4,9,4,1,8,3,18,1,10,1,
-    10,1,6,1,10,1,6,1,2,2,10,1,10,1,2,128,
-    10,3,8,1,10,1,10,1,10,2,14,1,4,251,115,54,
-    0,0,0,4,9,4,1,8,3,8,1,4,9,6,247,8,
-    1,2,8,8,249,2,5,6,252,8,1,2,3,6,254,2,
-    2,10,1,10,1,2,128,10,3,2,1,4,5,2,251,8,
-    1,2,3,10,254,10,2,18,1,115,166,0,0,0,12,23,
-    5,9,11,21,5,8,19,23,24,27,19,28,5,16,25,28,
-    25,36,25,44,25,44,5,45,5,45,9,21,9,13,15,21,
-    12,22,23,29,31,42,12,43,9,45,16,20,24,27,24,48,
-    16,48,13,25,26,41,17,23,17,23,18,22,18,38,33,37,
-    18,38,13,25,26,40,17,23,17,23,17,25,20,37,38,44,
-    46,52,20,53,13,17,13,31,32,36,38,44,13,45,13,45,
-    0,0,19,22,19,30,31,39,19,40,5,16,25,61,5,59,
-    5,59,9,21,12,24,32,35,32,43,12,43,9,55,30,48,
-    49,61,30,62,13,27,13,27,30,33,30,41,42,54,30,55,
-    13,27,9,16,17,28,30,42,44,58,9,59,9,59,9,59,
-    5,59,5,59,114,17,0,0,0,99,2,0,0,0,0,0,
+    68,83,95,76,79,65,68,73,78,71,114,12,0,0,0,114,
+    61,0,0,0,114,242,0,0,0,114,78,0,0,0,114,53,
+    0,0,0,114,240,0,0,0,41,4,114,20,0,0,0,114,
+    241,0,0,0,114,118,0,0,0,114,89,0,0,0,115,4,
+    0,0,0,32,32,32,32,114,5,0,0,0,218,14,95,102,
+    105,110,100,95,97,110,100,95,108,111,97,100,114,244,0,0,
+    0,9,4,0,0,115,40,0,0,0,14,5,8,1,18,1,
+    2,255,10,2,14,1,8,1,8,1,14,253,2,2,20,254,
+    2,128,12,0,8,9,8,2,2,1,6,1,2,255,12,2,
+    4,2,115,38,0,0,0,14,5,6,1,2,11,18,246,2,
+    10,6,247,4,3,14,254,6,1,46,1,2,128,12,0,8,
+    6,6,2,2,3,8,255,2,255,12,2,4,2,115,174,0,
+    0,0,14,17,14,25,14,51,30,34,36,50,14,51,5,11,
+    9,15,19,33,9,33,5,34,9,16,17,24,25,31,33,43,
+    45,49,17,50,52,67,69,74,9,75,5,34,14,32,33,37,
+    14,38,9,62,9,62,22,25,22,33,22,59,38,42,44,58,
+    22,59,13,19,16,22,26,40,16,40,13,62,24,47,48,52,
+    54,61,24,62,9,62,9,62,9,62,9,62,9,62,9,62,
+    9,62,13,62,9,62,9,62,9,62,9,62,9,62,9,62,
+    9,62,9,62,9,62,9,62,0,0,9,62,9,62,9,62,
+    9,62,9,62,9,62,9,28,29,33,9,34,9,34,8,14,
+    18,22,8,22,5,54,20,41,20,54,49,53,20,54,9,16,
+    15,34,35,42,49,53,15,54,15,54,9,54,12,18,5,18,
+    115,12,0,0,0,153,16,55,3,183,4,59,11,188,3,59,
+    11,114,27,0,0,0,99,3,0,0,0,0,0,0,0,0,
+    0,0,0,4,0,0,0,3,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,16,116,1,124,0,124,1,124,2,131,3,125,0,
+    116,2,124,0,116,3,131,2,83,0,41,3,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,27,0,0,0,78,41,4,114,237,0,0,0,
+    114,227,0,0,0,114,244,0,0,0,218,11,95,103,99,100,
+    95,105,109,112,111,114,116,114,236,0,0,0,115,3,0,0,
+    0,32,32,32,114,5,0,0,0,114,245,0,0,0,114,245,
+    0,0,0,36,4,0,0,115,8,0,0,0,12,9,8,1,
+    12,1,10,1,115,8,0,0,0,12,9,6,1,14,1,10,
+    1,115,42,0,0,0,5,18,19,23,25,32,34,39,5,40,
+    5,40,8,13,16,17,8,17,5,51,16,29,30,34,36,43,
+    45,50,16,51,9,13,12,26,27,31,33,44,12,45,5,45,
+    114,17,0,0,0,169,1,218,9,114,101,99,117,114,115,105,
+    118,101,99,3,0,0,0,0,0,0,0,1,0,0,0,9,
+    0,0,0,3,0,0,0,115,216,0,0,0,124,1,68,0,
+    93,103,125,4,116,0,124,4,116,1,131,2,115,32,124,3,
+    114,17,124,0,106,2,100,1,23,0,125,5,110,2,100,2,
+    125,5,116,3,100,3,124,5,155,0,100,4,116,4,124,4,
+    131,1,106,2,155,0,157,4,131,1,130,1,124,4,100,5,
+    107,2,114,53,124,3,115,52,116,5,124,0,100,6,131,2,
+    114,52,116,6,124,0,124,0,106,7,124,2,100,7,100,8,
+    141,4,1,0,113,2,116,5,124,0,124,4,131,2,115,105,
+    100,9,160,8,124,0,106,2,124,4,161,2,125,6,9,0,
+    116,9,124,2,124,6,131,2,1,0,113,2,35,0,4,0,
+    116,10,121,103,1,0,125,7,1,0,124,7,106,11,124,6,
+    107,2,114,98,116,12,106,13,160,14,124,6,116,15,161,2,
+    100,10,117,1,114,98,89,0,100,10,125,7,126,7,113,2,
+    130,0,100,10,125,7,126,7,119,1,119,0,37,0,113,2,
+    124,0,83,0,41,11,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,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,114,246,0,0,0,114,
+    222,0,0,0,78,41,16,114,232,0,0,0,114,233,0,0,
+    0,114,8,0,0,0,114,234,0,0,0,114,3,0,0,0,
+    114,10,0,0,0,218,16,95,104,97,110,100,108,101,95,102,
+    114,111,109,108,105,115,116,114,249,0,0,0,114,53,0,0,
+    0,114,80,0,0,0,114,240,0,0,0,114,20,0,0,0,
+    114,18,0,0,0,114,113,0,0,0,114,41,0,0,0,114,
+    243,0,0,0,41,8,114,118,0,0,0,218,8,102,114,111,
+    109,108,105,115,116,114,241,0,0,0,114,247,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,115,8,0,0,0,32,32,
+    32,32,32,32,32,32,114,5,0,0,0,114,250,0,0,0,
+    114,250,0,0,0,51,4,0,0,115,60,0,0,0,8,10,
+    10,1,4,1,12,1,4,2,10,1,8,1,8,255,8,2,
+    14,1,10,1,2,1,6,255,2,128,10,2,14,1,2,1,
+    12,1,2,128,12,1,10,4,16,1,2,255,10,2,2,1,
+    8,128,2,249,2,128,2,252,4,12,115,82,0,0,0,2,
+    10,4,23,2,233,8,1,2,22,2,235,2,3,12,254,4,
+    2,2,1,2,1,2,255,20,1,6,1,2,15,2,242,2,
+    2,8,254,2,2,10,255,8,1,2,128,8,1,2,11,14,
+    246,2,10,12,248,2,128,2,8,2,249,8,7,8,253,2,
+    2,16,255,12,1,2,1,8,128,2,0,2,128,2,0,4,
+    1,115,216,0,0,0,14,22,5,22,5,22,9,10,16,26,
+    27,28,30,33,16,34,9,22,16,25,13,40,25,31,25,40,
+    43,53,25,53,17,22,17,22,25,40,17,22,19,28,29,54,
+    40,45,29,54,29,54,36,40,41,42,36,43,36,52,29,54,
+    29,54,19,55,13,55,14,15,19,22,14,22,9,22,20,29,
+    13,49,34,41,42,48,50,59,34,60,13,49,17,33,34,40,
+    42,48,42,56,58,65,44,48,17,49,17,49,17,49,0,0,
+    18,25,26,32,34,35,18,36,9,22,25,32,25,59,40,46,
+    40,55,57,58,25,59,13,22,13,22,17,42,43,50,52,61,
+    17,62,17,62,17,62,0,0,13,22,20,39,13,22,13,22,
+    13,22,13,22,21,24,21,29,33,42,21,42,17,29,21,24,
+    21,32,21,63,37,46,48,62,21,63,71,75,21,75,17,29,
+    21,29,21,29,21,29,21,29,21,29,17,22,0,0,0,0,
+    0,0,0,0,13,22,0,0,9,22,12,18,5,18,115,30,
+    0,0,0,193,2,5,65,8,2,193,8,7,65,40,9,193,
+    15,14,65,35,9,193,34,1,65,35,9,193,35,5,65,40,
+    9,99,1,0,0,0,0,0,0,0,0,0,0,0,7,0,
+    0,0,3,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,117,1,114,41,124,2,100,3,117,1,114,39,124,
+    1,124,2,106,1,107,3,114,39,116,2,160,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,166,3,1,0,124,1,83,0,124,2,100,
+    3,117,1,114,48,124,2,106,1,83,0,116,2,160,3,100,
+    9,116,4,100,7,100,8,166,3,1,0,124,0,100,10,25,
+    0,125,1,100,11,124,0,118,1,114,71,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,171,0,0,0,114,121,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,8,0,0,
+    0,114,167,0,0,0,114,152,0,0,0,114,27,0,0,0,
+    41,6,114,41,0,0,0,114,154,0,0,0,114,109,0,0,
+    0,114,110,0,0,0,114,182,0,0,0,114,153,0,0,0,
+    41,3,218,7,103,108,111,98,97,108,115,114,225,0,0,0,
+    114,117,0,0,0,115,3,0,0,0,32,32,32,114,5,0,
+    0,0,218,17,95,99,97,108,99,95,95,95,112,97,99,107,
+    97,103,101,95,95,114,0,1,0,0,88,4,0,0,115,42,
+    0,0,0,10,7,10,1,8,1,18,1,6,1,2,1,4,
+    255,4,1,6,255,4,2,6,254,4,3,8,1,6,1,6,
+    2,4,2,6,254,8,3,8,1,14,1,4,1,115,48,0,
+    0,0,10,7,10,1,6,1,2,14,6,243,2,3,8,253,
+    2,3,2,254,2,2,18,255,10,1,4,1,6,1,2,8,
+    6,249,2,2,2,2,2,255,10,1,8,1,6,1,16,1,
+    4,1,115,146,0,0,0,15,22,15,41,27,40,15,41,5,
+    12,12,19,12,35,24,34,12,35,5,9,8,15,23,27,8,
+    27,5,49,12,16,24,28,12,28,9,56,33,40,44,48,44,
+    55,33,55,9,56,13,22,13,56,28,63,32,39,28,63,28,
+    63,47,51,47,58,28,63,28,63,28,63,28,41,54,55,13,
+    56,13,56,13,56,16,23,9,23,10,14,22,26,10,26,5,
+    49,16,20,16,27,9,27,9,18,9,52,24,63,24,37,50,
+    51,9,52,9,52,9,52,19,26,27,37,19,38,9,16,12,
+    22,30,37,12,37,9,49,23,30,23,46,42,45,23,46,47,
+    48,23,49,13,20,12,19,5,19,114,17,0,0,0,114,24,
+    0,0,0,99,5,0,0,0,0,0,0,0,0,0,0,0,
+    5,0,0,0,3,0,0,0,115,174,0,0,0,124,4,100,
+    1,107,2,114,9,116,0,124,0,131,1,125,5,110,18,124,
+    1,100,2,117,1,114,15,124,1,110,1,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,74,124,4,100,1,107,2,114,42,116,
+    0,124,0,160,2,100,3,161,1,100,1,25,0,131,1,83,
+    0,124,0,115,46,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,116,7,124,5,100,4,131,2,114,85,116,8,124,5,124,
+    3,116,0,131,3,83,0,124,5,83,0,41,5,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,27,0,0,0,78,114,
+    152,0,0,0,114,167,0,0,0,41,9,114,245,0,0,0,
+    114,0,1,0,0,218,9,112,97,114,116,105,116,105,111,110,
+    114,224,0,0,0,114,18,0,0,0,114,113,0,0,0,114,
+    8,0,0,0,114,10,0,0,0,114,250,0,0,0,41,9,
+    114,20,0,0,0,114,255,0,0,0,218,6,108,111,99,97,
+    108,115,114,251,0,0,0,114,226,0,0,0,114,118,0,0,
+    0,90,8,103,108,111,98,97,108,115,95,114,225,0,0,0,
+    90,7,99,117,116,95,111,102,102,115,9,0,0,0,32,32,
+    32,32,32,32,32,32,32,114,5,0,0,0,218,10,95,95,
+    105,109,112,111,114,116,95,95,114,3,1,0,0,115,4,0,
+    0,115,30,0,0,0,8,11,10,1,16,2,8,1,12,1,
+    4,1,8,3,18,1,4,1,4,1,26,4,30,3,10,1,
+    12,1,4,2,115,40,0,0,0,6,11,2,5,10,252,16,
+    2,8,1,12,1,2,1,2,17,6,242,2,10,18,247,2,
+    1,2,8,4,249,26,4,30,3,8,1,2,3,12,254,4,
+    2,115,174,0,0,0,8,13,17,18,8,18,5,51,18,29,
+    30,34,18,35,9,15,9,15,31,38,46,50,31,50,20,58,
+    20,27,20,27,56,58,9,17,19,36,37,45,19,46,9,16,
+    18,29,30,34,36,43,45,50,18,51,9,15,12,20,5,22,
+    12,17,21,22,12,22,9,79,20,31,32,36,32,51,47,50,
+    32,51,52,53,32,54,20,55,13,55,18,22,9,79,20,26,
+    13,26,23,26,27,31,23,32,35,38,39,43,39,58,54,57,
+    39,58,59,60,39,61,35,62,23,62,13,20,20,23,20,31,
+    32,38,32,47,48,77,49,52,53,59,53,68,49,69,70,77,
+    49,77,48,77,32,78,20,79,13,79,10,17,18,24,26,36,
+    10,37,5,22,16,32,33,39,41,49,51,62,16,63,9,63,
+    16,22,9,22,114,17,0,0,0,99,1,0,0,0,0,0,
     0,0,0,0,0,0,3,0,0,0,3,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,7,1,0,0,114,18,0,0,0,114,229,0,0,0,114,
-    142,0,0,0,114,188,0,0,0,114,207,0,0,0,41,2,
-    114,5,1,0,0,114,6,1,0,0,115,2,0,0,0,32,
-    32,114,5,0,0,0,218,8,95,105,110,115,116,97,108,108,
-    114,8,1,0,0,183,4,0,0,243,6,0,0,0,10,2,
-    12,2,16,1,114,9,1,0,0,115,38,0,0,0,5,11,
-    12,22,24,35,5,36,5,36,5,8,5,18,5,42,26,41,
-    5,42,5,42,5,8,5,18,5,41,26,40,5,41,5,41,
-    5,41,5,41,114,17,0,0,0,99,0,0,0,0,0,0,
-    0,0,0,0,0,0,4,0,0,0,3,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,27,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,149,0,0,0,114,8,1,0,0,114,18,
-    0,0,0,114,113,0,0,0,114,8,0,0,0,41,1,114,
-    10,1,0,0,115,1,0,0,0,32,114,5,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,114,11,1,0,
-    0,191,4,0,0,243,6,0,0,0,8,3,4,1,20,1,
-    114,12,1,0,0,115,32,0,0,0,5,38,5,38,5,38,
-    5,38,27,53,5,24,5,31,5,63,41,44,41,52,53,61,
-    41,62,5,63,5,63,5,63,5,63,114,17,0,0,0,114,
-    204,0,0,0,114,0,0,0,0,114,26,0,0,0,41,4,
-    78,78,114,24,0,0,0,114,27,0,0,0,41,54,114,9,
-    0,0,0,114,6,0,0,0,114,28,0,0,0,114,109,0,
-    0,0,114,77,0,0,0,114,149,0,0,0,114,16,0,0,
-    0,114,21,0,0,0,114,72,0,0,0,114,40,0,0,0,
-    114,50,0,0,0,114,23,0,0,0,114,25,0,0,0,114,
-    58,0,0,0,114,61,0,0,0,114,64,0,0,0,114,78,
-    0,0,0,114,80,0,0,0,114,90,0,0,0,114,102,0,
-    0,0,114,108,0,0,0,114,119,0,0,0,114,132,0,0,
-    0,114,133,0,0,0,114,112,0,0,0,114,168,0,0,0,
-    114,174,0,0,0,114,178,0,0,0,114,127,0,0,0,114,
-    114,0,0,0,114,185,0,0,0,114,186,0,0,0,114,115,
-    0,0,0,114,188,0,0,0,114,207,0,0,0,114,215,0,
-    0,0,114,226,0,0,0,114,228,0,0,0,114,230,0,0,
-    0,114,236,0,0,0,90,15,95,69,82,82,95,77,83,71,
-    95,80,82,69,70,73,88,114,238,0,0,0,114,241,0,0,
-    0,218,6,111,98,106,101,99,116,114,242,0,0,0,114,243,
-    0,0,0,114,244,0,0,0,114,249,0,0,0,114,255,0,
-    0,0,114,2,1,0,0,114,3,1,0,0,114,7,1,0,
-    0,114,8,1,0,0,114,11,1,0,0,114,24,0,0,0,
-    114,17,0,0,0,114,5,0,0,0,218,8,60,109,111,100,
-    117,108,101,62,114,14,1,0,0,1,0,0,0,115,104,0,
-    0,0,4,0,6,22,4,9,4,1,4,1,4,3,6,3,
-    6,8,4,8,4,2,14,3,12,4,12,77,12,21,6,16,
-    6,37,6,17,12,11,6,8,6,11,6,12,6,19,12,26,
-    14,102,8,26,12,45,6,72,6,17,6,17,6,30,6,36,
-    6,45,12,15,12,80,12,85,6,13,6,9,8,10,6,47,
-    4,16,8,1,6,2,6,42,6,3,8,16,12,15,6,37,
-    8,27,6,37,6,7,6,35,10,8,115,124,0,0,0,4,
-    7,6,19,4,5,4,1,4,1,4,3,6,8,6,4,4,
-    7,4,2,8,4,2,255,4,1,12,77,12,21,12,14,6,
-    39,6,17,6,11,2,3,10,5,6,11,6,11,6,19,6,
-    27,12,102,4,3,10,23,2,3,6,42,2,3,10,69,6,
-    17,6,16,6,31,6,37,6,43,6,14,12,82,12,83,12,
-    15,6,9,6,10,2,3,6,44,6,16,4,3,8,1,6,
-    41,6,3,6,16,2,3,6,12,2,3,10,34,6,27,2,
-    3,6,34,6,7,6,35,6,8,10,8,115,130,1,0,0,
-    1,4,1,4,1,38,1,38,1,38,11,15,1,8,13,17,
-    1,10,12,16,1,9,23,27,1,20,1,38,1,38,1,38,
-    1,27,1,27,1,27,17,19,1,14,16,18,1,13,1,9,
-    1,9,1,9,1,9,22,34,1,9,1,9,1,69,1,69,
-    1,69,1,69,1,69,1,69,1,74,1,74,1,74,1,74,
-    1,74,1,74,1,29,1,29,1,29,1,29,1,29,1,29,
-    1,16,1,16,1,16,1,23,1,23,1,23,1,28,1,28,
-    1,28,48,49,1,54,1,54,1,54,1,54,1,54,1,37,
-    1,37,1,37,1,36,1,36,1,36,1,27,1,27,1,27,
-    1,64,1,64,1,64,1,41,1,41,1,41,1,41,1,41,
-    1,41,46,50,63,67,1,74,1,74,1,74,1,74,1,74,
-    38,42,1,16,1,16,1,16,50,55,1,18,1,18,1,18,
-    1,18,1,18,1,18,1,18,1,18,1,71,1,71,1,71,
+    0,0,0,116,0,160,1,124,0,161,1,125,1,124,1,100,
+    0,117,0,114,15,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,189,0,0,0,114,197,
+    0,0,0,114,94,0,0,0,114,187,0,0,0,41,2,114,
+    20,0,0,0,114,117,0,0,0,115,2,0,0,0,32,32,
+    114,5,0,0,0,218,18,95,98,117,105,108,116,105,110,95,
+    102,114,111,109,95,110,97,109,101,114,4,1,0,0,152,4,
+    0,0,115,8,0,0,0,10,1,8,1,12,1,8,1,115,
+    8,0,0,0,10,1,6,1,14,1,8,1,115,38,0,0,
+    0,12,27,12,43,38,42,12,43,5,9,8,12,16,20,8,
+    20,5,62,15,26,27,54,57,61,27,61,15,62,9,62,12,
+    26,27,31,12,32,5,32,114,17,0,0,0,99,2,0,0,
+    0,0,0,0,0,0,0,0,0,5,0,0,0,3,0,0,
+    0,115,166,0,0,0,124,1,97,0,124,0,97,1,116,2,
+    116,1,131,1,125,2,116,1,106,3,160,4,161,0,68,0,
+    93,36,92,2,125,3,125,4,116,5,124,4,124,2,131,2,
+    114,49,124,3,116,1,106,6,118,0,114,30,116,7,125,5,
+    110,9,116,0,160,8,124,3,161,1,114,38,116,9,125,5,
+    110,1,113,13,116,10,124,4,124,5,131,2,125,6,116,11,
+    124,6,124,4,131,2,1,0,113,13,116,1,106,3,116,12,
+    25,0,125,7,100,1,68,0,93,23,125,8,124,8,116,1,
+    106,3,118,1,114,69,116,13,124,8,131,1,125,9,110,5,
+    116,1,106,3,124,8,25,0,125,9,116,14,124,7,124,8,
+    124,9,131,3,1,0,113,57,100,2,83,0,41,3,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,41,3,114,28,0,0,
+    0,114,109,0,0,0,114,77,0,0,0,78,41,15,114,70,
+    0,0,0,114,18,0,0,0,114,3,0,0,0,114,113,0,
+    0,0,218,5,105,116,101,109,115,114,232,0,0,0,114,93,
+    0,0,0,114,189,0,0,0,114,106,0,0,0,114,208,0,
+    0,0,114,168,0,0,0,114,174,0,0,0,114,8,0,0,
+    0,114,4,1,0,0,114,11,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,20,0,0,0,114,118,0,0,0,114,130,0,
+    0,0,114,117,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,115,10,0,0,0,32,32,32,32,32,32,32,32,32,
+    32,114,5,0,0,0,218,6,95,115,101,116,117,112,114,8,
+    1,0,0,159,4,0,0,115,40,0,0,0,4,9,4,1,
+    8,3,18,1,10,1,10,1,6,1,10,1,6,1,2,2,
+    10,1,10,1,2,128,10,3,8,1,10,1,10,1,10,2,
+    14,1,4,251,115,54,0,0,0,4,9,4,1,8,3,8,
+    1,4,9,6,247,8,1,2,8,8,249,2,5,6,252,8,
+    1,2,3,6,254,2,2,10,1,10,1,2,128,10,3,2,
+    1,4,5,2,251,8,1,2,3,10,254,10,2,18,1,115,
+    166,0,0,0,12,23,5,9,11,21,5,8,19,23,24,27,
+    19,28,5,16,25,28,25,36,25,44,25,44,5,45,5,45,
+    9,21,9,13,15,21,12,22,23,29,31,42,12,43,9,45,
+    16,20,24,27,24,48,16,48,13,25,26,41,17,23,17,23,
+    18,22,18,38,33,37,18,38,13,25,26,40,17,23,17,23,
+    17,25,20,37,38,44,46,52,20,53,13,17,13,31,32,36,
+    38,44,13,45,13,45,0,0,19,22,19,30,31,39,19,40,
+    5,16,25,61,5,59,5,59,9,21,12,24,32,35,32,43,
+    12,43,9,55,30,48,49,61,30,62,13,27,13,27,30,33,
+    30,41,42,54,30,55,13,27,9,16,17,28,30,42,44,58,
+    9,59,9,59,9,59,5,59,5,59,114,17,0,0,0,99,
+    2,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,
+    3,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,8,1,0,0,114,18,0,0,0,
+    114,230,0,0,0,114,142,0,0,0,114,189,0,0,0,114,
+    208,0,0,0,41,2,114,6,1,0,0,114,7,1,0,0,
+    115,2,0,0,0,32,32,114,5,0,0,0,218,8,95,105,
+    110,115,116,97,108,108,114,9,1,0,0,194,4,0,0,243,
+    6,0,0,0,10,2,12,2,16,1,114,10,1,0,0,115,
+    38,0,0,0,5,11,12,22,24,35,5,36,5,36,5,8,
+    5,18,5,42,26,41,5,42,5,42,5,8,5,18,5,41,
+    26,40,5,41,5,41,5,41,5,41,114,17,0,0,0,99,
+    0,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,
+    3,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,27,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,149,0,0,0,114,
+    9,1,0,0,114,18,0,0,0,114,113,0,0,0,114,8,
+    0,0,0,41,1,114,11,1,0,0,115,1,0,0,0,32,
+    114,5,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,114,12,1,0,0,202,4,0,0,243,6,0,0,0,
+    8,3,4,1,20,1,114,13,1,0,0,115,32,0,0,0,
+    5,38,5,38,5,38,5,38,27,53,5,24,5,31,5,63,
+    41,44,41,52,53,61,41,62,5,63,5,63,5,63,5,63,
+    114,17,0,0,0,114,205,0,0,0,114,0,0,0,0,114,
+    26,0,0,0,41,4,78,78,114,24,0,0,0,114,27,0,
+    0,0,41,54,114,9,0,0,0,114,6,0,0,0,114,28,
+    0,0,0,114,109,0,0,0,114,77,0,0,0,114,149,0,
+    0,0,114,16,0,0,0,114,21,0,0,0,114,72,0,0,
+    0,114,40,0,0,0,114,50,0,0,0,114,23,0,0,0,
+    114,25,0,0,0,114,58,0,0,0,114,61,0,0,0,114,
+    64,0,0,0,114,78,0,0,0,114,80,0,0,0,114,90,
+    0,0,0,114,102,0,0,0,114,108,0,0,0,114,119,0,
+    0,0,114,132,0,0,0,114,133,0,0,0,114,112,0,0,
+    0,114,168,0,0,0,114,174,0,0,0,114,178,0,0,0,
+    114,127,0,0,0,114,114,0,0,0,114,185,0,0,0,114,
+    187,0,0,0,114,115,0,0,0,114,189,0,0,0,114,208,
+    0,0,0,114,216,0,0,0,114,227,0,0,0,114,229,0,
+    0,0,114,231,0,0,0,114,237,0,0,0,90,15,95,69,
+    82,82,95,77,83,71,95,80,82,69,70,73,88,114,239,0,
+    0,0,114,242,0,0,0,218,6,111,98,106,101,99,116,114,
+    243,0,0,0,114,244,0,0,0,114,245,0,0,0,114,250,
+    0,0,0,114,0,1,0,0,114,3,1,0,0,114,4,1,
+    0,0,114,8,1,0,0,114,9,1,0,0,114,12,1,0,
+    0,114,24,0,0,0,114,17,0,0,0,114,5,0,0,0,
+    218,8,60,109,111,100,117,108,101,62,114,15,1,0,0,1,
+    0,0,0,115,104,0,0,0,4,0,6,22,4,9,4,1,
+    4,1,4,3,6,3,6,8,4,8,4,2,14,3,12,4,
+    12,77,12,21,6,16,6,37,6,17,12,11,6,8,6,11,
+    6,12,6,19,12,26,14,102,8,26,12,45,6,72,6,17,
+    6,17,6,30,6,36,6,45,12,15,12,80,12,85,6,13,
+    6,9,8,10,6,47,4,16,8,1,6,2,6,42,6,3,
+    8,27,12,15,6,37,8,27,6,37,6,7,6,35,10,8,
+    115,124,0,0,0,4,7,6,19,4,5,4,1,4,1,4,
+    3,6,8,6,4,4,7,4,2,8,4,2,255,4,1,12,
+    77,12,21,12,14,6,39,6,17,6,11,2,3,10,5,6,
+    11,6,11,6,19,6,27,12,102,4,3,10,23,2,3,6,
+    42,2,3,10,69,6,17,6,16,6,31,6,37,6,43,6,
+    14,12,82,12,83,12,15,6,9,6,10,2,3,6,44,6,
+    16,4,3,8,1,6,41,6,3,6,27,2,3,6,12,2,
+    3,10,34,6,27,2,3,6,34,6,7,6,35,6,8,10,
+    8,115,130,1,0,0,1,4,1,4,1,38,1,38,1,38,
+    11,15,1,8,13,17,1,10,12,16,1,9,23,27,1,20,
+    1,38,1,38,1,38,1,27,1,27,1,27,17,19,1,14,
+    16,18,1,13,1,9,1,9,1,9,1,9,22,34,1,9,
+    1,9,1,69,1,69,1,69,1,69,1,69,1,69,1,74,
+    1,74,1,74,1,74,1,74,1,74,1,29,1,29,1,29,
+    1,29,1,29,1,29,1,16,1,16,1,16,1,23,1,23,
+    1,23,1,28,1,28,1,28,48,49,1,54,1,54,1,54,
+    1,54,1,54,1,37,1,37,1,37,1,36,1,36,1,36,
+    1,27,1,27,1,27,1,64,1,64,1,64,1,41,1,41,
+    1,41,1,41,1,41,1,41,46,50,63,67,1,74,1,74,
+    1,74,1,74,1,74,38,42,1,16,1,16,1,16,50,55,
     1,18,1,18,1,18,1,18,1,18,1,18,1,18,1,18,
-    1,18,1,36,1,36,1,36,1,49,1,49,1,49,1,49,
-    1,49,1,49,1,48,1,48,1,48,1,48,1,48,1,48,
-    1,28,1,28,1,28,1,28,1,28,1,28,1,56,1,56,
-    1,56,1,42,1,42,1,42,35,39,1,20,1,20,1,20,
-    1,46,1,46,1,46,19,37,1,16,12,27,30,36,12,36,
-    1,9,1,18,1,18,1,18,18,24,18,26,1,15,1,18,
-    1,18,1,18,31,35,1,45,1,45,1,45,62,67,1,18,
-    1,18,1,18,1,18,1,18,1,19,1,19,1,19,30,34,
-    1,22,1,22,1,22,1,32,1,32,1,32,1,59,1,59,
-    1,59,1,41,1,41,1,41,1,63,1,63,1,63,1,63,
-    1,63,114,17,0,0,0,
+    1,71,1,71,1,71,1,18,1,18,1,18,1,18,1,18,
+    1,18,1,18,1,18,1,18,1,36,1,36,1,36,1,49,
+    1,49,1,49,1,49,1,49,1,49,1,48,1,48,1,48,
+    1,48,1,48,1,48,1,28,1,28,1,28,1,28,1,28,
+    1,28,1,56,1,56,1,56,1,42,1,42,1,42,35,39,
+    1,20,1,20,1,20,1,46,1,46,1,46,19,37,1,16,
+    12,27,30,36,12,36,1,9,1,18,1,18,1,18,18,24,
+    18,26,1,15,1,18,1,18,1,18,31,35,1,45,1,45,
+    1,45,62,67,1,18,1,18,1,18,1,18,1,18,1,19,
+    1,19,1,19,30,34,1,22,1,22,1,22,1,32,1,32,
+    1,32,1,59,1,59,1,59,1,41,1,41,1,41,1,63,
+    1,63,1,63,1,63,1,63,114,17,0,0,0,
 };


From webhook-mailer at python.org  Fri Aug 13 05:41:40 2021
From: webhook-mailer at python.org (ambv)
Date: Fri, 13 Aug 2021 09:41:40 -0000
Subject: [Python-checkins] bpo-44895: Temporarily add an extra gc.collect()
 call (GH-27746)
Message-ID: <mailman.1018.1628847701.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/7bf28cbb4bf37fa6bdfc2d3f8a3939066b3f8f22
commit: 7bf28cbb4bf37fa6bdfc2d3f8a3939066b3f8f22
branch: main
author: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-13T11:41:35+02:00
summary:

bpo-44895: Temporarily add an extra gc.collect() call (GH-27746)

This is part of an investigation of a non-deterministic reference leak. While we're looking for the root cause, this is included temporarily so that CI doesn't fail on this particular issue. This enables it to find other regressions in the meantime, which would otherwise be shadowed by our known issue.

files:
M Lib/test/test_exceptions.py

diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index efeca6de822fb..947d7132cc718 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -1014,6 +1014,9 @@ def cycle():
 
     def test_no_hang_on_context_chain_cycle2(self):
         # See issue 25782. Cycle at head of context chain.
+        while gc.collect():
+            # Remove this once issue 44895 is resolved
+            pass
 
         class A(Exception):
             pass


From webhook-mailer at python.org  Fri Aug 13 05:45:17 2021
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 13 Aug 2021 09:45:17 -0000
Subject: [Python-checkins] [3.10] bpo-33930: Fix typo in the test name.
 (GH-27736)
Message-ID: <mailman.1019.1628847918.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/ef36dfe4de1ee0df11cde94fd76465336aa8141d
commit: ef36dfe4de1ee0df11cde94fd76465336aa8141d
branch: 3.10
author: Benjamin Peterson <benjamin at python.org>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-13T02:45:13-07:00
summary:

[3.10] bpo-33930: Fix typo in the test name. (GH-27736)



[bpo-33930](): Fix typo in the test name. (GH-27733)
(cherry picked from commit f08e6d1bb3c5655f184af88c6793e90908bb6338)

Automerge-Triggered-By: GH:benjaminp

files:
M Lib/test/test_exceptions.py

diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 10d48ebc076c3..b520a52561480 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -1171,7 +1171,7 @@ def g():
 
 
     @cpython_only
-    def test_crashcan_recursion(self):
+    def test_trashcan_recursion(self):
         # See bpo-33930
 
         def foo():


From webhook-mailer at python.org  Fri Aug 13 06:21:30 2021
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 13 Aug 2021 10:21:30 -0000
Subject: [Python-checkins] bpo-44895: Temporarily add an extra gc.collect()
 call (GH-27746)
Message-ID: <mailman.1020.1628850091.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/ebc59262349d6901b825ed9101d604e826757262
commit: ebc59262349d6901b825ed9101d604e826757262
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-13T03:21:26-07:00
summary:

bpo-44895: Temporarily add an extra gc.collect() call (GH-27746)


This is part of an investigation of a non-deterministic reference leak. While we're looking for the root cause, this is included temporarily so that CI doesn't fail on this particular issue. This enables it to find other regressions in the meantime, which would otherwise be shadowed by our known issue.
(cherry picked from commit 7bf28cbb4bf37fa6bdfc2d3f8a3939066b3f8f22)

Co-authored-by: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>

files:
M Lib/test/test_exceptions.py

diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index b520a52561480..2e4ec9d33f689 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -1014,6 +1014,9 @@ def cycle():
 
     def test_no_hang_on_context_chain_cycle2(self):
         # See issue 25782. Cycle at head of context chain.
+        while gc.collect():
+            # Remove this once issue 44895 is resolved
+            pass
 
         class A(Exception):
             pass


From webhook-mailer at python.org  Fri Aug 13 06:26:12 2021
From: webhook-mailer at python.org (ambv)
Date: Fri, 13 Aug 2021 10:26:12 -0000
Subject: [Python-checkins] [3.9] Fix the test suite for the old parser
 (GH-27749)
Message-ID: <mailman.1021.1628850372.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/282fc5c00787297f1d7a9b7b1469b51e84f485a9
commit: 282fc5c00787297f1d7a9b7b1469b51e84f485a9
branch: 3.9
author: Pablo Galindo Salgado <Pablogsal at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-13T12:26:07+02:00
summary:

[3.9] Fix the test suite for the old parser (GH-27749)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
M Lib/test/test_exceptions.py
M Lib/test/test_fstring.py
M Lib/test/test_syntax.py

diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 6dd3d5d909422..6f192d7d079eb 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -235,7 +235,8 @@ def baz():
             """, 9, 20)
         check("pass\npass\npass\n(1+)\npass\npass\npass", 4, 4)
         check("(1+)", 1, 4)
-        check(b"\xef\xbb\xbf#coding: utf8\nprint('\xe6\x88\x91')\n", 0, -1)
+        check(b"\xef\xbb\xbf#coding: utf8\nprint('\xe6\x88\x91')\n", 0,
+              0 if support.use_old_parser() else -1)
 
         # Errors thrown by symtable.c
         check('x = [(yield i) for i in range(3)]', 1, 5)
diff --git a/Lib/test/test_fstring.py b/Lib/test/test_fstring.py
index fbd97ffbdec80..518ebdf16c1c6 100644
--- a/Lib/test/test_fstring.py
+++ b/Lib/test/test_fstring.py
@@ -211,6 +211,7 @@ def test_ast_line_numbers_nested(self):
         self.assertEqual(call.lineno, 3)
         self.assertEqual(call.col_offset, 11)
 
+    @unittest.skipIf(use_old_parser(), "The old parser gets the offsets incorrectly for fstrings")
     def test_ast_line_numbers_duplicate_expression(self):
         expr = """
 a = 10
@@ -277,6 +278,7 @@ def test_ast_line_numbers_duplicate_expression(self):
         self.assertEqual(binop.left.col_offset, 23)
         self.assertEqual(binop.right.col_offset, 27)
 
+    @unittest.skipIf(use_old_parser(), "The old parser gets the offsets incorrectly for fstrings")
     def test_ast_numbers_fstring_with_formatting(self):
 
         t = ast.parse('f"Here is that pesky {xxx:.3f} again"')
diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
index 74d97735e5fc4..30d8e5a71800f 100644
--- a/Lib/test/test_syntax.py
+++ b/Lib/test/test_syntax.py
@@ -429,9 +429,6 @@
 >>> f((x)=2)
 Traceback (most recent call last):
 SyntaxError: expression cannot contain assignment, perhaps you meant "=="?
->>> f(True=2)
-Traceback (most recent call last):
-SyntaxError: expression cannot contain assignment, perhaps you meant "=="?
 >>> f(__debug__=1)
 Traceback (most recent call last):
 SyntaxError: cannot assign to __debug__
@@ -981,7 +978,7 @@ def func2():
     def test_invalid_line_continuation_error_position(self):
         self._check_error(r"a = 3 \ 4",
                           "unexpected character after line continuation character",
-                          lineno=1, offset=9)
+                          lineno=1, offset=(10 if support.use_old_parser() else 9))
 
     def test_invalid_line_continuation_left_recursive(self):
         # Check bpo-42218: SyntaxErrors following left-recursive rules


From webhook-mailer at python.org  Fri Aug 13 06:36:36 2021
From: webhook-mailer at python.org (ambv)
Date: Fri, 13 Aug 2021 10:36:36 -0000
Subject: [Python-checkins] bpo-44891: Tests `id` preserving on `* 1` for
 `str` and `bytes` (GH-27745)
Message-ID: <mailman.1022.1628850997.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/a2ce538e16d5e3a6168704366bdd7a8c5af29881
commit: a2ce538e16d5e3a6168704366bdd7a8c5af29881
branch: main
author: Nikita Sobolev <mail at sobolevn.me>
committer: ambv <lukasz at langa.pl>
date: 2021-08-13T12:36:22+02:00
summary:

bpo-44891: Tests `id` preserving on `* 1` for `str` and `bytes` (GH-27745)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Misc/NEWS.d/next/Tests/2021-08-13-12-11-06.bpo-44891.T9_mBT.rst
M Lib/test/test_bytes.py
M Lib/test/test_unicode.py

diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
index 381030fe0e8383..13ad238242d0c5 100644
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -1169,6 +1169,28 @@ class BufferBlocked(bytearray):
         self.assertEqual(bytes(ba), b'ab')
         self.assertRaises(TypeError, bytes, bb)
 
+    def test_repeat_id_preserving(self):
+        a = b'123abc1@'
+        b = b'456zyx-+'
+        self.assertEqual(id(a), id(a))
+        self.assertNotEqual(id(a), id(b))
+        self.assertNotEqual(id(a), id(a * -4))
+        self.assertNotEqual(id(a), id(a * 0))
+        self.assertEqual(id(a), id(a * 1))
+        self.assertEqual(id(a), id(1 * a))
+        self.assertNotEqual(id(a), id(a * 2))
+
+        class SubBytes(bytes):
+            pass
+
+        s = SubBytes(b'qwerty()')
+        self.assertEqual(id(s), id(s))
+        self.assertNotEqual(id(s), id(s * -4))
+        self.assertNotEqual(id(s), id(s * 0))
+        self.assertNotEqual(id(s), id(s * 1))
+        self.assertNotEqual(id(s), id(1 * s))
+        self.assertNotEqual(id(s), id(s * 2))
+
 
 class ByteArrayTest(BaseBytesTest, unittest.TestCase):
     type2test = bytearray
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index ffe3e82804ea9c..a14eead3411f30 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -508,6 +508,28 @@ def test_replace_id(self):
         text = 'abc def'
         self.assertIs(text.replace(pattern, pattern), text)
 
+    def test_repeat_id_preserving(self):
+        a = '123abc1@'
+        b = '456zyx-+'
+        self.assertEqual(id(a), id(a))
+        self.assertNotEqual(id(a), id(b))
+        self.assertNotEqual(id(a), id(a * -4))
+        self.assertNotEqual(id(a), id(a * 0))
+        self.assertEqual(id(a), id(a * 1))
+        self.assertEqual(id(a), id(1 * a))
+        self.assertNotEqual(id(a), id(a * 2))
+
+        class SubStr(str):
+            pass
+
+        s = SubStr('qwerty()')
+        self.assertEqual(id(s), id(s))
+        self.assertNotEqual(id(s), id(s * -4))
+        self.assertNotEqual(id(s), id(s * 0))
+        self.assertNotEqual(id(s), id(s * 1))
+        self.assertNotEqual(id(s), id(1 * s))
+        self.assertNotEqual(id(s), id(s * 2))
+
     def test_bytes_comparison(self):
         with warnings_helper.check_warnings():
             warnings.simplefilter('ignore', BytesWarning)
diff --git a/Misc/NEWS.d/next/Tests/2021-08-13-12-11-06.bpo-44891.T9_mBT.rst b/Misc/NEWS.d/next/Tests/2021-08-13-12-11-06.bpo-44891.T9_mBT.rst
new file mode 100644
index 00000000000000..2f83389ec15855
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2021-08-13-12-11-06.bpo-44891.T9_mBT.rst
@@ -0,0 +1,2 @@
+Tests were added to clarify :func:`id` is preserved when ``obj * 1`` is used
+on :class:`str` and :class:`bytes` objects. Patch by Nikita Sobolev.


From webhook-mailer at python.org  Fri Aug 13 06:51:07 2021
From: webhook-mailer at python.org (ambv)
Date: Fri, 13 Aug 2021 10:51:07 -0000
Subject: [Python-checkins] Added test case based on recommended test cases
 from RFC 4648 (GH-27747)
Message-ID: <mailman.1023.1628851868.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/230403a6a19042b174374c3825904d2e857f38b0
commit: 230403a6a19042b174374c3825904d2e857f38b0
branch: main
author: andrei kulakov <andrei.avk at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-13T12:50:37+02:00
summary:

Added test case based on recommended test cases from RFC 4648 (GH-27747)

files:
M Lib/test/test_base64.py

diff --git a/Lib/test/test_base64.py b/Lib/test/test_base64.py
index 4f62c4115f60a..418492432a167 100644
--- a/Lib/test/test_base64.py
+++ b/Lib/test/test_base64.py
@@ -714,6 +714,45 @@ def test_decode_nonascii_str(self):
     def test_ErrorHeritage(self):
         self.assertTrue(issubclass(binascii.Error, ValueError))
 
+    def test_RFC4648_test_cases(self):
+        # test cases from RFC 4648 section 10
+        b64encode = base64.b64encode
+        b32hexencode = base64.b32hexencode
+        b32encode = base64.b32encode
+        b16encode = base64.b16encode
+
+        self.assertEqual(b64encode(b""), b"")
+        self.assertEqual(b64encode(b"f"), b"Zg==")
+        self.assertEqual(b64encode(b"fo"), b"Zm8=")
+        self.assertEqual(b64encode(b"foo"), b"Zm9v")
+        self.assertEqual(b64encode(b"foob"), b"Zm9vYg==")
+        self.assertEqual(b64encode(b"fooba"), b"Zm9vYmE=")
+        self.assertEqual(b64encode(b"foobar"), b"Zm9vYmFy")
+
+        self.assertEqual(b32encode(b""), b"")
+        self.assertEqual(b32encode(b"f"), b"MY======")
+        self.assertEqual(b32encode(b"fo"), b"MZXQ====")
+        self.assertEqual(b32encode(b"foo"), b"MZXW6===")
+        self.assertEqual(b32encode(b"foob"), b"MZXW6YQ=")
+        self.assertEqual(b32encode(b"fooba"), b"MZXW6YTB")
+        self.assertEqual(b32encode(b"foobar"), b"MZXW6YTBOI======")
+
+        self.assertEqual(b32hexencode(b""), b"")
+        self.assertEqual(b32hexencode(b"f"), b"CO======")
+        self.assertEqual(b32hexencode(b"fo"), b"CPNG====")
+        self.assertEqual(b32hexencode(b"foo"), b"CPNMU===")
+        self.assertEqual(b32hexencode(b"foob"), b"CPNMUOG=")
+        self.assertEqual(b32hexencode(b"fooba"), b"CPNMUOJ1")
+        self.assertEqual(b32hexencode(b"foobar"), b"CPNMUOJ1E8======")
+
+        self.assertEqual(b16encode(b""), b"")
+        self.assertEqual(b16encode(b"f"), b"66")
+        self.assertEqual(b16encode(b"fo"), b"666F")
+        self.assertEqual(b16encode(b"foo"), b"666F6F")
+        self.assertEqual(b16encode(b"foob"), b"666F6F62")
+        self.assertEqual(b16encode(b"fooba"), b"666F6F6261")
+        self.assertEqual(b16encode(b"foobar"), b"666F6F626172")
+
 
 class TestMain(unittest.TestCase):
     def tearDown(self):


From webhook-mailer at python.org  Fri Aug 13 06:57:17 2021
From: webhook-mailer at python.org (ambv)
Date: Fri, 13 Aug 2021 10:57:17 -0000
Subject: [Python-checkins] bpo-26228: [doc] Adapt PTY documentation updates
 from GH-4167 (GH-27754)
Message-ID: <mailman.1024.1628852238.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/dd8eb303b90d63e1f56684bedadca6674bb74a29
commit: dd8eb303b90d63e1f56684bedadca6674bb74a29
branch: main
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2021-08-13T12:57:07+02:00
summary:

bpo-26228: [doc] Adapt PTY documentation updates from GH-4167 (GH-27754)

Co-authored-by: Cornelius Diekmann <c.diekmann at googlemail.com>

files:
M Doc/library/pty.rst
M Lib/pty.py
M Misc/NEWS.d/next/Library/2019-02-26-09-31-59.bpo-26228.wyrHKc.rst

diff --git a/Doc/library/pty.rst b/Doc/library/pty.rst
index 4b49d244038eb..7f4da41e93802 100644
--- a/Doc/library/pty.rst
+++ b/Doc/library/pty.rst
@@ -2,8 +2,8 @@
 ========================================
 
 .. module:: pty
-   :platform: Linux
-   :synopsis: Pseudo-Terminal Handling for Linux.
+   :platform: Unix
+   :synopsis: Pseudo-Terminal Handling for Unix.
 
 .. moduleauthor:: Steen Lumholt
 .. sectionauthor:: Moshe Zadka <moshez at zadka.site.co.il>
@@ -16,9 +16,9 @@ The :mod:`pty` module defines operations for handling the pseudo-terminal
 concept: starting another process and being able to write to and read from its
 controlling terminal programmatically.
 
-Because pseudo-terminal handling is highly platform dependent, there is code to
-do it only for Linux. (The Linux code is supposed to work on other platforms,
-but hasn't been tested yet.)
+Pseudo-terminal handling is highly platform dependent. This code is mainly
+tested on Linux, FreeBSD, and macOS (it is supposed to work on other POSIX
+platforms but it's not been thoroughly tested).
 
 The :mod:`pty` module defines the following functions:
 
@@ -47,6 +47,10 @@ The :mod:`pty` module defines the following functions:
    spawned behind the pty will eventually terminate, and when it does *spawn*
    will return.
 
+   A loop copies STDIN of the current process to the child and data received
+   from the child to STDOUT of the current process. It is not signaled to the
+   child if STDIN of the current process closes down.
+
    The functions *master_read* and *stdin_read* are passed a file descriptor
    which they should read from, and they should always return a byte string. In
    order to force spawn to return before the child process exits an
diff --git a/Lib/pty.py b/Lib/pty.py
index 43e974fff1c90..8d8ce40df541c 100644
--- a/Lib/pty.py
+++ b/Lib/pty.py
@@ -1,7 +1,7 @@
 """Pseudo terminal utilities."""
 
 # Bugs: No signal handling.  Doesn't set slave termios and window size.
-#       Only tested on Linux.
+#       Only tested on Linux, FreeBSD, and macOS.
 # See:  W. Richard Stevens. 1992.  Advanced Programming in the
 #       UNIX Environment.  Chapter 19.
 # Author: Steen Lumholt -- with additions by Guido.
diff --git a/Misc/NEWS.d/next/Library/2019-02-26-09-31-59.bpo-26228.wyrHKc.rst b/Misc/NEWS.d/next/Library/2019-02-26-09-31-59.bpo-26228.wyrHKc.rst
index 43ff580bcfaf6..c6ca84ae3b639 100644
--- a/Misc/NEWS.d/next/Library/2019-02-26-09-31-59.bpo-26228.wyrHKc.rst
+++ b/Misc/NEWS.d/next/Library/2019-02-26-09-31-59.bpo-26228.wyrHKc.rst
@@ -1 +1 @@
-pty.spawn no longer hangs on FreeBSD, OS X, and Solaris.
\ No newline at end of file
+pty.spawn no longer hangs on FreeBSD, macOS, and Solaris.


From webhook-mailer at python.org  Fri Aug 13 06:59:00 2021
From: webhook-mailer at python.org (ambv)
Date: Fri, 13 Aug 2021 10:59:00 -0000
Subject: [Python-checkins] bpo-36700: [doc] Update base64 RFC references to
 RFC 4648 (GH-27700)
Message-ID: <mailman.1025.1628852341.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/e43b9bbc31c22a0d97dc4fc420300e40c2d74166
commit: e43b9bbc31c22a0d97dc4fc420300e40c2d74166
branch: main
author: andrei kulakov <andrei.avk at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-13T12:58:55+02:00
summary:

bpo-36700: [doc] Update base64 RFC references to RFC 4648 (GH-27700)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Misc/NEWS.d/next/Documentation/2021-08-09-19-58-45.bpo-36700.WPNW5f.rst
M Doc/library/base64.rst
M Doc/library/security_warnings.rst

diff --git a/Doc/library/base64.rst b/Doc/library/base64.rst
index 2f24bb63912fb..f91547bd58403 100644
--- a/Doc/library/base64.rst
+++ b/Doc/library/base64.rst
@@ -2,7 +2,7 @@
 ===============================================================
 
 .. module:: base64
-   :synopsis: RFC 3548: Base16, Base32, Base64 Data Encodings;
+   :synopsis: RFC 4648: Base16, Base32, Base64 Data Encodings;
               Base85 and Ascii85
 
 **Source code:** :source:`Lib/base64.py`
@@ -16,10 +16,10 @@
 This module provides functions for encoding binary data to printable
 ASCII characters and decoding such encodings back to binary data.
 It provides encoding and decoding functions for the encodings specified in
-:rfc:`3548`, which defines the Base16, Base32, and Base64 algorithms,
+:rfc:`4648`, which defines the Base16, Base32, and Base64 algorithms,
 and for the de-facto standard Ascii85 and Base85 encodings.
 
-The :rfc:`3548` encodings are suitable for encoding binary data so that it can
+The :rfc:`4648` encodings are suitable for encoding binary data so that it can be
 safely sent by email, used as parts of URLs, or included as part of an HTTP
 POST request.  The encoding algorithm is not the same as the
 :program:`uuencode` program.
@@ -28,7 +28,7 @@ There are two interfaces provided by this module.  The modern interface
 supports encoding :term:`bytes-like objects <bytes-like object>` to ASCII
 :class:`bytes`, and decoding :term:`bytes-like objects <bytes-like object>` or
 strings containing ASCII to :class:`bytes`.  Both base-64 alphabets
-defined in :rfc:`3548` (normal, and URL- and filesystem-safe) are supported.
+defined in :rfc:`4648` (normal, and URL- and filesystem-safe) are supported.
 
 The legacy interface does not support decoding from strings, but it does
 provide functions for encoding and decoding to and from :term:`file objects
@@ -287,6 +287,13 @@ An example usage of the module:
    >>> data
    b'data to be encoded'
 
+.. _base64-security:
+
+Security Considerations
+-----------------------
+
+A new security considerations section was added to :rfc:`4648` (section 12); it's
+recommended to review the security section for any code deployed to production.
 
 .. seealso::
 
diff --git a/Doc/library/security_warnings.rst b/Doc/library/security_warnings.rst
index 61fd4e6e487f7..26b015c0f8fc7 100644
--- a/Doc/library/security_warnings.rst
+++ b/Doc/library/security_warnings.rst
@@ -7,6 +7,8 @@ Security Considerations
 
 The following modules have specific security considerations:
 
+* :mod:`base64`: :ref:`base64 security considerations <base64-security>` in
+  :rfc:`4648`
 * :mod:`cgi`: :ref:`CGI security considerations <cgi-security>`
 * :mod:`hashlib`: :ref:`all constructors take a "usedforsecurity" keyword-only
   argument disabling known insecure and blocked algorithms
diff --git a/Misc/NEWS.d/next/Documentation/2021-08-09-19-58-45.bpo-36700.WPNW5f.rst b/Misc/NEWS.d/next/Documentation/2021-08-09-19-58-45.bpo-36700.WPNW5f.rst
new file mode 100644
index 0000000000000..5bc1e23b28597
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2021-08-09-19-58-45.bpo-36700.WPNW5f.rst
@@ -0,0 +1,3 @@
+:mod:`base64` RFC references were updated to point to :rfc:`4648`; a section
+was added to point users to the new "security considerations" section of the
+RFC.


From webhook-mailer at python.org  Fri Aug 13 07:04:13 2021
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 13 Aug 2021 11:04:13 -0000
Subject: [Python-checkins] bpo-44891: Tests `id` preserving on `* 1` for
 `str` and `bytes` (GH-27745)
Message-ID: <mailman.1026.1628852654.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/45a97d91a42795fb0b220e67ee25a14b940c7e50
commit: 45a97d91a42795fb0b220e67ee25a14b940c7e50
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-13T04:04:08-07:00
summary:

bpo-44891: Tests `id` preserving on `* 1` for `str` and `bytes` (GH-27745)


Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit a2ce538e16d5e3a6168704366bdd7a8c5af29881)

Co-authored-by: Nikita Sobolev <mail at sobolevn.me>

files:
A Misc/NEWS.d/next/Tests/2021-08-13-12-11-06.bpo-44891.T9_mBT.rst
M Lib/test/test_bytes.py
M Lib/test/test_unicode.py

diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
index 381030fe0e8383..13ad238242d0c5 100644
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -1169,6 +1169,28 @@ class BufferBlocked(bytearray):
         self.assertEqual(bytes(ba), b'ab')
         self.assertRaises(TypeError, bytes, bb)
 
+    def test_repeat_id_preserving(self):
+        a = b'123abc1@'
+        b = b'456zyx-+'
+        self.assertEqual(id(a), id(a))
+        self.assertNotEqual(id(a), id(b))
+        self.assertNotEqual(id(a), id(a * -4))
+        self.assertNotEqual(id(a), id(a * 0))
+        self.assertEqual(id(a), id(a * 1))
+        self.assertEqual(id(a), id(1 * a))
+        self.assertNotEqual(id(a), id(a * 2))
+
+        class SubBytes(bytes):
+            pass
+
+        s = SubBytes(b'qwerty()')
+        self.assertEqual(id(s), id(s))
+        self.assertNotEqual(id(s), id(s * -4))
+        self.assertNotEqual(id(s), id(s * 0))
+        self.assertNotEqual(id(s), id(s * 1))
+        self.assertNotEqual(id(s), id(1 * s))
+        self.assertNotEqual(id(s), id(s * 2))
+
 
 class ByteArrayTest(BaseBytesTest, unittest.TestCase):
     type2test = bytearray
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index a6549c79ff05ac..dd1428710d568c 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -508,6 +508,28 @@ def test_replace_id(self):
         text = 'abc def'
         self.assertIs(text.replace(pattern, pattern), text)
 
+    def test_repeat_id_preserving(self):
+        a = '123abc1@'
+        b = '456zyx-+'
+        self.assertEqual(id(a), id(a))
+        self.assertNotEqual(id(a), id(b))
+        self.assertNotEqual(id(a), id(a * -4))
+        self.assertNotEqual(id(a), id(a * 0))
+        self.assertEqual(id(a), id(a * 1))
+        self.assertEqual(id(a), id(1 * a))
+        self.assertNotEqual(id(a), id(a * 2))
+
+        class SubStr(str):
+            pass
+
+        s = SubStr('qwerty()')
+        self.assertEqual(id(s), id(s))
+        self.assertNotEqual(id(s), id(s * -4))
+        self.assertNotEqual(id(s), id(s * 0))
+        self.assertNotEqual(id(s), id(s * 1))
+        self.assertNotEqual(id(s), id(1 * s))
+        self.assertNotEqual(id(s), id(s * 2))
+
     def test_bytes_comparison(self):
         with warnings_helper.check_warnings():
             warnings.simplefilter('ignore', BytesWarning)
diff --git a/Misc/NEWS.d/next/Tests/2021-08-13-12-11-06.bpo-44891.T9_mBT.rst b/Misc/NEWS.d/next/Tests/2021-08-13-12-11-06.bpo-44891.T9_mBT.rst
new file mode 100644
index 00000000000000..2f83389ec15855
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2021-08-13-12-11-06.bpo-44891.T9_mBT.rst
@@ -0,0 +1,2 @@
+Tests were added to clarify :func:`id` is preserved when ``obj * 1`` is used
+on :class:`str` and :class:`bytes` objects. Patch by Nikita Sobolev.


From webhook-mailer at python.org  Fri Aug 13 07:15:47 2021
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 13 Aug 2021 11:15:47 -0000
Subject: [Python-checkins] Added test case based on recommended test cases
 from RFC 4648 (GH-27747)
Message-ID: <mailman.1027.1628853347.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/6d134864d62b1838b12e31ec6357b9f0c078deae
commit: 6d134864d62b1838b12e31ec6357b9f0c078deae
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-13T04:15:27-07:00
summary:

Added test case based on recommended test cases from RFC 4648 (GH-27747)

(cherry picked from commit 230403a6a19042b174374c3825904d2e857f38b0)

Co-authored-by: andrei kulakov <andrei.avk at gmail.com>

files:
M Lib/test/test_base64.py

diff --git a/Lib/test/test_base64.py b/Lib/test/test_base64.py
index 4f62c4115f60a..418492432a167 100644
--- a/Lib/test/test_base64.py
+++ b/Lib/test/test_base64.py
@@ -714,6 +714,45 @@ def test_decode_nonascii_str(self):
     def test_ErrorHeritage(self):
         self.assertTrue(issubclass(binascii.Error, ValueError))
 
+    def test_RFC4648_test_cases(self):
+        # test cases from RFC 4648 section 10
+        b64encode = base64.b64encode
+        b32hexencode = base64.b32hexencode
+        b32encode = base64.b32encode
+        b16encode = base64.b16encode
+
+        self.assertEqual(b64encode(b""), b"")
+        self.assertEqual(b64encode(b"f"), b"Zg==")
+        self.assertEqual(b64encode(b"fo"), b"Zm8=")
+        self.assertEqual(b64encode(b"foo"), b"Zm9v")
+        self.assertEqual(b64encode(b"foob"), b"Zm9vYg==")
+        self.assertEqual(b64encode(b"fooba"), b"Zm9vYmE=")
+        self.assertEqual(b64encode(b"foobar"), b"Zm9vYmFy")
+
+        self.assertEqual(b32encode(b""), b"")
+        self.assertEqual(b32encode(b"f"), b"MY======")
+        self.assertEqual(b32encode(b"fo"), b"MZXQ====")
+        self.assertEqual(b32encode(b"foo"), b"MZXW6===")
+        self.assertEqual(b32encode(b"foob"), b"MZXW6YQ=")
+        self.assertEqual(b32encode(b"fooba"), b"MZXW6YTB")
+        self.assertEqual(b32encode(b"foobar"), b"MZXW6YTBOI======")
+
+        self.assertEqual(b32hexencode(b""), b"")
+        self.assertEqual(b32hexencode(b"f"), b"CO======")
+        self.assertEqual(b32hexencode(b"fo"), b"CPNG====")
+        self.assertEqual(b32hexencode(b"foo"), b"CPNMU===")
+        self.assertEqual(b32hexencode(b"foob"), b"CPNMUOG=")
+        self.assertEqual(b32hexencode(b"fooba"), b"CPNMUOJ1")
+        self.assertEqual(b32hexencode(b"foobar"), b"CPNMUOJ1E8======")
+
+        self.assertEqual(b16encode(b""), b"")
+        self.assertEqual(b16encode(b"f"), b"66")
+        self.assertEqual(b16encode(b"fo"), b"666F")
+        self.assertEqual(b16encode(b"foo"), b"666F6F")
+        self.assertEqual(b16encode(b"foob"), b"666F6F62")
+        self.assertEqual(b16encode(b"fooba"), b"666F6F6261")
+        self.assertEqual(b16encode(b"foobar"), b"666F6F626172")
+
 
 class TestMain(unittest.TestCase):
     def tearDown(self):


From webhook-mailer at python.org  Fri Aug 13 07:21:15 2021
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 13 Aug 2021 11:21:15 -0000
Subject: [Python-checkins] bpo-26228: [doc] Adapt PTY documentation updates
 from GH-4167 (GH-27754)
Message-ID: <mailman.1028.1628853676.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/d4128485d6c2cbfebe756f3eeec2c60137b63bba
commit: d4128485d6c2cbfebe756f3eeec2c60137b63bba
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-13T04:21:06-07:00
summary:

bpo-26228: [doc] Adapt PTY documentation updates from GH-4167 (GH-27754)


Co-authored-by: Cornelius Diekmann <c.diekmann at googlemail.com>
(cherry picked from commit dd8eb303b90d63e1f56684bedadca6674bb74a29)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
M Doc/library/pty.rst
M Lib/pty.py
M Misc/NEWS.d/next/Library/2019-02-26-09-31-59.bpo-26228.wyrHKc.rst

diff --git a/Doc/library/pty.rst b/Doc/library/pty.rst
index 4b49d244038eb..7f4da41e93802 100644
--- a/Doc/library/pty.rst
+++ b/Doc/library/pty.rst
@@ -2,8 +2,8 @@
 ========================================
 
 .. module:: pty
-   :platform: Linux
-   :synopsis: Pseudo-Terminal Handling for Linux.
+   :platform: Unix
+   :synopsis: Pseudo-Terminal Handling for Unix.
 
 .. moduleauthor:: Steen Lumholt
 .. sectionauthor:: Moshe Zadka <moshez at zadka.site.co.il>
@@ -16,9 +16,9 @@ The :mod:`pty` module defines operations for handling the pseudo-terminal
 concept: starting another process and being able to write to and read from its
 controlling terminal programmatically.
 
-Because pseudo-terminal handling is highly platform dependent, there is code to
-do it only for Linux. (The Linux code is supposed to work on other platforms,
-but hasn't been tested yet.)
+Pseudo-terminal handling is highly platform dependent. This code is mainly
+tested on Linux, FreeBSD, and macOS (it is supposed to work on other POSIX
+platforms but it's not been thoroughly tested).
 
 The :mod:`pty` module defines the following functions:
 
@@ -47,6 +47,10 @@ The :mod:`pty` module defines the following functions:
    spawned behind the pty will eventually terminate, and when it does *spawn*
    will return.
 
+   A loop copies STDIN of the current process to the child and data received
+   from the child to STDOUT of the current process. It is not signaled to the
+   child if STDIN of the current process closes down.
+
    The functions *master_read* and *stdin_read* are passed a file descriptor
    which they should read from, and they should always return a byte string. In
    order to force spawn to return before the child process exits an
diff --git a/Lib/pty.py b/Lib/pty.py
index 43e974fff1c90..8d8ce40df541c 100644
--- a/Lib/pty.py
+++ b/Lib/pty.py
@@ -1,7 +1,7 @@
 """Pseudo terminal utilities."""
 
 # Bugs: No signal handling.  Doesn't set slave termios and window size.
-#       Only tested on Linux.
+#       Only tested on Linux, FreeBSD, and macOS.
 # See:  W. Richard Stevens. 1992.  Advanced Programming in the
 #       UNIX Environment.  Chapter 19.
 # Author: Steen Lumholt -- with additions by Guido.
diff --git a/Misc/NEWS.d/next/Library/2019-02-26-09-31-59.bpo-26228.wyrHKc.rst b/Misc/NEWS.d/next/Library/2019-02-26-09-31-59.bpo-26228.wyrHKc.rst
index 43ff580bcfaf6..c6ca84ae3b639 100644
--- a/Misc/NEWS.d/next/Library/2019-02-26-09-31-59.bpo-26228.wyrHKc.rst
+++ b/Misc/NEWS.d/next/Library/2019-02-26-09-31-59.bpo-26228.wyrHKc.rst
@@ -1 +1 @@
-pty.spawn no longer hangs on FreeBSD, OS X, and Solaris.
\ No newline at end of file
+pty.spawn no longer hangs on FreeBSD, macOS, and Solaris.


From webhook-mailer at python.org  Fri Aug 13 07:21:57 2021
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 13 Aug 2021 11:21:57 -0000
Subject: [Python-checkins] bpo-36700: [doc] Update base64 RFC references to
 RFC 4648 (GH-27700)
Message-ID: <mailman.1029.1628853718.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/16f73c8b5dbe02b4bf7f91ff9dbcd0886529bfe5
commit: 16f73c8b5dbe02b4bf7f91ff9dbcd0886529bfe5
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-13T04:21:53-07:00
summary:

bpo-36700: [doc] Update base64 RFC references to RFC 4648 (GH-27700)


Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit e43b9bbc31c22a0d97dc4fc420300e40c2d74166)

Co-authored-by: andrei kulakov <andrei.avk at gmail.com>

files:
A Misc/NEWS.d/next/Documentation/2021-08-09-19-58-45.bpo-36700.WPNW5f.rst
M Doc/library/base64.rst
M Doc/library/security_warnings.rst

diff --git a/Doc/library/base64.rst b/Doc/library/base64.rst
index 2f24bb63912fb..f91547bd58403 100644
--- a/Doc/library/base64.rst
+++ b/Doc/library/base64.rst
@@ -2,7 +2,7 @@
 ===============================================================
 
 .. module:: base64
-   :synopsis: RFC 3548: Base16, Base32, Base64 Data Encodings;
+   :synopsis: RFC 4648: Base16, Base32, Base64 Data Encodings;
               Base85 and Ascii85
 
 **Source code:** :source:`Lib/base64.py`
@@ -16,10 +16,10 @@
 This module provides functions for encoding binary data to printable
 ASCII characters and decoding such encodings back to binary data.
 It provides encoding and decoding functions for the encodings specified in
-:rfc:`3548`, which defines the Base16, Base32, and Base64 algorithms,
+:rfc:`4648`, which defines the Base16, Base32, and Base64 algorithms,
 and for the de-facto standard Ascii85 and Base85 encodings.
 
-The :rfc:`3548` encodings are suitable for encoding binary data so that it can
+The :rfc:`4648` encodings are suitable for encoding binary data so that it can be
 safely sent by email, used as parts of URLs, or included as part of an HTTP
 POST request.  The encoding algorithm is not the same as the
 :program:`uuencode` program.
@@ -28,7 +28,7 @@ There are two interfaces provided by this module.  The modern interface
 supports encoding :term:`bytes-like objects <bytes-like object>` to ASCII
 :class:`bytes`, and decoding :term:`bytes-like objects <bytes-like object>` or
 strings containing ASCII to :class:`bytes`.  Both base-64 alphabets
-defined in :rfc:`3548` (normal, and URL- and filesystem-safe) are supported.
+defined in :rfc:`4648` (normal, and URL- and filesystem-safe) are supported.
 
 The legacy interface does not support decoding from strings, but it does
 provide functions for encoding and decoding to and from :term:`file objects
@@ -287,6 +287,13 @@ An example usage of the module:
    >>> data
    b'data to be encoded'
 
+.. _base64-security:
+
+Security Considerations
+-----------------------
+
+A new security considerations section was added to :rfc:`4648` (section 12); it's
+recommended to review the security section for any code deployed to production.
 
 .. seealso::
 
diff --git a/Doc/library/security_warnings.rst b/Doc/library/security_warnings.rst
index 61fd4e6e487f7..26b015c0f8fc7 100644
--- a/Doc/library/security_warnings.rst
+++ b/Doc/library/security_warnings.rst
@@ -7,6 +7,8 @@ Security Considerations
 
 The following modules have specific security considerations:
 
+* :mod:`base64`: :ref:`base64 security considerations <base64-security>` in
+  :rfc:`4648`
 * :mod:`cgi`: :ref:`CGI security considerations <cgi-security>`
 * :mod:`hashlib`: :ref:`all constructors take a "usedforsecurity" keyword-only
   argument disabling known insecure and blocked algorithms
diff --git a/Misc/NEWS.d/next/Documentation/2021-08-09-19-58-45.bpo-36700.WPNW5f.rst b/Misc/NEWS.d/next/Documentation/2021-08-09-19-58-45.bpo-36700.WPNW5f.rst
new file mode 100644
index 0000000000000..5bc1e23b28597
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2021-08-09-19-58-45.bpo-36700.WPNW5f.rst
@@ -0,0 +1,3 @@
+:mod:`base64` RFC references were updated to point to :rfc:`4648`; a section
+was added to point users to the new "security considerations" section of the
+RFC.


From webhook-mailer at python.org  Fri Aug 13 07:31:29 2021
From: webhook-mailer at python.org (ambv)
Date: Fri, 13 Aug 2021 11:31:29 -0000
Subject: [Python-checkins] bpo-30077: Add support for Apple aifc/sowt
 pseudo-compression (GH-24449)
Message-ID: <mailman.1030.1628854290.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/e4ed9d21534c2ed4397fdee0bb530a6e6a2c5af8
commit: e4ed9d21534c2ed4397fdee0bb530a6e6a2c5af8
branch: main
author: dnknth <41536869+dnknth at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-13T13:31:25+02:00
summary:

bpo-30077: Add support for Apple aifc/sowt pseudo-compression (GH-24449)

Co-authored-by: Toby Thurston <thurston at eml.cc>

files:
A Misc/NEWS.d/next/Library/2021-02-04-23-16-03.bpo-30077.v6TqAi.rst
M Lib/aifc.py

diff --git a/Lib/aifc.py b/Lib/aifc.py
index ed5da7d8936fd..d50f258e1acf8 100644
--- a/Lib/aifc.py
+++ b/Lib/aifc.py
@@ -462,6 +462,10 @@ def _adpcm2lin(self, data):
         data, self._adpcmstate = audioop.adpcm2lin(data, 2, self._adpcmstate)
         return data
 
+    def _sowt2lin(self, data):
+        import audioop
+        return audioop.byteswap(data, 2)
+
     def _read_comm_chunk(self, chunk):
         self._nchannels = _read_short(chunk)
         self._nframes = _read_long(chunk)
@@ -497,6 +501,8 @@ def _read_comm_chunk(self, chunk):
                     self._convert = self._ulaw2lin
                 elif self._comptype in (b'alaw', b'ALAW'):
                     self._convert = self._alaw2lin
+                elif self._comptype in (b'sowt', b'SOWT'):
+                    self._convert = self._sowt2lin
                 else:
                     raise Error('unsupported compression type')
                 self._sampwidth = 2
@@ -659,7 +665,7 @@ def setcomptype(self, comptype, compname):
         if self._nframeswritten:
             raise Error('cannot change parameters after starting to write')
         if comptype not in (b'NONE', b'ulaw', b'ULAW',
-                            b'alaw', b'ALAW', b'G722'):
+                            b'alaw', b'ALAW', b'G722', b'sowt', b'SOWT'):
             raise Error('unsupported compression type')
         self._comptype = comptype
         self._compname = compname
@@ -680,7 +686,7 @@ def setparams(self, params):
         if self._nframeswritten:
             raise Error('cannot change parameters after starting to write')
         if comptype not in (b'NONE', b'ulaw', b'ULAW',
-                            b'alaw', b'ALAW', b'G722'):
+                            b'alaw', b'ALAW', b'G722', b'sowt', b'SOWT'):
             raise Error('unsupported compression type')
         self.setnchannels(nchannels)
         self.setsampwidth(sampwidth)
@@ -778,14 +784,21 @@ def _lin2adpcm(self, data):
         data, self._adpcmstate = audioop.lin2adpcm(data, 2, self._adpcmstate)
         return data
 
+    def _lin2sowt(self, data):
+        import audioop
+        return audioop.byteswap(data, 2)
+
     def _ensure_header_written(self, datasize):
         if not self._nframeswritten:
-            if self._comptype in (b'ULAW', b'ulaw', b'ALAW', b'alaw', b'G722'):
+            if self._comptype in (b'ULAW', b'ulaw',
+                b'ALAW', b'alaw', b'G722',
+                b'sowt', b'SOWT'):
                 if not self._sampwidth:
                     self._sampwidth = 2
                 if self._sampwidth != 2:
                     raise Error('sample width must be 2 when compressing '
-                                'with ulaw/ULAW, alaw/ALAW or G7.22 (ADPCM)')
+                                'with ulaw/ULAW, alaw/ALAW, sowt/SOWT '
+                                'or G7.22 (ADPCM)')
             if not self._nchannels:
                 raise Error('# channels not specified')
             if not self._sampwidth:
@@ -801,6 +814,8 @@ def _init_compression(self):
             self._convert = self._lin2ulaw
         elif self._comptype in (b'alaw', b'ALAW'):
             self._convert = self._lin2alaw
+        elif self._comptype in (b'sowt', b'SOWT'):
+            self._convert = self._lin2sowt
 
     def _write_header(self, initlength):
         if self._aifc and self._comptype != b'NONE':
diff --git a/Misc/NEWS.d/next/Library/2021-02-04-23-16-03.bpo-30077.v6TqAi.rst b/Misc/NEWS.d/next/Library/2021-02-04-23-16-03.bpo-30077.v6TqAi.rst
new file mode 100644
index 0000000000000..4af17eed8f733
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-02-04-23-16-03.bpo-30077.v6TqAi.rst
@@ -0,0 +1 @@
+Added support for Apple's aifc/sowt pseudo-compression
\ No newline at end of file


From webhook-mailer at python.org  Fri Aug 13 19:41:30 2021
From: webhook-mailer at python.org (terryjreedy)
Date: Fri, 13 Aug 2021 23:41:30 -0000
Subject: [Python-checkins] bpo-44907: Update error messages in tutorial
 examples (GH-27755)
Message-ID: <mailman.1031.1628898092.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/ed524b4569b1e4a166886c880018418d46284378
commit: ed524b4569b1e4a166886c880018418d46284378
branch: main
author: meowmeowmeowcat <meowmeowcat1211 at gmail.com>
committer: terryjreedy <tjreedy at udel.edu>
date: 2021-08-13T19:40:58-04:00
summary:

bpo-44907: Update error messages in tutorial examples (GH-27755)

files:
M Doc/tutorial/controlflow.rst

diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst
index 3473078d93a683..fb3b140fe79bab 100644
--- a/Doc/tutorial/controlflow.rst
+++ b/Doc/tutorial/controlflow.rst
@@ -651,7 +651,7 @@ Here's an example that fails due to this restriction::
    >>> function(0, a=0)
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
-   TypeError: function() got multiple values for keyword argument 'a'
+   TypeError: function() got multiple values for argument 'a'
 
 When a final formal parameter of the form ``**name`` is present, it receives a
 dictionary (see :ref:`typesmapping`) containing all keyword arguments except for
@@ -787,7 +787,7 @@ parameters as there is a ``/`` in the function definition::
    >>> pos_only_arg(arg=1)
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
-   TypeError: pos_only_arg() got an unexpected keyword argument 'arg'
+   TypeError: pos_only_arg() got some positional-only arguments passed as keyword arguments: 'arg'
 
 The third function ``kwd_only_args`` only allows keyword arguments as indicated
 by a ``*`` in the function definition::
@@ -817,7 +817,7 @@ definition::
    >>> combined_example(pos_only=1, standard=2, kwd_only=3)
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
-   TypeError: combined_example() got an unexpected keyword argument 'pos_only'
+   TypeError: combined_example() got some positional-only arguments passed as keyword arguments: 'pos_only'
 
 
 Finally, consider this function definition which has a potential collision between the positional argument ``name``  and ``**kwds`` which has ``name`` as a key::


From webhook-mailer at python.org  Fri Aug 13 20:25:30 2021
From: webhook-mailer at python.org (terryjreedy)
Date: Sat, 14 Aug 2021 00:25:30 -0000
Subject: [Python-checkins] bpo-44907: Update error messages in tutorial
 examples (GH-27755)
Message-ID: <mailman.1032.1628900731.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/25122b2cf9b55f67572dd454b6809e1f62f78f39
commit: 25122b2cf9b55f67572dd454b6809e1f62f78f39
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: terryjreedy <tjreedy at udel.edu>
date: 2021-08-13T20:25:11-04:00
summary:

bpo-44907: Update error messages in tutorial examples (GH-27755)

(cherry picked from commit ed524b4569b1e4a166886c880018418d46284378)

Co-authored-by: meowmeowmeowcat <meowmeowcat1211 at gmail.com>

files:
M Doc/tutorial/controlflow.rst

diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst
index 3473078d93a683..fb3b140fe79bab 100644
--- a/Doc/tutorial/controlflow.rst
+++ b/Doc/tutorial/controlflow.rst
@@ -651,7 +651,7 @@ Here's an example that fails due to this restriction::
    >>> function(0, a=0)
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
-   TypeError: function() got multiple values for keyword argument 'a'
+   TypeError: function() got multiple values for argument 'a'
 
 When a final formal parameter of the form ``**name`` is present, it receives a
 dictionary (see :ref:`typesmapping`) containing all keyword arguments except for
@@ -787,7 +787,7 @@ parameters as there is a ``/`` in the function definition::
    >>> pos_only_arg(arg=1)
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
-   TypeError: pos_only_arg() got an unexpected keyword argument 'arg'
+   TypeError: pos_only_arg() got some positional-only arguments passed as keyword arguments: 'arg'
 
 The third function ``kwd_only_args`` only allows keyword arguments as indicated
 by a ``*`` in the function definition::
@@ -817,7 +817,7 @@ definition::
    >>> combined_example(pos_only=1, standard=2, kwd_only=3)
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
-   TypeError: combined_example() got an unexpected keyword argument 'pos_only'
+   TypeError: combined_example() got some positional-only arguments passed as keyword arguments: 'pos_only'
 
 
 Finally, consider this function definition which has a potential collision between the positional argument ``name``  and ``**kwds`` which has ``name`` as a key::


From webhook-mailer at python.org  Fri Aug 13 20:25:42 2021
From: webhook-mailer at python.org (terryjreedy)
Date: Sat, 14 Aug 2021 00:25:42 -0000
Subject: [Python-checkins] bpo-44907: Update error messages in tutorial
 examples (GH-27755)
Message-ID: <mailman.1033.1628900743.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/43bab0537ceb6e2ca3597f8f3a3c79733b897434
commit: 43bab0537ceb6e2ca3597f8f3a3c79733b897434
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: terryjreedy <tjreedy at udel.edu>
date: 2021-08-13T20:25:38-04:00
summary:

bpo-44907: Update error messages in tutorial examples (GH-27755)

(cherry picked from commit ed524b4569b1e4a166886c880018418d46284378)

Co-authored-by: meowmeowmeowcat <meowmeowcat1211 at gmail.com>

files:
M Doc/tutorial/controlflow.rst

diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst
index 129ab21cc48ce4..08202f0344ea34 100644
--- a/Doc/tutorial/controlflow.rst
+++ b/Doc/tutorial/controlflow.rst
@@ -479,7 +479,7 @@ Here's an example that fails due to this restriction::
    >>> function(0, a=0)
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
-   TypeError: function() got multiple values for keyword argument 'a'
+   TypeError: function() got multiple values for argument 'a'
 
 When a final formal parameter of the form ``**name`` is present, it receives a
 dictionary (see :ref:`typesmapping`) containing all keyword arguments except for
@@ -615,7 +615,7 @@ parameters as there is a ``/`` in the function definition::
    >>> pos_only_arg(arg=1)
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
-   TypeError: pos_only_arg() got an unexpected keyword argument 'arg'
+   TypeError: pos_only_arg() got some positional-only arguments passed as keyword arguments: 'arg'
 
 The third function ``kwd_only_args`` only allows keyword arguments as indicated
 by a ``*`` in the function definition::
@@ -645,7 +645,7 @@ definition::
    >>> combined_example(pos_only=1, standard=2, kwd_only=3)
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
-   TypeError: combined_example() got an unexpected keyword argument 'pos_only'
+   TypeError: combined_example() got some positional-only arguments passed as keyword arguments: 'pos_only'
 
 
 Finally, consider this function definition which has a potential collision between the positional argument ``name``  and ``**kwds`` which has ``name`` as a key::


From webhook-mailer at python.org  Sun Aug 15 07:29:41 2021
From: webhook-mailer at python.org (mdickinson)
Date: Sun, 15 Aug 2021 11:29:41 -0000
Subject: [Python-checkins] bpo-16580: [doc] Add examples to int.to_bytes and
 int.from_bytes (GH-27760)
Message-ID: <mailman.1034.1629026982.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/ad0a8a9c629a7a0fa306fbdf019be63c701a8028
commit: ad0a8a9c629a7a0fa306fbdf019be63c701a8028
branch: main
author: Gautam Chaudhuri <gautam.chaudhuri.1803 at gmail.com>
committer: mdickinson <dickinsm at gmail.com>
date: 2021-08-15T12:29:05+01:00
summary:

bpo-16580: [doc] Add examples to int.to_bytes and int.from_bytes (GH-27760)

* added code equivs. for to_bytes and from_bytes

Based on woparry's patch[1] from the relevant issue thread[2].

[1]: https://bugs.python.org/file30372/issue16580.patch
[2]: https://bugs.python.org/issue16580

Co-authored-by: Mark Dickinson <dickinsm at gmail.com>

files:
A Misc/NEWS.d/next/Documentation/2021-08-13-20-17-59.bpo-16580.MZ_iK9.rst
M Doc/library/stdtypes.rst
M Lib/test/test_long.py
M Misc/ACKS

diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index d6eff144cce54..f0a3eda8213e9 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -529,6 +529,18 @@ class`. In addition, it provides a few more methods:
     given, an :exc:`OverflowError` is raised. The default value for *signed*
     is ``False``.
 
+    Equivalent to::
+
+        def to_bytes(n, length, byteorder, signed=False):
+            if byteorder == 'little':
+                order = range(length)
+            elif byteorder == 'big':
+                order = reversed(range(length))
+            else:
+                raise ValueError("byteorder must be either 'little' or 'big'")
+
+            return bytes((n >> i*8) & 0xff for i in order)
+
     .. versionadded:: 3.2
 
 .. classmethod:: int.from_bytes(bytes, byteorder, *, signed=False)
@@ -559,6 +571,22 @@ class`. In addition, it provides a few more methods:
     The *signed* argument indicates whether two's complement is used to
     represent the integer.
 
+    Equivalent to::
+
+        def from_bytes(bytes, byteorder, signed=False):
+            if byteorder == 'little':
+                little_ordered = list(bytes)
+            elif byteorder == 'big':
+                little_ordered = list(reversed(bytes))
+            else:
+                raise ValueError("byteorder must be either 'little' or 'big'")
+
+            n = sum(b << i*8 for i, b in enumerate(little_ordered))
+            if signed and little_ordered and (little_ordered[-1] & 0x80):
+                n -= 1 << 8*len(little_ordered)
+
+            return n
+
     .. versionadded:: 3.2
 
 .. method:: int.as_integer_ratio()
diff --git a/Lib/test/test_long.py b/Lib/test/test_long.py
index c97842b5bfd23..1de75bf86c0ae 100644
--- a/Lib/test/test_long.py
+++ b/Lib/test/test_long.py
@@ -1103,6 +1103,13 @@ def test_round(self):
 
     def test_to_bytes(self):
         def check(tests, byteorder, signed=False):
+            def equivalent_python(n, length, byteorder, signed=False):
+                if byteorder == 'little':
+                    order = range(length)
+                elif byteorder == 'big':
+                    order = reversed(range(length))
+                return bytes((n >> i*8) & 0xff for i in order)
+
             for test, expected in tests.items():
                 try:
                     self.assertEqual(
@@ -1113,6 +1120,18 @@ def check(tests, byteorder, signed=False):
                         "failed to convert {0} with byteorder={1} and signed={2}"
                         .format(test, byteorder, signed)) from err
 
+                try:
+                    self.assertEqual(
+                        equivalent_python(
+                            test, len(expected), byteorder, signed=signed),
+                        expected
+                    )
+                except Exception as err:
+                    raise AssertionError(
+                        "Code equivalent from docs is not equivalent for "
+                        "conversion of {0} with byteorder byteorder={1} and "
+                        "signed={2}".format(test, byteorder, signed)) from err
+
         # Convert integers to signed big-endian byte arrays.
         tests1 = {
             0: b'\x00',
@@ -1202,6 +1221,18 @@ def check(tests, byteorder, signed=False):
 
     def test_from_bytes(self):
         def check(tests, byteorder, signed=False):
+            def equivalent_python(byte_array, byteorder, signed=False):
+                if byteorder == 'little':
+                    little_ordered = list(byte_array)
+                elif byteorder == 'big':
+                    little_ordered = list(reversed(byte_array))
+
+                n = sum(b << i*8 for i, b in enumerate(little_ordered))
+                if signed and little_ordered and (little_ordered[-1] & 0x80):
+                    n -= 1 << 8*len(little_ordered)
+
+                return n
+
             for test, expected in tests.items():
                 try:
                     self.assertEqual(
@@ -1212,6 +1243,17 @@ def check(tests, byteorder, signed=False):
                         "failed to convert {0} with byteorder={1!r} and signed={2}"
                         .format(test, byteorder, signed)) from err
 
+                try:
+                    self.assertEqual(
+                        equivalent_python(test, byteorder, signed=signed),
+                        expected
+                    )
+                except Exception as err:
+                    raise AssertionError(
+                        "Code equivalent from docs is not equivalent for "
+                        "conversion of {0} with byteorder={1!r} and signed={2}"
+                        .format(test, byteorder, signed)) from err
+
         # Convert signed big-endian byte arrays to integers.
         tests1 = {
             b'': 0,
diff --git a/Misc/ACKS b/Misc/ACKS
index 7829feebc49b0..91233509b7e8b 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -306,6 +306,7 @@ Mitch Chapman
 Matt Chaput
 William Chargin
 Yogesh Chaudhari
+Gautam Chaudhuri
 David Chaum
 Nicolas Chauvat
 Jerry Chen
diff --git a/Misc/NEWS.d/next/Documentation/2021-08-13-20-17-59.bpo-16580.MZ_iK9.rst b/Misc/NEWS.d/next/Documentation/2021-08-13-20-17-59.bpo-16580.MZ_iK9.rst
new file mode 100644
index 0000000000000..edeca6f66e539
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2021-08-13-20-17-59.bpo-16580.MZ_iK9.rst
@@ -0,0 +1,2 @@
+Added code equivalents for the :meth:`int.to_bytes` and :meth:`int.from_bytes`
+methods, as well as tests ensuring that these code equivalents are valid.


From webhook-mailer at python.org  Mon Aug 16 04:21:40 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 16 Aug 2021 08:21:40 -0000
Subject: [Python-checkins] bpo-44911: Fixed IsolatedAsyncioTestCase from
 throwing an exception on leaked tasks (GH-27765)
Message-ID: <mailman.1035.1629102101.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/2cb1a6806c0cefab0c3a40fdd428a89a4392570e
commit: 2cb1a6806c0cefab0c3a40fdd428a89a4392570e
branch: main
author: Bar Harel <bar.harel at biocatch.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-16T10:21:08+02:00
summary:

bpo-44911: Fixed IsolatedAsyncioTestCase from throwing an exception on leaked tasks (GH-27765)

files:
A Misc/NEWS.d/next/Library/2021-08-14-00-55-16.bpo-44911.uk3hYk.rst
M Lib/unittest/async_case.py
M Lib/unittest/test/test_async_case.py

diff --git a/Lib/unittest/async_case.py b/Lib/unittest/async_case.py
index 520213c3727555..86ed7046c499a3 100644
--- a/Lib/unittest/async_case.py
+++ b/Lib/unittest/async_case.py
@@ -135,7 +135,7 @@ def _tearDownAsyncioLoop(self):
                 task.cancel()
 
             loop.run_until_complete(
-                asyncio.gather(*to_cancel, loop=loop, return_exceptions=True))
+                asyncio.gather(*to_cancel, return_exceptions=True))
 
             for task in to_cancel:
                 if task.cancelled():
diff --git a/Lib/unittest/test/test_async_case.py b/Lib/unittest/test/test_async_case.py
index d01864b6936ca8..6e48b9e4bfed36 100644
--- a/Lib/unittest/test/test_async_case.py
+++ b/Lib/unittest/test/test_async_case.py
@@ -216,6 +216,26 @@ async def test_cancel(self):
         output = test.run()
         self.assertFalse(output.wasSuccessful())
 
+    def test_cancellation_hanging_tasks(self):
+        cancelled = False
+        class Test(unittest.IsolatedAsyncioTestCase):
+            async def test_leaking_task(self):
+                async def coro():
+                    nonlocal cancelled
+                    try:
+                        await asyncio.sleep(1)
+                    except asyncio.CancelledError:
+                        cancelled = True
+                        raise
+
+                # Leave this running in the background
+                asyncio.create_task(coro())
+
+        test = Test("test_leaking_task")
+        output = test.run()
+        self.assertTrue(cancelled)
+
+
 
 
 if __name__ == "__main__":
diff --git a/Misc/NEWS.d/next/Library/2021-08-14-00-55-16.bpo-44911.uk3hYk.rst b/Misc/NEWS.d/next/Library/2021-08-14-00-55-16.bpo-44911.uk3hYk.rst
new file mode 100644
index 00000000000000..f8aed69a40a3be
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-14-00-55-16.bpo-44911.uk3hYk.rst
@@ -0,0 +1 @@
+:class:`~unittest.IsolatedAsyncioTestCase` will no longer throw an exception while cancelling leaked tasks. Patch by Bar Harel.
\ No newline at end of file


From webhook-mailer at python.org  Mon Aug 16 04:36:57 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 16 Aug 2021 08:36:57 -0000
Subject: [Python-checkins] bpo-44895: skip
 test_no_hang_on_context_chain_cycle2 until the refleak is fixed (GH-27761)
Message-ID: <mailman.1036.1629103018.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/62bc716fde20fcb7b47416c7959be9e66df93212
commit: 62bc716fde20fcb7b47416c7959be9e66df93212
branch: main
author: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-16T10:36:49+02:00
summary:

bpo-44895: skip test_no_hang_on_context_chain_cycle2 until the refleak is fixed (GH-27761)

files:
M Lib/test/test_exceptions.py

diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 947d7132cc718..ce7b86880e69f 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -1012,11 +1012,9 @@ def cycle():
         self.assertIsInstance(exc.__context__, ValueError)
         self.assertIs(exc.__context__.__context__, exc.__context__)
 
+    @unittest.skip("See issue 44895")
     def test_no_hang_on_context_chain_cycle2(self):
         # See issue 25782. Cycle at head of context chain.
-        while gc.collect():
-            # Remove this once issue 44895 is resolved
-            pass
 
         class A(Exception):
             pass


From webhook-mailer at python.org  Mon Aug 16 04:48:19 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 16 Aug 2021 08:48:19 -0000
Subject: [Python-checkins] [3.10] bpo-44830 - Remove the broken Broken
 Mozilla devguide link. (GH-27664) (GH-27666)
Message-ID: <mailman.1037.1629103700.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/b6a6d99a0ba3796a9d7d4fe8612b640f90e6d7f9
commit: b6a6d99a0ba3796a9d7d4fe8612b640f90e6d7f9
branch: 3.10
author: Senthil Kumaran <senthil at python.org>
committer: ambv <lukasz at langa.pl>
date: 2021-08-16T10:48:08+02:00
summary:

[3.10] bpo-44830 - Remove the broken Broken Mozilla devguide link. (GH-27664) (GH-27666)

(cherry picked from commit ebecffdb6d5fffa4249f9a813f1fc1915926feb5)

Co-authored-by: Senthil Kumaran <senthil at python.org>

files:
M Doc/bugs.rst

diff --git a/Doc/bugs.rst b/Doc/bugs.rst
index 8ffc8b14c53e4..82819792a1ad8 100644
--- a/Doc/bugs.rst
+++ b/Doc/bugs.rst
@@ -80,10 +80,6 @@ taken on the bug.
       Article which goes into some detail about how to create a useful bug report.
       This describes what kind of information is useful and why it is useful.
 
-   `Bug Report Writing Guidelines <https://developer.mozilla.org/en-US/docs/Mozilla/QA/Bug_writing_guidelines>`_
-      Information about writing a good bug report.  Some of this is specific to the
-      Mozilla project, but describes general good practices.
-
 .. _contributing-to-python:
 
 Getting started contributing to Python yourself


From webhook-mailer at python.org  Mon Aug 16 05:01:18 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 16 Aug 2021 09:01:18 -0000
Subject: [Python-checkins] bpo-44895: skip
 test_no_hang_on_context_chain_cycle2 until the refleak is fixed (GH-27761)
Message-ID: <mailman.1038.1629104479.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/1960409a6dcbd1e3527f02b523bd27df9086dd77
commit: 1960409a6dcbd1e3527f02b523bd27df9086dd77
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-16T02:01:14-07:00
summary:

bpo-44895: skip test_no_hang_on_context_chain_cycle2 until the refleak is fixed (GH-27761)

(cherry picked from commit 62bc716fde20fcb7b47416c7959be9e66df93212)

Co-authored-by: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>

files:
M Lib/test/test_exceptions.py

diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 2e4ec9d33f689..520deb301ecf8 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -1012,11 +1012,9 @@ def cycle():
         self.assertIsInstance(exc.__context__, ValueError)
         self.assertIs(exc.__context__.__context__, exc.__context__)
 
+    @unittest.skip("See issue 44895")
     def test_no_hang_on_context_chain_cycle2(self):
         # See issue 25782. Cycle at head of context chain.
-        while gc.collect():
-            # Remove this once issue 44895 is resolved
-            pass
 
         class A(Exception):
             pass


From webhook-mailer at python.org  Mon Aug 16 05:55:17 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 16 Aug 2021 09:55:17 -0000
Subject: [Python-checkins] bpo-44911: Fixed IsolatedAsyncioTestCase from
 throwing an exception on leaked tasks (GH-27765)
Message-ID: <mailman.1039.1629107718.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/8516ca500eb45ecf997a471f003df02a9eb767ce
commit: 8516ca500eb45ecf997a471f003df02a9eb767ce
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-16T02:54:58-07:00
summary:

bpo-44911: Fixed IsolatedAsyncioTestCase from throwing an exception on leaked tasks (GH-27765)

(cherry picked from commit 2cb1a6806c0cefab0c3a40fdd428a89a4392570e)

Co-authored-by: Bar Harel <bar.harel at biocatch.com>

files:
A Misc/NEWS.d/next/Library/2021-08-14-00-55-16.bpo-44911.uk3hYk.rst
M Lib/unittest/async_case.py
M Lib/unittest/test/test_async_case.py

diff --git a/Lib/unittest/async_case.py b/Lib/unittest/async_case.py
index 520213c3727555..86ed7046c499a3 100644
--- a/Lib/unittest/async_case.py
+++ b/Lib/unittest/async_case.py
@@ -135,7 +135,7 @@ def _tearDownAsyncioLoop(self):
                 task.cancel()
 
             loop.run_until_complete(
-                asyncio.gather(*to_cancel, loop=loop, return_exceptions=True))
+                asyncio.gather(*to_cancel, return_exceptions=True))
 
             for task in to_cancel:
                 if task.cancelled():
diff --git a/Lib/unittest/test/test_async_case.py b/Lib/unittest/test/test_async_case.py
index d01864b6936ca8..6e48b9e4bfed36 100644
--- a/Lib/unittest/test/test_async_case.py
+++ b/Lib/unittest/test/test_async_case.py
@@ -216,6 +216,26 @@ async def test_cancel(self):
         output = test.run()
         self.assertFalse(output.wasSuccessful())
 
+    def test_cancellation_hanging_tasks(self):
+        cancelled = False
+        class Test(unittest.IsolatedAsyncioTestCase):
+            async def test_leaking_task(self):
+                async def coro():
+                    nonlocal cancelled
+                    try:
+                        await asyncio.sleep(1)
+                    except asyncio.CancelledError:
+                        cancelled = True
+                        raise
+
+                # Leave this running in the background
+                asyncio.create_task(coro())
+
+        test = Test("test_leaking_task")
+        output = test.run()
+        self.assertTrue(cancelled)
+
+
 
 
 if __name__ == "__main__":
diff --git a/Misc/NEWS.d/next/Library/2021-08-14-00-55-16.bpo-44911.uk3hYk.rst b/Misc/NEWS.d/next/Library/2021-08-14-00-55-16.bpo-44911.uk3hYk.rst
new file mode 100644
index 00000000000000..f8aed69a40a3be
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-14-00-55-16.bpo-44911.uk3hYk.rst
@@ -0,0 +1 @@
+:class:`~unittest.IsolatedAsyncioTestCase` will no longer throw an exception while cancelling leaked tasks. Patch by Bar Harel.
\ No newline at end of file


From webhook-mailer at python.org  Mon Aug 16 07:21:55 2021
From: webhook-mailer at python.org (markshannon)
Date: Mon, 16 Aug 2021 11:21:55 -0000
Subject: [Python-checkins] bpo-44914: Maintain invariants of type version
 tags. (GH-27773)
Message-ID: <mailman.1040.1629112916.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/1a511dc92dd10ee8fc2e5da9f52f795924bdc89a
commit: 1a511dc92dd10ee8fc2e5da9f52f795924bdc89a
branch: main
author: Mark Shannon <mark at hotpy.org>
committer: markshannon <mark at hotpy.org>
date: 2021-08-16T12:21:34+01:00
summary:

bpo-44914: Maintain invariants of type version tags. (GH-27773)

* Do not invalidate type versions unnecessarily.

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-16-11-36-02.bpo-44914.6Lgrx3.rst
M Objects/typeobject.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-16-11-36-02.bpo-44914.6Lgrx3.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-16-11-36-02.bpo-44914.6Lgrx3.rst
new file mode 100644
index 00000000000000..5e306ffaf5de84
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-16-11-36-02.bpo-44914.6Lgrx3.rst	
@@ -0,0 +1,5 @@
+Class version tags are no longer recycled.
+
+This means that a version tag serves as a unique identifier for the state of
+a class. We rely on this for effective specialization of the LOAD_ATTR and
+other instructions.
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 7ae50c453ed2f8..1efb9fc5944b02 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -45,7 +45,7 @@ class object "PyObject *" "&PyBaseObject_Type"
 
 // bpo-42745: next_version_tag remains shared by all interpreters because of static types
 // Used to set PyTypeObject.tp_version_tag
-static unsigned int next_version_tag = 0;
+static unsigned int next_version_tag = 1;
 
 typedef struct PySlot_Offset {
     short subslot_offset;
@@ -233,24 +233,14 @@ get_type_cache(void)
 
 
 static void
-type_cache_clear(struct type_cache *cache, int use_none)
+type_cache_clear(struct type_cache *cache, PyObject *value)
 {
     for (Py_ssize_t i = 0; i < (1 << MCACHE_SIZE_EXP); i++) {
         struct type_cache_entry *entry = &cache->hashtable[i];
         entry->version = 0;
-        if (use_none) {
-            // Set to None so _PyType_Lookup() can use Py_SETREF(),
-            // rather than using slower Py_XSETREF().
-            Py_XSETREF(entry->name, Py_NewRef(Py_None));
-        }
-        else {
-            Py_CLEAR(entry->name);
-        }
+        Py_XSETREF(entry->name, _Py_XNewRef(value));
         entry->value = NULL;
     }
-
-    // Mark all version tags as invalid
-    PyType_Modified(&PyBaseObject_Type);
 }
 
 
@@ -287,14 +277,11 @@ _PyType_ClearCache(PyInterpreterState *interp)
             sizeof(cache->hashtable) / 1024);
 #endif
 
-    unsigned int cur_version_tag = next_version_tag - 1;
-    if (_Py_IsMainInterpreter(interp)) {
-        next_version_tag = 0;
-    }
+    // Set to None, rather than NULL, so _PyType_Lookup() can
+    // use Py_SETREF() rather than using slower Py_XSETREF().
+    type_cache_clear(cache, Py_None);
 
-    type_cache_clear(cache, 0);
-
-    return cur_version_tag;
+    return next_version_tag - 1;
 }
 
 
@@ -309,7 +296,8 @@ PyType_ClearCache(void)
 void
 _PyType_Fini(PyInterpreterState *interp)
 {
-    _PyType_ClearCache(interp);
+    struct type_cache *cache = &interp->type_cache;
+    type_cache_clear(cache, NULL);
     if (_Py_IsMainInterpreter(interp)) {
         clear_slotdefs();
     }
@@ -426,14 +414,12 @@ assign_version_tag(struct type_cache *cache, PyTypeObject *type)
     if (!_PyType_HasFeature(type, Py_TPFLAGS_READY))
         return 0;
 
-    type->tp_version_tag = next_version_tag++;
-    /* for stress-testing: next_version_tag &= 0xFF; */
-
-    if (type->tp_version_tag == 0) {
-        // Wrap-around or just starting Python - clear the whole cache
-        type_cache_clear(cache, 1);
+    if (next_version_tag == 0) {
+        /* We have run out of version numbers */
         return 0;
     }
+    type->tp_version_tag = next_version_tag++;
+    assert (type->tp_version_tag != 0);
 
     bases = type->tp_bases;
     n = PyTuple_GET_SIZE(bases);


From webhook-mailer at python.org  Mon Aug 16 07:23:17 2021
From: webhook-mailer at python.org (markshannon)
Date: Mon, 16 Aug 2021 11:23:17 -0000
Subject: [Python-checkins] bpo-44900: Add five superinstructions. (GH-27741)
Message-ID: <mailman.1041.1629112998.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/4f51fa9e2d3ea9316e674fb9a9f3e3112e83661c
commit: 4f51fa9e2d3ea9316e674fb9a9f3e3112e83661c
branch: main
author: Mark Shannon <mark at hotpy.org>
committer: markshannon <mark at hotpy.org>
date: 2021-08-16T12:23:13+01:00
summary:

bpo-44900: Add five superinstructions. (GH-27741)

* LOAD_FAST LOAD_FAST
* STORE_FAST LOAD_FAST
* LOAD_FAST LOAD_CONST
* LOAD_CONST LOAD_FAST
* STORE_FAST STORE_FAST

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-12-14-00-57.bpo-44900.w2gpwy.rst
M Include/opcode.h
M Lib/opcode.py
M Python/ceval.c
M Python/opcode_targets.h
M Python/specialize.c

diff --git a/Include/opcode.h b/Include/opcode.h
index 50b783289590d..3334242e7e4d4 100644
--- a/Include/opcode.h
+++ b/Include/opcode.h
@@ -153,6 +153,11 @@ extern "C" {
 #define STORE_ATTR_SPLIT_KEYS    45
 #define STORE_ATTR_SLOT          46
 #define STORE_ATTR_WITH_HINT     47
+#define LOAD_FAST__LOAD_FAST     48
+#define STORE_FAST__LOAD_FAST    58
+#define LOAD_FAST__LOAD_CONST    80
+#define LOAD_CONST__LOAD_FAST    81
+#define STORE_FAST__STORE_FAST   87
 #ifdef NEED_OPCODE_JUMP_TABLES
 static uint32_t _PyOpcode_RelativeJump[8] = {
     0U,
diff --git a/Lib/opcode.py b/Lib/opcode.py
index 061506d0b88bd..53cdc4aa0d549 100644
--- a/Lib/opcode.py
+++ b/Lib/opcode.py
@@ -237,8 +237,13 @@ def jabs_op(name, op):
     "STORE_ATTR_SPLIT_KEYS",
     "STORE_ATTR_SLOT",
     "STORE_ATTR_WITH_HINT",
+    # Super instructions
+    "LOAD_FAST__LOAD_FAST",
+    "STORE_FAST__LOAD_FAST",
+    "LOAD_FAST__LOAD_CONST",
+    "LOAD_CONST__LOAD_FAST",
+    "STORE_FAST__STORE_FAST",
 ]
-
 _specialization_stats = [
     "specialization_success",
     "specialization_failure",
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-12-14-00-57.bpo-44900.w2gpwy.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-12-14-00-57.bpo-44900.w2gpwy.rst
new file mode 100644
index 0000000000000..8d94d6aed80ea
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-12-14-00-57.bpo-44900.w2gpwy.rst	
@@ -0,0 +1,7 @@
+Add five superinstructions for PEP 659 quickening:
+
+* LOAD_FAST LOAD_FAST
+* STORE_FAST LOAD_FAST
+* LOAD_FAST LOAD_CONST
+* LOAD_CONST LOAD_FAST
+* STORE_FAST STORE_FAST
diff --git a/Python/ceval.c b/Python/ceval.c
index 111689ff62980..48787493fdd2c 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1266,16 +1266,21 @@ eval_frame_handle_pending(PyThreadState *tstate)
 #define PRE_DISPATCH_GOTO() do { LLTRACE_INSTR();  RECORD_DXPROFILE(); } while (0)
 #endif
 
+#define NOTRACE_DISPATCH() \
+    { \
+        frame->f_lasti = INSTR_OFFSET(); \
+        NEXTOPARG(); \
+        PRE_DISPATCH_GOTO(); \
+        DISPATCH_GOTO(); \
+    }
+
 /* Do interpreter dispatch accounting for tracing and instrumentation */
 #define DISPATCH() \
     { \
         if (cframe.use_tracing OR_DTRACE_LINE) { \
             goto tracing_dispatch; \
         } \
-        frame->f_lasti = INSTR_OFFSET(); \
-        NEXTOPARG(); \
-        PRE_DISPATCH_GOTO(); \
-        DISPATCH_GOTO(); \
+        NOTRACE_DISPATCH(); \
     }
 
 #define CHECK_EVAL_BREAKER() \
@@ -1682,11 +1687,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
         TARGET(LOAD_FAST): {
             PyObject *value = GETLOCAL(oparg);
             if (value == NULL) {
-                format_exc_check_arg(tstate, PyExc_UnboundLocalError,
-                                     UNBOUNDLOCAL_ERROR_MSG,
-                                     PyTuple_GetItem(co->co_localsplusnames,
-                                                     oparg));
-                goto error;
+                goto unbound_local_error;
             }
             Py_INCREF(value);
             PUSH(value);
@@ -1708,6 +1709,73 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
+        TARGET(LOAD_FAST__LOAD_FAST): {
+            PyObject *value = GETLOCAL(oparg);
+            if (value == NULL) {
+                goto unbound_local_error;
+            }
+            NEXTOPARG();
+            Py_INCREF(value);
+            PUSH(value);
+            value = GETLOCAL(oparg);
+            if (value == NULL) {
+                goto unbound_local_error;
+            }
+            Py_INCREF(value);
+            PUSH(value);
+            NOTRACE_DISPATCH();
+        }
+
+        TARGET(LOAD_FAST__LOAD_CONST): {
+            PyObject *value = GETLOCAL(oparg);
+            if (value == NULL) {
+                goto unbound_local_error;
+            }
+            NEXTOPARG();
+            Py_INCREF(value);
+            PUSH(value);
+            value = GETITEM(consts, oparg);
+            Py_INCREF(value);
+            PUSH(value);
+            NOTRACE_DISPATCH();
+        }
+
+        TARGET(STORE_FAST__LOAD_FAST): {
+            PyObject *value = POP();
+            SETLOCAL(oparg, value);
+            NEXTOPARG();
+            value = GETLOCAL(oparg);
+            if (value == NULL) {
+                goto unbound_local_error;
+            }
+            Py_INCREF(value);
+            PUSH(value);
+            NOTRACE_DISPATCH();
+        }
+
+        TARGET(STORE_FAST__STORE_FAST): {
+            PyObject *value = POP();
+            SETLOCAL(oparg, value);
+            NEXTOPARG();
+            value = POP();
+            SETLOCAL(oparg, value);
+            NOTRACE_DISPATCH();
+        }
+
+        TARGET(LOAD_CONST__LOAD_FAST): {
+            PyObject *value = GETITEM(consts, oparg);
+            NEXTOPARG();
+            Py_INCREF(value);
+            PUSH(value);
+            value = GETLOCAL(oparg);
+            if (value == NULL) {
+                goto unbound_local_error;
+            }
+            Py_INCREF(value);
+            PUSH(value);
+            NOTRACE_DISPATCH();
+        }
+
         TARGET(POP_TOP): {
             PyObject *value = POP();
             Py_DECREF(value);
@@ -4592,6 +4660,15 @@ MISS_WITH_OPARG_COUNTER(BINARY_SUBSCR)
             goto error;
         }
 
+unbound_local_error:
+        {
+            format_exc_check_arg(tstate, PyExc_UnboundLocalError,
+                UNBOUNDLOCAL_ERROR_MSG,
+                PyTuple_GetItem(co->co_localsplusnames, oparg)
+            );
+            goto error;
+        }
+
 error:
         /* Double-check exception status. */
 #ifdef NDEBUG
diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h
index 24ee44f2d08c0..c8036a63f2201 100644
--- a/Python/opcode_targets.h
+++ b/Python/opcode_targets.h
@@ -47,7 +47,7 @@ static void *opcode_targets[256] = {
     &&TARGET_STORE_ATTR_SPLIT_KEYS,
     &&TARGET_STORE_ATTR_SLOT,
     &&TARGET_STORE_ATTR_WITH_HINT,
-    &&_unknown_opcode,
+    &&TARGET_LOAD_FAST__LOAD_FAST,
     &&TARGET_WITH_EXCEPT_START,
     &&TARGET_GET_AITER,
     &&TARGET_GET_ANEXT,
@@ -57,7 +57,7 @@ static void *opcode_targets[256] = {
     &&TARGET_INPLACE_ADD,
     &&TARGET_INPLACE_SUBTRACT,
     &&TARGET_INPLACE_MULTIPLY,
-    &&_unknown_opcode,
+    &&TARGET_STORE_FAST__LOAD_FAST,
     &&TARGET_INPLACE_MODULO,
     &&TARGET_STORE_SUBSCR,
     &&TARGET_DELETE_SUBSCR,
@@ -79,14 +79,14 @@ static void *opcode_targets[256] = {
     &&TARGET_INPLACE_AND,
     &&TARGET_INPLACE_XOR,
     &&TARGET_INPLACE_OR,
-    &&_unknown_opcode,
-    &&_unknown_opcode,
+    &&TARGET_LOAD_FAST__LOAD_CONST,
+    &&TARGET_LOAD_CONST__LOAD_FAST,
     &&TARGET_LIST_TO_TUPLE,
     &&TARGET_RETURN_VALUE,
     &&TARGET_IMPORT_STAR,
     &&TARGET_SETUP_ANNOTATIONS,
     &&TARGET_YIELD_VALUE,
-    &&_unknown_opcode,
+    &&TARGET_STORE_FAST__STORE_FAST,
     &&_unknown_opcode,
     &&TARGET_POP_EXCEPT,
     &&TARGET_STORE_NAME,
diff --git a/Python/specialize.c b/Python/specialize.c
index e653ae41c5778..ecab69bcae78e 100644
--- a/Python/specialize.c
+++ b/Python/specialize.c
@@ -303,6 +303,7 @@ optimize(SpecializedCacheOrInstruction *quickened, int len)
     _Py_CODEUNIT *instructions = first_instruction(quickened);
     int cache_offset = 0;
     int previous_opcode = -1;
+    int previous_oparg = 0;
     for(int i = 0; i < len; i++) {
         int opcode = _Py_OPCODE(instructions[i]);
         int oparg = _Py_OPARG(instructions[i]);
@@ -338,14 +339,32 @@ optimize(SpecializedCacheOrInstruction *quickened, int len)
                 case JUMP_ABSOLUTE:
                     instructions[i] = _Py_MAKECODEUNIT(JUMP_ABSOLUTE_QUICK, oparg);
                     break;
-                /* Insert superinstructions here
-                 E.g.
                 case LOAD_FAST:
-                    if (previous_opcode == LOAD_FAST)
-                        instructions[i-1] = _Py_MAKECODEUNIT(LOAD_FAST__LOAD_FAST, oparg);
-                 */
+                    switch(previous_opcode) {
+                        case LOAD_FAST:
+                            instructions[i-1] = _Py_MAKECODEUNIT(LOAD_FAST__LOAD_FAST, previous_oparg);
+                            break;
+                        case STORE_FAST:
+                            instructions[i-1] = _Py_MAKECODEUNIT(STORE_FAST__LOAD_FAST, previous_oparg);
+                            break;
+                        case LOAD_CONST:
+                            instructions[i-1] = _Py_MAKECODEUNIT(LOAD_CONST__LOAD_FAST, previous_oparg);
+                            break;
+                    }
+                    break;
+                case STORE_FAST:
+                    if (previous_opcode == STORE_FAST) {
+                        instructions[i-1] = _Py_MAKECODEUNIT(STORE_FAST__STORE_FAST, previous_oparg);
+                    }
+                    break;
+                case LOAD_CONST:
+                    if (previous_opcode == LOAD_FAST) {
+                        instructions[i-1] = _Py_MAKECODEUNIT(LOAD_FAST__LOAD_CONST, previous_oparg);
+                    }
+                    break;
             }
             previous_opcode = opcode;
+            previous_oparg = oparg;
         }
     }
     assert(cache_offset+1 == get_cache_count(quickened));


From webhook-mailer at python.org  Mon Aug 16 14:13:55 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 16 Aug 2021 18:13:55 -0000
Subject: [Python-checkins] bpo-44852: Support ignoring specific
 DeprecationWarnings wholesale in regrtest (GH-27634)
Message-ID: <mailman.1042.1629137636.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/a0a6d39295a30434b088f4b66439bf5ea21a3e4e
commit: a0a6d39295a30434b088f4b66439bf5ea21a3e4e
branch: main
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2021-08-16T20:13:51+02:00
summary:

bpo-44852: Support ignoring specific DeprecationWarnings wholesale in regrtest (GH-27634)

files:
A Misc/NEWS.d/next/Tests/2021-08-06-18-36-04.bpo-44852.sUL8YX.rst
M Lib/test/support/__init__.py
M Lib/test/support/warnings_helper.py
M Lib/test/test_support.py

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index b380271d24f230..c89901ea8f7265 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -13,6 +13,7 @@
 import time
 import types
 import unittest
+import warnings
 
 from .testresult import get_test_runner
 
@@ -2053,3 +2054,31 @@ def infinite_recursion(max_depth=75):
         yield
     finally:
         sys.setrecursionlimit(original_depth)
+
+def ignore_deprecations_from(module: str, *, like: str) -> object:
+    token = object()
+    warnings.filterwarnings(
+        "ignore",
+        category=DeprecationWarning,
+        module=module,
+        message=like + fr"(?#support{id(token)})",
+    )
+    return token
+
+def clear_ignored_deprecations(*tokens: object) -> None:
+    if not tokens:
+        raise ValueError("Provide token or tokens returned by ignore_deprecations_from")
+
+    new_filters = []
+    for action, message, category, module, lineno in warnings.filters:
+        if action == "ignore" and category is DeprecationWarning:
+            if isinstance(message, re.Pattern):
+                message = message.pattern
+            if tokens:
+                endswith = tuple(rf"(?#support{id(token)})" for token in tokens)
+            if message.endswith(endswith):
+                continue
+        new_filters.append((action, message, category, module, lineno))
+    if warnings.filters != new_filters:
+        warnings.filters[:] = new_filters
+        warnings._filters_mutated()
diff --git a/Lib/test/support/warnings_helper.py b/Lib/test/support/warnings_helper.py
index de23e6b452b28d..a024fbe5beaa02 100644
--- a/Lib/test/support/warnings_helper.py
+++ b/Lib/test/support/warnings_helper.py
@@ -187,3 +187,13 @@ def save_restore_warnings_filters():
         yield
     finally:
         warnings.filters[:] = old_filters
+
+
+def _warn_about_deprecation():
+    warnings.warn(
+        "This is used in test_support test to ensure"
+        " support.ignore_deprecations_from() works as expected."
+        " You should not be seeing this.",
+        DeprecationWarning,
+        stacklevel=0,
+    )
diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index b1d3411a865bb2..11ca0c2fb2d2f3 100644
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -11,6 +11,8 @@
 import textwrap
 import time
 import unittest
+import warnings
+
 from test import support
 from test.support import import_helper
 from test.support import os_helper
@@ -22,6 +24,33 @@
 
 
 class TestSupport(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        orig_filter_len = len(warnings.filters)
+        cls._warnings_helper_token = support.ignore_deprecations_from(
+            "test.support.warnings_helper", like=".*used in test_support.*"
+        )
+        cls._test_support_token = support.ignore_deprecations_from(
+            "test.test_support", like=".*You should NOT be seeing this.*"
+        )
+        assert len(warnings.filters) == orig_filter_len + 2
+
+    @classmethod
+    def tearDownClass(cls):
+        orig_filter_len = len(warnings.filters)
+        support.clear_ignored_deprecations(
+            cls._warnings_helper_token,
+            cls._test_support_token,
+        )
+        assert len(warnings.filters) == orig_filter_len - 2
+
+    def test_ignored_deprecations_are_silent(self):
+        """Test support.ignore_deprecations_from() silences warnings"""
+        with warnings.catch_warnings(record=True) as warning_objs:
+            warnings_helper._warn_about_deprecation()
+            warnings.warn("You should NOT be seeing this.", DeprecationWarning)
+            messages = [str(w.message) for w in warning_objs]
+        self.assertEqual(len(messages), 0, messages)
 
     def test_import_module(self):
         import_helper.import_module("ftplib")
diff --git a/Misc/NEWS.d/next/Tests/2021-08-06-18-36-04.bpo-44852.sUL8YX.rst b/Misc/NEWS.d/next/Tests/2021-08-06-18-36-04.bpo-44852.sUL8YX.rst
new file mode 100644
index 00000000000000..41b5c2fb51c5c7
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2021-08-06-18-36-04.bpo-44852.sUL8YX.rst
@@ -0,0 +1,2 @@
+Add ability to wholesale silence DeprecationWarnings while running the
+regression test suite.


From webhook-mailer at python.org  Mon Aug 16 14:34:45 2021
From: webhook-mailer at python.org (gvanrossum)
Date: Mon, 16 Aug 2021 18:34:45 -0000
Subject: [Python-checkins] Fix a SystemError in code.replace() (#27771)
Message-ID: <mailman.1043.1629138886.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/62bd97303eb6d1fb0109e4a57d38c2ba6b0be7ff
commit: 62bd97303eb6d1fb0109e4a57d38c2ba6b0be7ff
branch: main
author: Guido van Rossum <guido at python.org>
committer: gvanrossum <gvanrossum at gmail.com>
date: 2021-08-16T11:34:23-07:00
summary:

Fix a SystemError in code.replace() (#27771)

While the comment said 'We don't bother resizing localspluskinds',
this would cause .replace() to crash when it happened.
(Also types.CodeType(), but testing that is tedious, and this tests all
code paths.)

files:
M Lib/test/test_code.py
M Objects/codeobject.c

diff --git a/Lib/test/test_code.py b/Lib/test/test_code.py
index 2bdd7e749434d..9d6b465115ca2 100644
--- a/Lib/test/test_code.py
+++ b/Lib/test/test_code.py
@@ -320,6 +320,15 @@ def func():
         with self.assertRaises(ValueError):
             co.replace(co_nlocals=co.co_nlocals + 1)
 
+    def test_shrinking_localsplus(self):
+        # Check that PyCode_NewWithPosOnlyArgs resizes both
+        # localsplusnames and localspluskinds, if an argument is a cell.
+        def func(arg):
+            return lambda: arg
+        code = func.__code__
+        newcode = code.replace(co_name="func")  # Should not raise SystemError
+        self.assertEqual(code, newcode)
+
     def test_empty_linetable(self):
         def func():
             pass
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
index 3dc9fd787f385..ad8f13a781b94 100644
--- a/Objects/codeobject.c
+++ b/Objects/codeobject.c
@@ -471,9 +471,11 @@ PyCode_NewWithPosOnlyArgs(int argcount, int posonlyargcount, int kwonlyargcount,
                                localsplusnames, localspluskinds);
     }
     // If any cells were args then nlocalsplus will have shrunk.
-    // We don't bother resizing localspluskinds.
-    if (_PyTuple_Resize(&localsplusnames, nlocalsplus) < 0) {
-        goto error;
+    if (nlocalsplus != PyTuple_GET_SIZE(localsplusnames)) {
+        if (_PyTuple_Resize(&localsplusnames, nlocalsplus) < 0
+                || _PyBytes_Resize(&localspluskinds, nlocalsplus) < 0) {
+            goto error;
+        }
     }
 
     struct _PyCodeConstructor con = {


From webhook-mailer at python.org  Mon Aug 16 15:19:06 2021
From: webhook-mailer at python.org (markshannon)
Date: Mon, 16 Aug 2021 19:19:06 -0000
Subject: [Python-checkins] bpo-44914: Add tests for some invariants of
 tp_version_tag (GH-27774)
Message-ID: <mailman.1044.1629141546.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/d84d2c4985457733602d46dc4ee77290da4e9539
commit: d84d2c4985457733602d46dc4ee77290da4e9539
branch: main
author: Ken Jin <28750310+Fidget-Spinner at users.noreply.github.com>
committer: markshannon <mark at hotpy.org>
date: 2021-08-16T20:18:36+01:00
summary:

bpo-44914: Add tests for some invariants of tp_version_tag (GH-27774)

files:
A Lib/test/test_type_cache.py
M Modules/_testcapimodule.c

diff --git a/Lib/test/test_type_cache.py b/Lib/test/test_type_cache.py
new file mode 100644
index 0000000000000..8502f6b0584b0
--- /dev/null
+++ b/Lib/test/test_type_cache.py
@@ -0,0 +1,47 @@
+""" Tests for the internal type cache in CPython. """
+import unittest
+from test import support
+from test.support import import_helper
+try:
+    from sys import _clear_type_cache
+except ImportError:
+    _clear_type_cache = None
+
+# Skip this test if the _testcapi module isn't available.
+type_get_version = import_helper.import_module('_testcapi').type_get_version
+
+
+ at support.cpython_only
+ at unittest.skipIf(_clear_type_cache is None, "requires sys._clear_type_cache")
+class TypeCacheTests(unittest.TestCase):
+    def test_tp_version_tag_unique(self):
+        """tp_version_tag should be unique assuming no overflow, even after
+        clearing type cache.
+        """
+        # Check if global version tag has already overflowed.
+        Y = type('Y', (), {})
+        Y.x = 1
+        Y.x  # Force a _PyType_Lookup, populating version tag
+        y_ver = type_get_version(Y)
+        # Overflow, or not enough left to conduct the test.
+        if y_ver == 0 or y_ver > 0xFFFFF000:
+            self.skipTest("Out of type version tags")
+        # Note: try to avoid any method lookups within this loop,
+        # It will affect global version tag.
+        all_version_tags = []
+        append_result = all_version_tags.append
+        assertNotEqual = self.assertNotEqual
+        for _ in range(30):
+            _clear_type_cache()
+            X = type('Y', (), {})
+            X.x = 1
+            X.x
+            tp_version_tag_after = type_get_version(X)
+            assertNotEqual(tp_version_tag_after, 0, msg="Version overflowed")
+            append_result(tp_version_tag_after)
+        self.assertEqual(len(set(all_version_tags)), 30,
+                         msg=f"{all_version_tags} contains non-unique versions")
+
+
+if __name__ == "__main__":
+    support.run_unittest(TypeCacheTests)
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index f338e89f426da..c35eac78ebe88 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -5575,6 +5575,23 @@ test_fatal_error(PyObject *self, PyObject *args)
     Py_RETURN_NONE;
 }
 
+// type->tp_version_tag
+static PyObject *
+type_get_version(PyObject *self, PyObject *type)
+{
+    if (!PyType_Check(type)) {
+        PyErr_SetString(PyExc_TypeError, "argument must be a type");
+        return NULL;
+    }
+    PyObject *res = PyLong_FromUnsignedLong(
+        ((PyTypeObject *)type)->tp_version_tag);
+    if (res == NULL) {
+        assert(PyErr_Occurred());
+        return NULL;
+    }
+    return res;
+}
+
 
 static PyObject *test_buildvalue_issue38913(PyObject *, PyObject *);
 static PyObject *getargs_s_hash_int(PyObject *, PyObject *, PyObject*);
@@ -5854,6 +5871,7 @@ static PyMethodDef TestMethods[] = {
     {"test_py_is_funcs", test_py_is_funcs, METH_NOARGS},
     {"fatal_error", test_fatal_error, METH_VARARGS,
      PyDoc_STR("fatal_error(message, release_gil=False): call Py_FatalError(message)")},
+    {"type_get_version", type_get_version, METH_O, PyDoc_STR("type->tp_version_tag")},
     {NULL, NULL} /* sentinel */
 };
 


From webhook-mailer at python.org  Mon Aug 16 16:47:30 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 16 Aug 2021 20:47:30 -0000
Subject: [Python-checkins] [3.9] bpo-44852: Support ignoring specific
 DeprecationWarnings wholesale in regrtest (GH-27634) (GH-27785)
Message-ID: <mailman.1045.1629146851.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/c7c4cbc58e18ef5a6f4f377b1ece0a84a54335a7
commit: c7c4cbc58e18ef5a6f4f377b1ece0a84a54335a7
branch: 3.9
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2021-08-16T22:47:08+02:00
summary:

[3.9] bpo-44852: Support ignoring specific DeprecationWarnings wholesale in regrtest (GH-27634) (GH-27785)

(cherry picked from commit a0a6d39295a30434b088f4b66439bf5ea21a3e4e)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Lib/test/support/warnings_helper.py
A Misc/NEWS.d/next/Tests/2021-08-06-18-36-04.bpo-44852.sUL8YX.rst
M Lib/test/support/__init__.py
M Lib/test/test_support.py

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index ff7db991589c2b..39dea88076e9e1 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -3241,3 +3241,31 @@ def infinite_recursion(max_depth=75):
         yield
     finally:
         sys.setrecursionlimit(original_depth)
+
+def ignore_deprecations_from(module: str, *, like: str) -> object:
+    token = object()
+    warnings.filterwarnings(
+        "ignore",
+        category=DeprecationWarning,
+        module=module,
+        message=like + fr"(?#support{id(token)})",
+    )
+    return token
+
+def clear_ignored_deprecations(*tokens: object) -> None:
+    if not tokens:
+        raise ValueError("Provide token or tokens returned by ignore_deprecations_from")
+
+    new_filters = []
+    for action, message, category, module, lineno in warnings.filters:
+        if action == "ignore" and category is DeprecationWarning:
+            if isinstance(message, re.Pattern):
+                message = message.pattern
+            if tokens:
+                endswith = tuple(rf"(?#support{id(token)})" for token in tokens)
+            if message.endswith(endswith):
+                continue
+        new_filters.append((action, message, category, module, lineno))
+    if warnings.filters != new_filters:
+        warnings.filters[:] = new_filters
+        warnings._filters_mutated()
diff --git a/Lib/test/support/warnings_helper.py b/Lib/test/support/warnings_helper.py
new file mode 100644
index 00000000000000..a024fbe5beaa02
--- /dev/null
+++ b/Lib/test/support/warnings_helper.py
@@ -0,0 +1,199 @@
+import contextlib
+import functools
+import re
+import sys
+import warnings
+
+
+def check_syntax_warning(testcase, statement, errtext='',
+                         *, lineno=1, offset=None):
+    # Test also that a warning is emitted only once.
+    from test.support import check_syntax_error
+    with warnings.catch_warnings(record=True) as warns:
+        warnings.simplefilter('always', SyntaxWarning)
+        compile(statement, '<testcase>', 'exec')
+    testcase.assertEqual(len(warns), 1, warns)
+
+    warn, = warns
+    testcase.assertTrue(issubclass(warn.category, SyntaxWarning),
+                        warn.category)
+    if errtext:
+        testcase.assertRegex(str(warn.message), errtext)
+    testcase.assertEqual(warn.filename, '<testcase>')
+    testcase.assertIsNotNone(warn.lineno)
+    if lineno is not None:
+        testcase.assertEqual(warn.lineno, lineno)
+
+    # SyntaxWarning should be converted to SyntaxError when raised,
+    # since the latter contains more information and provides better
+    # error report.
+    with warnings.catch_warnings(record=True) as warns:
+        warnings.simplefilter('error', SyntaxWarning)
+        check_syntax_error(testcase, statement, errtext,
+                           lineno=lineno, offset=offset)
+    # No warnings are leaked when a SyntaxError is raised.
+    testcase.assertEqual(warns, [])
+
+
+def ignore_warnings(*, category):
+    """Decorator to suppress deprecation warnings.
+
+    Use of context managers to hide warnings make diffs
+    more noisy and tools like 'git blame' less useful.
+    """
+    def decorator(test):
+        @functools.wraps(test)
+        def wrapper(self, *args, **kwargs):
+            with warnings.catch_warnings():
+                warnings.simplefilter('ignore', category=category)
+                return test(self, *args, **kwargs)
+        return wrapper
+    return decorator
+
+
+class WarningsRecorder(object):
+    """Convenience wrapper for the warnings list returned on
+       entry to the warnings.catch_warnings() context manager.
+    """
+    def __init__(self, warnings_list):
+        self._warnings = warnings_list
+        self._last = 0
+
+    def __getattr__(self, attr):
+        if len(self._warnings) > self._last:
+            return getattr(self._warnings[-1], attr)
+        elif attr in warnings.WarningMessage._WARNING_DETAILS:
+            return None
+        raise AttributeError("%r has no attribute %r" % (self, attr))
+
+    @property
+    def warnings(self):
+        return self._warnings[self._last:]
+
+    def reset(self):
+        self._last = len(self._warnings)
+
+
+ at contextlib.contextmanager
+def check_warnings(*filters, **kwargs):
+    """Context manager to silence warnings.
+
+    Accept 2-tuples as positional arguments:
+        ("message regexp", WarningCategory)
+
+    Optional argument:
+     - if 'quiet' is True, it does not fail if a filter catches nothing
+        (default True without argument,
+         default False if some filters are defined)
+
+    Without argument, it defaults to:
+        check_warnings(("", Warning), quiet=True)
+    """
+    quiet = kwargs.get('quiet')
+    if not filters:
+        filters = (("", Warning),)
+        # Preserve backward compatibility
+        if quiet is None:
+            quiet = True
+    return _filterwarnings(filters, quiet)
+
+
+ at contextlib.contextmanager
+def check_no_warnings(testcase, message='', category=Warning, force_gc=False):
+    """Context manager to check that no warnings are emitted.
+
+    This context manager enables a given warning within its scope
+    and checks that no warnings are emitted even with that warning
+    enabled.
+
+    If force_gc is True, a garbage collection is attempted before checking
+    for warnings. This may help to catch warnings emitted when objects
+    are deleted, such as ResourceWarning.
+
+    Other keyword arguments are passed to warnings.filterwarnings().
+    """
+    from test.support import gc_collect
+    with warnings.catch_warnings(record=True) as warns:
+        warnings.filterwarnings('always',
+                                message=message,
+                                category=category)
+        yield
+        if force_gc:
+            gc_collect()
+    testcase.assertEqual(warns, [])
+
+
+ at contextlib.contextmanager
+def check_no_resource_warning(testcase):
+    """Context manager to check that no ResourceWarning is emitted.
+
+    Usage:
+
+        with check_no_resource_warning(self):
+            f = open(...)
+            ...
+            del f
+
+    You must remove the object which may emit ResourceWarning before
+    the end of the context manager.
+    """
+    with check_no_warnings(testcase, category=ResourceWarning, force_gc=True):
+        yield
+
+
+def _filterwarnings(filters, quiet=False):
+    """Catch the warnings, then check if all the expected
+    warnings have been raised and re-raise unexpected warnings.
+    If 'quiet' is True, only re-raise the unexpected warnings.
+    """
+    # Clear the warning registry of the calling module
+    # in order to re-raise the warnings.
+    frame = sys._getframe(2)
+    registry = frame.f_globals.get('__warningregistry__')
+    if registry:
+        registry.clear()
+    with warnings.catch_warnings(record=True) as w:
+        # Set filter "always" to record all warnings.  Because
+        # test_warnings swap the module, we need to look up in
+        # the sys.modules dictionary.
+        sys.modules['warnings'].simplefilter("always")
+        yield WarningsRecorder(w)
+    # Filter the recorded warnings
+    reraise = list(w)
+    missing = []
+    for msg, cat in filters:
+        seen = False
+        for w in reraise[:]:
+            warning = w.message
+            # Filter out the matching messages
+            if (re.match(msg, str(warning), re.I) and
+                issubclass(warning.__class__, cat)):
+                seen = True
+                reraise.remove(w)
+        if not seen and not quiet:
+            # This filter caught nothing
+            missing.append((msg, cat.__name__))
+    if reraise:
+        raise AssertionError("unhandled warning %s" % reraise[0])
+    if missing:
+        raise AssertionError("filter (%r, %s) did not catch any warning" %
+                             missing[0])
+
+
+ at contextlib.contextmanager
+def save_restore_warnings_filters():
+    old_filters = warnings.filters[:]
+    try:
+        yield
+    finally:
+        warnings.filters[:] = old_filters
+
+
+def _warn_about_deprecation():
+    warnings.warn(
+        "This is used in test_support test to ensure"
+        " support.ignore_deprecations_from() works as expected."
+        " You should not be seeing this.",
+        DeprecationWarning,
+        stacklevel=0,
+    )
diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index b5a16f9cb60272..60a7741194f2fc 100644
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -11,6 +11,8 @@
 import textwrap
 import time
 import unittest
+import warnings
+
 from test import support
 from test.support import script_helper
 from test.support import socket_helper
@@ -19,6 +21,33 @@
 
 
 class TestSupport(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        orig_filter_len = len(warnings.filters)
+        cls._warnings_helper_token = support.ignore_deprecations_from(
+            "test.test_support", like=".*used in test_support.*"
+        )
+        cls._test_support_token = support.ignore_deprecations_from(
+            "test.test_support", like=".*You should NOT be seeing this.*"
+        )
+        assert len(warnings.filters) == orig_filter_len + 2
+
+    @classmethod
+    def tearDownClass(cls):
+        orig_filter_len = len(warnings.filters)
+        support.clear_ignored_deprecations(
+            cls._warnings_helper_token,
+            cls._test_support_token,
+        )
+        assert len(warnings.filters) == orig_filter_len - 2
+
+    def test_ignored_deprecations_are_silent(self):
+        """Test support.ignore_deprecations_from() silences warnings"""
+        with warnings.catch_warnings(record=True) as warning_objs:
+            _warn_about_deprecation()
+            warnings.warn("You should NOT be seeing this.", DeprecationWarning)
+            messages = [str(w.message) for w in warning_objs]
+        self.assertEqual(len(messages), 0, messages)
 
     def test_import_module(self):
         support.import_module("ftplib")
@@ -676,6 +705,17 @@ def test_print_warning(self):
     # SuppressCrashReport
 
 
+def _warn_about_deprecation():
+    # In 3.10+ this lives in test.support.warnings_helper
+    warnings.warn(
+        "This is used in test_support test to ensure"
+        " support.ignore_deprecations_from() works as expected."
+        " You should not be seeing this.",
+        DeprecationWarning,
+        stacklevel=0,
+    )
+
+
 def test_main():
     tests = [TestSupport]
     support.run_unittest(*tests)
diff --git a/Misc/NEWS.d/next/Tests/2021-08-06-18-36-04.bpo-44852.sUL8YX.rst b/Misc/NEWS.d/next/Tests/2021-08-06-18-36-04.bpo-44852.sUL8YX.rst
new file mode 100644
index 00000000000000..41b5c2fb51c5c7
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2021-08-06-18-36-04.bpo-44852.sUL8YX.rst
@@ -0,0 +1,2 @@
+Add ability to wholesale silence DeprecationWarnings while running the
+regression test suite.


From webhook-mailer at python.org  Mon Aug 16 17:42:34 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 16 Aug 2021 21:42:34 -0000
Subject: [Python-checkins] bpo-38956: don't print BooleanOptionalAction's
 default twice (GH-27672)
Message-ID: <mailman.1046.1629150155.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/1512bc21d60f098a9e9f37b44a2f6a9b49a3fd4f
commit: 1512bc21d60f098a9e9f37b44a2f6a9b49a3fd4f
branch: main
author: Maximilian Hils <git at maximilianhils.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-16T23:42:21+02:00
summary:

bpo-38956: don't print BooleanOptionalAction's default twice (GH-27672)

Co-authored-by: Micky Yun Chan <michan at redhat.com>

files:
A Misc/NEWS.d/next/Library/2021-08-09-13-17-10.bpo-38956.owWLNv.rst
M Lib/argparse.py
M Lib/test/test_argparse.py

diff --git a/Lib/argparse.py b/Lib/argparse.py
index 33c5d705bc62d..d5a0afb4a33ee 100644
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -876,7 +876,7 @@ def __init__(self,
                 _option_strings.append(option_string)
 
         if help is not None and default is not None:
-            help += f" (default: {default})"
+            help += " (default: %(default)s)"
 
         super().__init__(
             option_strings=_option_strings,
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
index 93ac0c3b746a4..d369d0fb28f4a 100644
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -4281,6 +4281,9 @@ class TestHelpArgumentDefaults(HelpTestCase):
     argument_signatures = [
         Sig('--foo', help='foo help - oh and by the way, %(default)s'),
         Sig('--bar', action='store_true', help='bar help'),
+        Sig('--taz', action=argparse.BooleanOptionalAction,
+            help='Whether to taz it', default=True),
+        Sig('--quux', help="Set the quux", default=42),
         Sig('spam', help='spam help'),
         Sig('badger', nargs='?', default='wooden', help='badger help'),
     ]
@@ -4289,25 +4292,29 @@ class TestHelpArgumentDefaults(HelpTestCase):
          [Sig('--baz', type=int, default=42, help='baz help')]),
     ]
     usage = '''\
-        usage: PROG [-h] [--foo FOO] [--bar] [--baz BAZ] spam [badger]
+        usage: PROG [-h] [--foo FOO] [--bar] [--taz | --no-taz] [--quux QUUX]
+                    [--baz BAZ]
+                    spam [badger]
         '''
     help = usage + '''\
 
         description
 
         positional arguments:
-          spam        spam help
-          badger      badger help (default: wooden)
+          spam             spam help
+          badger           badger help (default: wooden)
 
         options:
-          -h, --help  show this help message and exit
-          --foo FOO   foo help - oh and by the way, None
-          --bar       bar help (default: False)
+          -h, --help       show this help message and exit
+          --foo FOO        foo help - oh and by the way, None
+          --bar            bar help (default: False)
+          --taz, --no-taz  Whether to taz it (default: True)
+          --quux QUUX      Set the quux (default: 42)
 
         title:
           description
 
-          --baz BAZ   baz help (default: 42)
+          --baz BAZ        baz help (default: 42)
         '''
     version = ''
 
diff --git a/Misc/NEWS.d/next/Library/2021-08-09-13-17-10.bpo-38956.owWLNv.rst b/Misc/NEWS.d/next/Library/2021-08-09-13-17-10.bpo-38956.owWLNv.rst
new file mode 100644
index 0000000000000..3f57c0ea5d5a3
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-09-13-17-10.bpo-38956.owWLNv.rst
@@ -0,0 +1 @@
+:class:`argparse.BooleanOptionalAction`'s default value is no longer printed twice when used with :class:`argparse.ArgumentDefaultsHelpFormatter`.


From webhook-mailer at python.org  Tue Aug 17 05:01:07 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 17 Aug 2021 09:01:07 -0000
Subject: [Python-checkins] bpo-44903: Removed othergui.rst and list of GUI
 frameworks (GH-27762)
Message-ID: <mailman.1047.1629190869.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/6a358bb9482f7595b858ea7b800cbe66f0de5fa1
commit: 6a358bb9482f7595b858ea7b800cbe66f0de5fa1
branch: main
author: Gautam Chaudhuri <gautam.chaudhuri.1803 at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-17T11:00:58+02:00
summary:

bpo-44903: Removed othergui.rst and list of GUI frameworks (GH-27762)

files:
A Misc/NEWS.d/next/Documentation/2021-08-13-19-08-03.bpo-44903.aJuvQF.rst
D Doc/library/othergui.rst
M Doc/faq/gui.rst
M Doc/library/tk.rst

diff --git a/Doc/faq/gui.rst b/Doc/faq/gui.rst
index a322fa231669bc..145283d072d40c 100644
--- a/Doc/faq/gui.rst
+++ b/Doc/faq/gui.rst
@@ -14,17 +14,8 @@ Graphic User Interface FAQ
 General GUI Questions
 =====================
 
-What platform-independent GUI toolkits exist for Python?
-========================================================
-
-Depending on what platform(s) you are aiming at, there are several.  Some
-of them haven't been ported to Python 3 yet.  At least `Tkinter`_ and `Qt`_
-are known to be Python 3-compatible.
-
-.. XXX check links
-
-Tkinter
--------
+What GUI toolkits exist for Python?
+===================================
 
 Standard builds of Python include an object-oriented interface to the Tcl/Tk
 widget set, called :ref:`tkinter <Tkinter>`.  This is probably the easiest to
@@ -34,83 +25,12 @@ For more info about Tk, including pointers to the source, see the
 `Tcl/Tk home page <https://www.tcl.tk>`_.  Tcl/Tk is fully portable to the
 Mac OS X, Windows, and Unix platforms.
 
-wxWidgets
----------
-
-wxWidgets (https://www.wxwidgets.org) is a free, portable GUI class
-library written in C++ that provides a native look and feel on a
-number of platforms, with Windows, Mac OS X, GTK, X11, all listed as
-current stable targets.  Language bindings are available for a number
-of languages including Python, Perl, Ruby, etc.
-
-`wxPython <https://www.wxpython.org>`_ is the Python binding for
-wxwidgets.  While it often lags slightly behind the official wxWidgets
-releases, it also offers a number of features via pure Python
-extensions that are not available in other language bindings.  There
-is an active wxPython user and developer community.
-
-Both wxWidgets and wxPython are free, open source, software with
-permissive licences that allow their use in commercial products as
-well as in freeware or shareware.
-
-
-Qt
----
-
-There are bindings available for the Qt toolkit (using either `PyQt
-<https://riverbankcomputing.com/software/pyqt/intro>`_ or `PySide
-<https://wiki.qt.io/PySide>`_) and for KDE (`PyKDE4 <https://techbase.kde.org/Languages/Python/Using_PyKDE_4>`__).
-PyQt is currently more mature than PySide, but you must buy a PyQt license from
-`Riverbank Computing <https://www.riverbankcomputing.com/commercial/license-faq>`_
-if you want to write proprietary applications.  PySide is free for all applications.
-
-Qt 4.5 upwards is licensed under the LGPL license; also, commercial licenses
-are available from `The Qt Company <https://www.qt.io/licensing/>`_.
-
-Gtk+
-----
-
-The `GObject introspection bindings <https://wiki.gnome.org/Projects/PyGObject>`_
-for Python allow you to write GTK+ 3 applications.  There is also a
-`Python GTK+ 3 Tutorial <https://python-gtk-3-tutorial.readthedocs.io>`_.
-
-The older PyGtk bindings for the `Gtk+ 2 toolkit <https://www.gtk.org>`_ have
-been implemented by James Henstridge; see <http://www.pygtk.org>.
-
-Kivy
-----
-
-`Kivy <https://kivy.org/>`_ is a cross-platform GUI library supporting both
-desktop operating systems (Windows, macOS, Linux) and mobile devices (Android,
-iOS).  It is written in Python and Cython, and can use a range of windowing
-backends.
-
-Kivy is free and open source software distributed under the MIT license.
-
-FLTK
-----
-
-Python bindings for `the FLTK toolkit <http://www.fltk.org>`_, a simple yet
-powerful and mature cross-platform windowing system, are available from `the
-PyFLTK project <https://pyfltk.sourceforge.io/>`_.
-
-OpenGL
-------
-
-For OpenGL bindings, see `PyOpenGL <http://pyopengl.sourceforge.net>`_.
-
-
-What platform-specific GUI toolkits exist for Python?
-========================================================
-
-By installing the `PyObjc Objective-C bridge
-<https://pypi.org/project/pyobjc/>`_, Python programs can use Mac OS X's
-Cocoa libraries.
-
-:ref:`Pythonwin <windows-faq>` by Mark Hammond includes an interface to the
-Microsoft Foundation Classes and a Python programming environment
-that's written mostly in Python using the MFC classes.
-
+Depending on what platform(s) you are aiming at, there are also several
+alternatives. A `list of cross-platform
+<https://wiki.python.org/moin/GuiProgramming#Cross-Platform_Frameworks>`_ and
+`platform-specific
+<https://wiki.python.org/moin/GuiProgramming#Platform-specific_Frameworks>`_ GUI
+frameworks can be found on the python wiki.
 
 Tkinter questions
 =================
diff --git a/Doc/library/othergui.rst b/Doc/library/othergui.rst
deleted file mode 100644
index db11933b325f39..00000000000000
--- a/Doc/library/othergui.rst
+++ /dev/null
@@ -1,57 +0,0 @@
-.. _other-gui-packages:
-
-Other Graphical User Interface Packages
-=======================================
-
-Major cross-platform (Windows, macOS, Unix-like) GUI toolkits are
-available for Python:
-
-.. seealso::
-
-   `PyGObject <https://wiki.gnome.org/Projects/PyGObject>`_
-      PyGObject provides introspection bindings for C libraries using
-      `GObject <https://developer.gnome.org/gobject/stable/>`_.  One of
-      these libraries is the `GTK+ 3 <https://www.gtk.org/>`_ widget set.
-      GTK+ comes with many more widgets than Tkinter provides.  An online
-      `Python GTK+ 3 Tutorial <https://python-gtk-3-tutorial.readthedocs.io/>`_
-      is available.
-
-   `PyGTK <http://www.pygtk.org/>`_
-      PyGTK provides bindings for an older version
-      of the library, GTK+ 2.  It provides an object oriented interface that
-      is slightly higher level than the C one.  There are also bindings to
-      `GNOME <https://www.gnome.org/>`_.  An online `tutorial
-      <http://www.pygtk.org/pygtk2tutorial/index.html>`_ is available.
-
-   `PyQt <https://riverbankcomputing.com/software/pyqt/intro>`_
-      PyQt is a :program:`sip`\ -wrapped binding to the Qt toolkit.  Qt is an
-      extensive C++ GUI application development framework that is
-      available for Unix, Windows and macOS. :program:`sip` is a tool
-      for generating bindings for C++ libraries as Python classes, and
-      is specifically designed for Python.
-
-   `PySide2 <https://doc.qt.io/qtforpython/>`_
-      Also known as the Qt for Python project, PySide2 is a newer binding to the
-      Qt toolkit. It is provided by The Qt Company and aims to provide a
-      complete port of PySide to Qt 5. Compared to PyQt, its licensing scheme is
-      friendlier to non-open source applications.
-
-   `wxPython <https://www.wxpython.org>`_
-      wxPython is a cross-platform GUI toolkit for Python that is built around
-      the popular `wxWidgets <https://www.wxwidgets.org/>`_ (formerly wxWindows)
-      C++ toolkit.  It provides a native look and feel for applications on
-      Windows, macOS, and Unix systems by using each platform's native
-      widgets where ever possible, (GTK+ on Unix-like systems).  In addition to
-      an extensive set of widgets, wxPython provides classes for online
-      documentation and context sensitive help, printing, HTML viewing,
-      low-level device context drawing, drag and drop, system clipboard access,
-      an XML-based resource format and more, including an ever growing library
-      of user-contributed modules.
-
-PyGTK, PyQt, PySide2, and wxPython, all have a modern look and feel and more
-widgets than Tkinter. In addition, there are many other GUI toolkits for
-Python, both cross-platform, and platform-specific. See the `GUI Programming
-<https://wiki.python.org/moin/GuiProgramming>`_ page in the Python Wiki for a
-much more complete list, and also for links to documents where the
-different GUI toolkits are compared.
-
diff --git a/Doc/library/tk.rst b/Doc/library/tk.rst
index 691c9df5e8f803..0cb8fda4e32ebb 100644
--- a/Doc/library/tk.rst
+++ b/Doc/library/tk.rst
@@ -26,8 +26,8 @@ bundled with Python. Although its standard documentation is weak, good
 material is available, which includes: references, tutorials, a book and
 others. :mod:`tkinter` is also famous for having an outdated look and feel,
 which has been vastly improved in Tk 8.5. Nevertheless, there are many other
-GUI libraries that you could be interested in. For more information about
-alternatives, see the :ref:`other-gui-packages` section.
+GUI libraries that you could be interested in. The Python wiki lists several
+alternative `GUI frameworks and tools <https://wiki.python.org/moin/GuiProgramming>`_.
 
 .. toctree::
 
@@ -41,7 +41,6 @@ alternatives, see the :ref:`other-gui-packages` section.
    tkinter.ttk.rst
    tkinter.tix.rst
    idle.rst
-   othergui.rst
 
 .. Other sections I have in mind are
    Tkinter internals
diff --git a/Misc/NEWS.d/next/Documentation/2021-08-13-19-08-03.bpo-44903.aJuvQF.rst b/Misc/NEWS.d/next/Documentation/2021-08-13-19-08-03.bpo-44903.aJuvQF.rst
new file mode 100644
index 00000000000000..e357405085ca06
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2021-08-13-19-08-03.bpo-44903.aJuvQF.rst
@@ -0,0 +1,3 @@
+Removed the othergui.rst file, any references to it, and the list of GUI
+frameworks in the FAQ. In their place I've added links to the Python Wiki
+`page on GUI frameworks <https://wiki.python.org/moin/GuiProgramming>`.


From webhook-mailer at python.org  Tue Aug 17 05:17:11 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 17 Aug 2021 09:17:11 -0000
Subject: [Python-checkins] [3.9] bpo-38956: don't print
 BooleanOptionalAction's default twice (GH-27672) (GH-27788)
Message-ID: <mailman.1048.1629191832.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/27fd31311097ab7326f084b5e0e5f388f8dc6b13
commit: 27fd31311097ab7326f084b5e0e5f388f8dc6b13
branch: 3.9
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2021-08-17T11:17:00+02:00
summary:

[3.9] bpo-38956: don't print BooleanOptionalAction's default twice (GH-27672) (GH-27788)

Co-authored-by: Micky Yun Chan <michan at redhat.com>.
(cherry picked from commit 1512bc21d60f098a9e9f37b44a2f6a9b49a3fd4f)

Co-authored-by: Maximilian Hils <git at maximilianhils.com>

files:
A Misc/NEWS.d/next/Library/2021-08-09-13-17-10.bpo-38956.owWLNv.rst
M Lib/argparse.py
M Lib/test/test_argparse.py

diff --git a/Lib/argparse.py b/Lib/argparse.py
index ccb010d0d5cae5..f45a2ed4d4dc77 100644
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -875,7 +875,7 @@ def __init__(self,
                 _option_strings.append(option_string)
 
         if help is not None and default is not None:
-            help += f" (default: {default})"
+            help += " (default: %(default)s)"
 
         super().__init__(
             option_strings=_option_strings,
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
index e1685443248ef2..5d8bc1427c4278 100644
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -4259,6 +4259,9 @@ class TestHelpArgumentDefaults(HelpTestCase):
     argument_signatures = [
         Sig('--foo', help='foo help - oh and by the way, %(default)s'),
         Sig('--bar', action='store_true', help='bar help'),
+        Sig('--taz', action=argparse.BooleanOptionalAction,
+            help='Whether to taz it', default=True),
+        Sig('--quux', help="Set the quux", default=42),
         Sig('spam', help='spam help'),
         Sig('badger', nargs='?', default='wooden', help='badger help'),
     ]
@@ -4267,25 +4270,29 @@ class TestHelpArgumentDefaults(HelpTestCase):
          [Sig('--baz', type=int, default=42, help='baz help')]),
     ]
     usage = '''\
-        usage: PROG [-h] [--foo FOO] [--bar] [--baz BAZ] spam [badger]
+        usage: PROG [-h] [--foo FOO] [--bar] [--taz | --no-taz] [--quux QUUX]
+                    [--baz BAZ]
+                    spam [badger]
         '''
     help = usage + '''\
 
         description
 
         positional arguments:
-          spam        spam help
-          badger      badger help (default: wooden)
+          spam             spam help
+          badger           badger help (default: wooden)
 
         optional arguments:
-          -h, --help  show this help message and exit
-          --foo FOO   foo help - oh and by the way, None
-          --bar       bar help (default: False)
+          -h, --help       show this help message and exit
+          --foo FOO        foo help - oh and by the way, None
+          --bar            bar help (default: False)
+          --taz, --no-taz  Whether to taz it (default: True)
+          --quux QUUX      Set the quux (default: 42)
 
         title:
           description
 
-          --baz BAZ   baz help (default: 42)
+          --baz BAZ        baz help (default: 42)
         '''
     version = ''
 
diff --git a/Misc/NEWS.d/next/Library/2021-08-09-13-17-10.bpo-38956.owWLNv.rst b/Misc/NEWS.d/next/Library/2021-08-09-13-17-10.bpo-38956.owWLNv.rst
new file mode 100644
index 00000000000000..3f57c0ea5d5a38
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-09-13-17-10.bpo-38956.owWLNv.rst
@@ -0,0 +1 @@
+:class:`argparse.BooleanOptionalAction`'s default value is no longer printed twice when used with :class:`argparse.ArgumentDefaultsHelpFormatter`.


From webhook-mailer at python.org  Tue Aug 17 05:40:50 2021
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 17 Aug 2021 09:40:50 -0000
Subject: [Python-checkins] bpo-38956: don't print BooleanOptionalAction's
 default twice (GH-27672)
Message-ID: <mailman.1049.1629193251.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/6f6648e436d02bce0e49ba82f4377c0d2f586f0f
commit: 6f6648e436d02bce0e49ba82f4377c0d2f586f0f
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-17T02:40:41-07:00
summary:

bpo-38956: don't print BooleanOptionalAction's default twice (GH-27672)


Co-authored-by: Micky Yun Chan <michan at redhat.com>
(cherry picked from commit 1512bc21d60f098a9e9f37b44a2f6a9b49a3fd4f)

Co-authored-by: Maximilian Hils <git at maximilianhils.com>

files:
A Misc/NEWS.d/next/Library/2021-08-09-13-17-10.bpo-38956.owWLNv.rst
M Lib/argparse.py
M Lib/test/test_argparse.py

diff --git a/Lib/argparse.py b/Lib/argparse.py
index e3a49e74fa8d1..2ded39a0d341a 100644
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -875,7 +875,7 @@ def __init__(self,
                 _option_strings.append(option_string)
 
         if help is not None and default is not None:
-            help += f" (default: {default})"
+            help += " (default: %(default)s)"
 
         super().__init__(
             option_strings=_option_strings,
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
index 0994e70e65e1c..f453f6064b3ae 100644
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -4262,6 +4262,9 @@ class TestHelpArgumentDefaults(HelpTestCase):
     argument_signatures = [
         Sig('--foo', help='foo help - oh and by the way, %(default)s'),
         Sig('--bar', action='store_true', help='bar help'),
+        Sig('--taz', action=argparse.BooleanOptionalAction,
+            help='Whether to taz it', default=True),
+        Sig('--quux', help="Set the quux", default=42),
         Sig('spam', help='spam help'),
         Sig('badger', nargs='?', default='wooden', help='badger help'),
     ]
@@ -4270,25 +4273,29 @@ class TestHelpArgumentDefaults(HelpTestCase):
          [Sig('--baz', type=int, default=42, help='baz help')]),
     ]
     usage = '''\
-        usage: PROG [-h] [--foo FOO] [--bar] [--baz BAZ] spam [badger]
+        usage: PROG [-h] [--foo FOO] [--bar] [--taz | --no-taz] [--quux QUUX]
+                    [--baz BAZ]
+                    spam [badger]
         '''
     help = usage + '''\
 
         description
 
         positional arguments:
-          spam        spam help
-          badger      badger help (default: wooden)
+          spam             spam help
+          badger           badger help (default: wooden)
 
         options:
-          -h, --help  show this help message and exit
-          --foo FOO   foo help - oh and by the way, None
-          --bar       bar help (default: False)
+          -h, --help       show this help message and exit
+          --foo FOO        foo help - oh and by the way, None
+          --bar            bar help (default: False)
+          --taz, --no-taz  Whether to taz it (default: True)
+          --quux QUUX      Set the quux (default: 42)
 
         title:
           description
 
-          --baz BAZ   baz help (default: 42)
+          --baz BAZ        baz help (default: 42)
         '''
     version = ''
 
diff --git a/Misc/NEWS.d/next/Library/2021-08-09-13-17-10.bpo-38956.owWLNv.rst b/Misc/NEWS.d/next/Library/2021-08-09-13-17-10.bpo-38956.owWLNv.rst
new file mode 100644
index 0000000000000..3f57c0ea5d5a3
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-09-13-17-10.bpo-38956.owWLNv.rst
@@ -0,0 +1 @@
+:class:`argparse.BooleanOptionalAction`'s default value is no longer printed twice when used with :class:`argparse.ArgumentDefaultsHelpFormatter`.


From webhook-mailer at python.org  Tue Aug 17 06:01:17 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 17 Aug 2021 10:01:17 -0000
Subject: [Python-checkins] [3.10] bpo-44852: Support ignoring specific
 DeprecationWarnings wholesale in regrtest (GH-27634) (GH-27784)
Message-ID: <mailman.1050.1629194479.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/bc98f981326d7cb30f939dedd04b91f378255d88
commit: bc98f981326d7cb30f939dedd04b91f378255d88
branch: 3.10
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2021-08-17T12:01:00+02:00
summary:

[3.10] bpo-44852: Support ignoring specific DeprecationWarnings wholesale in regrtest (GH-27634) (GH-27784)

(cherry picked from commit a0a6d39295a30434b088f4b66439bf5ea21a3e4e)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Misc/NEWS.d/next/Tests/2021-08-06-18-36-04.bpo-44852.sUL8YX.rst
M Lib/test/support/__init__.py
M Lib/test/support/warnings_helper.py
M Lib/test/test_support.py

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index cb3acecbbd1197..227ce47655f98f 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -13,6 +13,7 @@
 import time
 import types
 import unittest
+import warnings
 
 from .testresult import get_test_runner
 
@@ -2040,3 +2041,33 @@ def check_disallow_instantiation(testcase, tp, *args, **kwds):
         qualname = f"{name}"
     msg = f"cannot create '{re.escape(qualname)}' instances"
     testcase.assertRaisesRegex(TypeError, msg, tp, *args, **kwds)
+
+
+def ignore_deprecations_from(module: str, *, like: str) -> object:
+    token = object()
+    warnings.filterwarnings(
+        "ignore",
+        category=DeprecationWarning,
+        module=module,
+        message=like + fr"(?#support{id(token)})",
+    )
+    return token
+
+
+def clear_ignored_deprecations(*tokens: object) -> None:
+    if not tokens:
+        raise ValueError("Provide token or tokens returned by ignore_deprecations_from")
+
+    new_filters = []
+    for action, message, category, module, lineno in warnings.filters:
+        if action == "ignore" and category is DeprecationWarning:
+            if isinstance(message, re.Pattern):
+                message = message.pattern
+            if tokens:
+                endswith = tuple(rf"(?#support{id(token)})" for token in tokens)
+            if message.endswith(endswith):
+                continue
+        new_filters.append((action, message, category, module, lineno))
+    if warnings.filters != new_filters:
+        warnings.filters[:] = new_filters
+        warnings._filters_mutated()
diff --git a/Lib/test/support/warnings_helper.py b/Lib/test/support/warnings_helper.py
index de23e6b452b28d..a024fbe5beaa02 100644
--- a/Lib/test/support/warnings_helper.py
+++ b/Lib/test/support/warnings_helper.py
@@ -187,3 +187,13 @@ def save_restore_warnings_filters():
         yield
     finally:
         warnings.filters[:] = old_filters
+
+
+def _warn_about_deprecation():
+    warnings.warn(
+        "This is used in test_support test to ensure"
+        " support.ignore_deprecations_from() works as expected."
+        " You should not be seeing this.",
+        DeprecationWarning,
+        stacklevel=0,
+    )
diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index b1d3411a865bb2..11ca0c2fb2d2f3 100644
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -11,6 +11,8 @@
 import textwrap
 import time
 import unittest
+import warnings
+
 from test import support
 from test.support import import_helper
 from test.support import os_helper
@@ -22,6 +24,33 @@
 
 
 class TestSupport(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        orig_filter_len = len(warnings.filters)
+        cls._warnings_helper_token = support.ignore_deprecations_from(
+            "test.support.warnings_helper", like=".*used in test_support.*"
+        )
+        cls._test_support_token = support.ignore_deprecations_from(
+            "test.test_support", like=".*You should NOT be seeing this.*"
+        )
+        assert len(warnings.filters) == orig_filter_len + 2
+
+    @classmethod
+    def tearDownClass(cls):
+        orig_filter_len = len(warnings.filters)
+        support.clear_ignored_deprecations(
+            cls._warnings_helper_token,
+            cls._test_support_token,
+        )
+        assert len(warnings.filters) == orig_filter_len - 2
+
+    def test_ignored_deprecations_are_silent(self):
+        """Test support.ignore_deprecations_from() silences warnings"""
+        with warnings.catch_warnings(record=True) as warning_objs:
+            warnings_helper._warn_about_deprecation()
+            warnings.warn("You should NOT be seeing this.", DeprecationWarning)
+            messages = [str(w.message) for w in warning_objs]
+        self.assertEqual(len(messages), 0, messages)
 
     def test_import_module(self):
         import_helper.import_module("ftplib")
diff --git a/Misc/NEWS.d/next/Tests/2021-08-06-18-36-04.bpo-44852.sUL8YX.rst b/Misc/NEWS.d/next/Tests/2021-08-06-18-36-04.bpo-44852.sUL8YX.rst
new file mode 100644
index 00000000000000..41b5c2fb51c5c7
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2021-08-06-18-36-04.bpo-44852.sUL8YX.rst
@@ -0,0 +1,2 @@
+Add ability to wholesale silence DeprecationWarnings while running the
+regression test suite.


From webhook-mailer at python.org  Tue Aug 17 06:08:57 2021
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 17 Aug 2021 10:08:57 -0000
Subject: [Python-checkins] bpo-44903: Removed othergui.rst and list of GUI
 frameworks (GH-27762)
Message-ID: <mailman.1051.1629194938.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/f6bd1ca166a9c8c9769fb23bc6d8f9c6dcc907ab
commit: f6bd1ca166a9c8c9769fb23bc6d8f9c6dcc907ab
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-17T03:08:49-07:00
summary:

bpo-44903: Removed othergui.rst and list of GUI frameworks (GH-27762)

(cherry picked from commit 6a358bb9482f7595b858ea7b800cbe66f0de5fa1)

Co-authored-by: Gautam Chaudhuri <gautam.chaudhuri.1803 at gmail.com>

files:
A Misc/NEWS.d/next/Documentation/2021-08-13-19-08-03.bpo-44903.aJuvQF.rst
D Doc/library/othergui.rst
M Doc/faq/gui.rst
M Doc/library/tk.rst

diff --git a/Doc/faq/gui.rst b/Doc/faq/gui.rst
index a322fa231669bc..145283d072d40c 100644
--- a/Doc/faq/gui.rst
+++ b/Doc/faq/gui.rst
@@ -14,17 +14,8 @@ Graphic User Interface FAQ
 General GUI Questions
 =====================
 
-What platform-independent GUI toolkits exist for Python?
-========================================================
-
-Depending on what platform(s) you are aiming at, there are several.  Some
-of them haven't been ported to Python 3 yet.  At least `Tkinter`_ and `Qt`_
-are known to be Python 3-compatible.
-
-.. XXX check links
-
-Tkinter
--------
+What GUI toolkits exist for Python?
+===================================
 
 Standard builds of Python include an object-oriented interface to the Tcl/Tk
 widget set, called :ref:`tkinter <Tkinter>`.  This is probably the easiest to
@@ -34,83 +25,12 @@ For more info about Tk, including pointers to the source, see the
 `Tcl/Tk home page <https://www.tcl.tk>`_.  Tcl/Tk is fully portable to the
 Mac OS X, Windows, and Unix platforms.
 
-wxWidgets
----------
-
-wxWidgets (https://www.wxwidgets.org) is a free, portable GUI class
-library written in C++ that provides a native look and feel on a
-number of platforms, with Windows, Mac OS X, GTK, X11, all listed as
-current stable targets.  Language bindings are available for a number
-of languages including Python, Perl, Ruby, etc.
-
-`wxPython <https://www.wxpython.org>`_ is the Python binding for
-wxwidgets.  While it often lags slightly behind the official wxWidgets
-releases, it also offers a number of features via pure Python
-extensions that are not available in other language bindings.  There
-is an active wxPython user and developer community.
-
-Both wxWidgets and wxPython are free, open source, software with
-permissive licences that allow their use in commercial products as
-well as in freeware or shareware.
-
-
-Qt
----
-
-There are bindings available for the Qt toolkit (using either `PyQt
-<https://riverbankcomputing.com/software/pyqt/intro>`_ or `PySide
-<https://wiki.qt.io/PySide>`_) and for KDE (`PyKDE4 <https://techbase.kde.org/Languages/Python/Using_PyKDE_4>`__).
-PyQt is currently more mature than PySide, but you must buy a PyQt license from
-`Riverbank Computing <https://www.riverbankcomputing.com/commercial/license-faq>`_
-if you want to write proprietary applications.  PySide is free for all applications.
-
-Qt 4.5 upwards is licensed under the LGPL license; also, commercial licenses
-are available from `The Qt Company <https://www.qt.io/licensing/>`_.
-
-Gtk+
-----
-
-The `GObject introspection bindings <https://wiki.gnome.org/Projects/PyGObject>`_
-for Python allow you to write GTK+ 3 applications.  There is also a
-`Python GTK+ 3 Tutorial <https://python-gtk-3-tutorial.readthedocs.io>`_.
-
-The older PyGtk bindings for the `Gtk+ 2 toolkit <https://www.gtk.org>`_ have
-been implemented by James Henstridge; see <http://www.pygtk.org>.
-
-Kivy
-----
-
-`Kivy <https://kivy.org/>`_ is a cross-platform GUI library supporting both
-desktop operating systems (Windows, macOS, Linux) and mobile devices (Android,
-iOS).  It is written in Python and Cython, and can use a range of windowing
-backends.
-
-Kivy is free and open source software distributed under the MIT license.
-
-FLTK
-----
-
-Python bindings for `the FLTK toolkit <http://www.fltk.org>`_, a simple yet
-powerful and mature cross-platform windowing system, are available from `the
-PyFLTK project <https://pyfltk.sourceforge.io/>`_.
-
-OpenGL
-------
-
-For OpenGL bindings, see `PyOpenGL <http://pyopengl.sourceforge.net>`_.
-
-
-What platform-specific GUI toolkits exist for Python?
-========================================================
-
-By installing the `PyObjc Objective-C bridge
-<https://pypi.org/project/pyobjc/>`_, Python programs can use Mac OS X's
-Cocoa libraries.
-
-:ref:`Pythonwin <windows-faq>` by Mark Hammond includes an interface to the
-Microsoft Foundation Classes and a Python programming environment
-that's written mostly in Python using the MFC classes.
-
+Depending on what platform(s) you are aiming at, there are also several
+alternatives. A `list of cross-platform
+<https://wiki.python.org/moin/GuiProgramming#Cross-Platform_Frameworks>`_ and
+`platform-specific
+<https://wiki.python.org/moin/GuiProgramming#Platform-specific_Frameworks>`_ GUI
+frameworks can be found on the python wiki.
 
 Tkinter questions
 =================
diff --git a/Doc/library/othergui.rst b/Doc/library/othergui.rst
deleted file mode 100644
index db11933b325f39..00000000000000
--- a/Doc/library/othergui.rst
+++ /dev/null
@@ -1,57 +0,0 @@
-.. _other-gui-packages:
-
-Other Graphical User Interface Packages
-=======================================
-
-Major cross-platform (Windows, macOS, Unix-like) GUI toolkits are
-available for Python:
-
-.. seealso::
-
-   `PyGObject <https://wiki.gnome.org/Projects/PyGObject>`_
-      PyGObject provides introspection bindings for C libraries using
-      `GObject <https://developer.gnome.org/gobject/stable/>`_.  One of
-      these libraries is the `GTK+ 3 <https://www.gtk.org/>`_ widget set.
-      GTK+ comes with many more widgets than Tkinter provides.  An online
-      `Python GTK+ 3 Tutorial <https://python-gtk-3-tutorial.readthedocs.io/>`_
-      is available.
-
-   `PyGTK <http://www.pygtk.org/>`_
-      PyGTK provides bindings for an older version
-      of the library, GTK+ 2.  It provides an object oriented interface that
-      is slightly higher level than the C one.  There are also bindings to
-      `GNOME <https://www.gnome.org/>`_.  An online `tutorial
-      <http://www.pygtk.org/pygtk2tutorial/index.html>`_ is available.
-
-   `PyQt <https://riverbankcomputing.com/software/pyqt/intro>`_
-      PyQt is a :program:`sip`\ -wrapped binding to the Qt toolkit.  Qt is an
-      extensive C++ GUI application development framework that is
-      available for Unix, Windows and macOS. :program:`sip` is a tool
-      for generating bindings for C++ libraries as Python classes, and
-      is specifically designed for Python.
-
-   `PySide2 <https://doc.qt.io/qtforpython/>`_
-      Also known as the Qt for Python project, PySide2 is a newer binding to the
-      Qt toolkit. It is provided by The Qt Company and aims to provide a
-      complete port of PySide to Qt 5. Compared to PyQt, its licensing scheme is
-      friendlier to non-open source applications.
-
-   `wxPython <https://www.wxpython.org>`_
-      wxPython is a cross-platform GUI toolkit for Python that is built around
-      the popular `wxWidgets <https://www.wxwidgets.org/>`_ (formerly wxWindows)
-      C++ toolkit.  It provides a native look and feel for applications on
-      Windows, macOS, and Unix systems by using each platform's native
-      widgets where ever possible, (GTK+ on Unix-like systems).  In addition to
-      an extensive set of widgets, wxPython provides classes for online
-      documentation and context sensitive help, printing, HTML viewing,
-      low-level device context drawing, drag and drop, system clipboard access,
-      an XML-based resource format and more, including an ever growing library
-      of user-contributed modules.
-
-PyGTK, PyQt, PySide2, and wxPython, all have a modern look and feel and more
-widgets than Tkinter. In addition, there are many other GUI toolkits for
-Python, both cross-platform, and platform-specific. See the `GUI Programming
-<https://wiki.python.org/moin/GuiProgramming>`_ page in the Python Wiki for a
-much more complete list, and also for links to documents where the
-different GUI toolkits are compared.
-
diff --git a/Doc/library/tk.rst b/Doc/library/tk.rst
index 691c9df5e8f803..0cb8fda4e32ebb 100644
--- a/Doc/library/tk.rst
+++ b/Doc/library/tk.rst
@@ -26,8 +26,8 @@ bundled with Python. Although its standard documentation is weak, good
 material is available, which includes: references, tutorials, a book and
 others. :mod:`tkinter` is also famous for having an outdated look and feel,
 which has been vastly improved in Tk 8.5. Nevertheless, there are many other
-GUI libraries that you could be interested in. For more information about
-alternatives, see the :ref:`other-gui-packages` section.
+GUI libraries that you could be interested in. The Python wiki lists several
+alternative `GUI frameworks and tools <https://wiki.python.org/moin/GuiProgramming>`_.
 
 .. toctree::
 
@@ -41,7 +41,6 @@ alternatives, see the :ref:`other-gui-packages` section.
    tkinter.ttk.rst
    tkinter.tix.rst
    idle.rst
-   othergui.rst
 
 .. Other sections I have in mind are
    Tkinter internals
diff --git a/Misc/NEWS.d/next/Documentation/2021-08-13-19-08-03.bpo-44903.aJuvQF.rst b/Misc/NEWS.d/next/Documentation/2021-08-13-19-08-03.bpo-44903.aJuvQF.rst
new file mode 100644
index 00000000000000..e357405085ca06
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2021-08-13-19-08-03.bpo-44903.aJuvQF.rst
@@ -0,0 +1,3 @@
+Removed the othergui.rst file, any references to it, and the list of GUI
+frameworks in the FAQ. In their place I've added links to the Python Wiki
+`page on GUI frameworks <https://wiki.python.org/moin/GuiProgramming>`.


From webhook-mailer at python.org  Tue Aug 17 06:09:13 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 17 Aug 2021 10:09:13 -0000
Subject: [Python-checkins] bpo-44903: Removed othergui.rst and list of GUI
 frameworks (GH-27762) (GH-27790)
Message-ID: <mailman.1052.1629194954.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/e21b66b0446d119862d352b1eecc830fed4192ff
commit: e21b66b0446d119862d352b1eecc830fed4192ff
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-17T12:09:09+02:00
summary:

bpo-44903: Removed othergui.rst and list of GUI frameworks (GH-27762) (GH-27790)

(cherry picked from commit 6a358bb9482f7595b858ea7b800cbe66f0de5fa1)

Co-authored-by: Gautam Chaudhuri <gautam.chaudhuri.1803 at gmail.com>

files:
A Misc/NEWS.d/next/Documentation/2021-08-13-19-08-03.bpo-44903.aJuvQF.rst
D Doc/library/othergui.rst
M Doc/faq/gui.rst
M Doc/library/tk.rst

diff --git a/Doc/faq/gui.rst b/Doc/faq/gui.rst
index a322fa231669bc..145283d072d40c 100644
--- a/Doc/faq/gui.rst
+++ b/Doc/faq/gui.rst
@@ -14,17 +14,8 @@ Graphic User Interface FAQ
 General GUI Questions
 =====================
 
-What platform-independent GUI toolkits exist for Python?
-========================================================
-
-Depending on what platform(s) you are aiming at, there are several.  Some
-of them haven't been ported to Python 3 yet.  At least `Tkinter`_ and `Qt`_
-are known to be Python 3-compatible.
-
-.. XXX check links
-
-Tkinter
--------
+What GUI toolkits exist for Python?
+===================================
 
 Standard builds of Python include an object-oriented interface to the Tcl/Tk
 widget set, called :ref:`tkinter <Tkinter>`.  This is probably the easiest to
@@ -34,83 +25,12 @@ For more info about Tk, including pointers to the source, see the
 `Tcl/Tk home page <https://www.tcl.tk>`_.  Tcl/Tk is fully portable to the
 Mac OS X, Windows, and Unix platforms.
 
-wxWidgets
----------
-
-wxWidgets (https://www.wxwidgets.org) is a free, portable GUI class
-library written in C++ that provides a native look and feel on a
-number of platforms, with Windows, Mac OS X, GTK, X11, all listed as
-current stable targets.  Language bindings are available for a number
-of languages including Python, Perl, Ruby, etc.
-
-`wxPython <https://www.wxpython.org>`_ is the Python binding for
-wxwidgets.  While it often lags slightly behind the official wxWidgets
-releases, it also offers a number of features via pure Python
-extensions that are not available in other language bindings.  There
-is an active wxPython user and developer community.
-
-Both wxWidgets and wxPython are free, open source, software with
-permissive licences that allow their use in commercial products as
-well as in freeware or shareware.
-
-
-Qt
----
-
-There are bindings available for the Qt toolkit (using either `PyQt
-<https://riverbankcomputing.com/software/pyqt/intro>`_ or `PySide
-<https://wiki.qt.io/PySide>`_) and for KDE (`PyKDE4 <https://techbase.kde.org/Languages/Python/Using_PyKDE_4>`__).
-PyQt is currently more mature than PySide, but you must buy a PyQt license from
-`Riverbank Computing <https://www.riverbankcomputing.com/commercial/license-faq>`_
-if you want to write proprietary applications.  PySide is free for all applications.
-
-Qt 4.5 upwards is licensed under the LGPL license; also, commercial licenses
-are available from `The Qt Company <https://www.qt.io/licensing/>`_.
-
-Gtk+
-----
-
-The `GObject introspection bindings <https://wiki.gnome.org/Projects/PyGObject>`_
-for Python allow you to write GTK+ 3 applications.  There is also a
-`Python GTK+ 3 Tutorial <https://python-gtk-3-tutorial.readthedocs.io>`_.
-
-The older PyGtk bindings for the `Gtk+ 2 toolkit <https://www.gtk.org>`_ have
-been implemented by James Henstridge; see <http://www.pygtk.org>.
-
-Kivy
-----
-
-`Kivy <https://kivy.org/>`_ is a cross-platform GUI library supporting both
-desktop operating systems (Windows, macOS, Linux) and mobile devices (Android,
-iOS).  It is written in Python and Cython, and can use a range of windowing
-backends.
-
-Kivy is free and open source software distributed under the MIT license.
-
-FLTK
-----
-
-Python bindings for `the FLTK toolkit <http://www.fltk.org>`_, a simple yet
-powerful and mature cross-platform windowing system, are available from `the
-PyFLTK project <https://pyfltk.sourceforge.io/>`_.
-
-OpenGL
-------
-
-For OpenGL bindings, see `PyOpenGL <http://pyopengl.sourceforge.net>`_.
-
-
-What platform-specific GUI toolkits exist for Python?
-========================================================
-
-By installing the `PyObjc Objective-C bridge
-<https://pypi.org/project/pyobjc/>`_, Python programs can use Mac OS X's
-Cocoa libraries.
-
-:ref:`Pythonwin <windows-faq>` by Mark Hammond includes an interface to the
-Microsoft Foundation Classes and a Python programming environment
-that's written mostly in Python using the MFC classes.
-
+Depending on what platform(s) you are aiming at, there are also several
+alternatives. A `list of cross-platform
+<https://wiki.python.org/moin/GuiProgramming#Cross-Platform_Frameworks>`_ and
+`platform-specific
+<https://wiki.python.org/moin/GuiProgramming#Platform-specific_Frameworks>`_ GUI
+frameworks can be found on the python wiki.
 
 Tkinter questions
 =================
diff --git a/Doc/library/othergui.rst b/Doc/library/othergui.rst
deleted file mode 100644
index db11933b325f39..00000000000000
--- a/Doc/library/othergui.rst
+++ /dev/null
@@ -1,57 +0,0 @@
-.. _other-gui-packages:
-
-Other Graphical User Interface Packages
-=======================================
-
-Major cross-platform (Windows, macOS, Unix-like) GUI toolkits are
-available for Python:
-
-.. seealso::
-
-   `PyGObject <https://wiki.gnome.org/Projects/PyGObject>`_
-      PyGObject provides introspection bindings for C libraries using
-      `GObject <https://developer.gnome.org/gobject/stable/>`_.  One of
-      these libraries is the `GTK+ 3 <https://www.gtk.org/>`_ widget set.
-      GTK+ comes with many more widgets than Tkinter provides.  An online
-      `Python GTK+ 3 Tutorial <https://python-gtk-3-tutorial.readthedocs.io/>`_
-      is available.
-
-   `PyGTK <http://www.pygtk.org/>`_
-      PyGTK provides bindings for an older version
-      of the library, GTK+ 2.  It provides an object oriented interface that
-      is slightly higher level than the C one.  There are also bindings to
-      `GNOME <https://www.gnome.org/>`_.  An online `tutorial
-      <http://www.pygtk.org/pygtk2tutorial/index.html>`_ is available.
-
-   `PyQt <https://riverbankcomputing.com/software/pyqt/intro>`_
-      PyQt is a :program:`sip`\ -wrapped binding to the Qt toolkit.  Qt is an
-      extensive C++ GUI application development framework that is
-      available for Unix, Windows and macOS. :program:`sip` is a tool
-      for generating bindings for C++ libraries as Python classes, and
-      is specifically designed for Python.
-
-   `PySide2 <https://doc.qt.io/qtforpython/>`_
-      Also known as the Qt for Python project, PySide2 is a newer binding to the
-      Qt toolkit. It is provided by The Qt Company and aims to provide a
-      complete port of PySide to Qt 5. Compared to PyQt, its licensing scheme is
-      friendlier to non-open source applications.
-
-   `wxPython <https://www.wxpython.org>`_
-      wxPython is a cross-platform GUI toolkit for Python that is built around
-      the popular `wxWidgets <https://www.wxwidgets.org/>`_ (formerly wxWindows)
-      C++ toolkit.  It provides a native look and feel for applications on
-      Windows, macOS, and Unix systems by using each platform's native
-      widgets where ever possible, (GTK+ on Unix-like systems).  In addition to
-      an extensive set of widgets, wxPython provides classes for online
-      documentation and context sensitive help, printing, HTML viewing,
-      low-level device context drawing, drag and drop, system clipboard access,
-      an XML-based resource format and more, including an ever growing library
-      of user-contributed modules.
-
-PyGTK, PyQt, PySide2, and wxPython, all have a modern look and feel and more
-widgets than Tkinter. In addition, there are many other GUI toolkits for
-Python, both cross-platform, and platform-specific. See the `GUI Programming
-<https://wiki.python.org/moin/GuiProgramming>`_ page in the Python Wiki for a
-much more complete list, and also for links to documents where the
-different GUI toolkits are compared.
-
diff --git a/Doc/library/tk.rst b/Doc/library/tk.rst
index 691c9df5e8f803..0cb8fda4e32ebb 100644
--- a/Doc/library/tk.rst
+++ b/Doc/library/tk.rst
@@ -26,8 +26,8 @@ bundled with Python. Although its standard documentation is weak, good
 material is available, which includes: references, tutorials, a book and
 others. :mod:`tkinter` is also famous for having an outdated look and feel,
 which has been vastly improved in Tk 8.5. Nevertheless, there are many other
-GUI libraries that you could be interested in. For more information about
-alternatives, see the :ref:`other-gui-packages` section.
+GUI libraries that you could be interested in. The Python wiki lists several
+alternative `GUI frameworks and tools <https://wiki.python.org/moin/GuiProgramming>`_.
 
 .. toctree::
 
@@ -41,7 +41,6 @@ alternatives, see the :ref:`other-gui-packages` section.
    tkinter.ttk.rst
    tkinter.tix.rst
    idle.rst
-   othergui.rst
 
 .. Other sections I have in mind are
    Tkinter internals
diff --git a/Misc/NEWS.d/next/Documentation/2021-08-13-19-08-03.bpo-44903.aJuvQF.rst b/Misc/NEWS.d/next/Documentation/2021-08-13-19-08-03.bpo-44903.aJuvQF.rst
new file mode 100644
index 00000000000000..e357405085ca06
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2021-08-13-19-08-03.bpo-44903.aJuvQF.rst
@@ -0,0 +1,3 @@
+Removed the othergui.rst file, any references to it, and the list of GUI
+frameworks in the FAQ. In their place I've added links to the Python Wiki
+`page on GUI frameworks <https://wiki.python.org/moin/GuiProgramming>`.


From webhook-mailer at python.org  Tue Aug 17 09:39:45 2021
From: webhook-mailer at python.org (encukou)
Date: Tue, 17 Aug 2021 13:39:45 -0000
Subject: [Python-checkins] bpo-42035: Add PyType_GetQualName() to get a
 type's qualified name. (GH-27551)
Message-ID: <mailman.1053.1629207586.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/3e2c643ae0b21f9e596bfd9c8ec99ca546ea8d0f
commit: 3e2c643ae0b21f9e596bfd9c8ec99ca546ea8d0f
branch: main
author: Hai Shi <shihai1992 at gmail.com>
committer: encukou <encukou at gmail.com>
date: 2021-08-17T15:39:34+02:00
summary:

bpo-42035: Add PyType_GetQualName() to get a type's qualified name. (GH-27551)

files:
A Misc/NEWS.d/next/C API/2021-08-02-20-49-36.bpo-42035.HTBcZt.rst
M Doc/c-api/type.rst
M Doc/data/refcounts.dat
M Doc/data/stable_abi.dat
M Doc/whatsnew/3.11.rst
M Include/object.h
M Misc/stable_abi.txt
M Modules/_testcapimodule.c
M Objects/typeobject.c
M PC/python3dll.c

diff --git a/Doc/c-api/type.rst b/Doc/c-api/type.rst
index 630c7db437cb40..413294dde779f3 100644
--- a/Doc/c-api/type.rst
+++ b/Doc/c-api/type.rst
@@ -112,6 +112,13 @@ Type Objects
 
    .. versionadded:: 3.11
 
+.. c:function:: PyObject* PyType_GetQualName(PyTypeObject *type)
+
+   Return the type's qualified name. Equivalent to getting the
+   type's ``__qualname__`` attribute.
+
+   .. versionadded:: 3.11
+
 .. c:function:: void* PyType_GetSlot(PyTypeObject *type, int slot)
 
    Return the function pointer stored in the given slot. If the
diff --git a/Doc/data/refcounts.dat b/Doc/data/refcounts.dat
index 9b5c00599f1e68..3ef1b280e11708 100644
--- a/Doc/data/refcounts.dat
+++ b/Doc/data/refcounts.dat
@@ -2310,6 +2310,9 @@ PyType_GetFlags:PyTypeObject*:type:0:
 PyType_GetName:PyObject*::+1:
 PyType_GetName:PyTypeObject*:type:0:
 
+PyType_GetQualName:PyObject*::+1:
+PyType_GetQualName:PyTypeObject*:type:0:
+
 PyType_GetSlot:void*:::
 PyType_GetSlot:PyTypeObject*:type:0:
 PyType_GetSlot:int:slot::
diff --git a/Doc/data/stable_abi.dat b/Doc/data/stable_abi.dat
index 4938459d3174f8..ea57cc83f7a510 100644
--- a/Doc/data/stable_abi.dat
+++ b/Doc/data/stable_abi.dat
@@ -644,6 +644,7 @@ function,PyType_GetFlags,3.2,
 function,PyType_GetModule,3.10,
 function,PyType_GetModuleState,3.10,
 function,PyType_GetName,3.11,
+function,PyType_GetQualName,3.11,
 function,PyType_GetSlot,3.4,
 function,PyType_IsSubtype,3.2,
 function,PyType_Modified,3.2,
diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index 88b6f8fa7314e0..c546ec0fc6d9b4 100644
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -298,6 +298,9 @@ C API Changes
 * Add a new :c:func:`PyType_GetName` function to get type's short name.
   (Contributed by Hai Shi in :issue:`42035`.)
 
+* Add a new :c:func:`PyType_GetQualName` function to get type's qualified name.
+  (Contributed by Hai Shi in :issue:`42035`.)
+
 New Features
 ------------
 
diff --git a/Include/object.h b/Include/object.h
index 23ebad84ab4672..fb8a63fc7dbe84 100644
--- a/Include/object.h
+++ b/Include/object.h
@@ -241,6 +241,7 @@ PyAPI_FUNC(void *) PyType_GetModuleState(struct _typeobject *);
 #endif
 #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x030B0000
 PyAPI_FUNC(PyObject *) PyType_GetName(PyTypeObject *);
+PyAPI_FUNC(PyObject *) PyType_GetQualName(PyTypeObject *);
 #endif
 
 /* Generic type check */
diff --git a/Misc/NEWS.d/next/C API/2021-08-02-20-49-36.bpo-42035.HTBcZt.rst b/Misc/NEWS.d/next/C API/2021-08-02-20-49-36.bpo-42035.HTBcZt.rst
new file mode 100644
index 00000000000000..4631c43fdd5312
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2021-08-02-20-49-36.bpo-42035.HTBcZt.rst	
@@ -0,0 +1,2 @@
+Add a new :c:func:`PyType_GetQualName` function to get type's qualified
+name.
diff --git a/Misc/stable_abi.txt b/Misc/stable_abi.txt
index ba16669bd29ba8..a3ee0f01beccb9 100644
--- a/Misc/stable_abi.txt
+++ b/Misc/stable_abi.txt
@@ -2147,6 +2147,8 @@ function PyGC_IsEnabled
 
 function PyType_GetName
     added 3.11
+function PyType_GetQualName
+    added 3.11
 
 # (Detailed comments aren't really needed for further entries: from here on
 #  we can use version control logs.)
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index c35eac78ebe880..0a3c6e0b9b27c6 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -1159,6 +1159,46 @@ test_get_type_name(PyObject *self, PyObject *Py_UNUSED(ignored))
 }
 
 
+static PyObject *
+test_get_type_qualname(PyObject *self, PyObject *Py_UNUSED(ignored))
+{
+    PyObject *tp_qualname = PyType_GetQualName(&PyLong_Type);
+    assert(strcmp(PyUnicode_AsUTF8(tp_qualname), "int") == 0);
+    Py_DECREF(tp_qualname);
+
+    tp_qualname = PyType_GetQualName(&_PyNamespace_Type);
+    assert(strcmp(PyUnicode_AsUTF8(tp_qualname), "SimpleNamespace") == 0);
+    Py_DECREF(tp_qualname);
+
+    PyObject *HeapTypeNameType = PyType_FromSpec(&HeapTypeNameType_Spec);
+    if (HeapTypeNameType == NULL) {
+        Py_RETURN_NONE;
+    }
+    tp_qualname = PyType_GetQualName((PyTypeObject *)HeapTypeNameType);
+    assert(strcmp(PyUnicode_AsUTF8(tp_qualname), "HeapTypeNameType") == 0);
+    Py_DECREF(tp_qualname);
+
+    PyObject *spec_name = PyUnicode_FromString(HeapTypeNameType_Spec.name);
+    if (spec_name == NULL) {
+        goto done;
+    }
+    if (PyObject_SetAttrString(HeapTypeNameType,
+                               "__qualname__", spec_name) < 0) {
+        Py_DECREF(spec_name);
+        goto done;
+    }
+    tp_qualname = PyType_GetQualName((PyTypeObject *)HeapTypeNameType);
+    assert(strcmp(PyUnicode_AsUTF8(tp_qualname),
+                  "_testcapi.HeapTypeNameType") == 0);
+    Py_DECREF(spec_name);
+    Py_DECREF(tp_qualname);
+
+  done:
+    Py_DECREF(HeapTypeNameType);
+    Py_RETURN_NONE;
+}
+
+
 static PyObject *
 get_args(PyObject *self, PyObject *args)
 {
@@ -5667,6 +5707,7 @@ static PyMethodDef TestMethods[] = {
     {"get_args",                get_args,                        METH_VARARGS},
     {"test_get_statictype_slots", test_get_statictype_slots,     METH_NOARGS},
     {"test_get_type_name",        test_get_type_name,            METH_NOARGS},
+    {"test_get_type_qualname",   test_get_type_qualname,       METH_NOARGS},
     {"get_kwargs", (PyCFunction)(void(*)(void))get_kwargs,
       METH_VARARGS|METH_KEYWORDS},
     {"getargs_tuple",           getargs_tuple,                   METH_VARARGS},
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 1efb9fc5944b02..a38690aed5c818 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -3620,6 +3620,12 @@ PyType_GetName(PyTypeObject *type)
     return type_name(type, NULL);
 }
 
+PyObject *
+PyType_GetQualName(PyTypeObject *type)
+{
+    return type_qualname(type, NULL);
+}
+
 void *
 PyType_GetSlot(PyTypeObject *type, int slot)
 {
diff --git a/PC/python3dll.c b/PC/python3dll.c
index e0a78294a650e3..2420e53e7052d5 100755
--- a/PC/python3dll.c
+++ b/PC/python3dll.c
@@ -593,6 +593,7 @@ EXPORT_FUNC(PyType_GetFlags)
 EXPORT_FUNC(PyType_GetModule)
 EXPORT_FUNC(PyType_GetModuleState)
 EXPORT_FUNC(PyType_GetName)
+EXPORT_FUNC(PyType_GetQualName)
 EXPORT_FUNC(PyType_GetSlot)
 EXPORT_FUNC(PyType_IsSubtype)
 EXPORT_FUNC(PyType_Modified)


From webhook-mailer at python.org  Tue Aug 17 10:50:42 2021
From: webhook-mailer at python.org (encukou)
Date: Tue, 17 Aug 2021 14:50:42 -0000
Subject: [Python-checkins] bpo-42035: Enhance test_get_type_name() of
 _testcapi (GH-27649)
Message-ID: <mailman.1054.1629211843.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/fcd651d16fc5ac3d07dd3f57f1001a861a2e7d23
commit: fcd651d16fc5ac3d07dd3f57f1001a861a2e7d23
branch: main
author: Hai Shi <shihai1992 at gmail.com>
committer: encukou <encukou at gmail.com>
date: 2021-08-17T16:50:33+02:00
summary:

bpo-42035: Enhance test_get_type_name() of _testcapi (GH-27649)

files:
M Modules/_testcapimodule.c

diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 0a3c6e0b9b27c..e5f1ad312b41b 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -1154,6 +1154,20 @@ test_get_type_name(PyObject *self, PyObject *Py_UNUSED(ignored))
     assert(strcmp(PyUnicode_AsUTF8(tp_name), "HeapTypeNameType") == 0);
     Py_DECREF(tp_name);
 
+    PyObject *name = PyUnicode_FromString("test_name");
+    if (name == NULL) {
+        goto done;
+    }
+    if (PyObject_SetAttrString(HeapTypeNameType, "__name__", name) < 0) {
+        Py_DECREF(name);
+        goto done;
+    }
+    tp_name = PyType_GetName((PyTypeObject *)HeapTypeNameType);
+    assert(strcmp(PyUnicode_AsUTF8(tp_name), "test_name") == 0);
+    Py_DECREF(name);
+    Py_DECREF(tp_name);
+
+  done:
     Py_DECREF(HeapTypeNameType);
     Py_RETURN_NONE;
 }


From webhook-mailer at python.org  Tue Aug 17 10:56:04 2021
From: webhook-mailer at python.org (markshannon)
Date: Tue, 17 Aug 2021 14:56:04 -0000
Subject: [Python-checkins] bpo-44889: Specialize LOAD_METHOD with PEP 659
 adaptive interpreter (GH-27722)
Message-ID: <mailman.1055.1629212165.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/96346cb6d0593ef9ec122614347ccb053cd63433
commit: 96346cb6d0593ef9ec122614347ccb053cd63433
branch: main
author: Ken Jin <28750310+Fidget-Spinner at users.noreply.github.com>
committer: markshannon <mark at hotpy.org>
date: 2021-08-17T15:55:55+01:00
summary:

bpo-44889: Specialize LOAD_METHOD with PEP 659 adaptive interpreter (GH-27722)

Adds four new instructions:

* LOAD_METHOD_ADAPTIVE
* LOAD_METHOD_CACHED
* LOAD_METHOD_MODULE
* LOAD_METHOD_CLASS

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-11-20-45-02.bpo-44889.2T3nTn.rst
M Include/internal/pycore_code.h
M Include/opcode.h
M Lib/opcode.py
M Python/ceval.c
M Python/opcode_targets.h
M Python/specialize.c

diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
index 282089c08379e..6289acdd968a1 100644
--- a/Include/internal/pycore_code.h
+++ b/Include/internal/pycore_code.h
@@ -30,6 +30,11 @@ typedef struct {
     uint32_t builtin_keys_version;
 } _PyLoadGlobalCache;
 
+typedef struct {
+    /* Borrowed ref in LOAD_METHOD */
+    PyObject *obj;
+} _PyObjectCache;
+
 /* Add specialized versions of entries to this union.
  *
  * Do not break the invariant: sizeof(SpecializedCacheEntry) == 8
@@ -45,6 +50,7 @@ typedef union {
     _PyAdaptiveEntry adaptive;
     _PyAttrCache attr;
     _PyLoadGlobalCache load_global;
+    _PyObjectCache obj;
 } SpecializedCacheEntry;
 
 #define INSTRUCTIONS_PER_ENTRY (sizeof(SpecializedCacheEntry)/sizeof(_Py_CODEUNIT))
@@ -299,6 +305,7 @@ cache_backoff(_PyAdaptiveEntry *entry) {
 int _Py_Specialize_LoadAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name, SpecializedCacheEntry *cache);
 int _Py_Specialize_StoreAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name, SpecializedCacheEntry *cache);
 int _Py_Specialize_LoadGlobal(PyObject *globals, PyObject *builtins, _Py_CODEUNIT *instr, PyObject *name, SpecializedCacheEntry *cache);
+int _Py_Specialize_LoadMethod(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name, SpecializedCacheEntry *cache);
 int _Py_Specialize_BinarySubscr(PyObject *sub, PyObject *container, _Py_CODEUNIT *instr);
 
 #define PRINT_SPECIALIZATION_STATS 0
diff --git a/Include/opcode.h b/Include/opcode.h
index 3334242e7e4d4..6b0298224ae7b 100644
--- a/Include/opcode.h
+++ b/Include/opcode.h
@@ -149,15 +149,19 @@ extern "C" {
 #define LOAD_GLOBAL_ADAPTIVE     41
 #define LOAD_GLOBAL_MODULE       42
 #define LOAD_GLOBAL_BUILTIN      43
-#define STORE_ATTR_ADAPTIVE      44
-#define STORE_ATTR_SPLIT_KEYS    45
-#define STORE_ATTR_SLOT          46
-#define STORE_ATTR_WITH_HINT     47
-#define LOAD_FAST__LOAD_FAST     48
-#define STORE_FAST__LOAD_FAST    58
-#define LOAD_FAST__LOAD_CONST    80
-#define LOAD_CONST__LOAD_FAST    81
-#define STORE_FAST__STORE_FAST   87
+#define LOAD_METHOD_ADAPTIVE     44
+#define LOAD_METHOD_CACHED       45
+#define LOAD_METHOD_CLASS        46
+#define LOAD_METHOD_MODULE       47
+#define STORE_ATTR_ADAPTIVE      48
+#define STORE_ATTR_SPLIT_KEYS    58
+#define STORE_ATTR_SLOT          80
+#define STORE_ATTR_WITH_HINT     81
+#define LOAD_FAST__LOAD_FAST     87
+#define STORE_FAST__LOAD_FAST    88
+#define LOAD_FAST__LOAD_CONST   120
+#define LOAD_CONST__LOAD_FAST   122
+#define STORE_FAST__STORE_FAST  123
 #ifdef NEED_OPCODE_JUMP_TABLES
 static uint32_t _PyOpcode_RelativeJump[8] = {
     0U,
diff --git a/Lib/opcode.py b/Lib/opcode.py
index 53cdc4aa0d549..d3a7c8bf16f4f 100644
--- a/Lib/opcode.py
+++ b/Lib/opcode.py
@@ -233,6 +233,10 @@ def jabs_op(name, op):
     "LOAD_GLOBAL_ADAPTIVE",
     "LOAD_GLOBAL_MODULE",
     "LOAD_GLOBAL_BUILTIN",
+    "LOAD_METHOD_ADAPTIVE",
+    "LOAD_METHOD_CACHED",
+    "LOAD_METHOD_CLASS",
+    "LOAD_METHOD_MODULE",
     "STORE_ATTR_ADAPTIVE",
     "STORE_ATTR_SPLIT_KEYS",
     "STORE_ATTR_SLOT",
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-11-20-45-02.bpo-44889.2T3nTn.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-11-20-45-02.bpo-44889.2T3nTn.rst
new file mode 100644
index 0000000000000..a50b6851c14b7
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-11-20-45-02.bpo-44889.2T3nTn.rst	
@@ -0,0 +1,8 @@
+Initial implementation of adaptive specialization of ``LOAD_METHOD``. The
+following specialized forms were added:
+
+* ``LOAD_METHOD_CACHED``
+
+* ``LOAD_METHOD_MODULE``
+
+* ``LOAD_METHOD_CLASS``
diff --git a/Python/ceval.c b/Python/ceval.c
index 48787493fdd2c..333c54f50e2e3 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1439,6 +1439,27 @@ eval_frame_handle_pending(PyThreadState *tstate)
 #define BUILTINS() frame->f_builtins
 #define LOCALS() frame->f_locals
 
+/* Shared opcode macros */
+
+// shared by LOAD_ATTR_MODULE and LOAD_METHOD_MODULE
+#define LOAD_MODULE_ATTR_OR_METHOD(attr_or_method) \
+    SpecializedCacheEntry *caches = GET_CACHE(); \
+    _PyAdaptiveEntry *cache0 = &caches[0].adaptive; \
+    _PyAttrCache *cache1 = &caches[-1].attr; \
+    DEOPT_IF(!PyModule_CheckExact(owner), LOAD_##attr_or_method); \
+    PyDictObject *dict = (PyDictObject *)((PyModuleObject *)owner)->md_dict; \
+    assert(dict != NULL); \
+    DEOPT_IF(dict->ma_keys->dk_version != cache1->dk_version_or_hint, \
+        LOAD_##attr_or_method); \
+    assert(dict->ma_keys->dk_kind == DICT_KEYS_UNICODE); \
+    assert(cache0->index < dict->ma_keys->dk_nentries); \
+    PyDictKeyEntry *ep = DK_ENTRIES(dict->ma_keys) + cache0->index; \
+    res = ep->me_value; \
+    DEOPT_IF(res == NULL, LOAD_##attr_or_method); \
+    STAT_INC(LOAD_##attr_or_method, hit); \
+    record_cache_hit(cache0); \
+    Py_INCREF(res);
+
 static int
 trace_function_entry(PyThreadState *tstate, InterpreterFrame *frame)
 {
@@ -3511,23 +3532,10 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
 
         TARGET(LOAD_ATTR_MODULE): {
             assert(cframe.use_tracing == 0);
+            // shared with LOAD_METHOD_MODULE
             PyObject *owner = TOP();
             PyObject *res;
-            SpecializedCacheEntry *caches = GET_CACHE();
-            _PyAdaptiveEntry *cache0 = &caches[0].adaptive;
-            _PyAttrCache *cache1 = &caches[-1].attr;
-            DEOPT_IF(!PyModule_CheckExact(owner), LOAD_ATTR);
-            PyDictObject *dict = (PyDictObject *)((PyModuleObject *)owner)->md_dict;
-            assert(dict != NULL);
-            DEOPT_IF(dict->ma_keys->dk_version != cache1->dk_version_or_hint, LOAD_ATTR);
-            assert(dict->ma_keys->dk_kind == DICT_KEYS_UNICODE);
-            assert(cache0->index < dict->ma_keys->dk_nentries);
-            PyDictKeyEntry *ep = DK_ENTRIES(dict->ma_keys) + cache0->index;
-            res = ep->me_value;
-            DEOPT_IF(res == NULL, LOAD_ATTR);
-            STAT_INC(LOAD_ATTR, hit);
-            record_cache_hit(cache0);
-            Py_INCREF(res);
+            LOAD_MODULE_ATTR_OR_METHOD(ATTR);
             SET_TOP(res);
             Py_DECREF(owner);
             DISPATCH();
@@ -4282,6 +4290,8 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
         }
 
         TARGET(LOAD_METHOD): {
+            PREDICTED(LOAD_METHOD);
+            STAT_INC(LOAD_METHOD, unquickened);
             /* Designed to work in tandem with CALL_METHOD. */
             PyObject *name = GETITEM(names, oparg);
             PyObject *obj = TOP();
@@ -4318,6 +4328,107 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DISPATCH();
         }
 
+        TARGET(LOAD_METHOD_ADAPTIVE): {
+            assert(cframe.use_tracing == 0);
+            SpecializedCacheEntry *cache = GET_CACHE();
+            if (cache->adaptive.counter == 0) {
+                PyObject *owner = TOP();
+                PyObject *name = GETITEM(names, cache->adaptive.original_oparg);
+                next_instr--;
+                if (_Py_Specialize_LoadMethod(owner, next_instr, name, cache) < 0) {
+                    goto error;
+                }
+                DISPATCH();
+            }
+            else {
+                STAT_INC(LOAD_METHOD, deferred);
+                cache->adaptive.counter--;
+                oparg = cache->adaptive.original_oparg;
+                STAT_DEC(LOAD_METHOD, unquickened);
+                JUMP_TO_INSTRUCTION(LOAD_METHOD);
+            }            
+        }
+
+        TARGET(LOAD_METHOD_CACHED): {
+            /* LOAD_METHOD, with cached method object */
+            assert(cframe.use_tracing == 0);
+            PyObject *self = TOP();
+            PyTypeObject *self_cls = Py_TYPE(self);
+            SpecializedCacheEntry *caches = GET_CACHE();
+            _PyAdaptiveEntry *cache0 = &caches[0].adaptive;
+            _PyAttrCache *cache1 = &caches[-1].attr;
+            _PyObjectCache *cache2 = &caches[-2].obj;
+
+            DEOPT_IF(self_cls->tp_version_tag != cache1->tp_version, LOAD_METHOD);
+            assert(cache1->dk_version_or_hint != 0);
+            assert(cache1->tp_version != 0);
+            assert(self_cls->tp_dictoffset >= 0);
+            assert(Py_TYPE(self_cls)->tp_dictoffset > 0);
+            
+            // inline version of _PyObject_GetDictPtr for offset >= 0
+            PyObject *dict = self_cls->tp_dictoffset != 0 ?
+                *(PyObject **) ((char *)self + self_cls->tp_dictoffset) : NULL;
+
+            // Ensure self.__dict__ didn't modify keys.
+            // Don't care if self has no dict, it could be builtin or __slots__.
+            DEOPT_IF(dict != NULL &&
+                ((PyDictObject *)dict)->ma_keys->dk_version !=
+                cache1->dk_version_or_hint, LOAD_METHOD);
+
+            STAT_INC(LOAD_METHOD, hit);
+            record_cache_hit(cache0);
+            PyObject *res = cache2->obj;
+            assert(res != NULL);
+            assert(_PyType_HasFeature(Py_TYPE(res), Py_TPFLAGS_METHOD_DESCRIPTOR));
+            Py_INCREF(res);
+            SET_TOP(res);
+            PUSH(self);
+            DISPATCH();
+        }
+
+        TARGET(LOAD_METHOD_MODULE): {
+            assert(cframe.use_tracing == 0);
+            PyObject *owner = TOP();
+            PyObject *res;
+            LOAD_MODULE_ATTR_OR_METHOD(METHOD);
+            SET_TOP(NULL);
+            Py_DECREF(owner);
+            PUSH(res);
+            DISPATCH();
+        }
+
+        TARGET(LOAD_METHOD_CLASS): {
+            /* LOAD_METHOD, for class methods */
+            assert(cframe.use_tracing == 0);
+            SpecializedCacheEntry *caches = GET_CACHE();
+            _PyAdaptiveEntry *cache0 = &caches[0].adaptive;
+            _PyAttrCache *cache1 = &caches[-1].attr;
+            _PyObjectCache *cache2 = &caches[-2].obj;
+
+            PyObject *cls = TOP();
+            PyTypeObject *cls_type = Py_TYPE(cls);
+            assert(cls_type->tp_dictoffset > 0);
+            PyObject *dict = *(PyObject **) ((char *)cls + cls_type->tp_dictoffset);
+            // Don't care if no dict -- tp_version_tag should catch anything wrong.
+            DEOPT_IF(dict != NULL && ((PyDictObject *)dict)->ma_keys->dk_version !=
+                cache1->dk_version_or_hint, LOAD_METHOD);
+            DEOPT_IF(((PyTypeObject *)cls)->tp_version_tag != cache1->tp_version,
+                LOAD_METHOD);
+            assert(cache1->dk_version_or_hint != 0);
+            assert(cache1->tp_version != 0);
+
+            STAT_INC(LOAD_METHOD, hit);
+            record_cache_hit(cache0);
+            PyObject *res = cache2->obj;
+            assert(res != NULL);
+            assert(_PyType_HasFeature(Py_TYPE(res), Py_TPFLAGS_METHOD_DESCRIPTOR));
+            Py_INCREF(res);
+            SET_TOP(NULL);
+            Py_DECREF(cls);
+            PUSH(res);
+            DISPATCH();
+        }
+
         TARGET(CALL_METHOD): {
             /* Designed to work in tamdem with LOAD_METHOD. */
             PyObject **sp, *res;
@@ -4648,6 +4759,7 @@ opname ## _miss: \
 MISS_WITH_CACHE(LOAD_ATTR)
 MISS_WITH_CACHE(STORE_ATTR)
 MISS_WITH_CACHE(LOAD_GLOBAL)
+MISS_WITH_CACHE(LOAD_METHOD)
 MISS_WITH_OPARG_COUNTER(BINARY_SUBSCR)
 
 binary_subscr_dict_error:
diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h
index c8036a63f2201..f97eaf808156f 100644
--- a/Python/opcode_targets.h
+++ b/Python/opcode_targets.h
@@ -43,11 +43,11 @@ static void *opcode_targets[256] = {
     &&TARGET_LOAD_GLOBAL_ADAPTIVE,
     &&TARGET_LOAD_GLOBAL_MODULE,
     &&TARGET_LOAD_GLOBAL_BUILTIN,
+    &&TARGET_LOAD_METHOD_ADAPTIVE,
+    &&TARGET_LOAD_METHOD_CACHED,
+    &&TARGET_LOAD_METHOD_CLASS,
+    &&TARGET_LOAD_METHOD_MODULE,
     &&TARGET_STORE_ATTR_ADAPTIVE,
-    &&TARGET_STORE_ATTR_SPLIT_KEYS,
-    &&TARGET_STORE_ATTR_SLOT,
-    &&TARGET_STORE_ATTR_WITH_HINT,
-    &&TARGET_LOAD_FAST__LOAD_FAST,
     &&TARGET_WITH_EXCEPT_START,
     &&TARGET_GET_AITER,
     &&TARGET_GET_ANEXT,
@@ -57,7 +57,7 @@ static void *opcode_targets[256] = {
     &&TARGET_INPLACE_ADD,
     &&TARGET_INPLACE_SUBTRACT,
     &&TARGET_INPLACE_MULTIPLY,
-    &&TARGET_STORE_FAST__LOAD_FAST,
+    &&TARGET_STORE_ATTR_SPLIT_KEYS,
     &&TARGET_INPLACE_MODULO,
     &&TARGET_STORE_SUBSCR,
     &&TARGET_DELETE_SUBSCR,
@@ -79,15 +79,15 @@ static void *opcode_targets[256] = {
     &&TARGET_INPLACE_AND,
     &&TARGET_INPLACE_XOR,
     &&TARGET_INPLACE_OR,
-    &&TARGET_LOAD_FAST__LOAD_CONST,
-    &&TARGET_LOAD_CONST__LOAD_FAST,
+    &&TARGET_STORE_ATTR_SLOT,
+    &&TARGET_STORE_ATTR_WITH_HINT,
     &&TARGET_LIST_TO_TUPLE,
     &&TARGET_RETURN_VALUE,
     &&TARGET_IMPORT_STAR,
     &&TARGET_SETUP_ANNOTATIONS,
     &&TARGET_YIELD_VALUE,
-    &&TARGET_STORE_FAST__STORE_FAST,
-    &&_unknown_opcode,
+    &&TARGET_LOAD_FAST__LOAD_FAST,
+    &&TARGET_STORE_FAST__LOAD_FAST,
     &&TARGET_POP_EXCEPT,
     &&TARGET_STORE_NAME,
     &&TARGET_DELETE_NAME,
@@ -119,10 +119,10 @@ static void *opcode_targets[256] = {
     &&TARGET_IS_OP,
     &&TARGET_CONTAINS_OP,
     &&TARGET_RERAISE,
-    &&_unknown_opcode,
+    &&TARGET_LOAD_FAST__LOAD_CONST,
     &&TARGET_JUMP_IF_NOT_EXC_MATCH,
-    &&_unknown_opcode,
-    &&_unknown_opcode,
+    &&TARGET_LOAD_CONST__LOAD_FAST,
+    &&TARGET_STORE_FAST__STORE_FAST,
     &&TARGET_LOAD_FAST,
     &&TARGET_STORE_FAST,
     &&TARGET_DELETE_FAST,
diff --git a/Python/specialize.c b/Python/specialize.c
index ecab69bcae78e..359bec5719363 100644
--- a/Python/specialize.c
+++ b/Python/specialize.c
@@ -121,6 +121,7 @@ _Py_GetSpecializationStats(void) {
     int err = 0;
     err += add_stat_dict(stats, LOAD_ATTR, "load_attr");
     err += add_stat_dict(stats, LOAD_GLOBAL, "load_global");
+    err += add_stat_dict(stats, LOAD_GLOBAL, "load_method");
     err += add_stat_dict(stats, BINARY_SUBSCR, "binary_subscr");
     err += add_stat_dict(stats, STORE_ATTR, "store_attr");
     if (err < 0) {
@@ -175,6 +176,7 @@ _Py_PrintSpecializationStats(void)
 #endif
     print_stats(out, &_specialization_stats[LOAD_ATTR], "load_attr");
     print_stats(out, &_specialization_stats[LOAD_GLOBAL], "load_global");
+    print_stats(out, &_specialization_stats[LOAD_METHOD], "load_method");
     print_stats(out, &_specialization_stats[BINARY_SUBSCR], "binary_subscr");
     print_stats(out, &_specialization_stats[STORE_ATTR], "store_attr");
     if (out != stderr) {
@@ -223,6 +225,7 @@ get_cache_count(SpecializedCacheOrInstruction *quickened) {
 static uint8_t adaptive_opcodes[256] = {
     [LOAD_ATTR] = LOAD_ATTR_ADAPTIVE,
     [LOAD_GLOBAL] = LOAD_GLOBAL_ADAPTIVE,
+    [LOAD_METHOD] = LOAD_METHOD_ADAPTIVE,
     [BINARY_SUBSCR] = BINARY_SUBSCR_ADAPTIVE,
     [STORE_ATTR] = STORE_ATTR_ADAPTIVE,
 };
@@ -231,6 +234,7 @@ static uint8_t adaptive_opcodes[256] = {
 static uint8_t cache_requirements[256] = {
     [LOAD_ATTR] = 2, /* _PyAdaptiveEntry and _PyAttrCache */
     [LOAD_GLOBAL] = 2, /* _PyAdaptiveEntry and _PyLoadGlobalCache */
+    [LOAD_METHOD] = 3, /* _PyAdaptiveEntry, _PyAttrCache and _PyObjectCache */
     [BINARY_SUBSCR] = 0,
     [STORE_ATTR] = 2, /* _PyAdaptiveEntry and _PyAttrCache */
 };
@@ -417,6 +421,15 @@ _Py_Quicken(PyCodeObject *code) {
 #define SPEC_FAIL_READ_ONLY 15
 #define SPEC_FAIL_AUDITED_SLOT 16
 
+/* Methods */
+
+#define SPEC_FAIL_NEGATIVE_DICTOFFSET 14
+#define SPEC_FAIL_IS_ATTR 15
+#define SPEC_FAIL_DICT_SUBCLASS 16
+#define SPEC_FAIL_BUILTIN_CLASS_METHOD 17
+#define SPEC_FAIL_CLASS_METHOD_OBJ 18
+#define SPEC_FAIL_NOT_METHOD 19
+
 /* Binary subscr */
 
 #define SPEC_FAIL_LIST_NON_INT_SUBSCRIPT 8
@@ -427,7 +440,8 @@ _Py_Quicken(PyCodeObject *code) {
 static int
 specialize_module_load_attr(
     PyObject *owner, _Py_CODEUNIT *instr, PyObject *name,
-    _PyAdaptiveEntry *cache0, _PyAttrCache *cache1)
+    _PyAdaptiveEntry *cache0, _PyAttrCache *cache1, int opcode,
+    int opcode_module)
 {
     PyModuleObject *m = (PyModuleObject *)owner;
     PyObject *value = NULL;
@@ -435,39 +449,39 @@ specialize_module_load_attr(
     _Py_IDENTIFIER(__getattr__);
     PyDictObject *dict = (PyDictObject *)m->md_dict;
     if (dict == NULL) {
-        SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_NO_DICT);
+        SPECIALIZATION_FAIL(opcode, SPEC_FAIL_NO_DICT);
         return -1;
     }
     if (dict->ma_keys->dk_kind != DICT_KEYS_UNICODE) {
-        SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_NON_STRING_OR_SPLIT);
+        SPECIALIZATION_FAIL(opcode, SPEC_FAIL_NON_STRING_OR_SPLIT);
         return -1;
     }
     getattr = _PyUnicode_FromId(&PyId___getattr__); /* borrowed */
     if (getattr == NULL) {
-        SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_OVERRIDDEN);
+        SPECIALIZATION_FAIL(opcode, SPEC_FAIL_OVERRIDDEN);
         PyErr_Clear();
         return -1;
     }
     Py_ssize_t index = _PyDict_GetItemHint(dict, getattr, -1,  &value);
     assert(index != DKIX_ERROR);
     if (index != DKIX_EMPTY) {
-        SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_MODULE_ATTR_NOT_FOUND);
+        SPECIALIZATION_FAIL(opcode, SPEC_FAIL_MODULE_ATTR_NOT_FOUND);
         return -1;
     }
     index = _PyDict_GetItemHint(dict, name, -1, &value);
     assert (index != DKIX_ERROR);
     if (index != (uint16_t)index) {
-        SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_OUT_OF_RANGE);
+        SPECIALIZATION_FAIL(opcode, SPEC_FAIL_OUT_OF_RANGE);
         return -1;
     }
     uint32_t keys_version = _PyDictKeys_GetVersionForCurrentState(dict);
     if (keys_version == 0) {
-        SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_OUT_OF_VERSIONS);
+        SPECIALIZATION_FAIL(opcode, SPEC_FAIL_OUT_OF_VERSIONS);
         return -1;
     }
     cache1->dk_version_or_hint = keys_version;
     cache0->index = (uint16_t)index;
-    *instr = _Py_MAKECODEUNIT(LOAD_ATTR_MODULE, _Py_OPARG(*instr));
+    *instr = _Py_MAKECODEUNIT(opcode_module, _Py_OPARG(*instr));
     return 0;
 }
 
@@ -482,6 +496,8 @@ typedef enum {
     OBJECT_SLOT, /* Is an object slot descriptor */
     OTHER_SLOT, /* Is a slot descriptor of another type */
     NON_OVERRIDING, /* Is another non-overriding descriptor, and is an instance of an immutable class*/
+    BUILTIN_CLASSMETHOD, /* Builtin methods with METH_CLASS */
+    PYTHON_CLASSMETHOD, /* Python classmethod(func) object */
     NON_DESCRIPTOR, /* Is not a descriptor, and is an instance of an immutable class */
     MUTABLE,   /* Instance of a mutable class; might, or might not, be a descriptor */
     ABSENT, /* Attribute is not present on the class */
@@ -537,6 +553,12 @@ analyze_descriptor(PyTypeObject *type, PyObject *name, PyObject **descr, int sto
         if (desc_cls->tp_flags & Py_TPFLAGS_METHOD_DESCRIPTOR) {
             return METHOD;
         }
+        if (Py_IS_TYPE(descriptor, &PyClassMethodDescr_Type)) {
+            return BUILTIN_CLASSMETHOD;
+        }
+        if (Py_IS_TYPE(descriptor, &PyClassMethod_Type)) {
+            return PYTHON_CLASSMETHOD;
+        }
         return NON_OVERRIDING;
     }
     return NON_DESCRIPTOR;
@@ -549,7 +571,8 @@ specialize_dict_access(
     _PyAdaptiveEntry *cache0, _PyAttrCache *cache1,
     int base_op, int split_op, int hint_op)
 {
-    assert(kind == NON_OVERRIDING || kind == NON_DESCRIPTOR || kind == ABSENT);
+    assert(kind == NON_OVERRIDING || kind == NON_DESCRIPTOR || kind == ABSENT ||
+        kind == BUILTIN_CLASSMETHOD || kind == PYTHON_CLASSMETHOD);
     // No desciptor, or non overriding.
     if (type->tp_dictoffset < 0) {
         SPECIALIZATION_FAIL(base_op, SPEC_FAIL_OUT_OF_RANGE);
@@ -608,6 +631,8 @@ specialize_dict_access(
     /* No attribute in instance dictionary */
     switch(kind) {
         case NON_OVERRIDING:
+        case BUILTIN_CLASSMETHOD:
+        case PYTHON_CLASSMETHOD:
             SPECIALIZATION_FAIL(base_op, SPEC_FAIL_NON_OVERRIDING_DESCRIPTOR);
             return 0;
         case NON_DESCRIPTOR:
@@ -628,7 +653,8 @@ _Py_Specialize_LoadAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name, Sp
     _PyAdaptiveEntry *cache0 = &cache->adaptive;
     _PyAttrCache *cache1 = &cache[-1].attr;
     if (PyModule_CheckExact(owner)) {
-        int err = specialize_module_load_attr(owner, instr, name, cache0, cache1);
+        int err = specialize_module_load_attr(owner, instr, name, cache0, cache1,
+            LOAD_ATTR, LOAD_ATTR_MODULE);
         if (err) {
             goto fail;
         }
@@ -690,6 +716,8 @@ _Py_Specialize_LoadAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name, Sp
         case GETSET_OVERRIDDEN:
             SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_OVERRIDDEN);
             goto fail;
+        case BUILTIN_CLASSMETHOD:
+        case PYTHON_CLASSMETHOD:
         case NON_OVERRIDING:
         case NON_DESCRIPTOR:
         case ABSENT:
@@ -769,6 +797,8 @@ _Py_Specialize_StoreAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name, S
         case GETSET_OVERRIDDEN:
             SPECIALIZATION_FAIL(STORE_ATTR, SPEC_FAIL_OVERRIDDEN);
             goto fail;
+        case BUILTIN_CLASSMETHOD:
+        case PYTHON_CLASSMETHOD:
         case NON_OVERRIDING:
         case NON_DESCRIPTOR:
         case ABSENT:
@@ -798,6 +828,146 @@ _Py_Specialize_StoreAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name, S
 }
 
 
+// Please collect stats carefully before and after modifying. A subtle change
+// can cause a significant drop in cache hits. A possible test is
+// python.exe -m test_typing test_re test_dis test_zlib.
+int
+_Py_Specialize_LoadMethod(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name, SpecializedCacheEntry *cache)
+{
+    _PyAdaptiveEntry *cache0 = &cache->adaptive;
+    _PyAttrCache *cache1 = &cache[-1].attr;
+    _PyObjectCache *cache2 = &cache[-2].obj;
+
+    PyTypeObject *owner_cls = Py_TYPE(owner);
+    PyDictObject *owner_dict = NULL;
+    if (PyModule_CheckExact(owner)) {
+        int err = specialize_module_load_attr(owner, instr, name, cache0, cache1,
+            LOAD_METHOD, LOAD_METHOD_MODULE);
+        if (err) {
+            goto fail;
+        }
+        goto success;
+    }
+    if (owner_cls->tp_dict == NULL) {
+        if (PyType_Ready(owner_cls) < 0) {
+            return -1;
+        }
+    }
+    if (Py_TYPE(owner_cls)->tp_dictoffset < 0) {
+        SPECIALIZATION_FAIL(LOAD_METHOD, SPEC_FAIL_OUT_OF_RANGE);
+        goto fail;
+    }
+    // Technically this is fine for bound method calls, but it's uncommon and
+    // slightly slower at runtime to get dict.
+    if (owner_cls->tp_dictoffset < 0) {
+        SPECIALIZATION_FAIL(LOAD_METHOD, SPEC_FAIL_NEGATIVE_DICTOFFSET);
+        goto fail;
+    }
+    PyObject **owner_dictptr = _PyObject_GetDictPtr(owner);
+    int owner_has_dict = (owner_dictptr != NULL && *owner_dictptr != NULL);
+    owner_dict = owner_has_dict ? (PyDictObject *)*owner_dictptr : NULL;
+    // Make sure dict doesn't get GC-ed halfway.
+    Py_XINCREF(owner_dict);
+    // Check for classmethods.
+    int owner_is_class = PyType_Check(owner);
+    owner_cls = owner_is_class ? (PyTypeObject *)owner : owner_cls;
+
+    if ((owner_cls->tp_flags & Py_TPFLAGS_VALID_VERSION_TAG) == 0 ||
+        owner_cls->tp_version_tag == 0) {
+        SPECIALIZATION_FAIL(LOAD_METHOD, SPEC_FAIL_OUT_OF_VERSIONS);
+        goto fail;
+    }
+
+    PyObject *descr = NULL;
+    DesciptorClassification kind = 0;
+    kind = analyze_descriptor(owner_cls, name, &descr, 0);
+    // Store the version right away, in case it's modified halfway through.
+    cache1->tp_version = owner_cls->tp_version_tag;
+
+    assert(descr != NULL || kind == ABSENT || kind == GETSET_OVERRIDDEN);
+    switch (kind) {
+        case METHOD:
+            break;
+        case BUILTIN_CLASSMETHOD:
+            SPECIALIZATION_FAIL(LOAD_METHOD, SPEC_FAIL_BUILTIN_CLASS_METHOD);
+            goto fail;
+        case PYTHON_CLASSMETHOD:
+            SPECIALIZATION_FAIL(LOAD_METHOD, SPEC_FAIL_CLASS_METHOD_OBJ);
+            goto fail;
+        default:
+            SPECIALIZATION_FAIL(LOAD_METHOD, SPEC_FAIL_NOT_METHOD);
+            goto fail;
+    }
+    
+    assert(kind == METHOD);
+    // If o.__dict__ changes, the method might be found in o.__dict__
+    // instead of old type lookup. So record o.__dict__'s keys.
+    uint32_t keys_version = UINT32_MAX;
+    if (owner_has_dict) {
+        // _PyDictKeys_GetVersionForCurrentState isn't accurate for
+        // custom dict subclasses at the moment.
+        if (!PyDict_CheckExact(owner_dict)) {
+            SPECIALIZATION_FAIL(LOAD_METHOD, SPEC_FAIL_DICT_SUBCLASS);
+            goto fail;
+        }
+        assert(PyUnicode_CheckExact(name));
+        Py_hash_t hash = PyObject_Hash(name);
+        if (hash == -1) {
+            return -1;
+        }
+        PyObject *value = NULL;
+        if (!owner_is_class) {
+            // Instance methods shouldn't be in o.__dict__. That makes
+            // it an attribute.
+            Py_ssize_t ix = _Py_dict_lookup(owner_dict, name, hash, &value);
+            assert(ix != DKIX_ERROR);
+            if (ix != DKIX_EMPTY) {
+                SPECIALIZATION_FAIL(LOAD_METHOD, SPEC_FAIL_IS_ATTR);
+                goto fail;
+            }
+        }
+        keys_version = _PyDictKeys_GetVersionForCurrentState(owner_dict);
+        if (keys_version == 0) {
+            SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_OUT_OF_VERSIONS);
+            goto fail;
+        }
+        // Fall through.
+    } // Else owner is maybe a builtin with no dict, or __slots__. Doesn't matter.
+        
+    /* `descr` is borrowed. Just check tp_version_tag before accessing in case
+    *  it's deleted.  This is safe for methods (even inherited ones from super
+    *  classes!) as long as tp_version_tag is validated for two main reasons:
+    * 
+    *  1. The class will always hold a reference to the method so it will
+    *  usually not be GC-ed. Should it be deleted in Python, e.g.
+    *  `del obj.meth`, tp_version_tag will be invalidated, because of reason 2.
+    * 
+    *  2. The pre-existing type method cache (MCACHE) uses the same principles
+    *  of caching a borrowed descriptor. It does all the heavy lifting for us.
+    *  E.g. it invalidates on any MRO modification, on any type object
+    *  change along said MRO, etc. (see PyType_Modified usages in typeobject.c).
+    *  The type method cache has been working since Python 2.6 and it's
+    *  battle-tested.
+    */
+    cache2->obj = descr;
+    cache1->dk_version_or_hint = keys_version;
+    *instr = _Py_MAKECODEUNIT(owner_is_class ? LOAD_METHOD_CLASS :
+        LOAD_METHOD_CACHED, _Py_OPARG(*instr));
+    // Fall through.
+success:
+    Py_XDECREF(owner_dict);
+    STAT_INC(LOAD_METHOD, specialization_success);
+    assert(!PyErr_Occurred());
+    cache0->counter = saturating_start();
+    return 0;
+fail:
+    Py_XDECREF(owner_dict);
+    STAT_INC(LOAD_METHOD, specialization_failure);
+    assert(!PyErr_Occurred());
+    cache_backoff(cache0);
+    return 0;
+
+}
 int
 _Py_Specialize_LoadGlobal(
     PyObject *globals, PyObject *builtins,


From webhook-mailer at python.org  Tue Aug 17 11:53:04 2021
From: webhook-mailer at python.org (corona10)
Date: Tue, 17 Aug 2021 15:53:04 -0000
Subject: [Python-checkins] bpo-44895: Introduce PYTHONDUMPREFSFILE variable
 for refcount dumping (GH-27767)
Message-ID: <mailman.1056.1629215585.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/c2c857b40f226575d64e0d56a759cbd799f51e62
commit: c2c857b40f226575d64e0d56a759cbd799f51e62
branch: main
author: Dong-hee Na <donghee.na92 at gmail.com>
committer: corona10 <donghee.na92 at gmail.com>
date: 2021-08-18T00:52:50+09:00
summary:

bpo-44895: Introduce PYTHONDUMPREFSFILE variable for refcount dumping (GH-27767)

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-14-20-13-21.bpo-44895.Ic9m90.rst
M Doc/using/cmdline.rst
M Include/cpython/initconfig.h
M Python/initconfig.c
M Python/pylifecycle.c

diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 9e391604a1a59d..7ebc34f47fc39b 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -975,3 +975,12 @@ Debug-mode variables
    shutting down the interpreter.
 
    Need Python configured with the :option:`--with-trace-refs` build option.
+
+.. envvar:: PYTHONDUMPREFSFILE=FILENAME
+
+   If set, Python will dump objects and reference counts still alive
+   after shutting down the interpreter into a file called *FILENAME*.
+
+   Need Python configured with the :option:`--with-trace-refs` build option.
+
+   .. versionadded:: 3.11
diff --git a/Include/cpython/initconfig.h b/Include/cpython/initconfig.h
index 5f03b8c57f8bc8..22ad0f14e58004 100644
--- a/Include/cpython/initconfig.h
+++ b/Include/cpython/initconfig.h
@@ -143,6 +143,7 @@ typedef struct PyConfig {
     int no_debug_ranges;
     int show_ref_count;
     int dump_refs;
+    wchar_t *dump_refs_file;
     int malloc_stats;
     wchar_t *filesystem_encoding;
     wchar_t *filesystem_errors;
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-14-20-13-21.bpo-44895.Ic9m90.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-14-20-13-21.bpo-44895.Ic9m90.rst
new file mode 100644
index 00000000000000..d369ac76505974
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-14-20-13-21.bpo-44895.Ic9m90.rst	
@@ -0,0 +1,2 @@
+A debug variable :envvar:`PYTHONDUMPREFSFILE` is added for creating a dump file
+which is generated by :option:`--with-trace-refs`. Patch by Dong-hee Na.
diff --git a/Python/initconfig.c b/Python/initconfig.c
index d328f227cead25..61cd0e6213ed17 100644
--- a/Python/initconfig.c
+++ b/Python/initconfig.c
@@ -898,6 +898,7 @@ _PyConfig_Copy(PyConfig *config, const PyConfig *config2)
     COPY_ATTR(no_debug_ranges);
     COPY_ATTR(show_ref_count);
     COPY_ATTR(dump_refs);
+    COPY_ATTR(dump_refs_file);
     COPY_ATTR(malloc_stats);
 
     COPY_WSTR_ATTR(pycache_prefix);
@@ -1701,6 +1702,14 @@ config_read_env_vars(PyConfig *config)
         config->malloc_stats = 1;
     }
 
+    if (config->dump_refs_file == NULL) {
+        status = CONFIG_GET_ENV_DUP(config, &config->dump_refs_file,
+                                    L"PYTHONDUMPREFSFILE", "PYTHONDUMPREFSFILE");
+        if (_PyStatus_EXCEPTION(status)) {
+            return status;
+        }
+    }
+
     if (config->pythonpath_env == NULL) {
         status = CONFIG_GET_ENV_DUP(config, &config->pythonpath_env,
                                     L"PYTHONPATH", "PYTHONPATH");
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index eeaf20b4617a20..f3b6b0ac68a1ea 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -1737,6 +1737,7 @@ Py_FinalizeEx(void)
 #endif
 #ifdef Py_TRACE_REFS
     int dump_refs = tstate->interp->config.dump_refs;
+    wchar_t *dump_refs_file = tstate->interp->config.dump_refs_file;
 #endif
 #ifdef WITH_PYMALLOC
     int malloc_stats = tstate->interp->config.malloc_stats;
@@ -1835,9 +1836,22 @@ Py_FinalizeEx(void)
      * Alas, a lot of stuff may still be alive now that will be cleaned
      * up later.
      */
+
+    FILE *dump_refs_fp = NULL;
+    if (dump_refs_file != NULL) {
+        dump_refs_fp = _Py_wfopen(dump_refs_file, L"w");
+        if (dump_refs_fp == NULL) {
+            fprintf(stderr, "PYTHONDUMPREFSFILE: cannot create file: %ls\n", dump_refs_file);
+        }
+    }
+
     if (dump_refs) {
         _Py_PrintReferences(stderr);
     }
+
+    if (dump_refs_fp != NULL) {
+        _Py_PrintReferences(dump_refs_fp);
+    }
 #endif /* Py_TRACE_REFS */
 
     finalize_interp_clear(tstate);
@@ -1848,9 +1862,15 @@ Py_FinalizeEx(void)
      * An address can be used to find the repr of the object, printed
      * above by _Py_PrintReferences.
      */
+
     if (dump_refs) {
         _Py_PrintReferenceAddresses(stderr);
     }
+
+    if (dump_refs_fp != NULL) {
+        _Py_PrintReferenceAddresses(dump_refs_fp);
+        fclose(dump_refs_fp);
+    }
 #endif /* Py_TRACE_REFS */
 #ifdef WITH_PYMALLOC
     if (malloc_stats) {


From webhook-mailer at python.org  Tue Aug 17 12:51:38 2021
From: webhook-mailer at python.org (mdickinson)
Date: Tue, 17 Aug 2021 16:51:38 -0000
Subject: [Python-checkins] bpo-44698: Restore complex pow behaviour for
 small integral exponents (GH-27772)
Message-ID: <mailman.1057.1629219099.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/4b9a2dcf19e5d13c3bc2afea2de1f65cd994c699
commit: 4b9a2dcf19e5d13c3bc2afea2de1f65cd994c699
branch: main
author: Mark Dickinson <mdickinson at enthought.com>
committer: mdickinson <dickinsm at gmail.com>
date: 2021-08-17T17:51:28+01:00
summary:

bpo-44698: Restore complex pow behaviour for small integral exponents (GH-27772)

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-15-10-39-06.bpo-44698.lITKNc.rst
M Lib/test/test_complex.py
M Objects/complexobject.c

diff --git a/Lib/test/test_complex.py b/Lib/test/test_complex.py
index badb234bb303b..abd7e39cc5ae7 100644
--- a/Lib/test/test_complex.py
+++ b/Lib/test/test_complex.py
@@ -269,6 +269,34 @@ def test_pow(self):
                     except OverflowError:
                         pass
 
+    def test_pow_with_small_integer_exponents(self):
+        # Check that small integer exponents are handled identically
+        # regardless of their type.
+        values = [
+            complex(5.0, 12.0),
+            complex(5.0e100, 12.0e100),
+            complex(-4.0, INF),
+            complex(INF, 0.0),
+        ]
+        exponents = [-19, -5, -3, -2, -1, 0, 1, 2, 3, 5, 19]
+        for value in values:
+            for exponent in exponents:
+                with self.subTest(value=value, exponent=exponent):
+                    try:
+                        int_pow = value**exponent
+                    except OverflowError:
+                        int_pow = "overflow"
+                    try:
+                        float_pow = value**float(exponent)
+                    except OverflowError:
+                        float_pow = "overflow"
+                    try:
+                        complex_pow = value**complex(exponent)
+                    except OverflowError:
+                        complex_pow = "overflow"
+                    self.assertEqual(str(float_pow), str(int_pow))
+                    self.assertEqual(str(complex_pow), str(int_pow))
+
     def test_boolcontext(self):
         for i in range(100):
             self.assertTrue(complex(random() + 1e-6, random() + 1e-6))
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-15-10-39-06.bpo-44698.lITKNc.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-15-10-39-06.bpo-44698.lITKNc.rst
new file mode 100644
index 0000000000000..f197253e10ec6
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-15-10-39-06.bpo-44698.lITKNc.rst	
@@ -0,0 +1,2 @@
+Restore behaviour of complex exponentiation with integer-valued exponent of
+type :class:`float` or :class:`complex`.
diff --git a/Objects/complexobject.c b/Objects/complexobject.c
index 05cae32f528c4..3e479497cfcc3 100644
--- a/Objects/complexobject.c
+++ b/Objects/complexobject.c
@@ -172,14 +172,7 @@ c_powu(Py_complex x, long n)
 static Py_complex
 c_powi(Py_complex x, long n)
 {
-    Py_complex cn;
-
-    if (n > 100 || n < -100) {
-        cn.real = (double) n;
-        cn.imag = 0.;
-        return _Py_c_pow(x,cn);
-    }
-    else if (n > 0)
+    if (n > 0)
         return c_powu(x,n);
     else
         return _Py_c_quot(c_1, c_powu(x,-n));
@@ -523,19 +516,12 @@ complex_pow(PyObject *v, PyObject *w, PyObject *z)
         return NULL;
     }
     errno = 0;
-    // Check if w is an integer value that fits inside a C long, so we can
-    // use a faster algorithm. TO_COMPLEX(w, b), above, already handled the
-    // conversion from larger longs, as well as other types.
-    if (PyLong_Check(w)) {
-        int overflow = 0;
-        long int_exponent = PyLong_AsLongAndOverflow(w, &overflow);
-        if (int_exponent == -1 && PyErr_Occurred())
-            return NULL;
-        if (overflow == 0)
-            p = c_powi(a, int_exponent);
-        else
-            p = _Py_c_pow(a, b);
-    } else {
+    // Check whether the exponent has a small integer value, and if so use
+    // a faster and more accurate algorithm.
+    if (b.imag == 0.0 && b.real == floor(b.real) && fabs(b.real) <= 100.0) {
+        p = c_powi(a, (long)b.real);
+    }
+    else {
         p = _Py_c_pow(a, b);
     }
 


From webhook-mailer at python.org  Tue Aug 17 13:38:13 2021
From: webhook-mailer at python.org (mdickinson)
Date: Tue, 17 Aug 2021 17:38:13 -0000
Subject: [Python-checkins] bpo-44698: Restore complex pow behaviour for
 small integral exponents (GH-27772) (GH-27796)
Message-ID: <mailman.1058.1629221894.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/3f81e9628f6f104c103d0e38adb84c51e5261626
commit: 3f81e9628f6f104c103d0e38adb84c51e5261626
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: mdickinson <dickinsm at gmail.com>
date: 2021-08-17T18:38:03+01:00
summary:

bpo-44698: Restore complex pow behaviour for small integral exponents (GH-27772) (GH-27796)

(cherry picked from commit 4b9a2dcf19e5d13c3bc2afea2de1f65cd994c699)

Co-authored-by: Mark Dickinson <mdickinson at enthought.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-15-10-39-06.bpo-44698.lITKNc.rst
M Lib/test/test_complex.py
M Objects/complexobject.c

diff --git a/Lib/test/test_complex.py b/Lib/test/test_complex.py
index badb234bb303b..abd7e39cc5ae7 100644
--- a/Lib/test/test_complex.py
+++ b/Lib/test/test_complex.py
@@ -269,6 +269,34 @@ def test_pow(self):
                     except OverflowError:
                         pass
 
+    def test_pow_with_small_integer_exponents(self):
+        # Check that small integer exponents are handled identically
+        # regardless of their type.
+        values = [
+            complex(5.0, 12.0),
+            complex(5.0e100, 12.0e100),
+            complex(-4.0, INF),
+            complex(INF, 0.0),
+        ]
+        exponents = [-19, -5, -3, -2, -1, 0, 1, 2, 3, 5, 19]
+        for value in values:
+            for exponent in exponents:
+                with self.subTest(value=value, exponent=exponent):
+                    try:
+                        int_pow = value**exponent
+                    except OverflowError:
+                        int_pow = "overflow"
+                    try:
+                        float_pow = value**float(exponent)
+                    except OverflowError:
+                        float_pow = "overflow"
+                    try:
+                        complex_pow = value**complex(exponent)
+                    except OverflowError:
+                        complex_pow = "overflow"
+                    self.assertEqual(str(float_pow), str(int_pow))
+                    self.assertEqual(str(complex_pow), str(int_pow))
+
     def test_boolcontext(self):
         for i in range(100):
             self.assertTrue(complex(random() + 1e-6, random() + 1e-6))
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-15-10-39-06.bpo-44698.lITKNc.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-15-10-39-06.bpo-44698.lITKNc.rst
new file mode 100644
index 0000000000000..f197253e10ec6
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-15-10-39-06.bpo-44698.lITKNc.rst	
@@ -0,0 +1,2 @@
+Restore behaviour of complex exponentiation with integer-valued exponent of
+type :class:`float` or :class:`complex`.
diff --git a/Objects/complexobject.c b/Objects/complexobject.c
index 05cae32f528c4..3e479497cfcc3 100644
--- a/Objects/complexobject.c
+++ b/Objects/complexobject.c
@@ -172,14 +172,7 @@ c_powu(Py_complex x, long n)
 static Py_complex
 c_powi(Py_complex x, long n)
 {
-    Py_complex cn;
-
-    if (n > 100 || n < -100) {
-        cn.real = (double) n;
-        cn.imag = 0.;
-        return _Py_c_pow(x,cn);
-    }
-    else if (n > 0)
+    if (n > 0)
         return c_powu(x,n);
     else
         return _Py_c_quot(c_1, c_powu(x,-n));
@@ -523,19 +516,12 @@ complex_pow(PyObject *v, PyObject *w, PyObject *z)
         return NULL;
     }
     errno = 0;
-    // Check if w is an integer value that fits inside a C long, so we can
-    // use a faster algorithm. TO_COMPLEX(w, b), above, already handled the
-    // conversion from larger longs, as well as other types.
-    if (PyLong_Check(w)) {
-        int overflow = 0;
-        long int_exponent = PyLong_AsLongAndOverflow(w, &overflow);
-        if (int_exponent == -1 && PyErr_Occurred())
-            return NULL;
-        if (overflow == 0)
-            p = c_powi(a, int_exponent);
-        else
-            p = _Py_c_pow(a, b);
-    } else {
+    // Check whether the exponent has a small integer value, and if so use
+    // a faster and more accurate algorithm.
+    if (b.imag == 0.0 && b.real == floor(b.real) && fabs(b.real) <= 100.0) {
+        p = c_powi(a, (long)b.real);
+    }
+    else {
         p = _Py_c_pow(a, b);
     }
 


From webhook-mailer at python.org  Tue Aug 17 13:38:50 2021
From: webhook-mailer at python.org (mdickinson)
Date: Tue, 17 Aug 2021 17:38:50 -0000
Subject: [Python-checkins] bpo-44698: Restore complex pow behaviour for
 small integral exponents (GH-27772) (GH-27797)
Message-ID: <mailman.1059.1629221931.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/beb3a835dae3cd940b93e7caa32450890c4cd539
commit: beb3a835dae3cd940b93e7caa32450890c4cd539
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: mdickinson <dickinsm at gmail.com>
date: 2021-08-17T18:38:39+01:00
summary:

bpo-44698: Restore complex pow behaviour for small integral exponents (GH-27772) (GH-27797)

(cherry picked from commit 4b9a2dcf19e5d13c3bc2afea2de1f65cd994c699)

Co-authored-by: Mark Dickinson <mdickinson at enthought.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-15-10-39-06.bpo-44698.lITKNc.rst
M Lib/test/test_complex.py
M Objects/complexobject.c

diff --git a/Lib/test/test_complex.py b/Lib/test/test_complex.py
index 26a15df4db951..0db9be5190da4 100644
--- a/Lib/test/test_complex.py
+++ b/Lib/test/test_complex.py
@@ -227,6 +227,34 @@ def test_pow(self):
                     except OverflowError:
                         pass
 
+    def test_pow_with_small_integer_exponents(self):
+        # Check that small integer exponents are handled identically
+        # regardless of their type.
+        values = [
+            complex(5.0, 12.0),
+            complex(5.0e100, 12.0e100),
+            complex(-4.0, INF),
+            complex(INF, 0.0),
+        ]
+        exponents = [-19, -5, -3, -2, -1, 0, 1, 2, 3, 5, 19]
+        for value in values:
+            for exponent in exponents:
+                with self.subTest(value=value, exponent=exponent):
+                    try:
+                        int_pow = value**exponent
+                    except OverflowError:
+                        int_pow = "overflow"
+                    try:
+                        float_pow = value**float(exponent)
+                    except OverflowError:
+                        float_pow = "overflow"
+                    try:
+                        complex_pow = value**complex(exponent)
+                    except OverflowError:
+                        complex_pow = "overflow"
+                    self.assertEqual(str(float_pow), str(int_pow))
+                    self.assertEqual(str(complex_pow), str(int_pow))
+
     def test_boolcontext(self):
         for i in range(100):
             self.assertTrue(complex(random() + 1e-6, random() + 1e-6))
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-15-10-39-06.bpo-44698.lITKNc.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-15-10-39-06.bpo-44698.lITKNc.rst
new file mode 100644
index 0000000000000..f197253e10ec6
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-15-10-39-06.bpo-44698.lITKNc.rst	
@@ -0,0 +1,2 @@
+Restore behaviour of complex exponentiation with integer-valued exponent of
+type :class:`float` or :class:`complex`.
diff --git a/Objects/complexobject.c b/Objects/complexobject.c
index bc2ec2ad0a30b..e09cc15fe84e6 100644
--- a/Objects/complexobject.c
+++ b/Objects/complexobject.c
@@ -169,14 +169,7 @@ c_powu(Py_complex x, long n)
 static Py_complex
 c_powi(Py_complex x, long n)
 {
-    Py_complex cn;
-
-    if (n > 100 || n < -100) {
-        cn.real = (double) n;
-        cn.imag = 0.;
-        return _Py_c_pow(x,cn);
-    }
-    else if (n > 0)
+    if (n > 0)
         return c_powu(x,n);
     else
         return _Py_c_quot(c_1, c_powu(x,-n));
@@ -538,19 +531,12 @@ complex_pow(PyObject *v, PyObject *w, PyObject *z)
         return NULL;
     }
     errno = 0;
-    // Check if w is an integer value that fits inside a C long, so we can
-    // use a faster algorithm. TO_COMPLEX(w, b), above, already handled the
-    // conversion from larger longs, as well as other types.
-    if (PyLong_Check(w)) {
-        int overflow = 0;
-        long int_exponent = PyLong_AsLongAndOverflow(w, &overflow);
-        if (int_exponent == -1 && PyErr_Occurred())
-            return NULL;
-        if (overflow == 0)
-            p = c_powi(a, int_exponent);
-        else
-            p = _Py_c_pow(a, b);
-    } else {
+    // Check whether the exponent has a small integer value, and if so use
+    // a faster and more accurate algorithm.
+    if (b.imag == 0.0 && b.real == floor(b.real) && fabs(b.real) <= 100.0) {
+        p = c_powi(a, (long)b.real);
+    }
+    else {
         p = _Py_c_pow(a, b);
     }
 


From webhook-mailer at python.org  Tue Aug 17 14:10:04 2021
From: webhook-mailer at python.org (gpshead)
Date: Tue, 17 Aug 2021 18:10:04 -0000
Subject: [Python-checkins] bpo-44935: enable posix_spawn() on Solaris
 (GH-27795)
Message-ID: <mailman.1060.1629223804.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/b1930bf75f276cd7ca08c4455298128d89adf7d1
commit: b1930bf75f276cd7ca08c4455298128d89adf7d1
branch: main
author: Jakub Kul?k <Kulikjak at gmail.com>
committer: gpshead <greg at krypto.org>
date: 2021-08-17T11:09:48-07:00
summary:

bpo-44935: enable posix_spawn() on Solaris (GH-27795)

Enable posix_spawn() on Solaris

files:
A Misc/NEWS.d/next/Library/2021-08-17-16-01-44.bpo-44935.roUl0G.rst
M Lib/subprocess.py

diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index 7a9ab5a4ed0ec..dd1174ee59ad3 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -660,8 +660,9 @@ def _use_posix_spawn():
         # os.posix_spawn() is not available
         return False
 
-    if sys.platform == 'darwin':
-        # posix_spawn() is a syscall on macOS and properly reports errors
+    if sys.platform in ('darwin', 'sunos5'):
+        # posix_spawn() is a syscall on both macOS and Solaris,
+        # and properly reports errors
         return True
 
     # Check libc name and runtime libc version
diff --git a/Misc/NEWS.d/next/Library/2021-08-17-16-01-44.bpo-44935.roUl0G.rst b/Misc/NEWS.d/next/Library/2021-08-17-16-01-44.bpo-44935.roUl0G.rst
new file mode 100644
index 0000000000000..3d41c3be1403d
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-17-16-01-44.bpo-44935.roUl0G.rst
@@ -0,0 +1,2 @@
+:mod:`subprocess` on Solaris now also uses :func:`os.posix_spawn()` for
+better performance.


From webhook-mailer at python.org  Tue Aug 17 14:33:43 2021
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 17 Aug 2021 18:33:43 -0000
Subject: [Python-checkins] [3.10] bpo-44935: enable posix_spawn() on Solaris
 (GH-27795) (GH-27800)
Message-ID: <mailman.1061.1629225223.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/826e059bb9b42e17bef2186938a2bd3f33610e69
commit: 826e059bb9b42e17bef2186938a2bd3f33610e69
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-17T11:33:34-07:00
summary:

[3.10] bpo-44935: enable posix_spawn() on Solaris (GH-27795) (GH-27800)



Enable posix_spawn() on Solaris
(cherry picked from commit b1930bf75f276cd7ca08c4455298128d89adf7d1)


Co-authored-by: Jakub Kul?k <Kulikjak at gmail.com>

Automerge-Triggered-By: GH:gpshead

files:
A Misc/NEWS.d/next/Library/2021-08-17-16-01-44.bpo-44935.roUl0G.rst
M Lib/subprocess.py

diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index 8203aded7d552..ccb46a6337b3d 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -660,8 +660,9 @@ def _use_posix_spawn():
         # os.posix_spawn() is not available
         return False
 
-    if sys.platform == 'darwin':
-        # posix_spawn() is a syscall on macOS and properly reports errors
+    if sys.platform in ('darwin', 'sunos5'):
+        # posix_spawn() is a syscall on both macOS and Solaris,
+        # and properly reports errors
         return True
 
     # Check libc name and runtime libc version
diff --git a/Misc/NEWS.d/next/Library/2021-08-17-16-01-44.bpo-44935.roUl0G.rst b/Misc/NEWS.d/next/Library/2021-08-17-16-01-44.bpo-44935.roUl0G.rst
new file mode 100644
index 0000000000000..3d41c3be1403d
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-17-16-01-44.bpo-44935.roUl0G.rst
@@ -0,0 +1,2 @@
+:mod:`subprocess` on Solaris now also uses :func:`os.posix_spawn()` for
+better performance.


From webhook-mailer at python.org  Tue Aug 17 17:19:14 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 17 Aug 2021 21:19:14 -0000
Subject: [Python-checkins] introduce omitted index default before using it
 (GH-27775)
Message-ID: <mailman.1062.1629235155.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/599f5c8481ca258ca3a5d13eaee7d07a9103b5f2
commit: 599f5c8481ca258ca3a5d13eaee7d07a9103b5f2
branch: main
author: Jefferson Oliveira <jefferson.dev.insights at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-17T23:19:03+02:00
summary:

introduce omitted index default before using it (GH-27775)

files:
M Doc/tutorial/introduction.rst

diff --git a/Doc/tutorial/introduction.rst b/Doc/tutorial/introduction.rst
index 4613cf76c5309..8763626ef553b 100644
--- a/Doc/tutorial/introduction.rst
+++ b/Doc/tutorial/introduction.rst
@@ -269,14 +269,6 @@ to obtain individual characters, *slicing* allows you to obtain substring::
    >>> word[2:5]  # characters from position 2 (included) to 5 (excluded)
    'tho'
 
-Note how the start is always included, and the end always excluded.  This
-makes sure that ``s[:i] + s[i:]`` is always equal to ``s``::
-
-   >>> word[:2] + word[2:]
-   'Python'
-   >>> word[:4] + word[4:]
-   'Python'
-
 Slice indices have useful defaults; an omitted first index defaults to zero, an
 omitted second index defaults to the size of the string being sliced. ::
 
@@ -287,6 +279,14 @@ omitted second index defaults to the size of the string being sliced. ::
    >>> word[-2:]  # characters from the second-last (included) to the end
    'on'
 
+Note how the start is always included, and the end always excluded.  This
+makes sure that ``s[:i] + s[i:]`` is always equal to ``s``::
+
+   >>> word[:2] + word[2:]
+   'Python'
+   >>> word[:4] + word[4:]
+   'Python'
+
 One way to remember how slices work is to think of the indices as pointing
 *between* characters, with the left edge of the first character numbered 0.
 Then the right edge of the last character of a string of *n* characters has


From webhook-mailer at python.org  Tue Aug 17 17:43:08 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 17 Aug 2021 21:43:08 -0000
Subject: [Python-checkins] introduce omitted index default before using it
 (GH-27775) (GH-27802)
Message-ID: <mailman.1063.1629236590.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/f20f061cfaee639875a7a72926f3ad9cc4494ff9
commit: f20f061cfaee639875a7a72926f3ad9cc4494ff9
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-17T23:42:50+02:00
summary:

introduce omitted index default before using it (GH-27775) (GH-27802)

(cherry picked from commit 599f5c8481ca258ca3a5d13eaee7d07a9103b5f2)

Co-authored-by: Jefferson Oliveira <jefferson.dev.insights at gmail.com>

files:
M Doc/tutorial/introduction.rst

diff --git a/Doc/tutorial/introduction.rst b/Doc/tutorial/introduction.rst
index 4613cf76c5309..8763626ef553b 100644
--- a/Doc/tutorial/introduction.rst
+++ b/Doc/tutorial/introduction.rst
@@ -269,14 +269,6 @@ to obtain individual characters, *slicing* allows you to obtain substring::
    >>> word[2:5]  # characters from position 2 (included) to 5 (excluded)
    'tho'
 
-Note how the start is always included, and the end always excluded.  This
-makes sure that ``s[:i] + s[i:]`` is always equal to ``s``::
-
-   >>> word[:2] + word[2:]
-   'Python'
-   >>> word[:4] + word[4:]
-   'Python'
-
 Slice indices have useful defaults; an omitted first index defaults to zero, an
 omitted second index defaults to the size of the string being sliced. ::
 
@@ -287,6 +279,14 @@ omitted second index defaults to the size of the string being sliced. ::
    >>> word[-2:]  # characters from the second-last (included) to the end
    'on'
 
+Note how the start is always included, and the end always excluded.  This
+makes sure that ``s[:i] + s[i:]`` is always equal to ``s``::
+
+   >>> word[:2] + word[2:]
+   'Python'
+   >>> word[:4] + word[4:]
+   'Python'
+
 One way to remember how slices work is to think of the indices as pointing
 *between* characters, with the left edge of the first character numbered 0.
 Then the right edge of the last character of a string of *n* characters has


From webhook-mailer at python.org  Tue Aug 17 17:50:02 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 17 Aug 2021 21:50:02 -0000
Subject: [Python-checkins] introduce omitted index default before using it
 (GH-27775) (GH-27803)
Message-ID: <mailman.1064.1629237003.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/1bc05419b8518da75b6ac8c13e27fa0079d5015f
commit: 1bc05419b8518da75b6ac8c13e27fa0079d5015f
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-17T23:49:53+02:00
summary:

introduce omitted index default before using it (GH-27775) (GH-27803)

(cherry picked from commit 599f5c8481ca258ca3a5d13eaee7d07a9103b5f2)

Co-authored-by: Jefferson Oliveira <jefferson.dev.insights at gmail.com>

files:
M Doc/tutorial/introduction.rst

diff --git a/Doc/tutorial/introduction.rst b/Doc/tutorial/introduction.rst
index 4613cf76c5309..8763626ef553b 100644
--- a/Doc/tutorial/introduction.rst
+++ b/Doc/tutorial/introduction.rst
@@ -269,14 +269,6 @@ to obtain individual characters, *slicing* allows you to obtain substring::
    >>> word[2:5]  # characters from position 2 (included) to 5 (excluded)
    'tho'
 
-Note how the start is always included, and the end always excluded.  This
-makes sure that ``s[:i] + s[i:]`` is always equal to ``s``::
-
-   >>> word[:2] + word[2:]
-   'Python'
-   >>> word[:4] + word[4:]
-   'Python'
-
 Slice indices have useful defaults; an omitted first index defaults to zero, an
 omitted second index defaults to the size of the string being sliced. ::
 
@@ -287,6 +279,14 @@ omitted second index defaults to the size of the string being sliced. ::
    >>> word[-2:]  # characters from the second-last (included) to the end
    'on'
 
+Note how the start is always included, and the end always excluded.  This
+makes sure that ``s[:i] + s[i:]`` is always equal to ``s``::
+
+   >>> word[:2] + word[2:]
+   'Python'
+   >>> word[:4] + word[4:]
+   'Python'
+
 One way to remember how slices work is to think of the indices as pointing
 *between* characters, with the left edge of the first character numbered 0.
 Then the right edge of the last character of a string of *n* characters has


From webhook-mailer at python.org  Tue Aug 17 18:55:09 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 17 Aug 2021 22:55:09 -0000
Subject: [Python-checkins] bpo-44508: [Doc] Document failure mode for
 loop.call_soon_threadsafe (GH-27688)
Message-ID: <mailman.1065.1629240909.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/3240bc62f4e0afa09964f3afc845697f0a0806b9
commit: 3240bc62f4e0afa09964f3afc845697f0a0806b9
branch: main
author: meowmeowmeowcat <meowmeowcat1211 at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-18T00:55:04+02:00
summary:

bpo-44508: [Doc] Document failure mode for loop.call_soon_threadsafe (GH-27688)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

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

diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst
index 98ec65dde887c..147fb2b9bf603 100644
--- a/Doc/library/asyncio-eventloop.rst
+++ b/Doc/library/asyncio-eventloop.rst
@@ -216,6 +216,10 @@ Scheduling callbacks
    A thread-safe variant of :meth:`call_soon`.  Must be used to
    schedule callbacks *from another thread*.
 
+   Raises :exc:`RuntimeError` if called on a loop that's been closed.
+   This can happen on a secondary thread when the main application is
+   shutting down.
+
    See the :ref:`concurrency and multithreading <asyncio-multithreading>`
    section of the documentation.
 


From webhook-mailer at python.org  Tue Aug 17 19:17:33 2021
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 17 Aug 2021 23:17:33 -0000
Subject: [Python-checkins] bpo-44508: [Doc] Document failure mode for
 loop.call_soon_threadsafe (GH-27688)
Message-ID: <mailman.1066.1629242253.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/bbb10761b64095425f7f8dcb3bc1f0d8bdee528a
commit: bbb10761b64095425f7f8dcb3bc1f0d8bdee528a
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-17T16:17:29-07:00
summary:

bpo-44508: [Doc] Document failure mode for loop.call_soon_threadsafe (GH-27688)


Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 3240bc62f4e0afa09964f3afc845697f0a0806b9)

Co-authored-by: meowmeowmeowcat <meowmeowcat1211 at gmail.com>

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

diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst
index b1609f7bb77f2..eee8095bd4c0f 100644
--- a/Doc/library/asyncio-eventloop.rst
+++ b/Doc/library/asyncio-eventloop.rst
@@ -216,6 +216,10 @@ Scheduling callbacks
    A thread-safe variant of :meth:`call_soon`.  Must be used to
    schedule callbacks *from another thread*.
 
+   Raises :exc:`RuntimeError` if called on a loop that's been closed.
+   This can happen on a secondary thread when the main application is
+   shutting down.
+
    See the :ref:`concurrency and multithreading <asyncio-multithreading>`
    section of the documentation.
 


From webhook-mailer at python.org  Tue Aug 17 19:18:27 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 17 Aug 2021 23:18:27 -0000
Subject: [Python-checkins] bpo-44508: [Doc] Document failure mode for
 loop.call_soon_threadsafe (GH-27688) (GH-27805)
Message-ID: <mailman.1067.1629242308.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/e2320c6a34d44a0efa7ecc693c3a6215014b7b6e
commit: e2320c6a34d44a0efa7ecc693c3a6215014b7b6e
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-18T01:18:22+02:00
summary:

bpo-44508: [Doc] Document failure mode for loop.call_soon_threadsafe (GH-27688) (GH-27805)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 3240bc62f4e0afa09964f3afc845697f0a0806b9)

Co-authored-by: meowmeowmeowcat <meowmeowcat1211 at gmail.com>

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

diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst
index 66eb3faecd896..4a64475f2a939 100644
--- a/Doc/library/asyncio-eventloop.rst
+++ b/Doc/library/asyncio-eventloop.rst
@@ -211,6 +211,10 @@ Scheduling callbacks
    A thread-safe variant of :meth:`call_soon`.  Must be used to
    schedule callbacks *from another thread*.
 
+   Raises :exc:`RuntimeError` if called on a loop that's been closed.
+   This can happen on a secondary thread when the main application is
+   shutting down.
+
    See the :ref:`concurrency and multithreading <asyncio-multithreading>`
    section of the documentation.
 


From webhook-mailer at python.org  Tue Aug 17 19:46:43 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 17 Aug 2021 23:46:43 -0000
Subject: [Python-checkins] [3.8] bpo-36384: Leading zeros in IPv4 addresses
 are no longer tolerated (GH-25099) (GH-27801)
Message-ID: <mailman.1068.1629244004.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/03dd89d62413c4a92831ed1b36e2ae8983bcb2d4
commit: 03dd89d62413c4a92831ed1b36e2ae8983bcb2d4
branch: 3.8
author: achraf-mer <51244975+achraf-mer at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-18T01:46:37+02:00
summary:

[3.8] bpo-36384: Leading zeros in IPv4 addresses are no longer tolerated (GH-25099) (GH-27801)

Reverts commit e653d4d8e820a7a004ad399530af0135b45db27a and makes
parsing even more strict. Like socket.inet_pton() any leading zero
is now treated as invalid input.

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

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Misc/NEWS.d/next/Security/2021-03-30-16-29-51.bpo-36384.sCAmLs.rst
M Doc/library/ipaddress.rst
M Doc/whatsnew/3.8.rst
M Lib/ipaddress.py
M Lib/test/test_ipaddress.py

diff --git a/Doc/library/ipaddress.rst b/Doc/library/ipaddress.rst
index 2cdfddb02e96c4..5e21d5db2ed9c3 100644
--- a/Doc/library/ipaddress.rst
+++ b/Doc/library/ipaddress.rst
@@ -104,8 +104,7 @@ write code that handles both IP versions correctly.  Address objects are
    1. A string in decimal-dot notation, consisting of four decimal integers in
       the inclusive range 0--255, separated by dots (e.g. ``192.168.0.1``). Each
       integer represents an octet (byte) in the address. Leading zeroes are
-      tolerated only for values less than 8 (as there is no ambiguity
-      between the decimal and octal interpretations of such strings).
+      not tolerated to prevent confusion with octal notation.
    2. An integer that fits into 32 bits.
    3. An integer packed into a :class:`bytes` object of length 4 (most
       significant octet first).
@@ -117,6 +116,18 @@ write code that handles both IP versions correctly.  Address objects are
    >>> ipaddress.IPv4Address(b'\xC0\xA8\x00\x01')
    IPv4Address('192.168.0.1')
 
+
+   .. versionchanged:: 3.8
+
+      Leading zeros are tolerated, even in ambiguous cases that look like
+      octal notation.
+
+   .. versionchanged:: 3.8.12
+
+      Leading zeros are no longer tolerated and are treated as an error.
+      IPv4 address strings are now parsed as strict as glibc
+      :func:`~socket.inet_pton`.
+
    .. attribute:: version
 
       The appropriate version number: ``4`` for IPv4, ``6`` for IPv6.
diff --git a/Doc/whatsnew/3.8.rst b/Doc/whatsnew/3.8.rst
index 109a06e92efb7d..7a3460adb3827f 100644
--- a/Doc/whatsnew/3.8.rst
+++ b/Doc/whatsnew/3.8.rst
@@ -2307,3 +2307,19 @@ URL by the parser in :mod:`urllib.parse` preventing such attacks. The removal
 characters are controlled by a new module level variable
 ``urllib.parse._UNSAFE_URL_BYTES_TO_REMOVE``. (See :issue:`43882`)
 
+
+Notable changes in Python 3.8.12
+================================
+
+Changes in the Python API
+-------------------------
+
+Starting with Python 3.8.12 the :mod:`ipaddress` module no longer accepts
+any leading zeros in IPv4 address strings. Leading zeros are ambiguous and
+interpreted as octal notation by some libraries. For example the legacy
+function :func:`socket.inet_aton` treats leading zeros as octal notatation.
+glibc implementation of modern :func:`~socket.inet_pton` does not accept
+any leading zeros.
+
+(Originally contributed by Christian Heimes in :issue:`36384`, and backported
+to 3.8 by Achraf Merzouki)
diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py
index 28b7b6159a62ef..d351f07a5bd960 100644
--- a/Lib/ipaddress.py
+++ b/Lib/ipaddress.py
@@ -1173,6 +1173,11 @@ def _parse_octet(cls, octet_str):
         if len(octet_str) > 3:
             msg = "At most 3 characters permitted in %r"
             raise ValueError(msg % octet_str)
+        # Handle leading zeros as strict as glibc's inet_pton()
+        # See security bug bpo-36384
+        if octet_str != '0' and octet_str[0] == '0':
+            msg = "Leading zeros are not permitted in %r"
+            raise ValueError(msg % octet_str)
         # Convert to integer (we know digits are legal)
         octet_int = int(octet_str, 10)
         if octet_int > 255:
diff --git a/Lib/test/test_ipaddress.py b/Lib/test/test_ipaddress.py
index 2f1c5b6b6fb9c8..1297b8371d8583 100644
--- a/Lib/test/test_ipaddress.py
+++ b/Lib/test/test_ipaddress.py
@@ -97,10 +97,23 @@ def pickle_test(self, addr):
 class CommonTestMixin_v4(CommonTestMixin):
 
     def test_leading_zeros(self):
-        self.assertInstancesEqual("000.000.000.000", "0.0.0.0")
-        self.assertInstancesEqual("192.168.000.001", "192.168.0.1")
-        self.assertInstancesEqual("016.016.016.016", "16.16.16.16")
-        self.assertInstancesEqual("001.000.008.016", "1.0.8.16")
+        # bpo-36384: no leading zeros to avoid ambiguity with octal notation
+        msg = "Leading zeros are not permitted in '\d+'"
+        addresses = [
+            "000.000.000.000",
+            "192.168.000.001",
+            "016.016.016.016",
+            "192.168.000.001",
+            "001.000.008.016",
+            "01.2.3.40",
+            "1.02.3.40",
+            "1.2.03.40",
+            "1.2.3.040",
+        ]
+        for address in addresses:
+            with self.subTest(address=address):
+                with self.assertAddressError(msg):
+                    self.factory(address)
 
     def test_int(self):
         self.assertInstancesEqual(0, "0.0.0.0")
diff --git a/Misc/NEWS.d/next/Security/2021-03-30-16-29-51.bpo-36384.sCAmLs.rst b/Misc/NEWS.d/next/Security/2021-03-30-16-29-51.bpo-36384.sCAmLs.rst
new file mode 100644
index 00000000000000..f956cde948ec57
--- /dev/null
+++ b/Misc/NEWS.d/next/Security/2021-03-30-16-29-51.bpo-36384.sCAmLs.rst
@@ -0,0 +1,6 @@
+:mod:`ipaddress` module no longer accepts any leading zeros in IPv4 address
+strings. Leading zeros are ambiguous and interpreted as octal notation by
+some libraries. For example the legacy function :func:`socket.inet_aton`
+treats leading zeros as octal notatation. glibc implementation of modern
+:func:`~socket.inet_pton` does not accept any leading zeros. For a while
+the :mod:`ipaddress` module used to accept ambiguous leading zeros.


From webhook-mailer at python.org  Wed Aug 18 07:19:37 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 18 Aug 2021 11:19:37 -0000
Subject: [Python-checkins] bpo-44852: Support filtering over warnings
 without a set message (GH-27793)
Message-ID: <mailman.1069.1629285578.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/8cf07d3db3eed02b43350a5f9dbf68f1c839ea82
commit: 8cf07d3db3eed02b43350a5f9dbf68f1c839ea82
branch: main
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2021-08-18T13:19:30+02:00
summary:

bpo-44852: Support filtering over warnings without a set message (GH-27793)

Additional improvements:

- messages which were compiled regular expressions aren't unpacked back into
  strings for unmatched warnings;

- removed unnecessary "if tokens:" check (there's one before the for loop);

- took `endswith` calculation out of the for loop.

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

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index c89901ea8f7265..a86bfca4ce96bf 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -2070,13 +2070,14 @@ def clear_ignored_deprecations(*tokens: object) -> None:
         raise ValueError("Provide token or tokens returned by ignore_deprecations_from")
 
     new_filters = []
+    endswith = tuple(rf"(?#support{id(token)})" for token in tokens)
     for action, message, category, module, lineno in warnings.filters:
         if action == "ignore" and category is DeprecationWarning:
             if isinstance(message, re.Pattern):
-                message = message.pattern
-            if tokens:
-                endswith = tuple(rf"(?#support{id(token)})" for token in tokens)
-            if message.endswith(endswith):
+                msg = message.pattern
+            else:
+                msg = message or ""
+            if msg.endswith(endswith):
                 continue
         new_filters.append((action, message, category, module, lineno))
     if warnings.filters != new_filters:


From webhook-mailer at python.org  Wed Aug 18 08:10:32 2021
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 18 Aug 2021 12:10:32 -0000
Subject: [Python-checkins] bpo-44852: Support filtering over warnings
 without a set message (GH-27793)
Message-ID: <mailman.1070.1629288632.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/d1c0e4413dd544270df1f5b8a145fd4370cb759b
commit: d1c0e4413dd544270df1f5b8a145fd4370cb759b
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-18T05:10:10-07:00
summary:

bpo-44852: Support filtering over warnings without a set message (GH-27793)


Additional improvements:

- messages which were compiled regular expressions aren't unpacked back into
  strings for unmatched warnings;

- removed unnecessary "if tokens:" check (there's one before the for loop);

- took `endswith` calculation out of the for loop.
(cherry picked from commit 8cf07d3db3eed02b43350a5f9dbf68f1c839ea82)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

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

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index 227ce47655f98..abc2a189ffc5f 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -2059,13 +2059,14 @@ def clear_ignored_deprecations(*tokens: object) -> None:
         raise ValueError("Provide token or tokens returned by ignore_deprecations_from")
 
     new_filters = []
+    endswith = tuple(rf"(?#support{id(token)})" for token in tokens)
     for action, message, category, module, lineno in warnings.filters:
         if action == "ignore" and category is DeprecationWarning:
             if isinstance(message, re.Pattern):
-                message = message.pattern
-            if tokens:
-                endswith = tuple(rf"(?#support{id(token)})" for token in tokens)
-            if message.endswith(endswith):
+                msg = message.pattern
+            else:
+                msg = message or ""
+            if msg.endswith(endswith):
                 continue
         new_filters.append((action, message, category, module, lineno))
     if warnings.filters != new_filters:


From webhook-mailer at python.org  Wed Aug 18 08:10:44 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 18 Aug 2021 12:10:44 -0000
Subject: [Python-checkins] bpo-44852: Support filtering over warnings
 without a set message (GH-27793) (GH-27810)
Message-ID: <mailman.1071.1629288645.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/ebe7e6d86cf8f54d449d49866698d7f4c700cc7c
commit: ebe7e6d86cf8f54d449d49866698d7f4c700cc7c
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-18T14:10:39+02:00
summary:

bpo-44852: Support filtering over warnings without a set message (GH-27793) (GH-27810)

Additional improvements:

- messages which were compiled regular expressions aren't unpacked back into
  strings for unmatched warnings;

- removed unnecessary "if tokens:" check (there's one before the for loop);

- took `endswith` calculation out of the for loop.
(cherry picked from commit 8cf07d3db3eed02b43350a5f9dbf68f1c839ea82)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

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

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index 39dea88076e9e..7e5a29b18de39 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -3257,13 +3257,14 @@ def clear_ignored_deprecations(*tokens: object) -> None:
         raise ValueError("Provide token or tokens returned by ignore_deprecations_from")
 
     new_filters = []
+    endswith = tuple(rf"(?#support{id(token)})" for token in tokens)
     for action, message, category, module, lineno in warnings.filters:
         if action == "ignore" and category is DeprecationWarning:
             if isinstance(message, re.Pattern):
-                message = message.pattern
-            if tokens:
-                endswith = tuple(rf"(?#support{id(token)})" for token in tokens)
-            if message.endswith(endswith):
+                msg = message.pattern
+            else:
+                msg = message or ""
+            if msg.endswith(endswith):
                 continue
         new_filters.append((action, message, category, module, lineno))
     if warnings.filters != new_filters:


From webhook-mailer at python.org  Wed Aug 18 13:39:04 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 18 Aug 2021 17:39:04 -0000
Subject: [Python-checkins] bpo-44949: Fix test_readline auto history tests
 (#27813)
Message-ID: <mailman.1072.1629308345.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/6fb62b42f4db56ed5efe0ca4c1059049276c1083
commit: 6fb62b42f4db56ed5efe0ca4c1059049276c1083
branch: main
author: Victor Stinner <vstinner at python.org>
committer: ambv <lukasz at langa.pl>
date: 2021-08-18T19:38:54+02:00
summary:

bpo-44949: Fix test_readline auto history tests (#27813)

files:
A Misc/NEWS.d/next/Tests/2021-08-18-18-30-12.bpo-44949.VE5ENv.rst
M Lib/test/test_readline.py

diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py
index f3e404da6f0b8..e8fb8d2f9cc60 100644
--- a/Lib/test/test_readline.py
+++ b/Lib/test/test_readline.py
@@ -156,11 +156,15 @@ def test_init(self):
 
     def test_auto_history_enabled(self):
         output = run_pty(self.auto_history_script.format(True))
-        self.assertIn(b"History length: 1\r\n", output)
+        # bpo-44949: Sometimes, the newline character is not written at the
+        # end, so don't expect it in the output.
+        self.assertIn(b"History length: 1", output)
 
     def test_auto_history_disabled(self):
         output = run_pty(self.auto_history_script.format(False))
-        self.assertIn(b"History length: 0\r\n", output)
+        # bpo-44949: Sometimes, the newline character is not written at the
+        # end, so don't expect it in the output.
+        self.assertIn(b"History length: 0", output)
 
     def test_nonascii(self):
         loc = locale.setlocale(locale.LC_CTYPE, None)
diff --git a/Misc/NEWS.d/next/Tests/2021-08-18-18-30-12.bpo-44949.VE5ENv.rst b/Misc/NEWS.d/next/Tests/2021-08-18-18-30-12.bpo-44949.VE5ENv.rst
new file mode 100644
index 0000000000000..7fdf1810b165e
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2021-08-18-18-30-12.bpo-44949.VE5ENv.rst
@@ -0,0 +1,2 @@
+Fix auto history tests of test_readline: sometimes, the newline character is
+not written at the end, so don't expect it in the output.


From webhook-mailer at python.org  Wed Aug 18 14:48:11 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 18 Aug 2021 18:48:11 -0000
Subject: [Python-checkins] [3.9] bpo-44815: Always show deprecation in
 asyncio.gather/sleep() (GH-27569)
Message-ID: <mailman.1073.1629312492.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/b2779b2aa16acb3fd1297ccfe2fe5aaa007f74ae
commit: b2779b2aa16acb3fd1297ccfe2fe5aaa007f74ae
branch: 3.9
author: Sam Bull <aa6bs0 at sambull.org>
committer: ambv <lukasz at langa.pl>
date: 2021-08-18T20:47:55+02:00
summary:

[3.9] bpo-44815: Always show deprecation in asyncio.gather/sleep() (GH-27569)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Misc/NEWS.d/next/Library/2021-08-03-15-02-28.bpo-44815.9AmFfy.rst
M Lib/asyncio/tasks.py
M Lib/test/test_asyncio/__init__.py

diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py
index d6262ae75e6569..d7e0575ebd7fbb 100644
--- a/Lib/asyncio/tasks.py
+++ b/Lib/asyncio/tasks.py
@@ -635,16 +635,17 @@ def __sleep0():
 
 async def sleep(delay, result=None, *, loop=None):
     """Coroutine that completes after a given time (in seconds)."""
+    if loop is not None:
+        warnings.warn("The loop argument is deprecated since Python 3.8, "
+                      "and scheduled for removal in Python 3.10.",
+                      DeprecationWarning, stacklevel=2)
+
     if delay <= 0:
         await __sleep0()
         return result
 
     if loop is None:
         loop = events.get_running_loop()
-    else:
-        warnings.warn("The loop argument is deprecated since Python 3.8, "
-                      "and scheduled for removal in Python 3.10.",
-                      DeprecationWarning, stacklevel=2)
 
     future = loop.create_future()
     h = loop.call_later(delay,
@@ -750,13 +751,14 @@ def gather(*coros_or_futures, loop=None, return_exceptions=False):
     after catching an exception (raised by one of the awaitables) from
     gather won't cancel any other awaitables.
     """
+    if loop is not None:
+        warnings.warn("The loop argument is deprecated since Python 3.8, "
+                      "and scheduled for removal in Python 3.10.",
+                      DeprecationWarning, stacklevel=2)
+
     if not coros_or_futures:
         if loop is None:
             loop = events.get_event_loop()
-        else:
-            warnings.warn("The loop argument is deprecated since Python 3.8, "
-                          "and scheduled for removal in Python 3.10.",
-                          DeprecationWarning, stacklevel=2)
         outer = loop.create_future()
         outer.set_result([])
         return outer
diff --git a/Lib/test/test_asyncio/__init__.py b/Lib/test/test_asyncio/__init__.py
index c77c7a81278be7..230c35cfcf12cf 100644
--- a/Lib/test/test_asyncio/__init__.py
+++ b/Lib/test/test_asyncio/__init__.py
@@ -1,8 +1,37 @@
 import os
-from test.support import load_package_tests, import_module
+from test import support
+import unittest
 
 # Skip tests if we don't have concurrent.futures.
-import_module('concurrent.futures')
+support.import_module('concurrent.futures')
 
-def load_tests(*args):
-    return load_package_tests(os.path.dirname(__file__), *args)
+
+def load_tests(loader, _, pattern):
+    pkg_dir = os.path.dirname(__file__)
+    suite = AsyncioTestSuite()
+    return support.load_package_tests(pkg_dir, loader, suite, pattern)
+
+
+class AsyncioTestSuite(unittest.TestSuite):
+    """A custom test suite that also runs setup/teardown for the whole package.
+
+    Normally unittest only runs setUpModule() and tearDownModule() within each
+    test module part of the test suite. Copying those functions to each file
+    would be tedious, let's run this once and for all.
+    """
+    def run(self, result, debug=False):
+        ignore = support.ignore_deprecations_from
+        tokens = {
+            ignore("asyncio.base_events", like=r".*loop argument.*"),
+            ignore("asyncio.unix_events", like=r".*loop argument.*"),
+            ignore("asyncio.futures", like=r".*loop argument.*"),
+            ignore("asyncio.runners", like=r".*loop argument.*"),
+            ignore("asyncio.subprocess", like=r".*loop argument.*"),
+            ignore("asyncio.tasks", like=r".*loop argument.*"),
+            ignore("test.test_asyncio.test_queues", like=r".*loop argument.*"),
+            ignore("test.test_asyncio.test_tasks", like=r".*loop argument.*"),
+        }
+        try:
+            super().run(result, debug=debug)
+        finally:
+            support.clear_ignored_deprecations(*tokens)
diff --git a/Misc/NEWS.d/next/Library/2021-08-03-15-02-28.bpo-44815.9AmFfy.rst b/Misc/NEWS.d/next/Library/2021-08-03-15-02-28.bpo-44815.9AmFfy.rst
new file mode 100644
index 00000000000000..63dfbf3cd37946
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-03-15-02-28.bpo-44815.9AmFfy.rst
@@ -0,0 +1,2 @@
+Always show ``loop=`` arg deprecations in :func:`asyncio.gather` and
+:func:`asyncio.sleep`


From webhook-mailer at python.org  Wed Aug 18 15:08:42 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 18 Aug 2021 19:08:42 -0000
Subject: [Python-checkins] bpo-44524: Fix cryptic TypeError message when
 trying to subclass special forms in `typing` (GH-27710)
Message-ID: <mailman.1074.1629313723.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/a3a4d20d6798aa2975428d51f3a4f890248810cb
commit: a3a4d20d6798aa2975428d51f3a4f890248810cb
branch: main
author: Yurii Karabas <1998uriyyo at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-18T21:08:32+02:00
summary:

bpo-44524: Fix cryptic TypeError message when trying to subclass special forms in `typing` (GH-27710)

This was a Python 3.9 regression.

files:
A Misc/NEWS.d/next/Library/2021-08-10-16-57-10.bpo-44524.dk9QX4.rst
M Lib/test/test_typing.py
M Lib/typing.py

diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index 06141f8bbcb61..d090c5f8818da 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -2424,6 +2424,22 @@ def __new__(cls, arg):
         self.assertEqual(c.from_b, 'b')
         self.assertEqual(c.from_c, 'c')
 
+    def test_subclass_special_form(self):
+        for obj in (
+            ClassVar[int],
+            Final[int],
+            Union[int, float],
+            Optional[int],
+            Literal[1, 2],
+            Concatenate[int, ParamSpec("P")],
+            TypeGuard[int],
+        ):
+            with self.subTest(msg=obj):
+                with self.assertRaisesRegex(
+                        TypeError, f'^{re.escape(f"Cannot subclass {obj!r}")}$'
+                ):
+                    class Foo(obj):
+                        pass
 
 class ClassVarTests(BaseTestCase):
 
diff --git a/Lib/typing.py b/Lib/typing.py
index 51468aeaf5b75..eeeb295b6c2c2 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -1086,6 +1086,9 @@ def __reduce__(self):
         return operator.getitem, (origin, args)
 
     def __mro_entries__(self, bases):
+        if isinstance(self.__origin__, _SpecialForm):
+            raise TypeError(f"Cannot subclass {self!r}")
+
         if self._name:  # generic version of an ABC or built-in class
             return super().__mro_entries__(bases)
         if self.__origin__ is Generic:
diff --git a/Misc/NEWS.d/next/Library/2021-08-10-16-57-10.bpo-44524.dk9QX4.rst b/Misc/NEWS.d/next/Library/2021-08-10-16-57-10.bpo-44524.dk9QX4.rst
new file mode 100644
index 0000000000000..bc3659fca5209
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-10-16-57-10.bpo-44524.dk9QX4.rst
@@ -0,0 +1,2 @@
+Make exception message more useful when subclass from typing special form
+alias. Patch provided by Yurii Karabas.


From webhook-mailer at python.org  Wed Aug 18 15:50:27 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 18 Aug 2021 19:50:27 -0000
Subject: [Python-checkins] bpo-44874: deprecate Py_TRASHCAN_SAFE_BEGIN and
 Py_TRASHCAN_SAFE_END (GH-27693)
Message-ID: <mailman.1075.1629316228.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/31ee985db86c1339d00bd0d3cc1712019460670a
commit: 31ee985db86c1339d00bd0d3cc1712019460670a
branch: main
author: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-18T21:50:19+02:00
summary:

bpo-44874: deprecate Py_TRASHCAN_SAFE_BEGIN and Py_TRASHCAN_SAFE_END (GH-27693)

Co-authored-by: Victor Stinner <vstinner at python.org>
Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-09-19-05-20.bpo-44874.oOcfU4.rst
M Doc/whatsnew/3.11.rst
M Include/cpython/object.h

diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index c546ec0fc6d9b4..49b4364be9bd7f 100644
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -307,6 +307,47 @@ New Features
 Porting to Python 3.11
 ----------------------
 
+* The old trashcan macros (``Py_TRASHCAN_SAFE_BEGIN``/``Py_TRASHCAN_SAFE_END``)
+  are now deprecated. They should be replaced by the new macros
+  ``Py_TRASHCAN_BEGIN`` and ``Py_TRASHCAN_END``.
+
+  A tp_dealloc function that has the old macros, such as::
+
+    static void
+    mytype_dealloc(mytype *p)
+    {
+        PyObject_GC_UnTrack(p);
+        Py_TRASHCAN_SAFE_BEGIN(p);
+        ...
+        Py_TRASHCAN_SAFE_END
+    }
+
+  should migrate to the new macros as follows::
+
+    static void
+    mytype_dealloc(mytype *p)
+    {
+        PyObject_GC_UnTrack(p);
+        Py_TRASHCAN_BEGIN(p, mytype_dealloc)
+        ...
+        Py_TRASHCAN_END
+    }
+
+  Note that ``Py_TRASHCAN_BEGIN`` has a second argument which
+  should be the deallocation function it is in.
+
+  To support older Python versions in the same codebase, you
+  can define the following macros and use them throughout
+  the code (credit: these were copied from the ``mypy`` codebase)::
+
+    #if PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >= 8
+    #  define CPy_TRASHCAN_BEGIN(op, dealloc) Py_TRASHCAN_BEGIN(op, dealloc)
+    #  define CPy_TRASHCAN_END(op) Py_TRASHCAN_END
+    #else
+    #  define CPy_TRASHCAN_BEGIN(op, dealloc) Py_TRASHCAN_SAFE_BEGIN(op)
+    #  define CPy_TRASHCAN_END(op) Py_TRASHCAN_SAFE_END(op)
+    #endif
+
 * The :c:func:`PyType_Ready` function now raises an error if a type is defined
   with the :const:`Py_TPFLAGS_HAVE_GC` flag set but has no traverse function
   (:c:member:`PyTypeObject.tp_traverse`).
diff --git a/Include/cpython/object.h b/Include/cpython/object.h
index 75cd0f9002215b..5ae6f367c6048a 100644
--- a/Include/cpython/object.h
+++ b/Include/cpython/object.h
@@ -534,7 +534,16 @@ PyAPI_FUNC(int) _PyTrash_cond(PyObject *op, destructor dealloc);
     Py_TRASHCAN_BEGIN_CONDITION(op, \
         _PyTrash_cond(_PyObject_CAST(op), (destructor)dealloc))
 
-/* For backwards compatibility, these macros enable the trashcan
- * unconditionally */
-#define Py_TRASHCAN_SAFE_BEGIN(op) Py_TRASHCAN_BEGIN_CONDITION(op, 1)
-#define Py_TRASHCAN_SAFE_END(op) Py_TRASHCAN_END
+/* The following two macros, Py_TRASHCAN_SAFE_BEGIN and
+ * Py_TRASHCAN_SAFE_END, are deprecated since version 3.11 and
+ * will be removed in the future.
+ * Use Py_TRASHCAN_BEGIN and Py_TRASHCAN_END instead.
+ */
+Py_DEPRECATED(3.11) typedef int UsingDeprecatedTrashcanMacro;
+#define Py_TRASHCAN_SAFE_BEGIN(op) \
+    do { \
+        UsingDeprecatedTrashcanMacro cond=1; \
+        Py_TRASHCAN_BEGIN_CONDITION(op, cond);
+#define Py_TRASHCAN_SAFE_END(op) \
+        Py_TRASHCAN_END; \
+    } while(0);
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-09-19-05-20.bpo-44874.oOcfU4.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-09-19-05-20.bpo-44874.oOcfU4.rst
new file mode 100644
index 00000000000000..1aed5351d74173
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-09-19-05-20.bpo-44874.oOcfU4.rst	
@@ -0,0 +1 @@
+Deprecate the old trashcan macros (``Py_TRASHCAN_SAFE_BEGIN``/``Py_TRASHCAN_SAFE_END``). They should be replaced by the new macros ``Py_TRASHCAN_BEGIN`` and ``Py_TRASHCAN_END``.


From webhook-mailer at python.org  Wed Aug 18 16:09:38 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 18 Aug 2021 20:09:38 -0000
Subject: [Python-checkins] bpo-44947: Refine the syntax error for trailing
 commas in import statements (GH-27814)
Message-ID: <mailman.1076.1629317379.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/b2f68b190035540872072ac1d2349e7745e85596
commit: b2f68b190035540872072ac1d2349e7745e85596
branch: main
author: Pablo Galindo Salgado <Pablogsal at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-18T22:09:21+02:00
summary:

bpo-44947: Refine the syntax error for trailing commas in import statements (GH-27814)

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-18-19-09-28.bpo-44947.mcvGdS.rst
M Grammar/python.gram
M Lib/test/test_syntax.py
M Parser/parser.c

diff --git a/Grammar/python.gram b/Grammar/python.gram
index b107e474630c6d..97114b20f5dc64 100644
--- a/Grammar/python.gram
+++ b/Grammar/python.gram
@@ -1169,7 +1169,7 @@ invalid_group:
     | '(' a='**' expression ')' {
         RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "cannot use double starred expression here") }
 invalid_import_from_targets:
-    | import_from_as_names ',' {
+    | import_from_as_names ',' NEWLINE {
         RAISE_SYNTAX_ERROR("trailing comma not allowed without surrounding parentheses") }
 
 invalid_with_stmt:
diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
index c77aafeb363613..88503dcaad99b7 100644
--- a/Lib/test/test_syntax.py
+++ b/Lib/test/test_syntax.py
@@ -1202,6 +1202,13 @@
 Traceback (most recent call last):
 SyntaxError: trailing comma not allowed without surrounding parentheses
 
+# Check that we dont raise the "trailing comma" error if there is more
+# input to the left of the valid part that we parsed.
+
+>>> from t import x,y, and 3
+Traceback (most recent call last):
+SyntaxError: invalid syntax
+
 >>> (): int
 Traceback (most recent call last):
 SyntaxError: only single target (not tuple) can be annotated
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-18-19-09-28.bpo-44947.mcvGdS.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-18-19-09-28.bpo-44947.mcvGdS.rst
new file mode 100644
index 00000000000000..d531ba9faf3de5
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-18-19-09-28.bpo-44947.mcvGdS.rst	
@@ -0,0 +1,2 @@
+Refine the syntax error for trailing commas in import statements. Patch by
+Pablo Galindo.
diff --git a/Parser/parser.c b/Parser/parser.c
index 01082fa1d774ab..87227b7f2f7078 100644
--- a/Parser/parser.c
+++ b/Parser/parser.c
@@ -19540,7 +19540,7 @@ invalid_group_rule(Parser *p)
     return _res;
 }
 
-// invalid_import_from_targets: import_from_as_names ','
+// invalid_import_from_targets: import_from_as_names ',' NEWLINE
 static void *
 invalid_import_from_targets_rule(Parser *p)
 {
@@ -19551,21 +19551,24 @@ invalid_import_from_targets_rule(Parser *p)
     }
     void * _res = NULL;
     int _mark = p->mark;
-    { // import_from_as_names ','
+    { // import_from_as_names ',' NEWLINE
         if (p->error_indicator) {
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> invalid_import_from_targets[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "import_from_as_names ','"));
+        D(fprintf(stderr, "%*c> invalid_import_from_targets[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "import_from_as_names ',' NEWLINE"));
         Token * _literal;
         asdl_alias_seq* import_from_as_names_var;
+        Token * newline_var;
         if (
             (import_from_as_names_var = import_from_as_names_rule(p))  // import_from_as_names
             &&
             (_literal = _PyPegen_expect_token(p, 12))  // token=','
+            &&
+            (newline_var = _PyPegen_expect_token(p, NEWLINE))  // token='NEWLINE'
         )
         {
-            D(fprintf(stderr, "%*c+ invalid_import_from_targets[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "import_from_as_names ','"));
+            D(fprintf(stderr, "%*c+ invalid_import_from_targets[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "import_from_as_names ',' NEWLINE"));
             _res = RAISE_SYNTAX_ERROR ( "trailing comma not allowed without surrounding parentheses" );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
@@ -19576,7 +19579,7 @@ invalid_import_from_targets_rule(Parser *p)
         }
         p->mark = _mark;
         D(fprintf(stderr, "%*c%s invalid_import_from_targets[%d-%d]: %s failed!\n", p->level, ' ',
-                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "import_from_as_names ','"));
+                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "import_from_as_names ',' NEWLINE"));
     }
     _res = NULL;
   done:


From webhook-mailer at python.org  Wed Aug 18 16:32:10 2021
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 18 Aug 2021 20:32:10 -0000
Subject: [Python-checkins] bpo-44947: Refine the syntax error for trailing
 commas in import statements (GH-27814)
Message-ID: <mailman.1077.1629318730.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/846a10fc45ef83b41d1b1b568a9ee8012f37c8c2
commit: 846a10fc45ef83b41d1b1b568a9ee8012f37c8c2
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-18T13:32:01-07:00
summary:

bpo-44947: Refine the syntax error for trailing commas in import statements (GH-27814)

(cherry picked from commit b2f68b190035540872072ac1d2349e7745e85596)

Co-authored-by: Pablo Galindo Salgado <Pablogsal at gmail.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-18-19-09-28.bpo-44947.mcvGdS.rst
M Grammar/python.gram
M Lib/test/test_syntax.py
M Parser/parser.c

diff --git a/Grammar/python.gram b/Grammar/python.gram
index decc57807867ba..b3ae906fd5414f 100644
--- a/Grammar/python.gram
+++ b/Grammar/python.gram
@@ -947,7 +947,7 @@ invalid_group:
     | '(' a='**' expression ')' {
         RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "cannot use double starred expression here") }
 invalid_import_from_targets:
-    | import_from_as_names ',' {
+    | import_from_as_names ',' NEWLINE {
         RAISE_SYNTAX_ERROR("trailing comma not allowed without surrounding parentheses") }
 
 invalid_with_stmt:
diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
index c77aafeb363613..88503dcaad99b7 100644
--- a/Lib/test/test_syntax.py
+++ b/Lib/test/test_syntax.py
@@ -1202,6 +1202,13 @@
 Traceback (most recent call last):
 SyntaxError: trailing comma not allowed without surrounding parentheses
 
+# Check that we dont raise the "trailing comma" error if there is more
+# input to the left of the valid part that we parsed.
+
+>>> from t import x,y, and 3
+Traceback (most recent call last):
+SyntaxError: invalid syntax
+
 >>> (): int
 Traceback (most recent call last):
 SyntaxError: only single target (not tuple) can be annotated
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-18-19-09-28.bpo-44947.mcvGdS.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-18-19-09-28.bpo-44947.mcvGdS.rst
new file mode 100644
index 00000000000000..d531ba9faf3de5
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-18-19-09-28.bpo-44947.mcvGdS.rst	
@@ -0,0 +1,2 @@
+Refine the syntax error for trailing commas in import statements. Patch by
+Pablo Galindo.
diff --git a/Parser/parser.c b/Parser/parser.c
index acaa7b0e8db3fb..e57c603e5ab760 100644
--- a/Parser/parser.c
+++ b/Parser/parser.c
@@ -19607,7 +19607,7 @@ invalid_group_rule(Parser *p)
     return _res;
 }
 
-// invalid_import_from_targets: import_from_as_names ','
+// invalid_import_from_targets: import_from_as_names ',' NEWLINE
 static void *
 invalid_import_from_targets_rule(Parser *p)
 {
@@ -19618,21 +19618,24 @@ invalid_import_from_targets_rule(Parser *p)
     }
     void * _res = NULL;
     int _mark = p->mark;
-    { // import_from_as_names ','
+    { // import_from_as_names ',' NEWLINE
         if (p->error_indicator) {
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> invalid_import_from_targets[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "import_from_as_names ','"));
+        D(fprintf(stderr, "%*c> invalid_import_from_targets[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "import_from_as_names ',' NEWLINE"));
         Token * _literal;
         asdl_alias_seq* import_from_as_names_var;
+        Token * newline_var;
         if (
             (import_from_as_names_var = import_from_as_names_rule(p))  // import_from_as_names
             &&
             (_literal = _PyPegen_expect_token(p, 12))  // token=','
+            &&
+            (newline_var = _PyPegen_expect_token(p, NEWLINE))  // token='NEWLINE'
         )
         {
-            D(fprintf(stderr, "%*c+ invalid_import_from_targets[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "import_from_as_names ','"));
+            D(fprintf(stderr, "%*c+ invalid_import_from_targets[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "import_from_as_names ',' NEWLINE"));
             _res = RAISE_SYNTAX_ERROR ( "trailing comma not allowed without surrounding parentheses" );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
@@ -19643,7 +19646,7 @@ invalid_import_from_targets_rule(Parser *p)
         }
         p->mark = _mark;
         D(fprintf(stderr, "%*c%s invalid_import_from_targets[%d-%d]: %s failed!\n", p->level, ' ',
-                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "import_from_as_names ','"));
+                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "import_from_as_names ',' NEWLINE"));
     }
     _res = NULL;
   done:


From webhook-mailer at python.org  Wed Aug 18 17:04:08 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 18 Aug 2021 21:04:08 -0000
Subject: [Python-checkins] [3.9] bpo-44947: Refine the syntax error for
 trailing commas in import statements (GH-27814) (GH-27817)
Message-ID: <mailman.1078.1629320648.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/4e4d35d3325fb1e05dad43bd1ec73f14c3c5dc0a
commit: 4e4d35d3325fb1e05dad43bd1ec73f14c3c5dc0a
branch: 3.9
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2021-08-18T23:03:59+02:00
summary:

[3.9] bpo-44947: Refine the syntax error for trailing commas in import statements (GH-27814) (GH-27817)

(cherry picked from commit b2f68b190035540872072ac1d2349e7745e85596)

Co-authored-by: Pablo Galindo Salgado <Pablogsal at gmail.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-18-19-09-28.bpo-44947.mcvGdS.rst
M Grammar/python.gram
M Lib/test/test_syntax.py
M Parser/pegen/parse.c

diff --git a/Grammar/python.gram b/Grammar/python.gram
index 544b4f794e08f6..38405b72d80663 100644
--- a/Grammar/python.gram
+++ b/Grammar/python.gram
@@ -692,5 +692,5 @@ invalid_group:
     | '(' a=starred_expression ')' {
         RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "can't use starred expression here") }
 invalid_import_from_targets:
-    | import_from_as_names ',' {
+    | import_from_as_names ',' NEWLINE {
         RAISE_SYNTAX_ERROR("trailing comma not allowed without surrounding parentheses") }
diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
index 30d8e5a71800f2..f54b09f54f03de 100644
--- a/Lib/test/test_syntax.py
+++ b/Lib/test/test_syntax.py
@@ -727,6 +727,13 @@
 Traceback (most recent call last):
 SyntaxError: trailing comma not allowed without surrounding parentheses
 
+# Check that we dont raise the "trailing comma" error if there is more
+# input to the left of the valid part that we parsed.
+
+>>> from t import x,y, and 3
+Traceback (most recent call last):
+SyntaxError: invalid syntax
+
 >>> (): int
 Traceback (most recent call last):
 SyntaxError: only single target (not tuple) can be annotated
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-18-19-09-28.bpo-44947.mcvGdS.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-18-19-09-28.bpo-44947.mcvGdS.rst
new file mode 100644
index 00000000000000..d531ba9faf3de5
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-18-19-09-28.bpo-44947.mcvGdS.rst	
@@ -0,0 +1,2 @@
+Refine the syntax error for trailing commas in import statements. Patch by
+Pablo Galindo.
diff --git a/Parser/pegen/parse.c b/Parser/pegen/parse.c
index 78e68d1618734f..dc388ce3dbd9e9 100644
--- a/Parser/pegen/parse.c
+++ b/Parser/pegen/parse.c
@@ -15375,7 +15375,7 @@ invalid_group_rule(Parser *p)
     return _res;
 }
 
-// invalid_import_from_targets: import_from_as_names ','
+// invalid_import_from_targets: import_from_as_names ',' NEWLINE
 static void *
 invalid_import_from_targets_rule(Parser *p)
 {
@@ -15386,21 +15386,24 @@ invalid_import_from_targets_rule(Parser *p)
     }
     void * _res = NULL;
     int _mark = p->mark;
-    { // import_from_as_names ','
+    { // import_from_as_names ',' NEWLINE
         if (p->error_indicator) {
             D(p->level--);
             return NULL;
         }
-        D(fprintf(stderr, "%*c> invalid_import_from_targets[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "import_from_as_names ','"));
+        D(fprintf(stderr, "%*c> invalid_import_from_targets[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "import_from_as_names ',' NEWLINE"));
         Token * _literal;
         asdl_seq* import_from_as_names_var;
+        Token * newline_var;
         if (
             (import_from_as_names_var = import_from_as_names_rule(p))  // import_from_as_names
             &&
             (_literal = _PyPegen_expect_token(p, 12))  // token=','
+            &&
+            (newline_var = _PyPegen_expect_token(p, NEWLINE))  // token='NEWLINE'
         )
         {
-            D(fprintf(stderr, "%*c+ invalid_import_from_targets[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "import_from_as_names ','"));
+            D(fprintf(stderr, "%*c+ invalid_import_from_targets[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "import_from_as_names ',' NEWLINE"));
             _res = RAISE_SYNTAX_ERROR ( "trailing comma not allowed without surrounding parentheses" );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
@@ -15411,7 +15414,7 @@ invalid_import_from_targets_rule(Parser *p)
         }
         p->mark = _mark;
         D(fprintf(stderr, "%*c%s invalid_import_from_targets[%d-%d]: %s failed!\n", p->level, ' ',
-                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "import_from_as_names ','"));
+                  p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "import_from_as_names ',' NEWLINE"));
     }
     _res = NULL;
   done:


From webhook-mailer at python.org  Wed Aug 18 19:38:03 2021
From: webhook-mailer at python.org (pablogsal)
Date: Wed, 18 Aug 2021 23:38:03 -0000
Subject: [Python-checkins] bpo-44079: Strip superfluous statement cache from
 sqlite3.Connection (GH-25998)
Message-ID: <mailman.1079.1629329884.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/243b6c3b8fd3144450c477d99f01e31e7c3ebc0f
commit: 243b6c3b8fd3144450c477d99f01e31e7c3ebc0f
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-08-19T00:37:53+01:00
summary:

bpo-44079: Strip superfluous statement cache from sqlite3.Connection (GH-25998)

files:
M Modules/_sqlite/connection.c
M Modules/_sqlite/connection.h
M Modules/_sqlite/statement.c
M Modules/_sqlite/statement.h

diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index 67160c4c449aa..0645367988e63 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -29,9 +29,6 @@
 #include "prepare_protocol.h"
 #include "util.h"
 
-#define ACTION_FINALIZE 1
-#define ACTION_RESET 2
-
 #if SQLITE_VERSION_NUMBER >= 3014000
 #define HAVE_TRACE_V2
 #endif
@@ -114,7 +111,6 @@ pysqlite_connection_init_impl(pysqlite_Connection *self,
     self->begin_statement = NULL;
 
     Py_CLEAR(self->statement_cache);
-    Py_CLEAR(self->statements);
     Py_CLEAR(self->cursors);
 
     Py_INCREF(Py_None);
@@ -159,13 +155,11 @@ pysqlite_connection_init_impl(pysqlite_Connection *self,
         return -1;
     }
 
-    self->created_statements = 0;
     self->created_cursors = 0;
 
-    /* Create lists of weak references to statements/cursors */
-    self->statements = PyList_New(0);
+    /* Create list of weak references to cursors */
     self->cursors = PyList_New(0);
-    if (!self->statements || !self->cursors) {
+    if (self->cursors == NULL) {
         return -1;
     }
 
@@ -198,37 +192,24 @@ pysqlite_connection_init_impl(pysqlite_Connection *self,
     return 0;
 }
 
-/* action in (ACTION_RESET, ACTION_FINALIZE) */
 static void
-pysqlite_do_all_statements(pysqlite_Connection *self, int action,
-                           int reset_cursors)
+pysqlite_do_all_statements(pysqlite_Connection *self)
 {
-    int i;
-    PyObject* weakref;
-    PyObject* statement;
-    pysqlite_Cursor* cursor;
-
-    for (i = 0; i < PyList_Size(self->statements); i++) {
-        weakref = PyList_GetItem(self->statements, i);
-        statement = PyWeakref_GetObject(weakref);
-        if (statement != Py_None) {
-            Py_INCREF(statement);
-            if (action == ACTION_RESET) {
-                (void)pysqlite_statement_reset((pysqlite_Statement*)statement);
-            } else {
-                (void)pysqlite_statement_finalize((pysqlite_Statement*)statement);
-            }
-            Py_DECREF(statement);
+    // Reset all statements
+    sqlite3_stmt *stmt = NULL;
+    while ((stmt = sqlite3_next_stmt(self->db, stmt))) {
+        if (sqlite3_stmt_busy(stmt)) {
+            (void)sqlite3_reset(stmt);
         }
     }
 
-    if (reset_cursors) {
-        for (i = 0; i < PyList_Size(self->cursors); i++) {
-            weakref = PyList_GetItem(self->cursors, i);
-            cursor = (pysqlite_Cursor*)PyWeakref_GetObject(weakref);
-            if ((PyObject*)cursor != Py_None) {
-                cursor->reset = 1;
-            }
+    // Reset all cursors
+    for (int i = 0; i < PyList_Size(self->cursors); i++) {
+        PyObject *weakref = PyList_GetItem(self->cursors, i);
+        PyObject *object = PyWeakref_GetObject(weakref);
+        if (object != Py_None) {
+            pysqlite_Cursor *cursor = (pysqlite_Cursor *)object;
+            cursor->reset = 1;
         }
     }
 }
@@ -239,7 +220,6 @@ connection_traverse(pysqlite_Connection *self, visitproc visit, void *arg)
     Py_VISIT(Py_TYPE(self));
     Py_VISIT(self->isolation_level);
     Py_VISIT(self->statement_cache);
-    Py_VISIT(self->statements);
     Py_VISIT(self->cursors);
     Py_VISIT(self->row_factory);
     Py_VISIT(self->text_factory);
@@ -254,7 +234,6 @@ connection_clear(pysqlite_Connection *self)
 {
     Py_CLEAR(self->isolation_level);
     Py_CLEAR(self->statement_cache);
-    Py_CLEAR(self->statements);
     Py_CLEAR(self->cursors);
     Py_CLEAR(self->row_factory);
     Py_CLEAR(self->text_factory);
@@ -378,7 +357,7 @@ pysqlite_connection_close_impl(pysqlite_Connection *self)
         return NULL;
     }
 
-    pysqlite_do_all_statements(self, ACTION_FINALIZE, 1);
+    Py_CLEAR(self->statement_cache);
     connection_close(self);
 
     Py_RETURN_NONE;
@@ -474,7 +453,7 @@ pysqlite_connection_rollback_impl(pysqlite_Connection *self)
     }
 
     if (!sqlite3_get_autocommit(self->db)) {
-        pysqlite_do_all_statements(self, ACTION_RESET, 1);
+        pysqlite_do_all_statements(self);
 
         Py_BEGIN_ALLOW_THREADS
         rc = sqlite3_prepare_v2(self->db, "ROLLBACK", 9, &statement, NULL);
@@ -774,37 +753,6 @@ _pysqlite_final_callback(sqlite3_context *context)
     PyGILState_Release(threadstate);
 }
 
-static void _pysqlite_drop_unused_statement_references(pysqlite_Connection* self)
-{
-    PyObject* new_list;
-    PyObject* weakref;
-    int i;
-
-    /* we only need to do this once in a while */
-    if (self->created_statements++ < 200) {
-        return;
-    }
-
-    self->created_statements = 0;
-
-    new_list = PyList_New(0);
-    if (!new_list) {
-        return;
-    }
-
-    for (i = 0; i < PyList_Size(self->statements); i++) {
-        weakref = PyList_GetItem(self->statements, i);
-        if (PyWeakref_GetObject(weakref) != Py_None) {
-            if (PyList_Append(new_list, weakref) != 0) {
-                Py_DECREF(new_list);
-                return;
-            }
-        }
-    }
-
-    Py_SETREF(self->statements, new_list);
-}
-
 static void _pysqlite_drop_unused_cursor_references(pysqlite_Connection* self)
 {
     PyObject* new_list;
@@ -1358,7 +1306,6 @@ pysqlite_connection_call(pysqlite_Connection *self, PyObject *args,
 {
     PyObject* sql;
     pysqlite_Statement* statement;
-    PyObject* weakref;
 
     if (!pysqlite_check_thread(self) || !pysqlite_check_connection(self)) {
         return NULL;
@@ -1370,27 +1317,12 @@ pysqlite_connection_call(pysqlite_Connection *self, PyObject *args,
     if (!PyArg_ParseTuple(args, "U", &sql))
         return NULL;
 
-    _pysqlite_drop_unused_statement_references(self);
-
     statement = pysqlite_statement_create(self, sql);
     if (statement == NULL) {
         return NULL;
     }
 
-    weakref = PyWeakref_NewRef((PyObject*)statement, NULL);
-    if (weakref == NULL)
-        goto error;
-    if (PyList_Append(self->statements, weakref) != 0) {
-        Py_DECREF(weakref);
-        goto error;
-    }
-    Py_DECREF(weakref);
-
     return (PyObject*)statement;
-
-error:
-    Py_DECREF(statement);
-    return NULL;
 }
 
 /*[clinic input]
diff --git a/Modules/_sqlite/connection.h b/Modules/_sqlite/connection.h
index edf565020420d..4f08a6d5f7b21 100644
--- a/Modules/_sqlite/connection.h
+++ b/Modules/_sqlite/connection.h
@@ -60,12 +60,10 @@ typedef struct
     PyObject *statement_cache;
 
     /* Lists of weak references to statements and cursors used within this connection */
-    PyObject* statements;
     PyObject* cursors;
 
-    /* Counters for how many statements/cursors were created in the connection. May be
+    /* Counters for how many cursors were created in the connection. May be
      * reset to 0 at certain intervals */
-    int created_statements;
     int created_cursors;
 
     PyObject* row_factory;
diff --git a/Modules/_sqlite/statement.c b/Modules/_sqlite/statement.c
index 2d5c72d13b7ed..b20c91da3179c 100644
--- a/Modules/_sqlite/statement.c
+++ b/Modules/_sqlite/statement.c
@@ -118,7 +118,6 @@ pysqlite_statement_create(pysqlite_Connection *connection, PyObject *sql)
     self->st = stmt;
     self->in_use = 0;
     self->is_dml = is_dml;
-    self->in_weakreflist = NULL;
 
     PyObject_GC_Track(self);
     return self;
@@ -361,23 +360,6 @@ pysqlite_statement_bind_parameters(pysqlite_state *state,
     }
 }
 
-int pysqlite_statement_finalize(pysqlite_Statement* self)
-{
-    int rc;
-
-    rc = SQLITE_OK;
-    if (self->st) {
-        Py_BEGIN_ALLOW_THREADS
-        rc = sqlite3_finalize(self->st);
-        Py_END_ALLOW_THREADS
-        self->st = NULL;
-    }
-
-    self->in_use = 0;
-
-    return rc;
-}
-
 int pysqlite_statement_reset(pysqlite_Statement* self)
 {
     int rc;
@@ -407,9 +389,6 @@ stmt_dealloc(pysqlite_Statement *self)
 {
     PyTypeObject *tp = Py_TYPE(self);
     PyObject_GC_UnTrack(self);
-    if (self->in_weakreflist != NULL) {
-        PyObject_ClearWeakRefs((PyObject*)self);
-    }
     if (self->st) {
         Py_BEGIN_ALLOW_THREADS
         sqlite3_finalize(self->st);
@@ -497,12 +476,7 @@ static int pysqlite_check_remaining_sql(const char* tail)
     return 0;
 }
 
-static PyMemberDef stmt_members[] = {
-    {"__weaklistoffset__", T_PYSSIZET, offsetof(pysqlite_Statement, in_weakreflist), READONLY},
-    {NULL},
-};
 static PyType_Slot stmt_slots[] = {
-    {Py_tp_members, stmt_members},
     {Py_tp_dealloc, stmt_dealloc},
     {Py_tp_traverse, stmt_traverse},
     {0, NULL},
diff --git a/Modules/_sqlite/statement.h b/Modules/_sqlite/statement.h
index dc692d7df99fd..b901c43c479ae 100644
--- a/Modules/_sqlite/statement.h
+++ b/Modules/_sqlite/statement.h
@@ -35,7 +35,6 @@ typedef struct
     sqlite3_stmt* st;
     int in_use;
     int is_dml;
-    PyObject* in_weakreflist; /* List of weak references */
 } pysqlite_Statement;
 
 pysqlite_Statement *pysqlite_statement_create(pysqlite_Connection *connection, PyObject *sql);
@@ -45,7 +44,6 @@ void pysqlite_statement_bind_parameters(pysqlite_state *state,
                                         pysqlite_Statement *self,
                                         PyObject *parameters);
 
-int pysqlite_statement_finalize(pysqlite_Statement* self);
 int pysqlite_statement_reset(pysqlite_Statement* self);
 void pysqlite_statement_mark_dirty(pysqlite_Statement* self);
 


From webhook-mailer at python.org  Thu Aug 19 04:11:16 2021
From: webhook-mailer at python.org (ambv)
Date: Thu, 19 Aug 2021 08:11:16 -0000
Subject: [Python-checkins] bpo-44830: [doc] Restore missing Mozilla devguide
 link (GH-27818)
Message-ID: <mailman.1080.1629360677.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/942d1a4284e9341df47c48d7c63e921136dc9719
commit: 942d1a4284e9341df47c48d7c63e921136dc9719
branch: main
author: Jack DeVries <58614260+jdevries3133 at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-19T10:10:54+02:00
summary:

bpo-44830: [doc] Restore missing Mozilla devguide link (GH-27818)

files:
M Doc/bugs.rst

diff --git a/Doc/bugs.rst b/Doc/bugs.rst
index 82819792a1ad8c..b3d057797c2561 100644
--- a/Doc/bugs.rst
+++ b/Doc/bugs.rst
@@ -80,6 +80,10 @@ taken on the bug.
       Article which goes into some detail about how to create a useful bug report.
       This describes what kind of information is useful and why it is useful.
 
+   `Bug Writing Guidelines <https://bugzilla.mozilla.org/page.cgi?id=bug-writing.html>`_
+      Information about writing a good bug report.  Some of this is specific to the
+      Mozilla project, but describes general good practices.
+
 .. _contributing-to-python:
 
 Getting started contributing to Python yourself


From webhook-mailer at python.org  Thu Aug 19 04:33:47 2021
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 19 Aug 2021 08:33:47 -0000
Subject: [Python-checkins] bpo-44830: [doc] Restore missing Mozilla devguide
 link (GH-27818)
Message-ID: <mailman.1081.1629362028.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/ad16f93942a398ca1ec9bba54bb9c53a4e121e75
commit: ad16f93942a398ca1ec9bba54bb9c53a4e121e75
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-19T01:33:42-07:00
summary:

bpo-44830: [doc] Restore missing Mozilla devguide link (GH-27818)

(cherry picked from commit 942d1a4284e9341df47c48d7c63e921136dc9719)

Co-authored-by: Jack DeVries <58614260+jdevries3133 at users.noreply.github.com>

files:
M Doc/bugs.rst

diff --git a/Doc/bugs.rst b/Doc/bugs.rst
index 82819792a1ad8c..b3d057797c2561 100644
--- a/Doc/bugs.rst
+++ b/Doc/bugs.rst
@@ -80,6 +80,10 @@ taken on the bug.
       Article which goes into some detail about how to create a useful bug report.
       This describes what kind of information is useful and why it is useful.
 
+   `Bug Writing Guidelines <https://bugzilla.mozilla.org/page.cgi?id=bug-writing.html>`_
+      Information about writing a good bug report.  Some of this is specific to the
+      Mozilla project, but describes general good practices.
+
 .. _contributing-to-python:
 
 Getting started contributing to Python yourself


From webhook-mailer at python.org  Thu Aug 19 04:37:00 2021
From: webhook-mailer at python.org (ambv)
Date: Thu, 19 Aug 2021 08:37:00 -0000
Subject: [Python-checkins] bpo-44830: [doc] Restore missing Mozilla devguide
 link (GH-27818) (GH-27821)
Message-ID: <mailman.1082.1629362220.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/fb6074f5d71a6f9802bad97a129378c9556ed8d3
commit: fb6074f5d71a6f9802bad97a129378c9556ed8d3
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-19T10:36:55+02:00
summary:

bpo-44830: [doc] Restore missing Mozilla devguide link (GH-27818) (GH-27821)

(cherry picked from commit 942d1a4284e9341df47c48d7c63e921136dc9719)

Co-authored-by: Jack DeVries <58614260+jdevries3133 at users.noreply.github.com>

files:
M Doc/bugs.rst

diff --git a/Doc/bugs.rst b/Doc/bugs.rst
index ee914920f10f02..192995ab06344c 100644
--- a/Doc/bugs.rst
+++ b/Doc/bugs.rst
@@ -80,6 +80,10 @@ taken on the bug.
       Article which goes into some detail about how to create a useful bug report.
       This describes what kind of information is useful and why it is useful.
 
+   `Bug Writing Guidelines <https://bugzilla.mozilla.org/page.cgi?id=bug-writing.html>`_
+      Information about writing a good bug report.  Some of this is specific to the
+      Mozilla project, but describes general good practices.
+
 .. _contributing-to-python:
 
 Getting started contributing to Python yourself


From webhook-mailer at python.org  Thu Aug 19 04:50:48 2021
From: webhook-mailer at python.org (ambv)
Date: Thu, 19 Aug 2021 08:50:48 -0000
Subject: [Python-checkins] [3.8] bpo-36384: [doc] Correct typos in
 CVE-2021-29921 fix description (GH-27825)
Message-ID: <mailman.1083.1629363049.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/6ebfe8da6331bfcf54057f6e22a6f353a5621d35
commit: 6ebfe8da6331bfcf54057f6e22a6f353a5621d35
branch: 3.8
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2021-08-19T10:50:40+02:00
summary:

[3.8] bpo-36384: [doc] Correct typos in CVE-2021-29921 fix description (GH-27825)

files:
M Doc/whatsnew/3.8.rst
M Misc/NEWS.d/next/Security/2021-03-30-16-29-51.bpo-36384.sCAmLs.rst

diff --git a/Doc/whatsnew/3.8.rst b/Doc/whatsnew/3.8.rst
index 7a3460adb3827f..c27c968aa16302 100644
--- a/Doc/whatsnew/3.8.rst
+++ b/Doc/whatsnew/3.8.rst
@@ -2317,7 +2317,7 @@ Changes in the Python API
 Starting with Python 3.8.12 the :mod:`ipaddress` module no longer accepts
 any leading zeros in IPv4 address strings. Leading zeros are ambiguous and
 interpreted as octal notation by some libraries. For example the legacy
-function :func:`socket.inet_aton` treats leading zeros as octal notatation.
+function :func:`socket.inet_aton` treats leading zeros as octal notation.
 glibc implementation of modern :func:`~socket.inet_pton` does not accept
 any leading zeros.
 
diff --git a/Misc/NEWS.d/next/Security/2021-03-30-16-29-51.bpo-36384.sCAmLs.rst b/Misc/NEWS.d/next/Security/2021-03-30-16-29-51.bpo-36384.sCAmLs.rst
index f956cde948ec57..6e2926ce1e1746 100644
--- a/Misc/NEWS.d/next/Security/2021-03-30-16-29-51.bpo-36384.sCAmLs.rst
+++ b/Misc/NEWS.d/next/Security/2021-03-30-16-29-51.bpo-36384.sCAmLs.rst
@@ -1,6 +1,6 @@
 :mod:`ipaddress` module no longer accepts any leading zeros in IPv4 address
 strings. Leading zeros are ambiguous and interpreted as octal notation by
 some libraries. For example the legacy function :func:`socket.inet_aton`
-treats leading zeros as octal notatation. glibc implementation of modern
+treats leading zeros as octal notation. glibc implementation of modern
 :func:`~socket.inet_pton` does not accept any leading zeros. For a while
 the :mod:`ipaddress` module used to accept ambiguous leading zeros.


From webhook-mailer at python.org  Thu Aug 19 04:52:20 2021
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 19 Aug 2021 08:52:20 -0000
Subject: [Python-checkins] bpo-44949: Fix test_readline auto history tests
 (GH-27813)
Message-ID: <mailman.1084.1629363141.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/fc6ad0585e8133ee0fca05f0f8075b62fe71a95d
commit: fc6ad0585e8133ee0fca05f0f8075b62fe71a95d
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-19T01:52:16-07:00
summary:

bpo-44949: Fix test_readline auto history tests (GH-27813)

(cherry picked from commit 6fb62b42f4db56ed5efe0ca4c1059049276c1083)

Co-authored-by: Victor Stinner <vstinner at python.org>

files:
A Misc/NEWS.d/next/Tests/2021-08-18-18-30-12.bpo-44949.VE5ENv.rst
M Lib/test/test_readline.py

diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py
index f3e404da6f0b87..e8fb8d2f9cc603 100644
--- a/Lib/test/test_readline.py
+++ b/Lib/test/test_readline.py
@@ -156,11 +156,15 @@ def test_init(self):
 
     def test_auto_history_enabled(self):
         output = run_pty(self.auto_history_script.format(True))
-        self.assertIn(b"History length: 1\r\n", output)
+        # bpo-44949: Sometimes, the newline character is not written at the
+        # end, so don't expect it in the output.
+        self.assertIn(b"History length: 1", output)
 
     def test_auto_history_disabled(self):
         output = run_pty(self.auto_history_script.format(False))
-        self.assertIn(b"History length: 0\r\n", output)
+        # bpo-44949: Sometimes, the newline character is not written at the
+        # end, so don't expect it in the output.
+        self.assertIn(b"History length: 0", output)
 
     def test_nonascii(self):
         loc = locale.setlocale(locale.LC_CTYPE, None)
diff --git a/Misc/NEWS.d/next/Tests/2021-08-18-18-30-12.bpo-44949.VE5ENv.rst b/Misc/NEWS.d/next/Tests/2021-08-18-18-30-12.bpo-44949.VE5ENv.rst
new file mode 100644
index 00000000000000..7fdf1810b165e5
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2021-08-18-18-30-12.bpo-44949.VE5ENv.rst
@@ -0,0 +1,2 @@
+Fix auto history tests of test_readline: sometimes, the newline character is
+not written at the end, so don't expect it in the output.


From webhook-mailer at python.org  Thu Aug 19 04:55:54 2021
From: webhook-mailer at python.org (ambv)
Date: Thu, 19 Aug 2021 08:55:54 -0000
Subject: [Python-checkins] bpo-36384: [doc] Mention CVE-2021-29921 fix in
 3.8.12 (GH-27824)
Message-ID: <mailman.1085.1629363355.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/0fd66e46b2f472d0d206a185dc8892f4f0347cb6
commit: 0fd66e46b2f472d0d206a185dc8892f4f0347cb6
branch: main
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2021-08-19T10:55:49+02:00
summary:

bpo-36384: [doc] Mention CVE-2021-29921 fix in 3.8.12 (GH-27824)

files:
M Doc/library/ipaddress.rst
M Doc/whatsnew/3.8.rst

diff --git a/Doc/library/ipaddress.rst b/Doc/library/ipaddress.rst
index 1c2263b128a8fe..2ab4dd83ad4dee 100644
--- a/Doc/library/ipaddress.rst
+++ b/Doc/library/ipaddress.rst
@@ -132,6 +132,11 @@ write code that handles both IP versions correctly.  Address objects are
       The above change was also included in Python 3.9 starting with
       version 3.9.5.
 
+   .. versionchanged:: 3.8.12
+
+      The above change was also included in Python 3.8 starting with
+      version 3.8.12.
+
    .. attribute:: version
 
       The appropriate version number: ``4`` for IPv4, ``6`` for IPv6.
diff --git a/Doc/whatsnew/3.8.rst b/Doc/whatsnew/3.8.rst
index f1a903624f4c2c..7c293a501895b3 100644
--- a/Doc/whatsnew/3.8.rst
+++ b/Doc/whatsnew/3.8.rst
@@ -2248,3 +2248,16 @@ separator key, with ``&`` as the default.  This change also affects
 functions internally. For more details, please see their respective
 documentation.
 (Contributed by Adam Goldschmidt, Senthil Kumaran and Ken Jin in :issue:`42967`.)
+
+Notable changes in Python 3.8.12
+================================
+
+Starting with Python 3.8.12 the :mod:`ipaddress` module no longer accepts
+any leading zeros in IPv4 address strings. Leading zeros are ambiguous and
+interpreted as octal notation by some libraries. For example the legacy
+function :func:`socket.inet_aton` treats leading zeros as octal notation.
+glibc implementation of modern :func:`~socket.inet_pton` does not accept
+any leading zeros.
+
+(Originally contributed by Christian Heimes in :issue:`36384`, and backported
+to 3.8 by Achraf Merzouki.)


From webhook-mailer at python.org  Thu Aug 19 05:16:19 2021
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 19 Aug 2021 09:16:19 -0000
Subject: [Python-checkins] bpo-36384: [doc] Mention CVE-2021-29921 fix in
 3.8.12 (GH-27824)
Message-ID: <mailman.1086.1629364580.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/1204dfc89cb3ed5e21dce32aed0339b7569fe1f9
commit: 1204dfc89cb3ed5e21dce32aed0339b7569fe1f9
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-19T02:16:15-07:00
summary:

bpo-36384: [doc] Mention CVE-2021-29921 fix in 3.8.12 (GH-27824)

(cherry picked from commit 0fd66e46b2f472d0d206a185dc8892f4f0347cb6)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
M Doc/library/ipaddress.rst
M Doc/whatsnew/3.8.rst

diff --git a/Doc/library/ipaddress.rst b/Doc/library/ipaddress.rst
index 1c2263b128a8fe..2ab4dd83ad4dee 100644
--- a/Doc/library/ipaddress.rst
+++ b/Doc/library/ipaddress.rst
@@ -132,6 +132,11 @@ write code that handles both IP versions correctly.  Address objects are
       The above change was also included in Python 3.9 starting with
       version 3.9.5.
 
+   .. versionchanged:: 3.8.12
+
+      The above change was also included in Python 3.8 starting with
+      version 3.8.12.
+
    .. attribute:: version
 
       The appropriate version number: ``4`` for IPv4, ``6`` for IPv6.
diff --git a/Doc/whatsnew/3.8.rst b/Doc/whatsnew/3.8.rst
index f1a903624f4c2c..7c293a501895b3 100644
--- a/Doc/whatsnew/3.8.rst
+++ b/Doc/whatsnew/3.8.rst
@@ -2248,3 +2248,16 @@ separator key, with ``&`` as the default.  This change also affects
 functions internally. For more details, please see their respective
 documentation.
 (Contributed by Adam Goldschmidt, Senthil Kumaran and Ken Jin in :issue:`42967`.)
+
+Notable changes in Python 3.8.12
+================================
+
+Starting with Python 3.8.12 the :mod:`ipaddress` module no longer accepts
+any leading zeros in IPv4 address strings. Leading zeros are ambiguous and
+interpreted as octal notation by some libraries. For example the legacy
+function :func:`socket.inet_aton` treats leading zeros as octal notation.
+glibc implementation of modern :func:`~socket.inet_pton` does not accept
+any leading zeros.
+
+(Originally contributed by Christian Heimes in :issue:`36384`, and backported
+to 3.8 by Achraf Merzouki.)


From webhook-mailer at python.org  Thu Aug 19 05:20:51 2021
From: webhook-mailer at python.org (ambv)
Date: Thu, 19 Aug 2021 09:20:51 -0000
Subject: [Python-checkins] bpo-36384: [doc] Mention CVE-2021-29921 fix in
 3.8.12 (GH-27824) (GH-27827)
Message-ID: <mailman.1087.1629364852.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/98820250a3c9c131d3c2d57c4fc5260aebd8aa1d
commit: 98820250a3c9c131d3c2d57c4fc5260aebd8aa1d
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-19T11:20:47+02:00
summary:

bpo-36384: [doc] Mention CVE-2021-29921 fix in 3.8.12 (GH-27824) (GH-27827)

(cherry picked from commit 0fd66e46b2f472d0d206a185dc8892f4f0347cb6)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
M Doc/library/ipaddress.rst
M Doc/whatsnew/3.8.rst

diff --git a/Doc/library/ipaddress.rst b/Doc/library/ipaddress.rst
index 1c2263b128a8fe..2ab4dd83ad4dee 100644
--- a/Doc/library/ipaddress.rst
+++ b/Doc/library/ipaddress.rst
@@ -132,6 +132,11 @@ write code that handles both IP versions correctly.  Address objects are
       The above change was also included in Python 3.9 starting with
       version 3.9.5.
 
+   .. versionchanged:: 3.8.12
+
+      The above change was also included in Python 3.8 starting with
+      version 3.8.12.
+
    .. attribute:: version
 
       The appropriate version number: ``4`` for IPv4, ``6`` for IPv6.
diff --git a/Doc/whatsnew/3.8.rst b/Doc/whatsnew/3.8.rst
index dbc3875aae61b3..1b3bb152eea13c 100644
--- a/Doc/whatsnew/3.8.rst
+++ b/Doc/whatsnew/3.8.rst
@@ -2247,3 +2247,16 @@ separator key, with ``&`` as the default.  This change also affects
 functions internally. For more details, please see their respective
 documentation.
 (Contributed by Adam Goldschmidt, Senthil Kumaran and Ken Jin in :issue:`42967`.)
+
+Notable changes in Python 3.8.12
+================================
+
+Starting with Python 3.8.12 the :mod:`ipaddress` module no longer accepts
+any leading zeros in IPv4 address strings. Leading zeros are ambiguous and
+interpreted as octal notation by some libraries. For example the legacy
+function :func:`socket.inet_aton` treats leading zeros as octal notation.
+glibc implementation of modern :func:`~socket.inet_pton` does not accept
+any leading zeros.
+
+(Originally contributed by Christian Heimes in :issue:`36384`, and backported
+to 3.8 by Achraf Merzouki.)


From webhook-mailer at python.org  Thu Aug 19 05:41:13 2021
From: webhook-mailer at python.org (ambv)
Date: Thu, 19 Aug 2021 09:41:13 -0000
Subject: [Python-checkins] bpo-41322: added deprecation warning for tests
 returning value!=None (GH-27748)
Message-ID: <mailman.1088.1629366074.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/3db42fc5aca320b0cac1895bc3cb731235ede794
commit: 3db42fc5aca320b0cac1895bc3cb731235ede794
branch: main
author: andrei kulakov <andrei.avk at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-19T11:41:04+02:00
summary:

bpo-41322: added deprecation warning for tests returning value!=None (GH-27748)

files:
A Misc/NEWS.d/next/Library/2021-08-12-16-22-16.bpo-41322.utscTd.rst
M Lib/unittest/async_case.py
M Lib/unittest/case.py

diff --git a/Lib/unittest/async_case.py b/Lib/unittest/async_case.py
index 86ed7046c499a3..cc404cc06f8b65 100644
--- a/Lib/unittest/async_case.py
+++ b/Lib/unittest/async_case.py
@@ -1,5 +1,6 @@
 import asyncio
 import inspect
+import warnings
 
 from .case import TestCase
 
@@ -62,7 +63,9 @@ def _callSetUp(self):
         self._callAsync(self.asyncSetUp)
 
     def _callTestMethod(self, method):
-        self._callMaybeAsync(method)
+        if self._callMaybeAsync(method) is not None:
+            warnings.warn(f'It is deprecated to return a value!=None from a '
+                          f'test case ({method})', DeprecationWarning)
 
     def _callTearDown(self):
         self._callAsync(self.asyncTearDown)
diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index 872f12112755e9..3c771c0ca8e102 100644
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -546,7 +546,9 @@ def _callSetUp(self):
         self.setUp()
 
     def _callTestMethod(self, method):
-        method()
+        if method() is not None:
+            warnings.warn(f'It is deprecated to return a value!=None from a '
+                          f'test case ({method})', DeprecationWarning)
 
     def _callTearDown(self):
         self.tearDown()
diff --git a/Misc/NEWS.d/next/Library/2021-08-12-16-22-16.bpo-41322.utscTd.rst b/Misc/NEWS.d/next/Library/2021-08-12-16-22-16.bpo-41322.utscTd.rst
new file mode 100644
index 00000000000000..e16efd2c7bd556
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-12-16-22-16.bpo-41322.utscTd.rst
@@ -0,0 +1,3 @@
+Added ``DeprecationWarning`` for tests and async tests that return a
+value!=None (as this may indicate an improperly written test, for example a
+test written as a generator function).


From webhook-mailer at python.org  Thu Aug 19 06:36:01 2021
From: webhook-mailer at python.org (ambv)
Date: Thu, 19 Aug 2021 10:36:01 -0000
Subject: [Python-checkins] bpo-44949: Fix test_readline auto history tests
 (GH-27813) (GH-27822)
Message-ID: <mailman.1089.1629369363.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/0215257c613d55bec27201683f3dcb00f1726536
commit: 0215257c613d55bec27201683f3dcb00f1726536
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-19T12:35:28+02:00
summary:

bpo-44949: Fix test_readline auto history tests (GH-27813) (GH-27822)

(cherry picked from commit 6fb62b42f4db56ed5efe0ca4c1059049276c1083)

Co-authored-by: Victor Stinner <vstinner at python.org>

files:
A Misc/NEWS.d/next/Tests/2021-08-18-18-30-12.bpo-44949.VE5ENv.rst
M Lib/test/test_readline.py

diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py
index 67ee9b7f7cfb1f..7898abb7a61d51 100644
--- a/Lib/test/test_readline.py
+++ b/Lib/test/test_readline.py
@@ -147,11 +147,15 @@ def test_init(self):
 
     def test_auto_history_enabled(self):
         output = run_pty(self.auto_history_script.format(True))
-        self.assertIn(b"History length: 1\r\n", output)
+        # bpo-44949: Sometimes, the newline character is not written at the
+        # end, so don't expect it in the output.
+        self.assertIn(b"History length: 1", output)
 
     def test_auto_history_disabled(self):
         output = run_pty(self.auto_history_script.format(False))
-        self.assertIn(b"History length: 0\r\n", output)
+        # bpo-44949: Sometimes, the newline character is not written at the
+        # end, so don't expect it in the output.
+        self.assertIn(b"History length: 0", output)
 
     def test_nonascii(self):
         loc = locale.setlocale(locale.LC_CTYPE, None)
diff --git a/Misc/NEWS.d/next/Tests/2021-08-18-18-30-12.bpo-44949.VE5ENv.rst b/Misc/NEWS.d/next/Tests/2021-08-18-18-30-12.bpo-44949.VE5ENv.rst
new file mode 100644
index 00000000000000..7fdf1810b165e5
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2021-08-18-18-30-12.bpo-44949.VE5ENv.rst
@@ -0,0 +1,2 @@
+Fix auto history tests of test_readline: sometimes, the newline character is
+not written at the end, so don't expect it in the output.


From webhook-mailer at python.org  Thu Aug 19 16:47:30 2021
From: webhook-mailer at python.org (ericvsmith)
Date: Thu, 19 Aug 2021 20:47:30 -0000
Subject: [Python-checkins] Fix reST markup in dataclasses.rst (GH-27843)
Message-ID: <mailman.1090.1629406051.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/d26dbba9297adb59bc49a6583c647804ef56fc58
commit: d26dbba9297adb59bc49a6583c647804ef56fc58
branch: main
author: Jean-Abou-Samra <37271310+Jean-Abou-Samra at users.noreply.github.com>
committer: ericvsmith <ericvsmith at users.noreply.github.com>
date: 2021-08-19T16:47:16-04:00
summary:

Fix reST markup in dataclasses.rst (GH-27843)

The signature of field() had an extraneous colon at the end, causing it
to appear all bold and without the module name.

files:
M Doc/library/dataclasses.rst

diff --git a/Doc/library/dataclasses.rst b/Doc/library/dataclasses.rst
index 4ee75f1cc5ff9..de7dfae15ebd8 100644
--- a/Doc/library/dataclasses.rst
+++ b/Doc/library/dataclasses.rst
@@ -205,7 +205,7 @@ Module contents
    follows a field with a default value.  This is true whether this
    occurs in a single class, or as a result of class inheritance.
 
-.. function:: field(*, default=MISSING, default_factory=MISSING, init=True, repr=True, hash=None, compare=True, metadata=None, kw_only=MISSING):
+.. function:: field(*, default=MISSING, default_factory=MISSING, init=True, repr=True, hash=None, compare=True, metadata=None, kw_only=MISSING)
 
    For common and simple use cases, no other functionality is
    required.  There are, however, some dataclass features that


From webhook-mailer at python.org  Thu Aug 19 16:49:19 2021
From: webhook-mailer at python.org (ericvsmith)
Date: Thu, 19 Aug 2021 20:49:19 -0000
Subject: [Python-checkins] Fix reST markup in dataclasses.rst (GH-27843)
 (GH-27845)
Message-ID: <mailman.1091.1629406160.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/f0e2a46349bc5a733aee58d53fa685de108b1787
commit: f0e2a46349bc5a733aee58d53fa685de108b1787
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ericvsmith <ericvsmith at users.noreply.github.com>
date: 2021-08-19T16:49:15-04:00
summary:

Fix reST markup in dataclasses.rst (GH-27843) (GH-27845)

The signature of field() had an extraneous colon at the end, causing it
to appear all bold and without the module name.
(cherry picked from commit d26dbba9297adb59bc49a6583c647804ef56fc58)

Co-authored-by: Jean-Abou-Samra <37271310+Jean-Abou-Samra at users.noreply.github.com>

Co-authored-by: Jean-Abou-Samra <37271310+Jean-Abou-Samra at users.noreply.github.com>

files:
M Doc/library/dataclasses.rst

diff --git a/Doc/library/dataclasses.rst b/Doc/library/dataclasses.rst
index e203a1a2132df..5da05539c90b1 100644
--- a/Doc/library/dataclasses.rst
+++ b/Doc/library/dataclasses.rst
@@ -205,7 +205,7 @@ Module contents
    follows a field with a default value.  This is true whether this
    occurs in a single class, or as a result of class inheritance.
 
-.. function:: field(*, default=MISSING, default_factory=MISSING, init=True, repr=True, hash=None, compare=True, metadata=None, kw_only=MISSING):
+.. function:: field(*, default=MISSING, default_factory=MISSING, init=True, repr=True, hash=None, compare=True, metadata=None, kw_only=MISSING)
 
    For common and simple use cases, no other functionality is
    required.  There are, however, some dataclass features that


From webhook-mailer at python.org  Fri Aug 20 06:40:21 2021
From: webhook-mailer at python.org (mdickinson)
Date: Fri, 20 Aug 2021 10:40:21 -0000
Subject: [Python-checkins] bpo-44954: Fix wrong result in float.fromhex
 corner case (GH-27834)
Message-ID: <mailman.1092.1629456022.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/60b93d9e4922eeae25052bc15909d1f4152babde
commit: 60b93d9e4922eeae25052bc15909d1f4152babde
branch: main
author: Mark Dickinson <mdickinson at enthought.com>
committer: mdickinson <dickinsm at gmail.com>
date: 2021-08-20T11:40:11+01:00
summary:

bpo-44954: Fix wrong result in float.fromhex corner case (GH-27834)

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-19-14-43-24.bpo-44954.dLn3lg.rst
M Lib/test/test_float.py
M Objects/floatobject.c

diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py
index 38a17cedd6446f..29f775644dd4a8 100644
--- a/Lib/test/test_float.py
+++ b/Lib/test/test_float.py
@@ -1468,6 +1468,20 @@ def test_from_hex(self):
         self.identical(fromHex('0X1.0000000000001fp0'), 1.0+2*EPS)
         self.identical(fromHex('0x1.00000000000020p0'), 1.0+2*EPS)
 
+        # Regression test for a corner-case bug reported in b.p.o. 44954
+        self.identical(fromHex('0x.8p-1074'), 0.0)
+        self.identical(fromHex('0x.80p-1074'), 0.0)
+        self.identical(fromHex('0x.81p-1074'), TINY)
+        self.identical(fromHex('0x8p-1078'), 0.0)
+        self.identical(fromHex('0x8.0p-1078'), 0.0)
+        self.identical(fromHex('0x8.1p-1078'), TINY)
+        self.identical(fromHex('0x80p-1082'), 0.0)
+        self.identical(fromHex('0x81p-1082'), TINY)
+        self.identical(fromHex('.8p-1074'), 0.0)
+        self.identical(fromHex('8p-1078'), 0.0)
+        self.identical(fromHex('-.8p-1074'), -0.0)
+        self.identical(fromHex('+8p-1078'), 0.0)
+
     def test_roundtrip(self):
         def roundtrip(x):
             return fromHex(toHex(x))
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-19-14-43-24.bpo-44954.dLn3lg.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-19-14-43-24.bpo-44954.dLn3lg.rst
new file mode 100644
index 00000000000000..4cdeb34b8b6116
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-19-14-43-24.bpo-44954.dLn3lg.rst	
@@ -0,0 +1,2 @@
+Fixed a corner case bug where the result of ``float.fromhex('0x.8p-1074')``
+was rounded the wrong way.
diff --git a/Objects/floatobject.c b/Objects/floatobject.c
index 7e78132c01ca27..92faa7c1320237 100644
--- a/Objects/floatobject.c
+++ b/Objects/floatobject.c
@@ -1463,8 +1463,8 @@ float_fromhex(PyTypeObject *type, PyObject *string)
        bits lsb, lsb-2, lsb-3, lsb-4, ... is 1. */
     if ((digit & half_eps) != 0) {
         round_up = 0;
-        if ((digit & (3*half_eps-1)) != 0 ||
-            (half_eps == 8 && (HEX_DIGIT(key_digit+1) & 1) != 0))
+        if ((digit & (3*half_eps-1)) != 0 || (half_eps == 8 &&
+                key_digit+1 < ndigits && (HEX_DIGIT(key_digit+1) & 1) != 0))
             round_up = 1;
         else
             for (i = key_digit-1; i >= 0; i--)


From webhook-mailer at python.org  Fri Aug 20 07:37:48 2021
From: webhook-mailer at python.org (mdickinson)
Date: Fri, 20 Aug 2021 11:37:48 -0000
Subject: [Python-checkins] bpo-44954: Fix wrong result in float.fromhex
 corner case (GH-27834) (GH-27855)
Message-ID: <mailman.1093.1629459469.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/7ef0673de48958bc3a75af5f152564bd2dffa8dd
commit: 7ef0673de48958bc3a75af5f152564bd2dffa8dd
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: mdickinson <dickinsm at gmail.com>
date: 2021-08-20T12:37:41+01:00
summary:

bpo-44954: Fix wrong result in float.fromhex corner case (GH-27834) (GH-27855)

(cherry picked from commit 60b93d9e4922eeae25052bc15909d1f4152babde)

Co-authored-by: Mark Dickinson <mdickinson at enthought.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-19-14-43-24.bpo-44954.dLn3lg.rst
M Lib/test/test_float.py
M Objects/floatobject.c

diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py
index 4f66b41e0ad0ec..fcb87491c2a434 100644
--- a/Lib/test/test_float.py
+++ b/Lib/test/test_float.py
@@ -1446,6 +1446,20 @@ def test_from_hex(self):
         self.identical(fromHex('0X1.0000000000001fp0'), 1.0+2*EPS)
         self.identical(fromHex('0x1.00000000000020p0'), 1.0+2*EPS)
 
+        # Regression test for a corner-case bug reported in b.p.o. 44954
+        self.identical(fromHex('0x.8p-1074'), 0.0)
+        self.identical(fromHex('0x.80p-1074'), 0.0)
+        self.identical(fromHex('0x.81p-1074'), TINY)
+        self.identical(fromHex('0x8p-1078'), 0.0)
+        self.identical(fromHex('0x8.0p-1078'), 0.0)
+        self.identical(fromHex('0x8.1p-1078'), TINY)
+        self.identical(fromHex('0x80p-1082'), 0.0)
+        self.identical(fromHex('0x81p-1082'), TINY)
+        self.identical(fromHex('.8p-1074'), 0.0)
+        self.identical(fromHex('8p-1078'), 0.0)
+        self.identical(fromHex('-.8p-1074'), -0.0)
+        self.identical(fromHex('+8p-1078'), 0.0)
+
     def test_roundtrip(self):
         def roundtrip(x):
             return fromHex(toHex(x))
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-19-14-43-24.bpo-44954.dLn3lg.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-19-14-43-24.bpo-44954.dLn3lg.rst
new file mode 100644
index 00000000000000..4cdeb34b8b6116
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-19-14-43-24.bpo-44954.dLn3lg.rst	
@@ -0,0 +1,2 @@
+Fixed a corner case bug where the result of ``float.fromhex('0x.8p-1074')``
+was rounded the wrong way.
diff --git a/Objects/floatobject.c b/Objects/floatobject.c
index 9f5014092cf20a..6adc90ab9a2c34 100644
--- a/Objects/floatobject.c
+++ b/Objects/floatobject.c
@@ -1443,8 +1443,8 @@ float_fromhex(PyTypeObject *type, PyObject *string)
        bits lsb, lsb-2, lsb-3, lsb-4, ... is 1. */
     if ((digit & half_eps) != 0) {
         round_up = 0;
-        if ((digit & (3*half_eps-1)) != 0 ||
-            (half_eps == 8 && (HEX_DIGIT(key_digit+1) & 1) != 0))
+        if ((digit & (3*half_eps-1)) != 0 || (half_eps == 8 &&
+                key_digit+1 < ndigits && (HEX_DIGIT(key_digit+1) & 1) != 0))
             round_up = 1;
         else
             for (i = key_digit-1; i >= 0; i--)


From webhook-mailer at python.org  Fri Aug 20 09:08:30 2021
From: webhook-mailer at python.org (iritkatriel)
Date: Fri, 20 Aug 2021 13:08:30 -0000
Subject: [Python-checkins] =?utf-8?q?bpo-44960=3A_add_regression_test_for?=
 =?utf-8?q?_geometric=5Fmean_with_mixed_int/floa=E2=80=A6_=28=2327856=29?=
Message-ID: <mailman.1094.1629464911.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/f5d7a8d29c49ad47254fa098abb7a510e5e7b45e
commit: f5d7a8d29c49ad47254fa098abb7a510e5e7b45e
branch: main
author: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
committer: iritkatriel <1055913+iritkatriel at users.noreply.github.com>
date: 2021-08-20T14:08:21+01:00
summary:

bpo-44960: add regression test for geometric_mean with mixed int/floa? (#27856)

Co-authored-by: Mark Dickinson <dickinsm at gmail.com>

files:
M Lib/test/test_statistics.py

diff --git a/Lib/test/test_statistics.py b/Lib/test/test_statistics.py
index a7cb027726965..dc066fa921d79 100644
--- a/Lib/test/test_statistics.py
+++ b/Lib/test/test_statistics.py
@@ -2263,6 +2263,22 @@ def test_special_values(self):
         with self.assertRaises(ValueError):
             geometric_mean([Inf, -Inf])
 
+    def test_mixed_int_and_float(self):
+        # Regression test for b.p.o. issue #28327
+        geometric_mean = statistics.geometric_mean
+        expected_mean = 3.80675409583932
+        values = [
+            [2, 3, 5, 7],
+            [2, 3, 5, 7.0],
+            [2, 3, 5.0, 7.0],
+            [2, 3.0, 5.0, 7.0],
+            [2.0, 3.0, 5.0, 7.0],
+        ]
+        for v in values:
+            with self.subTest(v=v):
+                actual_mean = geometric_mean(v)
+                self.assertAlmostEqual(actual_mean, expected_mean, places=5)
+
 
 class TestQuantiles(unittest.TestCase):
 


From webhook-mailer at python.org  Fri Aug 20 10:37:00 2021
From: webhook-mailer at python.org (gvanrossum)
Date: Fri, 20 Aug 2021 14:37:00 -0000
Subject: [Python-checkins] bpo-44926: `get_type_hints`: Add note about type
 aliases with forward refs (#27859)
Message-ID: <mailman.1095.1629470221.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/16b9be4861e007ad483611ba0479feb2b90ea783
commit: 16b9be4861e007ad483611ba0479feb2b90ea783
branch: main
author: Maximilian Hils <git at maximilianhils.com>
committer: gvanrossum <gvanrossum at gmail.com>
date: 2021-08-20T07:36:51-07:00
summary:

bpo-44926: `get_type_hints`: Add note about type aliases with forward refs (#27859)

files:
M Doc/library/typing.rst

diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst
index e8d7c9ee01bd1..47d6c3a2e3898 100644
--- a/Doc/library/typing.rst
+++ b/Doc/library/typing.rst
@@ -2013,6 +2013,13 @@ Introspection helpers
            'name': Annotated[str, 'some marker']
        }
 
+   .. note::
+
+      :func:`get_type_hints` does not work with imported
+      :ref:`type aliases <type-aliases>` that include forward references.
+      Enabling postponed evaluation of annotations (:pep:`563`) may remove
+      the need for most forward references.
+
    .. versionchanged:: 3.9
       Added ``include_extras`` parameter as part of :pep:`593`.
 


From webhook-mailer at python.org  Fri Aug 20 13:49:04 2021
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 20 Aug 2021 17:49:04 -0000
Subject: [Python-checkins] bpo-44954: Fix wrong result in float.fromhex
 corner case (GH-27834)
Message-ID: <mailman.1096.1629481745.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/838b0e975fc2c106508eb27d19a9548533ac1e55
commit: 838b0e975fc2c106508eb27d19a9548533ac1e55
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-20T10:48:47-07:00
summary:

bpo-44954: Fix wrong result in float.fromhex corner case (GH-27834)

(cherry picked from commit 60b93d9e4922eeae25052bc15909d1f4152babde)

Co-authored-by: Mark Dickinson <mdickinson at enthought.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-19-14-43-24.bpo-44954.dLn3lg.rst
M Lib/test/test_float.py
M Objects/floatobject.c

diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py
index 38a17cedd6446f..29f775644dd4a8 100644
--- a/Lib/test/test_float.py
+++ b/Lib/test/test_float.py
@@ -1468,6 +1468,20 @@ def test_from_hex(self):
         self.identical(fromHex('0X1.0000000000001fp0'), 1.0+2*EPS)
         self.identical(fromHex('0x1.00000000000020p0'), 1.0+2*EPS)
 
+        # Regression test for a corner-case bug reported in b.p.o. 44954
+        self.identical(fromHex('0x.8p-1074'), 0.0)
+        self.identical(fromHex('0x.80p-1074'), 0.0)
+        self.identical(fromHex('0x.81p-1074'), TINY)
+        self.identical(fromHex('0x8p-1078'), 0.0)
+        self.identical(fromHex('0x8.0p-1078'), 0.0)
+        self.identical(fromHex('0x8.1p-1078'), TINY)
+        self.identical(fromHex('0x80p-1082'), 0.0)
+        self.identical(fromHex('0x81p-1082'), TINY)
+        self.identical(fromHex('.8p-1074'), 0.0)
+        self.identical(fromHex('8p-1078'), 0.0)
+        self.identical(fromHex('-.8p-1074'), -0.0)
+        self.identical(fromHex('+8p-1078'), 0.0)
+
     def test_roundtrip(self):
         def roundtrip(x):
             return fromHex(toHex(x))
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-19-14-43-24.bpo-44954.dLn3lg.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-19-14-43-24.bpo-44954.dLn3lg.rst
new file mode 100644
index 00000000000000..4cdeb34b8b6116
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-19-14-43-24.bpo-44954.dLn3lg.rst	
@@ -0,0 +1,2 @@
+Fixed a corner case bug where the result of ``float.fromhex('0x.8p-1074')``
+was rounded the wrong way.
diff --git a/Objects/floatobject.c b/Objects/floatobject.c
index 7e78132c01ca27..92faa7c1320237 100644
--- a/Objects/floatobject.c
+++ b/Objects/floatobject.c
@@ -1463,8 +1463,8 @@ float_fromhex(PyTypeObject *type, PyObject *string)
        bits lsb, lsb-2, lsb-3, lsb-4, ... is 1. */
     if ((digit & half_eps) != 0) {
         round_up = 0;
-        if ((digit & (3*half_eps-1)) != 0 ||
-            (half_eps == 8 && (HEX_DIGIT(key_digit+1) & 1) != 0))
+        if ((digit & (3*half_eps-1)) != 0 || (half_eps == 8 &&
+                key_digit+1 < ndigits && (HEX_DIGIT(key_digit+1) & 1) != 0))
             round_up = 1;
         else
             for (i = key_digit-1; i >= 0; i--)


From webhook-mailer at python.org  Sat Aug 21 02:48:09 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Sat, 21 Aug 2021 06:48:09 -0000
Subject: [Python-checkins] bpo-44524: Do not set _name of _SpecialForm
 without need (GH-27861)
Message-ID: <mailman.1097.1629528490.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/4ceec495598e78f0776dd46d511dcc612a434dc3
commit: 4ceec495598e78f0776dd46d511dcc612a434dc3
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-21T09:47:59+03:00
summary:

bpo-44524: Do not set _name of _SpecialForm without need (GH-27861)

Because setting non-empty _name affects behavior of other code.

In most cases __name__ can be derived from __origin__.__name__.

files:
M Lib/test/test_typing.py
M Lib/typing.py

diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index d090c5f8818da..3bd5894f42574 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -4929,7 +4929,6 @@ def test_special_attrs(self):
                 self.assertEqual(cls.__name__, name, str(cls))
                 self.assertEqual(cls.__qualname__, name, str(cls))
                 self.assertEqual(cls.__module__, 'typing', str(cls))
-                self.assertEqual(getattr(cls, '_name', name), name, str(cls))
                 for proto in range(pickle.HIGHEST_PROTOCOL + 1):
                     s = pickle.dumps(cls, proto)
                     loaded = pickle.loads(s)
diff --git a/Lib/typing.py b/Lib/typing.py
index eeeb295b6c2c2..a283fe40d2d3f 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -461,7 +461,7 @@ class Starship:
     be used with isinstance() or issubclass().
     """
     item = _type_check(parameters, f'{self} accepts only single type.')
-    return _GenericAlias(self, (item,), name="ClassVar")
+    return _GenericAlias(self, (item,))
 
 @_SpecialForm
 def Final(self, parameters):
@@ -482,7 +482,7 @@ class FastConnector(Connection):
     There is no runtime checking of these properties.
     """
     item = _type_check(parameters, f'{self} accepts only single type.')
-    return _GenericAlias(self, (item,), name="Final")
+    return _GenericAlias(self, (item,))
 
 @_SpecialForm
 def Union(self, parameters):
@@ -520,12 +520,9 @@ def Union(self, parameters):
     parameters = _remove_dups_flatten(parameters)
     if len(parameters) == 1:
         return parameters[0]
-
     if len(parameters) == 2 and type(None) in parameters:
-        name = "Optional"
-    else:
-        name = "Union"
-    return _UnionGenericAlias(self, parameters, name=name)
+        return _UnionGenericAlias(self, parameters, name="Optional")
+    return _UnionGenericAlias(self, parameters)
 
 @_SpecialForm
 def Optional(self, parameters):
@@ -570,7 +567,7 @@ def open_helper(file: str, mode: MODE) -> str:
     except TypeError:  # unhashable parameters
         pass
 
-    return _LiteralGenericAlias(self, parameters, name="Literal")
+    return _LiteralGenericAlias(self, parameters)
 
 
 @_SpecialForm
@@ -609,7 +606,7 @@ def Concatenate(self, parameters):
                         "ParamSpec variable.")
     msg = "Concatenate[arg, ...]: each arg must be a type."
     parameters = tuple(_type_check(p, msg) for p in parameters)
-    return _ConcatenateGenericAlias(self, parameters, name="Concatenate")
+    return _ConcatenateGenericAlias(self, parameters)
 
 
 @_SpecialForm
@@ -657,7 +654,7 @@ def is_str(val: Union[str, float]):
     PEP 647 (User-Defined Type Guards).
     """
     item = _type_check(parameters, f'{self} accepts only single type.')
-    return _GenericAlias(self, (item,), name="TypeGuard")
+    return _GenericAlias(self, (item,))
 
 
 class ForwardRef(_Final, _root=True):
@@ -962,7 +959,7 @@ def __mro_entries__(self, bases):
 
     def __getattr__(self, attr):
         if attr in {'__name__', '__qualname__'}:
-            return self._name
+            return self._name or self.__origin__.__name__
 
         # We are careful for copy and pickle.
         # Also for simplicity we just don't relay all dunder names


From webhook-mailer at python.org  Sat Aug 21 05:33:38 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Sat, 21 Aug 2021 09:33:38 -0000
Subject: [Python-checkins] bpo-44524: Do not set _name of _SpecialForm
 without need (GH-27861) (GH-27871)
Message-ID: <mailman.1098.1629538419.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/5bd27c3be5734e158f67ff86087a977a25d89161
commit: 5bd27c3be5734e158f67ff86087a977a25d89161
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-21T12:33:14+03:00
summary:

bpo-44524: Do not set _name of _SpecialForm without need (GH-27861) (GH-27871)

Because setting non-empty _name affects behavior of other code.

In most cases __name__ can be derived from __origin__.__name__.
(cherry picked from commit 4ceec495598e78f0776dd46d511dcc612a434dc3)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
M Lib/test/test_typing.py
M Lib/typing.py

diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index af7c343d6b69a..b1cd547125633 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -4873,7 +4873,6 @@ def test_special_attrs(self):
                 self.assertEqual(cls.__name__, name, str(cls))
                 self.assertEqual(cls.__qualname__, name, str(cls))
                 self.assertEqual(cls.__module__, 'typing', str(cls))
-                self.assertEqual(getattr(cls, '_name', name), name, str(cls))
                 for proto in range(pickle.HIGHEST_PROTOCOL + 1):
                     s = pickle.dumps(cls, proto)
                     loaded = pickle.loads(s)
diff --git a/Lib/typing.py b/Lib/typing.py
index 6d7ba330acabe..493546045a2bd 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -453,7 +453,7 @@ class Starship:
     be used with isinstance() or issubclass().
     """
     item = _type_check(parameters, f'{self} accepts only single type.')
-    return _GenericAlias(self, (item,), name="ClassVar")
+    return _GenericAlias(self, (item,))
 
 @_SpecialForm
 def Final(self, parameters):
@@ -474,7 +474,7 @@ class FastConnector(Connection):
     There is no runtime checking of these properties.
     """
     item = _type_check(parameters, f'{self} accepts only single type.')
-    return _GenericAlias(self, (item,), name="Final")
+    return _GenericAlias(self, (item,))
 
 @_SpecialForm
 def Union(self, parameters):
@@ -512,12 +512,9 @@ def Union(self, parameters):
     parameters = _remove_dups_flatten(parameters)
     if len(parameters) == 1:
         return parameters[0]
-
     if len(parameters) == 2 and type(None) in parameters:
-        name = "Optional"
-    else:
-        name = "Union"
-    return _UnionGenericAlias(self, parameters, name=name)
+        return _UnionGenericAlias(self, parameters, name="Optional")
+    return _UnionGenericAlias(self, parameters)
 
 @_SpecialForm
 def Optional(self, parameters):
@@ -562,7 +559,7 @@ def open_helper(file: str, mode: MODE) -> str:
     except TypeError:  # unhashable parameters
         pass
 
-    return _LiteralGenericAlias(self, parameters, name="Literal")
+    return _LiteralGenericAlias(self, parameters)
 
 
 @_SpecialForm
@@ -601,7 +598,7 @@ def Concatenate(self, parameters):
                         "ParamSpec variable.")
     msg = "Concatenate[arg, ...]: each arg must be a type."
     parameters = tuple(_type_check(p, msg) for p in parameters)
-    return _ConcatenateGenericAlias(self, parameters, name="Concatenate")
+    return _ConcatenateGenericAlias(self, parameters)
 
 
 @_SpecialForm
@@ -649,7 +646,7 @@ def is_str(val: Union[str, float]):
     PEP 647 (User-Defined Type Guards).
     """
     item = _type_check(parameters, f'{self} accepts only single type.')
-    return _GenericAlias(self, (item,), name="TypeGuard")
+    return _GenericAlias(self, (item,))
 
 
 class ForwardRef(_Final, _root=True):
@@ -960,7 +957,7 @@ def __mro_entries__(self, bases):
 
     def __getattr__(self, attr):
         if attr in {'__name__', '__qualname__'}:
-            return self._name
+            return self._name or self.__origin__.__name__
 
         # We are careful for copy and pickle.
         # Also for simplicity we just don't relay all dunder names


From webhook-mailer at python.org  Sat Aug 21 14:59:03 2021
From: webhook-mailer at python.org (pablogsal)
Date: Sat, 21 Aug 2021 18:59:03 -0000
Subject: [Python-checkins] bpo-44965: Early exit for non-DML statements in
 sqlite3.Cursor.executemany() (GH-27865)
Message-ID: <mailman.1099.1629572344.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/878e7267016ba25d05d8736349fb897c756f311d
commit: 878e7267016ba25d05d8736349fb897c756f311d
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-08-21T19:58:58+01:00
summary:

bpo-44965: Early exit for non-DML statements in sqlite3.Cursor.executemany() (GH-27865)

files:
M Modules/_sqlite/cursor.c

diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
index 7308f3062da4b9..e418cafb4feb60 100644
--- a/Modules/_sqlite/cursor.c
+++ b/Modules/_sqlite/cursor.c
@@ -548,6 +548,13 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
         goto error;
     }
 
+    pysqlite_state *state = self->connection->state;
+    if (multiple && sqlite3_stmt_readonly(self->statement->st)) {
+        PyErr_SetString(state->ProgrammingError,
+                        "executemany() can only execute DML statements.");
+        goto error;
+    }
+
     if (self->statement->in_use) {
         Py_SETREF(self->statement,
                   pysqlite_statement_create(self->connection, operation));
@@ -570,7 +577,6 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
         }
     }
 
-    pysqlite_state *state = self->connection->state;
     while (1) {
         parameters = PyIter_Next(parameters_iter);
         if (!parameters) {
@@ -653,13 +659,6 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
         }
 
         if (rc == SQLITE_ROW) {
-            if (multiple) {
-                PyErr_SetString(state->ProgrammingError,
-                                "executemany() can only execute DML "
-                                "statements.");
-                goto error;
-            }
-
             self->next_row = _pysqlite_fetch_one_row(self);
             if (self->next_row == NULL)
                 goto error;


From webhook-mailer at python.org  Sat Aug 21 14:59:22 2021
From: webhook-mailer at python.org (rhettinger)
Date: Sat, 21 Aug 2021 18:59:22 -0000
Subject: [Python-checkins] bpo-44966: Fix out-of-date traceback message
 (GH-27867)
Message-ID: <mailman.1100.1629572363.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/15a64d89a31b7e91f0361c305b7b27d8761db93d
commit: 15a64d89a31b7e91f0361c305b7b27d8761db93d
branch: main
author: Raymond Hettinger <rhettinger at users.noreply.github.com>
committer: rhettinger <rhettinger at users.noreply.github.com>
date: 2021-08-21T13:59:18-05:00
summary:

bpo-44966: Fix out-of-date traceback message (GH-27867)

files:
M Doc/tutorial/errors.rst

diff --git a/Doc/tutorial/errors.rst b/Doc/tutorial/errors.rst
index e7a45a302c65a7..f2490d65db5d49 100644
--- a/Doc/tutorial/errors.rst
+++ b/Doc/tutorial/errors.rst
@@ -53,7 +53,7 @@ programs, however, and result in error messages as shown here::
    >>> '2' + 2
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
-   TypeError: Can't convert 'int' object to str implicitly
+   TypeError: can only concatenate str (not "int") to str
 
 The last line of the error message indicates what happened. Exceptions come in
 different types, and the type is printed as part of the message: the types in


From webhook-mailer at python.org  Sat Aug 21 16:09:16 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Sat, 21 Aug 2021 20:09:16 -0000
Subject: [Python-checkins] bpo-44968: Fix test_subprocess_wait_no_same_group
 in test_asyncio (GH-27870)
Message-ID: <mailman.1101.1629576557.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/585390fdd8661b4bc08bdfc27551292da9b4b9b8
commit: 585390fdd8661b4bc08bdfc27551292da9b4b9b8
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-21T23:09:08+03:00
summary:

bpo-44968: Fix test_subprocess_wait_no_same_group in test_asyncio (GH-27870)

The code of the test was never executed because the test function
was unintentionally converted to a generator function.

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

diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
index e78176997a0591..e50a53d7067840 100644
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -1971,10 +1971,11 @@ def test_subprocess_wait_no_same_group(self):
                         functools.partial(MySubprocessProtocol, self.loop),
                         'exit 7', stdin=None, stdout=None, stderr=None,
                         start_new_session=True)
-        _, proto = yield self.loop.run_until_complete(connect)
+        transp, proto = self.loop.run_until_complete(connect)
         self.assertIsInstance(proto, MySubprocessProtocol)
         self.loop.run_until_complete(proto.completed)
         self.assertEqual(7, proto.returncode)
+        transp.close()
 
     def test_subprocess_exec_invalid_args(self):
         async def connect(**kwds):


From webhook-mailer at python.org  Sat Aug 21 16:29:27 2021
From: webhook-mailer at python.org (miss-islington)
Date: Sat, 21 Aug 2021 20:29:27 -0000
Subject: [Python-checkins] bpo-44968: Fix test_subprocess_wait_no_same_group
 in test_asyncio (GH-27870)
Message-ID: <mailman.1102.1629577768.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/d5781e973079a20b2370686d6e080316d6c9f90d
commit: d5781e973079a20b2370686d6e080316d6c9f90d
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-21T13:29:18-07:00
summary:

bpo-44968: Fix test_subprocess_wait_no_same_group in test_asyncio (GH-27870)


The code of the test was never executed because the test function
was unintentionally converted to a generator function.
(cherry picked from commit 585390fdd8661b4bc08bdfc27551292da9b4b9b8)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

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

diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
index fa6c49d89da5cd..7114c2f0c71daa 100644
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -1968,10 +1968,11 @@ def test_subprocess_wait_no_same_group(self):
                         functools.partial(MySubprocessProtocol, self.loop),
                         'exit 7', stdin=None, stdout=None, stderr=None,
                         start_new_session=True)
-        _, proto = yield self.loop.run_until_complete(connect)
+        transp, proto = self.loop.run_until_complete(connect)
         self.assertIsInstance(proto, MySubprocessProtocol)
         self.loop.run_until_complete(proto.completed)
         self.assertEqual(7, proto.returncode)
+        transp.close()
 
     def test_subprocess_exec_invalid_args(self):
         async def connect(**kwds):


From webhook-mailer at python.org  Sat Aug 21 16:30:17 2021
From: webhook-mailer at python.org (miss-islington)
Date: Sat, 21 Aug 2021 20:30:17 -0000
Subject: [Python-checkins] bpo-44968: Fix test_subprocess_wait_no_same_group
 in test_asyncio (GH-27870)
Message-ID: <mailman.1103.1629577818.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/88a1920c7b7b0fb73c4037b460c6a4a8c0aa10f0
commit: 88a1920c7b7b0fb73c4037b460c6a4a8c0aa10f0
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-21T13:30:08-07:00
summary:

bpo-44968: Fix test_subprocess_wait_no_same_group in test_asyncio (GH-27870)


The code of the test was never executed because the test function
was unintentionally converted to a generator function.
(cherry picked from commit 585390fdd8661b4bc08bdfc27551292da9b4b9b8)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

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

diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
index 55fc266cb714b1..778dd43f68848a 100644
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -1970,10 +1970,11 @@ def test_subprocess_wait_no_same_group(self):
                         functools.partial(MySubprocessProtocol, self.loop),
                         'exit 7', stdin=None, stdout=None, stderr=None,
                         start_new_session=True)
-        _, proto = yield self.loop.run_until_complete(connect)
+        transp, proto = self.loop.run_until_complete(connect)
         self.assertIsInstance(proto, MySubprocessProtocol)
         self.loop.run_until_complete(proto.completed)
         self.assertEqual(7, proto.returncode)
+        transp.close()
 
     def test_subprocess_exec_invalid_args(self):
         async def connect(**kwds):


From webhook-mailer at python.org  Sat Aug 21 20:35:44 2021
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 22 Aug 2021 00:35:44 -0000
Subject: [Python-checkins] bpo-44966: Fix out-of-date traceback message
 (GH-27867)
Message-ID: <mailman.1104.1629592544.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/95a9ba173ecaeec0cb8bf57cfcd916d64fa6f861
commit: 95a9ba173ecaeec0cb8bf57cfcd916d64fa6f861
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-21T17:35:32-07:00
summary:

bpo-44966: Fix out-of-date traceback message (GH-27867)

(cherry picked from commit 15a64d89a31b7e91f0361c305b7b27d8761db93d)

Co-authored-by: Raymond Hettinger <rhettinger at users.noreply.github.com>

files:
M Doc/tutorial/errors.rst

diff --git a/Doc/tutorial/errors.rst b/Doc/tutorial/errors.rst
index e7a45a302c65a7..f2490d65db5d49 100644
--- a/Doc/tutorial/errors.rst
+++ b/Doc/tutorial/errors.rst
@@ -53,7 +53,7 @@ programs, however, and result in error messages as shown here::
    >>> '2' + 2
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
-   TypeError: Can't convert 'int' object to str implicitly
+   TypeError: can only concatenate str (not "int") to str
 
 The last line of the error message indicates what happened. Exceptions come in
 different types, and the type is printed as part of the message: the types in


From webhook-mailer at python.org  Sat Aug 21 20:37:01 2021
From: webhook-mailer at python.org (rhettinger)
Date: Sun, 22 Aug 2021 00:37:01 -0000
Subject: [Python-checkins] bpo-44966: Fix out-of-date traceback message
 (GH-27867) (GH-27876)
Message-ID: <mailman.1105.1629592623.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/407b3e0bb028c30fbf5efcf58c70c50eaa6712b0
commit: 407b3e0bb028c30fbf5efcf58c70c50eaa6712b0
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: rhettinger <rhettinger at users.noreply.github.com>
date: 2021-08-21T19:36:54-05:00
summary:

bpo-44966: Fix out-of-date traceback message (GH-27867) (GH-27876)

files:
M Doc/tutorial/errors.rst

diff --git a/Doc/tutorial/errors.rst b/Doc/tutorial/errors.rst
index 516c925b72f5e7..4e2ed1d10a65c6 100644
--- a/Doc/tutorial/errors.rst
+++ b/Doc/tutorial/errors.rst
@@ -53,7 +53,7 @@ programs, however, and result in error messages as shown here::
    >>> '2' + 2
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
-   TypeError: Can't convert 'int' object to str implicitly
+   TypeError: can only concatenate str (not "int") to str
 
 The last line of the error message indicates what happened. Exceptions come in
 different types, and the type is printed as part of the message: the types in


From webhook-mailer at python.org  Sun Aug 22 03:24:31 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Sun, 22 Aug 2021 07:24:31 -0000
Subject: [Python-checkins] bpo-44940: Clarify the documentation of
 re.findall() (GH-27849)
Message-ID: <mailman.1106.1629617072.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/64f9e7b19dc1603fcbd07c17c9860085b9d21465
commit: 64f9e7b19dc1603fcbd07c17c9860085b9d21465
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-22T10:24:20+03:00
summary:

bpo-44940: Clarify the documentation of re.findall() (GH-27849)

Co-authored-by: Ken Jin <28750310+Fidget-Spinner at users.noreply.github.com>
Co-authored-by: Vedran ?a?i? <vedgar+github at gmail.com>

files:
M Doc/library/re.rst

diff --git a/Doc/library/re.rst b/Doc/library/re.rst
index 950012a9b0fe2..ff7687cc936ec 100644
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -824,10 +824,20 @@ form.
 .. function:: findall(pattern, string, flags=0)
 
    Return all non-overlapping matches of *pattern* in *string*, as a list of
-   strings.  The *string* is scanned left-to-right, and matches are returned in
-   the order found.  If one or more groups are present in the pattern, return a
-   list of groups; this will be a list of tuples if the pattern has more than
-   one group.  Empty matches are included in the result.
+   strings or tuples.  The *string* is scanned left-to-right, and matches
+   are returned in the order found.  Empty matches are included in the result.
+
+   The result depends on the number of capturing groups in the pattern.
+   If there are no groups, return a list of strings matching the whole
+   pattern.  If there is exactly one group, return a list of strings
+   matching that group.  If multiple groups are present, return a list
+   of tuples of strings matching the groups.  Non-capturing groups do not
+   affect the form of the result.
+
+      >>> re.findall(r'\bf[a-z]*', 'which foot or hand fell fastest')
+      ['foot', 'fell', 'fastest']
+      >>> re.findall(r'(\w+)=(\d+)', 'set width=20 and height=10')
+      [('width', '20'), ('height', '10')]
 
    .. versionchanged:: 3.7
       Non-empty matches can now start just after a previous empty match.


From webhook-mailer at python.org  Sun Aug 22 03:34:04 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Sun, 22 Aug 2021 07:34:04 -0000
Subject: [Python-checkins] bpo-44955: Always call stopTestRun() for
 implicitly created TestResult objects (GH-27831)
Message-ID: <mailman.1107.1629617645.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/a9640d75531d6cbbfd254b65435f238c26bf5cd9
commit: a9640d75531d6cbbfd254b65435f238c26bf5cd9
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-22T10:33:52+03:00
summary:

bpo-44955: Always call stopTestRun() for implicitly created TestResult objects (GH-27831)

Method stopTestRun() is now always called in pair with method startTestRun()
for TestResult objects implicitly created in TestCase.run().
Previously it was not called for test methods and classes decorated with
a skipping decorator.

files:
A Misc/NEWS.d/next/Library/2021-08-19-15-03-54.bpo-44955.1mxFQS.rst
M Lib/unittest/case.py
M Lib/unittest/test/test_skipping.py

diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index 3c771c0ca8e102..625d27ef6dc61e 100644
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -557,73 +557,71 @@ def _callCleanup(self, function, /, *args, **kwargs):
         function(*args, **kwargs)
 
     def run(self, result=None):
-        orig_result = result
         if result is None:
             result = self.defaultTestResult()
             startTestRun = getattr(result, 'startTestRun', None)
+            stopTestRun = getattr(result, 'stopTestRun', None)
             if startTestRun is not None:
                 startTestRun()
+        else:
+            stopTestRun = None
 
         result.startTest(self)
-
-        testMethod = getattr(self, self._testMethodName)
-        if (getattr(self.__class__, "__unittest_skip__", False) or
-            getattr(testMethod, "__unittest_skip__", False)):
-            # If the class or method was skipped.
-            try:
+        try:
+            testMethod = getattr(self, self._testMethodName)
+            if (getattr(self.__class__, "__unittest_skip__", False) or
+                getattr(testMethod, "__unittest_skip__", False)):
+                # If the class or method was skipped.
                 skip_why = (getattr(self.__class__, '__unittest_skip_why__', '')
                             or getattr(testMethod, '__unittest_skip_why__', ''))
                 self._addSkip(result, self, skip_why)
-            finally:
-                result.stopTest(self)
-            return
-        expecting_failure_method = getattr(testMethod,
-                                           "__unittest_expecting_failure__", False)
-        expecting_failure_class = getattr(self,
-                                          "__unittest_expecting_failure__", False)
-        expecting_failure = expecting_failure_class or expecting_failure_method
-        outcome = _Outcome(result)
-        try:
-            self._outcome = outcome
+                return
+
+            expecting_failure = (
+                getattr(self, "__unittest_expecting_failure__", False) or
+                getattr(testMethod, "__unittest_expecting_failure__", False)
+            )
+            outcome = _Outcome(result)
+            try:
+                self._outcome = outcome
 
-            with outcome.testPartExecutor(self):
-                self._callSetUp()
-            if outcome.success:
-                outcome.expecting_failure = expecting_failure
-                with outcome.testPartExecutor(self, isTest=True):
-                    self._callTestMethod(testMethod)
-                outcome.expecting_failure = False
                 with outcome.testPartExecutor(self):
-                    self._callTearDown()
-
-            self.doCleanups()
-            for test, reason in outcome.skipped:
-                self._addSkip(result, test, reason)
-            self._feedErrorsToResult(result, outcome.errors)
-            if outcome.success:
-                if expecting_failure:
-                    if outcome.expectedFailure:
-                        self._addExpectedFailure(result, outcome.expectedFailure)
+                    self._callSetUp()
+                if outcome.success:
+                    outcome.expecting_failure = expecting_failure
+                    with outcome.testPartExecutor(self, isTest=True):
+                        self._callTestMethod(testMethod)
+                    outcome.expecting_failure = False
+                    with outcome.testPartExecutor(self):
+                        self._callTearDown()
+
+                self.doCleanups()
+                for test, reason in outcome.skipped:
+                    self._addSkip(result, test, reason)
+                self._feedErrorsToResult(result, outcome.errors)
+                if outcome.success:
+                    if expecting_failure:
+                        if outcome.expectedFailure:
+                            self._addExpectedFailure(result, outcome.expectedFailure)
+                        else:
+                            self._addUnexpectedSuccess(result)
                     else:
-                        self._addUnexpectedSuccess(result)
-                else:
-                    result.addSuccess(self)
-            return result
+                        result.addSuccess(self)
+                return result
+            finally:
+                # explicitly break reference cycles:
+                # outcome.errors -> frame -> outcome -> outcome.errors
+                # outcome.expectedFailure -> frame -> outcome -> outcome.expectedFailure
+                outcome.errors.clear()
+                outcome.expectedFailure = None
+
+                # clear the outcome, no more needed
+                self._outcome = None
+
         finally:
             result.stopTest(self)
-            if orig_result is None:
-                stopTestRun = getattr(result, 'stopTestRun', None)
-                if stopTestRun is not None:
-                    stopTestRun()
-
-            # explicitly break reference cycles:
-            # outcome.errors -> frame -> outcome -> outcome.errors
-            # outcome.expectedFailure -> frame -> outcome -> outcome.expectedFailure
-            outcome.errors.clear()
-            outcome.expectedFailure = None
-
-            # clear the outcome, no more needed
-            self._outcome = None
+            if stopTestRun is not None:
+                stopTestRun()
 
     def doCleanups(self):
         """Execute all cleanup functions. Normally called for you after
diff --git a/Lib/unittest/test/test_skipping.py b/Lib/unittest/test/test_skipping.py
index 1c178a95f750ff..3adde41b04e737 100644
--- a/Lib/unittest/test/test_skipping.py
+++ b/Lib/unittest/test/test_skipping.py
@@ -7,6 +7,8 @@ class Test_TestSkipping(unittest.TestCase):
 
     def test_skipping(self):
         class Foo(unittest.TestCase):
+            def defaultTestResult(self):
+                return LoggingResult(events)
             def test_skip_me(self):
                 self.skipTest("skip")
         events = []
@@ -16,8 +18,15 @@ def test_skip_me(self):
         self.assertEqual(events, ['startTest', 'addSkip', 'stopTest'])
         self.assertEqual(result.skipped, [(test, "skip")])
 
+        events = []
+        test.run()
+        self.assertEqual(events, ['startTestRun', 'startTest', 'addSkip',
+                                  'stopTest', 'stopTestRun'])
+
         # Try letting setUp skip the test now.
         class Foo(unittest.TestCase):
+            def defaultTestResult(self):
+                return LoggingResult(events)
             def setUp(self):
                 self.skipTest("testing")
             def test_nothing(self): pass
@@ -29,8 +38,15 @@ def test_nothing(self): pass
         self.assertEqual(result.skipped, [(test, "testing")])
         self.assertEqual(result.testsRun, 1)
 
+        events = []
+        test.run()
+        self.assertEqual(events, ['startTestRun', 'startTest', 'addSkip',
+                                  'stopTest', 'stopTestRun'])
+
     def test_skipping_subtests(self):
         class Foo(unittest.TestCase):
+            def defaultTestResult(self):
+                return LoggingResult(events)
             def test_skip_me(self):
                 with self.subTest(a=1):
                     with self.subTest(b=2):
@@ -54,11 +70,20 @@ def test_skip_me(self):
         self.assertIsNot(subtest, test)
         self.assertEqual(result.skipped[2], (test, "skip 3"))
 
+        events = []
+        test.run()
+        self.assertEqual(events,
+                         ['startTestRun', 'startTest', 'addSkip', 'addSkip',
+                          'addSkip', 'stopTest', 'stopTestRun'])
+
     def test_skipping_decorators(self):
         op_table = ((unittest.skipUnless, False, True),
                     (unittest.skipIf, True, False))
         for deco, do_skip, dont_skip in op_table:
             class Foo(unittest.TestCase):
+                def defaultTestResult(self):
+                    return LoggingResult(events)
+
                 @deco(do_skip, "testing")
                 def test_skip(self): pass
 
@@ -66,6 +91,7 @@ def test_skip(self): pass
                 def test_dont_skip(self): pass
             test_do_skip = Foo("test_skip")
             test_dont_skip = Foo("test_dont_skip")
+
             suite = unittest.TestSuite([test_do_skip, test_dont_skip])
             events = []
             result = LoggingResult(events)
@@ -78,19 +104,41 @@ def test_dont_skip(self): pass
             self.assertEqual(result.skipped, [(test_do_skip, "testing")])
             self.assertTrue(result.wasSuccessful())
 
+            events = []
+            test_do_skip.run()
+            self.assertEqual(len(result.skipped), 1)
+            self.assertEqual(events, ['startTestRun', 'startTest', 'addSkip',
+                                      'stopTest', 'stopTestRun'])
+
+            events = []
+            test_dont_skip.run()
+            self.assertEqual(len(result.skipped), 1)
+            self.assertEqual(events, ['startTestRun', 'startTest', 'addSuccess',
+                                      'stopTest', 'stopTestRun'])
+
     def test_skip_class(self):
         @unittest.skip("testing")
         class Foo(unittest.TestCase):
+            def defaultTestResult(self):
+                return LoggingResult(events)
             def test_1(self):
                 record.append(1)
+        events = []
         record = []
-        result = unittest.TestResult()
+        result = LoggingResult(events)
         test = Foo("test_1")
         suite = unittest.TestSuite([test])
         suite.run(result)
+        self.assertEqual(events, ['startTest', 'addSkip', 'stopTest'])
         self.assertEqual(result.skipped, [(test, "testing")])
         self.assertEqual(record, [])
 
+        events = []
+        test.run()
+        self.assertEqual(events, ['startTestRun', 'startTest', 'addSkip',
+                                  'stopTest', 'stopTestRun'])
+        self.assertEqual(record, [])
+
     def test_skip_non_unittest_class(self):
         @unittest.skip("testing")
         class Mixin:
diff --git a/Misc/NEWS.d/next/Library/2021-08-19-15-03-54.bpo-44955.1mxFQS.rst b/Misc/NEWS.d/next/Library/2021-08-19-15-03-54.bpo-44955.1mxFQS.rst
new file mode 100644
index 00000000000000..57d1da533cde0d
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-19-15-03-54.bpo-44955.1mxFQS.rst
@@ -0,0 +1,5 @@
+Method :meth:`~unittest.TestResult.stopTestRun` is now always called in pair
+with method :meth:`~unittest.TestResult.startTestRun` for
+:class:`~unittest.TestResult` objects implicitly created in
+:meth:`~unittest.TestCase.run`. Previously it was not called for test
+methods and classes decorated with a skipping decorator.


From webhook-mailer at python.org  Sun Aug 22 03:45:13 2021
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 22 Aug 2021 07:45:13 -0000
Subject: [Python-checkins] bpo-44940: Clarify the documentation of
 re.findall() (GH-27849)
Message-ID: <mailman.1108.1629618314.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/519bcc698c436e12bd6c1ff6f2517060719c60d5
commit: 519bcc698c436e12bd6c1ff6f2517060719c60d5
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-22T00:45:02-07:00
summary:

bpo-44940: Clarify the documentation of re.findall() (GH-27849)


Co-authored-by: Ken Jin <28750310+Fidget-Spinner at users.noreply.github.com>
Co-authored-by: Vedran ?a?i? <vedgar+github at gmail.com>
(cherry picked from commit 64f9e7b19dc1603fcbd07c17c9860085b9d21465)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
M Doc/library/re.rst

diff --git a/Doc/library/re.rst b/Doc/library/re.rst
index 950012a9b0fe2..ff7687cc936ec 100644
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -824,10 +824,20 @@ form.
 .. function:: findall(pattern, string, flags=0)
 
    Return all non-overlapping matches of *pattern* in *string*, as a list of
-   strings.  The *string* is scanned left-to-right, and matches are returned in
-   the order found.  If one or more groups are present in the pattern, return a
-   list of groups; this will be a list of tuples if the pattern has more than
-   one group.  Empty matches are included in the result.
+   strings or tuples.  The *string* is scanned left-to-right, and matches
+   are returned in the order found.  Empty matches are included in the result.
+
+   The result depends on the number of capturing groups in the pattern.
+   If there are no groups, return a list of strings matching the whole
+   pattern.  If there is exactly one group, return a list of strings
+   matching that group.  If multiple groups are present, return a list
+   of tuples of strings matching the groups.  Non-capturing groups do not
+   affect the form of the result.
+
+      >>> re.findall(r'\bf[a-z]*', 'which foot or hand fell fastest')
+      ['foot', 'fell', 'fastest']
+      >>> re.findall(r'(\w+)=(\d+)', 'set width=20 and height=10')
+      [('width', '20'), ('height', '10')]
 
    .. versionchanged:: 3.7
       Non-empty matches can now start just after a previous empty match.


From webhook-mailer at python.org  Sun Aug 22 03:55:42 2021
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 22 Aug 2021 07:55:42 -0000
Subject: [Python-checkins] bpo-44955: Always call stopTestRun() for
 implicitly created TestResult objects (GH-27831)
Message-ID: <mailman.1109.1629618943.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/d63114caf9384ead7baf872598acdff25315a5bf
commit: d63114caf9384ead7baf872598acdff25315a5bf
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-22T00:55:34-07:00
summary:

bpo-44955: Always call stopTestRun() for implicitly created TestResult objects (GH-27831)


Method stopTestRun() is now always called in pair with method startTestRun()
for TestResult objects implicitly created in TestCase.run().
Previously it was not called for test methods and classes decorated with
a skipping decorator.
(cherry picked from commit a9640d75531d6cbbfd254b65435f238c26bf5cd9)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
A Misc/NEWS.d/next/Library/2021-08-19-15-03-54.bpo-44955.1mxFQS.rst
M Lib/unittest/case.py
M Lib/unittest/test/test_skipping.py

diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index 872f12112755e9..d8522c02996f5f 100644
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -555,73 +555,71 @@ def _callCleanup(self, function, /, *args, **kwargs):
         function(*args, **kwargs)
 
     def run(self, result=None):
-        orig_result = result
         if result is None:
             result = self.defaultTestResult()
             startTestRun = getattr(result, 'startTestRun', None)
+            stopTestRun = getattr(result, 'stopTestRun', None)
             if startTestRun is not None:
                 startTestRun()
+        else:
+            stopTestRun = None
 
         result.startTest(self)
-
-        testMethod = getattr(self, self._testMethodName)
-        if (getattr(self.__class__, "__unittest_skip__", False) or
-            getattr(testMethod, "__unittest_skip__", False)):
-            # If the class or method was skipped.
-            try:
+        try:
+            testMethod = getattr(self, self._testMethodName)
+            if (getattr(self.__class__, "__unittest_skip__", False) or
+                getattr(testMethod, "__unittest_skip__", False)):
+                # If the class or method was skipped.
                 skip_why = (getattr(self.__class__, '__unittest_skip_why__', '')
                             or getattr(testMethod, '__unittest_skip_why__', ''))
                 self._addSkip(result, self, skip_why)
-            finally:
-                result.stopTest(self)
-            return
-        expecting_failure_method = getattr(testMethod,
-                                           "__unittest_expecting_failure__", False)
-        expecting_failure_class = getattr(self,
-                                          "__unittest_expecting_failure__", False)
-        expecting_failure = expecting_failure_class or expecting_failure_method
-        outcome = _Outcome(result)
-        try:
-            self._outcome = outcome
+                return
+
+            expecting_failure = (
+                getattr(self, "__unittest_expecting_failure__", False) or
+                getattr(testMethod, "__unittest_expecting_failure__", False)
+            )
+            outcome = _Outcome(result)
+            try:
+                self._outcome = outcome
 
-            with outcome.testPartExecutor(self):
-                self._callSetUp()
-            if outcome.success:
-                outcome.expecting_failure = expecting_failure
-                with outcome.testPartExecutor(self, isTest=True):
-                    self._callTestMethod(testMethod)
-                outcome.expecting_failure = False
                 with outcome.testPartExecutor(self):
-                    self._callTearDown()
-
-            self.doCleanups()
-            for test, reason in outcome.skipped:
-                self._addSkip(result, test, reason)
-            self._feedErrorsToResult(result, outcome.errors)
-            if outcome.success:
-                if expecting_failure:
-                    if outcome.expectedFailure:
-                        self._addExpectedFailure(result, outcome.expectedFailure)
+                    self._callSetUp()
+                if outcome.success:
+                    outcome.expecting_failure = expecting_failure
+                    with outcome.testPartExecutor(self, isTest=True):
+                        self._callTestMethod(testMethod)
+                    outcome.expecting_failure = False
+                    with outcome.testPartExecutor(self):
+                        self._callTearDown()
+
+                self.doCleanups()
+                for test, reason in outcome.skipped:
+                    self._addSkip(result, test, reason)
+                self._feedErrorsToResult(result, outcome.errors)
+                if outcome.success:
+                    if expecting_failure:
+                        if outcome.expectedFailure:
+                            self._addExpectedFailure(result, outcome.expectedFailure)
+                        else:
+                            self._addUnexpectedSuccess(result)
                     else:
-                        self._addUnexpectedSuccess(result)
-                else:
-                    result.addSuccess(self)
-            return result
+                        result.addSuccess(self)
+                return result
+            finally:
+                # explicitly break reference cycles:
+                # outcome.errors -> frame -> outcome -> outcome.errors
+                # outcome.expectedFailure -> frame -> outcome -> outcome.expectedFailure
+                outcome.errors.clear()
+                outcome.expectedFailure = None
+
+                # clear the outcome, no more needed
+                self._outcome = None
+
         finally:
             result.stopTest(self)
-            if orig_result is None:
-                stopTestRun = getattr(result, 'stopTestRun', None)
-                if stopTestRun is not None:
-                    stopTestRun()
-
-            # explicitly break reference cycles:
-            # outcome.errors -> frame -> outcome -> outcome.errors
-            # outcome.expectedFailure -> frame -> outcome -> outcome.expectedFailure
-            outcome.errors.clear()
-            outcome.expectedFailure = None
-
-            # clear the outcome, no more needed
-            self._outcome = None
+            if stopTestRun is not None:
+                stopTestRun()
 
     def doCleanups(self):
         """Execute all cleanup functions. Normally called for you after
diff --git a/Lib/unittest/test/test_skipping.py b/Lib/unittest/test/test_skipping.py
index 1c178a95f750ff..3adde41b04e737 100644
--- a/Lib/unittest/test/test_skipping.py
+++ b/Lib/unittest/test/test_skipping.py
@@ -7,6 +7,8 @@ class Test_TestSkipping(unittest.TestCase):
 
     def test_skipping(self):
         class Foo(unittest.TestCase):
+            def defaultTestResult(self):
+                return LoggingResult(events)
             def test_skip_me(self):
                 self.skipTest("skip")
         events = []
@@ -16,8 +18,15 @@ def test_skip_me(self):
         self.assertEqual(events, ['startTest', 'addSkip', 'stopTest'])
         self.assertEqual(result.skipped, [(test, "skip")])
 
+        events = []
+        test.run()
+        self.assertEqual(events, ['startTestRun', 'startTest', 'addSkip',
+                                  'stopTest', 'stopTestRun'])
+
         # Try letting setUp skip the test now.
         class Foo(unittest.TestCase):
+            def defaultTestResult(self):
+                return LoggingResult(events)
             def setUp(self):
                 self.skipTest("testing")
             def test_nothing(self): pass
@@ -29,8 +38,15 @@ def test_nothing(self): pass
         self.assertEqual(result.skipped, [(test, "testing")])
         self.assertEqual(result.testsRun, 1)
 
+        events = []
+        test.run()
+        self.assertEqual(events, ['startTestRun', 'startTest', 'addSkip',
+                                  'stopTest', 'stopTestRun'])
+
     def test_skipping_subtests(self):
         class Foo(unittest.TestCase):
+            def defaultTestResult(self):
+                return LoggingResult(events)
             def test_skip_me(self):
                 with self.subTest(a=1):
                     with self.subTest(b=2):
@@ -54,11 +70,20 @@ def test_skip_me(self):
         self.assertIsNot(subtest, test)
         self.assertEqual(result.skipped[2], (test, "skip 3"))
 
+        events = []
+        test.run()
+        self.assertEqual(events,
+                         ['startTestRun', 'startTest', 'addSkip', 'addSkip',
+                          'addSkip', 'stopTest', 'stopTestRun'])
+
     def test_skipping_decorators(self):
         op_table = ((unittest.skipUnless, False, True),
                     (unittest.skipIf, True, False))
         for deco, do_skip, dont_skip in op_table:
             class Foo(unittest.TestCase):
+                def defaultTestResult(self):
+                    return LoggingResult(events)
+
                 @deco(do_skip, "testing")
                 def test_skip(self): pass
 
@@ -66,6 +91,7 @@ def test_skip(self): pass
                 def test_dont_skip(self): pass
             test_do_skip = Foo("test_skip")
             test_dont_skip = Foo("test_dont_skip")
+
             suite = unittest.TestSuite([test_do_skip, test_dont_skip])
             events = []
             result = LoggingResult(events)
@@ -78,19 +104,41 @@ def test_dont_skip(self): pass
             self.assertEqual(result.skipped, [(test_do_skip, "testing")])
             self.assertTrue(result.wasSuccessful())
 
+            events = []
+            test_do_skip.run()
+            self.assertEqual(len(result.skipped), 1)
+            self.assertEqual(events, ['startTestRun', 'startTest', 'addSkip',
+                                      'stopTest', 'stopTestRun'])
+
+            events = []
+            test_dont_skip.run()
+            self.assertEqual(len(result.skipped), 1)
+            self.assertEqual(events, ['startTestRun', 'startTest', 'addSuccess',
+                                      'stopTest', 'stopTestRun'])
+
     def test_skip_class(self):
         @unittest.skip("testing")
         class Foo(unittest.TestCase):
+            def defaultTestResult(self):
+                return LoggingResult(events)
             def test_1(self):
                 record.append(1)
+        events = []
         record = []
-        result = unittest.TestResult()
+        result = LoggingResult(events)
         test = Foo("test_1")
         suite = unittest.TestSuite([test])
         suite.run(result)
+        self.assertEqual(events, ['startTest', 'addSkip', 'stopTest'])
         self.assertEqual(result.skipped, [(test, "testing")])
         self.assertEqual(record, [])
 
+        events = []
+        test.run()
+        self.assertEqual(events, ['startTestRun', 'startTest', 'addSkip',
+                                  'stopTest', 'stopTestRun'])
+        self.assertEqual(record, [])
+
     def test_skip_non_unittest_class(self):
         @unittest.skip("testing")
         class Mixin:
diff --git a/Misc/NEWS.d/next/Library/2021-08-19-15-03-54.bpo-44955.1mxFQS.rst b/Misc/NEWS.d/next/Library/2021-08-19-15-03-54.bpo-44955.1mxFQS.rst
new file mode 100644
index 00000000000000..57d1da533cde0d
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-19-15-03-54.bpo-44955.1mxFQS.rst
@@ -0,0 +1,5 @@
+Method :meth:`~unittest.TestResult.stopTestRun` is now always called in pair
+with method :meth:`~unittest.TestResult.startTestRun` for
+:class:`~unittest.TestResult` objects implicitly created in
+:meth:`~unittest.TestCase.run`. Previously it was not called for test
+methods and classes decorated with a skipping decorator.


From webhook-mailer at python.org  Sun Aug 22 08:13:42 2021
From: webhook-mailer at python.org (mdickinson)
Date: Sun, 22 Aug 2021 12:13:42 -0000
Subject: [Python-checkins] bpo-44978: allow Argument Clinic to handle
 __complex__ special methods (GH-27886)
Message-ID: <mailman.1110.1629634423.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/c5c3fbe2a16a8fcb77eb98eda53efb3e03b863ca
commit: c5c3fbe2a16a8fcb77eb98eda53efb3e03b863ca
branch: main
author: Mark Dickinson <mdickinson at enthought.com>
committer: mdickinson <dickinsm at gmail.com>
date: 2021-08-22T13:13:26+01:00
summary:

bpo-44978: allow Argument Clinic to handle __complex__ special methods (GH-27886)

files:
A Misc/NEWS.d/next/Tools-Demos/2021-08-22-11-45-31.bpo-44978.QupKV3.rst
M Tools/clinic/clinic.py

diff --git a/Misc/NEWS.d/next/Tools-Demos/2021-08-22-11-45-31.bpo-44978.QupKV3.rst b/Misc/NEWS.d/next/Tools-Demos/2021-08-22-11-45-31.bpo-44978.QupKV3.rst
new file mode 100644
index 00000000000000..c7a844c1230e2e
--- /dev/null
+++ b/Misc/NEWS.d/next/Tools-Demos/2021-08-22-11-45-31.bpo-44978.QupKV3.rst
@@ -0,0 +1 @@
+Allow the Argument Clinic tool to handle ``__complex__`` special methods.
diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py
index b52ac3b00de9ee..ed17fabf8d2a14 100755
--- a/Tools/clinic/clinic.py
+++ b/Tools/clinic/clinic.py
@@ -2181,7 +2181,6 @@ def __repr__(self):
 __and__
 __bytes__
 __call__
-__complex__
 __delitem__
 __divmod__
 __eq__


From webhook-mailer at python.org  Sun Aug 22 09:23:53 2021
From: webhook-mailer at python.org (corona10)
Date: Sun, 22 Aug 2021 13:23:53 -0000
Subject: [Python-checkins] Remove unused UNKNOWN macros from cursor.h and
 prepare_protocol.h (GH-27885)
Message-ID: <mailman.1111.1629638635.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/6dd1cdb0cfd6427925863e0ff7ad3fde0d824a8b
commit: 6dd1cdb0cfd6427925863e0ff7ad3fde0d824a8b
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: corona10 <donghee.na92 at gmail.com>
date: 2021-08-22T22:23:45+09:00
summary:

Remove unused UNKNOWN macros from cursor.h and prepare_protocol.h (GH-27885)

files:
M Modules/_sqlite/cursor.h
M Modules/_sqlite/prepare_protocol.h

diff --git a/Modules/_sqlite/cursor.h b/Modules/_sqlite/cursor.h
index 9a5e9eede2302..29f52b92189be 100644
--- a/Modules/_sqlite/cursor.h
+++ b/Modules/_sqlite/cursor.h
@@ -54,5 +54,4 @@ typedef struct
 
 int pysqlite_cursor_setup_types(PyObject *module);
 
-#define UNKNOWN (-1)
 #endif
diff --git a/Modules/_sqlite/prepare_protocol.h b/Modules/_sqlite/prepare_protocol.h
index f24cef5497139..afc55a8c1c4eb 100644
--- a/Modules/_sqlite/prepare_protocol.h
+++ b/Modules/_sqlite/prepare_protocol.h
@@ -32,5 +32,4 @@ typedef struct
 
 int pysqlite_prepare_protocol_setup_types(PyObject *module);
 
-#define UNKNOWN (-1)
 #endif


From webhook-mailer at python.org  Sun Aug 22 14:15:18 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Sun, 22 Aug 2021 18:15:18 -0000
Subject: [Python-checkins] bpo-44955: Always call stopTestRun() for
 implicitly created TestResult objects (GH-27831) (GH-27882)
Message-ID: <mailman.1112.1629656120.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/4e5162fd369baf25dd16a42ccd0fa7756744f4d0
commit: 4e5162fd369baf25dd16a42ccd0fa7756744f4d0
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-22T21:15:10+03:00
summary:

bpo-44955: Always call stopTestRun() for implicitly created TestResult objects (GH-27831) (GH-27882)

Method stopTestRun() is now always called in pair with method startTestRun()
for TestResult objects implicitly created in TestCase.run().
Previously it was not called for test methods and classes decorated with
a skipping decorator.
(cherry picked from commit a9640d75531d6cbbfd254b65435f238c26bf5cd9)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
A Misc/NEWS.d/next/Library/2021-08-19-15-03-54.bpo-44955.1mxFQS.rst
M Lib/unittest/case.py
M Lib/unittest/test/test_skipping.py

diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index f8bc865ee82039..325e2d4a7b0262 100644
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -556,73 +556,71 @@ def _callCleanup(self, function, /, *args, **kwargs):
         function(*args, **kwargs)
 
     def run(self, result=None):
-        orig_result = result
         if result is None:
             result = self.defaultTestResult()
             startTestRun = getattr(result, 'startTestRun', None)
+            stopTestRun = getattr(result, 'stopTestRun', None)
             if startTestRun is not None:
                 startTestRun()
+        else:
+            stopTestRun = None
 
         result.startTest(self)
-
-        testMethod = getattr(self, self._testMethodName)
-        if (getattr(self.__class__, "__unittest_skip__", False) or
-            getattr(testMethod, "__unittest_skip__", False)):
-            # If the class or method was skipped.
-            try:
+        try:
+            testMethod = getattr(self, self._testMethodName)
+            if (getattr(self.__class__, "__unittest_skip__", False) or
+                getattr(testMethod, "__unittest_skip__", False)):
+                # If the class or method was skipped.
                 skip_why = (getattr(self.__class__, '__unittest_skip_why__', '')
                             or getattr(testMethod, '__unittest_skip_why__', ''))
                 self._addSkip(result, self, skip_why)
-            finally:
-                result.stopTest(self)
-            return
-        expecting_failure_method = getattr(testMethod,
-                                           "__unittest_expecting_failure__", False)
-        expecting_failure_class = getattr(self,
-                                          "__unittest_expecting_failure__", False)
-        expecting_failure = expecting_failure_class or expecting_failure_method
-        outcome = _Outcome(result)
-        try:
-            self._outcome = outcome
+                return
+
+            expecting_failure = (
+                getattr(self, "__unittest_expecting_failure__", False) or
+                getattr(testMethod, "__unittest_expecting_failure__", False)
+            )
+            outcome = _Outcome(result)
+            try:
+                self._outcome = outcome
 
-            with outcome.testPartExecutor(self):
-                self._callSetUp()
-            if outcome.success:
-                outcome.expecting_failure = expecting_failure
-                with outcome.testPartExecutor(self, isTest=True):
-                    self._callTestMethod(testMethod)
-                outcome.expecting_failure = False
                 with outcome.testPartExecutor(self):
-                    self._callTearDown()
-
-            self.doCleanups()
-            for test, reason in outcome.skipped:
-                self._addSkip(result, test, reason)
-            self._feedErrorsToResult(result, outcome.errors)
-            if outcome.success:
-                if expecting_failure:
-                    if outcome.expectedFailure:
-                        self._addExpectedFailure(result, outcome.expectedFailure)
+                    self._callSetUp()
+                if outcome.success:
+                    outcome.expecting_failure = expecting_failure
+                    with outcome.testPartExecutor(self, isTest=True):
+                        self._callTestMethod(testMethod)
+                    outcome.expecting_failure = False
+                    with outcome.testPartExecutor(self):
+                        self._callTearDown()
+
+                self.doCleanups()
+                for test, reason in outcome.skipped:
+                    self._addSkip(result, test, reason)
+                self._feedErrorsToResult(result, outcome.errors)
+                if outcome.success:
+                    if expecting_failure:
+                        if outcome.expectedFailure:
+                            self._addExpectedFailure(result, outcome.expectedFailure)
+                        else:
+                            self._addUnexpectedSuccess(result)
                     else:
-                        self._addUnexpectedSuccess(result)
-                else:
-                    result.addSuccess(self)
-            return result
+                        result.addSuccess(self)
+                return result
+            finally:
+                # explicitly break reference cycles:
+                # outcome.errors -> frame -> outcome -> outcome.errors
+                # outcome.expectedFailure -> frame -> outcome -> outcome.expectedFailure
+                outcome.errors.clear()
+                outcome.expectedFailure = None
+
+                # clear the outcome, no more needed
+                self._outcome = None
+
         finally:
             result.stopTest(self)
-            if orig_result is None:
-                stopTestRun = getattr(result, 'stopTestRun', None)
-                if stopTestRun is not None:
-                    stopTestRun()
-
-            # explicitly break reference cycles:
-            # outcome.errors -> frame -> outcome -> outcome.errors
-            # outcome.expectedFailure -> frame -> outcome -> outcome.expectedFailure
-            outcome.errors.clear()
-            outcome.expectedFailure = None
-
-            # clear the outcome, no more needed
-            self._outcome = None
+            if stopTestRun is not None:
+                stopTestRun()
 
     def doCleanups(self):
         """Execute all cleanup functions. Normally called for you after
diff --git a/Lib/unittest/test/test_skipping.py b/Lib/unittest/test/test_skipping.py
index 1c178a95f750ff..3adde41b04e737 100644
--- a/Lib/unittest/test/test_skipping.py
+++ b/Lib/unittest/test/test_skipping.py
@@ -7,6 +7,8 @@ class Test_TestSkipping(unittest.TestCase):
 
     def test_skipping(self):
         class Foo(unittest.TestCase):
+            def defaultTestResult(self):
+                return LoggingResult(events)
             def test_skip_me(self):
                 self.skipTest("skip")
         events = []
@@ -16,8 +18,15 @@ def test_skip_me(self):
         self.assertEqual(events, ['startTest', 'addSkip', 'stopTest'])
         self.assertEqual(result.skipped, [(test, "skip")])
 
+        events = []
+        test.run()
+        self.assertEqual(events, ['startTestRun', 'startTest', 'addSkip',
+                                  'stopTest', 'stopTestRun'])
+
         # Try letting setUp skip the test now.
         class Foo(unittest.TestCase):
+            def defaultTestResult(self):
+                return LoggingResult(events)
             def setUp(self):
                 self.skipTest("testing")
             def test_nothing(self): pass
@@ -29,8 +38,15 @@ def test_nothing(self): pass
         self.assertEqual(result.skipped, [(test, "testing")])
         self.assertEqual(result.testsRun, 1)
 
+        events = []
+        test.run()
+        self.assertEqual(events, ['startTestRun', 'startTest', 'addSkip',
+                                  'stopTest', 'stopTestRun'])
+
     def test_skipping_subtests(self):
         class Foo(unittest.TestCase):
+            def defaultTestResult(self):
+                return LoggingResult(events)
             def test_skip_me(self):
                 with self.subTest(a=1):
                     with self.subTest(b=2):
@@ -54,11 +70,20 @@ def test_skip_me(self):
         self.assertIsNot(subtest, test)
         self.assertEqual(result.skipped[2], (test, "skip 3"))
 
+        events = []
+        test.run()
+        self.assertEqual(events,
+                         ['startTestRun', 'startTest', 'addSkip', 'addSkip',
+                          'addSkip', 'stopTest', 'stopTestRun'])
+
     def test_skipping_decorators(self):
         op_table = ((unittest.skipUnless, False, True),
                     (unittest.skipIf, True, False))
         for deco, do_skip, dont_skip in op_table:
             class Foo(unittest.TestCase):
+                def defaultTestResult(self):
+                    return LoggingResult(events)
+
                 @deco(do_skip, "testing")
                 def test_skip(self): pass
 
@@ -66,6 +91,7 @@ def test_skip(self): pass
                 def test_dont_skip(self): pass
             test_do_skip = Foo("test_skip")
             test_dont_skip = Foo("test_dont_skip")
+
             suite = unittest.TestSuite([test_do_skip, test_dont_skip])
             events = []
             result = LoggingResult(events)
@@ -78,19 +104,41 @@ def test_dont_skip(self): pass
             self.assertEqual(result.skipped, [(test_do_skip, "testing")])
             self.assertTrue(result.wasSuccessful())
 
+            events = []
+            test_do_skip.run()
+            self.assertEqual(len(result.skipped), 1)
+            self.assertEqual(events, ['startTestRun', 'startTest', 'addSkip',
+                                      'stopTest', 'stopTestRun'])
+
+            events = []
+            test_dont_skip.run()
+            self.assertEqual(len(result.skipped), 1)
+            self.assertEqual(events, ['startTestRun', 'startTest', 'addSuccess',
+                                      'stopTest', 'stopTestRun'])
+
     def test_skip_class(self):
         @unittest.skip("testing")
         class Foo(unittest.TestCase):
+            def defaultTestResult(self):
+                return LoggingResult(events)
             def test_1(self):
                 record.append(1)
+        events = []
         record = []
-        result = unittest.TestResult()
+        result = LoggingResult(events)
         test = Foo("test_1")
         suite = unittest.TestSuite([test])
         suite.run(result)
+        self.assertEqual(events, ['startTest', 'addSkip', 'stopTest'])
         self.assertEqual(result.skipped, [(test, "testing")])
         self.assertEqual(record, [])
 
+        events = []
+        test.run()
+        self.assertEqual(events, ['startTestRun', 'startTest', 'addSkip',
+                                  'stopTest', 'stopTestRun'])
+        self.assertEqual(record, [])
+
     def test_skip_non_unittest_class(self):
         @unittest.skip("testing")
         class Mixin:
diff --git a/Misc/NEWS.d/next/Library/2021-08-19-15-03-54.bpo-44955.1mxFQS.rst b/Misc/NEWS.d/next/Library/2021-08-19-15-03-54.bpo-44955.1mxFQS.rst
new file mode 100644
index 00000000000000..57d1da533cde0d
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-19-15-03-54.bpo-44955.1mxFQS.rst
@@ -0,0 +1,5 @@
+Method :meth:`~unittest.TestResult.stopTestRun` is now always called in pair
+with method :meth:`~unittest.TestResult.startTestRun` for
+:class:`~unittest.TestResult` objects implicitly created in
+:meth:`~unittest.TestCase.run`. Previously it was not called for test
+methods and classes decorated with a skipping decorator.


From webhook-mailer at python.org  Sun Aug 22 14:15:42 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Sun, 22 Aug 2021 18:15:42 -0000
Subject: [Python-checkins] bpo-44940: Clarify the documentation of
 re.findall() (GH-27849) (GH-27880)
Message-ID: <mailman.1113.1629656143.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/d006392245c904547e5727144235c2f9d7948e96
commit: d006392245c904547e5727144235c2f9d7948e96
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-22T21:15:38+03:00
summary:

bpo-44940: Clarify the documentation of re.findall() (GH-27849) (GH-27880)

Co-authored-by: Ken Jin <28750310+Fidget-Spinner at users.noreply.github.com>
Co-authored-by: Vedran ?a?i? <vedgar+github at gmail.com>
(cherry picked from commit 64f9e7b19dc1603fcbd07c17c9860085b9d21465)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
M Doc/library/re.rst

diff --git a/Doc/library/re.rst b/Doc/library/re.rst
index 950012a9b0fe2..ff7687cc936ec 100644
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -824,10 +824,20 @@ form.
 .. function:: findall(pattern, string, flags=0)
 
    Return all non-overlapping matches of *pattern* in *string*, as a list of
-   strings.  The *string* is scanned left-to-right, and matches are returned in
-   the order found.  If one or more groups are present in the pattern, return a
-   list of groups; this will be a list of tuples if the pattern has more than
-   one group.  Empty matches are included in the result.
+   strings or tuples.  The *string* is scanned left-to-right, and matches
+   are returned in the order found.  Empty matches are included in the result.
+
+   The result depends on the number of capturing groups in the pattern.
+   If there are no groups, return a list of strings matching the whole
+   pattern.  If there is exactly one group, return a list of strings
+   matching that group.  If multiple groups are present, return a list
+   of tuples of strings matching the groups.  Non-capturing groups do not
+   affect the form of the result.
+
+      >>> re.findall(r'\bf[a-z]*', 'which foot or hand fell fastest')
+      ['foot', 'fell', 'fastest']
+      >>> re.findall(r'(\w+)=(\d+)', 'set width=20 and height=10')
+      [('width', '20'), ('height', '10')]
 
    .. versionchanged:: 3.7
       Non-empty matches can now start just after a previous empty match.


From webhook-mailer at python.org  Sun Aug 22 14:30:11 2021
From: webhook-mailer at python.org (ambv)
Date: Sun, 22 Aug 2021 18:30:11 -0000
Subject: [Python-checkins] bpo-44926: `get_type_hints`: Add note about type
 aliases with forward refs (GH-27859) (GH-27860)
Message-ID: <mailman.1114.1629657012.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/9ffe582a018a2babd14e874ae2b169370633fe33
commit: 9ffe582a018a2babd14e874ae2b169370633fe33
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-22T20:29:59+02:00
summary:

bpo-44926: `get_type_hints`: Add note about type aliases with forward refs (GH-27859) (GH-27860)

(cherry picked from commit 16b9be4861e007ad483611ba0479feb2b90ea783)

Co-authored-by: Maximilian Hils <git at maximilianhils.com>

files:
M Doc/library/typing.rst

diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst
index e8d7c9ee01bd1..47d6c3a2e3898 100644
--- a/Doc/library/typing.rst
+++ b/Doc/library/typing.rst
@@ -2013,6 +2013,13 @@ Introspection helpers
            'name': Annotated[str, 'some marker']
        }
 
+   .. note::
+
+      :func:`get_type_hints` does not work with imported
+      :ref:`type aliases <type-aliases>` that include forward references.
+      Enabling postponed evaluation of annotations (:pep:`563`) may remove
+      the need for most forward references.
+
    .. versionchanged:: 3.9
       Added ``include_extras`` parameter as part of :pep:`593`.
 


From webhook-mailer at python.org  Sun Aug 22 14:32:54 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Sun, 22 Aug 2021 18:32:54 -0000
Subject: [Python-checkins] bpo-41322: Add unit tests for deprecation of test
 return values (GH-27846)
Message-ID: <mailman.1115.1629657175.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/b1db308c6114bb18c06656c94c0ffa73ba954977
commit: b1db308c6114bb18c06656c94c0ffa73ba954977
branch: main
author: andrei kulakov <andrei.avk at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-22T21:32:45+03:00
summary:

bpo-41322: Add unit tests for deprecation of test return values (GH-27846)

Also fix the traceback of warnings.

files:
M Doc/library/unittest.rst
M Doc/whatsnew/3.11.rst
M Lib/unittest/async_case.py
M Lib/unittest/case.py
M Lib/unittest/test/test_async_case.py
M Lib/unittest/test/test_case.py

diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 99c2f6e029448..f0fba94677a91 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -151,6 +151,10 @@ The above examples show the most commonly used :mod:`unittest` features which
 are sufficient to meet many everyday testing needs.  The remainder of the
 documentation explores the full feature set from first principles.
 
+.. versionchanged:: 3.11
+   The behavior of returning a value from a test method (other than the default
+   ``None`` value), is now deprecated.
+
 
 .. _unittest-command-line-interface:
 
diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index 49b4364be9bd7..cb8f84c4b625e 100644
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -395,3 +395,7 @@ Removed
   :func:`~gettext.install` are also removed, since they are only used for
   the ``l*gettext()`` functions.
   (Contributed by Dong-hee Na and Serhiy Storchaka in :issue:`44235`.)
+
+* The behavior of returning a value from a :class:`~unittest.TestCase` and
+  :class:`~unittest.IsolatedAsyncioTestCase` test methods (other than the default ``None``
+  value), is now deprecated.
diff --git a/Lib/unittest/async_case.py b/Lib/unittest/async_case.py
index cc404cc06f8b6..bfc68a76e84d9 100644
--- a/Lib/unittest/async_case.py
+++ b/Lib/unittest/async_case.py
@@ -65,7 +65,7 @@ def _callSetUp(self):
     def _callTestMethod(self, method):
         if self._callMaybeAsync(method) is not None:
             warnings.warn(f'It is deprecated to return a value!=None from a '
-                          f'test case ({method})', DeprecationWarning)
+                          f'test case ({method})', DeprecationWarning, stacklevel=4)
 
     def _callTearDown(self):
         self._callAsync(self.asyncTearDown)
diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index 625d27ef6dc61..8775ba9e241c4 100644
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -548,7 +548,7 @@ def _callSetUp(self):
     def _callTestMethod(self, method):
         if method() is not None:
             warnings.warn(f'It is deprecated to return a value!=None from a '
-                          f'test case ({method})', DeprecationWarning)
+                          f'test case ({method})', DeprecationWarning, stacklevel=3)
 
     def _callTearDown(self):
         self.tearDown()
diff --git a/Lib/unittest/test/test_async_case.py b/Lib/unittest/test/test_async_case.py
index 6e48b9e4bfed3..93ef1997e0c99 100644
--- a/Lib/unittest/test/test_async_case.py
+++ b/Lib/unittest/test/test_async_case.py
@@ -167,6 +167,26 @@ async def on_cleanup(self):
         test.run()
         self.assertEqual(events, ['asyncSetUp', 'test', 'asyncTearDown', 'cleanup'])
 
+    def test_deprecation_of_return_val_from_test(self):
+        # Issue 41322 - deprecate return of value!=None from a test
+        class Test(unittest.IsolatedAsyncioTestCase):
+            async def test1(self):
+                return 1
+            async def test2(self):
+                yield 1
+
+        with self.assertWarns(DeprecationWarning) as w:
+            Test('test1').run()
+        self.assertIn('It is deprecated to return a value!=None', str(w.warnings[0].message))
+        self.assertIn('test1', str(w.warnings[0].message))
+        self.assertEqual(w.warnings[0].filename, __file__)
+
+        with self.assertWarns(DeprecationWarning) as w:
+            Test('test2').run()
+        self.assertIn('It is deprecated to return a value!=None', str(w.warnings[0].message))
+        self.assertIn('test2', str(w.warnings[0].message))
+        self.assertEqual(w.warnings[0].filename, __file__)
+
     def test_cleanups_interleave_order(self):
         events = []
 
diff --git a/Lib/unittest/test/test_case.py b/Lib/unittest/test/test_case.py
index b8aca92a8ebe9..f3cabe44d1c88 100644
--- a/Lib/unittest/test/test_case.py
+++ b/Lib/unittest/test/test_case.py
@@ -306,6 +306,26 @@ def test(self):
 
         Foo('test').run()
 
+    def test_deprecation_of_return_val_from_test(self):
+        # Issue 41322 - deprecate return of value!=None from a test
+        class Foo(unittest.TestCase):
+            def test1(self):
+                return 1
+            def test2(self):
+                yield 1
+
+        with self.assertWarns(DeprecationWarning) as w:
+            Foo('test1').run()
+        self.assertIn('It is deprecated to return a value!=None', str(w.warnings[0].message))
+        self.assertIn('test1', str(w.warnings[0].message))
+        self.assertEqual(w.warnings[0].filename, __file__)
+
+        with self.assertWarns(DeprecationWarning) as w:
+            Foo('test2').run()
+        self.assertIn('It is deprecated to return a value!=None', str(w.warnings[0].message))
+        self.assertIn('test2', str(w.warnings[0].message))
+        self.assertEqual(w.warnings[0].filename, __file__)
+
     def _check_call_order__subtests(self, result, events, expected_events):
         class Foo(Test.LoggingTestCase):
             def test(self):


From webhook-mailer at python.org  Sun Aug 22 14:34:24 2021
From: webhook-mailer at python.org (ambv)
Date: Sun, 22 Aug 2021 18:34:24 -0000
Subject: [Python-checkins] bpo-42560: rework external references in Tkinter
 docs (GH-27838)
Message-ID: <mailman.1116.1629657266.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/d1049d1d6b43296d4db1aa8668aa4ca807bf7adb
commit: d1049d1d6b43296d4db1aa8668aa4ca807bf7adb
branch: main
author: Mark Roseman <mark at markroseman.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-22T20:34:15+02:00
summary:

bpo-42560: rework external references in Tkinter docs (GH-27838)

- reorganized from two sections (tkinter vs. tcl/tk) into three (tkinter, tcl/tk, and books)
- main (recommended) tkinter docs have one tutorial (tkdocs) and one reference (shipman), added better descriptions
- dropped link to Tkinter page on wiki (suggestion by E. Paine; outdated, most material already linked to from python.org)
- replaced Tcl/Tk recent man pages and core dev home with single link to main Tcl/Tk page (which holds both of these)
- updated Modern Tkinter link to book page on TkDocs site (was Amazon link to old version), dropped description
- replaced Grayson book by Moore book (newer, covers ttk)
- changed Ousterhout ref to second edition, covers ttk
- dropped link to Welch book (old)

files:
M Doc/library/tkinter.rst

diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index 39766486f64f9..45bcab644798b 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -32,44 +32,34 @@ details that are unchanged.
 
 .. seealso::
 
-   Tkinter documentation:
+   * `TkDocs <http://tkdocs.com/>`_
+      Extensive tutorial on creating user interfaces with Tkinter.  Explains key concepts,
+      and illustrates recommended approaches using the modern API.
 
-   `Python Tkinter Resources <https://wiki.python.org/moin/TkInter>`_
-      The Python Tkinter Topic Guide provides a great deal of information on using Tk
-      from Python and links to other sources of information on Tk.
+   * `Tkinter 8.5 reference: a GUI for Python <https://www.tkdocs.com/shipman/>`_
+      Reference documentation for Tkinter 8.5 detailing available classes, methods, and options.
 
-   `TKDocs <http://www.tkdocs.com/>`_
-      Extensive tutorial plus friendlier widget pages for some of the widgets.
+   Tcl/Tk Resources:
 
-   `Tkinter 8.5 reference: a GUI for Python <https://www.tkdocs.com/shipman/>`_
-      On-line reference material.
+   * `Tk commands <https://www.tcl.tk/man/tcl8.6/TkCmd/contents.htm>`_
+      Comprehensive reference to each of the underlying Tcl/Tk commands used by Tkinter.
 
-   `Programming Python <http://learning-python.com/about-pp4e.html>`_
-      Book by Mark Lutz, has excellent coverage of Tkinter.
+   * `Tcl/Tk Home Page <https://www.tcl.tk>`_
+      Additional documentation, and links to Tcl/Tk core development.
 
-   `Modern Tkinter for Busy Python Developers <https://www.amazon.com/Modern-Tkinter-Python-Developers-ebook/dp/B0071QDNLO/>`_
-      Book by Mark Roseman about building attractive and modern graphical user interfaces with Python and Tkinter.
+   Books:
 
-   `Python and Tkinter Programming <https://www.manning.com/books/python-and-tkinter-programming>`_
-      Book by John Grayson (ISBN 1-884777-81-3).
+   * `Modern Tkinter for Busy Python Developers <https://tkdocs.com/book.html>`_
+      By Mark Roseman. (ISBN 978-1999149567)
 
-   Tcl/Tk documentation:
+   * `Python and Tkinter Programming <https://www.packtpub.com/product/python-gui-programming-with-tkinter/9781788835886>`_
+      By Alan Moore. (ISBN 978-1788835886)
 
-   `Tk commands <https://www.tcl.tk/man/tcl8.6/TkCmd/contents.htm>`_
-      Most commands are available as :mod:`tkinter` or :mod:`tkinter.ttk` classes.
-      Change '8.6' to match the version of your Tcl/Tk installation.
+   * `Programming Python <http://learning-python.com/about-pp4e.html>`_
+      By Mark Lutz; has excellent coverage of Tkinter. (ISBN 978-0596158101)
 
-   `Tcl/Tk recent man pages <https://www.tcl.tk/doc/>`_
-      Recent Tcl/Tk manuals on www.tcl.tk.
-
-   `ActiveState Tcl Home Page <https://tcl.tk>`_
-      The Tk/Tcl development is largely taking place at ActiveState.
-
-   `Tcl and the Tk Toolkit <https://www.amazon.com/exec/obidos/ASIN/020163337X>`_
-      Book by John Ousterhout, the inventor of Tcl.
-
-   `Practical Programming in Tcl and Tk <http://www.beedub.com/book/>`_
-      Brent Welch's encyclopedic book.
+   * `Tcl and the Tk Toolkit (2nd edition)  <https://www.amazon.com/exec/obidos/ASIN/032133633X>`_
+      By John Ousterhout, inventor of Tcl/Tk, and Ken Jones; does not cover Tkinter. (ISBN 978-0321336330)
 
 
 Architecture


From webhook-mailer at python.org  Sun Aug 22 14:35:31 2021
From: webhook-mailer at python.org (ambv)
Date: Sun, 22 Aug 2021 18:35:31 -0000
Subject: [Python-checkins] bpo-42560: tweaks to intro of Tkinter docs- add
 macOS, drop ActiveState (GH-27835)
Message-ID: <mailman.1117.1629657332.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/141c7a4fce8def67baa9d24f542c105b8502893e
commit: 141c7a4fce8def67baa9d24f542c105b8502893e
branch: main
author: Mark Roseman <mark at markroseman.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-22T20:35:22+02:00
summary:

bpo-42560: tweaks to intro of Tkinter docs- add macOS, drop ActiveState (GH-27835)

files:
M Doc/library/tkinter.rst

diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index 45bcab644798b..c397956d7cf62 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -11,9 +11,8 @@
 --------------
 
 The :mod:`tkinter` package ("Tk interface") is the standard Python interface to
-the Tk GUI toolkit.  Both Tk and :mod:`tkinter` are available on most Unix
-platforms, as well as on Windows systems.  (Tk itself is not part of Python; it
-is maintained at ActiveState.)
+the Tcl/Tk GUI toolkit.  Both Tk and :mod:`tkinter` are available on most Unix
+platforms, including macOS, as well as on Windows systems.
 
 Running ``python -m tkinter`` from the command line should open a window
 demonstrating a simple Tk interface, letting you know that :mod:`tkinter` is


From webhook-mailer at python.org  Sun Aug 22 14:41:54 2021
From: webhook-mailer at python.org (ambv)
Date: Sun, 22 Aug 2021 18:41:54 -0000
Subject: [Python-checkins] bpo-42560: reorganize Tkinter docs modules
 section for clarity (GH-27840)
Message-ID: <mailman.1118.1629657715.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/d5dbe8bca792350f4997c027535e0ca498abd1bb
commit: d5dbe8bca792350f4997c027535e0ca498abd1bb
branch: main
author: Mark Roseman <mark at markroseman.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-22T20:41:45+02:00
summary:

 bpo-42560: reorganize Tkinter docs modules section for clarity (GH-27840)

- move description of internal modules (_tkinter and tkinter.constants) from section intro to list of additional modules at end of section, as not most important info
- added missing ttk and tix here
- emphasized up front that most apps will need tkinter and ttk

files:
M Doc/library/tkinter.rst

diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index c397956d7cf62..34238f4cdd0bb 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -105,23 +105,13 @@ Tix
 Tkinter Modules
 ---------------
 
-Most of the time, :mod:`tkinter` is all you really need, but a number of
-additional modules are available as well.  The Tk interface is located in a
-binary module named :mod:`_tkinter`. This module contains the low-level
-interface to Tk, and should never be used directly by application programmers.
-It is usually a shared library (or DLL), but might in some cases be statically
-linked with the Python interpreter.
-
-In addition to the Tk interface module, :mod:`tkinter` includes a number of
-Python modules, :mod:`tkinter.constants` being one of the most important.
-Importing :mod:`tkinter` will automatically import :mod:`tkinter.constants`,
-so, usually, to use Tkinter all you need is a simple import statement::
+Support for Tkinter is spread across several modules. Most applications will need the
+main :mod:`tkinter` module, as well as the :mod:`tkinter.ttk` module, which provides
+the modern themed widget set and API::
 
-   import tkinter
-
-Or, more often::
 
    from tkinter import *
+   from tkinter import ttk
 
 
 .. class:: Tk(screenName=None, baseName=None, className='Tk', useTk=1)
@@ -144,7 +134,10 @@ Or, more often::
    subsystem initialized) by calling its :meth:`loadtk` method.
 
 
-Other modules that provide Tk support include:
+The modules that provide Tk support include:
+
+:mod:`tkinter`
+   Main Tkinter module.
 
 :mod:`tkinter.colorchooser`
    Dialog to let the user choose a color.
@@ -167,9 +160,35 @@ Other modules that provide Tk support include:
 :mod:`tkinter.simpledialog`
    Basic dialogs and convenience functions.
 
+:mod:`tkinter.ttk`
+   Themed widget set introduced in Tk 8.5, providing modern alternatives
+   for many of the classic widgets in the main :mod:`tkinter` module.
+
+Additional modules:
+
+:mod:`_tkinter`
+   A binary module that contains the low-level interface to Tcl/Tk.
+   It is automatically imported by the main :mod:`tkinter` module,
+   and should never be used directly by application programmers.
+   It is usually a shared library (or DLL), but might in some cases be
+   statically linked with the Python interpreter.
+
+:mod:`idlelib`
+   Python's Integrated Development and Learning Environment (IDLE). Based
+   on :mod:`tkinter`.
+
+:mod:`tkinter.constants`
+   Symbolic constants that can be used in place of strings when passing
+   various parameters to Tkinter calls. Automatically imported by the
+   main :mod:`tkinter` module.
+
 :mod:`tkinter.dnd`
-   Drag-and-drop support for :mod:`tkinter`. This is experimental and should
-   become deprecated when it is replaced  with the Tk DND.
+   (experimental) Drag-and-drop support for :mod:`tkinter`. This will
+   become deprecated when it is replaced with the Tk DND.
+
+:mod:`tkinter.tix`
+   (deprecated) An older third-party Tcl/Tk package that adds several new
+   widgets. Better alternatives for most can be found in :mod:`tkinter.ttk`.
 
 :mod:`turtle`
    Turtle graphics in a Tk window.


From webhook-mailer at python.org  Sun Aug 22 14:45:06 2021
From: webhook-mailer at python.org (ambv)
Date: Sun, 22 Aug 2021 18:45:06 -0000
Subject: [Python-checkins] bpo-44957: Promote PEP 604 syntax in typing docs
 (GH-27833)
Message-ID: <mailman.1119.1629657907.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/dabb6e8ddd7626266184ba022bcb76f74196248f
commit: dabb6e8ddd7626266184ba022bcb76f74196248f
branch: main
author: Sebastian Rittau <srittau at rittau.biz>
committer: ambv <lukasz at langa.pl>
date: 2021-08-22T20:45:01+02:00
summary:

bpo-44957: Promote PEP 604 syntax in typing docs (GH-27833)

* Use "X | Y" instead of "Union" where it makes sense.
* Mention that "X | Y" is equivalent to "Union[X, Y]" in Union section.
* Remove "Optional[X]" as shorthand for "Union[X, None]" as the new
  shorthand is now "X | None".
* Mention that "Optional[X]" can be written as "X | None" in section
  about "Optional".

Co-authored-by: Ken Jin <28750310+Fidget-Spinner at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Documentation/2021-08-19-15-53-08.bpo-44957.imqrh3.rst
M Doc/library/typing.rst

diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst
index 47d6c3a2e38985..53cf5429b54c97 100644
--- a/Doc/library/typing.rst
+++ b/Doc/library/typing.rst
@@ -321,11 +321,11 @@ not generic but implicitly inherits from ``Iterable[Any]``::
 User defined generic type aliases are also supported. Examples::
 
    from collections.abc import Iterable
-   from typing import TypeVar, Union
+   from typing import TypeVar
    S = TypeVar('S')
-   Response = Union[Iterable[S], int]
+   Response = Iterable[S] | int
 
-   # Return type here is same as Union[Iterable[str], int]
+   # Return type here is same as Iterable[str] | int
    def response(query: str) -> Response[str]:
        ...
 
@@ -588,9 +588,9 @@ These can be used as types in annotations using ``[]``, each having a unique syn
 
 .. data:: Union
 
-   Union type; ``Union[X, Y]`` means either X or Y.
+   Union type; ``Union[X, Y]`` is equivalent to ``X | Y`` and means either X or Y.
 
-   To define a union, use e.g. ``Union[int, str]``.  Details:
+   To define a union, use e.g. ``Union[int, str]`` or the shorthand ``int | str``.  Details:
 
    * The arguments must be types and there must be at least one.
 
@@ -604,18 +604,16 @@ These can be used as types in annotations using ``[]``, each having a unique syn
 
    * Redundant arguments are skipped, e.g.::
 
-       Union[int, str, int] == Union[int, str]
+       Union[int, str, int] == Union[int, str] == int | str
 
    * When comparing unions, the argument order is ignored, e.g.::
 
        Union[int, str] == Union[str, int]
 
-   * You cannot subclass or instantiate a union.
+   * You cannot subclass or instantiate a ``Union``.
 
    * You cannot write ``Union[X][Y]``.
 
-   * You can use ``Optional[X]`` as a shorthand for ``Union[X, None]``.
-
    .. versionchanged:: 3.7
       Don't remove explicit subclasses from unions at runtime.
 
@@ -627,7 +625,7 @@ These can be used as types in annotations using ``[]``, each having a unique syn
 
    Optional type.
 
-   ``Optional[X]`` is equivalent to ``Union[X, None]``.
+   ``Optional[X]`` is equivalent to ``X | None`` (or ``Union[X, None]``).
 
    Note that this is not the same concept as an optional argument,
    which is one that has a default.  An optional argument with a
@@ -644,6 +642,10 @@ These can be used as types in annotations using ``[]``, each having a unique syn
       def foo(arg: Optional[int] = None) -> None:
           ...
 
+   .. versionchanged:: 3.10
+      Optional can now be written as ``X | None``. See
+      :ref:`union type expressions<types-union>`.
+
 .. data:: Callable
 
    Callable type; ``Callable[[int], str]`` is a function of (int) -> str.
@@ -770,7 +772,7 @@ These can be used as types in annotations using ``[]``, each having a unique syn
    :ref:`type variables <generics>`, and unions of any of these types.
    For example::
 
-      def new_non_team_user(user_class: Type[Union[BasicUser, ProUser]]): ...
+      def new_non_team_user(user_class: Type[BasicUser | ProUser]): ...
 
    ``Type[Any]`` is equivalent to ``Type`` which in turn is equivalent
    to ``type``, which is the root of Python's metaclass hierarchy.
@@ -951,7 +953,7 @@ These can be used as types in annotations using ``[]``, each having a unique syn
    conditional code flow and applying the narrowing to a block of code.  The
    conditional expression here is sometimes referred to as a "type guard"::
 
-      def is_str(val: Union[str, float]):
+      def is_str(val: str | float):
           # "isinstance" type guard
           if isinstance(val, str):
               # Type of ``val`` is narrowed to ``str``
@@ -2031,7 +2033,7 @@ Introspection helpers
    For a typing object of the form ``X[Y, Z, ...]`` these functions return
    ``X`` and ``(Y, Z, ...)``. If ``X`` is a generic alias for a builtin or
    :mod:`collections` class, it gets normalized to the original class.
-   If ``X`` is a :class:`Union` or :class:`Literal` contained in another
+   If ``X`` is a union or :class:`Literal` contained in another
    generic type, the order of ``(Y, Z, ...)`` may be different from the order
    of the original arguments ``[Y, Z, ...]`` due to type caching.
    For unsupported objects return ``None`` and ``()`` correspondingly.
@@ -2056,7 +2058,7 @@ Introspection helpers
           year: int
 
       is_typeddict(Film)  # => True
-      is_typeddict(Union[list, str])  # => False
+      is_typeddict(list | str)  # => False
 
    .. versionadded:: 3.10
 
diff --git a/Misc/NEWS.d/next/Documentation/2021-08-19-15-53-08.bpo-44957.imqrh3.rst b/Misc/NEWS.d/next/Documentation/2021-08-19-15-53-08.bpo-44957.imqrh3.rst
new file mode 100644
index 00000000000000..20a2aecc94ee19
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2021-08-19-15-53-08.bpo-44957.imqrh3.rst
@@ -0,0 +1,3 @@
+Promote PEP 604 union syntax by using it where possible. Also, mention ``X |
+Y`` more prominently in section about ``Union`` and mention ``X | None`` at
+all in section about ``Optional``.


From webhook-mailer at python.org  Sun Aug 22 14:54:54 2021
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 22 Aug 2021 18:54:54 -0000
Subject: [Python-checkins] bpo-42560: tweaks to intro of Tkinter docs- add
 macOS, drop ActiveState (GH-27835)
Message-ID: <mailman.1120.1629658495.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/61ecd3e593e05c3d84adf5640458a01f8550aa74
commit: 61ecd3e593e05c3d84adf5640458a01f8550aa74
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-22T11:54:46-07:00
summary:

bpo-42560: tweaks to intro of Tkinter docs- add macOS, drop ActiveState (GH-27835)

(cherry picked from commit 141c7a4fce8def67baa9d24f542c105b8502893e)

Co-authored-by: Mark Roseman <mark at markroseman.com>

files:
M Doc/library/tkinter.rst

diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index 7483ccd6f40e1..5d0bf79706411 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -11,9 +11,8 @@
 --------------
 
 The :mod:`tkinter` package ("Tk interface") is the standard Python interface to
-the Tk GUI toolkit.  Both Tk and :mod:`tkinter` are available on most Unix
-platforms, as well as on Windows systems.  (Tk itself is not part of Python; it
-is maintained at ActiveState.)
+the Tcl/Tk GUI toolkit.  Both Tk and :mod:`tkinter` are available on most Unix
+platforms, including macOS, as well as on Windows systems.
 
 Running ``python -m tkinter`` from the command line should open a window
 demonstrating a simple Tk interface, letting you know that :mod:`tkinter` is


From webhook-mailer at python.org  Sun Aug 22 15:02:20 2021
From: webhook-mailer at python.org (ambv)
Date: Sun, 22 Aug 2021 19:02:20 -0000
Subject: [Python-checkins] bpo-42560: tweaks to intro of Tkinter docs- add
 macOS, drop ActiveState (GH-27835) (GH-27892)
Message-ID: <mailman.1121.1629658941.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/e74cf8667d7d73e6cacd5d0aedcecbd20e711d6a
commit: e74cf8667d7d73e6cacd5d0aedcecbd20e711d6a
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-22T21:02:12+02:00
summary:

bpo-42560: tweaks to intro of Tkinter docs- add macOS, drop ActiveState (GH-27835) (GH-27892)

(cherry picked from commit 141c7a4fce8def67baa9d24f542c105b8502893e)

Co-authored-by: Mark Roseman <mark at markroseman.com>

files:
M Doc/library/tkinter.rst

diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index 7739f2f60a798..b9ef1e649a064 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -11,9 +11,8 @@
 --------------
 
 The :mod:`tkinter` package ("Tk interface") is the standard Python interface to
-the Tk GUI toolkit.  Both Tk and :mod:`tkinter` are available on most Unix
-platforms, as well as on Windows systems.  (Tk itself is not part of Python; it
-is maintained at ActiveState.)
+the Tcl/Tk GUI toolkit.  Both Tk and :mod:`tkinter` are available on most Unix
+platforms, including macOS, as well as on Windows systems.
 
 Running ``python -m tkinter`` from the command line should open a window
 demonstrating a simple Tk interface, letting you know that :mod:`tkinter` is


From webhook-mailer at python.org  Sun Aug 22 15:04:28 2021
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 22 Aug 2021 19:04:28 -0000
Subject: [Python-checkins] bpo-42560: reorganize Tkinter docs modules
 section for clarity (GH-27840)
Message-ID: <mailman.1122.1629659070.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/4d1e74f352d8bf70b726b373e19fd21274899d8e
commit: 4d1e74f352d8bf70b726b373e19fd21274899d8e
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-22T12:04:24-07:00
summary:

bpo-42560: reorganize Tkinter docs modules section for clarity (GH-27840)


- move description of internal modules (_tkinter and tkinter.constants) from section intro to list of additional modules at end of section, as not most important info
- added missing ttk and tix here
- emphasized up front that most apps will need tkinter and ttk
(cherry picked from commit d5dbe8bca792350f4997c027535e0ca498abd1bb)

Co-authored-by: Mark Roseman <mark at markroseman.com>

files:
M Doc/library/tkinter.rst

diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index 5d0bf79706411..2d7c02ff49f2e 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -118,23 +118,13 @@ Tix
 Tkinter Modules
 ---------------
 
-Most of the time, :mod:`tkinter` is all you really need, but a number of
-additional modules are available as well.  The Tk interface is located in a
-binary module named :mod:`_tkinter`. This module contains the low-level
-interface to Tk, and should never be used directly by application programmers.
-It is usually a shared library (or DLL), but might in some cases be statically
-linked with the Python interpreter.
-
-In addition to the Tk interface module, :mod:`tkinter` includes a number of
-Python modules, :mod:`tkinter.constants` being one of the most important.
-Importing :mod:`tkinter` will automatically import :mod:`tkinter.constants`,
-so, usually, to use Tkinter all you need is a simple import statement::
+Support for Tkinter is spread across several modules. Most applications will need the
+main :mod:`tkinter` module, as well as the :mod:`tkinter.ttk` module, which provides
+the modern themed widget set and API::
 
-   import tkinter
-
-Or, more often::
 
    from tkinter import *
+   from tkinter import ttk
 
 
 .. class:: Tk(screenName=None, baseName=None, className='Tk', useTk=1)
@@ -157,7 +147,10 @@ Or, more often::
    subsystem initialized) by calling its :meth:`loadtk` method.
 
 
-Other modules that provide Tk support include:
+The modules that provide Tk support include:
+
+:mod:`tkinter`
+   Main Tkinter module.
 
 :mod:`tkinter.colorchooser`
    Dialog to let the user choose a color.
@@ -180,9 +173,35 @@ Other modules that provide Tk support include:
 :mod:`tkinter.simpledialog`
    Basic dialogs and convenience functions.
 
+:mod:`tkinter.ttk`
+   Themed widget set introduced in Tk 8.5, providing modern alternatives
+   for many of the classic widgets in the main :mod:`tkinter` module.
+
+Additional modules:
+
+:mod:`_tkinter`
+   A binary module that contains the low-level interface to Tcl/Tk.
+   It is automatically imported by the main :mod:`tkinter` module,
+   and should never be used directly by application programmers.
+   It is usually a shared library (or DLL), but might in some cases be
+   statically linked with the Python interpreter.
+
+:mod:`idlelib`
+   Python's Integrated Development and Learning Environment (IDLE). Based
+   on :mod:`tkinter`.
+
+:mod:`tkinter.constants`
+   Symbolic constants that can be used in place of strings when passing
+   various parameters to Tkinter calls. Automatically imported by the
+   main :mod:`tkinter` module.
+
 :mod:`tkinter.dnd`
-   Drag-and-drop support for :mod:`tkinter`. This is experimental and should
-   become deprecated when it is replaced  with the Tk DND.
+   (experimental) Drag-and-drop support for :mod:`tkinter`. This will
+   become deprecated when it is replaced with the Tk DND.
+
+:mod:`tkinter.tix`
+   (deprecated) An older third-party Tcl/Tk package that adds several new
+   widgets. Better alternatives for most can be found in :mod:`tkinter.ttk`.
 
 :mod:`turtle`
    Turtle graphics in a Tk window.


From webhook-mailer at python.org  Sun Aug 22 15:05:01 2021
From: webhook-mailer at python.org (ambv)
Date: Sun, 22 Aug 2021 19:05:01 -0000
Subject: [Python-checkins] [3.10] bpo-42560: rework external references in
 Tkinter docs (GH-27838) (GH-27893)
Message-ID: <mailman.1123.1629659102.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/8e90f15ac88c66ddb7b084bb5780a126d35168af
commit: 8e90f15ac88c66ddb7b084bb5780a126d35168af
branch: 3.10
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2021-08-22T21:04:57+02:00
summary:

[3.10] bpo-42560: rework external references in Tkinter docs (GH-27838) (GH-27893)

- reorganized from two sections (tkinter vs. tcl/tk) into three (tkinter, tcl/tk, and books)
- main (recommended) tkinter docs have one tutorial (tkdocs) and one reference (shipman), added better descriptions
- dropped link to Tkinter page on wiki (suggestion by E. Paine; outdated, most material already linked to from python.org)
- replaced Tcl/Tk recent man pages and core dev home with single link to main Tcl/Tk page (which holds both of these)
- updated Modern Tkinter link to book page on TkDocs site (was Amazon link to old version), dropped description
- replaced Grayson book by Moore book (newer, covers ttk)
- changed Ousterhout ref to second edition, covers ttk
- dropped link to Welch book (old).
(cherry picked from commit d1049d1d6b43296d4db1aa8668aa4ca807bf7adb)

Co-authored-by: Mark Roseman <mark at markroseman.com>

files:
M Doc/library/tkinter.rst

diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index 2d7c02ff49f2e..34238f4cdd0bb 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -31,47 +31,34 @@ details that are unchanged.
 
 .. seealso::
 
-   Tkinter documentation:
+   * `TkDocs <http://tkdocs.com/>`_
+      Extensive tutorial on creating user interfaces with Tkinter.  Explains key concepts,
+      and illustrates recommended approaches using the modern API.
 
-   `Python Tkinter Resources <https://wiki.python.org/moin/TkInter>`_
-      The Python Tkinter Topic Guide provides a great deal of information on using Tk
-      from Python and links to other sources of information on Tk.
+   * `Tkinter 8.5 reference: a GUI for Python <https://www.tkdocs.com/shipman/>`_
+      Reference documentation for Tkinter 8.5 detailing available classes, methods, and options.
 
-   `TKDocs <http://www.tkdocs.com/>`_
-      Extensive tutorial plus friendlier widget pages for some of the widgets.
+   Tcl/Tk Resources:
 
-   `Tkinter 8.5 reference: a GUI for Python <https://www.tkdocs.com/shipman/>`_
-      On-line reference material.
+   * `Tk commands <https://www.tcl.tk/man/tcl8.6/TkCmd/contents.htm>`_
+      Comprehensive reference to each of the underlying Tcl/Tk commands used by Tkinter.
 
-   `Tkinter docs from effbot <http://effbot.org/tkinterbook/>`_
-      Online reference for tkinter supported by effbot.org.
+   * `Tcl/Tk Home Page <https://www.tcl.tk>`_
+      Additional documentation, and links to Tcl/Tk core development.
 
-   `Programming Python <http://learning-python.com/about-pp4e.html>`_
-      Book by Mark Lutz, has excellent coverage of Tkinter.
+   Books:
 
-   `Modern Tkinter for Busy Python Developers <https://www.amazon.com/Modern-Tkinter-Python-Developers-ebook/dp/B0071QDNLO/>`_
-      Book by Mark Roseman about building attractive and modern graphical user interfaces with Python and Tkinter.
+   * `Modern Tkinter for Busy Python Developers <https://tkdocs.com/book.html>`_
+      By Mark Roseman. (ISBN 978-1999149567)
 
-   `Python and Tkinter Programming <https://www.manning.com/books/python-and-tkinter-programming>`_
-      Book by John Grayson (ISBN 1-884777-81-3).
+   * `Python and Tkinter Programming <https://www.packtpub.com/product/python-gui-programming-with-tkinter/9781788835886>`_
+      By Alan Moore. (ISBN 978-1788835886)
 
-   Tcl/Tk documentation:
+   * `Programming Python <http://learning-python.com/about-pp4e.html>`_
+      By Mark Lutz; has excellent coverage of Tkinter. (ISBN 978-0596158101)
 
-   `Tk commands <https://www.tcl.tk/man/tcl8.6/TkCmd/contents.htm>`_
-      Most commands are available as :mod:`tkinter` or :mod:`tkinter.ttk` classes.
-      Change '8.6' to match the version of your Tcl/Tk installation.
-
-   `Tcl/Tk recent man pages <https://www.tcl.tk/doc/>`_
-      Recent Tcl/Tk manuals on www.tcl.tk.
-
-   `ActiveState Tcl Home Page <https://tcl.tk>`_
-      The Tk/Tcl development is largely taking place at ActiveState.
-
-   `Tcl and the Tk Toolkit <https://www.amazon.com/exec/obidos/ASIN/020163337X>`_
-      Book by John Ousterhout, the inventor of Tcl.
-
-   `Practical Programming in Tcl and Tk <http://www.beedub.com/book/>`_
-      Brent Welch's encyclopedic book.
+   * `Tcl and the Tk Toolkit (2nd edition)  <https://www.amazon.com/exec/obidos/ASIN/032133633X>`_
+      By John Ousterhout, inventor of Tcl/Tk, and Ken Jones; does not cover Tkinter. (ISBN 978-0321336330)
 
 
 Architecture


From webhook-mailer at python.org  Sun Aug 22 15:05:50 2021
From: webhook-mailer at python.org (ambv)
Date: Sun, 22 Aug 2021 19:05:50 -0000
Subject: [Python-checkins] bpo-42560: reorganize Tkinter docs modules
 section for clarity (GH-27840) (GH-27895)
Message-ID: <mailman.1124.1629659151.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/986750be5c7914f4b0120f5627fe848dcced103b
commit: 986750be5c7914f4b0120f5627fe848dcced103b
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-22T21:05:46+02:00
summary:

bpo-42560: reorganize Tkinter docs modules section for clarity (GH-27840) (GH-27895)

- move description of internal modules (_tkinter and tkinter.constants) from section intro to list of additional modules at end of section, as not most important info
- added missing ttk and tix here
- emphasized up front that most apps will need tkinter and ttk
(cherry picked from commit d5dbe8bca792350f4997c027535e0ca498abd1bb)

Co-authored-by: Mark Roseman <mark at markroseman.com>

files:
M Doc/library/tkinter.rst

diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index b9ef1e649a064..a8da883df612b 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -67,23 +67,13 @@ installed, so you can read the Tcl/Tk documentation specific to that version.
 Tkinter Modules
 ---------------
 
-Most of the time, :mod:`tkinter` is all you really need, but a number of
-additional modules are available as well.  The Tk interface is located in a
-binary module named :mod:`_tkinter`. This module contains the low-level
-interface to Tk, and should never be used directly by application programmers.
-It is usually a shared library (or DLL), but might in some cases be statically
-linked with the Python interpreter.
-
-In addition to the Tk interface module, :mod:`tkinter` includes a number of
-Python modules, :mod:`tkinter.constants` being one of the most important.
-Importing :mod:`tkinter` will automatically import :mod:`tkinter.constants`,
-so, usually, to use Tkinter all you need is a simple import statement::
+Support for Tkinter is spread across several modules. Most applications will need the
+main :mod:`tkinter` module, as well as the :mod:`tkinter.ttk` module, which provides
+the modern themed widget set and API::
 
-   import tkinter
-
-Or, more often::
 
    from tkinter import *
+   from tkinter import ttk
 
 
 .. class:: Tk(screenName=None, baseName=None, className='Tk', useTk=1)
@@ -106,7 +96,10 @@ Or, more often::
    subsystem initialized) by calling its :meth:`loadtk` method.
 
 
-Other modules that provide Tk support include:
+The modules that provide Tk support include:
+
+:mod:`tkinter`
+   Main Tkinter module.
 
 :mod:`tkinter.colorchooser`
    Dialog to let the user choose a color.
@@ -129,9 +122,35 @@ Other modules that provide Tk support include:
 :mod:`tkinter.simpledialog`
    Basic dialogs and convenience functions.
 
+:mod:`tkinter.ttk`
+   Themed widget set introduced in Tk 8.5, providing modern alternatives
+   for many of the classic widgets in the main :mod:`tkinter` module.
+
+Additional modules:
+
+:mod:`_tkinter`
+   A binary module that contains the low-level interface to Tcl/Tk.
+   It is automatically imported by the main :mod:`tkinter` module,
+   and should never be used directly by application programmers.
+   It is usually a shared library (or DLL), but might in some cases be
+   statically linked with the Python interpreter.
+
+:mod:`idlelib`
+   Python's Integrated Development and Learning Environment (IDLE). Based
+   on :mod:`tkinter`.
+
+:mod:`tkinter.constants`
+   Symbolic constants that can be used in place of strings when passing
+   various parameters to Tkinter calls. Automatically imported by the
+   main :mod:`tkinter` module.
+
 :mod:`tkinter.dnd`
-   Drag-and-drop support for :mod:`tkinter`. This is experimental and should
-   become deprecated when it is replaced  with the Tk DND.
+   (experimental) Drag-and-drop support for :mod:`tkinter`. This will
+   become deprecated when it is replaced with the Tk DND.
+
+:mod:`tkinter.tix`
+   (deprecated) An older third-party Tcl/Tk package that adds several new
+   widgets. Better alternatives for most can be found in :mod:`tkinter.ttk`.
 
 :mod:`turtle`
    Turtle graphics in a Tk window.


From webhook-mailer at python.org  Sun Aug 22 15:06:10 2021
From: webhook-mailer at python.org (ambv)
Date: Sun, 22 Aug 2021 19:06:10 -0000
Subject: [Python-checkins] [3.9] bpo-42560: rework external references in
 Tkinter docs (GH-27838) (GH-27896)
Message-ID: <mailman.1125.1629659171.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/c579f0ba62974b90f348e50088e4c036e281f45e
commit: c579f0ba62974b90f348e50088e4c036e281f45e
branch: 3.9
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2021-08-22T21:06:06+02:00
summary:

[3.9] bpo-42560: rework external references in Tkinter docs (GH-27838) (GH-27896)

- reorganized from two sections (tkinter vs. tcl/tk) into three (tkinter, tcl/tk, and books)
- main (recommended) tkinter docs have one tutorial (tkdocs) and one reference (shipman), added better descriptions
- dropped link to Tkinter page on wiki (suggestion by E. Paine; outdated, most material already linked to from python.org)
- replaced Tcl/Tk recent man pages and core dev home with single link to main Tcl/Tk page (which holds both of these)
- updated Modern Tkinter link to book page on TkDocs site (was Amazon link to old version), dropped description
- replaced Grayson book by Moore book (newer, covers ttk)
- changed Ousterhout ref to second edition, covers ttk
- dropped link to Welch book (old).
(cherry picked from commit d1049d1d6b43296d4db1aa8668aa4ca807bf7adb)

Co-authored-by: Mark Roseman <mark at markroseman.com>

files:
M Doc/library/tkinter.rst

diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index a8da883df612b..e1b2a87b0ff2e 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -21,47 +21,34 @@ installed, so you can read the Tcl/Tk documentation specific to that version.
 
 .. seealso::
 
-   Tkinter documentation:
+   * `TkDocs <http://tkdocs.com/>`_
+      Extensive tutorial on creating user interfaces with Tkinter.  Explains key concepts,
+      and illustrates recommended approaches using the modern API.
 
-   `Python Tkinter Resources <https://wiki.python.org/moin/TkInter>`_
-      The Python Tkinter Topic Guide provides a great deal of information on using Tk
-      from Python and links to other sources of information on Tk.
+   * `Tkinter 8.5 reference: a GUI for Python <https://www.tkdocs.com/shipman/>`_
+      Reference documentation for Tkinter 8.5 detailing available classes, methods, and options.
 
-   `TKDocs <http://www.tkdocs.com/>`_
-      Extensive tutorial plus friendlier widget pages for some of the widgets.
+   Tcl/Tk Resources:
 
-   `Tkinter 8.5 reference: a GUI for Python <https://www.tkdocs.com/shipman/>`_
-      On-line reference material.
+   * `Tk commands <https://www.tcl.tk/man/tcl8.6/TkCmd/contents.htm>`_
+      Comprehensive reference to each of the underlying Tcl/Tk commands used by Tkinter.
 
-   `Tkinter docs from effbot <http://effbot.org/tkinterbook/>`_
-      Online reference for tkinter supported by effbot.org.
+   * `Tcl/Tk Home Page <https://www.tcl.tk>`_
+      Additional documentation, and links to Tcl/Tk core development.
 
-   `Programming Python <http://learning-python.com/about-pp4e.html>`_
-      Book by Mark Lutz, has excellent coverage of Tkinter.
+   Books:
 
-   `Modern Tkinter for Busy Python Developers <https://www.amazon.com/Modern-Tkinter-Python-Developers-ebook/dp/B0071QDNLO/>`_
-      Book by Mark Roseman about building attractive and modern graphical user interfaces with Python and Tkinter.
+   * `Modern Tkinter for Busy Python Developers <https://tkdocs.com/book.html>`_
+      By Mark Roseman. (ISBN 978-1999149567)
 
-   `Python and Tkinter Programming <https://www.manning.com/books/python-and-tkinter-programming>`_
-      Book by John Grayson (ISBN 1-884777-81-3).
+   * `Python and Tkinter Programming <https://www.packtpub.com/product/python-gui-programming-with-tkinter/9781788835886>`_
+      By Alan Moore. (ISBN 978-1788835886)
 
-   Tcl/Tk documentation:
+   * `Programming Python <http://learning-python.com/about-pp4e.html>`_
+      By Mark Lutz; has excellent coverage of Tkinter. (ISBN 978-0596158101)
 
-   `Tk commands <https://www.tcl.tk/man/tcl8.6/TkCmd/contents.htm>`_
-      Most commands are available as :mod:`tkinter` or :mod:`tkinter.ttk` classes.
-      Change '8.6' to match the version of your Tcl/Tk installation.
-
-   `Tcl/Tk recent man pages <https://www.tcl.tk/doc/>`_
-      Recent Tcl/Tk manuals on www.tcl.tk.
-
-   `ActiveState Tcl Home Page <https://tcl.tk>`_
-      The Tk/Tcl development is largely taking place at ActiveState.
-
-   `Tcl and the Tk Toolkit <https://www.amazon.com/exec/obidos/ASIN/020163337X>`_
-      Book by John Ousterhout, the inventor of Tcl.
-
-   `Practical Programming in Tcl and Tk <http://www.beedub.com/book/>`_
-      Brent Welch's encyclopedic book.
+   * `Tcl and the Tk Toolkit (2nd edition)  <https://www.amazon.com/exec/obidos/ASIN/032133633X>`_
+      By John Ousterhout, inventor of Tcl/Tk, and Ken Jones; does not cover Tkinter. (ISBN 978-0321336330)
 
 
 Tkinter Modules


From webhook-mailer at python.org  Sun Aug 22 15:27:15 2021
From: webhook-mailer at python.org (ambv)
Date: Sun, 22 Aug 2021 19:27:15 -0000
Subject: [Python-checkins] bpo-4442: Document use of __new__ for subclasses
 of immutable types (GH-27866)
Message-ID: <mailman.1126.1629660436.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/eec340ea3af27887fcaac4029ebdee99f3713bff
commit: eec340ea3af27887fcaac4029ebdee99f3713bff
branch: main
author: Raymond Hettinger <rhettinger at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-22T21:27:06+02:00
summary:

bpo-4442:  Document use of __new__ for subclasses of immutable types (GH-27866)

files:
M Doc/faq/programming.rst

diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
index af4b489fc8a483..ef80808a1a4d5e 100644
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -1826,6 +1826,55 @@ For example, here is the implementation of
                 return True
         return False
 
+
+How can a subclass control what data is stored in an immutable instance?
+------------------------------------------------------------------------
+
+When subclassing an immutable type, override the :meth:`__new__` method
+instead of the :meth:`__init__` method.  The latter only runs *after* an
+instance is created, which is too late to alter data in an immutable
+instance.
+
+All of these immutable classes have a different signature than their
+parent class:
+
+.. testcode::
+
+    from datetime import date
+
+    class FirstOfMonthDate(date):
+        "Always choose the first day of the month"
+        def __new__(cls, year, month, day):
+            return super().__new__(cls, year, month, 1)
+
+    class NamedInt(int):
+        "Allow text names for some numbers"
+        xlat = {'zero': 0, 'one': 1, 'ten': 10}
+        def __new__(cls, value):
+            value = cls.xlat.get(value, value)
+            return super().__new__(cls, value)
+
+    class TitleStr(str):
+        "Convert str to name suitable for a URL path"
+        def __new__(cls, s):
+            s = s.lower().replace(' ', '-')
+            s = ''.join([c for c in s if c.isalnum() or c == '-'])
+            return super().__new__(cls, s)
+
+The classes can be used like this:
+
+.. doctest::
+
+    >>> FirstOfMonthDate(2012, 2, 14)
+    FirstOfMonthDate(2012, 2, 1)
+    >>> NamedInt('ten')
+    10
+    >>> NamedInt(20)
+    20
+    >>> TitleStr('Blog: Why Python Rocks')
+    'blog-why-python-rocks'
+
+
 How do I cache method calls?
 ----------------------------
 


From webhook-mailer at python.org  Sun Aug 22 15:49:29 2021
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 22 Aug 2021 19:49:29 -0000
Subject: [Python-checkins] bpo-4442: Document use of __new__ for subclasses
 of immutable types (GH-27866)
Message-ID: <mailman.1127.1629661770.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/0627918f0b69a15aa16e4ccbb5d8eaae4f6a2caf
commit: 0627918f0b69a15aa16e4ccbb5d8eaae4f6a2caf
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-22T12:49:24-07:00
summary:

bpo-4442:  Document use of __new__ for subclasses of immutable types (GH-27866)

(cherry picked from commit eec340ea3af27887fcaac4029ebdee99f3713bff)

Co-authored-by: Raymond Hettinger <rhettinger at users.noreply.github.com>

files:
M Doc/faq/programming.rst

diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
index af4b489fc8a483..ef80808a1a4d5e 100644
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -1826,6 +1826,55 @@ For example, here is the implementation of
                 return True
         return False
 
+
+How can a subclass control what data is stored in an immutable instance?
+------------------------------------------------------------------------
+
+When subclassing an immutable type, override the :meth:`__new__` method
+instead of the :meth:`__init__` method.  The latter only runs *after* an
+instance is created, which is too late to alter data in an immutable
+instance.
+
+All of these immutable classes have a different signature than their
+parent class:
+
+.. testcode::
+
+    from datetime import date
+
+    class FirstOfMonthDate(date):
+        "Always choose the first day of the month"
+        def __new__(cls, year, month, day):
+            return super().__new__(cls, year, month, 1)
+
+    class NamedInt(int):
+        "Allow text names for some numbers"
+        xlat = {'zero': 0, 'one': 1, 'ten': 10}
+        def __new__(cls, value):
+            value = cls.xlat.get(value, value)
+            return super().__new__(cls, value)
+
+    class TitleStr(str):
+        "Convert str to name suitable for a URL path"
+        def __new__(cls, s):
+            s = s.lower().replace(' ', '-')
+            s = ''.join([c for c in s if c.isalnum() or c == '-'])
+            return super().__new__(cls, s)
+
+The classes can be used like this:
+
+.. doctest::
+
+    >>> FirstOfMonthDate(2012, 2, 14)
+    FirstOfMonthDate(2012, 2, 1)
+    >>> NamedInt('ten')
+    10
+    >>> NamedInt(20)
+    20
+    >>> TitleStr('Blog: Why Python Rocks')
+    'blog-why-python-rocks'
+
+
 How do I cache method calls?
 ----------------------------
 


From webhook-mailer at python.org  Sun Aug 22 16:04:51 2021
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 22 Aug 2021 20:04:51 -0000
Subject: [Python-checkins] Move susp-ignored locations
Message-ID: <mailman.1128.1629662692.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/57b321c37716f07c8fa3f3ea48857b81bc7012af
commit: 57b321c37716f07c8fa3f3ea48857b81bc7012af
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-22T13:04:43-07:00
summary:

Move susp-ignored locations

files:
A Misc/NEWS.d/next/Documentation/2021-08-19-15-53-08.bpo-44957.imqrh3.rst
M Doc/library/typing.rst
M Doc/tools/susp-ignored.csv

diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst
index 47d6c3a2e38985..53cf5429b54c97 100644
--- a/Doc/library/typing.rst
+++ b/Doc/library/typing.rst
@@ -321,11 +321,11 @@ not generic but implicitly inherits from ``Iterable[Any]``::
 User defined generic type aliases are also supported. Examples::
 
    from collections.abc import Iterable
-   from typing import TypeVar, Union
+   from typing import TypeVar
    S = TypeVar('S')
-   Response = Union[Iterable[S], int]
+   Response = Iterable[S] | int
 
-   # Return type here is same as Union[Iterable[str], int]
+   # Return type here is same as Iterable[str] | int
    def response(query: str) -> Response[str]:
        ...
 
@@ -588,9 +588,9 @@ These can be used as types in annotations using ``[]``, each having a unique syn
 
 .. data:: Union
 
-   Union type; ``Union[X, Y]`` means either X or Y.
+   Union type; ``Union[X, Y]`` is equivalent to ``X | Y`` and means either X or Y.
 
-   To define a union, use e.g. ``Union[int, str]``.  Details:
+   To define a union, use e.g. ``Union[int, str]`` or the shorthand ``int | str``.  Details:
 
    * The arguments must be types and there must be at least one.
 
@@ -604,18 +604,16 @@ These can be used as types in annotations using ``[]``, each having a unique syn
 
    * Redundant arguments are skipped, e.g.::
 
-       Union[int, str, int] == Union[int, str]
+       Union[int, str, int] == Union[int, str] == int | str
 
    * When comparing unions, the argument order is ignored, e.g.::
 
        Union[int, str] == Union[str, int]
 
-   * You cannot subclass or instantiate a union.
+   * You cannot subclass or instantiate a ``Union``.
 
    * You cannot write ``Union[X][Y]``.
 
-   * You can use ``Optional[X]`` as a shorthand for ``Union[X, None]``.
-
    .. versionchanged:: 3.7
       Don't remove explicit subclasses from unions at runtime.
 
@@ -627,7 +625,7 @@ These can be used as types in annotations using ``[]``, each having a unique syn
 
    Optional type.
 
-   ``Optional[X]`` is equivalent to ``Union[X, None]``.
+   ``Optional[X]`` is equivalent to ``X | None`` (or ``Union[X, None]``).
 
    Note that this is not the same concept as an optional argument,
    which is one that has a default.  An optional argument with a
@@ -644,6 +642,10 @@ These can be used as types in annotations using ``[]``, each having a unique syn
       def foo(arg: Optional[int] = None) -> None:
           ...
 
+   .. versionchanged:: 3.10
+      Optional can now be written as ``X | None``. See
+      :ref:`union type expressions<types-union>`.
+
 .. data:: Callable
 
    Callable type; ``Callable[[int], str]`` is a function of (int) -> str.
@@ -770,7 +772,7 @@ These can be used as types in annotations using ``[]``, each having a unique syn
    :ref:`type variables <generics>`, and unions of any of these types.
    For example::
 
-      def new_non_team_user(user_class: Type[Union[BasicUser, ProUser]]): ...
+      def new_non_team_user(user_class: Type[BasicUser | ProUser]): ...
 
    ``Type[Any]`` is equivalent to ``Type`` which in turn is equivalent
    to ``type``, which is the root of Python's metaclass hierarchy.
@@ -951,7 +953,7 @@ These can be used as types in annotations using ``[]``, each having a unique syn
    conditional code flow and applying the narrowing to a block of code.  The
    conditional expression here is sometimes referred to as a "type guard"::
 
-      def is_str(val: Union[str, float]):
+      def is_str(val: str | float):
           # "isinstance" type guard
           if isinstance(val, str):
               # Type of ``val`` is narrowed to ``str``
@@ -2031,7 +2033,7 @@ Introspection helpers
    For a typing object of the form ``X[Y, Z, ...]`` these functions return
    ``X`` and ``(Y, Z, ...)``. If ``X`` is a generic alias for a builtin or
    :mod:`collections` class, it gets normalized to the original class.
-   If ``X`` is a :class:`Union` or :class:`Literal` contained in another
+   If ``X`` is a union or :class:`Literal` contained in another
    generic type, the order of ``(Y, Z, ...)`` may be different from the order
    of the original arguments ``[Y, Z, ...]`` due to type caching.
    For unsupported objects return ``None`` and ``()`` correspondingly.
@@ -2056,7 +2058,7 @@ Introspection helpers
           year: int
 
       is_typeddict(Film)  # => True
-      is_typeddict(Union[list, str])  # => False
+      is_typeddict(list | str)  # => False
 
    .. versionadded:: 3.10
 
diff --git a/Doc/tools/susp-ignored.csv b/Doc/tools/susp-ignored.csv
index 1fde253feac2fa..1ba0e5bfae65ce 100644
--- a/Doc/tools/susp-ignored.csv
+++ b/Doc/tools/susp-ignored.csv
@@ -369,7 +369,7 @@ library/importlib.metadata,,:main,"EntryPoint(name='wheel', value='wheel.cli:mai
 library/importlib.metadata,,`,loading the metadata for packages for the indicated ``context``.
 library/re,,`,"`"
 using/configure,84,:db2,=db1:db2:...
-library/typing,1004,`,# Type of ``val`` is narrowed to ``str``
-library/typing,1004,`,"# Else, type of ``val`` is narrowed to ``float``."
-library/typing,1004,`,# Type of ``val`` is narrowed to ``List[str]``.
-library/typing,1004,`,# Type of ``val`` remains as ``List[object]``.
+library/typing,1011,`,# Type of ``val`` is narrowed to ``str``
+library/typing,1011,`,"# Else, type of ``val`` is narrowed to ``float``."
+library/typing,1011,`,# Type of ``val`` is narrowed to ``List[str]``.
+library/typing,1011,`,# Type of ``val`` remains as ``List[object]``.
diff --git a/Misc/NEWS.d/next/Documentation/2021-08-19-15-53-08.bpo-44957.imqrh3.rst b/Misc/NEWS.d/next/Documentation/2021-08-19-15-53-08.bpo-44957.imqrh3.rst
new file mode 100644
index 00000000000000..20a2aecc94ee19
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2021-08-19-15-53-08.bpo-44957.imqrh3.rst
@@ -0,0 +1,3 @@
+Promote PEP 604 union syntax by using it where possible. Also, mention ``X |
+Y`` more prominently in section about ``Union`` and mention ``X | None`` at
+all in section about ``Optional``.


From webhook-mailer at python.org  Sun Aug 22 16:14:36 2021
From: webhook-mailer at python.org (ambv)
Date: Sun, 22 Aug 2021 20:14:36 -0000
Subject: [Python-checkins] [3.9] bpo-4442: Document use of __new__ for
 subclasses of immutable types (GH-27866) (GH-27900)
Message-ID: <mailman.1129.1629663277.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/ac87b07a10e0ba2834e8de9cf0ea29a40fd882b1
commit: ac87b07a10e0ba2834e8de9cf0ea29a40fd882b1
branch: 3.9
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2021-08-22T22:14:25+02:00
summary:

[3.9] bpo-4442:  Document use of __new__ for subclasses of immutable types (GH-27866) (GH-27900)

(cherry picked from commit eec340ea3af27887fcaac4029ebdee99f3713bff)

Co-authored-by: Raymond Hettinger <rhettinger at users.noreply.github.com>

files:
M Doc/faq/programming.rst

diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
index ad51bb6ebf5952..04d6592aeccdbe 100644
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -1828,6 +1828,54 @@ For example, here is the implementation of
         return False
 
 
+How can a subclass control what data is stored in an immutable instance?
+------------------------------------------------------------------------
+
+When subclassing an immutable type, override the :meth:`__new__` method
+instead of the :meth:`__init__` method.  The latter only runs *after* an
+instance is created, which is too late to alter data in an immutable
+instance.
+
+All of these immutable classes have a different signature than their
+parent class:
+
+.. testcode::
+
+    from datetime import date
+
+    class FirstOfMonthDate(date):
+        "Always choose the first day of the month"
+        def __new__(cls, year, month, day):
+            return super().__new__(cls, year, month, 1)
+
+    class NamedInt(int):
+        "Allow text names for some numbers"
+        xlat = {'zero': 0, 'one': 1, 'ten': 10}
+        def __new__(cls, value):
+            value = cls.xlat.get(value, value)
+            return super().__new__(cls, value)
+
+    class TitleStr(str):
+        "Convert str to name suitable for a URL path"
+        def __new__(cls, s):
+            s = s.lower().replace(' ', '-')
+            s = ''.join([c for c in s if c.isalnum() or c == '-'])
+            return super().__new__(cls, s)
+
+The classes can be used like this:
+
+.. doctest::
+
+    >>> FirstOfMonthDate(2012, 2, 14)
+    FirstOfMonthDate(2012, 2, 1)
+    >>> NamedInt('ten')
+    10
+    >>> NamedInt(20)
+    20
+    >>> TitleStr('Blog: Why Python Rocks')
+    'blog-why-python-rocks'
+
+
 Modules
 =======
 


From webhook-mailer at python.org  Mon Aug 23 04:16:16 2021
From: webhook-mailer at python.org (mdickinson)
Date: Mon, 23 Aug 2021 08:16:16 -0000
Subject: [Python-checkins] bpo-24234: implement complex.__complex__
 (GH-27887)
Message-ID: <mailman.1130.1629706578.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/6082bb5addab93755ab6e2bd2ed6021b391e10d1
commit: 6082bb5addab93755ab6e2bd2ed6021b391e10d1
branch: main
author: Mark Dickinson <mdickinson at enthought.com>
committer: mdickinson <dickinsm at gmail.com>
date: 2021-08-23T09:15:49+01:00
summary:

bpo-24234: implement complex.__complex__ (GH-27887)

Co-authored-by: Dong-hee Na <donghee.na92 at gmail.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-22-12-28-50.bpo-24234.n3oTdx.rst
M Lib/test/test_complex.py
M Lib/test/test_doctest.py
M Lib/test/test_typing.py
M Objects/clinic/complexobject.c.h
M Objects/complexobject.c

diff --git a/Lib/test/test_complex.py b/Lib/test/test_complex.py
index abd7e39cc5ae73..1cd025ed53a5d0 100644
--- a/Lib/test/test_complex.py
+++ b/Lib/test/test_complex.py
@@ -499,6 +499,18 @@ def __complex__(self):
             self.assertEqual(complex(complex1(1j)), 2j)
         self.assertRaises(TypeError, complex, complex2(1j))
 
+    def test___complex__(self):
+        z = 3 + 4j
+        self.assertEqual(z.__complex__(), z)
+        self.assertEqual(type(z.__complex__()), complex)
+
+        class complex_subclass(complex):
+            pass
+
+        z = complex_subclass(3 + 4j)
+        self.assertEqual(z.__complex__(), 3 + 4j)
+        self.assertEqual(type(z.__complex__()), complex)
+
     @support.requires_IEEE_754
     def test_constructor_special_numbers(self):
         class complex2(complex):
diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py
index 8f761d7a52c23e..571dc78bf5076e 100644
--- a/Lib/test/test_doctest.py
+++ b/Lib/test/test_doctest.py
@@ -668,7 +668,7 @@ def non_Python_modules(): r"""
 
     >>> import builtins
     >>> tests = doctest.DocTestFinder().find(builtins)
-    >>> 816 < len(tests) < 836 # approximate number of objects with docstrings
+    >>> 820 < len(tests) < 840 # approximate number of objects with docstrings
     True
     >>> real_tests = [t for t in tests if len(t.examples) > 0]
     >>> len(real_tests) # objects that actually have doctests
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index 3bd5894f425741..84521ee7dd95f5 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -1533,11 +1533,11 @@ def test_supports_float(self):
 
     def test_supports_complex(self):
 
-        # Note: complex itself doesn't have __complex__.
         class C:
             def __complex__(self):
                 return 0j
 
+        self.assertIsSubclass(complex, typing.SupportsComplex)
         self.assertIsSubclass(C, typing.SupportsComplex)
         self.assertNotIsSubclass(str, typing.SupportsComplex)
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-22-12-28-50.bpo-24234.n3oTdx.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-22-12-28-50.bpo-24234.n3oTdx.rst
new file mode 100644
index 00000000000000..52397e90fbdfa1
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-22-12-28-50.bpo-24234.n3oTdx.rst	
@@ -0,0 +1,3 @@
+Implement the :meth:`__complex__` special method on the :class:`complex` type,
+so a complex number ``z`` passes an ``isinstance(z, typing.SupportsComplex)``
+check.
diff --git a/Objects/clinic/complexobject.c.h b/Objects/clinic/complexobject.c.h
index 557fbf9752faf7..e7d8065e874ef3 100644
--- a/Objects/clinic/complexobject.c.h
+++ b/Objects/clinic/complexobject.c.h
@@ -69,6 +69,24 @@ complex___format__(PyComplexObject *self, PyObject *arg)
     return return_value;
 }
 
+PyDoc_STRVAR(complex___complex____doc__,
+"__complex__($self, /)\n"
+"--\n"
+"\n"
+"Convert this value to exact type complex.");
+
+#define COMPLEX___COMPLEX___METHODDEF    \
+    {"__complex__", (PyCFunction)complex___complex__, METH_NOARGS, complex___complex____doc__},
+
+static PyObject *
+complex___complex___impl(PyComplexObject *self);
+
+static PyObject *
+complex___complex__(PyComplexObject *self, PyObject *Py_UNUSED(ignored))
+{
+    return complex___complex___impl(self);
+}
+
 PyDoc_STRVAR(complex_new__doc__,
 "complex(real=0, imag=0)\n"
 "--\n"
@@ -113,4 +131,4 @@ complex_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=056cac3226d94967 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=6d85094ace15677e input=a9049054013a1b77]*/
diff --git a/Objects/complexobject.c b/Objects/complexobject.c
index 3e479497cfcc31..cfe6c737578a03 100644
--- a/Objects/complexobject.c
+++ b/Objects/complexobject.c
@@ -693,8 +693,29 @@ complex___format___impl(PyComplexObject *self, PyObject *format_spec)
     return _PyUnicodeWriter_Finish(&writer);
 }
 
+/*[clinic input]
+complex.__complex__
+
+Convert this value to exact type complex.
+[clinic start generated code]*/
+
+static PyObject *
+complex___complex___impl(PyComplexObject *self)
+/*[clinic end generated code: output=e6b35ba3d275dc9c input=3589ada9d27db854]*/
+{
+    if (PyComplex_CheckExact(self)) {
+        Py_INCREF(self);
+        return (PyObject *)self;
+    }
+    else {
+        return PyComplex_FromCComplex(self->cval);
+    }
+}
+
+
 static PyMethodDef complex_methods[] = {
     COMPLEX_CONJUGATE_METHODDEF
+    COMPLEX___COMPLEX___METHODDEF
     COMPLEX___GETNEWARGS___METHODDEF
     COMPLEX___FORMAT___METHODDEF
     {NULL,              NULL}           /* sentinel */


From webhook-mailer at python.org  Mon Aug 23 06:02:02 2021
From: webhook-mailer at python.org (corona10)
Date: Mon, 23 Aug 2021 10:02:02 -0000
Subject: [Python-checkins] bpo-24234: Implement bytes.__bytes__ (GH-27901)
Message-ID: <mailman.1131.1629712923.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/24b63c695ae0a95b06379eaadace66735abac1e2
commit: 24b63c695ae0a95b06379eaadace66735abac1e2
branch: main
author: Dong-hee Na <donghee.na at python.org>
committer: corona10 <donghee.na92 at gmail.com>
date: 2021-08-23T19:01:51+09:00
summary:

bpo-24234: Implement bytes.__bytes__ (GH-27901)

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-23-10-36-55.bpo-24234.MGVUQi.rst
M Doc/whatsnew/3.11.rst
M Lib/test/test_bytes.py
M Lib/test/test_typing.py
M Objects/bytesobject.c
M Objects/clinic/bytesobject.c.h
M Tools/clinic/clinic.py

diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index cb8f84c4b625e..306385c2a90aa 100644
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -169,6 +169,14 @@ Other Language Changes
   (Contributed by Serhiy Storchaka in :issue:`12022`.)
 
 
+Other CPython Implementation Changes
+====================================
+
+* Special methods :meth:`complex.__complex__` and :meth:`bytes.__bytes__` are implemented to
+  support :class:`typing.SupportsComplex` and :class:`typing.SupportsBytes` protocols.
+  (Contributed by Mark Dickinson and Dong-hee Na in :issue:`24234`.)
+
+
 New Modules
 ===========
 
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
index 13ad238242d0c..c45c69f3f22c1 100644
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -981,6 +981,18 @@ def test_sq_item(self):
 class BytesTest(BaseBytesTest, unittest.TestCase):
     type2test = bytes
 
+    def test__bytes__(self):
+        foo = b'foo'
+        self.assertEqual(foo.__bytes__(), foo)
+        self.assertEqual(type(foo.__bytes__()), self.type2test)
+
+        class bytes_subclass(bytes):
+            pass
+
+        bar = bytes_subclass(b'bar')
+        self.assertEqual(bar.__bytes__(), bar)
+        self.assertEqual(type(bar.__bytes__()), self.type2test)
+
     def test_getitem_error(self):
         b = b'python'
         msg = "byte indices must be integers or slices"
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index 84521ee7dd95f..de4db51bdc707 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -1543,11 +1543,11 @@ def __complex__(self):
 
     def test_supports_bytes(self):
 
-        # Note: bytes itself doesn't have __bytes__.
         class B:
             def __bytes__(self):
                 return b''
 
+        self.assertIsSubclass(bytes, typing.SupportsBytes)
         self.assertIsSubclass(B, typing.SupportsBytes)
         self.assertNotIsSubclass(str, typing.SupportsBytes)
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-23-10-36-55.bpo-24234.MGVUQi.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-23-10-36-55.bpo-24234.MGVUQi.rst
new file mode 100644
index 0000000000000..3f724da08898a
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-23-10-36-55.bpo-24234.MGVUQi.rst	
@@ -0,0 +1,3 @@
+Implement the :meth:`__bytes__` special method on the :class:`bytes` type,
+so a bytes object ``b``  passes an ``isinstance(b, typing.SupportsBytes)``
+check.
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index eaedb0b5689b2..13f94b4c82fbc 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -1687,6 +1687,25 @@ static PyBufferProcs bytes_as_buffer = {
 };
 
 
+/*[clinic input]
+bytes.__bytes__
+Convert this value to exact type bytes.
+[clinic start generated code]*/
+
+static PyObject *
+bytes___bytes___impl(PyBytesObject *self)
+/*[clinic end generated code: output=63a306a9bc0caac5 input=34ec5ddba98bd6bb]*/
+{
+    if (PyBytes_CheckExact(self)) {
+        Py_INCREF(self);
+        return (PyObject *)self;
+    }
+    else {
+        return PyBytes_FromString(self->ob_sval);
+    }
+}
+
+
 #define LEFTSTRIP 0
 #define RIGHTSTRIP 1
 #define BOTHSTRIP 2
@@ -2474,6 +2493,7 @@ bytes_getnewargs(PyBytesObject *v, PyObject *Py_UNUSED(ignored))
 static PyMethodDef
 bytes_methods[] = {
     {"__getnewargs__",          (PyCFunction)bytes_getnewargs,  METH_NOARGS},
+    BYTES___BYTES___METHODDEF
     {"capitalize", stringlib_capitalize, METH_NOARGS,
      _Py_capitalize__doc__},
     STRINGLIB_CENTER_METHODDEF
diff --git a/Objects/clinic/bytesobject.c.h b/Objects/clinic/bytesobject.c.h
index 9e365ce1a088b..103a364281321 100644
--- a/Objects/clinic/bytesobject.c.h
+++ b/Objects/clinic/bytesobject.c.h
@@ -2,6 +2,24 @@
 preserve
 [clinic start generated code]*/
 
+PyDoc_STRVAR(bytes___bytes____doc__,
+"__bytes__($self, /)\n"
+"--\n"
+"\n"
+"Convert this value to exact type bytes.");
+
+#define BYTES___BYTES___METHODDEF    \
+    {"__bytes__", (PyCFunction)bytes___bytes__, METH_NOARGS, bytes___bytes____doc__},
+
+static PyObject *
+bytes___bytes___impl(PyBytesObject *self);
+
+static PyObject *
+bytes___bytes__(PyBytesObject *self, PyObject *Py_UNUSED(ignored))
+{
+    return bytes___bytes___impl(self);
+}
+
 PyDoc_STRVAR(bytes_split__doc__,
 "split($self, /, sep=None, maxsplit=-1)\n"
 "--\n"
@@ -878,4 +896,4 @@ bytes_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=b3f0ec2753246b9c input=a9049054013a1b77]*/
+/*[clinic end generated code: output=d706344859f40122 input=a9049054013a1b77]*/
diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py
index ed17fabf8d2a1..b5a884536a9eb 100755
--- a/Tools/clinic/clinic.py
+++ b/Tools/clinic/clinic.py
@@ -2179,7 +2179,6 @@ def __repr__(self):
 __abs__
 __add__
 __and__
-__bytes__
 __call__
 __delitem__
 __divmod__


From webhook-mailer at python.org  Mon Aug 23 10:24:17 2021
From: webhook-mailer at python.org (mdickinson)
Date: Mon, 23 Aug 2021 14:24:17 -0000
Subject: [Python-checkins] Fix bytes.__bytes__ to not truncate at a zero
 byte (GH-27902)
Message-ID: <mailman.1132.1629728658.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/ae5259171b8ef62165e061b9dea7ad645a5131a2
commit: ae5259171b8ef62165e061b9dea7ad645a5131a2
branch: main
author: Mark Dickinson <mdickinson at enthought.com>
committer: mdickinson <dickinsm at gmail.com>
date: 2021-08-23T15:24:12+01:00
summary:

Fix bytes.__bytes__ to not truncate at a zero byte (GH-27902)

files:
M Lib/test/test_bytes.py
M Objects/bytesobject.c

diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
index c45c69f3f22c1..c2fe2cc25420f 100644
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -982,14 +982,14 @@ class BytesTest(BaseBytesTest, unittest.TestCase):
     type2test = bytes
 
     def test__bytes__(self):
-        foo = b'foo'
+        foo = b'foo\x00bar'
         self.assertEqual(foo.__bytes__(), foo)
         self.assertEqual(type(foo.__bytes__()), self.type2test)
 
         class bytes_subclass(bytes):
             pass
 
-        bar = bytes_subclass(b'bar')
+        bar = bytes_subclass(b'bar\x00foo')
         self.assertEqual(bar.__bytes__(), bar)
         self.assertEqual(type(bar.__bytes__()), self.type2test)
 
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index 13f94b4c82fbc..27f766bef6ed8 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -1701,7 +1701,7 @@ bytes___bytes___impl(PyBytesObject *self)
         return (PyObject *)self;
     }
     else {
-        return PyBytes_FromString(self->ob_sval);
+        return PyBytes_FromStringAndSize(self->ob_sval, Py_SIZE(self));
     }
 }
 


From webhook-mailer at python.org  Mon Aug 23 13:12:48 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 23 Aug 2021 17:12:48 -0000
Subject: [Python-checkins] [doc] Fix typo in idle.rst (GH-27903)
Message-ID: <mailman.1133.1629738769.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/0e8695ece0d3569eeb1b89c91a1b0aa3d34f228e
commit: 0e8695ece0d3569eeb1b89c91a1b0aa3d34f228e
branch: main
author: Ikko Ashimine <eltociear at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-23T19:12:33+02:00
summary:

[doc] Fix typo in idle.rst (GH-27903)

intially -> initially

files:
M Doc/library/idle.rst

diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst
index 91c540513cc8d..d740973af9124 100644
--- a/Doc/library/idle.rst
+++ b/Doc/library/idle.rst
@@ -518,7 +518,7 @@ and not restarting the Shell thereafter.  This is especially useful
 after adding imports at the top of a file.  This also increases
 possible attribute completions.
 
-Completion boxes intially exclude names beginning with '_' or, for
+Completion boxes initially exclude names beginning with '_' or, for
 modules, not included in '__all__'.  The hidden names can be accessed
 by typing '_' after '.', either before or after the box is opened.
 


From webhook-mailer at python.org  Mon Aug 23 13:14:00 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 23 Aug 2021 17:14:00 -0000
Subject: [Python-checkins] bpo-38291: Update 3.10 WhatsNew with
 typing.{io|re} DeprecationWarning (GH-27872)
Message-ID: <mailman.1134.1629738841.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/1a995b0ceefdf7eb59963f3ab395c47d8da226e3
commit: 1a995b0ceefdf7eb59963f3ab395c47d8da226e3
branch: main
author: Ken Jin <28750310+Fidget-Spinner at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-23T19:13:51+02:00
summary:

bpo-38291: Update 3.10 WhatsNew with typing.{io|re} DeprecationWarning (GH-27872)

files:
M Doc/whatsnew/3.10.rst

diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst
index ae6ad9c52ccad..6040daaf8f846 100644
--- a/Doc/whatsnew/3.10.rst
+++ b/Doc/whatsnew/3.10.rst
@@ -1401,6 +1401,13 @@ subclasses with the :func:`runtime_checkable` decorator
 if they want runtime protocols.
 (Contributed by Yurii Karabas in :issue:`38908`)
 
+Importing from the ``typing.io`` and ``typing.re`` submodules will now emit
+:exc:`DeprecationWarning`.  These submodules have been deprecated since
+Python 3.8 and will be removed in a future version of Python.  Anything
+belonging to those submodules should be imported directly from
+:mod:`typing` instead.
+(Contributed by Sebastian Rittau in :issue:`38291`)
+
 unittest
 --------
 
@@ -1696,6 +1703,12 @@ Deprecated
   requires a :ref:`debug build of Python <debug-build>`.
   (Contributed by Victor Stinner in :issue:`44584`.)
 
+* Importing from the ``typing.io`` and ``typing.re`` submodules will now emit
+  :exc:`DeprecationWarning`.  These submodules will be removed in a future version
+  of Python.  Anything belonging to these submodules should be imported directly
+  from :mod:`typing` instead.
+  (Contributed by Sebastian Rittau in :issue:`38291`)
+
 .. _whatsnew310-removed:
 
 Removed


From webhook-mailer at python.org  Mon Aug 23 13:32:40 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 23 Aug 2021 17:32:40 -0000
Subject: [Python-checkins] bpo-38291: Update 3.10 WhatsNew with
 typing.{io|re} DeprecationWarning (GH-27872)
Message-ID: <mailman.1135.1629739961.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/27f2f62ad490afc8e4dd6d80351916a9d06b97e3
commit: 27f2f62ad490afc8e4dd6d80351916a9d06b97e3
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-23T10:32:35-07:00
summary:

bpo-38291: Update 3.10 WhatsNew with typing.{io|re} DeprecationWarning (GH-27872)

(cherry picked from commit 1a995b0ceefdf7eb59963f3ab395c47d8da226e3)

Co-authored-by: Ken Jin <28750310+Fidget-Spinner at users.noreply.github.com>

files:
M Doc/whatsnew/3.10.rst

diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst
index d9a90fb63f18e..d973448e07f80 100644
--- a/Doc/whatsnew/3.10.rst
+++ b/Doc/whatsnew/3.10.rst
@@ -1390,6 +1390,13 @@ subclasses with the :func:`runtime_checkable` decorator
 if they want runtime protocols.
 (Contributed by Yurii Karabas in :issue:`38908`)
 
+Importing from the ``typing.io`` and ``typing.re`` submodules will now emit
+:exc:`DeprecationWarning`.  These submodules have been deprecated since
+Python 3.8 and will be removed in a future version of Python.  Anything
+belonging to those submodules should be imported directly from
+:mod:`typing` instead.
+(Contributed by Sebastian Rittau in :issue:`38291`)
+
 unittest
 --------
 
@@ -1692,6 +1699,12 @@ Deprecated
   requires a :ref:`debug build of Python <debug-build>`.
   (Contributed by Victor Stinner in :issue:`44584`.)
 
+* Importing from the ``typing.io`` and ``typing.re`` submodules will now emit
+  :exc:`DeprecationWarning`.  These submodules will be removed in a future version
+  of Python.  Anything belonging to these submodules should be imported directly
+  from :mod:`typing` instead.
+  (Contributed by Sebastian Rittau in :issue:`38291`)
+
 .. _whatsnew310-removed:
 
 Removed


From webhook-mailer at python.org  Mon Aug 23 13:54:06 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 23 Aug 2021 17:54:06 -0000
Subject: [Python-checkins] [doc] Fix typo in idle.rst (GH-27903)
Message-ID: <mailman.1136.1629741247.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/3390dfa8f36105e578a43720d03849371b3dec83
commit: 3390dfa8f36105e578a43720d03849371b3dec83
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-23T10:53:52-07:00
summary:

[doc] Fix typo in idle.rst (GH-27903)


intially -> initially
(cherry picked from commit 0e8695ece0d3569eeb1b89c91a1b0aa3d34f228e)

Co-authored-by: Ikko Ashimine <eltociear at gmail.com>

files:
M Doc/library/idle.rst

diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst
index 91c540513cc8d..d740973af9124 100644
--- a/Doc/library/idle.rst
+++ b/Doc/library/idle.rst
@@ -518,7 +518,7 @@ and not restarting the Shell thereafter.  This is especially useful
 after adding imports at the top of a file.  This also increases
 possible attribute completions.
 
-Completion boxes intially exclude names beginning with '_' or, for
+Completion boxes initially exclude names beginning with '_' or, for
 modules, not included in '__all__'.  The hidden names can be accessed
 by typing '_' after '.', either before or after the box is opened.
 


From webhook-mailer at python.org  Mon Aug 23 13:57:13 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 23 Aug 2021 17:57:13 -0000
Subject: [Python-checkins] [doc] Fix typo in idle.rst (GH-27903)
Message-ID: <mailman.1137.1629741434.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/7543e7fc261f1a79b685ff73b7a49615258b8f02
commit: 7543e7fc261f1a79b685ff73b7a49615258b8f02
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-23T10:57:05-07:00
summary:

[doc] Fix typo in idle.rst (GH-27903)


intially -> initially
(cherry picked from commit 0e8695ece0d3569eeb1b89c91a1b0aa3d34f228e)

Co-authored-by: Ikko Ashimine <eltociear at gmail.com>

files:
M Doc/library/idle.rst

diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst
index 3c302115b5f40..4fa4f1e5d30b9 100644
--- a/Doc/library/idle.rst
+++ b/Doc/library/idle.rst
@@ -518,7 +518,7 @@ and not restarting the Shell thereafter.  This is especially useful
 after adding imports at the top of a file.  This also increases
 possible attribute completions.
 
-Completion boxes intially exclude names beginning with '_' or, for
+Completion boxes initially exclude names beginning with '_' or, for
 modules, not included in '__all__'.  The hidden names can be accessed
 by typing '_' after '.', either before or after the box is opened.
 


From webhook-mailer at python.org  Mon Aug 23 14:05:17 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 23 Aug 2021 18:05:17 -0000
Subject: [Python-checkins] bpo-44984: Rewrite test_null_strings in _testcapi
 (GH-27904)
Message-ID: <mailman.1138.1629741919.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/4d689173861257c69adc6dc1dca4171946ddb57f
commit: 4d689173861257c69adc6dc1dca4171946ddb57f
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-23T20:05:07+02:00
summary:

bpo-44984: Rewrite test_null_strings in _testcapi (GH-27904)

Test also PyObject_Repr(NULL) and PyObject_Bytes(NULL).

files:
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 9165f45db64f3..db029ef731c38 100644
--- a/Lib/test/test_capi.py
+++ b/Lib/test/test_capi.py
@@ -623,6 +623,18 @@ def test_fatal_error(self):
         ''')
         self.check_fatal_error(code, expected)
 
+    def test_pyobject_repr_from_null(self):
+        s = _testcapi.pyobject_repr_from_null()
+        self.assertEqual(s, '<NULL>')
+
+    def test_pyobject_str_from_null(self):
+        s = _testcapi.pyobject_str_from_null()
+        self.assertEqual(s, '<NULL>')
+
+    def test_pyobject_bytes_from_null(self):
+        s = _testcapi.pyobject_bytes_from_null()
+        self.assertEqual(s, b'<NULL>')
+
 
 class TestPendingCalls(unittest.TestCase):
 
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index e5f1ad312b41b..68dd285c380e0 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -2376,16 +2376,22 @@ test_long_numbits(PyObject *self, PyObject *Py_UNUSED(ignored))
     Py_RETURN_NONE;
 }
 
-/* Example passing NULLs to PyObject_Str(NULL). */
+static PyObject *
+pyobject_repr_from_null(PyObject *self, PyObject *Py_UNUSED(ignored))
+{
+    return PyObject_Repr(NULL);
+}
 
 static PyObject *
-test_null_strings(PyObject *self, PyObject *Py_UNUSED(ignored))
+pyobject_str_from_null(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    PyObject *o1 = PyObject_Str(NULL), *o2 = PyObject_Str(NULL);
-    PyObject *tuple = PyTuple_Pack(2, o1, o2);
-    Py_XDECREF(o1);
-    Py_XDECREF(o2);
-    return tuple;
+    return PyObject_Str(NULL);
+}
+
+static PyObject *
+pyobject_bytes_from_null(PyObject *self, PyObject *Py_UNUSED(ignored))
+{
+    return PyObject_Bytes(NULL);
 }
 
 static PyObject *
@@ -5702,7 +5708,9 @@ static PyMethodDef TestMethods[] = {
     {"test_k_code",             test_k_code,                     METH_NOARGS},
     {"test_empty_argparse",     test_empty_argparse,             METH_NOARGS},
     {"parse_tuple_and_keywords", parse_tuple_and_keywords, METH_VARARGS},
-    {"test_null_strings",       test_null_strings,               METH_NOARGS},
+    {"pyobject_repr_from_null", pyobject_repr_from_null, METH_NOARGS},
+    {"pyobject_str_from_null",  pyobject_str_from_null, METH_NOARGS},
+    {"pyobject_bytes_from_null", pyobject_bytes_from_null, METH_NOARGS},
     {"test_string_from_format", (PyCFunction)test_string_from_format, METH_NOARGS},
     {"test_with_docstring",     test_with_docstring,             METH_NOARGS,
      PyDoc_STR("This is a pretty normal docstring.")},


From webhook-mailer at python.org  Mon Aug 23 14:31:01 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 23 Aug 2021 18:31:01 -0000
Subject: [Python-checkins] bpo-42560: rewrite of Tkinter docs "life
 preserver" (GH-27842)
Message-ID: <mailman.1139.1629743461.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/08830a4f75553682e8d1ea6cdabd4c3472c59e28
commit: 08830a4f75553682e8d1ea6cdabd4c3472c59e28
branch: main
author: Mark Roseman <mark at markroseman.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-23T20:30:53+02:00
summary:

bpo-42560: rewrite of Tkinter docs "life preserver" (GH-27842)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
M Doc/library/tkinter.rst
M Doc/tools/susp-ignored.csv

diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index 34238f4cdd0bbe..425f030dcc983f 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -197,210 +197,241 @@ Additional modules:
 Tkinter Life Preserver
 ----------------------
 
-.. sectionauthor:: Matt Conway
-
-
 This section is not designed to be an exhaustive tutorial on either Tk or
-Tkinter.  Rather, it is intended as a stop gap, providing some introductory
-orientation on the system.
+Tkinter.  For that, refer to one of the external resources noted earlier.
+Instead, this section provides a very quick orientation to what a Tkinter
+application looks like, identifies foundational Tk concepts, and
+explains how the Tkinter wrapper is structured.
 
-Credits:
+The remainder of this section will help you to identify the classes,
+methods, and options you'll need in your Tkinter application, and where to
+find more detailed documentation on them, including in the official Tcl/Tk
+reference manual.
 
-* Tk was written by John Ousterhout while at Berkeley.
 
-* Tkinter was written by Steen Lumholt and Guido van Rossum.
+A Hello World Program
+^^^^^^^^^^^^^^^^^^^^^
 
-* This Life Preserver was written by Matt Conway at the University of Virginia.
+We'll start by walking through a "Hello World" application in Tkinter. This
+isn't the smallest one we could write, but has enough to illustrate some
+key concepts you'll need to know.
 
-* The HTML rendering, and some liberal editing, was produced from a FrameMaker
-  version by Ken Manheimer.
+::
 
-* Fredrik Lundh elaborated and revised the class interface descriptions, to get
-  them current with Tk 4.2.
+    from tkinter import *
+    from tkinter import ttk
+    root = Tk()
+    frm = ttk.Frame(root, padding=10)
+    frm.grid()
+    ttk.Label(frm, text="Hello World!").grid(column=0, row=0)
+    ttk.Button(frm, text="Quit", command=root.destroy).grid(column=1, row=0)
+    root.mainloop()
 
-* Mike Clarkson converted the documentation to LaTeX, and compiled the  User
-  Interface chapter of the reference manual.
 
+After the imports, the next line creates an instance of the :class:`Tk` class,
+which initializes Tk and creates its associated Tcl interpreter. It also
+creates a toplevel window, known as the root window, which serves as the main
+window of the application.
 
-How To Use This Section
-^^^^^^^^^^^^^^^^^^^^^^^
+The following line creates a frame widget, which in this case will contain
+a label and a button we'll create next. The frame is fit inside the root
+window.
 
-This section is designed in two parts: the first half (roughly) covers
-background material, while the second half can be taken to the keyboard as a
-handy reference.
+The next line creates a label widget holding a static text string. The
+:meth:`grid` method is used to specify the relative layout (position) of the
+label within its containing frame widget, similar to how tables in HTML work.
 
-When trying to answer questions of the form "how do I do blah", it is often best
-to find out how to do "blah" in straight Tk, and then convert this back into the
-corresponding :mod:`tkinter` call. Python programmers can often guess at the
-correct Python command by looking at the Tk documentation. This means that in
-order to use Tkinter, you will have to know a little bit about Tk. This document
-can't fulfill that role, so the best we can do is point you to the best
-documentation that exists. Here are some hints:
+A button widget is then created, and placed to the right of the label. When
+pressed, it will call the :meth:`destroy` method of the root window.
 
-* The authors strongly suggest getting a copy of the Tk man pages.
-  Specifically, the man pages in the ``manN`` directory are most useful.
-  The ``man3`` man pages describe the C interface to the Tk library and thus
-  are not especially helpful for script writers.
+Finally, the :meth:`mainloop` method puts everything on the display, and
+responds to user input until the program terminates.
 
-* Addison-Wesley publishes a book called Tcl and the Tk Toolkit by John
-  Ousterhout (ISBN 0-201-63337-X) which is a good introduction to Tcl and Tk for
-  the novice.  The book is not exhaustive, and for many details it defers to the
-  man pages.
 
-* :file:`tkinter/__init__.py` is a last resort for most, but can be a good
-  place to go when nothing else makes sense.
 
+Important Tk Concepts
+^^^^^^^^^^^^^^^^^^^^^
 
-A Simple Hello World Program
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Even this simple program illustrates the following key Tk concepts:
 
-::
+widgets
+  A Tkinter user interface is made up of individual *widgets*. Each widget is
+  represented as a Python object, instantiated from classes like
+  :class:`ttk.Frame`, :class:`ttk.Label`, and :class:`ttk.Button`.
 
-    import tkinter as tk
+widget hierarchy
+  Widgets are arranged in a *hierarchy*. The label and button were contained
+  within a frame, which in turn was contained within the root window. When
+  creating each *child* widget, its *parent* widget is passed as the first
+  argument to the widget constructor.
 
-    class Application(tk.Frame):
-        def __init__(self, master=None):
-            super().__init__(master)
-            self.master = master
-            self.pack()
-            self.create_widgets()
+configuration options
+  Widgets have *configuration options*, which modify their appearance and
+  behavior, such as the text to display in a label or button. Different
+  classes of widgets will have different sets of options.
 
-        def create_widgets(self):
-            self.hi_there = tk.Button(self)
-            self.hi_there["text"] = "Hello World\n(click me)"
-            self.hi_there["command"] = self.say_hi
-            self.hi_there.pack(side="top")
+geometry management
+  Widgets aren't automatically added to the user interface when they are
+  created. A *geometry manager* like ``grid`` controls where in the
+  user interface they are placed.
 
-            self.quit = tk.Button(self, text="QUIT", fg="red",
-                                  command=self.master.destroy)
-            self.quit.pack(side="bottom")
+event loop
+  Tkinter reacts to user input, changes from your program, and even refreshes
+  the display only when actively running an *event loop*. If your program
+  isn't running the event loop, your user interface won't update.
 
-        def say_hi(self):
-            print("hi there, everyone!")
 
-    root = tk.Tk()
-    app = Application(master=root)
-    app.mainloop()
+Understanding How Tkinter Wraps Tcl/Tk
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+When your application uses Tkinter's classes and methods, internally Tkinter
+is assembling strings representing Tcl/Tk commands, and executing those
+commands in the Tcl interpreter attached to your applicaton's :class:`Tk`
+instance.
 
-A (Very) Quick Look at Tcl/Tk
------------------------------
+Whether it's trying to navigate reference documentation, trying to find
+the right method or option, adapting some existing code, or debugging your
+Tkinter application, there are times that it will be useful to understand
+what those underlying Tcl/Tk commands look like.
 
-The class hierarchy looks complicated, but in actual practice, application
-programmers almost always refer to the classes at the very bottom of the
-hierarchy.
+To illustrate, here is the Tcl/Tk equivalent of the main part of the Tkinter
+script above.
 
-Notes:
+::
 
-* These classes are provided for the purposes of organizing certain functions
-  under one namespace. They aren't meant to be instantiated independently.
+    ttk::frame .frm -padding 10
+    grid .frm
+    grid [ttk::label .frm.lbl -text "Hello World!"] -column 0 -row 0
+    grid [ttk::button .frm.btn -text "Quit" -command "destroy ."] -column 1 -row 0
 
-* The :class:`Tk` class is meant to be instantiated only once in an application.
-  Application programmers need not instantiate one explicitly, the system creates
-  one whenever any of the other classes are instantiated.
 
-* The :class:`Widget` class is not meant to be instantiated, it is meant only
-  for subclassing to make "real" widgets (in C++, this is called an 'abstract
-  class').
+Tcl's syntax is similar to many shell languages, where the first word is the
+command to be executed, with arguments to that command following it, separated
+by spaces. Without getting into too many details, notice the following:
 
-To make use of this reference material, there will be times when you will need
-to know how to read short passages of Tk and how to identify the various parts
-of a Tk command.   (See section :ref:`tkinter-basic-mapping` for the
-:mod:`tkinter` equivalents of what's below.)
+* The commands used to create widgets (like ``ttk::frame``) correspond to
+  widget classes in Tkinter.
 
-Tk scripts are Tcl programs.  Like all Tcl programs, Tk scripts are just lists
-of tokens separated by spaces.  A Tk widget is just its *class*, the *options*
-that help configure it, and the *actions* that make it do useful things.
+* Tcl widget options (like ``-text``) correspond to keyword arguments in
+  Tkinter.
 
-To make a widget in Tk, the command is always of the form::
+* Widgets are referred to by a *pathname* in Tcl (like ``.frm.btn``),
+  whereas Tkinter doesn't use names but object references.
 
-   classCommand newPathname options
+* A widget's place in the widget hierarchy is encoded in its (hierarchical)
+  pathname, which uses a ``.`` (dot) as a path separator. The pathname for
+  the root window is just ``.`` (dot). In Tkinter, the hierarchy is defined
+  not by pathname but by specifying the parent widget when creating each
+  child widget.
 
-*classCommand*
-   denotes which kind of widget to make (a button, a label, a menu...)
+* Operations which are implemented as separate *commands* in Tcl (like
+  ``grid`` or ``destroy``) are represented as *methods* on Tkinter widget
+  objects. As you'll see shortly, at other times Tcl uses what appear to be
+  method calls on widget objects, which more closely mirror what would is
+  used in Tkinter.
 
-.. index:: single: . (dot); in Tkinter
 
-*newPathname*
-   is the new name for this widget.  All names in Tk must be unique.  To help
-   enforce this, widgets in Tk are named with *pathnames*, just like files in a
-   file system.  The top level widget, the *root*, is called ``.`` (period) and
-   children are delimited by more periods.  For example,
-   ``.myApp.controlPanel.okButton`` might be the name of a widget.
+How do I...? What option does...?
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-*options*
-   configure the widget's appearance and in some cases, its behavior.  The options
-   come in the form of a list of flags and values. Flags are preceded by a '-',
-   like Unix shell command flags, and values are put in quotes if they are more
-   than one word.
+If you're not sure how to do something in Tkinter, and you can't immediately
+find it in the tutorial or reference documentation you're using, there are a
+few strategies that can be helpful.
 
-For example::
+First, remember that the details of how individual widgets work may vary
+across different versions of both Tkinter and Tcl/Tk. If you're searching
+documentation, make sure it corresponds to the Python and Tcl/Tk versions
+installed on your system.
 
-   button   .fred   -fg red -text "hi there"
-      ^       ^     \______________________/
-      |       |                |
-    class    new            options
-   command  widget  (-opt val -opt val ...)
+When searching for how to use an API, it helps to know the exact name of the
+class, option, or method that you're using. Introspection, either in an
+interactive Python shell or with :func:`print`, can help you identify what
+you need.
 
-Once created, the pathname to the widget becomes a new command.  This new
-*widget command* is the programmer's handle for getting the new widget to
-perform some *action*.  In C, you'd express this as someAction(fred,
-someOptions), in C++, you would express this as fred.someAction(someOptions),
-and in Tk, you say::
+To find out what configuration options are available on any widget, call its
+:meth:`configure` method, which returns a dictionary containing a variety of
+information about each object, including its default and current values. Use
+:meth:`keys` to get just the names of each option.
 
-   .fred someAction someOptions
+::
 
-Note that the object name, ``.fred``, starts with a dot.
+    btn = ttk.Button(frm, ...)
+    print(btn.configure().keys())
 
-As you'd expect, the legal values for *someAction* will depend on the widget's
-class: ``.fred disable`` works if fred is a button (fred gets greyed out), but
-does not work if fred is a label (disabling of labels is not supported in Tk).
+As most widgets have many configuration options in common, it can be useful
+to find out which are specific to a particular widget class. Comparing the
+list of options to that of a simpler widget, like a frame, is one way to
+do that.
 
-The legal values of *someOptions* is action dependent.  Some actions, like
-``disable``, require no arguments, others, like a text-entry box's ``delete``
-command, would need arguments to specify what range of text to delete.
+::
 
+    print(set(btn.configure().keys()) - set(frm.configure().keys()))
 
-.. _tkinter-basic-mapping:
+Similarly, you can find the available methods for a widget object using the
+standard :func:`dir` function. If you try it, you'll see there are over 200
+common widget methods, so again identifying those specific to a widget class
+is helpful.
 
-Mapping Basic Tk into Tkinter
------------------------------
+::
 
-Class commands in Tk correspond to class constructors in Tkinter. ::
+    print(dir(btn))
+    print(set(dir(btn)) - set(dir(frm)))
 
-   button .fred                =====>  fred = Button()
 
-The master of an object is implicit in the new name given to it at creation
-time.  In Tkinter, masters are specified explicitly. ::
+Navigating the Tcl/Tk Reference Manual
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-   button .panel.fred          =====>  fred = Button(panel)
+As noted, the official `Tk commands <https://www.tcl.tk/man/tcl8.6/TkCmd/contents.htm>`_
+reference manual (man pages) is often the most accurate description of what
+specific operations on widgets do. Even when you know the name of the option
+or method that you need, you may still have a few places to look.
 
-The configuration options in Tk are given in lists of hyphened tags followed by
-values.  In Tkinter, options are specified as keyword-arguments in the instance
-constructor, and keyword-args for configure calls or as instance indices, in
-dictionary style, for established instances.  See section
-:ref:`tkinter-setting-options` on setting options. ::
+While all operations in Tkinter are implemented as method calls on widget
+objects, you've seen that many Tcl/Tk operations appear as commands that
+take a widget pathname as its first parameter, followed by optional
+parameters, e.g.
 
-   button .fred -fg red        =====>  fred = Button(panel, fg="red")
-   .fred configure -fg red     =====>  fred["fg"] = red
-                               OR ==>  fred.config(fg="red")
+::
 
-In Tk, to perform an action on a widget, use the widget name as a command, and
-follow it with an action name, possibly with arguments (options).  In Tkinter,
-you call methods on the class instance to invoke actions on the widget.  The
-actions (methods) that a given widget can perform are listed in
-:file:`tkinter/__init__.py`. ::
+    destroy .
+    grid .frm.btn -column 0 -row 0
 
-   .fred invoke                =====>  fred.invoke()
+Others, however, look more like methods called on a widget object (in fact,
+when you create a widget in Tcl/Tk, it creates a Tcl command with the name
+of the widget pathname, with the first parameter to that command being the
+name of a method to call).
 
-To give a widget to the packer (geometry manager), you call pack with optional
-arguments.  In Tkinter, the Pack class holds all this functionality, and the
-various forms of the pack command are implemented as methods.  All widgets in
-:mod:`tkinter` are subclassed from the Packer, and so inherit all the packing
-methods. See the :mod:`tkinter.tix` module documentation for additional
-information on the Form geometry manager. ::
+::
 
-   pack .fred -side left       =====>  fred.pack(side="left")
+    .frm.btn invoke
+    .frm.lbl configure -text "Goodbye"
+
+
+In the official Tcl/Tk reference documentation, you'll find most operations
+that look like method calls on the man page for a specific widget (e.g.,
+you'll find the :meth:`invoke` method on the
+`ttk::button <https://www.tcl.tk/man/tcl8.6/TkCmd/ttk_button.htm>`_
+man page), while functions that take a widget as a parameter often have
+their own man page (e.g.,
+`grid <https://www.tcl.tk/man/tcl8.6/TkCmd/grid.htm>`_).
+
+You'll find many common options and methods in the
+`options <https://www.tcl.tk/man/tcl8.6/TkCmd/options.htm>`_ or
+`ttk::widget <https://www.tcl.tk/man/tcl8.6/TkCmd/ttk_widget.htm>`_ man
+pages, while others are found in the man page for a specific widget class.
+
+You'll also find that many Tkinter methods have compound names, e.g.,
+:func:`winfo_x`, :func:`winfo_height`, :func:`winfo_viewable`. You'd find
+documentation for all of these in the
+`winfo <https://www.tcl.tk/man/tcl8.6/TkCmd/winfo.htm>`_ man page.
+
+.. note::
+   Somewhat confusingly, there are also methods on all Tkinter widgets
+   that don't actually operate on the widget, but operate at a global
+   scope, independent of any widget. Examples are methods for accessing
+   the clipboard or the system bell. (They happen to be implemented as
+   methods in the base :class:`Widget` class that all Tkinter widgets
+   inherit from).
 
 
 How Tk and Tkinter are Related
diff --git a/Doc/tools/susp-ignored.csv b/Doc/tools/susp-ignored.csv
index 1fde253feac2fa..211b49a5449f48 100644
--- a/Doc/tools/susp-ignored.csv
+++ b/Doc/tools/susp-ignored.csv
@@ -233,6 +233,12 @@ library/tarfile,,:xz,'r:xz'
 library/tarfile,,:xz,'w:xz'
 library/time,,:mm,
 library/time,,:ss,
+library/tkinter,294,::,ttk::frame .frm -padding 10
+library/tkinter,294,::,"grid [ttk::label .frm.lbl -text ""Hello World!""] -column 0 -row 0"
+library/tkinter,294,::,"grid [ttk::button .frm.btn -text ""Quit"" -command ""destroy .""] -column 1 -row 0"
+library/tkinter,304,::,ttk::frame
+library/tkinter,402,::,ttk::button
+library/tkinter,410,::,ttk::widget
 library/tracemalloc,,:limit,"for index, stat in enumerate(top_stats[:limit], 1):"
 library/turtle,,::,Example::
 library/unittest,,:foo,"self.assertEqual(cm.output, ['INFO:foo:first message',"


From webhook-mailer at python.org  Mon Aug 23 14:48:13 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 23 Aug 2021 18:48:13 -0000
Subject: [Python-checkins] [3.9] bpo-44984: Rewrite test_null_strings in
 _testcapi (GH-27904) (GH-27910)
Message-ID: <mailman.1140.1629744494.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/b0df288c946143352237f28c78481d935ba1502c
commit: b0df288c946143352237f28c78481d935ba1502c
branch: 3.9
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2021-08-23T20:48:04+02:00
summary:

[3.9] bpo-44984: Rewrite test_null_strings in _testcapi (GH-27904) (GH-27910)

Test also PyObject_Repr(NULL) and PyObject_Bytes(NULL)..
(cherry picked from commit 4d689173861257c69adc6dc1dca4171946ddb57f)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
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 b21c3acf39b245..0cbe839665e3f6 100644
--- a/Lib/test/test_capi.py
+++ b/Lib/test/test_capi.py
@@ -537,6 +537,18 @@ def test_pynumber_tobase(self):
         self.assertRaises(TypeError, pynumber_tobase, '123', 10)
         self.assertRaises(SystemError, pynumber_tobase, 123, 0)
 
+    def test_pyobject_repr_from_null(self):
+        s = _testcapi.pyobject_repr_from_null()
+        self.assertEqual(s, '<NULL>')
+
+    def test_pyobject_str_from_null(self):
+        s = _testcapi.pyobject_str_from_null()
+        self.assertEqual(s, '<NULL>')
+
+    def test_pyobject_bytes_from_null(self):
+        s = _testcapi.pyobject_bytes_from_null()
+        self.assertEqual(s, b'<NULL>')
+
 
 class TestPendingCalls(unittest.TestCase):
 
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 53a6752d5fb2b1..f6558caee9e346 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -2215,16 +2215,22 @@ test_long_numbits(PyObject *self, PyObject *Py_UNUSED(ignored))
     Py_RETURN_NONE;
 }
 
-/* Example passing NULLs to PyObject_Str(NULL). */
+static PyObject *
+pyobject_repr_from_null(PyObject *self, PyObject *Py_UNUSED(ignored))
+{
+    return PyObject_Repr(NULL);
+}
 
 static PyObject *
-test_null_strings(PyObject *self, PyObject *Py_UNUSED(ignored))
+pyobject_str_from_null(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    PyObject *o1 = PyObject_Str(NULL), *o2 = PyObject_Str(NULL);
-    PyObject *tuple = PyTuple_Pack(2, o1, o2);
-    Py_XDECREF(o1);
-    Py_XDECREF(o2);
-    return tuple;
+    return PyObject_Str(NULL);
+}
+
+static PyObject *
+pyobject_bytes_from_null(PyObject *self, PyObject *Py_UNUSED(ignored))
+{
+    return PyObject_Bytes(NULL);
 }
 
 static PyObject *
@@ -5371,7 +5377,9 @@ static PyMethodDef TestMethods[] = {
     {"test_k_code",             test_k_code,                     METH_NOARGS},
     {"test_empty_argparse",     test_empty_argparse,             METH_NOARGS},
     {"parse_tuple_and_keywords", parse_tuple_and_keywords, METH_VARARGS},
-    {"test_null_strings",       test_null_strings,               METH_NOARGS},
+    {"pyobject_repr_from_null", pyobject_repr_from_null, METH_NOARGS},
+    {"pyobject_str_from_null",  pyobject_str_from_null, METH_NOARGS},
+    {"pyobject_bytes_from_null", pyobject_bytes_from_null, METH_NOARGS},
     {"test_string_from_format", (PyCFunction)test_string_from_format, METH_NOARGS},
     {"test_with_docstring",     test_with_docstring,             METH_NOARGS,
      PyDoc_STR("This is a pretty normal docstring.")},


From webhook-mailer at python.org  Mon Aug 23 14:50:55 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 23 Aug 2021 18:50:55 -0000
Subject: [Python-checkins] bpo-44980: fix test_constructor to return None
 value (GH-27898)
Message-ID: <mailman.1141.1629744656.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/27b761a11a14521617a01257eb3767150bec3a74
commit: 27b761a11a14521617a01257eb3767150bec3a74
branch: main
author: andrei kulakov <andrei.avk at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-23T20:50:46+02:00
summary:

bpo-44980: fix test_constructor to return None value (GH-27898)

files:
M Lib/test/test_code.py

diff --git a/Lib/test/test_code.py b/Lib/test/test_code.py
index 9d6b465115ca2..66c84a953cb3d 100644
--- a/Lib/test/test_code.py
+++ b/Lib/test/test_code.py
@@ -212,7 +212,7 @@ def func(): pass
         CodeType = type(co)
 
         # test code constructor
-        return CodeType(co.co_argcount,
+        CodeType(co.co_argcount,
                         co.co_posonlyargcount,
                         co.co_kwonlyargcount,
                         co.co_nlocals,


From webhook-mailer at python.org  Mon Aug 23 15:00:55 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 23 Aug 2021 19:00:55 -0000
Subject: [Python-checkins] bpo-42560: add warning to Tkinter docs about
 outdated pre-8.5 documentation online (GH-27836)
Message-ID: <mailman.1142.1629745256.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/1eb451031a64b4f28d737ee7f394252ae9a76118
commit: 1eb451031a64b4f28d737ee7f394252ae9a76118
branch: main
author: Mark Roseman <mark at markroseman.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-23T21:00:47+02:00
summary:

bpo-42560: add warning to Tkinter docs about outdated pre-8.5 documentation online (GH-27836)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
Co-authored-by: E-Paine <63801254+E-Paine at users.noreply.github.com>

files:
M Doc/library/tkinter.rst

diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index 425f030dcc983..c106cb8328c20 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -29,6 +29,13 @@ make the experience more pythonic. This documentation will concentrate on these
 additions and changes, and refer to the official Tcl/Tk documentation for
 details that are unchanged.
 
+.. note::
+
+   Tcl/Tk 8.5 (2007) introduced a modern set of themed user interface components
+   along with a new API to use them. Both old and new APIs are still available.
+   Most documentation you will find online still uses the old API and
+   can be woefully outdated.
+
 .. seealso::
 
    * `TkDocs <http://tkdocs.com/>`_


From webhook-mailer at python.org  Mon Aug 23 15:16:02 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 23 Aug 2021 19:16:02 -0000
Subject: [Python-checkins] [doc] Added mailing list link for
 comp.lang.python (GH-27852)
Message-ID: <mailman.1143.1629746163.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/7b550dfce64bd134c5604fd1f2d4c43ae2b669e4
commit: 7b550dfce64bd134c5604fd1f2d4c43ae2b669e4
branch: main
author: Mike Smith <mikesmith at screamingjoypad.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-23T21:15:52+02:00
summary:

[doc] Added mailing list link for comp.lang.python (GH-27852)

files:
M README.rst

diff --git a/README.rst b/README.rst
index 898680af095de..067d7d8ca2b81 100644
--- a/README.rst
+++ b/README.rst
@@ -229,12 +229,13 @@ Proposals for enhancement
 -------------------------
 
 If you have a proposal to change Python, you may want to send an email to the
-comp.lang.python or `python-ideas`_ mailing lists for initial feedback.  A
+`comp.lang.python`_ or `python-ideas`_ mailing lists for initial feedback.  A
 Python Enhancement Proposal (PEP) may be submitted if your idea gains ground.
 All current PEPs, as well as guidelines for submitting a new PEP, are listed at
 `python.org/dev/peps/ <https://www.python.org/dev/peps/>`_.
 
 .. _python-ideas: https://mail.python.org/mailman/listinfo/python-ideas/
+.. _comp.lang.python: https://mail.python.org/mailman/listinfo/python-list
 
 
 Release Schedule


From webhook-mailer at python.org  Mon Aug 23 15:17:44 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 23 Aug 2021 19:17:44 -0000
Subject: [Python-checkins] [doc] Fix typo c-api/exceptions.rst (GH-27847)
Message-ID: <mailman.1144.1629746265.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/dcbf7ff6a700b63e637a0445d68866670a398024
commit: dcbf7ff6a700b63e637a0445d68866670a398024
branch: main
author: Sunny Bean <ptq008 at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-23T21:17:40+02:00
summary:

[doc] Fix typo c-api/exceptions.rst (GH-27847)

Co-authored-by: Tianqing Peng <pengtianqing at yimian.com.cn>

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

diff --git a/Doc/c-api/exceptions.rst b/Doc/c-api/exceptions.rst
index 525a773b7c768f..5d90248f85a5d4 100644
--- a/Doc/c-api/exceptions.rst
+++ b/Doc/c-api/exceptions.rst
@@ -100,7 +100,7 @@ For convenience, some of these functions will always return a
    This is the most common way to set the error indicator.  The first argument
    specifies the exception type; it is normally one of the standard exceptions,
    e.g. :c:data:`PyExc_RuntimeError`.  You need not increment its reference count.
-   The second argument is an error message; it is decoded from ``'utf-8``'.
+   The second argument is an error message; it is decoded from ``'utf-8'``.
 
 
 .. c:function:: void PyErr_SetObject(PyObject *type, PyObject *value)


From webhook-mailer at python.org  Mon Aug 23 15:20:34 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 23 Aug 2021 19:20:34 -0000
Subject: [Python-checkins] bpo-44980: fix test_constructor to return None
 value (GH-27898) (GH-27914)
Message-ID: <mailman.1145.1629746435.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/de49eacee85dbd56bfa261200604766ca6042d66
commit: de49eacee85dbd56bfa261200604766ca6042d66
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-23T21:20:29+02:00
summary:

bpo-44980: fix test_constructor to return None value (GH-27898) (GH-27914)

(cherry picked from commit 27b761a11a14521617a01257eb3767150bec3a74)

Co-authored-by: andrei kulakov <andrei.avk at gmail.com>

files:
M Lib/test/test_code.py

diff --git a/Lib/test/test_code.py b/Lib/test/test_code.py
index ac3dde745603d..7d77d7a7bec86 100644
--- a/Lib/test/test_code.py
+++ b/Lib/test/test_code.py
@@ -213,7 +213,7 @@ def func(): pass
         CodeType = type(co)
 
         # test code constructor
-        return CodeType(co.co_argcount,
+        CodeType(co.co_argcount,
                         co.co_posonlyargcount,
                         co.co_kwonlyargcount,
                         co.co_nlocals,


From webhook-mailer at python.org  Mon Aug 23 15:21:11 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 23 Aug 2021 19:21:11 -0000
Subject: [Python-checkins] bpo-44980: fix test_constructor to return None
 value (GH-27898)
Message-ID: <mailman.1146.1629746472.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/10955353ce25a52741e8f72fdbb6f4b150ee4dc7
commit: 10955353ce25a52741e8f72fdbb6f4b150ee4dc7
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-23T12:21:06-07:00
summary:

bpo-44980: fix test_constructor to return None value (GH-27898)

(cherry picked from commit 27b761a11a14521617a01257eb3767150bec3a74)

Co-authored-by: andrei kulakov <andrei.avk at gmail.com>

files:
M Lib/test/test_code.py

diff --git a/Lib/test/test_code.py b/Lib/test/test_code.py
index 6aaf04ca6dde5..74cd0458a5108 100644
--- a/Lib/test/test_code.py
+++ b/Lib/test/test_code.py
@@ -213,7 +213,7 @@ def func(): pass
         CodeType = type(co)
 
         # test code constructor
-        return CodeType(co.co_argcount,
+        CodeType(co.co_argcount,
                         co.co_posonlyargcount,
                         co.co_kwonlyargcount,
                         co.co_nlocals,


From webhook-mailer at python.org  Mon Aug 23 15:22:33 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 23 Aug 2021 19:22:33 -0000
Subject: [Python-checkins] bpo-42560: add warning to Tkinter docs about
 outdated pre-8.5 documentation online (GH-27836)
Message-ID: <mailman.1147.1629746554.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/8351df6e3652a41ffc720066a68b666bbef1df67
commit: 8351df6e3652a41ffc720066a68b666bbef1df67
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-23T12:22:29-07:00
summary:

bpo-42560: add warning to Tkinter docs about outdated pre-8.5 documentation online (GH-27836)


Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
Co-authored-by: E-Paine <63801254+E-Paine at users.noreply.github.com>
(cherry picked from commit 1eb451031a64b4f28d737ee7f394252ae9a76118)

Co-authored-by: Mark Roseman <mark at markroseman.com>

files:
M Doc/library/tkinter.rst

diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index 34238f4cdd0bb..321865357d0b5 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -29,6 +29,13 @@ make the experience more pythonic. This documentation will concentrate on these
 additions and changes, and refer to the official Tcl/Tk documentation for
 details that are unchanged.
 
+.. note::
+
+   Tcl/Tk 8.5 (2007) introduced a modern set of themed user interface components
+   along with a new API to use them. Both old and new APIs are still available.
+   Most documentation you will find online still uses the old API and
+   can be woefully outdated.
+
 .. seealso::
 
    * `TkDocs <http://tkdocs.com/>`_


From webhook-mailer at python.org  Mon Aug 23 15:23:53 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 23 Aug 2021 19:23:53 -0000
Subject: [Python-checkins] [doc] Added mailing list link for
 comp.lang.python (GH-27852)
Message-ID: <mailman.1148.1629746635.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/c6c120ddfa2eaa55db4fc1311b5107f6a7c99d88
commit: c6c120ddfa2eaa55db4fc1311b5107f6a7c99d88
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-23T12:23:48-07:00
summary:

[doc] Added mailing list link for comp.lang.python (GH-27852)

(cherry picked from commit 7b550dfce64bd134c5604fd1f2d4c43ae2b669e4)

Co-authored-by: Mike Smith <mikesmith at screamingjoypad.com>

files:
M README.rst

diff --git a/README.rst b/README.rst
index 473fd9405c51f..0c7b53d3a41c7 100644
--- a/README.rst
+++ b/README.rst
@@ -229,12 +229,13 @@ Proposals for enhancement
 -------------------------
 
 If you have a proposal to change Python, you may want to send an email to the
-comp.lang.python or `python-ideas`_ mailing lists for initial feedback.  A
+`comp.lang.python`_ or `python-ideas`_ mailing lists for initial feedback.  A
 Python Enhancement Proposal (PEP) may be submitted if your idea gains ground.
 All current PEPs, as well as guidelines for submitting a new PEP, are listed at
 `python.org/dev/peps/ <https://www.python.org/dev/peps/>`_.
 
 .. _python-ideas: https://mail.python.org/mailman/listinfo/python-ideas/
+.. _comp.lang.python: https://mail.python.org/mailman/listinfo/python-list
 
 
 Release Schedule


From webhook-mailer at python.org  Mon Aug 23 15:24:16 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 23 Aug 2021 19:24:16 -0000
Subject: [Python-checkins] [doc] Added mailing list link for
 comp.lang.python (GH-27852) (GH-27916)
Message-ID: <mailman.1149.1629746659.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/28de5622abeadbf55a297b60199c068ee7ec0f63
commit: 28de5622abeadbf55a297b60199c068ee7ec0f63
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-23T21:24:12+02:00
summary:

[doc] Added mailing list link for comp.lang.python (GH-27852) (GH-27916)

(cherry picked from commit 7b550dfce64bd134c5604fd1f2d4c43ae2b669e4)

Co-authored-by: Mike Smith <mikesmith at screamingjoypad.com>

files:
M README.rst

diff --git a/README.rst b/README.rst
index cb5bbd2776810..87dc1937176e4 100644
--- a/README.rst
+++ b/README.rst
@@ -233,12 +233,13 @@ Proposals for enhancement
 -------------------------
 
 If you have a proposal to change Python, you may want to send an email to the
-comp.lang.python or `python-ideas`_ mailing lists for initial feedback.  A
+`comp.lang.python`_ or `python-ideas`_ mailing lists for initial feedback.  A
 Python Enhancement Proposal (PEP) may be submitted if your idea gains ground.
 All current PEPs, as well as guidelines for submitting a new PEP, are listed at
 `python.org/dev/peps/ <https://www.python.org/dev/peps/>`_.
 
 .. _python-ideas: https://mail.python.org/mailman/listinfo/python-ideas/
+.. _comp.lang.python: https://mail.python.org/mailman/listinfo/python-list
 
 
 Release Schedule


From webhook-mailer at python.org  Mon Aug 23 15:27:52 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 23 Aug 2021 19:27:52 -0000
Subject: [Python-checkins] bpo-42560: simplify/merge architecture info in
 Tkinter docs (GH-27839)
Message-ID: <mailman.1150.1629746873.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/e41912c6348362489d2514565a70782591f23902
commit: e41912c6348362489d2514565a70782591f23902
branch: main
author: Mark Roseman <mark at markroseman.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-23T21:27:47+02:00
summary:

bpo-42560: simplify/merge architecture info in Tkinter docs (GH-27839)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
Co-authored-by: E-Paine <63801254+E-Paine at users.noreply.github.com>

files:
M Doc/library/tkinter.rst

diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index c106cb8328c20..a48bc13c8b436 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -72,7 +72,7 @@ Architecture
 ------------
 
 Tcl/Tk is not a single library but rather consists of a few distinct
-modules, each with a separate functionality and its own official
+modules, each with separate functionality and its own official
 documentation. Python's binary releases also ship an add-on module
 together with it.
 
@@ -102,11 +102,14 @@ Ttk
    Ttk is distributed as part of Tk, starting with Tk version 8.5. Python
    bindings are provided in a separate module, :mod:`tkinter.ttk`.
 
-Tix
-   `Tix <https://core.tcl.tk/jenglish/gutter/packages/tix.html>`_ is an older
-   third-party Tcl package, an add-on for Tk that adds several new widgets.
-   Python bindings are found in the :mod:`tkinter.tix` module.
-   It's deprecated in favor of Ttk.
+Internally, Tk and Ttk use facilities of the underlying operating system,
+i.e., Xlib on Unix/X11, Cocoa on macOS, GDI on Windows.
+
+When your Python application uses a class in Tkinter, e.g., to create a widget,
+the :mod:`tkinter` module first assembles a Tcl/Tk command string. It passes that
+Tcl command string to an internal :mod:`_tkinter` binary module, which then
+calls the Tcl interpreter to evaluate it. The Tcl interpreter will then call into the
+Tk and/or Ttk packages, which will in turn make calls to Xlib, Cocoa, or GDI.
 
 
 Tkinter Modules
@@ -441,39 +444,6 @@ documentation for all of these in the
    inherit from).
 
 
-How Tk and Tkinter are Related
-------------------------------
-
-From the top down:
-
-Your App Here (Python)
-   A Python application makes a :mod:`tkinter` call.
-
-tkinter (Python Package)
-   This call (say, for example, creating a button widget), is implemented in
-   the :mod:`tkinter` package, which is written in Python.  This Python
-   function will parse the commands and the arguments and convert them into a
-   form that makes them look as if they had come from a Tk script instead of
-   a Python script.
-
-_tkinter (C)
-   These commands and their arguments will be passed to a C function in the
-   :mod:`_tkinter` - note the underscore - extension module.
-
-Tk Widgets (C and Tcl)
-   This C function is able to make calls into other C modules, including the C
-   functions that make up the Tk library.  Tk is implemented in C and some Tcl.
-   The Tcl part of the Tk widgets is used to bind certain default behaviors to
-   widgets, and is executed once at the point where the Python :mod:`tkinter`
-   package is imported. (The user never sees this stage).
-
-Tk (C)
-   The Tk part of the Tk Widgets implement the final mapping to ...
-
-Xlib (C)
-   the Xlib library to draw graphics on the screen.
-
-
 Threading model
 ---------------
 


From webhook-mailer at python.org  Mon Aug 23 15:30:27 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 23 Aug 2021 19:30:27 -0000
Subject: [Python-checkins] bpo-44984: Rewrite test_null_strings in _testcapi
 (GH-27904)
Message-ID: <mailman.1151.1629747028.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/6ff7fefc914541ec5afdd3c8193da80818cb0817
commit: 6ff7fefc914541ec5afdd3c8193da80818cb0817
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-23T12:30:21-07:00
summary:

bpo-44984: Rewrite test_null_strings in _testcapi (GH-27904)


Test also PyObject_Repr(NULL) and PyObject_Bytes(NULL).
(cherry picked from commit 4d689173861257c69adc6dc1dca4171946ddb57f)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
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 f9c5aca728b433..5f78c337028a99 100644
--- a/Lib/test/test_capi.py
+++ b/Lib/test/test_capi.py
@@ -619,6 +619,18 @@ def test_fatal_error(self):
         ''')
         self.check_fatal_error(code, expected)
 
+    def test_pyobject_repr_from_null(self):
+        s = _testcapi.pyobject_repr_from_null()
+        self.assertEqual(s, '<NULL>')
+
+    def test_pyobject_str_from_null(self):
+        s = _testcapi.pyobject_str_from_null()
+        self.assertEqual(s, '<NULL>')
+
+    def test_pyobject_bytes_from_null(self):
+        s = _testcapi.pyobject_bytes_from_null()
+        self.assertEqual(s, b'<NULL>')
+
 
 class TestPendingCalls(unittest.TestCase):
 
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index ef1fb71cc90487..103bd4062292db 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -2342,16 +2342,22 @@ test_long_numbits(PyObject *self, PyObject *Py_UNUSED(ignored))
     Py_RETURN_NONE;
 }
 
-/* Example passing NULLs to PyObject_Str(NULL). */
+static PyObject *
+pyobject_repr_from_null(PyObject *self, PyObject *Py_UNUSED(ignored))
+{
+    return PyObject_Repr(NULL);
+}
 
 static PyObject *
-test_null_strings(PyObject *self, PyObject *Py_UNUSED(ignored))
+pyobject_str_from_null(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    PyObject *o1 = PyObject_Str(NULL), *o2 = PyObject_Str(NULL);
-    PyObject *tuple = PyTuple_Pack(2, o1, o2);
-    Py_XDECREF(o1);
-    Py_XDECREF(o2);
-    return tuple;
+    return PyObject_Str(NULL);
+}
+
+static PyObject *
+pyobject_bytes_from_null(PyObject *self, PyObject *Py_UNUSED(ignored))
+{
+    return PyObject_Bytes(NULL);
 }
 
 static PyObject *
@@ -5653,7 +5659,9 @@ static PyMethodDef TestMethods[] = {
     {"test_k_code",             test_k_code,                     METH_NOARGS},
     {"test_empty_argparse",     test_empty_argparse,             METH_NOARGS},
     {"parse_tuple_and_keywords", parse_tuple_and_keywords, METH_VARARGS},
-    {"test_null_strings",       test_null_strings,               METH_NOARGS},
+    {"pyobject_repr_from_null", pyobject_repr_from_null, METH_NOARGS},
+    {"pyobject_str_from_null",  pyobject_str_from_null, METH_NOARGS},
+    {"pyobject_bytes_from_null", pyobject_bytes_from_null, METH_NOARGS},
     {"test_string_from_format", (PyCFunction)test_string_from_format, METH_NOARGS},
     {"test_with_docstring",     test_with_docstring,             METH_NOARGS,
      PyDoc_STR("This is a pretty normal docstring.")},


From webhook-mailer at python.org  Mon Aug 23 15:40:41 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 23 Aug 2021 19:40:41 -0000
Subject: [Python-checkins] [doc] Fix typo c-api/exceptions.rst (GH-27847)
Message-ID: <mailman.1152.1629747641.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/f70936052012ac2be958cc57e2ebfc4568722531
commit: f70936052012ac2be958cc57e2ebfc4568722531
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-23T12:40:36-07:00
summary:

[doc] Fix typo c-api/exceptions.rst (GH-27847)


Co-authored-by: Tianqing Peng <pengtianqing at yimian.com.cn>
(cherry picked from commit dcbf7ff6a700b63e637a0445d68866670a398024)

Co-authored-by: Sunny Bean <ptq008 at gmail.com>

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

diff --git a/Doc/c-api/exceptions.rst b/Doc/c-api/exceptions.rst
index 21c508dc30ae22..dc056590074707 100644
--- a/Doc/c-api/exceptions.rst
+++ b/Doc/c-api/exceptions.rst
@@ -100,7 +100,7 @@ For convenience, some of these functions will always return a
    This is the most common way to set the error indicator.  The first argument
    specifies the exception type; it is normally one of the standard exceptions,
    e.g. :c:data:`PyExc_RuntimeError`.  You need not increment its reference count.
-   The second argument is an error message; it is decoded from ``'utf-8``'.
+   The second argument is an error message; it is decoded from ``'utf-8'``.
 
 
 .. c:function:: void PyErr_SetObject(PyObject *type, PyObject *value)


From webhook-mailer at python.org  Mon Aug 23 16:08:28 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 23 Aug 2021 20:08:28 -0000
Subject: [Python-checkins] bpo-42560: simplify/merge architecture info in
 Tkinter docs (GH-27839)
Message-ID: <mailman.1153.1629749309.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/e4795103025aeef295a8c5f75cc7c33801f93a24
commit: e4795103025aeef295a8c5f75cc7c33801f93a24
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-23T13:08:19-07:00
summary:

bpo-42560: simplify/merge architecture info in Tkinter docs (GH-27839)


Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
Co-authored-by: E-Paine <63801254+E-Paine at users.noreply.github.com>
(cherry picked from commit e41912c6348362489d2514565a70782591f23902)

Co-authored-by: Mark Roseman <mark at markroseman.com>

files:
M Doc/library/tkinter.rst

diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index 321865357d0b5..f809db15a5202 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -72,7 +72,7 @@ Architecture
 ------------
 
 Tcl/Tk is not a single library but rather consists of a few distinct
-modules, each with a separate functionality and its own official
+modules, each with separate functionality and its own official
 documentation. Python's binary releases also ship an add-on module
 together with it.
 
@@ -102,11 +102,14 @@ Ttk
    Ttk is distributed as part of Tk, starting with Tk version 8.5. Python
    bindings are provided in a separate module, :mod:`tkinter.ttk`.
 
-Tix
-   `Tix <https://core.tcl.tk/jenglish/gutter/packages/tix.html>`_ is an older
-   third-party Tcl package, an add-on for Tk that adds several new widgets.
-   Python bindings are found in the :mod:`tkinter.tix` module.
-   It's deprecated in favor of Ttk.
+Internally, Tk and Ttk use facilities of the underlying operating system,
+i.e., Xlib on Unix/X11, Cocoa on macOS, GDI on Windows.
+
+When your Python application uses a class in Tkinter, e.g., to create a widget,
+the :mod:`tkinter` module first assembles a Tcl/Tk command string. It passes that
+Tcl command string to an internal :mod:`_tkinter` binary module, which then
+calls the Tcl interpreter to evaluate it. The Tcl interpreter will then call into the
+Tk and/or Ttk packages, which will in turn make calls to Xlib, Cocoa, or GDI.
 
 
 Tkinter Modules
@@ -410,39 +413,6 @@ information on the Form geometry manager. ::
    pack .fred -side left       =====>  fred.pack(side="left")
 
 
-How Tk and Tkinter are Related
-------------------------------
-
-From the top down:
-
-Your App Here (Python)
-   A Python application makes a :mod:`tkinter` call.
-
-tkinter (Python Package)
-   This call (say, for example, creating a button widget), is implemented in
-   the :mod:`tkinter` package, which is written in Python.  This Python
-   function will parse the commands and the arguments and convert them into a
-   form that makes them look as if they had come from a Tk script instead of
-   a Python script.
-
-_tkinter (C)
-   These commands and their arguments will be passed to a C function in the
-   :mod:`_tkinter` - note the underscore - extension module.
-
-Tk Widgets (C and Tcl)
-   This C function is able to make calls into other C modules, including the C
-   functions that make up the Tk library.  Tk is implemented in C and some Tcl.
-   The Tcl part of the Tk widgets is used to bind certain default behaviors to
-   widgets, and is executed once at the point where the Python :mod:`tkinter`
-   package is imported. (The user never sees this stage).
-
-Tk (C)
-   The Tk part of the Tk Widgets implement the final mapping to ...
-
-Xlib (C)
-   the Xlib library to draw graphics on the screen.
-
-
 Threading model
 ---------------
 


From webhook-mailer at python.org  Mon Aug 23 16:09:56 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 23 Aug 2021 20:09:56 -0000
Subject: [Python-checkins] [doc] Fix typo c-api/exceptions.rst (GH-27847)
 (GH-27919)
Message-ID: <mailman.1154.1629749397.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/834a2eb94517f9090b8c77feb968a4b95aa852b9
commit: 834a2eb94517f9090b8c77feb968a4b95aa852b9
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-23T22:09:52+02:00
summary:

[doc] Fix typo c-api/exceptions.rst (GH-27847) (GH-27919)

Co-authored-by: Tianqing Peng <pengtianqing at yimian.com.cn>
(cherry picked from commit dcbf7ff6a700b63e637a0445d68866670a398024)

Co-authored-by: Sunny Bean <ptq008 at gmail.com>

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

diff --git a/Doc/c-api/exceptions.rst b/Doc/c-api/exceptions.rst
index 247b6d68eceae9..614eb245255418 100644
--- a/Doc/c-api/exceptions.rst
+++ b/Doc/c-api/exceptions.rst
@@ -100,7 +100,7 @@ For convenience, some of these functions will always return a
    This is the most common way to set the error indicator.  The first argument
    specifies the exception type; it is normally one of the standard exceptions,
    e.g. :c:data:`PyExc_RuntimeError`.  You need not increment its reference count.
-   The second argument is an error message; it is decoded from ``'utf-8``'.
+   The second argument is an error message; it is decoded from ``'utf-8'``.
 
 
 .. c:function:: void PyErr_SetObject(PyObject *type, PyObject *value)


From webhook-mailer at python.org  Mon Aug 23 18:52:09 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 23 Aug 2021 22:52:09 -0000
Subject: [Python-checkins] Update susp-ignored.csv line numbers
Message-ID: <mailman.1155.1629759130.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/4673dc26f8beab50b4d4046ece720933401a4023
commit: 4673dc26f8beab50b4d4046ece720933401a4023
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-23T15:52:02-07:00
summary:

Update susp-ignored.csv line numbers

files:
M Doc/library/tkinter.rst
M Doc/tools/susp-ignored.csv

diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index f809db15a5202..a48bc13c8b436 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -207,210 +207,241 @@ Additional modules:
 Tkinter Life Preserver
 ----------------------
 
-.. sectionauthor:: Matt Conway
+This section is not designed to be an exhaustive tutorial on either Tk or
+Tkinter.  For that, refer to one of the external resources noted earlier.
+Instead, this section provides a very quick orientation to what a Tkinter
+application looks like, identifies foundational Tk concepts, and
+explains how the Tkinter wrapper is structured.
 
+The remainder of this section will help you to identify the classes,
+methods, and options you'll need in your Tkinter application, and where to
+find more detailed documentation on them, including in the official Tcl/Tk
+reference manual.
 
-This section is not designed to be an exhaustive tutorial on either Tk or
-Tkinter.  Rather, it is intended as a stop gap, providing some introductory
-orientation on the system.
 
-Credits:
+A Hello World Program
+^^^^^^^^^^^^^^^^^^^^^
 
-* Tk was written by John Ousterhout while at Berkeley.
+We'll start by walking through a "Hello World" application in Tkinter. This
+isn't the smallest one we could write, but has enough to illustrate some
+key concepts you'll need to know.
 
-* Tkinter was written by Steen Lumholt and Guido van Rossum.
+::
 
-* This Life Preserver was written by Matt Conway at the University of Virginia.
+    from tkinter import *
+    from tkinter import ttk
+    root = Tk()
+    frm = ttk.Frame(root, padding=10)
+    frm.grid()
+    ttk.Label(frm, text="Hello World!").grid(column=0, row=0)
+    ttk.Button(frm, text="Quit", command=root.destroy).grid(column=1, row=0)
+    root.mainloop()
 
-* The HTML rendering, and some liberal editing, was produced from a FrameMaker
-  version by Ken Manheimer.
 
-* Fredrik Lundh elaborated and revised the class interface descriptions, to get
-  them current with Tk 4.2.
+After the imports, the next line creates an instance of the :class:`Tk` class,
+which initializes Tk and creates its associated Tcl interpreter. It also
+creates a toplevel window, known as the root window, which serves as the main
+window of the application.
 
-* Mike Clarkson converted the documentation to LaTeX, and compiled the  User
-  Interface chapter of the reference manual.
+The following line creates a frame widget, which in this case will contain
+a label and a button we'll create next. The frame is fit inside the root
+window.
 
+The next line creates a label widget holding a static text string. The
+:meth:`grid` method is used to specify the relative layout (position) of the
+label within its containing frame widget, similar to how tables in HTML work.
 
-How To Use This Section
-^^^^^^^^^^^^^^^^^^^^^^^
+A button widget is then created, and placed to the right of the label. When
+pressed, it will call the :meth:`destroy` method of the root window.
 
-This section is designed in two parts: the first half (roughly) covers
-background material, while the second half can be taken to the keyboard as a
-handy reference.
+Finally, the :meth:`mainloop` method puts everything on the display, and
+responds to user input until the program terminates.
 
-When trying to answer questions of the form "how do I do blah", it is often best
-to find out how to do "blah" in straight Tk, and then convert this back into the
-corresponding :mod:`tkinter` call. Python programmers can often guess at the
-correct Python command by looking at the Tk documentation. This means that in
-order to use Tkinter, you will have to know a little bit about Tk. This document
-can't fulfill that role, so the best we can do is point you to the best
-documentation that exists. Here are some hints:
 
-* The authors strongly suggest getting a copy of the Tk man pages.
-  Specifically, the man pages in the ``manN`` directory are most useful.
-  The ``man3`` man pages describe the C interface to the Tk library and thus
-  are not especially helpful for script writers.
 
-* Addison-Wesley publishes a book called Tcl and the Tk Toolkit by John
-  Ousterhout (ISBN 0-201-63337-X) which is a good introduction to Tcl and Tk for
-  the novice.  The book is not exhaustive, and for many details it defers to the
-  man pages.
+Important Tk Concepts
+^^^^^^^^^^^^^^^^^^^^^
 
-* :file:`tkinter/__init__.py` is a last resort for most, but can be a good
-  place to go when nothing else makes sense.
+Even this simple program illustrates the following key Tk concepts:
 
+widgets
+  A Tkinter user interface is made up of individual *widgets*. Each widget is
+  represented as a Python object, instantiated from classes like
+  :class:`ttk.Frame`, :class:`ttk.Label`, and :class:`ttk.Button`.
 
-A Simple Hello World Program
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+widget hierarchy
+  Widgets are arranged in a *hierarchy*. The label and button were contained
+  within a frame, which in turn was contained within the root window. When
+  creating each *child* widget, its *parent* widget is passed as the first
+  argument to the widget constructor.
 
-::
+configuration options
+  Widgets have *configuration options*, which modify their appearance and
+  behavior, such as the text to display in a label or button. Different
+  classes of widgets will have different sets of options.
 
-    import tkinter as tk
+geometry management
+  Widgets aren't automatically added to the user interface when they are
+  created. A *geometry manager* like ``grid`` controls where in the
+  user interface they are placed.
 
-    class Application(tk.Frame):
-        def __init__(self, master=None):
-            super().__init__(master)
-            self.master = master
-            self.pack()
-            self.create_widgets()
+event loop
+  Tkinter reacts to user input, changes from your program, and even refreshes
+  the display only when actively running an *event loop*. If your program
+  isn't running the event loop, your user interface won't update.
 
-        def create_widgets(self):
-            self.hi_there = tk.Button(self)
-            self.hi_there["text"] = "Hello World\n(click me)"
-            self.hi_there["command"] = self.say_hi
-            self.hi_there.pack(side="top")
 
-            self.quit = tk.Button(self, text="QUIT", fg="red",
-                                  command=self.master.destroy)
-            self.quit.pack(side="bottom")
+Understanding How Tkinter Wraps Tcl/Tk
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-        def say_hi(self):
-            print("hi there, everyone!")
+When your application uses Tkinter's classes and methods, internally Tkinter
+is assembling strings representing Tcl/Tk commands, and executing those
+commands in the Tcl interpreter attached to your applicaton's :class:`Tk`
+instance.
 
-    root = tk.Tk()
-    app = Application(master=root)
-    app.mainloop()
+Whether it's trying to navigate reference documentation, trying to find
+the right method or option, adapting some existing code, or debugging your
+Tkinter application, there are times that it will be useful to understand
+what those underlying Tcl/Tk commands look like.
 
+To illustrate, here is the Tcl/Tk equivalent of the main part of the Tkinter
+script above.
 
-A (Very) Quick Look at Tcl/Tk
------------------------------
+::
 
-The class hierarchy looks complicated, but in actual practice, application
-programmers almost always refer to the classes at the very bottom of the
-hierarchy.
+    ttk::frame .frm -padding 10
+    grid .frm
+    grid [ttk::label .frm.lbl -text "Hello World!"] -column 0 -row 0
+    grid [ttk::button .frm.btn -text "Quit" -command "destroy ."] -column 1 -row 0
 
-Notes:
 
-* These classes are provided for the purposes of organizing certain functions
-  under one namespace. They aren't meant to be instantiated independently.
+Tcl's syntax is similar to many shell languages, where the first word is the
+command to be executed, with arguments to that command following it, separated
+by spaces. Without getting into too many details, notice the following:
 
-* The :class:`Tk` class is meant to be instantiated only once in an application.
-  Application programmers need not instantiate one explicitly, the system creates
-  one whenever any of the other classes are instantiated.
+* The commands used to create widgets (like ``ttk::frame``) correspond to
+  widget classes in Tkinter.
 
-* The :class:`Widget` class is not meant to be instantiated, it is meant only
-  for subclassing to make "real" widgets (in C++, this is called an 'abstract
-  class').
+* Tcl widget options (like ``-text``) correspond to keyword arguments in
+  Tkinter.
 
-To make use of this reference material, there will be times when you will need
-to know how to read short passages of Tk and how to identify the various parts
-of a Tk command.   (See section :ref:`tkinter-basic-mapping` for the
-:mod:`tkinter` equivalents of what's below.)
+* Widgets are referred to by a *pathname* in Tcl (like ``.frm.btn``),
+  whereas Tkinter doesn't use names but object references.
 
-Tk scripts are Tcl programs.  Like all Tcl programs, Tk scripts are just lists
-of tokens separated by spaces.  A Tk widget is just its *class*, the *options*
-that help configure it, and the *actions* that make it do useful things.
+* A widget's place in the widget hierarchy is encoded in its (hierarchical)
+  pathname, which uses a ``.`` (dot) as a path separator. The pathname for
+  the root window is just ``.`` (dot). In Tkinter, the hierarchy is defined
+  not by pathname but by specifying the parent widget when creating each
+  child widget.
 
-To make a widget in Tk, the command is always of the form::
+* Operations which are implemented as separate *commands* in Tcl (like
+  ``grid`` or ``destroy``) are represented as *methods* on Tkinter widget
+  objects. As you'll see shortly, at other times Tcl uses what appear to be
+  method calls on widget objects, which more closely mirror what would is
+  used in Tkinter.
 
-   classCommand newPathname options
 
-*classCommand*
-   denotes which kind of widget to make (a button, a label, a menu...)
+How do I...? What option does...?
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. index:: single: . (dot); in Tkinter
+If you're not sure how to do something in Tkinter, and you can't immediately
+find it in the tutorial or reference documentation you're using, there are a
+few strategies that can be helpful.
 
-*newPathname*
-   is the new name for this widget.  All names in Tk must be unique.  To help
-   enforce this, widgets in Tk are named with *pathnames*, just like files in a
-   file system.  The top level widget, the *root*, is called ``.`` (period) and
-   children are delimited by more periods.  For example,
-   ``.myApp.controlPanel.okButton`` might be the name of a widget.
+First, remember that the details of how individual widgets work may vary
+across different versions of both Tkinter and Tcl/Tk. If you're searching
+documentation, make sure it corresponds to the Python and Tcl/Tk versions
+installed on your system.
 
-*options*
-   configure the widget's appearance and in some cases, its behavior.  The options
-   come in the form of a list of flags and values. Flags are preceded by a '-',
-   like Unix shell command flags, and values are put in quotes if they are more
-   than one word.
+When searching for how to use an API, it helps to know the exact name of the
+class, option, or method that you're using. Introspection, either in an
+interactive Python shell or with :func:`print`, can help you identify what
+you need.
 
-For example::
+To find out what configuration options are available on any widget, call its
+:meth:`configure` method, which returns a dictionary containing a variety of
+information about each object, including its default and current values. Use
+:meth:`keys` to get just the names of each option.
 
-   button   .fred   -fg red -text "hi there"
-      ^       ^     \______________________/
-      |       |                |
-    class    new            options
-   command  widget  (-opt val -opt val ...)
+::
 
-Once created, the pathname to the widget becomes a new command.  This new
-*widget command* is the programmer's handle for getting the new widget to
-perform some *action*.  In C, you'd express this as someAction(fred,
-someOptions), in C++, you would express this as fred.someAction(someOptions),
-and in Tk, you say::
+    btn = ttk.Button(frm, ...)
+    print(btn.configure().keys())
 
-   .fred someAction someOptions
+As most widgets have many configuration options in common, it can be useful
+to find out which are specific to a particular widget class. Comparing the
+list of options to that of a simpler widget, like a frame, is one way to
+do that.
 
-Note that the object name, ``.fred``, starts with a dot.
+::
 
-As you'd expect, the legal values for *someAction* will depend on the widget's
-class: ``.fred disable`` works if fred is a button (fred gets greyed out), but
-does not work if fred is a label (disabling of labels is not supported in Tk).
+    print(set(btn.configure().keys()) - set(frm.configure().keys()))
 
-The legal values of *someOptions* is action dependent.  Some actions, like
-``disable``, require no arguments, others, like a text-entry box's ``delete``
-command, would need arguments to specify what range of text to delete.
+Similarly, you can find the available methods for a widget object using the
+standard :func:`dir` function. If you try it, you'll see there are over 200
+common widget methods, so again identifying those specific to a widget class
+is helpful.
 
+::
+
+    print(dir(btn))
+    print(set(dir(btn)) - set(dir(frm)))
 
-.. _tkinter-basic-mapping:
 
-Mapping Basic Tk into Tkinter
------------------------------
+Navigating the Tcl/Tk Reference Manual
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Class commands in Tk correspond to class constructors in Tkinter. ::
+As noted, the official `Tk commands <https://www.tcl.tk/man/tcl8.6/TkCmd/contents.htm>`_
+reference manual (man pages) is often the most accurate description of what
+specific operations on widgets do. Even when you know the name of the option
+or method that you need, you may still have a few places to look.
 
-   button .fred                =====>  fred = Button()
+While all operations in Tkinter are implemented as method calls on widget
+objects, you've seen that many Tcl/Tk operations appear as commands that
+take a widget pathname as its first parameter, followed by optional
+parameters, e.g.
 
-The master of an object is implicit in the new name given to it at creation
-time.  In Tkinter, masters are specified explicitly. ::
+::
 
-   button .panel.fred          =====>  fred = Button(panel)
+    destroy .
+    grid .frm.btn -column 0 -row 0
 
-The configuration options in Tk are given in lists of hyphened tags followed by
-values.  In Tkinter, options are specified as keyword-arguments in the instance
-constructor, and keyword-args for configure calls or as instance indices, in
-dictionary style, for established instances.  See section
-:ref:`tkinter-setting-options` on setting options. ::
+Others, however, look more like methods called on a widget object (in fact,
+when you create a widget in Tcl/Tk, it creates a Tcl command with the name
+of the widget pathname, with the first parameter to that command being the
+name of a method to call).
 
-   button .fred -fg red        =====>  fred = Button(panel, fg="red")
-   .fred configure -fg red     =====>  fred["fg"] = red
-                               OR ==>  fred.config(fg="red")
+::
 
-In Tk, to perform an action on a widget, use the widget name as a command, and
-follow it with an action name, possibly with arguments (options).  In Tkinter,
-you call methods on the class instance to invoke actions on the widget.  The
-actions (methods) that a given widget can perform are listed in
-:file:`tkinter/__init__.py`. ::
+    .frm.btn invoke
+    .frm.lbl configure -text "Goodbye"
 
-   .fred invoke                =====>  fred.invoke()
 
-To give a widget to the packer (geometry manager), you call pack with optional
-arguments.  In Tkinter, the Pack class holds all this functionality, and the
-various forms of the pack command are implemented as methods.  All widgets in
-:mod:`tkinter` are subclassed from the Packer, and so inherit all the packing
-methods. See the :mod:`tkinter.tix` module documentation for additional
-information on the Form geometry manager. ::
+In the official Tcl/Tk reference documentation, you'll find most operations
+that look like method calls on the man page for a specific widget (e.g.,
+you'll find the :meth:`invoke` method on the
+`ttk::button <https://www.tcl.tk/man/tcl8.6/TkCmd/ttk_button.htm>`_
+man page), while functions that take a widget as a parameter often have
+their own man page (e.g.,
+`grid <https://www.tcl.tk/man/tcl8.6/TkCmd/grid.htm>`_).
 
-   pack .fred -side left       =====>  fred.pack(side="left")
+You'll find many common options and methods in the
+`options <https://www.tcl.tk/man/tcl8.6/TkCmd/options.htm>`_ or
+`ttk::widget <https://www.tcl.tk/man/tcl8.6/TkCmd/ttk_widget.htm>`_ man
+pages, while others are found in the man page for a specific widget class.
+
+You'll also find that many Tkinter methods have compound names, e.g.,
+:func:`winfo_x`, :func:`winfo_height`, :func:`winfo_viewable`. You'd find
+documentation for all of these in the
+`winfo <https://www.tcl.tk/man/tcl8.6/TkCmd/winfo.htm>`_ man page.
+
+.. note::
+   Somewhat confusingly, there are also methods on all Tkinter widgets
+   that don't actually operate on the widget, but operate at a global
+   scope, independent of any widget. Examples are methods for accessing
+   the clipboard or the system bell. (They happen to be implemented as
+   methods in the base :class:`Widget` class that all Tkinter widgets
+   inherit from).
 
 
 Threading model
diff --git a/Doc/tools/susp-ignored.csv b/Doc/tools/susp-ignored.csv
index 1ba0e5bfae65c..c6c665c372849 100644
--- a/Doc/tools/susp-ignored.csv
+++ b/Doc/tools/susp-ignored.csv
@@ -233,6 +233,12 @@ library/tarfile,,:xz,'r:xz'
 library/tarfile,,:xz,'w:xz'
 library/time,,:mm,
 library/time,,:ss,
+library/tkinter,,::,ttk::frame .frm -padding 10
+library/tkinter,,::,"grid [ttk::label .frm.lbl -text ""Hello World!""] -column 0 -row 0"
+library/tkinter,,::,"grid [ttk::button .frm.btn -text ""Quit"" -command ""destroy .""] -column 1 -row 0"
+library/tkinter,,::,ttk::frame
+library/tkinter,,::,ttk::button
+library/tkinter,,::,ttk::widget
 library/tracemalloc,,:limit,"for index, stat in enumerate(top_stats[:limit], 1):"
 library/turtle,,::,Example::
 library/unittest,,:foo,"self.assertEqual(cm.output, ['INFO:foo:first message',"


From webhook-mailer at python.org  Mon Aug 23 19:44:37 2021
From: webhook-mailer at python.org (gpshead)
Date: Mon, 23 Aug 2021 23:44:37 -0000
Subject: [Python-checkins] bpo-44690: Adopt binacii.a2b_base64's strict mode
 in base64.b64decode (GH-27272)
Message-ID: <mailman.1156.1629762278.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/fa6304a5225787054067bb56089632146d288b20
commit: fa6304a5225787054067bb56089632146d288b20
branch: main
author: Idan Moral <idan22moral at gmail.com>
committer: gpshead <greg at krypto.org>
date: 2021-08-23T16:44:28-07:00
summary:

bpo-44690: Adopt binacii.a2b_base64's strict mode in base64.b64decode (GH-27272)

* Use binascii.a2b_base64 to validate b64decode input.
   This change leads to exception messages changes (mostly).
* Added more information to docstring of b64decode
* Added a reference to binascii.a2b_base64 in the docs

files:
A Misc/NEWS.d/next/Library/2021-07-20-22-03-24.bpo-44690.tV7Zjg.rst
M Doc/library/base64.rst
M Lib/base64.py

diff --git a/Doc/library/base64.rst b/Doc/library/base64.rst
index f91547bd58403..29e52ad48e115 100644
--- a/Doc/library/base64.rst
+++ b/Doc/library/base64.rst
@@ -78,6 +78,8 @@ The modern interface provides:
    these non-alphabet characters in the input result in a
    :exc:`binascii.Error`.
 
+   For more information about the strict base64 check, see :func:`binascii.a2b_base64`
+
 
 .. function:: standard_b64encode(s)
 
diff --git a/Lib/base64.py b/Lib/base64.py
index e1256ad9358e7..ffe2ce7332baa 100755
--- a/Lib/base64.py
+++ b/Lib/base64.py
@@ -76,15 +76,16 @@ def b64decode(s, altchars=None, validate=False):
     normal base-64 alphabet nor the alternative alphabet are discarded prior
     to the padding check.  If validate is True, these non-alphabet characters
     in the input result in a binascii.Error.
+    For more information about the strict base64 check, see:
+
+    https://docs.python.org/3.11/library/binascii.html#binascii.a2b_base64
     """
     s = _bytes_from_decode_data(s)
     if altchars is not None:
         altchars = _bytes_from_decode_data(altchars)
         assert len(altchars) == 2, repr(altchars)
         s = s.translate(bytes.maketrans(altchars, b'+/'))
-    if validate and not re.fullmatch(b'[A-Za-z0-9+/]*={0,2}', s):
-        raise binascii.Error('Non-base64 digit found')
-    return binascii.a2b_base64(s)
+    return binascii.a2b_base64(s, strict_mode=validate)
 
 
 def standard_b64encode(s):
diff --git a/Misc/NEWS.d/next/Library/2021-07-20-22-03-24.bpo-44690.tV7Zjg.rst b/Misc/NEWS.d/next/Library/2021-07-20-22-03-24.bpo-44690.tV7Zjg.rst
new file mode 100644
index 0000000000000..1d1184805471d
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-07-20-22-03-24.bpo-44690.tV7Zjg.rst
@@ -0,0 +1 @@
+Adopt *binacii.a2b_base64*'s strict mode in *base64.b64decode*.
\ No newline at end of file


From webhook-mailer at python.org  Tue Aug 24 05:13:40 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Tue, 24 Aug 2021 09:13:40 -0000
Subject: [Python-checkins] bpo-34990: Treat the pyc header's mtime in
 compileall as an unsigned int (GH-19708)
Message-ID: <mailman.1157.1629796420.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/bb21e28fd08f894ceff2405544a2f257d42b1354
commit: bb21e28fd08f894ceff2405544a2f257d42b1354
branch: main
author: Ammar Askar <ammar at ammaraskar.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-24T12:13:32+03:00
summary:

bpo-34990: Treat the pyc header's mtime in compileall as an unsigned int (GH-19708)

Co-authored-by: St?phane Wirtel <stephane at wirtel.be>

files:
A Misc/NEWS.d/next/Library/2020-04-24-20-39-38.bpo-34990.3SmL9M.rst
M Lib/compileall.py
M Lib/test/test_compileall.py
M Lib/test/test_zipimport.py

diff --git a/Lib/compileall.py b/Lib/compileall.py
index 454465bd8fc4e..3e00477616df8 100644
--- a/Lib/compileall.py
+++ b/Lib/compileall.py
@@ -221,8 +221,8 @@ def compile_file(fullname, ddir=None, force=False, rx=None, quiet=0,
             if not force:
                 try:
                     mtime = int(os.stat(fullname).st_mtime)
-                    expect = struct.pack('<4sll', importlib.util.MAGIC_NUMBER,
-                                         0, mtime)
+                    expect = struct.pack('<4sLL', importlib.util.MAGIC_NUMBER,
+                                         0, mtime & 0xFFFF_FFFF)
                     for cfile in opt_cfiles.values():
                         with open(cfile, 'rb') as chandle:
                             actual = chandle.read(12)
diff --git a/Lib/test/test_compileall.py b/Lib/test/test_compileall.py
index 4612953cf8df3..cc51b8c06a063 100644
--- a/Lib/test/test_compileall.py
+++ b/Lib/test/test_compileall.py
@@ -80,9 +80,28 @@ def timestamp_metadata(self):
         with open(self.bc_path, 'rb') as file:
             data = file.read(12)
         mtime = int(os.stat(self.source_path).st_mtime)
-        compare = struct.pack('<4sll', importlib.util.MAGIC_NUMBER, 0, mtime)
+        compare = struct.pack('<4sLL', importlib.util.MAGIC_NUMBER, 0,
+                              mtime & 0xFFFF_FFFF)
         return data, compare
 
+    def test_year_2038_mtime_compilation(self):
+        # Test to make sure we can handle mtimes larger than what a 32-bit
+        # signed number can hold as part of bpo-34990
+        try:
+            os.utime(self.source_path, (2**32 - 1, 2**32 - 1))
+        except (OverflowError, OSError):
+            self.skipTest("filesystem doesn't support timestamps near 2**32")
+        self.assertTrue(compileall.compile_file(self.source_path))
+
+    def test_larger_than_32_bit_times(self):
+        # This is similar to the test above but we skip it if the OS doesn't
+        # support modification times larger than 32-bits.
+        try:
+            os.utime(self.source_path, (2**35, 2**35))
+        except (OverflowError, OSError):
+            self.skipTest("filesystem doesn't support large timestamps")
+        self.assertTrue(compileall.compile_file(self.source_path))
+
     def recreation_check(self, metadata):
         """Check that compileall recreates bytecode when the new metadata is
         used."""
@@ -101,7 +120,7 @@ def recreation_check(self, metadata):
 
     def test_mtime(self):
         # Test a change in mtime leads to a new .pyc.
-        self.recreation_check(struct.pack('<4sll', importlib.util.MAGIC_NUMBER,
+        self.recreation_check(struct.pack('<4sLL', importlib.util.MAGIC_NUMBER,
                                           0, 1))
 
     def test_magic_number(self):
diff --git a/Lib/test/test_zipimport.py b/Lib/test/test_zipimport.py
index 4e88902e3e31d..c57f8615eb4c9 100644
--- a/Lib/test/test_zipimport.py
+++ b/Lib/test/test_zipimport.py
@@ -37,14 +37,9 @@ def get_file():
 
 def make_pyc(co, mtime, size):
     data = marshal.dumps(co)
-    if type(mtime) is type(0.0):
-        # Mac mtimes need a bit of special casing
-        if mtime < 0x7fffffff:
-            mtime = int(mtime)
-        else:
-            mtime = int(-0x100000000 + int(mtime))
     pyc = (importlib.util.MAGIC_NUMBER +
-        struct.pack("<iii", 0, int(mtime), size & 0xFFFFFFFF) + data)
+        struct.pack("<iLL", 0,
+                    int(mtime) & 0xFFFF_FFFF, size & 0xFFFF_FFFF) + data)
     return pyc
 
 def module_path_to_dotted_name(path):
@@ -256,6 +251,14 @@ def testBadMTime(self):
                  TESTMOD + pyc_ext: (NOW, badtime_pyc)}
         self.doTest(".py", files, TESTMOD)
 
+    def test2038MTime(self):
+        # Make sure we can handle mtimes larger than what a 32-bit signed number
+        # can hold.
+        twenty_thirty_eight_pyc = make_pyc(test_co, 2**32 - 1, len(test_src))
+        files = {TESTMOD + ".py": (NOW, test_src),
+                 TESTMOD + pyc_ext: (NOW, twenty_thirty_eight_pyc)}
+        self.doTest(".py", files, TESTMOD)
+
     def testPackage(self):
         packdir = TESTPACK + os.sep
         files = {packdir + "__init__" + pyc_ext: (NOW, test_pyc),
diff --git a/Misc/NEWS.d/next/Library/2020-04-24-20-39-38.bpo-34990.3SmL9M.rst b/Misc/NEWS.d/next/Library/2020-04-24-20-39-38.bpo-34990.3SmL9M.rst
new file mode 100644
index 0000000000000..d420b5dce1e3b
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-04-24-20-39-38.bpo-34990.3SmL9M.rst
@@ -0,0 +1,2 @@
+Fixed a Y2k38 bug in the compileall module where it would fail to compile
+files with a modification time after the year 2038.


From webhook-mailer at python.org  Tue Aug 24 06:44:19 2021
From: webhook-mailer at python.org (tirkarthi)
Date: Tue, 24 Aug 2021 10:44:19 -0000
Subject: [Python-checkins] bpo-43826: Fix resource warning due to unclosed
 objects. (GH-25381)
Message-ID: <mailman.1158.1629801860.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/7179930ab5f5b2dea039023bec968aadc03e3775
commit: 7179930ab5f5b2dea039023bec968aadc03e3775
branch: main
author: Karthikeyan Singaravelan <tir.karthi at gmail.com>
committer: tirkarthi <tir.karthi at gmail.com>
date: 2021-08-24T16:13:46+05:30
summary:

bpo-43826: Fix resource warning due to unclosed objects. (GH-25381)

files:
M Lib/test/test_subprocess.py

diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index f0f0e6f6069da..94a95c7a00bf2 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -719,6 +719,8 @@ def test_pipesizes(self):
             # However, this function is not yet in _winapi.
             p.stdin.write(b"pear")
             p.stdin.close()
+            p.stdout.close()
+            p.stderr.close()
         finally:
             p.kill()
             p.wait()
@@ -746,6 +748,8 @@ def test_pipesize_default(self):
             # On other platforms we cannot test the pipe size (yet). But above
             # code using pipesize=-1 should not crash.
             p.stdin.close()
+            p.stdout.close()
+            p.stderr.close()
         finally:
             p.kill()
             p.wait()
@@ -3243,6 +3247,7 @@ def test_send_signal_race2(self):
         with mock.patch.object(p, 'poll', new=lambda: None):
             p.returncode = None
             p.send_signal(signal.SIGTERM)
+        p.kill()
 
     def test_communicate_repeated_call_after_stdout_close(self):
         proc = subprocess.Popen([sys.executable, '-c',


From webhook-mailer at python.org  Tue Aug 24 08:24:17 2021
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 24 Aug 2021 12:24:17 -0000
Subject: [Python-checkins] bpo-42064: Pass module state to `sqlite3` UDF
 callbacks (GH-27456)
Message-ID: <mailman.1159.1629807858.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/9ed523159c7ba840dbf403e02498eeae1b5d3ed9
commit: 9ed523159c7ba840dbf403e02498eeae1b5d3ed9
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-24T05:24:09-07:00
summary:

bpo-42064: Pass module state to `sqlite3` UDF callbacks (GH-27456)



- Establish common callback context struct
- Convert UDF callbacks to fetch module state from callback context

files:
M Modules/_sqlite/connection.c
M Modules/_sqlite/connection.h

diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index 0645367988e63..8ad5f5f061da5 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -612,8 +612,10 @@ set_sqlite_error(sqlite3_context *context, const char *msg)
     else {
         sqlite3_result_error(context, msg, -1);
     }
-    pysqlite_state *state = pysqlite_get_state(NULL);
-    if (state->enable_callback_tracebacks) {
+    callback_context *ctx = (callback_context *)sqlite3_user_data(context);
+    assert(ctx != NULL);
+    assert(ctx->state != NULL);
+    if (ctx->state->enable_callback_tracebacks) {
         PyErr_Print();
     }
     else {
@@ -625,7 +627,6 @@ static void
 _pysqlite_func_callback(sqlite3_context *context, int argc, sqlite3_value **argv)
 {
     PyObject* args;
-    PyObject* py_func;
     PyObject* py_retval = NULL;
     int ok;
 
@@ -633,11 +634,11 @@ _pysqlite_func_callback(sqlite3_context *context, int argc, sqlite3_value **argv
 
     threadstate = PyGILState_Ensure();
 
-    py_func = (PyObject*)sqlite3_user_data(context);
-
     args = _pysqlite_build_py_params(context, argc, argv);
     if (args) {
-        py_retval = PyObject_CallObject(py_func, args);
+        callback_context *ctx = (callback_context *)sqlite3_user_data(context);
+        assert(ctx != NULL);
+        py_retval = PyObject_CallObject(ctx->callable, args);
         Py_DECREF(args);
     }
 
@@ -657,7 +658,6 @@ static void _pysqlite_step_callback(sqlite3_context *context, int argc, sqlite3_
 {
     PyObject* args;
     PyObject* function_result = NULL;
-    PyObject* aggregate_class;
     PyObject** aggregate_instance;
     PyObject* stepmethod = NULL;
 
@@ -665,12 +665,12 @@ static void _pysqlite_step_callback(sqlite3_context *context, int argc, sqlite3_
 
     threadstate = PyGILState_Ensure();
 
-    aggregate_class = (PyObject*)sqlite3_user_data(context);
-
     aggregate_instance = (PyObject**)sqlite3_aggregate_context(context, sizeof(PyObject*));
 
     if (*aggregate_instance == NULL) {
-        *aggregate_instance = _PyObject_CallNoArg(aggregate_class);
+        callback_context *ctx = (callback_context *)sqlite3_user_data(context);
+        assert(ctx != NULL);
+        *aggregate_instance = _PyObject_CallNoArg(ctx->callable);
         if (!*aggregate_instance) {
             set_sqlite_error(context,
                     "user-defined aggregate's '__init__' method raised error");
@@ -784,14 +784,35 @@ static void _pysqlite_drop_unused_cursor_references(pysqlite_Connection* self)
     Py_SETREF(self->cursors, new_list);
 }
 
-static void _destructor(void* args)
+static callback_context *
+create_callback_context(pysqlite_state *state, PyObject *callable)
 {
-    // This function may be called without the GIL held, so we need to ensure
-    // that we destroy 'args' with the GIL
-    PyGILState_STATE gstate;
-    gstate = PyGILState_Ensure();
-    Py_DECREF((PyObject*)args);
+    PyGILState_STATE gstate = PyGILState_Ensure();
+    callback_context *ctx = PyMem_Malloc(sizeof(callback_context));
+    if (ctx != NULL) {
+        ctx->callable = Py_NewRef(callable);
+        ctx->state = state;
+    }
     PyGILState_Release(gstate);
+    return ctx;
+}
+
+static void
+free_callback_context(callback_context *ctx)
+{
+    if (ctx != NULL) {
+        // This function may be called without the GIL held, so we need to
+        // ensure that we destroy 'ctx' with the GIL held.
+        PyGILState_STATE gstate = PyGILState_Ensure();
+        Py_DECREF(ctx->callable);
+        PyMem_Free(ctx);
+        PyGILState_Release(gstate);
+    }
+}
+
+static void _destructor(void* args)
+{
+    free_callback_context((callback_context *)args);
 }
 
 /*[clinic input]
@@ -833,11 +854,11 @@ pysqlite_connection_create_function_impl(pysqlite_Connection *self,
         flags |= SQLITE_DETERMINISTIC;
 #endif
     }
-    rc = sqlite3_create_function_v2(self->db,
-                                    name,
-                                    narg,
-                                    flags,
-                                    (void*)Py_NewRef(func),
+    callback_context *ctx = create_callback_context(self->state, func);
+    if (ctx == NULL) {
+        return NULL;
+    }
+    rc = sqlite3_create_function_v2(self->db, name, narg, flags, ctx,
                                     _pysqlite_func_callback,
                                     NULL,
                                     NULL,
@@ -873,11 +894,12 @@ pysqlite_connection_create_aggregate_impl(pysqlite_Connection *self,
         return NULL;
     }
 
-    rc = sqlite3_create_function_v2(self->db,
-                                    name,
-                                    n_arg,
-                                    SQLITE_UTF8,
-                                    (void*)Py_NewRef(aggregate_class),
+    callback_context *ctx = create_callback_context(self->state,
+                                                    aggregate_class);
+    if (ctx == NULL) {
+        return NULL;
+    }
+    rc = sqlite3_create_function_v2(self->db, name, n_arg, SQLITE_UTF8, ctx,
                                     0,
                                     &_pysqlite_step_callback,
                                     &_pysqlite_final_callback,
@@ -1439,7 +1461,6 @@ pysqlite_collation_callback(
         int text1_length, const void* text1_data,
         int text2_length, const void* text2_data)
 {
-    PyObject* callback = (PyObject*)context;
     PyObject* string1 = 0;
     PyObject* string2 = 0;
     PyGILState_STATE gilstate;
@@ -1459,8 +1480,10 @@ pysqlite_collation_callback(
         goto finally; /* failed to allocate strings */
     }
 
+    callback_context *ctx = (callback_context *)context;
+    assert(ctx != NULL);
     PyObject *args[] = { string1, string2 };  // Borrowed refs.
-    retval = PyObject_Vectorcall(callback, args, 2, NULL);
+    retval = PyObject_Vectorcall(ctx->callable, args, 2, NULL);
     if (retval == NULL) {
         /* execution failed */
         goto finally;
@@ -1690,6 +1713,7 @@ pysqlite_connection_create_collation_impl(pysqlite_Connection *self,
         return NULL;
     }
 
+    callback_context *ctx = NULL;
     int rc;
     int flags = SQLITE_UTF8;
     if (callable == Py_None) {
@@ -1701,8 +1725,11 @@ pysqlite_connection_create_collation_impl(pysqlite_Connection *self,
             PyErr_SetString(PyExc_TypeError, "parameter must be callable");
             return NULL;
         }
-        rc = sqlite3_create_collation_v2(self->db, name, flags,
-                                         Py_NewRef(callable),
+        ctx = create_callback_context(self->state, callable);
+        if (ctx == NULL) {
+            return NULL;
+        }
+        rc = sqlite3_create_collation_v2(self->db, name, flags, ctx,
                                          &pysqlite_collation_callback,
                                          &_destructor);
     }
@@ -1713,7 +1740,7 @@ pysqlite_connection_create_collation_impl(pysqlite_Connection *self,
          * the context before returning.
          */
         if (callable != Py_None) {
-            Py_DECREF(callable);
+            free_callback_context(ctx);
         }
         _pysqlite_seterror(self->state, self->db);
         return NULL;
diff --git a/Modules/_sqlite/connection.h b/Modules/_sqlite/connection.h
index 4f08a6d5f7b21..11b3a8005e1f9 100644
--- a/Modules/_sqlite/connection.h
+++ b/Modules/_sqlite/connection.h
@@ -32,6 +32,12 @@
 
 #include "sqlite3.h"
 
+typedef struct _callback_context
+{
+    PyObject *callable;
+    pysqlite_state *state;
+} callback_context;
+
 typedef struct
 {
     PyObject_HEAD


From webhook-mailer at python.org  Tue Aug 24 11:07:36 2021
From: webhook-mailer at python.org (ammaraskar)
Date: Tue, 24 Aug 2021 15:07:36 -0000
Subject: [Python-checkins] [3.9] bpo-34990: Treat the pyc header's mtime in
 compileall as an unsigned int (GH-19708)
Message-ID: <mailman.1160.1629817657.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/9d3b6b2472f7c7ef841e652825de652bc8af85d7
commit: 9d3b6b2472f7c7ef841e652825de652bc8af85d7
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ammaraskar <ammar_askar at hotmail.com>
date: 2021-08-24T11:07:31-04:00
summary:

[3.9] bpo-34990: Treat the pyc header's mtime in compileall as an unsigned int (GH-19708)

(cherry picked from commit bb21e28fd08f894ceff2405544a2f257d42b1354)

Co-authored-by: Ammar Askar <ammar at ammaraskar.com>
Co-authored-by: St?phane Wirtel <stephane at wirtel.be>

files:
A Misc/NEWS.d/next/Library/2020-04-24-20-39-38.bpo-34990.3SmL9M.rst
M Lib/compileall.py
M Lib/test/test_compileall.py
M Lib/test/test_zipimport.py

diff --git a/Lib/compileall.py b/Lib/compileall.py
index 33fb76c541544..39f4bb394d881 100644
--- a/Lib/compileall.py
+++ b/Lib/compileall.py
@@ -219,8 +219,8 @@ def compile_file(fullname, ddir=None, force=False, rx=None, quiet=0,
             if not force:
                 try:
                     mtime = int(os.stat(fullname).st_mtime)
-                    expect = struct.pack('<4sll', importlib.util.MAGIC_NUMBER,
-                                         0, mtime)
+                    expect = struct.pack('<4sLL', importlib.util.MAGIC_NUMBER,
+                                         0, mtime & 0xFFFF_FFFF)
                     for cfile in opt_cfiles.values():
                         with open(cfile, 'rb') as chandle:
                             actual = chandle.read(12)
diff --git a/Lib/test/test_compileall.py b/Lib/test/test_compileall.py
index 8df705666c092..a03735d3b7610 100644
--- a/Lib/test/test_compileall.py
+++ b/Lib/test/test_compileall.py
@@ -75,9 +75,28 @@ def timestamp_metadata(self):
         with open(self.bc_path, 'rb') as file:
             data = file.read(12)
         mtime = int(os.stat(self.source_path).st_mtime)
-        compare = struct.pack('<4sll', importlib.util.MAGIC_NUMBER, 0, mtime)
+        compare = struct.pack('<4sLL', importlib.util.MAGIC_NUMBER, 0,
+                              mtime & 0xFFFF_FFFF)
         return data, compare
 
+    def test_year_2038_mtime_compilation(self):
+        # Test to make sure we can handle mtimes larger than what a 32-bit
+        # signed number can hold as part of bpo-34990
+        try:
+            os.utime(self.source_path, (2**32 - 1, 2**32 - 1))
+        except (OverflowError, OSError):
+            self.skipTest("filesystem doesn't support timestamps near 2**32")
+        self.assertTrue(compileall.compile_file(self.source_path))
+
+    def test_larger_than_32_bit_times(self):
+        # This is similar to the test above but we skip it if the OS doesn't
+        # support modification times larger than 32-bits.
+        try:
+            os.utime(self.source_path, (2**35, 2**35))
+        except (OverflowError, OSError):
+            self.skipTest("filesystem doesn't support large timestamps")
+        self.assertTrue(compileall.compile_file(self.source_path))
+
     def recreation_check(self, metadata):
         """Check that compileall recreates bytecode when the new metadata is
         used."""
@@ -96,7 +115,7 @@ def recreation_check(self, metadata):
 
     def test_mtime(self):
         # Test a change in mtime leads to a new .pyc.
-        self.recreation_check(struct.pack('<4sll', importlib.util.MAGIC_NUMBER,
+        self.recreation_check(struct.pack('<4sLL', importlib.util.MAGIC_NUMBER,
                                           0, 1))
 
     def test_magic_number(self):
diff --git a/Lib/test/test_zipimport.py b/Lib/test/test_zipimport.py
index 560286071c690..80c98b4b4661d 100644
--- a/Lib/test/test_zipimport.py
+++ b/Lib/test/test_zipimport.py
@@ -34,14 +34,9 @@ def get_file():
 
 def make_pyc(co, mtime, size):
     data = marshal.dumps(co)
-    if type(mtime) is type(0.0):
-        # Mac mtimes need a bit of special casing
-        if mtime < 0x7fffffff:
-            mtime = int(mtime)
-        else:
-            mtime = int(-0x100000000 + int(mtime))
     pyc = (importlib.util.MAGIC_NUMBER +
-        struct.pack("<iii", 0, int(mtime), size & 0xFFFFFFFF) + data)
+        struct.pack("<iLL", 0,
+                    int(mtime) & 0xFFFF_FFFF, size & 0xFFFF_FFFF) + data)
     return pyc
 
 def module_path_to_dotted_name(path):
@@ -253,6 +248,14 @@ def testBadMTime(self):
                  TESTMOD + pyc_ext: (NOW, badtime_pyc)}
         self.doTest(".py", files, TESTMOD)
 
+    def test2038MTime(self):
+        # Make sure we can handle mtimes larger than what a 32-bit signed number
+        # can hold.
+        twenty_thirty_eight_pyc = make_pyc(test_co, 2**32 - 1, len(test_src))
+        files = {TESTMOD + ".py": (NOW, test_src),
+                 TESTMOD + pyc_ext: (NOW, twenty_thirty_eight_pyc)}
+        self.doTest(".py", files, TESTMOD)
+
     def testPackage(self):
         packdir = TESTPACK + os.sep
         files = {packdir + "__init__" + pyc_ext: (NOW, test_pyc),
diff --git a/Misc/NEWS.d/next/Library/2020-04-24-20-39-38.bpo-34990.3SmL9M.rst b/Misc/NEWS.d/next/Library/2020-04-24-20-39-38.bpo-34990.3SmL9M.rst
new file mode 100644
index 0000000000000..d420b5dce1e3b
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-04-24-20-39-38.bpo-34990.3SmL9M.rst
@@ -0,0 +1,2 @@
+Fixed a Y2k38 bug in the compileall module where it would fail to compile
+files with a modification time after the year 2038.


From webhook-mailer at python.org  Tue Aug 24 11:09:20 2021
From: webhook-mailer at python.org (ammaraskar)
Date: Tue, 24 Aug 2021 15:09:20 -0000
Subject: [Python-checkins] [3.10] bpo-34990: Treat the pyc header's mtime in
 compileall as an unsigned int (GH-19708)
Message-ID: <mailman.1161.1629817761.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/0af681b652c43f0ba90988400ecc1e7934fbfc5d
commit: 0af681b652c43f0ba90988400ecc1e7934fbfc5d
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ammaraskar <ammar_askar at hotmail.com>
date: 2021-08-24T11:09:14-04:00
summary:

[3.10] bpo-34990: Treat the pyc header's mtime in compileall as an unsigned int (GH-19708)

(cherry picked from commit bb21e28fd08f894ceff2405544a2f257d42b1354)

Co-authored-by: Ammar Askar <ammar at ammaraskar.com>
Co-authored-by: St?phane Wirtel <stephane at wirtel.be>

files:
A Misc/NEWS.d/next/Library/2020-04-24-20-39-38.bpo-34990.3SmL9M.rst
M Lib/compileall.py
M Lib/test/test_compileall.py
M Lib/test/test_zipimport.py

diff --git a/Lib/compileall.py b/Lib/compileall.py
index 454465bd8fc4e..3e00477616df8 100644
--- a/Lib/compileall.py
+++ b/Lib/compileall.py
@@ -221,8 +221,8 @@ def compile_file(fullname, ddir=None, force=False, rx=None, quiet=0,
             if not force:
                 try:
                     mtime = int(os.stat(fullname).st_mtime)
-                    expect = struct.pack('<4sll', importlib.util.MAGIC_NUMBER,
-                                         0, mtime)
+                    expect = struct.pack('<4sLL', importlib.util.MAGIC_NUMBER,
+                                         0, mtime & 0xFFFF_FFFF)
                     for cfile in opt_cfiles.values():
                         with open(cfile, 'rb') as chandle:
                             actual = chandle.read(12)
diff --git a/Lib/test/test_compileall.py b/Lib/test/test_compileall.py
index 4612953cf8df3..cc51b8c06a063 100644
--- a/Lib/test/test_compileall.py
+++ b/Lib/test/test_compileall.py
@@ -80,9 +80,28 @@ def timestamp_metadata(self):
         with open(self.bc_path, 'rb') as file:
             data = file.read(12)
         mtime = int(os.stat(self.source_path).st_mtime)
-        compare = struct.pack('<4sll', importlib.util.MAGIC_NUMBER, 0, mtime)
+        compare = struct.pack('<4sLL', importlib.util.MAGIC_NUMBER, 0,
+                              mtime & 0xFFFF_FFFF)
         return data, compare
 
+    def test_year_2038_mtime_compilation(self):
+        # Test to make sure we can handle mtimes larger than what a 32-bit
+        # signed number can hold as part of bpo-34990
+        try:
+            os.utime(self.source_path, (2**32 - 1, 2**32 - 1))
+        except (OverflowError, OSError):
+            self.skipTest("filesystem doesn't support timestamps near 2**32")
+        self.assertTrue(compileall.compile_file(self.source_path))
+
+    def test_larger_than_32_bit_times(self):
+        # This is similar to the test above but we skip it if the OS doesn't
+        # support modification times larger than 32-bits.
+        try:
+            os.utime(self.source_path, (2**35, 2**35))
+        except (OverflowError, OSError):
+            self.skipTest("filesystem doesn't support large timestamps")
+        self.assertTrue(compileall.compile_file(self.source_path))
+
     def recreation_check(self, metadata):
         """Check that compileall recreates bytecode when the new metadata is
         used."""
@@ -101,7 +120,7 @@ def recreation_check(self, metadata):
 
     def test_mtime(self):
         # Test a change in mtime leads to a new .pyc.
-        self.recreation_check(struct.pack('<4sll', importlib.util.MAGIC_NUMBER,
+        self.recreation_check(struct.pack('<4sLL', importlib.util.MAGIC_NUMBER,
                                           0, 1))
 
     def test_magic_number(self):
diff --git a/Lib/test/test_zipimport.py b/Lib/test/test_zipimport.py
index dfc4a060ec6cc..f6f5ca4adce45 100644
--- a/Lib/test/test_zipimport.py
+++ b/Lib/test/test_zipimport.py
@@ -37,14 +37,9 @@ def get_file():
 
 def make_pyc(co, mtime, size):
     data = marshal.dumps(co)
-    if type(mtime) is type(0.0):
-        # Mac mtimes need a bit of special casing
-        if mtime < 0x7fffffff:
-            mtime = int(mtime)
-        else:
-            mtime = int(-0x100000000 + int(mtime))
     pyc = (importlib.util.MAGIC_NUMBER +
-        struct.pack("<iii", 0, int(mtime), size & 0xFFFFFFFF) + data)
+        struct.pack("<iLL", 0,
+                    int(mtime) & 0xFFFF_FFFF, size & 0xFFFF_FFFF) + data)
     return pyc
 
 def module_path_to_dotted_name(path):
@@ -256,6 +251,14 @@ def testBadMTime(self):
                  TESTMOD + pyc_ext: (NOW, badtime_pyc)}
         self.doTest(".py", files, TESTMOD)
 
+    def test2038MTime(self):
+        # Make sure we can handle mtimes larger than what a 32-bit signed number
+        # can hold.
+        twenty_thirty_eight_pyc = make_pyc(test_co, 2**32 - 1, len(test_src))
+        files = {TESTMOD + ".py": (NOW, test_src),
+                 TESTMOD + pyc_ext: (NOW, twenty_thirty_eight_pyc)}
+        self.doTest(".py", files, TESTMOD)
+
     def testPackage(self):
         packdir = TESTPACK + os.sep
         files = {packdir + "__init__" + pyc_ext: (NOW, test_pyc),
diff --git a/Misc/NEWS.d/next/Library/2020-04-24-20-39-38.bpo-34990.3SmL9M.rst b/Misc/NEWS.d/next/Library/2020-04-24-20-39-38.bpo-34990.3SmL9M.rst
new file mode 100644
index 0000000000000..d420b5dce1e3b
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-04-24-20-39-38.bpo-34990.3SmL9M.rst
@@ -0,0 +1,2 @@
+Fixed a Y2k38 bug in the compileall module where it would fail to compile
+files with a modification time after the year 2038.


From webhook-mailer at python.org  Tue Aug 24 12:50:10 2021
From: webhook-mailer at python.org (pablogsal)
Date: Tue, 24 Aug 2021 16:50:10 -0000
Subject: [Python-checkins] Add tests for the C tokenizer and expose it as a
 private module (GH-27924)
Message-ID: <mailman.1162.1629823811.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/a24676bedcd332dd7e6fa5521d0449206391d190
commit: a24676bedcd332dd7e6fa5521d0449206391d190
branch: main
author: Pablo Galindo Salgado <Pablogsal at gmail.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-08-24T17:50:05+01:00
summary:

Add tests for the C tokenizer and expose it as a private module (GH-27924)

files:
A Python/Python-tokenize.c
A Python/clinic/Python-tokenize.c.h
M Lib/test/test_tokenize.py
M Lib/tokenize.py
M Makefile.pre.in
M Modules/config.c.in
M PC/config.c
M PCbuild/pythoncore.vcxproj
M Python/stdlib_module_names.h

diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
index 4bce1ca9c76f7c..f8b16e52976451 100644
--- a/Lib/test/test_tokenize.py
+++ b/Lib/test/test_tokenize.py
@@ -3,7 +3,7 @@
 from tokenize import (tokenize, _tokenize, untokenize, NUMBER, NAME, OP,
                      STRING, ENDMARKER, ENCODING, tok_name, detect_encoding,
                      open as tokenize_open, Untokenizer, generate_tokens,
-                     NEWLINE)
+                     NEWLINE, _generate_tokens_from_c_tokenizer)
 from io import BytesIO, StringIO
 import unittest
 from unittest import TestCase, mock
@@ -12,7 +12,6 @@
 import os
 import token
 
-
 # Converts a source string into a list of textual representation
 # of the tokens such as:
 # `    NAME       'if'          (1, 0) (1, 2)`
@@ -1654,5 +1653,865 @@ def test_indentation_semantics_retained(self):
         self.check_roundtrip(code)
 
 
+class CTokenizeTest(TestCase):
+    def check_tokenize(self, s, expected):
+        # Format the tokens in s in a table format.
+        # The ENDMARKER and final NEWLINE are omitted.
+        with self.subTest(source=s):
+            result = stringify_tokens_from_source(
+                _generate_tokens_from_c_tokenizer(s), s
+            )
+            self.assertEqual(result, expected.rstrip().splitlines())
+
+    def test_int(self):
+
+        self.check_tokenize('0xff <= 255', """\
+    NUMBER     '0xff'        (1, 0) (1, 4)
+    LESSEQUAL  '<='          (1, 5) (1, 7)
+    NUMBER     '255'         (1, 8) (1, 11)
+    """)
+
+        self.check_tokenize('0b10 <= 255', """\
+    NUMBER     '0b10'        (1, 0) (1, 4)
+    LESSEQUAL  '<='          (1, 5) (1, 7)
+    NUMBER     '255'         (1, 8) (1, 11)
+    """)
+
+        self.check_tokenize('0o123 <= 0O123', """\
+    NUMBER     '0o123'       (1, 0) (1, 5)
+    LESSEQUAL  '<='          (1, 6) (1, 8)
+    NUMBER     '0O123'       (1, 9) (1, 14)
+    """)
+
+        self.check_tokenize('1234567 > ~0x15', """\
+    NUMBER     '1234567'     (1, 0) (1, 7)
+    GREATER    '>'           (1, 8) (1, 9)
+    TILDE      '~'           (1, 10) (1, 11)
+    NUMBER     '0x15'        (1, 11) (1, 15)
+    """)
+
+        self.check_tokenize('2134568 != 1231515', """\
+    NUMBER     '2134568'     (1, 0) (1, 7)
+    NOTEQUAL   '!='          (1, 8) (1, 10)
+    NUMBER     '1231515'     (1, 11) (1, 18)
+    """)
+
+        self.check_tokenize('(-124561-1) & 200000000', """\
+    LPAR       '('           (1, 0) (1, 1)
+    MINUS      '-'           (1, 1) (1, 2)
+    NUMBER     '124561'      (1, 2) (1, 8)
+    MINUS      '-'           (1, 8) (1, 9)
+    NUMBER     '1'           (1, 9) (1, 10)
+    RPAR       ')'           (1, 10) (1, 11)
+    AMPER      '&'           (1, 12) (1, 13)
+    NUMBER     '200000000'   (1, 14) (1, 23)
+    """)
+
+        self.check_tokenize('0xdeadbeef != -1', """\
+    NUMBER     '0xdeadbeef'  (1, 0) (1, 10)
+    NOTEQUAL   '!='          (1, 11) (1, 13)
+    MINUS      '-'           (1, 14) (1, 15)
+    NUMBER     '1'           (1, 15) (1, 16)
+    """)
+
+        self.check_tokenize('0xdeadc0de & 12345', """\
+    NUMBER     '0xdeadc0de'  (1, 0) (1, 10)
+    AMPER      '&'           (1, 11) (1, 12)
+    NUMBER     '12345'       (1, 13) (1, 18)
+    """)
+
+        self.check_tokenize('0xFF & 0x15 | 1234', """\
+    NUMBER     '0xFF'        (1, 0) (1, 4)
+    AMPER      '&'           (1, 5) (1, 6)
+    NUMBER     '0x15'        (1, 7) (1, 11)
+    VBAR       '|'           (1, 12) (1, 13)
+    NUMBER     '1234'        (1, 14) (1, 18)
+    """)
+
+    def test_float(self):
+
+        self.check_tokenize('x = 3.14159', """\
+    NAME       'x'           (1, 0) (1, 1)
+    EQUAL      '='           (1, 2) (1, 3)
+    NUMBER     '3.14159'     (1, 4) (1, 11)
+    """)
+
+        self.check_tokenize('x = 314159.', """\
+    NAME       'x'           (1, 0) (1, 1)
+    EQUAL      '='           (1, 2) (1, 3)
+    NUMBER     '314159.'     (1, 4) (1, 11)
+    """)
+
+        self.check_tokenize('x = .314159', """\
+    NAME       'x'           (1, 0) (1, 1)
+    EQUAL      '='           (1, 2) (1, 3)
+    NUMBER     '.314159'     (1, 4) (1, 11)
+    """)
+
+        self.check_tokenize('x = 3e14159', """\
+    NAME       'x'           (1, 0) (1, 1)
+    EQUAL      '='           (1, 2) (1, 3)
+    NUMBER     '3e14159'     (1, 4) (1, 11)
+    """)
+
+        self.check_tokenize('x = 3E123', """\
+    NAME       'x'           (1, 0) (1, 1)
+    EQUAL      '='           (1, 2) (1, 3)
+    NUMBER     '3E123'       (1, 4) (1, 9)
+    """)
+
+        self.check_tokenize('x+y = 3e-1230', """\
+    NAME       'x'           (1, 0) (1, 1)
+    PLUS       '+'           (1, 1) (1, 2)
+    NAME       'y'           (1, 2) (1, 3)
+    EQUAL      '='           (1, 4) (1, 5)
+    NUMBER     '3e-1230'     (1, 6) (1, 13)
+    """)
+
+        self.check_tokenize('x = 3.14e159', """\
+    NAME       'x'           (1, 0) (1, 1)
+    EQUAL      '='           (1, 2) (1, 3)
+    NUMBER     '3.14e159'    (1, 4) (1, 12)
+    """)
+
+    def test_string(self):
+
+        self.check_tokenize('x = \'\'; y = ""', """\
+    NAME       'x'           (1, 0) (1, 1)
+    EQUAL      '='           (1, 2) (1, 3)
+    STRING     "''"          (1, 4) (1, 6)
+    SEMI       ';'           (1, 6) (1, 7)
+    NAME       'y'           (1, 8) (1, 9)
+    EQUAL      '='           (1, 10) (1, 11)
+    STRING     '""'          (1, 12) (1, 14)
+    """)
+
+        self.check_tokenize('x = \'"\'; y = "\'"', """\
+    NAME       'x'           (1, 0) (1, 1)
+    EQUAL      '='           (1, 2) (1, 3)
+    STRING     '\\'"\\''       (1, 4) (1, 7)
+    SEMI       ';'           (1, 7) (1, 8)
+    NAME       'y'           (1, 9) (1, 10)
+    EQUAL      '='           (1, 11) (1, 12)
+    STRING     '"\\'"'        (1, 13) (1, 16)
+    """)
+
+        self.check_tokenize('x = "doesn\'t "shrink", does it"', """\
+    NAME       'x'           (1, 0) (1, 1)
+    EQUAL      '='           (1, 2) (1, 3)
+    STRING     '"doesn\\'t "' (1, 4) (1, 14)
+    NAME       'shrink'      (1, 14) (1, 20)
+    STRING     '", does it"' (1, 20) (1, 31)
+    """)
+
+        self.check_tokenize("x = 'abc' + 'ABC'", """\
+    NAME       'x'           (1, 0) (1, 1)
+    EQUAL      '='           (1, 2) (1, 3)
+    STRING     "'abc'"       (1, 4) (1, 9)
+    PLUS       '+'           (1, 10) (1, 11)
+    STRING     "'ABC'"       (1, 12) (1, 17)
+    """)
+
+        self.check_tokenize('y = "ABC" + "ABC"', """\
+    NAME       'y'           (1, 0) (1, 1)
+    EQUAL      '='           (1, 2) (1, 3)
+    STRING     '"ABC"'       (1, 4) (1, 9)
+    PLUS       '+'           (1, 10) (1, 11)
+    STRING     '"ABC"'       (1, 12) (1, 17)
+    """)
+
+        self.check_tokenize("x = r'abc' + r'ABC' + R'ABC' + R'ABC'", """\
+    NAME       'x'           (1, 0) (1, 1)
+    EQUAL      '='           (1, 2) (1, 3)
+    STRING     "r'abc'"      (1, 4) (1, 10)
+    PLUS       '+'           (1, 11) (1, 12)
+    STRING     "r'ABC'"      (1, 13) (1, 19)
+    PLUS       '+'           (1, 20) (1, 21)
+    STRING     "R'ABC'"      (1, 22) (1, 28)
+    PLUS       '+'           (1, 29) (1, 30)
+    STRING     "R'ABC'"      (1, 31) (1, 37)
+    """)
+
+        self.check_tokenize('y = r"abc" + r"ABC" + R"ABC" + R"ABC"', """\
+    NAME       'y'           (1, 0) (1, 1)
+    EQUAL      '='           (1, 2) (1, 3)
+    STRING     'r"abc"'      (1, 4) (1, 10)
+    PLUS       '+'           (1, 11) (1, 12)
+    STRING     'r"ABC"'      (1, 13) (1, 19)
+    PLUS       '+'           (1, 20) (1, 21)
+    STRING     'R"ABC"'      (1, 22) (1, 28)
+    PLUS       '+'           (1, 29) (1, 30)
+    STRING     'R"ABC"'      (1, 31) (1, 37)
+    """)
+
+        self.check_tokenize("u'abc' + U'abc'", """\
+    STRING     "u'abc'"      (1, 0) (1, 6)
+    PLUS       '+'           (1, 7) (1, 8)
+    STRING     "U'abc'"      (1, 9) (1, 15)
+    """)
+
+        self.check_tokenize('u"abc" + U"abc"', """\
+    STRING     'u"abc"'      (1, 0) (1, 6)
+    PLUS       '+'           (1, 7) (1, 8)
+    STRING     'U"abc"'      (1, 9) (1, 15)
+    """)
+
+        self.check_tokenize("b'abc' + B'abc'", """\
+    STRING     "b'abc'"      (1, 0) (1, 6)
+    PLUS       '+'           (1, 7) (1, 8)
+    STRING     "B'abc'"      (1, 9) (1, 15)
+    """)
+
+        self.check_tokenize('b"abc" + B"abc"', """\
+    STRING     'b"abc"'      (1, 0) (1, 6)
+    PLUS       '+'           (1, 7) (1, 8)
+    STRING     'B"abc"'      (1, 9) (1, 15)
+    """)
+
+        self.check_tokenize("br'abc' + bR'abc' + Br'abc' + BR'abc'", """\
+    STRING     "br'abc'"     (1, 0) (1, 7)
+    PLUS       '+'           (1, 8) (1, 9)
+    STRING     "bR'abc'"     (1, 10) (1, 17)
+    PLUS       '+'           (1, 18) (1, 19)
+    STRING     "Br'abc'"     (1, 20) (1, 27)
+    PLUS       '+'           (1, 28) (1, 29)
+    STRING     "BR'abc'"     (1, 30) (1, 37)
+    """)
+
+        self.check_tokenize('br"abc" + bR"abc" + Br"abc" + BR"abc"', """\
+    STRING     'br"abc"'     (1, 0) (1, 7)
+    PLUS       '+'           (1, 8) (1, 9)
+    STRING     'bR"abc"'     (1, 10) (1, 17)
+    PLUS       '+'           (1, 18) (1, 19)
+    STRING     'Br"abc"'     (1, 20) (1, 27)
+    PLUS       '+'           (1, 28) (1, 29)
+    STRING     'BR"abc"'     (1, 30) (1, 37)
+    """)
+
+        self.check_tokenize("rb'abc' + rB'abc' + Rb'abc' + RB'abc'", """\
+    STRING     "rb'abc'"     (1, 0) (1, 7)
+    PLUS       '+'           (1, 8) (1, 9)
+    STRING     "rB'abc'"     (1, 10) (1, 17)
+    PLUS       '+'           (1, 18) (1, 19)
+    STRING     "Rb'abc'"     (1, 20) (1, 27)
+    PLUS       '+'           (1, 28) (1, 29)
+    STRING     "RB'abc'"     (1, 30) (1, 37)
+    """)
+
+        self.check_tokenize('rb"abc" + rB"abc" + Rb"abc" + RB"abc"', """\
+    STRING     'rb"abc"'     (1, 0) (1, 7)
+    PLUS       '+'           (1, 8) (1, 9)
+    STRING     'rB"abc"'     (1, 10) (1, 17)
+    PLUS       '+'           (1, 18) (1, 19)
+    STRING     'Rb"abc"'     (1, 20) (1, 27)
+    PLUS       '+'           (1, 28) (1, 29)
+    STRING     'RB"abc"'     (1, 30) (1, 37)
+    """)
+
+        self.check_tokenize('"a\\\nde\\\nfg"', """\
+    STRING     '"a\\\\\\nde\\\\\\nfg"\' (1, 0) (3, 3)
+    """)
+
+        self.check_tokenize('u"a\\\nde"', """\
+    STRING     'u"a\\\\\\nde"\'  (1, 0) (2, 3)
+    """)
+
+        self.check_tokenize('rb"a\\\nd"', """\
+    STRING     'rb"a\\\\\\nd"\'  (1, 0) (2, 2)
+    """)
+
+        self.check_tokenize(r'"""a\
+b"""', """\
+    STRING     '\"\""a\\\\\\nb\"\""' (1, 0) (2, 4)
+    """)
+        self.check_tokenize(r'u"""a\
+b"""', """\
+    STRING     'u\"\""a\\\\\\nb\"\""' (1, 0) (2, 4)
+    """)
+        self.check_tokenize(r'rb"""a\
+b\
+c"""', """\
+    STRING     'rb"\""a\\\\\\nb\\\\\\nc"\""' (1, 0) (3, 4)
+    """)
+ 
+        self.check_tokenize('f"abc"', """\
+    STRING     'f"abc"'      (1, 0) (1, 6)
+    """)
+
+        self.check_tokenize('fR"a{b}c"', """\
+    STRING     'fR"a{b}c"'   (1, 0) (1, 9)
+    """)
+
+        self.check_tokenize('f"""abc"""', """\
+    STRING     'f\"\"\"abc\"\"\"'  (1, 0) (1, 10)
+    """)
+
+        self.check_tokenize(r'f"abc\
+def"', """\
+    STRING     'f"abc\\\\\\ndef"' (1, 0) (2, 4)
+    """)
+
+        self.check_tokenize(r'Rf"abc\
+def"', """\
+    STRING     'Rf"abc\\\\\\ndef"' (1, 0) (2, 4)
+    """)
+
+    def test_function(self):
+
+        self.check_tokenize('def d22(a, b, c=2, d=2, *k): pass', """\
+    NAME       'def'         (1, 0) (1, 3)
+    NAME       'd22'         (1, 4) (1, 7)
+    LPAR       '('           (1, 7) (1, 8)
+    NAME       'a'           (1, 8) (1, 9)
+    COMMA      ','           (1, 9) (1, 10)
+    NAME       'b'           (1, 11) (1, 12)
+    COMMA      ','           (1, 12) (1, 13)
+    NAME       'c'           (1, 14) (1, 15)
+    EQUAL      '='           (1, 15) (1, 16)
+    NUMBER     '2'           (1, 16) (1, 17)
+    COMMA      ','           (1, 17) (1, 18)
+    NAME       'd'           (1, 19) (1, 20)
+    EQUAL      '='           (1, 20) (1, 21)
+    NUMBER     '2'           (1, 21) (1, 22)
+    COMMA      ','           (1, 22) (1, 23)
+    STAR       '*'           (1, 24) (1, 25)
+    NAME       'k'           (1, 25) (1, 26)
+    RPAR       ')'           (1, 26) (1, 27)
+    COLON      ':'           (1, 27) (1, 28)
+    NAME       'pass'        (1, 29) (1, 33)
+    """)
+
+        self.check_tokenize('def d01v_(a=1, *k, **w): pass', """\
+    NAME       'def'         (1, 0) (1, 3)
+    NAME       'd01v_'       (1, 4) (1, 9)
+    LPAR       '('           (1, 9) (1, 10)
+    NAME       'a'           (1, 10) (1, 11)
+    EQUAL      '='           (1, 11) (1, 12)
+    NUMBER     '1'           (1, 12) (1, 13)
+    COMMA      ','           (1, 13) (1, 14)
+    STAR       '*'           (1, 15) (1, 16)
+    NAME       'k'           (1, 16) (1, 17)
+    COMMA      ','           (1, 17) (1, 18)
+    DOUBLESTAR '**'          (1, 19) (1, 21)
+    NAME       'w'           (1, 21) (1, 22)
+    RPAR       ')'           (1, 22) (1, 23)
+    COLON      ':'           (1, 23) (1, 24)
+    NAME       'pass'        (1, 25) (1, 29)
+    """)
+
+        self.check_tokenize('def d23(a: str, b: int=3) -> int: pass', """\
+    NAME       'def'         (1, 0) (1, 3)
+    NAME       'd23'         (1, 4) (1, 7)
+    LPAR       '('           (1, 7) (1, 8)
+    NAME       'a'           (1, 8) (1, 9)
+    COLON      ':'           (1, 9) (1, 10)
+    NAME       'str'         (1, 11) (1, 14)
+    COMMA      ','           (1, 14) (1, 15)
+    NAME       'b'           (1, 16) (1, 17)
+    COLON      ':'           (1, 17) (1, 18)
+    NAME       'int'         (1, 19) (1, 22)
+    EQUAL      '='           (1, 22) (1, 23)
+    NUMBER     '3'           (1, 23) (1, 24)
+    RPAR       ')'           (1, 24) (1, 25)
+    RARROW     '->'          (1, 26) (1, 28)
+    NAME       'int'         (1, 29) (1, 32)
+    COLON      ':'           (1, 32) (1, 33)
+    NAME       'pass'        (1, 34) (1, 38)
+    """)
+
+    def test_comparison(self):
+
+        self.check_tokenize("if 1 < 1 > 1 == 1 >= 5 <= 0x15 <= 0x12 != "
+                            "1 and 5 in 1 not in 1 is 1 or 5 is not 1: pass", """\
+    NAME       'if'          (1, 0) (1, 2)
+    NUMBER     '1'           (1, 3) (1, 4)
+    LESS       '<'           (1, 5) (1, 6)
+    NUMBER     '1'           (1, 7) (1, 8)
+    GREATER    '>'           (1, 9) (1, 10)
+    NUMBER     '1'           (1, 11) (1, 12)
+    EQEQUAL    '=='          (1, 13) (1, 15)
+    NUMBER     '1'           (1, 16) (1, 17)
+    GREATEREQUAL '>='          (1, 18) (1, 20)
+    NUMBER     '5'           (1, 21) (1, 22)
+    LESSEQUAL  '<='          (1, 23) (1, 25)
+    NUMBER     '0x15'        (1, 26) (1, 30)
+    LESSEQUAL  '<='          (1, 31) (1, 33)
+    NUMBER     '0x12'        (1, 34) (1, 38)
+    NOTEQUAL   '!='          (1, 39) (1, 41)
+    NUMBER     '1'           (1, 42) (1, 43)
+    NAME       'and'         (1, 44) (1, 47)
+    NUMBER     '5'           (1, 48) (1, 49)
+    NAME       'in'          (1, 50) (1, 52)
+    NUMBER     '1'           (1, 53) (1, 54)
+    NAME       'not'         (1, 55) (1, 58)
+    NAME       'in'          (1, 59) (1, 61)
+    NUMBER     '1'           (1, 62) (1, 63)
+    NAME       'is'          (1, 64) (1, 66)
+    NUMBER     '1'           (1, 67) (1, 68)
+    NAME       'or'          (1, 69) (1, 71)
+    NUMBER     '5'           (1, 72) (1, 73)
+    NAME       'is'          (1, 74) (1, 76)
+    NAME       'not'         (1, 77) (1, 80)
+    NUMBER     '1'           (1, 81) (1, 82)
+    COLON      ':'           (1, 82) (1, 83)
+    NAME       'pass'        (1, 84) (1, 88)
+    """)
+
+    def test_additive(self):
+
+        self.check_tokenize('x = 1 - y + 15 - 1 + 0x124 + z + a[5]', """\
+    NAME       'x'           (1, 0) (1, 1)
+    EQUAL      '='           (1, 2) (1, 3)
+    NUMBER     '1'           (1, 4) (1, 5)
+    MINUS      '-'           (1, 6) (1, 7)
+    NAME       'y'           (1, 8) (1, 9)
+    PLUS       '+'           (1, 10) (1, 11)
+    NUMBER     '15'          (1, 12) (1, 14)
+    MINUS      '-'           (1, 15) (1, 16)
+    NUMBER     '1'           (1, 17) (1, 18)
+    PLUS       '+'           (1, 19) (1, 20)
+    NUMBER     '0x124'       (1, 21) (1, 26)
+    PLUS       '+'           (1, 27) (1, 28)
+    NAME       'z'           (1, 29) (1, 30)
+    PLUS       '+'           (1, 31) (1, 32)
+    NAME       'a'           (1, 33) (1, 34)
+    LSQB       '['           (1, 34) (1, 35)
+    NUMBER     '5'           (1, 35) (1, 36)
+    RSQB       ']'           (1, 36) (1, 37)
+    """)
+
+    def test_multiplicative(self):
+
+        self.check_tokenize('x = 1//1*1/5*12%0x12 at 42', """\
+    NAME       'x'           (1, 0) (1, 1)
+    EQUAL      '='           (1, 2) (1, 3)
+    NUMBER     '1'           (1, 4) (1, 5)
+    DOUBLESLASH '//'          (1, 5) (1, 7)
+    NUMBER     '1'           (1, 7) (1, 8)
+    STAR       '*'           (1, 8) (1, 9)
+    NUMBER     '1'           (1, 9) (1, 10)
+    SLASH      '/'           (1, 10) (1, 11)
+    NUMBER     '5'           (1, 11) (1, 12)
+    STAR       '*'           (1, 12) (1, 13)
+    NUMBER     '12'          (1, 13) (1, 15)
+    PERCENT    '%'           (1, 15) (1, 16)
+    NUMBER     '0x12'        (1, 16) (1, 20)
+    AT         '@'           (1, 20) (1, 21)
+    NUMBER     '42'          (1, 21) (1, 23)
+    """)
+
+    def test_unary(self):
+
+        self.check_tokenize('~1 ^ 1 & 1 |1 ^ -1', """\
+    TILDE      '~'           (1, 0) (1, 1)
+    NUMBER     '1'           (1, 1) (1, 2)
+    CIRCUMFLEX '^'           (1, 3) (1, 4)
+    NUMBER     '1'           (1, 5) (1, 6)
+    AMPER      '&'           (1, 7) (1, 8)
+    NUMBER     '1'           (1, 9) (1, 10)
+    VBAR       '|'           (1, 11) (1, 12)
+    NUMBER     '1'           (1, 12) (1, 13)
+    CIRCUMFLEX '^'           (1, 14) (1, 15)
+    MINUS      '-'           (1, 16) (1, 17)
+    NUMBER     '1'           (1, 17) (1, 18)
+    """)
+
+        self.check_tokenize('-1*1/1+1*1//1 - ---1**1', """\
+    MINUS      '-'           (1, 0) (1, 1)
+    NUMBER     '1'           (1, 1) (1, 2)
+    STAR       '*'           (1, 2) (1, 3)
+    NUMBER     '1'           (1, 3) (1, 4)
+    SLASH      '/'           (1, 4) (1, 5)
+    NUMBER     '1'           (1, 5) (1, 6)
+    PLUS       '+'           (1, 6) (1, 7)
+    NUMBER     '1'           (1, 7) (1, 8)
+    STAR       '*'           (1, 8) (1, 9)
+    NUMBER     '1'           (1, 9) (1, 10)
+    DOUBLESLASH '//'          (1, 10) (1, 12)
+    NUMBER     '1'           (1, 12) (1, 13)
+    MINUS      '-'           (1, 14) (1, 15)
+    MINUS      '-'           (1, 16) (1, 17)
+    MINUS      '-'           (1, 17) (1, 18)
+    MINUS      '-'           (1, 18) (1, 19)
+    NUMBER     '1'           (1, 19) (1, 20)
+    DOUBLESTAR '**'          (1, 20) (1, 22)
+    NUMBER     '1'           (1, 22) (1, 23)
+    """)
+
+    def test_selector(self):
+
+        self.check_tokenize("import sys, time\nx = sys.modules['time'].time()", """\
+    NAME       'import'      (1, 0) (1, 6)
+    NAME       'sys'         (1, 7) (1, 10)
+    COMMA      ','           (1, 10) (1, 11)
+    NAME       'time'        (1, 12) (1, 16)
+    NEWLINE    ''            (1, 16) (1, 16)
+    NAME       'x'           (2, 0) (2, 1)
+    EQUAL      '='           (2, 2) (2, 3)
+    NAME       'sys'         (2, 4) (2, 7)
+    DOT        '.'           (2, 7) (2, 8)
+    NAME       'modules'     (2, 8) (2, 15)
+    LSQB       '['           (2, 15) (2, 16)
+    STRING     "'time'"      (2, 16) (2, 22)
+    RSQB       ']'           (2, 22) (2, 23)
+    DOT        '.'           (2, 23) (2, 24)
+    NAME       'time'        (2, 24) (2, 28)
+    LPAR       '('           (2, 28) (2, 29)
+    RPAR       ')'           (2, 29) (2, 30)
+    """)
+
+    def test_method(self):
+
+        self.check_tokenize('@staticmethod\ndef foo(x,y): pass', """\
+    AT         '@'           (1, 0) (1, 1)
+    NAME       'staticmethod' (1, 1) (1, 13)
+    NEWLINE    ''            (1, 13) (1, 13)
+    NAME       'def'         (2, 0) (2, 3)
+    NAME       'foo'         (2, 4) (2, 7)
+    LPAR       '('           (2, 7) (2, 8)
+    NAME       'x'           (2, 8) (2, 9)
+    COMMA      ','           (2, 9) (2, 10)
+    NAME       'y'           (2, 10) (2, 11)
+    RPAR       ')'           (2, 11) (2, 12)
+    COLON      ':'           (2, 12) (2, 13)
+    NAME       'pass'        (2, 14) (2, 18)
+    """)
+
+    def test_tabs(self):
+
+        self.check_tokenize('@staticmethod\ndef foo(x,y): pass', """\
+    AT         '@'           (1, 0) (1, 1)
+    NAME       'staticmethod' (1, 1) (1, 13)
+    NEWLINE    ''            (1, 13) (1, 13)
+    NAME       'def'         (2, 0) (2, 3)
+    NAME       'foo'         (2, 4) (2, 7)
+    LPAR       '('           (2, 7) (2, 8)
+    NAME       'x'           (2, 8) (2, 9)
+    COMMA      ','           (2, 9) (2, 10)
+    NAME       'y'           (2, 10) (2, 11)
+    RPAR       ')'           (2, 11) (2, 12)
+    COLON      ':'           (2, 12) (2, 13)
+    NAME       'pass'        (2, 14) (2, 18)
+    """)
+
+    def test_async(self):
+
+        self.check_tokenize('async = 1', """\
+    ASYNC      'async'       (1, 0) (1, 5)
+    EQUAL      '='           (1, 6) (1, 7)
+    NUMBER     '1'           (1, 8) (1, 9)
+    """)
+
+        self.check_tokenize('a = (async = 1)', """\
+    NAME       'a'           (1, 0) (1, 1)
+    EQUAL      '='           (1, 2) (1, 3)
+    LPAR       '('           (1, 4) (1, 5)
+    ASYNC      'async'       (1, 5) (1, 10)
+    EQUAL      '='           (1, 11) (1, 12)
+    NUMBER     '1'           (1, 13) (1, 14)
+    RPAR       ')'           (1, 14) (1, 15)
+    """)
+
+        self.check_tokenize('async()', """\
+    ASYNC      'async'       (1, 0) (1, 5)
+    LPAR       '('           (1, 5) (1, 6)
+    RPAR       ')'           (1, 6) (1, 7)
+    """)
+
+        self.check_tokenize('class async(Bar):pass', """\
+    NAME       'class'       (1, 0) (1, 5)
+    ASYNC      'async'       (1, 6) (1, 11)
+    LPAR       '('           (1, 11) (1, 12)
+    NAME       'Bar'         (1, 12) (1, 15)
+    RPAR       ')'           (1, 15) (1, 16)
+    COLON      ':'           (1, 16) (1, 17)
+    NAME       'pass'        (1, 17) (1, 21)
+    """)
+
+        self.check_tokenize('class async:pass', """\
+    NAME       'class'       (1, 0) (1, 5)
+    ASYNC      'async'       (1, 6) (1, 11)
+    COLON      ':'           (1, 11) (1, 12)
+    NAME       'pass'        (1, 12) (1, 16)
+    """)
+
+        self.check_tokenize('await = 1', """\
+    AWAIT      'await'       (1, 0) (1, 5)
+    EQUAL      '='           (1, 6) (1, 7)
+    NUMBER     '1'           (1, 8) (1, 9)
+    """)
+
+        self.check_tokenize('foo.async', """\
+    NAME       'foo'         (1, 0) (1, 3)
+    DOT        '.'           (1, 3) (1, 4)
+    ASYNC      'async'       (1, 4) (1, 9)
+    """)
+
+        self.check_tokenize('async for a in b: pass', """\
+    ASYNC      'async'       (1, 0) (1, 5)
+    NAME       'for'         (1, 6) (1, 9)
+    NAME       'a'           (1, 10) (1, 11)
+    NAME       'in'          (1, 12) (1, 14)
+    NAME       'b'           (1, 15) (1, 16)
+    COLON      ':'           (1, 16) (1, 17)
+    NAME       'pass'        (1, 18) (1, 22)
+    """)
+
+        self.check_tokenize('async with a as b: pass', """\
+    ASYNC      'async'       (1, 0) (1, 5)
+    NAME       'with'        (1, 6) (1, 10)
+    NAME       'a'           (1, 11) (1, 12)
+    NAME       'as'          (1, 13) (1, 15)
+    NAME       'b'           (1, 16) (1, 17)
+    COLON      ':'           (1, 17) (1, 18)
+    NAME       'pass'        (1, 19) (1, 23)
+    """)
+
+        self.check_tokenize('async.foo', """\
+    ASYNC      'async'       (1, 0) (1, 5)
+    DOT        '.'           (1, 5) (1, 6)
+    NAME       'foo'         (1, 6) (1, 9)
+    """)
+
+        self.check_tokenize('async', """\
+    ASYNC      'async'       (1, 0) (1, 5)
+    """)
+
+        self.check_tokenize('async\n#comment\nawait', """\
+    ASYNC      'async'       (1, 0) (1, 5)
+    NEWLINE    ''            (1, 5) (1, 5)
+    AWAIT      'await'       (3, 0) (3, 5)
+    """)
+
+        self.check_tokenize('async\n...\nawait', """\
+    ASYNC      'async'       (1, 0) (1, 5)
+    NEWLINE    ''            (1, 5) (1, 5)
+    ELLIPSIS   '...'         (2, 0) (2, 3)
+    NEWLINE    ''            (2, 3) (2, 3)
+    AWAIT      'await'       (3, 0) (3, 5)
+    """)
+
+        self.check_tokenize('async\nawait', """\
+    ASYNC      'async'       (1, 0) (1, 5)
+    NEWLINE    ''            (1, 5) (1, 5)
+    AWAIT      'await'       (2, 0) (2, 5)
+    """)
+
+        self.check_tokenize('foo.async + 1', """\
+    NAME       'foo'         (1, 0) (1, 3)
+    DOT        '.'           (1, 3) (1, 4)
+    ASYNC      'async'       (1, 4) (1, 9)
+    PLUS       '+'           (1, 10) (1, 11)
+    NUMBER     '1'           (1, 12) (1, 13)
+    """)
+
+        self.check_tokenize('async def foo(): pass', """\
+    ASYNC      'async'       (1, 0) (1, 5)
+    NAME       'def'         (1, 6) (1, 9)
+    NAME       'foo'         (1, 10) (1, 13)
+    LPAR       '('           (1, 13) (1, 14)
+    RPAR       ')'           (1, 14) (1, 15)
+    COLON      ':'           (1, 15) (1, 16)
+    NAME       'pass'        (1, 17) (1, 21)
+    """)
+
+        self.check_tokenize('''\
+async def foo():
+  def foo(await):
+    await = 1
+  if 1:
+    await
+async += 1
+''', """\
+    ASYNC      'async'       (1, 0) (1, 5)
+    NAME       'def'         (1, 6) (1, 9)
+    NAME       'foo'         (1, 10) (1, 13)
+    LPAR       '('           (1, 13) (1, 14)
+    RPAR       ')'           (1, 14) (1, 15)
+    COLON      ':'           (1, 15) (1, 16)
+    NEWLINE    ''            (1, 16) (1, 16)
+    INDENT     ''            (2, -1) (2, -1)
+    NAME       'def'         (2, 2) (2, 5)
+    NAME       'foo'         (2, 6) (2, 9)
+    LPAR       '('           (2, 9) (2, 10)
+    AWAIT      'await'       (2, 10) (2, 15)
+    RPAR       ')'           (2, 15) (2, 16)
+    COLON      ':'           (2, 16) (2, 17)
+    NEWLINE    ''            (2, 17) (2, 17)
+    INDENT     ''            (3, -1) (3, -1)
+    AWAIT      'await'       (3, 4) (3, 9)
+    EQUAL      '='           (3, 10) (3, 11)
+    NUMBER     '1'           (3, 12) (3, 13)
+    NEWLINE    ''            (3, 13) (3, 13)
+    DEDENT     ''            (4, -1) (4, -1)
+    NAME       'if'          (4, 2) (4, 4)
+    NUMBER     '1'           (4, 5) (4, 6)
+    COLON      ':'           (4, 6) (4, 7)
+    NEWLINE    ''            (4, 7) (4, 7)
+    INDENT     ''            (5, -1) (5, -1)
+    AWAIT      'await'       (5, 4) (5, 9)
+    NEWLINE    ''            (5, 9) (5, 9)
+    DEDENT     ''            (6, -1) (6, -1)
+    DEDENT     ''            (6, -1) (6, -1)
+    ASYNC      'async'       (6, 0) (6, 5)
+    PLUSEQUAL  '+='          (6, 6) (6, 8)
+    NUMBER     '1'           (6, 9) (6, 10)
+    NEWLINE    ''            (6, 10) (6, 10)
+    """)
+
+        self.check_tokenize('async def foo():\n  async for i in 1: pass', """\
+    ASYNC      'async'       (1, 0) (1, 5)
+    NAME       'def'         (1, 6) (1, 9)
+    NAME       'foo'         (1, 10) (1, 13)
+    LPAR       '('           (1, 13) (1, 14)
+    RPAR       ')'           (1, 14) (1, 15)
+    COLON      ':'           (1, 15) (1, 16)
+    NEWLINE    ''            (1, 16) (1, 16)
+    INDENT     ''            (2, -1) (2, -1)
+    ASYNC      'async'       (2, 2) (2, 7)
+    NAME       'for'         (2, 8) (2, 11)
+    NAME       'i'           (2, 12) (2, 13)
+    NAME       'in'          (2, 14) (2, 16)
+    NUMBER     '1'           (2, 17) (2, 18)
+    COLON      ':'           (2, 18) (2, 19)
+    NAME       'pass'        (2, 20) (2, 24)
+    DEDENT     ''            (2, -1) (2, -1)
+    """)
+
+        self.check_tokenize('async def foo(async): await', """\
+    ASYNC      'async'       (1, 0) (1, 5)
+    NAME       'def'         (1, 6) (1, 9)
+    NAME       'foo'         (1, 10) (1, 13)
+    LPAR       '('           (1, 13) (1, 14)
+    ASYNC      'async'       (1, 14) (1, 19)
+    RPAR       ')'           (1, 19) (1, 20)
+    COLON      ':'           (1, 20) (1, 21)
+    AWAIT      'await'       (1, 22) (1, 27)
+    """)
+
+        self.check_tokenize('''\
+def f():
+
+  def baz(): pass
+  async def bar(): pass
+
+  await = 2''', """\
+    NAME       'def'         (1, 0) (1, 3)
+    NAME       'f'           (1, 4) (1, 5)
+    LPAR       '('           (1, 5) (1, 6)
+    RPAR       ')'           (1, 6) (1, 7)
+    COLON      ':'           (1, 7) (1, 8)
+    NEWLINE    ''            (1, 8) (1, 8)
+    INDENT     ''            (3, -1) (3, -1)
+    NAME       'def'         (3, 2) (3, 5)
+    NAME       'baz'         (3, 6) (3, 9)
+    LPAR       '('           (3, 9) (3, 10)
+    RPAR       ')'           (3, 10) (3, 11)
+    COLON      ':'           (3, 11) (3, 12)
+    NAME       'pass'        (3, 13) (3, 17)
+    NEWLINE    ''            (3, 17) (3, 17)
+    ASYNC      'async'       (4, 2) (4, 7)
+    NAME       'def'         (4, 8) (4, 11)
+    NAME       'bar'         (4, 12) (4, 15)
+    LPAR       '('           (4, 15) (4, 16)
+    RPAR       ')'           (4, 16) (4, 17)
+    COLON      ':'           (4, 17) (4, 18)
+    NAME       'pass'        (4, 19) (4, 23)
+    NEWLINE    ''            (4, 23) (4, 23)
+    AWAIT      'await'       (6, 2) (6, 7)
+    EQUAL      '='           (6, 8) (6, 9)
+    NUMBER     '2'           (6, 10) (6, 11)
+    DEDENT     ''            (6, -1) (6, -1)
+    """)
+
+        self.check_tokenize('''\
+async def f():
+
+  def baz(): pass
+  async def bar(): pass
+
+  await = 2''', """\
+    ASYNC      'async'       (1, 0) (1, 5)
+    NAME       'def'         (1, 6) (1, 9)
+    NAME       'f'           (1, 10) (1, 11)
+    LPAR       '('           (1, 11) (1, 12)
+    RPAR       ')'           (1, 12) (1, 13)
+    COLON      ':'           (1, 13) (1, 14)
+    NEWLINE    ''            (1, 14) (1, 14)
+    INDENT     ''            (3, -1) (3, -1)
+    NAME       'def'         (3, 2) (3, 5)
+    NAME       'baz'         (3, 6) (3, 9)
+    LPAR       '('           (3, 9) (3, 10)
+    RPAR       ')'           (3, 10) (3, 11)
+    COLON      ':'           (3, 11) (3, 12)
+    NAME       'pass'        (3, 13) (3, 17)
+    NEWLINE    ''            (3, 17) (3, 17)
+    ASYNC      'async'       (4, 2) (4, 7)
+    NAME       'def'         (4, 8) (4, 11)
+    NAME       'bar'         (4, 12) (4, 15)
+    LPAR       '('           (4, 15) (4, 16)
+    RPAR       ')'           (4, 16) (4, 17)
+    COLON      ':'           (4, 17) (4, 18)
+    NAME       'pass'        (4, 19) (4, 23)
+    NEWLINE    ''            (4, 23) (4, 23)
+    AWAIT      'await'       (6, 2) (6, 7)
+    EQUAL      '='           (6, 8) (6, 9)
+    NUMBER     '2'           (6, 10) (6, 11)
+    DEDENT     ''            (6, -1) (6, -1)
+    """)
+
+    def test_unicode(self):
+
+        self.check_tokenize("?rter = u'places'\ngr?n = U'green'", """\
+    NAME       '?rter'       (1, 0) (1, 6)
+    EQUAL      '='           (1, 7) (1, 8)
+    STRING     "u'places'"   (1, 9) (1, 18)
+    NEWLINE    ''            (1, 18) (1, 18)
+    NAME       'gr?n'        (2, 0) (2, 5)
+    EQUAL      '='           (2, 6) (2, 7)
+    STRING     "U'green'"    (2, 8) (2, 16)
+    """)
+
+    def test_invalid_syntax(self):
+        def get_tokens(string):
+            return list(_generate_tokens_from_c_tokenizer(string))
+
+        self.assertRaises(SyntaxError, get_tokens, "(1+2]")
+        self.assertRaises(SyntaxError, get_tokens, "(1+2}")
+        self.assertRaises(SyntaxError, get_tokens, "{1+2]")
+
+        self.assertRaises(SyntaxError, get_tokens, "1_")
+        self.assertRaises(SyntaxError, get_tokens, "1.2_")
+        self.assertRaises(SyntaxError, get_tokens, "1e2_")
+        self.assertRaises(SyntaxError, get_tokens, "1e+")
+
+        self.assertRaises(SyntaxError, get_tokens, "\xa0")
+        self.assertRaises(SyntaxError, get_tokens, "?")
+
+        self.assertRaises(SyntaxError, get_tokens, "0b12")
+        self.assertRaises(SyntaxError, get_tokens, "0b1_2")
+        self.assertRaises(SyntaxError, get_tokens, "0b2")
+        self.assertRaises(SyntaxError, get_tokens, "0b1_")
+        self.assertRaises(SyntaxError, get_tokens, "0b")
+        self.assertRaises(SyntaxError, get_tokens, "0o18")
+        self.assertRaises(SyntaxError, get_tokens, "0o1_8")
+        self.assertRaises(SyntaxError, get_tokens, "0o8")
+        self.assertRaises(SyntaxError, get_tokens, "0o1_")
+        self.assertRaises(SyntaxError, get_tokens, "0o")
+        self.assertRaises(SyntaxError, get_tokens, "0x1_")
+        self.assertRaises(SyntaxError, get_tokens, "0x")
+        self.assertRaises(SyntaxError, get_tokens, "1_")
+        self.assertRaises(SyntaxError, get_tokens, "012")
+        self.assertRaises(SyntaxError, get_tokens, "1.2_")
+        self.assertRaises(SyntaxError, get_tokens, "1e2_")
+        self.assertRaises(SyntaxError, get_tokens, "1e+")
+
+        self.assertRaises(SyntaxError, get_tokens, "'sdfsdf")
+        self.assertRaises(SyntaxError, get_tokens, "'''sdfsdf''")
+
+        self.assertRaises(SyntaxError, get_tokens, "("*1000+"a"+")"*1000)
+        self.assertRaises(SyntaxError, get_tokens, "]")
+
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/Lib/tokenize.py b/Lib/tokenize.py
index 7d7736fe985981..0b9e238310049c 100644
--- a/Lib/tokenize.py
+++ b/Lib/tokenize.py
@@ -680,5 +680,13 @@ def error(message, filename=None, location=None):
         perror("unexpected error: %s" % err)
         raise
 
+def _generate_tokens_from_c_tokenizer(source):
+    """Tokenize a source reading Python code as unicode strings using the internal C tokenizer"""
+    import _tokenize as c_tokenizer
+    for info in c_tokenizer.TokenizerIter(source):
+        tok, type, lineno, end_lineno, col_off, end_col_off, line = info
+        yield TokenInfo(type, tok, (lineno, col_off), (end_lineno, end_col_off), line)
+
+
 if __name__ == "__main__":
     main()
diff --git a/Makefile.pre.in b/Makefile.pre.in
index f503ac4d876726..1007f440759b1a 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -339,6 +339,7 @@ PARSER_HEADERS= \
 PYTHON_OBJS=	\
 		Python/_warnings.o \
 		Python/Python-ast.o \
+		Python/Python-tokenize.o \
 		Python/asdl.o \
 		Python/ast.o \
 		Python/ast_opt.o \
diff --git a/Modules/config.c.in b/Modules/config.c.in
index d69e8e88b0ca45..6081f95759538f 100644
--- a/Modules/config.c.in
+++ b/Modules/config.c.in
@@ -28,6 +28,7 @@ extern PyObject* PyMarshal_Init(void);
 extern PyObject* PyInit__imp(void);
 extern PyObject* PyInit_gc(void);
 extern PyObject* PyInit__ast(void);
+extern PyObject* PyInit__tokenize(void);
 extern PyObject* _PyWarnings_Init(void);
 extern PyObject* PyInit__string(void);
 
@@ -44,6 +45,9 @@ struct _inittab _PyImport_Inittab[] = {
     /* This lives in Python/Python-ast.c */
     {"_ast", PyInit__ast},
 
+    /* This lives in Python/Python-tokenizer.c */
+    {"_tokenize", PyInit__tokenize},
+
     /* These entries are here for sys.builtin_module_names */
     {"builtins", NULL},
     {"sys", NULL},
diff --git a/PC/config.c b/PC/config.c
index 11743ea45a969d..9d900c78e40d00 100644
--- a/PC/config.c
+++ b/PC/config.c
@@ -72,9 +72,8 @@ extern PyObject* _PyWarnings_Init(void);
 extern PyObject* PyInit__string(void);
 extern PyObject* PyInit__stat(void);
 extern PyObject* PyInit__opcode(void);
-
 extern PyObject* PyInit__contextvars(void);
-
+extern PyObject* PyInit__tokenize(void);
 
 /* tools/freeze/makeconfig.py marker for additional "extern" */
 /* -- ADDMODULE MARKER 1 -- */
@@ -83,7 +82,6 @@ extern PyObject* PyMarshal_Init(void);
 extern PyObject* PyInit__imp(void);
 
 struct _inittab _PyImport_Inittab[] = {
-
     {"_abc", PyInit__abc},
     {"array", PyInit_array},
     {"_ast", PyInit__ast},
@@ -105,6 +103,7 @@ struct _inittab _PyImport_Inittab[] = {
     {"_blake2", PyInit__blake2},
     {"time", PyInit_time},
     {"_thread", PyInit__thread},
+    {"_tokenize", PyInit__tokenize},
     {"_typing", PyInit__typing},
     {"_statistics", PyInit__statistics},
 #ifdef WIN32
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
index ebc0f2879f9595..b8cadf469355f4 100644
--- a/PCbuild/pythoncore.vcxproj
+++ b/PCbuild/pythoncore.vcxproj
@@ -488,6 +488,7 @@
     <ClCompile Include="..\Python\pystrtod.c" />
     <ClCompile Include="..\Python\dtoa.c" />
     <ClCompile Include="..\Python\Python-ast.c" />
+    <ClCompile Include="..\Python\Python-tokenize.c" />
     <ClCompile Include="..\Python\pythonrun.c" />
     <ClCompile Include="..\Python\specialize.c" />
     <ClCompile Include="..\Python\suggestions.c" />
diff --git a/Python/Python-tokenize.c b/Python/Python-tokenize.c
new file mode 100644
index 00000000000000..b9fb1693ce117e
--- /dev/null
+++ b/Python/Python-tokenize.c
@@ -0,0 +1,195 @@
+#include "Python.h"
+#include "../Parser/tokenizer.h"
+
+static struct PyModuleDef _tokenizemodule;
+
+typedef struct {
+    PyTypeObject* TokenizerIter;
+} tokenize_state;
+
+static tokenize_state*
+get_tokenize_state(PyObject* module)
+{
+    return (tokenize_state*)PyModule_GetState(module);
+}
+
+#define _tokenize_get_state_by_type(type)                                                               \
+    get_tokenize_state(_PyType_GetModuleByDef(type, &_tokenizemodule))
+
+#include "clinic/Python-tokenize.c.h"
+
+/*[clinic input]
+module _tokenizer
+class _tokenizer.tokenizeriter "tokenizeriterobject *" "_tokenize_get_state_by_type(type)->TokenizerIter"
+[clinic start generated code]*/
+/*[clinic end generated code: output=da39a3ee5e6b4b0d input=96d98ee2fef7a8bc]*/
+
+typedef struct {
+    PyObject_HEAD
+    struct tok_state* tok;
+} tokenizeriterobject;
+
+/*[clinic input]
+ at classmethod
+_tokenizer.tokenizeriter.__new__ as tokenizeriter_new
+
+    source: str
+[clinic start generated code]*/
+
+static PyObject *
+tokenizeriter_new_impl(PyTypeObject *type, const char *source)
+/*[clinic end generated code: output=7fd9f46cf9263cbb input=4384b368407375c6]*/
+{
+    tokenizeriterobject* self = (tokenizeriterobject*)type->tp_alloc(type, 0);
+    if (self == NULL) {
+        return NULL;
+    }
+    PyObject* filename = PyUnicode_FromString("<string>");
+    if (filename == NULL) {
+        return NULL;
+    }
+    self->tok = PyTokenizer_FromUTF8(source, 1);
+    if (self->tok == NULL) {
+        return NULL;
+    }
+    self->tok->filename = filename;
+    return (PyObject*)self;
+}
+
+static PyObject*
+tokenizeriter_next(tokenizeriterobject* it)
+{
+    const char* start;
+    const char* end;
+    int type = PyTokenizer_Get(it->tok, &start, &end);
+    if (type == ERRORTOKEN && PyErr_Occurred()) {
+        return NULL;
+    }
+    if (type == ERRORTOKEN || type == ENDMARKER) {
+        PyErr_SetString(PyExc_StopIteration, "EOF");
+        return NULL;
+    }
+    PyObject* str = NULL;
+    if (start == NULL || end == NULL) {
+        str = PyUnicode_FromString("");
+    } else {
+        str = PyUnicode_FromStringAndSize(start, end - start);
+    }
+    if (str == NULL) {
+        return NULL;
+    }
+
+    Py_ssize_t size = it->tok->inp - it->tok->buf;
+    PyObject* line = PyUnicode_DecodeUTF8(it->tok->buf, size, "replace");
+    if (line == NULL) {
+        Py_DECREF(str);
+        return NULL;
+    }
+    const char* line_start = type == STRING ? it->tok->multi_line_start : it->tok->line_start;
+    int lineno = type == STRING ? it->tok->first_lineno : it->tok->lineno;
+    int end_lineno = it->tok->lineno;
+    int col_offset = -1;
+    int end_col_offset = -1;
+    if (start != NULL && start >= line_start) {
+        col_offset = (int)(start - line_start);
+    }
+    if (end != NULL && end >= it->tok->line_start) {
+        end_col_offset = (int)(end - it->tok->line_start);
+    }
+
+    return Py_BuildValue("(NiiiiiN)", str, type, lineno, end_lineno, col_offset, end_col_offset, line);
+}
+
+static void
+tokenizeriter_dealloc(tokenizeriterobject* it)
+{
+    PyTypeObject* tp = Py_TYPE(it);
+    PyTokenizer_Free(it->tok);
+    tp->tp_free(it);
+    Py_DECREF(tp);
+}
+
+static PyType_Slot tokenizeriter_slots[] = {
+        {Py_tp_new, tokenizeriter_new},
+        {Py_tp_dealloc, tokenizeriter_dealloc},
+        {Py_tp_getattro, PyObject_GenericGetAttr},
+        {Py_tp_iter, PyObject_SelfIter},
+        {Py_tp_iternext, tokenizeriter_next},
+        {0, NULL},
+};
+
+static PyType_Spec tokenizeriter_spec = {
+        .name = "_tokenize.TokenizerIter",
+        .basicsize = sizeof(tokenizeriterobject),
+        .flags = (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_IMMUTABLETYPE),
+        .slots = tokenizeriter_slots,
+};
+
+
+static int
+tokenizemodule_exec(PyObject* m)
+{
+    tokenize_state* state = get_tokenize_state(m);
+    if (state == NULL) {
+        return -1;
+    }
+
+    state->TokenizerIter = (PyTypeObject *)PyType_FromModuleAndSpec(
+        m, &tokenizeriter_spec, NULL);
+    if (state->TokenizerIter == NULL) {
+        return -1;
+    }
+    if (PyModule_AddType(m, state->TokenizerIter) < 0) {
+        return -1;
+    }
+
+    return 0;
+}
+
+static PyMethodDef tokenize_methods[] = {
+        {NULL, NULL, 0, NULL} /* Sentinel */
+};
+
+static PyModuleDef_Slot tokenizemodule_slots[] = {
+    {Py_mod_exec, tokenizemodule_exec},
+    {0, NULL}
+};
+
+static int
+tokenizemodule_traverse(PyObject *m, visitproc visit, void *arg)
+{
+    tokenize_state *state = get_tokenize_state(m);
+    Py_VISIT(state->TokenizerIter);
+    return 0;
+}
+
+static int
+tokenizemodule_clear(PyObject *m)
+{
+    tokenize_state *state = get_tokenize_state(m);
+    Py_CLEAR(state->TokenizerIter);
+    return 0;
+}
+
+static void
+tokenizemodule_free(void *m)
+{
+    tokenizemodule_clear((PyObject *)m);
+}
+
+static struct PyModuleDef _tokenizemodule = {
+        PyModuleDef_HEAD_INIT,
+        .m_name = "_tokenize",
+        .m_size = sizeof(tokenize_state),
+        .m_slots = tokenizemodule_slots,
+        .m_methods = tokenize_methods,
+        .m_traverse = tokenizemodule_traverse,
+        .m_clear = tokenizemodule_clear,
+        .m_free = tokenizemodule_free,
+};
+
+PyMODINIT_FUNC
+PyInit__tokenize(void)
+{
+    return PyModuleDef_Init(&_tokenizemodule);
+}
diff --git a/Python/clinic/Python-tokenize.c.h b/Python/clinic/Python-tokenize.c.h
new file mode 100644
index 00000000000000..050b4d49448c36
--- /dev/null
+++ b/Python/clinic/Python-tokenize.c.h
@@ -0,0 +1,41 @@
+/*[clinic input]
+preserve
+[clinic start generated code]*/
+
+static PyObject *
+tokenizeriter_new_impl(PyTypeObject *type, const char *source);
+
+static PyObject *
+tokenizeriter_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
+{
+    PyObject *return_value = NULL;
+    static const char * const _keywords[] = {"source", NULL};
+    static _PyArg_Parser _parser = {NULL, _keywords, "tokenizeriter", 0};
+    PyObject *argsbuf[1];
+    PyObject * const *fastargs;
+    Py_ssize_t nargs = PyTuple_GET_SIZE(args);
+    const char *source;
+
+    fastargs = _PyArg_UnpackKeywords(_PyTuple_CAST(args)->ob_item, nargs, kwargs, NULL, &_parser, 1, 1, 0, argsbuf);
+    if (!fastargs) {
+        goto exit;
+    }
+    if (!PyUnicode_Check(fastargs[0])) {
+        _PyArg_BadArgument("tokenizeriter", "argument 'source'", "str", fastargs[0]);
+        goto exit;
+    }
+    Py_ssize_t source_length;
+    source = PyUnicode_AsUTF8AndSize(fastargs[0], &source_length);
+    if (source == NULL) {
+        goto exit;
+    }
+    if (strlen(source) != (size_t)source_length) {
+        PyErr_SetString(PyExc_ValueError, "embedded null character");
+        goto exit;
+    }
+    return_value = tokenizeriter_new_impl(type, source);
+
+exit:
+    return return_value;
+}
+/*[clinic end generated code: output=dfcd64774e01bfe6 input=a9049054013a1b77]*/
diff --git a/Python/stdlib_module_names.h b/Python/stdlib_module_names.h
index 3c5f1768305cb0..2f75c2e54cd5e9 100644
--- a/Python/stdlib_module_names.h
+++ b/Python/stdlib_module_names.h
@@ -80,6 +80,7 @@ static const char* _Py_stdlib_module_names[] = {
 "_thread",
 "_threading_local",
 "_tkinter",
+"_tokenize",
 "_tracemalloc",
 "_typing",
 "_uuid",


From webhook-mailer at python.org  Tue Aug 24 13:01:50 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 24 Aug 2021 17:01:50 -0000
Subject: [Python-checkins] bpo-39452: Rewrite and expand __main__.rst
 (#26883)
Message-ID: <mailman.1163.1629824511.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/7cba23164cf82f6619db002cd30021b5dfb1f809
commit: 7cba23164cf82f6619db002cd30021b5dfb1f809
branch: main
author: Jack DeVries <58614260+jdevries3133 at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-24T19:01:41+02:00
summary:

bpo-39452: Rewrite and expand __main__.rst (#26883)

Broadened scope of the document to explicitly discuss and differentiate between ``__main__.py`` in packages versus the ``__name__ == '__main__'`` expression (and the idioms that surround it), as well as ``import __main__``.

Co-authored-by: G?ry Ogam <gery.ogam at gmail.com>
Co-authored-by: ?ric Araujo <merwok at netwok.org>
Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Misc/NEWS.d/next/Documentation/2021-06-23-15-21-36.bpo-39452.o_I-6d.rst
M Doc/library/__main__.rst
M Doc/reference/import.rst
M Doc/tools/susp-ignored.csv
M Doc/tutorial/modules.rst

diff --git a/Doc/library/__main__.rst b/Doc/library/__main__.rst
index a64faf1bbe3c84..116a9a9d1d729f 100644
--- a/Doc/library/__main__.rst
+++ b/Doc/library/__main__.rst
@@ -1,25 +1,368 @@
-
-:mod:`__main__` --- Top-level script environment
-================================================
+:mod:`__main__` --- Top-level code environment
+==============================================
 
 .. module:: __main__
-   :synopsis: The environment where the top-level script is run.
+   :synopsis: The environment where top-level code is run. Covers command-line
+              interfaces, import-time behavior, and ``__name__ == '__main__'``.
 
 --------------
 
-``'__main__'`` is the name of the scope in which top-level code executes.
-A module's __name__ is set equal to ``'__main__'`` when read from
-standard input, a script, or from an interactive prompt.
+In Python, the special name ``__main__`` is used for two important constructs:
+
+1. the name of the top-level environment of the program, which can be
+   checked using the ``__name__ == '__main__'`` expression; and
+2. the ``__main__.py`` file in Python packages.
+
+Both of these mechanisms are related to Python modules; how users interact with
+them and how they interact with each other.  They are explained in detail
+below.  If you're new to Python modules, see the tutorial section
+:ref:`tut-modules` for an introduction.
+
+
+.. _name_equals_main:
+
+``__name__ == '__main__'``
+---------------------------
+
+When a Python module or package is imported, ``__name__`` is set to the
+module's name.  Usually, this is the name of the Python file itself without the
+``.py`` extension::
+
+    >>> import configparser
+    >>> configparser.__name__
+    'configparser'
+
+If the file is part of a package, ``__name__`` will also include the parent
+package's path::
+
+    >>> from concurrent.futures import process
+    >>> process.__name__
+    'concurrent.futures.process'
+
+However, if the module is executed in the top-level code environment,
+its ``__name__`` is set to the string ``'__main__'``.
+
+What is the "top-level code environment"?
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+``__main__`` is the name of the environment where top-level code is run.
+"Top-level code" is the first user-specified Python module that starts running.
+It's "top-level" because it imports all other modules that the program needs.
+Sometimes "top-level code" is called an *entry point* to the application.
+
+The top-level code environment can be:
+
+* the scope of an interactive prompt::
+
+    >>> __name__
+    '__main__'
+
+* the Python module passed to the Python interpreter as a file argument:
+
+    .. code-block:: shell-session
+
+       $ python3 helloworld.py
+       Hello, world!
+
+* the Python module or package passed to the Python interpreter with the
+  :option:`-m` argument:
+
+    .. code-block:: shell-session
+
+       $ python3 -m tarfile
+       usage: tarfile.py [-h] [-v] (...)
+
+* Python code read by the Python interpreter from standard input:
+
+    .. code-block:: shell-session
+
+       $ echo "import this" | python3
+       The Zen of Python, by Tim Peters
+
+       Beautiful is better than ugly.
+       Explicit is better than implicit.
+       ...
+
+* Python code passed to the Python interpreter with the :option:`-c` argument:
+
+    .. code-block:: shell-session
+
+       $ python3 -c "import this"
+       The Zen of Python, by Tim Peters
+
+       Beautiful is better than ugly.
+       Explicit is better than implicit.
+       ...
+
+In each of these situations, the top-level module's ``__name__`` is set to
+``'__main__'``.
+
+As a result, a module can discover whether or not it is running in the
+top-level environment by checking its own ``__name__``, which allows a common
+idiom for conditionally executing code when the module is not initialized from
+an import statement::
+
+    if __name__ == '__main__':
+        # Execute when the module is not initialized from an import statement.
+        ...
+
+.. seealso::
+
+   For a more detailed look at how ``__name__`` is set in all situations, see
+   the tutorial section :ref:`tut-modules`.
+
+
+Idiomatic Usage
+^^^^^^^^^^^^^^^
+
+Some modules contain code that is intended for script use only, like parsing
+command-line arguments or fetching data from standard input.  When a module
+like this were to be imported from a different module, for example to unit test
+it, the script code would unintentionally execute as well.
+
+This is where using the ``if __name__ == '__main__'`` code block comes in
+handy. Code within this block won't run unless the module is executed in the
+top-level environment.
+
+Putting as few statements as possible in the block below ``if __name___ ==
+'__main__'`` can improve code clarity and correctness. Most often, a function
+named ``main`` encapsulates the program's primary behavior::
+
+    # echo.py
+
+    import shlex
+    import sys
+
+    def echo(phrase: str) -> None:
+       """A dummy wrapper around print."""
+       # for demonstration purposes, you can imagine that there is some
+       # valuable and reusable logic inside this function
+       print(phrase)
+
+    def main() -> int:
+        """Echo the input arguments to standard output"""
+        phrase = shlex.join(sys.argv)
+        echo(phrase)
+        return 0
+
+    if __name__ == '__main__':
+        sys.exit(main())  # next section explains the use of sys.exit
+
+Note that if the module didn't encapsulate code inside the ``main`` function
+but instead put it directly within the ``if __name__ == '__main__'`` block,
+the ``phrase`` variable would be global to the entire module.  This is
+error-prone as other functions within the module could be unintentionally using
+the global variable instead of a local name.  A ``main`` function solves this
+problem.
+
+Using a ``main`` function has the added benefit of the ``echo`` function itself
+being isolated and importable elsewhere. When ``echo.py`` is imported, the
+``echo`` and ``main`` functions will be defined, but neither of them will be
+called, because ``__name__ != '__main__'``.
+
+
+Packaging Considerations
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+``main`` functions are often used to create command-line tools by specifying
+them as entry points for console scripts.  When this is done,
+`pip <https://pip.pypa.io/>`_ inserts the function call into a template script,
+where the return value of ``main`` is passed into :func:`sys.exit`.
+For example::
+
+    sys.exit(main())
+
+Since the call to ``main`` is wrapped in :func:`sys.exit`, the expectation is
+that your function will return some value acceptable as an input to
+:func:`sys.exit`; typically, an integer or ``None`` (which is implicitly
+returned if your function does not have a return statement).
+
+By proactively following this convention ourselves, our module will have the
+same behavior when run directly (i.e. ``python3 echo.py``) as it will have if
+we later package it as a console script entry-point in a pip-installable
+package.
+
+In particular, be careful about returning strings from your ``main`` function.
+:func:`sys.exit` will interpret a string argument as a failure message, so
+your program will have an exit code of ``1``, indicating failure, and the
+string will be written to :data:`sys.stderr`.  The ``echo.py`` example from
+earlier exemplifies using the ``sys.exit(main())`` convention.
+
+.. seealso::
+
+   `Python Packaging User Guide <https://packaging.python.org/>`_
+   contains a collection of tutorials and references on how to distribute and
+   install Python packages with modern tools.
+
+
+``__main__.py`` in Python Packages
+----------------------------------
+
+If you are not familiar with Python packages, see section :ref:`tut-packages`
+of the tutorial.  Most commonly, the ``__main__.py`` file is used to provide
+a command-line interface for a package. Consider the following hypothetical
+package, "bandclass":
+
+.. code-block:: text
+
+   bandclass
+     ??? __init__.py
+     ??? __main__.py
+     ??? student.py
+
+``__main__.py`` will be executed when the package itself is invoked
+directly from the command line using the :option:`-m` flag. For example:
+
+.. code-block:: shell-session
+
+   $ python3 -m bandclass
+
+This command will cause ``__main__.py`` to run. How you utilize this mechanism
+will depend on the nature of the package you are writing, but in this
+hypothetical case, it might make sense to allow the teacher to search for
+students::
+
+    # bandclass/__main__.py
+
+    import sys
+    from .student import search_students
+
+    student_name = sys.argv[2] if len(sys.argv) >= 2 else ''
+    print(f'Found student: {search_students(student_name)}')
+
+Note that ``from .student import search_students`` is an example of a relative
+import.  This import style must be used when referencing modules within a
+package.  For more details, see :ref:`intra-package-references` in the
+:ref:`tut-modules` section of the tutorial.
+
+Idiomatic Usage
+^^^^^^^^^^^^^^^
+
+The contents of ``__main__.py`` typically isn't fenced with
+``if __name__ == '__main__'`` blocks.  Instead, those files are kept short,
+functions to execute from other modules.  Those other modules can then be
+easily unit-tested and are properly reusable.
+
+If used, an ``if __name__ == '__main__'`` block will still work as expected
+for a ``__main__.py`` file within a package, because its ``__name__``
+attribute will include the package's path if imported::
+
+    >>> import asyncio.__main__
+    >>> asyncio.__main__.__name__
+    'asyncio.__main__'
+
+This won't work for ``__main__.py`` files in the root directory of a .zip file
+though.  Hence, for consistency, minimal ``__main__.py`` like the :mod:`venv`
+one mentioned above are preferred.
+
+.. seealso::
+
+   See :mod:`venv` for an example of a package with a minimal ``__main__.py``
+   in the standard library. It doesn't contain a ``if __name__ == '__main__'``
+   block. You can invoke it with ``python3 -m venv [directory]``.
+
+   See :mod:`runpy` for more details on the :option:`-m` flag to the
+   interpreter executable.
+
+   See :mod:`zipapp` for how to run applications packaged as *.zip* files. In
+   this case Python looks for a ``__main__.py`` file in the root directory of
+   the archive.
+
+
+
+``import __main__``
+-------------------
+
+Regardless of which module a Python program was started with, other modules
+running within that same program can import the top-level environment's scope
+(:term:`namespace`) by importing the ``__main__`` module.  This doesn't import
+a ``__main__.py`` file but rather whichever module that received the special
+name ``'__main__'``.
+
+Here is an example module that consumes the ``__main__`` namespace::
+
+    # namely.py
+
+    import __main__
+
+    def did_user_define_their_name():
+        return 'my_name' in dir(__main__)
+
+    def print_user_name():
+        if not did_user_define_their_name():
+            raise ValueError('Define the variable `my_name`!')
+
+        if '__file__' in dir(__main__):
+            print(__main__.my_name, "found in file", __main__.__file__)
+        else:
+            print(__main__.my_name)
+
+Example usage of this module could be as follows::
+
+    # start.py
+
+    import sys
+
+    from namely import print_user_name
+
+    # my_name = "Dinsdale"
+
+    def main():
+        try:
+            print_user_name()
+        except ValueError as ve:
+            return str(ve)
+
+    if __name__ == "__main__":
+        sys.exit(main())
+
+Now, if we started our program, the result would look like this:
+
+.. code-block:: shell-session
+
+   $ python3 start.py
+   Define the variable `my_name`!
+
+The exit code of the program would be 1, indicating an error. Uncommenting the
+line with ``my_name = "Dinsdale"`` fixes the program and now it exits with
+status code 0, indicating success:
+
+.. code-block:: shell-session
+
+   $ python3 start.py
+   Dinsdale found in file /path/to/start.py
+
+Note that importing ``__main__`` doesn't cause any issues with unintentionally
+running top-level code meant for script use which is put in the
+``if __name__ == "__main__"`` block of the ``start`` module. Why does this work?
+
+Python inserts an empty ``__main__`` module in :attr:`sys.modules` at
+interpreter startup, and populates it by running top-level code. In our example
+this is the ``start`` module which runs line by line and imports ``namely``.
+In turn, ``namely`` imports ``__main__`` (which is really ``start``). That's an
+import cycle! Fortunately, since the partially populated ``__main__``
+module is present in :attr:`sys.modules`, Python passes that to ``namely``.
+See :ref:`Special considerations for __main__ <import-dunder-main>` in the
+import system's reference for details on how this works.
+
+The Python REPL is another example of a "top-level environment", so anything
+defined in the REPL becomes part of the ``__main__`` scope::
 
-A module can discover whether or not it is running in the main scope by
-checking its own ``__name__``, which allows a common idiom for conditionally
-executing code in a module when it is run as a script or with ``python
--m`` but not when it is imported::
+    >>> import namely
+    >>> namely.did_user_define_their_name()
+    False
+    >>> namely.print_user_name()
+    Traceback (most recent call last):
+    ...
+    ValueError: Define the variable `my_name`!
+    >>> my_name = 'Jabberwocky'
+    >>> namely.did_user_define_their_name()
+    True
+    >>> namely.print_user_name()
+    Jabberwocky
 
-   if __name__ == "__main__":
-       # execute only if run as a script
-       main()
+Note that in this case the ``__main__`` scope doesn't contain a ``__file__``
+attribute as it's interactive.
 
-For a package, the same effect can be achieved by including a
-``__main__.py`` module, the contents of which will be executed when the
-module is run with ``-m``.
+The ``__main__`` scope is used in the implementation of :mod:`pdb` and
+:mod:`rlcompleter`.
diff --git a/Doc/reference/import.rst b/Doc/reference/import.rst
index 81a124f745ab6a..39fcba015b6947 100644
--- a/Doc/reference/import.rst
+++ b/Doc/reference/import.rst
@@ -975,6 +975,8 @@ should expose ``XXX.YYY.ZZZ`` as a usable expression, but .moduleY is
 not a valid expression.
 
 
+.. _import-dunder-main:
+
 Special considerations for __main__
 ===================================
 
diff --git a/Doc/tools/susp-ignored.csv b/Doc/tools/susp-ignored.csv
index 211b49a5449f48..35bcbd0404976f 100644
--- a/Doc/tools/susp-ignored.csv
+++ b/Doc/tools/susp-ignored.csv
@@ -110,6 +110,7 @@ howto/pyporting,,::,Programming Language :: Python :: 3
 howto/regex,,::,
 howto/regex,,:foo,(?:foo)
 howto/urllib2,,:password,"""joe:password at example.com"""
+library/__main__,,`,
 library/ast,,:upper,lower:upper
 library/ast,,:step,lower:upper:step
 library/audioop,,:ipos,"# factor = audioop.findfactor(in_test[ipos*2:ipos*2+len(out_test)],"
diff --git a/Doc/tutorial/modules.rst b/Doc/tutorial/modules.rst
index af595e5ca04d7e..a495c50cbde880 100644
--- a/Doc/tutorial/modules.rst
+++ b/Doc/tutorial/modules.rst
@@ -533,6 +533,8 @@ importing module needs to use submodules with the same name from different
 packages.
 
 
+.. _intra-package-references:
+
 Intra-package References
 ------------------------
 
diff --git a/Misc/NEWS.d/next/Documentation/2021-06-23-15-21-36.bpo-39452.o_I-6d.rst b/Misc/NEWS.d/next/Documentation/2021-06-23-15-21-36.bpo-39452.o_I-6d.rst
new file mode 100644
index 00000000000000..5c8cbd8e652232
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2021-06-23-15-21-36.bpo-39452.o_I-6d.rst
@@ -0,0 +1,4 @@
+Rewrote ``Doc/library/__main__.rst``. Broadened scope of the document to
+explicitly discuss and differentiate between ``__main__.py`` in packages
+versus the ``__name__ == '__main__'`` expression (and the idioms that
+surround it).


From webhook-mailer at python.org  Tue Aug 24 16:54:19 2021
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 24 Aug 2021 20:54:19 -0000
Subject: [Python-checkins] bpo-39452: Rewrite and expand __main__.rst
 (GH-26883)
Message-ID: <mailman.1164.1629838461.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/ec5a03168f02ef92f98a94796bc6378fc73622e8
commit: ec5a03168f02ef92f98a94796bc6378fc73622e8
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-24T13:54:08-07:00
summary:

bpo-39452: Rewrite and expand __main__.rst (GH-26883)


Broadened scope of the document to explicitly discuss and differentiate between ``__main__.py`` in packages versus the ``__name__ == '__main__'`` expression (and the idioms that surround it), as well as ``import __main__``.

Co-authored-by: G?ry Ogam <gery.ogam at gmail.com>
Co-authored-by: ?ric Araujo <merwok at netwok.org>
Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 7cba23164cf82f6619db002cd30021b5dfb1f809)

Co-authored-by: Jack DeVries <58614260+jdevries3133 at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Documentation/2021-06-23-15-21-36.bpo-39452.o_I-6d.rst
M Doc/library/__main__.rst
M Doc/reference/import.rst
M Doc/tools/susp-ignored.csv
M Doc/tutorial/modules.rst

diff --git a/Doc/library/__main__.rst b/Doc/library/__main__.rst
index a64faf1bbe3c84..116a9a9d1d729f 100644
--- a/Doc/library/__main__.rst
+++ b/Doc/library/__main__.rst
@@ -1,25 +1,368 @@
-
-:mod:`__main__` --- Top-level script environment
-================================================
+:mod:`__main__` --- Top-level code environment
+==============================================
 
 .. module:: __main__
-   :synopsis: The environment where the top-level script is run.
+   :synopsis: The environment where top-level code is run. Covers command-line
+              interfaces, import-time behavior, and ``__name__ == '__main__'``.
 
 --------------
 
-``'__main__'`` is the name of the scope in which top-level code executes.
-A module's __name__ is set equal to ``'__main__'`` when read from
-standard input, a script, or from an interactive prompt.
+In Python, the special name ``__main__`` is used for two important constructs:
+
+1. the name of the top-level environment of the program, which can be
+   checked using the ``__name__ == '__main__'`` expression; and
+2. the ``__main__.py`` file in Python packages.
+
+Both of these mechanisms are related to Python modules; how users interact with
+them and how they interact with each other.  They are explained in detail
+below.  If you're new to Python modules, see the tutorial section
+:ref:`tut-modules` for an introduction.
+
+
+.. _name_equals_main:
+
+``__name__ == '__main__'``
+---------------------------
+
+When a Python module or package is imported, ``__name__`` is set to the
+module's name.  Usually, this is the name of the Python file itself without the
+``.py`` extension::
+
+    >>> import configparser
+    >>> configparser.__name__
+    'configparser'
+
+If the file is part of a package, ``__name__`` will also include the parent
+package's path::
+
+    >>> from concurrent.futures import process
+    >>> process.__name__
+    'concurrent.futures.process'
+
+However, if the module is executed in the top-level code environment,
+its ``__name__`` is set to the string ``'__main__'``.
+
+What is the "top-level code environment"?
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+``__main__`` is the name of the environment where top-level code is run.
+"Top-level code" is the first user-specified Python module that starts running.
+It's "top-level" because it imports all other modules that the program needs.
+Sometimes "top-level code" is called an *entry point* to the application.
+
+The top-level code environment can be:
+
+* the scope of an interactive prompt::
+
+    >>> __name__
+    '__main__'
+
+* the Python module passed to the Python interpreter as a file argument:
+
+    .. code-block:: shell-session
+
+       $ python3 helloworld.py
+       Hello, world!
+
+* the Python module or package passed to the Python interpreter with the
+  :option:`-m` argument:
+
+    .. code-block:: shell-session
+
+       $ python3 -m tarfile
+       usage: tarfile.py [-h] [-v] (...)
+
+* Python code read by the Python interpreter from standard input:
+
+    .. code-block:: shell-session
+
+       $ echo "import this" | python3
+       The Zen of Python, by Tim Peters
+
+       Beautiful is better than ugly.
+       Explicit is better than implicit.
+       ...
+
+* Python code passed to the Python interpreter with the :option:`-c` argument:
+
+    .. code-block:: shell-session
+
+       $ python3 -c "import this"
+       The Zen of Python, by Tim Peters
+
+       Beautiful is better than ugly.
+       Explicit is better than implicit.
+       ...
+
+In each of these situations, the top-level module's ``__name__`` is set to
+``'__main__'``.
+
+As a result, a module can discover whether or not it is running in the
+top-level environment by checking its own ``__name__``, which allows a common
+idiom for conditionally executing code when the module is not initialized from
+an import statement::
+
+    if __name__ == '__main__':
+        # Execute when the module is not initialized from an import statement.
+        ...
+
+.. seealso::
+
+   For a more detailed look at how ``__name__`` is set in all situations, see
+   the tutorial section :ref:`tut-modules`.
+
+
+Idiomatic Usage
+^^^^^^^^^^^^^^^
+
+Some modules contain code that is intended for script use only, like parsing
+command-line arguments or fetching data from standard input.  When a module
+like this were to be imported from a different module, for example to unit test
+it, the script code would unintentionally execute as well.
+
+This is where using the ``if __name__ == '__main__'`` code block comes in
+handy. Code within this block won't run unless the module is executed in the
+top-level environment.
+
+Putting as few statements as possible in the block below ``if __name___ ==
+'__main__'`` can improve code clarity and correctness. Most often, a function
+named ``main`` encapsulates the program's primary behavior::
+
+    # echo.py
+
+    import shlex
+    import sys
+
+    def echo(phrase: str) -> None:
+       """A dummy wrapper around print."""
+       # for demonstration purposes, you can imagine that there is some
+       # valuable and reusable logic inside this function
+       print(phrase)
+
+    def main() -> int:
+        """Echo the input arguments to standard output"""
+        phrase = shlex.join(sys.argv)
+        echo(phrase)
+        return 0
+
+    if __name__ == '__main__':
+        sys.exit(main())  # next section explains the use of sys.exit
+
+Note that if the module didn't encapsulate code inside the ``main`` function
+but instead put it directly within the ``if __name__ == '__main__'`` block,
+the ``phrase`` variable would be global to the entire module.  This is
+error-prone as other functions within the module could be unintentionally using
+the global variable instead of a local name.  A ``main`` function solves this
+problem.
+
+Using a ``main`` function has the added benefit of the ``echo`` function itself
+being isolated and importable elsewhere. When ``echo.py`` is imported, the
+``echo`` and ``main`` functions will be defined, but neither of them will be
+called, because ``__name__ != '__main__'``.
+
+
+Packaging Considerations
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+``main`` functions are often used to create command-line tools by specifying
+them as entry points for console scripts.  When this is done,
+`pip <https://pip.pypa.io/>`_ inserts the function call into a template script,
+where the return value of ``main`` is passed into :func:`sys.exit`.
+For example::
+
+    sys.exit(main())
+
+Since the call to ``main`` is wrapped in :func:`sys.exit`, the expectation is
+that your function will return some value acceptable as an input to
+:func:`sys.exit`; typically, an integer or ``None`` (which is implicitly
+returned if your function does not have a return statement).
+
+By proactively following this convention ourselves, our module will have the
+same behavior when run directly (i.e. ``python3 echo.py``) as it will have if
+we later package it as a console script entry-point in a pip-installable
+package.
+
+In particular, be careful about returning strings from your ``main`` function.
+:func:`sys.exit` will interpret a string argument as a failure message, so
+your program will have an exit code of ``1``, indicating failure, and the
+string will be written to :data:`sys.stderr`.  The ``echo.py`` example from
+earlier exemplifies using the ``sys.exit(main())`` convention.
+
+.. seealso::
+
+   `Python Packaging User Guide <https://packaging.python.org/>`_
+   contains a collection of tutorials and references on how to distribute and
+   install Python packages with modern tools.
+
+
+``__main__.py`` in Python Packages
+----------------------------------
+
+If you are not familiar with Python packages, see section :ref:`tut-packages`
+of the tutorial.  Most commonly, the ``__main__.py`` file is used to provide
+a command-line interface for a package. Consider the following hypothetical
+package, "bandclass":
+
+.. code-block:: text
+
+   bandclass
+     ??? __init__.py
+     ??? __main__.py
+     ??? student.py
+
+``__main__.py`` will be executed when the package itself is invoked
+directly from the command line using the :option:`-m` flag. For example:
+
+.. code-block:: shell-session
+
+   $ python3 -m bandclass
+
+This command will cause ``__main__.py`` to run. How you utilize this mechanism
+will depend on the nature of the package you are writing, but in this
+hypothetical case, it might make sense to allow the teacher to search for
+students::
+
+    # bandclass/__main__.py
+
+    import sys
+    from .student import search_students
+
+    student_name = sys.argv[2] if len(sys.argv) >= 2 else ''
+    print(f'Found student: {search_students(student_name)}')
+
+Note that ``from .student import search_students`` is an example of a relative
+import.  This import style must be used when referencing modules within a
+package.  For more details, see :ref:`intra-package-references` in the
+:ref:`tut-modules` section of the tutorial.
+
+Idiomatic Usage
+^^^^^^^^^^^^^^^
+
+The contents of ``__main__.py`` typically isn't fenced with
+``if __name__ == '__main__'`` blocks.  Instead, those files are kept short,
+functions to execute from other modules.  Those other modules can then be
+easily unit-tested and are properly reusable.
+
+If used, an ``if __name__ == '__main__'`` block will still work as expected
+for a ``__main__.py`` file within a package, because its ``__name__``
+attribute will include the package's path if imported::
+
+    >>> import asyncio.__main__
+    >>> asyncio.__main__.__name__
+    'asyncio.__main__'
+
+This won't work for ``__main__.py`` files in the root directory of a .zip file
+though.  Hence, for consistency, minimal ``__main__.py`` like the :mod:`venv`
+one mentioned above are preferred.
+
+.. seealso::
+
+   See :mod:`venv` for an example of a package with a minimal ``__main__.py``
+   in the standard library. It doesn't contain a ``if __name__ == '__main__'``
+   block. You can invoke it with ``python3 -m venv [directory]``.
+
+   See :mod:`runpy` for more details on the :option:`-m` flag to the
+   interpreter executable.
+
+   See :mod:`zipapp` for how to run applications packaged as *.zip* files. In
+   this case Python looks for a ``__main__.py`` file in the root directory of
+   the archive.
+
+
+
+``import __main__``
+-------------------
+
+Regardless of which module a Python program was started with, other modules
+running within that same program can import the top-level environment's scope
+(:term:`namespace`) by importing the ``__main__`` module.  This doesn't import
+a ``__main__.py`` file but rather whichever module that received the special
+name ``'__main__'``.
+
+Here is an example module that consumes the ``__main__`` namespace::
+
+    # namely.py
+
+    import __main__
+
+    def did_user_define_their_name():
+        return 'my_name' in dir(__main__)
+
+    def print_user_name():
+        if not did_user_define_their_name():
+            raise ValueError('Define the variable `my_name`!')
+
+        if '__file__' in dir(__main__):
+            print(__main__.my_name, "found in file", __main__.__file__)
+        else:
+            print(__main__.my_name)
+
+Example usage of this module could be as follows::
+
+    # start.py
+
+    import sys
+
+    from namely import print_user_name
+
+    # my_name = "Dinsdale"
+
+    def main():
+        try:
+            print_user_name()
+        except ValueError as ve:
+            return str(ve)
+
+    if __name__ == "__main__":
+        sys.exit(main())
+
+Now, if we started our program, the result would look like this:
+
+.. code-block:: shell-session
+
+   $ python3 start.py
+   Define the variable `my_name`!
+
+The exit code of the program would be 1, indicating an error. Uncommenting the
+line with ``my_name = "Dinsdale"`` fixes the program and now it exits with
+status code 0, indicating success:
+
+.. code-block:: shell-session
+
+   $ python3 start.py
+   Dinsdale found in file /path/to/start.py
+
+Note that importing ``__main__`` doesn't cause any issues with unintentionally
+running top-level code meant for script use which is put in the
+``if __name__ == "__main__"`` block of the ``start`` module. Why does this work?
+
+Python inserts an empty ``__main__`` module in :attr:`sys.modules` at
+interpreter startup, and populates it by running top-level code. In our example
+this is the ``start`` module which runs line by line and imports ``namely``.
+In turn, ``namely`` imports ``__main__`` (which is really ``start``). That's an
+import cycle! Fortunately, since the partially populated ``__main__``
+module is present in :attr:`sys.modules`, Python passes that to ``namely``.
+See :ref:`Special considerations for __main__ <import-dunder-main>` in the
+import system's reference for details on how this works.
+
+The Python REPL is another example of a "top-level environment", so anything
+defined in the REPL becomes part of the ``__main__`` scope::
 
-A module can discover whether or not it is running in the main scope by
-checking its own ``__name__``, which allows a common idiom for conditionally
-executing code in a module when it is run as a script or with ``python
--m`` but not when it is imported::
+    >>> import namely
+    >>> namely.did_user_define_their_name()
+    False
+    >>> namely.print_user_name()
+    Traceback (most recent call last):
+    ...
+    ValueError: Define the variable `my_name`!
+    >>> my_name = 'Jabberwocky'
+    >>> namely.did_user_define_their_name()
+    True
+    >>> namely.print_user_name()
+    Jabberwocky
 
-   if __name__ == "__main__":
-       # execute only if run as a script
-       main()
+Note that in this case the ``__main__`` scope doesn't contain a ``__file__``
+attribute as it's interactive.
 
-For a package, the same effect can be achieved by including a
-``__main__.py`` module, the contents of which will be executed when the
-module is run with ``-m``.
+The ``__main__`` scope is used in the implementation of :mod:`pdb` and
+:mod:`rlcompleter`.
diff --git a/Doc/reference/import.rst b/Doc/reference/import.rst
index 2ef5b901b930bf..9834f957ea9f64 100644
--- a/Doc/reference/import.rst
+++ b/Doc/reference/import.rst
@@ -970,6 +970,8 @@ should expose ``XXX.YYY.ZZZ`` as a usable expression, but .moduleY is
 not a valid expression.
 
 
+.. _import-dunder-main:
+
 Special considerations for __main__
 ===================================
 
diff --git a/Doc/tools/susp-ignored.csv b/Doc/tools/susp-ignored.csv
index c6c665c372849b..54360c2f8ebaa9 100644
--- a/Doc/tools/susp-ignored.csv
+++ b/Doc/tools/susp-ignored.csv
@@ -110,6 +110,7 @@ howto/pyporting,,::,Programming Language :: Python :: 3
 howto/regex,,::,
 howto/regex,,:foo,(?:foo)
 howto/urllib2,,:password,"""joe:password at example.com"""
+library/__main__,,`,
 library/ast,,:upper,lower:upper
 library/ast,,:step,lower:upper:step
 library/audioop,,:ipos,"# factor = audioop.findfactor(in_test[ipos*2:ipos*2+len(out_test)],"
diff --git a/Doc/tutorial/modules.rst b/Doc/tutorial/modules.rst
index af595e5ca04d7e..a495c50cbde880 100644
--- a/Doc/tutorial/modules.rst
+++ b/Doc/tutorial/modules.rst
@@ -533,6 +533,8 @@ importing module needs to use submodules with the same name from different
 packages.
 
 
+.. _intra-package-references:
+
 Intra-package References
 ------------------------
 
diff --git a/Misc/NEWS.d/next/Documentation/2021-06-23-15-21-36.bpo-39452.o_I-6d.rst b/Misc/NEWS.d/next/Documentation/2021-06-23-15-21-36.bpo-39452.o_I-6d.rst
new file mode 100644
index 00000000000000..5c8cbd8e652232
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2021-06-23-15-21-36.bpo-39452.o_I-6d.rst
@@ -0,0 +1,4 @@
+Rewrote ``Doc/library/__main__.rst``. Broadened scope of the document to
+explicitly discuss and differentiate between ``__main__.py`` in packages
+versus the ``__name__ == '__main__'`` expression (and the idioms that
+surround it).


From webhook-mailer at python.org  Wed Aug 25 06:28:56 2021
From: webhook-mailer at python.org (pablogsal)
Date: Wed, 25 Aug 2021 10:28:56 -0000
Subject: [Python-checkins] bpo-44976: Lazy creation of sqlite3 result rows
 (GH-27884)
Message-ID: <mailman.1165.1629887337.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/3df0fc89bc2714f5ef03e36a926bc795dcd5e05a
commit: 3df0fc89bc2714f5ef03e36a926bc795dcd5e05a
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-08-25T11:28:47+01:00
summary:

bpo-44976: Lazy creation of sqlite3 result rows (GH-27884)

files:
M Modules/_sqlite/cursor.c
M Modules/_sqlite/cursor.h

diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
index e418cafb4feb6..8b830ec767b5d 100644
--- a/Modules/_sqlite/cursor.c
+++ b/Modules/_sqlite/cursor.c
@@ -53,7 +53,6 @@ pysqlite_cursor_init_impl(pysqlite_Cursor *self,
     Py_INCREF(connection);
     Py_XSETREF(self->connection, connection);
     Py_CLEAR(self->statement);
-    Py_CLEAR(self->next_row);
     Py_CLEAR(self->row_cast_map);
 
     Py_INCREF(Py_None);
@@ -94,7 +93,6 @@ cursor_traverse(pysqlite_Cursor *self, visitproc visit, void *arg)
     Py_VISIT(self->lastrowid);
     Py_VISIT(self->row_factory);
     Py_VISIT(self->statement);
-    Py_VISIT(self->next_row);
     return 0;
 }
 
@@ -111,7 +109,6 @@ cursor_clear(pysqlite_Cursor *self)
         pysqlite_statement_reset(self->statement);
         Py_CLEAR(self->statement);
     }
-    Py_CLEAR(self->next_row);
 
     return 0;
 }
@@ -489,8 +486,6 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
     self->locked = 1;
     self->reset = 0;
 
-    Py_CLEAR(self->next_row);
-
     if (multiple) {
         if (PyIter_Check(second_argument)) {
             /* iterator */
@@ -658,11 +653,7 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
             }
         }
 
-        if (rc == SQLITE_ROW) {
-            self->next_row = _pysqlite_fetch_one_row(self);
-            if (self->next_row == NULL)
-                goto error;
-        } else if (rc == SQLITE_DONE && !multiple) {
+        if (rc == SQLITE_DONE && !multiple) {
             pysqlite_statement_reset(self->statement);
             Py_CLEAR(self->statement);
         }
@@ -821,10 +812,6 @@ pysqlite_cursor_executescript_impl(pysqlite_Cursor *self,
 static PyObject *
 pysqlite_cursor_iternext(pysqlite_Cursor *self)
 {
-    PyObject* next_row_tuple;
-    PyObject* next_row;
-    int rc;
-
     if (!check_cursor(self)) {
         return NULL;
     }
@@ -835,53 +822,40 @@ pysqlite_cursor_iternext(pysqlite_Cursor *self)
         return NULL;
     }
 
-    if (!self->next_row) {
-         if (self->statement) {
-            (void)pysqlite_statement_reset(self->statement);
-            Py_CLEAR(self->statement);
-        }
+    if (self->statement == NULL) {
         return NULL;
     }
 
-    next_row_tuple = self->next_row;
-    assert(next_row_tuple != NULL);
-    self->next_row = NULL;
-
-    if (self->row_factory != Py_None) {
-        next_row = PyObject_CallFunction(self->row_factory, "OO", self, next_row_tuple);
-        if (next_row == NULL) {
-            self->next_row = next_row_tuple;
-            return NULL;
-        }
-        Py_DECREF(next_row_tuple);
-    } else {
-        next_row = next_row_tuple;
+    sqlite3_stmt *stmt = self->statement->st;
+    assert(stmt != NULL);
+    if (sqlite3_data_count(stmt) == 0) {
+        (void)pysqlite_statement_reset(self->statement);
+        Py_CLEAR(self->statement);
+        return NULL;
     }
 
-    if (self->statement) {
-        rc = pysqlite_step(self->statement->st);
-        if (PyErr_Occurred()) {
-            (void)pysqlite_statement_reset(self->statement);
-            Py_DECREF(next_row);
-            return NULL;
-        }
-        if (rc != SQLITE_DONE && rc != SQLITE_ROW) {
-            (void)pysqlite_statement_reset(self->statement);
-            Py_DECREF(next_row);
-            _pysqlite_seterror(self->connection->state, self->connection->db);
-            return NULL;
-        }
-
-        if (rc == SQLITE_ROW) {
-            self->next_row = _pysqlite_fetch_one_row(self);
-            if (self->next_row == NULL) {
-                (void)pysqlite_statement_reset(self->statement);
-                return NULL;
-            }
-        }
+    PyObject *row = _pysqlite_fetch_one_row(self);
+    if (row == NULL) {
+        return NULL;
     }
-
-    return next_row;
+    int rc = pysqlite_step(stmt);
+    if (rc == SQLITE_DONE) {
+        (void)pysqlite_statement_reset(self->statement);
+    }
+    else if (rc != SQLITE_ROW) {
+        (void)_pysqlite_seterror(self->connection->state,
+                                 self->connection->db);
+        Py_DECREF(row);
+        return NULL;
+    }
+    if (!Py_IsNone(self->row_factory)) {
+        PyObject *factory = self->row_factory;
+        PyObject *args[] = { (PyObject *)self, row, };
+        PyObject *new_row = PyObject_Vectorcall(factory, args, 2, NULL);
+        Py_DECREF(row);
+        row = new_row;
+    }
+    return row;
 }
 
 /*[clinic input]
diff --git a/Modules/_sqlite/cursor.h b/Modules/_sqlite/cursor.h
index 29f52b92189be..d26d20a9fc5ea 100644
--- a/Modules/_sqlite/cursor.h
+++ b/Modules/_sqlite/cursor.h
@@ -46,9 +46,6 @@ typedef struct
     int locked;
     int initialized;
 
-    /* the next row to be returned, NULL if no next row available */
-    PyObject* next_row;
-
     PyObject* in_weakreflist; /* List of weak references */
 } pysqlite_Cursor;
 


From webhook-mailer at python.org  Wed Aug 25 06:59:47 2021
From: webhook-mailer at python.org (pablogsal)
Date: Wed, 25 Aug 2021 10:59:47 -0000
Subject: [Python-checkins] bpo-27334: roll back transaction if sqlite3
 context manager fails to commit (GH-26202)
Message-ID: <mailman.1166.1629889187.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/7ecd3425d45a37efbc745788dfe21df0286c785a
commit: 7ecd3425d45a37efbc745788dfe21df0286c785a
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-08-25T11:59:42+01:00
summary:

bpo-27334: roll back transaction if sqlite3 context manager fails to commit (GH-26202)

Co-authored-by: Luca Citi
Co-authored-by: Berker Peksag <berker.peksag at gmail.com>

files:
A Misc/NEWS.d/next/Library/2021-05-18-00-17-21.bpo-27334.32EJZi.rst
M Lib/sqlite3/test/dbapi.py
M Modules/_sqlite/connection.c

diff --git a/Lib/sqlite3/test/dbapi.py b/Lib/sqlite3/test/dbapi.py
index 5d7e5bba05bc45..bb9d5a7ce3e001 100644
--- a/Lib/sqlite3/test/dbapi.py
+++ b/Lib/sqlite3/test/dbapi.py
@@ -22,11 +22,17 @@
 
 import contextlib
 import sqlite3 as sqlite
+import subprocess
 import sys
 import threading
 import unittest
 
-from test.support import check_disallow_instantiation, threading_helper, bigmemtest
+from test.support import (
+    bigmemtest,
+    check_disallow_instantiation,
+    threading_helper,
+    SHORT_TIMEOUT,
+)
 from test.support.os_helper import TESTFN, unlink
 
 
@@ -986,6 +992,77 @@ def test_on_conflict_replace(self):
         self.assertEqual(self.cu.fetchall(), [('Very different data!', 'foo')])
 
 
+class MultiprocessTests(unittest.TestCase):
+    CONNECTION_TIMEOUT = SHORT_TIMEOUT / 1000.  # Defaults to 30 ms
+
+    def tearDown(self):
+        unlink(TESTFN)
+
+    def test_ctx_mgr_rollback_if_commit_failed(self):
+        # bpo-27334: ctx manager does not rollback if commit fails
+        SCRIPT = f"""if 1:
+            import sqlite3
+            def wait():
+                print("started")
+                assert "database is locked" in input()
+
+            cx = sqlite3.connect("{TESTFN}", timeout={self.CONNECTION_TIMEOUT})
+            cx.create_function("wait", 0, wait)
+            with cx:
+                cx.execute("create table t(t)")
+            try:
+                # execute two transactions; both will try to lock the db
+                cx.executescript('''
+                    -- start a transaction and wait for parent
+                    begin transaction;
+                    select * from t;
+                    select wait();
+                    rollback;
+
+                    -- start a new transaction; would fail if parent holds lock
+                    begin transaction;
+                    select * from t;
+                    rollback;
+                ''')
+            finally:
+                cx.close()
+        """
+
+        # spawn child process
+        proc = subprocess.Popen(
+            [sys.executable, "-c", SCRIPT],
+            encoding="utf-8",
+            bufsize=0,
+            stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE,
+        )
+        self.addCleanup(proc.communicate)
+
+        # wait for child process to start
+        self.assertEqual("started", proc.stdout.readline().strip())
+
+        cx = sqlite.connect(TESTFN, timeout=self.CONNECTION_TIMEOUT)
+        try:  # context manager should correctly release the db lock
+            with cx:
+                cx.execute("insert into t values('test')")
+        except sqlite.OperationalError as exc:
+            proc.stdin.write(str(exc))
+        else:
+            proc.stdin.write("no error")
+        finally:
+            cx.close()
+
+        # terminate child process
+        self.assertIsNone(proc.returncode)
+        try:
+            proc.communicate(input="end", timeout=SHORT_TIMEOUT)
+        except subprocess.TimeoutExpired:
+            proc.kill()
+            proc.communicate()
+            raise
+        self.assertEqual(proc.returncode, 0)
+
+
 def suite():
     tests = [
         ClosedConTests,
@@ -995,6 +1072,7 @@ def suite():
         CursorTests,
         ExtensionTests,
         ModuleTests,
+        MultiprocessTests,
         OpenTests,
         SqliteOnConflictTests,
         ThreadTests,
diff --git a/Misc/NEWS.d/next/Library/2021-05-18-00-17-21.bpo-27334.32EJZi.rst b/Misc/NEWS.d/next/Library/2021-05-18-00-17-21.bpo-27334.32EJZi.rst
new file mode 100644
index 00000000000000..dc0cdf33ec5acf
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-05-18-00-17-21.bpo-27334.32EJZi.rst
@@ -0,0 +1,2 @@
+The :mod:`sqlite3` context manager now performs a rollback (thus releasing the
+database lock) if commit failed.  Patch by Luca Citi and Erlend E. Aasland.
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index 8ad5f5f061da5d..1bc045523a252e 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -1785,17 +1785,31 @@ pysqlite_connection_exit_impl(pysqlite_Connection *self, PyObject *exc_type,
                               PyObject *exc_value, PyObject *exc_tb)
 /*[clinic end generated code: output=0705200e9321202a input=bd66f1532c9c54a7]*/
 {
-    const char* method_name;
+    int commit = 0;
     PyObject* result;
 
     if (exc_type == Py_None && exc_value == Py_None && exc_tb == Py_None) {
-        method_name = "commit";
-    } else {
-        method_name = "rollback";
+        commit = 1;
+        result = pysqlite_connection_commit_impl(self);
     }
-
-    result = PyObject_CallMethod((PyObject*)self, method_name, NULL);
-    if (!result) {
+    else {
+        result = pysqlite_connection_rollback_impl(self);
+    }
+
+    if (result == NULL) {
+        if (commit) {
+            /* Commit failed; try to rollback in order to unlock the database.
+             * If rollback also fails, chain the exceptions. */
+            PyObject *exc, *val, *tb;
+            PyErr_Fetch(&exc, &val, &tb);
+            result = pysqlite_connection_rollback_impl(self);
+            if (result == NULL) {
+                _PyErr_ChainExceptions(exc, val, tb);
+            }
+            else {
+                PyErr_Restore(exc, val, tb);
+            }
+        }
         return NULL;
     }
     Py_DECREF(result);


From webhook-mailer at python.org  Wed Aug 25 07:14:39 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 25 Aug 2021 11:14:39 -0000
Subject: [Python-checkins] bpo-37596: Make `set` and `frozenset` marshalling
 deterministic (GH-27926)
Message-ID: <mailman.1167.1629890080.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/33d95c6facdfda3c8c0feffa7a99184e4abc2f63
commit: 33d95c6facdfda3c8c0feffa7a99184e4abc2f63
branch: main
author: Brandt Bucher <brandt at python.org>
committer: ambv <lukasz at langa.pl>
date: 2021-08-25T13:14:34+02:00
summary:

bpo-37596: Make `set` and `frozenset` marshalling deterministic (GH-27926)

files:
A Misc/NEWS.d/next/Library/2021-08-23-21-39-59.bpo-37596.ojRcwB.rst
M Lib/test/test_marshal.py
M Python/marshal.c

diff --git a/Lib/test/test_marshal.py b/Lib/test/test_marshal.py
index d20b9d2c1ff39..bdfe79fbbecb3 100644
--- a/Lib/test/test_marshal.py
+++ b/Lib/test/test_marshal.py
@@ -344,6 +344,31 @@ def test_eof(self):
         for i in range(len(data)):
             self.assertRaises(EOFError, marshal.loads, data[0: i])
 
+    def test_deterministic_sets(self):
+        # bpo-37596: To support reproducible builds, sets and frozensets need to
+        # have their elements serialized in a consistent order (even when they
+        # have been scrambled by hash randomization):
+        for kind in ("set", "frozenset"):
+            for elements in (
+                "float('nan'), b'a', b'b', b'c', 'x', 'y', 'z'",
+                # Also test for bad interactions with backreferencing:
+                "('string', 1), ('string', 2), ('string', 3)",
+            ):
+                s = f"{kind}([{elements}])"
+                with self.subTest(s):
+                    # First, make sure that our test case still has different
+                    # orders under hash seeds 0 and 1. If this check fails, we
+                    # need to update this test with different elements:
+                    args = ["-c", f"print({s})"]
+                    _, repr_0, _ = assert_python_ok(*args, PYTHONHASHSEED="0")
+                    _, repr_1, _ = assert_python_ok(*args, PYTHONHASHSEED="1")
+                    self.assertNotEqual(repr_0, repr_1)
+                    # Then, perform the actual test:
+                    args = ["-c", f"import marshal; print(marshal.dumps({s}))"]
+                    _, dump_0, _ = assert_python_ok(*args, PYTHONHASHSEED="0")
+                    _, dump_1, _ = assert_python_ok(*args, PYTHONHASHSEED="1")
+                    self.assertEqual(dump_0, dump_1)
+
 LARGE_SIZE = 2**31
 pointer_size = 8 if sys.maxsize > 0xFFFFFFFF else 4
 
diff --git a/Misc/NEWS.d/next/Library/2021-08-23-21-39-59.bpo-37596.ojRcwB.rst b/Misc/NEWS.d/next/Library/2021-08-23-21-39-59.bpo-37596.ojRcwB.rst
new file mode 100644
index 0000000000000..81fdfeb629456
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-23-21-39-59.bpo-37596.ojRcwB.rst
@@ -0,0 +1,2 @@
+Ensure that :class:`set` and :class:`frozenset` objects are always
+:mod:`marshalled <marshal>` reproducibly.
diff --git a/Python/marshal.c b/Python/marshal.c
index 1260704c74c0b..b69c4d09641da 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -503,9 +503,41 @@ w_complex_object(PyObject *v, char flag, WFILE *p)
             W_TYPE(TYPE_SET, p);
         n = PySet_GET_SIZE(v);
         W_SIZE(n, p);
+        // bpo-37596: To support reproducible builds, sets and frozensets need
+        // to have their elements serialized in a consistent order (even when
+        // they have been scrambled by hash randomization). To ensure this, we
+        // use an order equivalent to sorted(v, key=marshal.dumps):
+        PyObject *pairs = PyList_New(0);
+        if (pairs == NULL) {
+            p->error = WFERR_NOMEMORY;
+            return;
+        }
         while (_PySet_NextEntry(v, &pos, &value, &hash)) {
+            PyObject *dump = PyMarshal_WriteObjectToString(value, p->version);
+            if (dump == NULL) {
+                p->error = WFERR_UNMARSHALLABLE;
+                goto anyset_done;
+            }
+            PyObject *pair = PyTuple_Pack(2, dump, value);
+            Py_DECREF(dump);
+            if (pair == NULL || PyList_Append(pairs, pair)) {
+                p->error = WFERR_NOMEMORY;
+                Py_XDECREF(pair);
+                goto anyset_done;
+            }
+            Py_DECREF(pair);
+        }
+        if (PyList_Sort(pairs)) {
+            p->error = WFERR_NOMEMORY;
+            goto anyset_done;
+        }
+        for (Py_ssize_t i = 0; i < n; i++) {
+            PyObject *pair = PyList_GET_ITEM(pairs, i);
+            value = PyTuple_GET_ITEM(pair, 1);
             w_object(value, p);
         }
+    anyset_done:
+        Py_DECREF(pairs);
     }
     else if (PyCode_Check(v)) {
         PyCodeObject *co = (PyCodeObject *)v;


From webhook-mailer at python.org  Wed Aug 25 08:41:32 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 25 Aug 2021 12:41:32 -0000
Subject: [Python-checkins] Format the Python-tokenize module and fix exit
 path (GH-27935)
Message-ID: <mailman.1168.1629895293.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/214c2e5d916d3ce5e7b1db800210b93001850bbb
commit: 214c2e5d916d3ce5e7b1db800210b93001850bbb
branch: main
author: Pablo Galindo Salgado <Pablogsal at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-25T14:41:14+02:00
summary:

Format the Python-tokenize module and fix exit path (GH-27935)

files:
M Python/Python-tokenize.c

diff --git a/Python/Python-tokenize.c b/Python/Python-tokenize.c
index b9fb1693ce117..2933b5b7b1e20 100644
--- a/Python/Python-tokenize.c
+++ b/Python/Python-tokenize.c
@@ -4,16 +4,15 @@
 static struct PyModuleDef _tokenizemodule;
 
 typedef struct {
-    PyTypeObject* TokenizerIter;
+    PyTypeObject *TokenizerIter;
 } tokenize_state;
 
-static tokenize_state*
-get_tokenize_state(PyObject* module)
-{
-    return (tokenize_state*)PyModule_GetState(module);
+static tokenize_state *
+get_tokenize_state(PyObject *module) {
+    return (tokenize_state *)PyModule_GetState(module);
 }
 
-#define _tokenize_get_state_by_type(type)                                                               \
+#define _tokenize_get_state_by_type(type) \
     get_tokenize_state(_PyType_GetModuleByDef(type, &_tokenizemodule))
 
 #include "clinic/Python-tokenize.c.h"
@@ -24,9 +23,9 @@ class _tokenizer.tokenizeriter "tokenizeriterobject *" "_tokenize_get_state_by_t
 [clinic start generated code]*/
 /*[clinic end generated code: output=da39a3ee5e6b4b0d input=96d98ee2fef7a8bc]*/
 
-typedef struct {
-    PyObject_HEAD
-    struct tok_state* tok;
+typedef struct
+{
+    PyObject_HEAD struct tok_state *tok;
 } tokenizeriterobject;
 
 /*[clinic input]
@@ -40,27 +39,28 @@ static PyObject *
 tokenizeriter_new_impl(PyTypeObject *type, const char *source)
 /*[clinic end generated code: output=7fd9f46cf9263cbb input=4384b368407375c6]*/
 {
-    tokenizeriterobject* self = (tokenizeriterobject*)type->tp_alloc(type, 0);
+    tokenizeriterobject *self = (tokenizeriterobject *)type->tp_alloc(type, 0);
     if (self == NULL) {
         return NULL;
     }
-    PyObject* filename = PyUnicode_FromString("<string>");
+    PyObject *filename = PyUnicode_FromString("<string>");
     if (filename == NULL) {
         return NULL;
     }
     self->tok = PyTokenizer_FromUTF8(source, 1);
     if (self->tok == NULL) {
+        Py_DECREF(filename);
         return NULL;
     }
     self->tok->filename = filename;
-    return (PyObject*)self;
+    return (PyObject *)self;
 }
 
-static PyObject*
-tokenizeriter_next(tokenizeriterobject* it)
+static PyObject *
+tokenizeriter_next(tokenizeriterobject *it)
 {
-    const char* start;
-    const char* end;
+    const char *start;
+    const char *end;
     int type = PyTokenizer_Get(it->tok, &start, &end);
     if (type == ERRORTOKEN && PyErr_Occurred()) {
         return NULL;
@@ -69,10 +69,11 @@ tokenizeriter_next(tokenizeriterobject* it)
         PyErr_SetString(PyExc_StopIteration, "EOF");
         return NULL;
     }
-    PyObject* str = NULL;
+    PyObject *str = NULL;
     if (start == NULL || end == NULL) {
         str = PyUnicode_FromString("");
-    } else {
+    }
+    else {
         str = PyUnicode_FromStringAndSize(start, end - start);
     }
     if (str == NULL) {
@@ -80,12 +81,12 @@ tokenizeriter_next(tokenizeriterobject* it)
     }
 
     Py_ssize_t size = it->tok->inp - it->tok->buf;
-    PyObject* line = PyUnicode_DecodeUTF8(it->tok->buf, size, "replace");
+    PyObject *line = PyUnicode_DecodeUTF8(it->tok->buf, size, "replace");
     if (line == NULL) {
         Py_DECREF(str);
         return NULL;
     }
-    const char* line_start = type == STRING ? it->tok->multi_line_start : it->tok->line_start;
+    const char *line_start = type == STRING ? it->tok->multi_line_start : it->tok->line_start;
     int lineno = type == STRING ? it->tok->first_lineno : it->tok->lineno;
     int end_lineno = it->tok->lineno;
     int col_offset = -1;
@@ -101,41 +102,39 @@ tokenizeriter_next(tokenizeriterobject* it)
 }
 
 static void
-tokenizeriter_dealloc(tokenizeriterobject* it)
+tokenizeriter_dealloc(tokenizeriterobject *it)
 {
-    PyTypeObject* tp = Py_TYPE(it);
+    PyTypeObject *tp = Py_TYPE(it);
     PyTokenizer_Free(it->tok);
     tp->tp_free(it);
     Py_DECREF(tp);
 }
 
 static PyType_Slot tokenizeriter_slots[] = {
-        {Py_tp_new, tokenizeriter_new},
-        {Py_tp_dealloc, tokenizeriter_dealloc},
-        {Py_tp_getattro, PyObject_GenericGetAttr},
-        {Py_tp_iter, PyObject_SelfIter},
-        {Py_tp_iternext, tokenizeriter_next},
-        {0, NULL},
+    {Py_tp_new, tokenizeriter_new},
+    {Py_tp_dealloc, tokenizeriter_dealloc},
+    {Py_tp_getattro, PyObject_GenericGetAttr},
+    {Py_tp_iter, PyObject_SelfIter},
+    {Py_tp_iternext, tokenizeriter_next},
+    {0, NULL},
 };
 
 static PyType_Spec tokenizeriter_spec = {
-        .name = "_tokenize.TokenizerIter",
-        .basicsize = sizeof(tokenizeriterobject),
-        .flags = (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_IMMUTABLETYPE),
-        .slots = tokenizeriter_slots,
+    .name = "_tokenize.TokenizerIter",
+    .basicsize = sizeof(tokenizeriterobject),
+    .flags = (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_IMMUTABLETYPE),
+    .slots = tokenizeriter_slots,
 };
 
-
 static int
-tokenizemodule_exec(PyObject* m)
+tokenizemodule_exec(PyObject *m)
 {
-    tokenize_state* state = get_tokenize_state(m);
+    tokenize_state *state = get_tokenize_state(m);
     if (state == NULL) {
         return -1;
     }
 
-    state->TokenizerIter = (PyTypeObject *)PyType_FromModuleAndSpec(
-        m, &tokenizeriter_spec, NULL);
+    state->TokenizerIter = (PyTypeObject *)PyType_FromModuleAndSpec(m, &tokenizeriter_spec, NULL);
     if (state->TokenizerIter == NULL) {
         return -1;
     }
@@ -147,11 +146,11 @@ tokenizemodule_exec(PyObject* m)
 }
 
 static PyMethodDef tokenize_methods[] = {
-        {NULL, NULL, 0, NULL} /* Sentinel */
+    {NULL, NULL, 0, NULL} /* Sentinel */
 };
 
 static PyModuleDef_Slot tokenizemodule_slots[] = {
-    {Py_mod_exec, tokenizemodule_exec},
+    {Py_mod_exec, tokenizemodule_exec}, 
     {0, NULL}
 };
 
@@ -178,14 +177,14 @@ tokenizemodule_free(void *m)
 }
 
 static struct PyModuleDef _tokenizemodule = {
-        PyModuleDef_HEAD_INIT,
-        .m_name = "_tokenize",
-        .m_size = sizeof(tokenize_state),
-        .m_slots = tokenizemodule_slots,
-        .m_methods = tokenize_methods,
-        .m_traverse = tokenizemodule_traverse,
-        .m_clear = tokenizemodule_clear,
-        .m_free = tokenizemodule_free,
+    PyModuleDef_HEAD_INIT,
+    .m_name = "_tokenize",
+    .m_size = sizeof(tokenize_state),
+    .m_slots = tokenizemodule_slots,
+    .m_methods = tokenize_methods,
+    .m_traverse = tokenizemodule_traverse,
+    .m_clear = tokenizemodule_clear,
+    .m_free = tokenizemodule_free,
 };
 
 PyMODINIT_FUNC


From webhook-mailer at python.org  Wed Aug 25 08:44:29 2021
From: webhook-mailer at python.org (markshannon)
Date: Wed, 25 Aug 2021 12:44:29 -0000
Subject: [Python-checkins] bpo-44990: Change layout of evaluation frames.
 "Layout B" (GH-27933)
Message-ID: <mailman.1169.1629895470.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/f9242d50b18572ef0d584a1c815ed08d1a38e4f4
commit: f9242d50b18572ef0d584a1c815ed08d1a38e4f4
branch: main
author: Mark Shannon <mark at hotpy.org>
committer: markshannon <mark at hotpy.org>
date: 2021-08-25T13:44:20+01:00
summary:

bpo-44990: Change layout of evaluation frames. "Layout B" (GH-27933)

Places the locals between the specials and stack. This is the more "natural" layout for a C struct, makes the code simpler and gives a slight speedup (~1%)

files:
M Include/internal/pycore_frame.h
M Objects/frameobject.c
M Objects/genobject.c
M Objects/typeobject.c
M Python/ceval.c
M Python/frame.c
M Python/pystate.c
M Tools/gdb/libpython.py

diff --git a/Include/internal/pycore_frame.h b/Include/internal/pycore_frame.h
index cd465d73bc6bdb..6afb95c3ad62e0 100644
--- a/Include/internal/pycore_frame.h
+++ b/Include/internal/pycore_frame.h
@@ -29,10 +29,9 @@ typedef struct _interpreter_frame {
     PyObject *generator;
     struct _interpreter_frame *previous;
     int f_lasti;       /* Last instruction if called */
-    int stackdepth;  /* Depth of value stack */
-    int nlocalsplus;
-    PyFrameState f_state;       /* What state the frame is in */
-    PyObject *stack[1];
+    int stacktop;     /* Offset of TOS from localsplus  */
+    PyFrameState f_state;  /* What state the frame is in */
+    PyObject *localsplus[1];
 } InterpreterFrame;
 
 static inline int _PyFrame_IsRunnable(InterpreterFrame *f) {
@@ -47,6 +46,26 @@ static inline int _PyFrameHasCompleted(InterpreterFrame *f) {
     return f->f_state > FRAME_EXECUTING;
 }
 
+static inline PyObject **_PyFrame_Stackbase(InterpreterFrame *f) {
+    return f->localsplus + f->f_code->co_nlocalsplus;
+}
+
+static inline PyObject *_PyFrame_StackPeek(InterpreterFrame *f) {
+    assert(f->stacktop > f->f_code->co_nlocalsplus);
+    return f->localsplus[f->stacktop-1];
+}
+
+static inline PyObject *_PyFrame_StackPop(InterpreterFrame *f) {
+    assert(f->stacktop > f->f_code->co_nlocalsplus);
+    f->stacktop--;
+    return f->localsplus[f->stacktop];
+}
+
+static inline void _PyFrame_StackPush(InterpreterFrame *f, PyObject *value) {
+    f->localsplus[f->stacktop] = value;
+    f->stacktop++;
+}
+
 #define FRAME_SPECIALS_SIZE ((sizeof(InterpreterFrame)-1)/sizeof(PyObject *))
 
 InterpreterFrame *
@@ -61,8 +80,7 @@ _PyFrame_InitializeSpecials(
     frame->f_builtins = Py_NewRef(con->fc_builtins);
     frame->f_globals = Py_NewRef(con->fc_globals);
     frame->f_locals = Py_XNewRef(locals);
-    frame->nlocalsplus = nlocalsplus;
-    frame->stackdepth = 0;
+    frame->stacktop = nlocalsplus;
     frame->frame_obj = NULL;
     frame->generator = NULL;
     frame->f_lasti = -1;
@@ -75,7 +93,19 @@ _PyFrame_InitializeSpecials(
 static inline PyObject**
 _PyFrame_GetLocalsArray(InterpreterFrame *frame)
 {
-    return ((PyObject **)frame) - frame->nlocalsplus;
+    return frame->localsplus;
+}
+
+static inline PyObject**
+_PyFrame_GetStackPointer(InterpreterFrame *frame)
+{
+    return frame->localsplus+frame->stacktop;
+}
+
+static inline void
+_PyFrame_SetStackPointer(InterpreterFrame *frame, PyObject **stack_pointer)
+{
+    frame->stacktop = (int)(stack_pointer - frame->localsplus);
 }
 
 /* For use by _PyFrame_GetFrameObject
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 2af69597c396ee..00d6888ff2a2ac 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -397,9 +397,7 @@ first_line_not_before(int *lines, int len, int line)
 static void
 frame_stack_pop(PyFrameObject *f)
 {
-    assert(f->f_frame->stackdepth > 0);
-    f->f_frame->stackdepth--;
-    PyObject *v = f->f_frame->stack[f->f_frame->stackdepth];
+    PyObject *v = _PyFrame_StackPop(f->f_frame);
     Py_DECREF(v);
 }
 
@@ -633,14 +631,10 @@ frame_dealloc(PyFrameObject *f)
         Py_CLEAR(frame->f_builtins);
         Py_CLEAR(frame->f_locals);
         PyObject **locals = _PyFrame_GetLocalsArray(frame);
-        for (int i = 0; i < co->co_nlocalsplus; i++) {
+        for (int i = 0; i < frame->stacktop; i++) {
             Py_CLEAR(locals[i]);
         }
-        /* stack */
-        for (int i = 0; i < frame->stackdepth; i++) {
-            Py_CLEAR(frame->stack[i]);
-        }
-        PyMem_Free(locals);
+        PyMem_Free(frame);
     }
     Py_CLEAR(f->f_back);
     Py_CLEAR(f->f_trace);
@@ -686,17 +680,13 @@ frame_tp_clear(PyFrameObject *f)
 
     Py_CLEAR(f->f_trace);
 
-    /* locals */
+    /* locals and stack */
     PyObject **locals = _PyFrame_GetLocalsArray(f->f_frame);
-    for (int i = 0; i < f->f_frame->nlocalsplus; i++) {
+    assert(f->f_frame->stacktop >= 0);
+    for (int i = 0; i < f->f_frame->stacktop; i++) {
         Py_CLEAR(locals[i]);
     }
-
-    /* stack */
-    for (int i = 0; i < f->f_frame->stackdepth; i++) {
-        Py_CLEAR(f->f_frame->stack[i]);
-    }
-    f->f_frame->stackdepth = 0;
+    f->f_frame->stacktop = 0;
     return 0;
 }
 
diff --git a/Objects/genobject.c b/Objects/genobject.c
index 86cd9cf7254589..7a687ce7f7cdfb 100644
--- a/Objects/genobject.c
+++ b/Objects/genobject.c
@@ -190,8 +190,7 @@ gen_send_ex2(PyGenObject *gen, PyObject *arg, PyObject **presult,
     /* Push arg onto the frame's value stack */
     result = arg ? arg : Py_None;
     Py_INCREF(result);
-    frame->stack[frame->stackdepth] = result;
-    frame->stackdepth++;
+    _PyFrame_StackPush(frame, result);
 
     frame->previous = tstate->frame;
 
@@ -350,8 +349,7 @@ _PyGen_yf(PyGenObject *gen)
 
         if (code[(frame->f_lasti+1)*sizeof(_Py_CODEUNIT)] != YIELD_FROM)
             return NULL;
-        assert(frame->stackdepth > 0);
-        yf = frame->stack[frame->stackdepth-1];
+        yf = _PyFrame_StackPeek(frame);
         Py_INCREF(yf);
     }
 
@@ -469,9 +467,7 @@ _gen_throw(PyGenObject *gen, int close_on_genexit,
         if (!ret) {
             PyObject *val;
             /* Pop subiterator from stack */
-            assert(gen->gi_xframe->stackdepth > 0);
-            gen->gi_xframe->stackdepth--;
-            ret = gen->gi_xframe->stack[gen->gi_xframe->stackdepth];
+            ret = _PyFrame_StackPop(gen->gi_xframe);
             assert(ret == yf);
             Py_DECREF(ret);
             /* Termination repetition of YIELD_FROM */
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index a38690aed5c818..ec274a025de30c 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -8874,7 +8874,7 @@ super_init_without_args(PyFrameObject *f, PyCodeObject *co,
         return -1;
     }
 
-    assert(f->f_frame->nlocalsplus > 0);
+    assert(f->f_frame->f_code->co_nlocalsplus > 0);
     PyObject *firstarg = _PyFrame_GetLocalsArray(f->f_frame)[0];
     // The first argument might be a cell.
     if (firstarg != NULL && (_PyLocals_GetKind(co->co_localspluskinds, 0) & CO_FAST_CELL)) {
diff --git a/Python/ceval.c b/Python/ceval.c
index 333c54f50e2e3a..5fec90b10483ab 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1367,7 +1367,7 @@ eval_frame_handle_pending(PyThreadState *tstate)
 
 /* The stack can grow at most MAXINT deep, as co_nlocals and
    co_stacksize are ints. */
-#define STACK_LEVEL()     ((int)(stack_pointer - frame->stack))
+#define STACK_LEVEL()     ((int)(stack_pointer - _PyFrame_Stackbase(frame)))
 #define EMPTY()           (STACK_LEVEL() == 0)
 #define TOP()             (stack_pointer[-1])
 #define SECOND()          (stack_pointer[-2])
@@ -1413,7 +1413,7 @@ eval_frame_handle_pending(PyThreadState *tstate)
 
 /* Local variable macros */
 
-#define GETLOCAL(i)     (localsplus[i])
+#define GETLOCAL(i)     (frame->localsplus[i])
 
 /* The SETLOCAL() macro must not DECREF the local variable in-place and
    then store the new value; it must copy the old value to a temporary
@@ -1559,7 +1559,6 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
 
     PyObject *names = co->co_names;
     PyObject *consts = co->co_consts;
-    PyObject **localsplus = _PyFrame_GetLocalsArray(frame);
     _Py_CODEUNIT *first_instr = co->co_firstinstr;
     /*
        frame->f_lasti refers to the index of the last instruction,
@@ -1578,14 +1577,14 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
     */
     assert(frame->f_lasti >= -1);
     _Py_CODEUNIT *next_instr = first_instr + frame->f_lasti + 1;
-    PyObject **stack_pointer = frame->stack + frame->stackdepth;
+    PyObject **stack_pointer = _PyFrame_GetStackPointer(frame);
     /* Set stackdepth to -1.
      * Update when returning or calling trace function.
-       Having f_stackdepth <= 0 ensures that invalid
+       Having stackdepth <= 0 ensures that invalid
        values are not visible to the cycle GC.
        We choose -1 rather than 0 to assist debugging.
      */
-    frame->stackdepth = -1;
+    frame->stacktop = -1;
     frame->f_state = FRAME_EXECUTING;
 
 #ifdef LLTRACE
@@ -1668,7 +1667,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             int err;
             /* see maybe_call_line_trace()
                for expository comments */
-            frame->stackdepth = (int)(stack_pointer - frame->stack);
+            _PyFrame_SetStackPointer(frame, stack_pointer);
 
             err = maybe_call_line_trace(tstate->c_tracefunc,
                                         tstate->c_traceobj,
@@ -1679,8 +1678,9 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             }
             /* Reload possibly changed frame fields */
             JUMPTO(frame->f_lasti);
-            stack_pointer = frame->stack+frame->stackdepth;
-            frame->stackdepth = -1;
+
+            stack_pointer = _PyFrame_GetStackPointer(frame);
+            frame->stacktop = -1;
             TRACING_NEXTOPARG();
         }
         PRE_DISPATCH_GOTO();
@@ -2439,7 +2439,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             retval = POP();
             assert(EMPTY());
             frame->f_state = FRAME_RETURNED;
-            frame->stackdepth = 0;
+            _PyFrame_SetStackPointer(frame, stack_pointer);
             goto exiting;
         }
 
@@ -2627,7 +2627,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             assert(frame->f_lasti > 0);
             frame->f_lasti -= 1;
             frame->f_state = FRAME_SUSPENDED;
-            frame->stackdepth = (int)(stack_pointer - frame->stack);
+            _PyFrame_SetStackPointer(frame, stack_pointer);
             goto exiting;
         }
 
@@ -2644,7 +2644,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
                 retval = w;
             }
             frame->f_state = FRAME_SUSPENDED;
-            frame->stackdepth = (int)(stack_pointer - frame->stack);
+            _PyFrame_SetStackPointer(frame, stack_pointer);
             goto exiting;
         }
 
@@ -4346,7 +4346,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
                 oparg = cache->adaptive.original_oparg;
                 STAT_DEC(LOAD_METHOD, unquickened);
                 JUMP_TO_INSTRUCTION(LOAD_METHOD);
-            }            
+            }
         }
 
         TARGET(LOAD_METHOD_CACHED): {
@@ -4364,7 +4364,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             assert(cache1->tp_version != 0);
             assert(self_cls->tp_dictoffset >= 0);
             assert(Py_TYPE(self_cls)->tp_dictoffset > 0);
-            
+
             // inline version of _PyObject_GetDictPtr for offset >= 0
             PyObject *dict = self_cls->tp_dictoffset != 0 ?
                 *(PyObject **) ((char *)self + self_cls->tp_dictoffset) : NULL;
@@ -4817,17 +4817,20 @@ MISS_WITH_OPARG_COUNTER(BINARY_SUBSCR)
             assert(_PyErr_Occurred(tstate));
 
             /* Pop remaining stack entries. */
-            while (!EMPTY()) {
+            PyObject **stackbase = _PyFrame_Stackbase(frame);
+            while (stack_pointer > stackbase) {
                 PyObject *o = POP();
                 Py_XDECREF(o);
             }
-            frame->stackdepth = 0;
+            assert(STACK_LEVEL() == 0);
+            _PyFrame_SetStackPointer(frame, stack_pointer);
             frame->f_state = FRAME_RAISED;
             goto exiting;
         }
 
         assert(STACK_LEVEL() >= level);
-        while (STACK_LEVEL() > level) {
+        PyObject **new_top = _PyFrame_Stackbase(frame) + level;
+        while (stack_pointer > new_top) {
             PyObject *v = POP();
             Py_XDECREF(v);
         }
@@ -4981,7 +4984,7 @@ missing_arguments(PyThreadState *tstate, PyCodeObject *co,
         end = start + co->co_kwonlyargcount;
     }
     for (i = start; i < end; i++) {
-        if (GETLOCAL(i) == NULL) {
+        if (localsplus[i] == NULL) {
             PyObject *raw = PyTuple_GET_ITEM(co->co_localsplusnames, i);
             PyObject *name = PyObject_Repr(raw);
             if (name == NULL) {
@@ -5010,7 +5013,7 @@ too_many_positional(PyThreadState *tstate, PyCodeObject *co,
     assert((co->co_flags & CO_VARARGS) == 0);
     /* Count missing keyword-only args. */
     for (i = co_argcount; i < co_argcount + co->co_kwonlyargcount; i++) {
-        if (GETLOCAL(i) != NULL) {
+        if (localsplus[i] != NULL) {
             kwonly_given++;
         }
     }
@@ -5217,7 +5220,8 @@ initialize_locals(PyThreadState *tstate, PyFrameConstructor *con,
         if (co->co_flags & CO_VARARGS) {
             i++;
         }
-        SETLOCAL(i, kwdict);
+        assert(localsplus[i] == NULL);
+        localsplus[i] = kwdict;
     }
     else {
         kwdict = NULL;
@@ -5234,7 +5238,8 @@ initialize_locals(PyThreadState *tstate, PyFrameConstructor *con,
     for (j = 0; j < n; j++) {
         PyObject *x = args[j];
         Py_INCREF(x);
-        SETLOCAL(j, x);
+        assert(localsplus[j] == NULL);
+        localsplus[j] = x;
     }
 
     /* Pack other positional arguments into the *args argument */
@@ -5243,7 +5248,8 @@ initialize_locals(PyThreadState *tstate, PyFrameConstructor *con,
         if (u == NULL) {
             goto fail;
         }
-        SETLOCAL(total_args, u);
+        assert(localsplus[total_args] == NULL);
+        localsplus[total_args] = u;
     }
 
     /* Handle keyword arguments */
@@ -5307,14 +5313,14 @@ initialize_locals(PyThreadState *tstate, PyFrameConstructor *con,
             continue;
 
         kw_found:
-            if (GETLOCAL(j) != NULL) {
+            if (localsplus[j] != NULL) {
                 _PyErr_Format(tstate, PyExc_TypeError,
                             "%U() got multiple values for argument '%S'",
                           con->fc_qualname, keyword);
                 goto fail;
             }
             Py_INCREF(value);
-            SETLOCAL(j, value);
+            localsplus[j] = value;
         }
     }
 
@@ -5331,7 +5337,7 @@ initialize_locals(PyThreadState *tstate, PyFrameConstructor *con,
         Py_ssize_t m = co->co_argcount - defcount;
         Py_ssize_t missing = 0;
         for (i = argcount; i < m; i++) {
-            if (GETLOCAL(i) == NULL) {
+            if (localsplus[i] == NULL) {
                 missing++;
             }
         }
@@ -5347,10 +5353,10 @@ initialize_locals(PyThreadState *tstate, PyFrameConstructor *con,
         if (defcount) {
             PyObject **defs = &PyTuple_GET_ITEM(con->fc_defaults, 0);
             for (; i < defcount; i++) {
-                if (GETLOCAL(m+i) == NULL) {
+                if (localsplus[m+i] == NULL) {
                     PyObject *def = defs[i];
                     Py_INCREF(def);
-                    SETLOCAL(m+i, def);
+                    localsplus[m+i] = def;
                 }
             }
         }
@@ -5360,14 +5366,14 @@ initialize_locals(PyThreadState *tstate, PyFrameConstructor *con,
     if (co->co_kwonlyargcount > 0) {
         Py_ssize_t missing = 0;
         for (i = co->co_argcount; i < total_args; i++) {
-            if (GETLOCAL(i) != NULL)
+            if (localsplus[i] != NULL)
                 continue;
             PyObject *varname = PyTuple_GET_ITEM(co->co_localsplusnames, i);
             if (con->fc_kwdefaults != NULL) {
                 PyObject *def = PyDict_GetItemWithError(con->fc_kwdefaults, varname);
                 if (def) {
                     Py_INCREF(def);
-                    SETLOCAL(i, def);
+                    localsplus[i] = def;
                     continue;
                 }
                 else if (_PyErr_Occurred(tstate)) {
@@ -5407,18 +5413,17 @@ make_coro_frame(PyThreadState *tstate,
     assert(con->fc_defaults == NULL || PyTuple_CheckExact(con->fc_defaults));
     PyCodeObject *code = (PyCodeObject *)con->fc_code;
     int size = code->co_nlocalsplus+code->co_stacksize + FRAME_SPECIALS_SIZE;
-    PyObject **localsarray = PyMem_Malloc(sizeof(PyObject *)*size);
-    if (localsarray == NULL) {
+    InterpreterFrame *frame = (InterpreterFrame *)PyMem_Malloc(sizeof(PyObject *)*size);
+    if (frame == NULL) {
         PyErr_NoMemory();
         return NULL;
     }
     for (Py_ssize_t i=0; i < code->co_nlocalsplus; i++) {
-        localsarray[i] = NULL;
+        frame->localsplus[i] = NULL;
     }
-    InterpreterFrame *frame = (InterpreterFrame *)(localsarray + code->co_nlocalsplus);
     _PyFrame_InitializeSpecials(frame, con, locals, code->co_nlocalsplus);
     assert(frame->frame_obj == NULL);
-    if (initialize_locals(tstate, con, localsarray, args, argcount, kwnames)) {
+    if (initialize_locals(tstate, con, frame->localsplus, args, argcount, kwnames)) {
         _PyFrame_Clear(frame, 1);
         return NULL;
     }
@@ -5497,7 +5502,7 @@ _PyEval_Vector(PyThreadState *tstate, PyFrameConstructor *con,
     }
     assert (tstate->interp->eval_frame != NULL);
     PyObject *retval = _PyEval_EvalFrame(tstate, frame, 0);
-    assert(frame->stackdepth == 0);
+    assert(_PyFrame_GetStackPointer(frame) == _PyFrame_Stackbase(frame));
     if (_PyEvalFrameClearAndPop(tstate, frame)) {
         retval = NULL;
     }
@@ -6764,7 +6769,6 @@ unicode_concatenate(PyThreadState *tstate, PyObject *v, PyObject *w,
         switch (opcode) {
         case STORE_FAST:
         {
-            PyObject **localsplus = _PyFrame_GetLocalsArray(frame);
             if (GETLOCAL(oparg) == v)
                 SETLOCAL(oparg, NULL);
             break;
diff --git a/Python/frame.c b/Python/frame.c
index ae4284346ea12f..3d2415fee70978 100644
--- a/Python/frame.c
+++ b/Python/frame.c
@@ -14,13 +14,11 @@ _PyFrame_Traverse(InterpreterFrame *frame, visitproc visit, void *arg)
     Py_VISIT(frame->f_code);
    /* locals */
     PyObject **locals = _PyFrame_GetLocalsArray(frame);
-    for (int i = 0; i < frame->nlocalsplus; i++) {
+    int i = 0;
+    /* locals and stack */
+    for (; i <frame->stacktop; i++) {
         Py_VISIT(locals[i]);
     }
-    /* stack */
-    for (int i = 0; i <frame->stackdepth; i++) {
-        Py_VISIT(frame->stack[i]);
-    }
     return 0;
 }
 
@@ -47,17 +45,15 @@ _PyFrame_MakeAndSetFrameObject(InterpreterFrame *frame)
 static InterpreterFrame *
 copy_frame_to_heap(InterpreterFrame *frame)
 {
-
-    Py_ssize_t size = ((char*)&frame->stack[frame->stackdepth]) - (char *)_PyFrame_GetLocalsArray(frame);
-    PyObject **copy = PyMem_Malloc(size);
+    assert(frame->stacktop >= frame->f_code->co_nlocalsplus);
+    Py_ssize_t size = ((char*)&frame->localsplus[frame->stacktop]) - (char *)frame;
+    InterpreterFrame *copy = PyMem_Malloc(size);
     if (copy == NULL) {
         PyErr_NoMemory();
         return NULL;
     }
-    PyObject **locals = _PyFrame_GetLocalsArray(frame);
-    memcpy(copy, locals, size);
-    InterpreterFrame *res = (InterpreterFrame *)(copy + frame->nlocalsplus);
-    return res;
+    memcpy(copy, frame, size);
+    return copy;
 }
 
 static inline void
@@ -103,7 +99,6 @@ take_ownership(PyFrameObject *f, InterpreterFrame *frame)
 int
 _PyFrame_Clear(InterpreterFrame * frame, int take)
 {
-    PyObject **localsarray = ((PyObject **)frame)-frame->nlocalsplus;
     if (frame->frame_obj) {
         PyFrameObject *f = frame->frame_obj;
         frame->frame_obj = NULL;
@@ -120,16 +115,13 @@ _PyFrame_Clear(InterpreterFrame * frame, int take)
         }
         Py_DECREF(f);
     }
-    for (int i = 0; i < frame->nlocalsplus; i++) {
-        Py_XDECREF(localsarray[i]);
-    }
-    assert(frame->stackdepth >= 0);
-    for (int i = 0; i < frame->stackdepth; i++) {
-        Py_DECREF(frame->stack[i]);
+    assert(_PyFrame_GetStackPointer(frame) >= _PyFrame_Stackbase(frame));
+    for (int i = 0; i < frame->stacktop; i++) {
+        Py_XDECREF(frame->localsplus[i]);
     }
     clear_specials(frame);
     if (take) {
-        PyMem_Free(_PyFrame_GetLocalsArray(frame));
+        PyMem_Free(frame);
     }
     return 0;
 }
diff --git a/Python/pystate.c b/Python/pystate.c
index 6a15b54d1dd84f..45272142e41734 100644
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -2045,21 +2045,21 @@ _PyThreadState_PushFrame(PyThreadState *tstate, PyFrameConstructor *con, PyObjec
     size_t size = nlocalsplus + code->co_stacksize +
         FRAME_SPECIALS_SIZE;
     assert(size < INT_MAX/sizeof(PyObject *));
-    PyObject **localsarray = tstate->datastack_top;
-    PyObject **top = localsarray + size;
+    PyObject **base = tstate->datastack_top;
+    PyObject **top = base + size;
     if (top >= tstate->datastack_limit) {
-        localsarray = push_chunk(tstate, (int)size);
-        if (localsarray == NULL) {
+        base = push_chunk(tstate, (int)size);
+        if (base == NULL) {
             return NULL;
         }
     }
     else {
         tstate->datastack_top = top;
     }
-    InterpreterFrame * frame = (InterpreterFrame *)(localsarray + nlocalsplus);
+    InterpreterFrame *frame  = (InterpreterFrame *)base;
     _PyFrame_InitializeSpecials(frame, con, locals, nlocalsplus);
     for (int i=0; i < nlocalsplus; i++) {
-        localsarray[i] = NULL;
+        frame->localsplus[i] = NULL;
     }
     return frame;
 }
@@ -2067,8 +2067,8 @@ _PyThreadState_PushFrame(PyThreadState *tstate, PyFrameConstructor *con, PyObjec
 void
 _PyThreadState_PopFrame(PyThreadState *tstate, InterpreterFrame * frame)
 {
-    PyObject **locals = _PyFrame_GetLocalsArray(frame);
-    if (locals == &tstate->datastack_chunk->data[0]) {
+    PyObject **base = (PyObject **)frame;
+    if (base == &tstate->datastack_chunk->data[0]) {
         _PyStackChunk *chunk = tstate->datastack_chunk;
         _PyStackChunk *previous = chunk->previous;
         tstate->datastack_top = &previous->data[previous->top];
@@ -2077,8 +2077,8 @@ _PyThreadState_PopFrame(PyThreadState *tstate, InterpreterFrame * frame)
         tstate->datastack_limit = (PyObject **)(((char *)previous) + previous->size);
     }
     else {
-        assert(tstate->datastack_top >= locals);
-        tstate->datastack_top = locals;
+        assert(tstate->datastack_top >= base);
+        tstate->datastack_top = base;
     }
 }
 
diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py
index 8b09563c18c9b1..c11b23e74b9bed 100755
--- a/Tools/gdb/libpython.py
+++ b/Tools/gdb/libpython.py
@@ -958,9 +958,11 @@ def iter_locals(self):
         if self.is_optimized_out():
             return
 
+
         obj_ptr_ptr = gdb.lookup_type("PyObject").pointer().pointer()
-        base = self._gdbval.cast(obj_ptr_ptr)
-        localsplus = base - self._f_nlocalsplus()
+
+        localsplus = self._gdbval["localsplus"].cast(obj_ptr_ptr)
+
         for i in safe_range(self.co_nlocals):
             pyop_value = PyObjectPtr.from_pyobject_ptr(localsplus[i])
             if pyop_value.is_null():


From webhook-mailer at python.org  Wed Aug 25 09:28:48 2021
From: webhook-mailer at python.org (markshannon)
Date: Wed, 25 Aug 2021 13:28:48 -0000
Subject: [Python-checkins] bpo-44946: Streamline operators and creation of
 ints for common case of single 'digit'. (GH-27832)
Message-ID: <mailman.1170.1629898129.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/15d50d7ed8afd3ab26b00210b5b4feaaadd5af51
commit: 15d50d7ed8afd3ab26b00210b5b4feaaadd5af51
branch: main
author: Mark Shannon <mark at hotpy.org>
committer: markshannon <mark at hotpy.org>
date: 2021-08-25T14:28:43+01:00
summary:

bpo-44946: Streamline operators and creation of ints for common case of single 'digit'. (GH-27832)

files:
M Objects/longobject.c

diff --git a/Objects/longobject.c b/Objects/longobject.c
index d9127b31fd486..18b0839adb6b0 100644
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -26,15 +26,27 @@ class int "PyObject *" "&PyLong_Type"
 _Py_IDENTIFIER(little);
 _Py_IDENTIFIER(big);
 
-/* convert a PyLong of size 1, 0 or -1 to an sdigit */
-#define MEDIUM_VALUE(x) (assert(-1 <= Py_SIZE(x) && Py_SIZE(x) <= 1),   \
-         Py_SIZE(x) < 0 ? -(sdigit)(x)->ob_digit[0] :   \
-             (Py_SIZE(x) == 0 ? (sdigit)0 :                             \
-              (sdigit)(x)->ob_digit[0]))
+/* Is this PyLong of size 1, 0 or -1? */
+#define IS_MEDIUM_VALUE(x) (((size_t)Py_SIZE(x)) + 1U < 3U)
+
+/* convert a PyLong of size 1, 0 or -1 to a C integer */
+static inline stwodigits
+medium_value(PyLongObject *x)
+{
+    assert(IS_MEDIUM_VALUE(x));
+    return ((stwodigits)Py_SIZE(x)) * x->ob_digit[0];
+}
 
 #define IS_SMALL_INT(ival) (-NSMALLNEGINTS <= (ival) && (ival) < NSMALLPOSINTS)
 #define IS_SMALL_UINT(ival) ((ival) < NSMALLPOSINTS)
 
+static inline int is_medium_int(stwodigits x)
+{
+    /* Take care that we are comparing unsigned values. */
+    twodigits x_plus_mask = ((twodigits)x) + PyLong_MASK;
+    return x_plus_mask < ((twodigits)PyLong_MASK) + PyLong_BASE;
+}
+
 static PyObject *
 get_small_int(sdigit ival)
 {
@@ -47,33 +59,16 @@ get_small_int(sdigit ival)
 static PyLongObject *
 maybe_small_long(PyLongObject *v)
 {
-    if (v && Py_ABS(Py_SIZE(v)) <= 1) {
-        sdigit ival = MEDIUM_VALUE(v);
+    if (v && IS_MEDIUM_VALUE(v)) {
+        stwodigits ival = medium_value(v);
         if (IS_SMALL_INT(ival)) {
             Py_DECREF(v);
-            return (PyLongObject *)get_small_int(ival);
+            return (PyLongObject *)get_small_int((sdigit)ival);
         }
     }
     return v;
 }
 
-/* If a freshly-allocated int is already shared, it must
-   be a small integer, so negating it must go to PyLong_FromLong */
-Py_LOCAL_INLINE(void)
-_PyLong_Negate(PyLongObject **x_p)
-{
-    PyLongObject *x;
-
-    x = (PyLongObject *)*x_p;
-    if (Py_REFCNT(x) == 1) {
-        Py_SET_SIZE(x, -Py_SIZE(x));
-        return;
-    }
-
-    *x_p = (PyLongObject *)PyLong_FromLong(-MEDIUM_VALUE(x));
-    Py_DECREF(x);
-}
-
 /* For int multiplication, use the O(N**2) school algorithm unless
  * both operands contain more than KARATSUBA_CUTOFF digits (this
  * being an internal Python int digit, in base BASE).
@@ -121,18 +116,21 @@ PyLongObject *
 _PyLong_New(Py_ssize_t size)
 {
     PyLongObject *result;
-    /* Number of bytes needed is: offsetof(PyLongObject, ob_digit) +
-       sizeof(digit)*size.  Previous incarnations of this code used
-       sizeof(PyVarObject) instead of the offsetof, but this risks being
-       incorrect in the presence of padding between the PyVarObject header
-       and the digits. */
     if (size > (Py_ssize_t)MAX_LONG_DIGITS) {
         PyErr_SetString(PyExc_OverflowError,
                         "too many digits in integer");
         return NULL;
     }
+    /* Fast operations for single digit integers (including zero)
+     * assume that there is always at least one digit present. */
+    Py_ssize_t ndigits = size ? size : 1;
+    /* Number of bytes needed is: offsetof(PyLongObject, ob_digit) +
+       sizeof(digit)*size.  Previous incarnations of this code used
+       sizeof(PyVarObject) instead of the offsetof, but this risks being
+       incorrect in the presence of padding between the PyVarObject header
+       and the digits. */
     result = PyObject_Malloc(offsetof(PyLongObject, ob_digit) +
-                             size*sizeof(digit));
+                             ndigits*sizeof(digit));
     if (!result) {
         PyErr_NoMemory();
         return NULL;
@@ -152,9 +150,9 @@ _PyLong_Copy(PyLongObject *src)
     if (i < 0)
         i = -(i);
     if (i < 2) {
-        sdigit ival = MEDIUM_VALUE(src);
+        stwodigits ival = medium_value(src);
         if (IS_SMALL_INT(ival)) {
-            return get_small_int(ival);
+            return get_small_int((sdigit)ival);
         }
     }
     result = _PyLong_New(i);
@@ -167,65 +165,126 @@ _PyLong_Copy(PyLongObject *src)
     return (PyObject *)result;
 }
 
-/* Create a new int object from a C long int */
+static PyObject *
+_PyLong_FromMedium(sdigit x)
+{
+    assert(!IS_SMALL_INT(x));
+    assert(is_medium_int(x));
+    /* We could use a freelist here */
+    PyLongObject *v = PyObject_Malloc(sizeof(PyLongObject));
+    if (v == NULL) {
+        PyErr_NoMemory();
+        return NULL;
+    }
+    Py_ssize_t sign = x < 0 ? -1: 1;
+    digit abs_x = x < 0 ? -x : x;
+    _PyObject_InitVar((PyVarObject*)v, &PyLong_Type, sign);
+    v->ob_digit[0] = abs_x;
+    return (PyObject*)v;
+}
 
-PyObject *
-PyLong_FromLong(long ival)
+static PyObject *
+_PyLong_FromLarge(stwodigits ival)
 {
-    PyLongObject *v;
-    unsigned long abs_ival;
-    unsigned long t;  /* unsigned so >> doesn't propagate sign bit */
-    int ndigits = 0;
+    twodigits abs_ival;
     int sign;
+    assert(!is_medium_int(ival));
 
+    if (ival < 0) {
+        /* negate: can't write this as abs_ival = -ival since that
+           invokes undefined behaviour when ival is LONG_MIN */
+        abs_ival = 0U-(twodigits)ival;
+        sign = -1;
+    }
+    else {
+        abs_ival = (twodigits)ival;
+        sign = 1;
+    }
+    /* Must be at least two digits */
+    assert(abs_ival >> PyLong_SHIFT != 0);
+    twodigits t = abs_ival >> (PyLong_SHIFT * 2);
+    Py_ssize_t ndigits = 2;
+    while (t) {
+        ++ndigits;
+        t >>= PyLong_SHIFT;
+    }
+    PyLongObject *v = _PyLong_New(ndigits);
+    if (v != NULL) {
+        digit *p = v->ob_digit;
+        Py_SET_SIZE(v, ndigits * sign);
+        t = abs_ival;
+        while (t) {
+            *p++ = Py_SAFE_DOWNCAST(
+                t & PyLong_MASK, twodigits, digit);
+            t >>= PyLong_SHIFT;
+        }
+    }
+    return (PyObject *)v;
+}
+
+/* Create a new int object from a C word-sized int */
+static inline PyObject *
+_PyLong_FromSTwoDigits(stwodigits x)
+{
+    if (IS_SMALL_INT(x)) {
+        return get_small_int((sdigit)x);
+    }
+    assert(x != 0);
+    if (is_medium_int(x)) {
+        return _PyLong_FromMedium((sdigit)x);
+    }
+    return _PyLong_FromLarge(x);
+}
+
+/* If a freshly-allocated int is already shared, it must
+   be a small integer, so negating it must go to PyLong_FromLong */
+Py_LOCAL_INLINE(void)
+_PyLong_Negate(PyLongObject **x_p)
+{
+    PyLongObject *x;
+
+    x = (PyLongObject *)*x_p;
+    if (Py_REFCNT(x) == 1) {
+        Py_SET_SIZE(x, -Py_SIZE(x));
+        return;
+    }
+
+    *x_p = (PyLongObject *)_PyLong_FromSTwoDigits(-medium_value(x));
+    Py_DECREF(x);
+}
+
+/* Create a new int object from a C long int */
+PyObject *
+PyLong_FromLong(long ival)
+{
     if (IS_SMALL_INT(ival)) {
         return get_small_int((sdigit)ival);
     }
-
+    unsigned long abs_ival;
+    int sign;
     if (ival < 0) {
         /* negate: can't write this as abs_ival = -ival since that
            invokes undefined behaviour when ival is LONG_MIN */
-        abs_ival = 0U-(unsigned long)ival;
+        abs_ival = 0U-(twodigits)ival;
         sign = -1;
     }
     else {
         abs_ival = (unsigned long)ival;
-        sign = ival == 0 ? 0 : 1;
+        sign = 1;
     }
-
     /* Fast path for single-digit ints */
     if (!(abs_ival >> PyLong_SHIFT)) {
-        v = _PyLong_New(1);
-        if (v) {
-            Py_SET_SIZE(v, sign);
-            v->ob_digit[0] = Py_SAFE_DOWNCAST(
-                abs_ival, unsigned long, digit);
-        }
-        return (PyObject*)v;
-    }
-
-#if PyLong_SHIFT==15
-    /* 2 digits */
-    if (!(abs_ival >> 2*PyLong_SHIFT)) {
-        v = _PyLong_New(2);
-        if (v) {
-            Py_SET_SIZE(v, 2 * sign);
-            v->ob_digit[0] = Py_SAFE_DOWNCAST(
-                abs_ival & PyLong_MASK, unsigned long, digit);
-            v->ob_digit[1] = Py_SAFE_DOWNCAST(
-                  abs_ival >> PyLong_SHIFT, unsigned long, digit);
-        }
-        return (PyObject*)v;
+        return _PyLong_FromMedium((sdigit)ival);
     }
-#endif
-
-    /* Larger numbers: loop to determine number of digits */
-    t = abs_ival;
+    /* Must be at least two digits.
+     * Do shift in two steps to avoid undefined behavior. */
+    unsigned long t = (abs_ival >> PyLong_SHIFT) >> PyLong_SHIFT;
+    Py_ssize_t ndigits = 2;
     while (t) {
         ++ndigits;
         t >>= PyLong_SHIFT;
     }
-    v = _PyLong_New(ndigits);
+    PyLongObject *v = _PyLong_New(ndigits);
     if (v != NULL) {
         digit *p = v->ob_digit;
         Py_SET_SIZE(v, ndigits * sign);
@@ -2860,12 +2919,12 @@ PyLong_AsDouble(PyObject *v)
         PyErr_SetString(PyExc_TypeError, "an integer is required");
         return -1.0;
     }
-    if (Py_ABS(Py_SIZE(v)) <= 1) {
+    if (IS_MEDIUM_VALUE(v)) {
         /* Fast path; single digit long (31 bits) will cast safely
            to double.  This improves performance of FP/long operations
            by 20%.
         */
-        return (double)MEDIUM_VALUE((PyLongObject *)v);
+        return (double)medium_value((PyLongObject *)v);
     }
     x = _PyLong_Frexp((PyLongObject *)v, &exponent);
     if ((x == -1.0 && PyErr_Occurred()) || exponent > DBL_MAX_EXP) {
@@ -3067,8 +3126,8 @@ long_add(PyLongObject *a, PyLongObject *b)
 
     CHECK_BINOP(a, b);
 
-    if (Py_ABS(Py_SIZE(a)) <= 1 && Py_ABS(Py_SIZE(b)) <= 1) {
-        return PyLong_FromLong(MEDIUM_VALUE(a) + MEDIUM_VALUE(b));
+    if (IS_MEDIUM_VALUE(a) && IS_MEDIUM_VALUE(b)) {
+        return _PyLong_FromSTwoDigits(medium_value(a) + medium_value(b));
     }
     if (Py_SIZE(a) < 0) {
         if (Py_SIZE(b) < 0) {
@@ -3101,8 +3160,8 @@ long_sub(PyLongObject *a, PyLongObject *b)
 
     CHECK_BINOP(a, b);
 
-    if (Py_ABS(Py_SIZE(a)) <= 1 && Py_ABS(Py_SIZE(b)) <= 1) {
-        return PyLong_FromLong(MEDIUM_VALUE(a) - MEDIUM_VALUE(b));
+    if (IS_MEDIUM_VALUE(a) && IS_MEDIUM_VALUE(b)) {
+        return _PyLong_FromSTwoDigits(medium_value(a) - medium_value(b));
     }
     if (Py_SIZE(a) < 0) {
         if (Py_SIZE(b) < 0) {
@@ -3536,9 +3595,9 @@ long_mul(PyLongObject *a, PyLongObject *b)
     CHECK_BINOP(a, b);
 
     /* fast path for single-digit multiplication */
-    if (Py_ABS(Py_SIZE(a)) <= 1 && Py_ABS(Py_SIZE(b)) <= 1) {
-        stwodigits v = (stwodigits)(MEDIUM_VALUE(a)) * MEDIUM_VALUE(b);
-        return PyLong_FromLongLong((long long)v);
+    if (IS_MEDIUM_VALUE(a) && IS_MEDIUM_VALUE(b)) {
+        stwodigits v = medium_value(a) * medium_value(b);
+        return _PyLong_FromSTwoDigits(v);
     }
 
     z = k_mul(a, b);
@@ -4343,8 +4402,8 @@ long_invert(PyLongObject *v)
 {
     /* Implement ~x as -(x+1) */
     PyLongObject *x;
-    if (Py_ABS(Py_SIZE(v)) <=1)
-        return PyLong_FromLong(-(MEDIUM_VALUE(v)+1));
+    if (IS_MEDIUM_VALUE(v))
+        return _PyLong_FromSTwoDigits(~medium_value(v));
     x = (PyLongObject *) long_add(v, (PyLongObject *)_PyLong_GetOne());
     if (x == NULL)
         return NULL;
@@ -4358,8 +4417,8 @@ static PyObject *
 long_neg(PyLongObject *v)
 {
     PyLongObject *z;
-    if (Py_ABS(Py_SIZE(v)) <= 1)
-        return PyLong_FromLong(-MEDIUM_VALUE(v));
+    if (IS_MEDIUM_VALUE(v))
+        return _PyLong_FromSTwoDigits(-medium_value(v));
     z = (PyLongObject *)_PyLong_Copy(v);
     if (z != NULL)
         Py_SET_SIZE(z, -(Py_SIZE(v)));
@@ -4704,28 +4763,37 @@ long_bitwise(PyLongObject *a,
 static PyObject *
 long_and(PyObject *a, PyObject *b)
 {
-    PyObject *c;
     CHECK_BINOP(a, b);
-    c = long_bitwise((PyLongObject*)a, '&', (PyLongObject*)b);
-    return c;
+    PyLongObject *x = (PyLongObject*)a;
+    PyLongObject *y = (PyLongObject*)b;
+    if (IS_MEDIUM_VALUE(x) && IS_MEDIUM_VALUE(y)) {
+        return _PyLong_FromSTwoDigits(medium_value(x) & medium_value(y));
+    }
+    return long_bitwise(x, '&', y);
 }
 
 static PyObject *
 long_xor(PyObject *a, PyObject *b)
 {
-    PyObject *c;
     CHECK_BINOP(a, b);
-    c = long_bitwise((PyLongObject*)a, '^', (PyLongObject*)b);
-    return c;
+    PyLongObject *x = (PyLongObject*)a;
+    PyLongObject *y = (PyLongObject*)b;
+    if (IS_MEDIUM_VALUE(x) && IS_MEDIUM_VALUE(y)) {
+        return _PyLong_FromSTwoDigits(medium_value(x) ^ medium_value(y));
+    }
+    return long_bitwise(x, '^', y);
 }
 
 static PyObject *
 long_or(PyObject *a, PyObject *b)
 {
-    PyObject *c;
     CHECK_BINOP(a, b);
-    c = long_bitwise((PyLongObject*)a, '|', (PyLongObject*)b);
-    return c;
+    PyLongObject *x = (PyLongObject*)a;
+    PyLongObject *y = (PyLongObject*)b;
+    if (IS_MEDIUM_VALUE(x) && IS_MEDIUM_VALUE(y)) {
+        return _PyLong_FromSTwoDigits(medium_value(x) | medium_value(y));
+    }
+    return long_bitwise(x, '|', y);
 }
 
 static PyObject *


From webhook-mailer at python.org  Wed Aug 25 09:58:02 2021
From: webhook-mailer at python.org (ambv)
Date: Wed, 25 Aug 2021 13:58:02 -0000
Subject: [Python-checkins] bpo-27334: Fix reference leak introduced by
 GH-26202 (GH-27942)
Message-ID: <mailman.1171.1629899882.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/a3c11cebf174e0c822eda8c545f7548269ce7a25
commit: a3c11cebf174e0c822eda8c545f7548269ce7a25
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: ambv <lukasz at langa.pl>
date: 2021-08-25T15:57:54+02:00
summary:

bpo-27334: Fix reference leak introduced by GH-26202 (GH-27942)

files:
M Modules/_sqlite/connection.c

diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index 1bc045523a252..19d30d24d7f2e 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -1807,6 +1807,7 @@ pysqlite_connection_exit_impl(pysqlite_Connection *self, PyObject *exc_type,
                 _PyErr_ChainExceptions(exc, val, tb);
             }
             else {
+                Py_DECREF(result);
                 PyErr_Restore(exc, val, tb);
             }
         }


From webhook-mailer at python.org  Wed Aug 25 10:24:37 2021
From: webhook-mailer at python.org (ethanfurman)
Date: Wed, 25 Aug 2021 14:24:37 -0000
Subject: [Python-checkins] bpo-44929: [Enum] Fix global repr (GH-27789)
Message-ID: <mailman.1172.1629901478.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/24da544014f78e6f1440d5ce5c2d14794a020340
commit: 24da544014f78e6f1440d5ce5c2d14794a020340
branch: main
author: Pablo Galindo Salgado <Pablogsal at gmail.com>
committer: ethanfurman <ethan at stoneleaf.us>
date: 2021-08-25T07:24:32-07:00
summary:

bpo-44929: [Enum] Fix global repr (GH-27789)

* Fix typo in __repr__ code

* Add more tests for global int flag reprs

* use last module if multi-module string
  - when an enum's `__module__` contains several module names, only
     use the last one

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
Co-authored-by: Ethan Furman <ethan at stoneleaf.us>

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-16-23-16-17.bpo-44929.qpMEky.rst
M Lib/enum.py
M Lib/test/test_enum.py

diff --git a/Lib/enum.py b/Lib/enum.py
index 84e3cc17bbc53..0776761ae6e73 100644
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -1390,17 +1390,28 @@ def _power_of_two(value):
     return value == 2 ** _high_bit(value)
 
 def global_enum_repr(self):
-    return '%s.%s' % (self.__class__.__module__, self._name_)
+    """
+    use module.enum_name instead of class.enum_name
+
+    the module is the last module in case of a multi-module name
+    """
+    module = self.__class__.__module__.split('.')[-1]
+    return '%s.%s' % (module, self._name_)
 
 def global_flag_repr(self):
-    module = self.__class__.__module__
+    """
+    use module.flag_name instead of class.flag_name
+
+    the module is the last module in case of a multi-module name
+    """
+    module = self.__class__.__module__.split('.')[-1]
     cls_name = self.__class__.__name__
     if self._name_ is None:
-        return "%x" % (module, cls_name, self._value_)
+        return "%s.%s(0x%x)" % (module, cls_name, self._value_)
     if _is_single_bit(self):
         return '%s.%s' % (module, self._name_)
     if self._boundary_ is not FlagBoundary.KEEP:
-        return module + module.join(self.name.split('|'))
+        return '|'.join(['%s.%s' % (module, name) for name in self.name.split('|')])
     else:
         name = []
         for n in self._name_.split('|'):
diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py
index 116f61e5cf092..52d7756da98bd 100644
--- a/Lib/test/test_enum.py
+++ b/Lib/test/test_enum.py
@@ -28,6 +28,9 @@ def load_tests(loader, tests, ignore):
                 ))
     return tests
 
+MODULE = ('test.test_enum', '__main__')[__name__=='__main__']
+SHORT_MODULE = MODULE.split('.')[-1]
+
 # for pickle tests
 try:
     class Stooges(Enum):
@@ -143,6 +146,23 @@ def __init__(self, fget=None, fset=None, fdel=None, doc=None):
     def __get__(self, instance, ownerclass):
         return self.fget(ownerclass)
 
+# for global repr tests
+
+ at enum.global_enum
+class HeadlightsK(IntFlag, boundary=enum.KEEP):
+    OFF_K = 0
+    LOW_BEAM_K = auto()
+    HIGH_BEAM_K = auto()
+    FOG_K = auto()
+
+
+ at enum.global_enum
+class HeadlightsC(IntFlag, boundary=enum.CONFORM):
+    OFF_C = 0
+    LOW_BEAM_C = auto()
+    HIGH_BEAM_C = auto()
+    FOG_C = auto()
+
 
 # tests
 
@@ -3224,6 +3244,34 @@ def test_repr(self):
         self.assertEqual(repr(~(Open.WO | Open.CE)), 'Open.RW')
         self.assertEqual(repr(Open(~4)), '-5')
 
+    def test_global_repr_keep(self):
+        self.assertEqual(
+                repr(HeadlightsK(0)),
+                '%s.OFF_K' % SHORT_MODULE,
+                )
+        self.assertEqual(
+                repr(HeadlightsK(2**0 + 2**2 + 2**3)),
+                '%(m)s.LOW_BEAM_K|%(m)s.FOG_K|0x8' % {'m': SHORT_MODULE},
+                )
+        self.assertEqual(
+                repr(HeadlightsK(2**3)),
+                '%(m)s.HeadlightsK(0x8)' % {'m': SHORT_MODULE},
+                )
+
+    def test_global_repr_conform1(self):
+        self.assertEqual(
+                repr(HeadlightsC(0)),
+                '%s.OFF_C' % SHORT_MODULE,
+                )
+        self.assertEqual(
+                repr(HeadlightsC(2**0 + 2**2 + 2**3)),
+                '%(m)s.LOW_BEAM_C|%(m)s.FOG_C' % {'m': SHORT_MODULE},
+                )
+        self.assertEqual(
+                repr(HeadlightsC(2**3)),
+                '%(m)s.OFF_C' % {'m': SHORT_MODULE},
+                )
+
     def test_format(self):
         Perm = self.Perm
         self.assertEqual(format(Perm.R, ''), '4')
@@ -4085,7 +4133,7 @@ def setUp(self):
     def test_convert_value_lookup_priority(self):
         test_type = enum.IntEnum._convert_(
                 'UnittestConvert',
-                ('test.test_enum', '__main__')[__name__=='__main__'],
+                MODULE,
                 filter=lambda x: x.startswith('CONVERT_TEST_'))
         # We don't want the reverse lookup value to vary when there are
         # multiple possible names for a given value.  It should always
@@ -4095,7 +4143,7 @@ def test_convert_value_lookup_priority(self):
     def test_convert(self):
         test_type = enum.IntEnum._convert_(
                 'UnittestConvert',
-                ('test.test_enum', '__main__')[__name__=='__main__'],
+                MODULE,
                 filter=lambda x: x.startswith('CONVERT_TEST_'))
         # Ensure that test_type has all of the desired names and values.
         self.assertEqual(test_type.CONVERT_TEST_NAME_F,
@@ -4115,7 +4163,7 @@ def test_convert_warn(self):
         with self.assertWarns(DeprecationWarning):
             enum.IntEnum._convert(
                 'UnittestConvert',
-                ('test.test_enum', '__main__')[__name__=='__main__'],
+                MODULE,
                 filter=lambda x: x.startswith('CONVERT_TEST_'))
 
     @unittest.skipUnless(python_version >= (3, 9),
@@ -4124,16 +4172,15 @@ def test_convert_raise(self):
         with self.assertRaises(AttributeError):
             enum.IntEnum._convert(
                 'UnittestConvert',
-                ('test.test_enum', '__main__')[__name__=='__main__'],
+                MODULE,
                 filter=lambda x: x.startswith('CONVERT_TEST_'))
 
     def test_convert_repr_and_str(self):
-        module = ('test.test_enum', '__main__')[__name__=='__main__']
         test_type = enum.IntEnum._convert_(
                 'UnittestConvert',
-                module,
+                MODULE,
                 filter=lambda x: x.startswith('CONVERT_STRING_TEST_'))
-        self.assertEqual(repr(test_type.CONVERT_STRING_TEST_NAME_A), '%s.CONVERT_STRING_TEST_NAME_A' % module)
+        self.assertEqual(repr(test_type.CONVERT_STRING_TEST_NAME_A), '%s.CONVERT_STRING_TEST_NAME_A' % SHORT_MODULE)
         self.assertEqual(str(test_type.CONVERT_STRING_TEST_NAME_A), 'CONVERT_STRING_TEST_NAME_A')
         self.assertEqual(format(test_type.CONVERT_STRING_TEST_NAME_A), '5')
 
@@ -4151,7 +4198,7 @@ def setUp(self):
     def test_convert(self):
         test_type = enum.StrEnum._convert_(
                 'UnittestConvert',
-                ('test.test_enum', '__main__')[__name__=='__main__'],
+                MODULE,
                 filter=lambda x: x.startswith('CONVERT_STR_'))
         # Ensure that test_type has all of the desired names and values.
         self.assertEqual(test_type.CONVERT_STR_TEST_1, 'hello')
@@ -4162,12 +4209,11 @@ def test_convert(self):
                          [], msg='Names other than CONVERT_STR_* found.')
 
     def test_convert_repr_and_str(self):
-        module = ('test.test_enum', '__main__')[__name__=='__main__']
         test_type = enum.StrEnum._convert_(
                 'UnittestConvert',
-                module,
+                MODULE,
                 filter=lambda x: x.startswith('CONVERT_STR_'))
-        self.assertEqual(repr(test_type.CONVERT_STR_TEST_1), '%s.CONVERT_STR_TEST_1' % module)
+        self.assertEqual(repr(test_type.CONVERT_STR_TEST_1), '%s.CONVERT_STR_TEST_1' % SHORT_MODULE)
         self.assertEqual(str(test_type.CONVERT_STR_TEST_2), 'goodbye')
         self.assertEqual(format(test_type.CONVERT_STR_TEST_1), 'hello')
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-16-23-16-17.bpo-44929.qpMEky.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-16-23-16-17.bpo-44929.qpMEky.rst
new file mode 100644
index 0000000000000..e883e031a4afd
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-16-23-16-17.bpo-44929.qpMEky.rst	
@@ -0,0 +1,2 @@
+Fix some edge cases of ``enum.Flag`` string representation in the REPL.
+Patch by Pablo Galindo.


From webhook-mailer at python.org  Wed Aug 25 13:54:34 2021
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 25 Aug 2021 17:54:34 -0000
Subject: [Python-checkins] bpo-45000: Raise SyntaxError when try to delete
 __debug__ (GH-27947)
Message-ID: <mailman.1173.1629914075.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/551da597a0996b0fb3af425f48aa5bc63ea6b963
commit: 551da597a0996b0fb3af425f48aa5bc63ea6b963
branch: main
author: Dong-hee Na <donghee.na at python.org>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-25T10:54:20-07:00
summary:

bpo-45000: Raise SyntaxError when try to delete __debug__ (GH-27947)



Automerge-Triggered-By: GH:pablogsal

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-25-23-17-32.bpo-45000.XjmyLl.rst
M Doc/whatsnew/3.11.rst
M Lib/test/test_syntax.py
M Python/compile.c

diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index 306385c2a90aa..296b1b279d09b 100644
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -176,6 +176,8 @@ Other CPython Implementation Changes
   support :class:`typing.SupportsComplex` and :class:`typing.SupportsBytes` protocols.
   (Contributed by Mark Dickinson and Dong-hee Na in :issue:`24234`.)
 
+*  A :exc:`SyntaxError` (instead of a :exc:`NameError`) will be raised when deleting the :const:`__debug__` constant. (Contributed by Dong-hee Na in :issue:`45000`.)
+
 
 New Modules
 ===========
diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
index 88503dcaad99b..43780ce273ef4 100644
--- a/Lib/test/test_syntax.py
+++ b/Lib/test/test_syntax.py
@@ -59,6 +59,10 @@
 Traceback (most recent call last):
 SyntaxError: cannot assign to __debug__
 
+>>> del __debug__
+Traceback (most recent call last):
+SyntaxError: cannot delete __debug__
+
 >>> f() = 1
 Traceback (most recent call last):
 SyntaxError: cannot assign to function call here. Maybe you meant '==' instead of '='?
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-25-23-17-32.bpo-45000.XjmyLl.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-25-23-17-32.bpo-45000.XjmyLl.rst
new file mode 100644
index 0000000000000..96c95cc6e0296
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-25-23-17-32.bpo-45000.XjmyLl.rst	
@@ -0,0 +1,2 @@
+A :exc:`SyntaxError` is now raised when trying to delete :const:`__debug__`.
+Patch by Dong-hee Na.
diff --git a/Python/compile.c b/Python/compile.c
index e651ca535191a..053915e55df9a 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -2343,6 +2343,10 @@ forbidden_name(struct compiler *c, identifier name, expr_context_ty ctx)
         compiler_error(c, "cannot assign to __debug__");
         return 1;
     }
+    if (ctx == Del && _PyUnicode_EqualToASCIIString(name, "__debug__")) {
+        compiler_error(c, "cannot delete __debug__");
+        return 1;
+    }
     return 0;
 }
 


From webhook-mailer at python.org  Wed Aug 25 14:14:08 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Wed, 25 Aug 2021 18:14:08 -0000
Subject: [Python-checkins] bpo-44524: Don't modify MRO when inheriting from
 typing.Annotated (GH-27841)
Message-ID: <mailman.1174.1629915249.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/23384a1749359f0ae7aaae052073d44b59e715a1
commit: 23384a1749359f0ae7aaae052073d44b59e715a1
branch: main
author: Ken Jin <28750310+Fidget-Spinner at users.noreply.github.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-25T21:13:59+03:00
summary:

bpo-44524: Don't modify MRO when inheriting from typing.Annotated (GH-27841)

files:
M Lib/test/test_typing.py
M Lib/typing.py

diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index de4db51bdc707..847d583cdafb9 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -4568,6 +4568,11 @@ def test_annotated_in_other_types(self):
         X = List[Annotated[T, 5]]
         self.assertEqual(X[int], List[Annotated[int, 5]])
 
+    def test_annotated_mro(self):
+        class X(Annotated[int, (1, 10)]): ...
+        self.assertEqual(X.__mro__, (X, int, object),
+                         "Annotated should be transparent.")
+
 
 class TypeAliasTests(BaseTestCase):
     def test_canonical_usage_with_variable_annotation(self):
diff --git a/Lib/typing.py b/Lib/typing.py
index a283fe40d2d3f..35c57c21b37c2 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -1575,7 +1575,7 @@ def __init__(self, origin, metadata):
         if isinstance(origin, _AnnotatedAlias):
             metadata = origin.__metadata__ + metadata
             origin = origin.__origin__
-        super().__init__(origin, origin, name="Annotated")
+        super().__init__(origin, origin)
         self.__metadata__ = metadata
 
     def copy_with(self, params):
@@ -1603,6 +1603,11 @@ def __eq__(self, other):
     def __hash__(self):
         return hash((self.__origin__, self.__metadata__))
 
+    def __getattr__(self, attr):
+        if attr in {'__name__', '__qualname__'}:
+            return 'Annotated'
+        return super().__getattr__(attr)
+
 
 class Annotated:
     """Add context specific metadata to a type.


From webhook-mailer at python.org  Wed Aug 25 14:36:59 2021
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 25 Aug 2021 18:36:59 -0000
Subject: [Python-checkins] bpo-44524: Don't modify MRO when inheriting from
 typing.Annotated (GH-27841)
Message-ID: <mailman.1175.1629916619.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/06e9a35169e125488d4ae9228626eb95375f3a14
commit: 06e9a35169e125488d4ae9228626eb95375f3a14
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-25T11:36:47-07:00
summary:

bpo-44524: Don't modify MRO when inheriting from typing.Annotated (GH-27841)

(cherry picked from commit 23384a1749359f0ae7aaae052073d44b59e715a1)

Co-authored-by: Ken Jin <28750310+Fidget-Spinner at users.noreply.github.com>

files:
M Lib/test/test_typing.py
M Lib/typing.py

diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index b1cd547125633..7b2fd69808993 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -4512,6 +4512,11 @@ def test_annotated_in_other_types(self):
         X = List[Annotated[T, 5]]
         self.assertEqual(X[int], List[Annotated[int, 5]])
 
+    def test_annotated_mro(self):
+        class X(Annotated[int, (1, 10)]): ...
+        self.assertEqual(X.__mro__, (X, int, object),
+                         "Annotated should be transparent.")
+
 
 class TypeAliasTests(BaseTestCase):
     def test_canonical_usage_with_variable_annotation(self):
diff --git a/Lib/typing.py b/Lib/typing.py
index 493546045a2bd..423329a98005c 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -1573,7 +1573,7 @@ def __init__(self, origin, metadata):
         if isinstance(origin, _AnnotatedAlias):
             metadata = origin.__metadata__ + metadata
             origin = origin.__origin__
-        super().__init__(origin, origin, name="Annotated")
+        super().__init__(origin, origin)
         self.__metadata__ = metadata
 
     def copy_with(self, params):
@@ -1601,6 +1601,11 @@ def __eq__(self, other):
     def __hash__(self):
         return hash((self.__origin__, self.__metadata__))
 
+    def __getattr__(self, attr):
+        if attr in {'__name__', '__qualname__'}:
+            return 'Annotated'
+        return super().__getattr__(attr)
+
 
 class Annotated:
     """Add context specific metadata to a type.


From webhook-mailer at python.org  Wed Aug 25 15:02:34 2021
From: webhook-mailer at python.org (pablogsal)
Date: Wed, 25 Aug 2021 19:02:34 -0000
Subject: [Python-checkins] [3.9] bpo-27334: roll back transaction if sqlite3
 context manager fails to commit (GH-26202) (GH-27944)
Message-ID: <mailman.1176.1629918155.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/52702e8ba0d777ac92ec36038213976545c4759e
commit: 52702e8ba0d777ac92ec36038213976545c4759e
branch: 3.9
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-08-25T20:02:25+01:00
summary:

[3.9] bpo-27334: roll back transaction if sqlite3 context manager fails to commit (GH-26202) (GH-27944)

files:
A Misc/NEWS.d/next/Library/2021-05-18-00-17-21.bpo-27334.32EJZi.rst
M Lib/sqlite3/test/dbapi.py
M Modules/_sqlite/connection.c

diff --git a/Lib/sqlite3/test/dbapi.py b/Lib/sqlite3/test/dbapi.py
index c43eb60e63b258..38e9fbd9d1dd60 100644
--- a/Lib/sqlite3/test/dbapi.py
+++ b/Lib/sqlite3/test/dbapi.py
@@ -21,11 +21,13 @@
 #    misrepresented as being the original software.
 # 3. This notice may not be removed or altered from any source distribution.
 
+import subprocess
 import threading
 import unittest
 import sqlite3 as sqlite
+import sys
 
-from test.support import TESTFN, unlink
+from test.support import SHORT_TIMEOUT, TESTFN, unlink
 
 
 class ModuleTests(unittest.TestCase):
@@ -954,6 +956,77 @@ def CheckOnConflictReplace(self):
         self.assertEqual(self.cu.fetchall(), [('Very different data!', 'foo')])
 
 
+class MultiprocessTests(unittest.TestCase):
+    CONNECTION_TIMEOUT = SHORT_TIMEOUT / 1000.  # Defaults to 30 ms
+
+    def tearDown(self):
+        unlink(TESTFN)
+
+    def test_ctx_mgr_rollback_if_commit_failed(self):
+        # bpo-27334: ctx manager does not rollback if commit fails
+        SCRIPT = f"""if 1:
+            import sqlite3
+            def wait():
+                print("started")
+                assert "database is locked" in input()
+
+            cx = sqlite3.connect("{TESTFN}", timeout={self.CONNECTION_TIMEOUT})
+            cx.create_function("wait", 0, wait)
+            with cx:
+                cx.execute("create table t(t)")
+            try:
+                # execute two transactions; both will try to lock the db
+                cx.executescript('''
+                    -- start a transaction and wait for parent
+                    begin transaction;
+                    select * from t;
+                    select wait();
+                    rollback;
+
+                    -- start a new transaction; would fail if parent holds lock
+                    begin transaction;
+                    select * from t;
+                    rollback;
+                ''')
+            finally:
+                cx.close()
+        """
+
+        # spawn child process
+        proc = subprocess.Popen(
+            [sys.executable, "-c", SCRIPT],
+            encoding="utf-8",
+            bufsize=0,
+            stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE,
+        )
+        self.addCleanup(proc.communicate)
+
+        # wait for child process to start
+        self.assertEqual("started", proc.stdout.readline().strip())
+
+        cx = sqlite.connect(TESTFN, timeout=self.CONNECTION_TIMEOUT)
+        try:  # context manager should correctly release the db lock
+            with cx:
+                cx.execute("insert into t values('test')")
+        except sqlite.OperationalError as exc:
+            proc.stdin.write(str(exc))
+        else:
+            proc.stdin.write("no error")
+        finally:
+            cx.close()
+
+        # terminate child process
+        self.assertIsNone(proc.returncode)
+        try:
+            proc.communicate(input="end", timeout=SHORT_TIMEOUT)
+        except subprocess.TimeoutExpired:
+            proc.kill()
+            proc.communicate()
+            raise
+        self.assertEqual(proc.returncode, 0)
+
+
 def suite():
     module_suite = unittest.makeSuite(ModuleTests, "Check")
     connection_suite = unittest.makeSuite(ConnectionTests, "Check")
@@ -965,10 +1038,11 @@ def suite():
     closed_cur_suite = unittest.makeSuite(ClosedCurTests, "Check")
     on_conflict_suite = unittest.makeSuite(SqliteOnConflictTests, "Check")
     uninit_con_suite = unittest.makeSuite(UninitialisedConnectionTests)
+    multiproc_con_suite = unittest.makeSuite(MultiprocessTests)
     return unittest.TestSuite((
         module_suite, connection_suite, cursor_suite, thread_suite,
         constructor_suite, ext_suite, closed_con_suite, closed_cur_suite,
-        on_conflict_suite, uninit_con_suite,
+        on_conflict_suite, uninit_con_suite, multiproc_con_suite,
     ))
 
 def test():
diff --git a/Misc/NEWS.d/next/Library/2021-05-18-00-17-21.bpo-27334.32EJZi.rst b/Misc/NEWS.d/next/Library/2021-05-18-00-17-21.bpo-27334.32EJZi.rst
new file mode 100644
index 00000000000000..dc0cdf33ec5acf
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-05-18-00-17-21.bpo-27334.32EJZi.rst
@@ -0,0 +1,2 @@
+The :mod:`sqlite3` context manager now performs a rollback (thus releasing the
+database lock) if commit failed.  Patch by Luca Citi and Erlend E. Aasland.
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index 4806a12789cd19..0949e8d408e620 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -1771,22 +1771,36 @@ pysqlite_connection_enter(pysqlite_Connection* self, PyObject* args)
 static PyObject *
 pysqlite_connection_exit(pysqlite_Connection* self, PyObject* args)
 {
-    PyObject* exc_type, *exc_value, *exc_tb;
-    const char* method_name;
-    PyObject* result;
-
+    PyObject *exc_type, *exc_value, *exc_tb;
     if (!PyArg_ParseTuple(args, "OOO", &exc_type, &exc_value, &exc_tb)) {
         return NULL;
     }
 
+    int commit = 0;
+    PyObject *result;
     if (exc_type == Py_None && exc_value == Py_None && exc_tb == Py_None) {
-        method_name = "commit";
-    } else {
-        method_name = "rollback";
+        commit = 1;
+        result = pysqlite_connection_commit(self, NULL);
     }
-
-    result = PyObject_CallMethod((PyObject*)self, method_name, NULL);
-    if (!result) {
+    else {
+        result = pysqlite_connection_rollback(self, NULL);
+    }
+
+    if (result == NULL) {
+        if (commit) {
+            /* Commit failed; try to rollback in order to unlock the database.
+             * If rollback also fails, chain the exceptions. */
+            PyObject *exc, *val, *tb;
+            PyErr_Fetch(&exc, &val, &tb);
+            result = pysqlite_connection_rollback(self, NULL);
+            if (result == NULL) {
+                _PyErr_ChainExceptions(exc, val, tb);
+            }
+            else {
+                Py_DECREF(result);
+                PyErr_Restore(exc, val, tb);
+            }
+        }
         return NULL;
     }
     Py_DECREF(result);


From webhook-mailer at python.org  Wed Aug 25 15:03:16 2021
From: webhook-mailer at python.org (pablogsal)
Date: Wed, 25 Aug 2021 19:03:16 -0000
Subject: [Python-checkins] bpo-43853: Amend NEWS entry for latest changes in
 sqlite3 (GH-27922)
Message-ID: <mailman.1177.1629918197.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/7903a1096343d8018e889029f025d39bdd077170
commit: 7903a1096343d8018e889029f025d39bdd077170
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-08-25T20:03:11+01:00
summary:

bpo-43853: Amend NEWS entry for latest changes in sqlite3 (GH-27922)

files:
M Misc/NEWS.d/next/Library/2021-04-15-12-02-17.bpo-43853.XXCVAp.rst

diff --git a/Misc/NEWS.d/next/Library/2021-04-15-12-02-17.bpo-43853.XXCVAp.rst b/Misc/NEWS.d/next/Library/2021-04-15-12-02-17.bpo-43853.XXCVAp.rst
index c5c3a0ae83c7f..a0164c4665a05 100644
--- a/Misc/NEWS.d/next/Library/2021-04-15-12-02-17.bpo-43853.XXCVAp.rst
+++ b/Misc/NEWS.d/next/Library/2021-04-15-12-02-17.bpo-43853.XXCVAp.rst
@@ -1,3 +1,7 @@
-Improve :mod:`sqlite3` error handling: ``sqlite3_value_text()`` errors that
-set ``SQLITE_NOMEM`` now raise :exc:`MemoryError`. Patch by Erlend E.
-Aasland.
+Improved string handling for :mod:`sqlite3` user-defined functions and
+aggregates:
+
+* It is now possible to pass strings with embedded null characters to UDFs
+* Conversion failures now correctly raise :exc:`MemoryError`
+
+Patch by Erlend E. Aasland.


From webhook-mailer at python.org  Wed Aug 25 15:26:38 2021
From: webhook-mailer at python.org (pablogsal)
Date: Wed, 25 Aug 2021 19:26:38 -0000
Subject: [Python-checkins] [3.9] bpo-43853: Amend NEWS entry for latest
 changes in sqlite3 (GH-27922) (GH-27952)
Message-ID: <mailman.1178.1629919599.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/0ec17a2494412ea7d76f7d0567b73c1fffa88c18
commit: 0ec17a2494412ea7d76f7d0567b73c1fffa88c18
branch: 3.9
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-08-25T20:26:28+01:00
summary:

[3.9] bpo-43853: Amend NEWS entry for latest changes in sqlite3 (GH-27922) (GH-27952)

(cherry picked from commit 7903a1096343d8018e889029f025d39bdd077170)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at innova.no>

files:
M Misc/NEWS.d/next/Library/2021-04-15-12-02-17.bpo-43853.XXCVAp.rst

diff --git a/Misc/NEWS.d/next/Library/2021-04-15-12-02-17.bpo-43853.XXCVAp.rst b/Misc/NEWS.d/next/Library/2021-04-15-12-02-17.bpo-43853.XXCVAp.rst
index c5c3a0ae83c7f..a0164c4665a05 100644
--- a/Misc/NEWS.d/next/Library/2021-04-15-12-02-17.bpo-43853.XXCVAp.rst
+++ b/Misc/NEWS.d/next/Library/2021-04-15-12-02-17.bpo-43853.XXCVAp.rst
@@ -1,3 +1,7 @@
-Improve :mod:`sqlite3` error handling: ``sqlite3_value_text()`` errors that
-set ``SQLITE_NOMEM`` now raise :exc:`MemoryError`. Patch by Erlend E.
-Aasland.
+Improved string handling for :mod:`sqlite3` user-defined functions and
+aggregates:
+
+* It is now possible to pass strings with embedded null characters to UDFs
+* Conversion failures now correctly raise :exc:`MemoryError`
+
+Patch by Erlend E. Aasland.


From webhook-mailer at python.org  Wed Aug 25 15:50:29 2021
From: webhook-mailer at python.org (pablogsal)
Date: Wed, 25 Aug 2021 19:50:29 -0000
Subject: [Python-checkins] [3.10] bpo-43853: Amend NEWS entry for latest
 changes in sqlite3 (GH-27922). (GH-27953)
Message-ID: <mailman.1179.1629921031.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/b34ca7e0515e6726cf5e938f7239de41df710cfd
commit: b34ca7e0515e6726cf5e938f7239de41df710cfd
branch: 3.10
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-08-25T20:50:23+01:00
summary:

[3.10] bpo-43853: Amend NEWS entry for latest changes in sqlite3 (GH-27922). (GH-27953)

(cherry picked from commit 7903a1096343d8018e889029f025d39bdd077170)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at innova.no>

files:
M Misc/NEWS.d/3.10.0b3.rst

diff --git a/Misc/NEWS.d/3.10.0b3.rst b/Misc/NEWS.d/3.10.0b3.rst
index ebbc0006080cc..5f399ad5aa871 100644
--- a/Misc/NEWS.d/3.10.0b3.rst
+++ b/Misc/NEWS.d/3.10.0b3.rst
@@ -192,9 +192,13 @@ improving entry point loading performance by ~10x.
 .. nonce: XXCVAp
 .. section: Library
 
-Improve :mod:`sqlite3` error handling: ``sqlite3_value_text()`` errors that
-set ``SQLITE_NOMEM`` now raise :exc:`MemoryError`. Patch by Erlend E.
-Aasland.
+Improved string handling for :mod:`sqlite3` user-defined functions and
+aggregates:
+
+* It is now possible to pass strings with embedded null characters to UDFs
+* Conversion failures now correctly raise :exc:`MemoryError`
+
+Patch by Erlend E. Aasland.
 
 ..
 


From webhook-mailer at python.org  Wed Aug 25 20:36:32 2021
From: webhook-mailer at python.org (corona10)
Date: Thu, 26 Aug 2021 00:36:32 -0000
Subject: [Python-checkins] bpo-45000: Update whatsnews about deleting
 __debug__ (GH-27956)
Message-ID: <mailman.1180.1629938193.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/c764dfbcbc12c4653fc8ab39773cf973c9db2757
commit: c764dfbcbc12c4653fc8ab39773cf973c9db2757
branch: main
author: Dong-hee Na <donghee.na at python.org>
committer: corona10 <donghee.na92 at gmail.com>
date: 2021-08-26T09:36:16+09:00
summary:

bpo-45000: Update whatsnews about deleting __debug__ (GH-27956)

files:
M Doc/whatsnew/3.10.rst
M Doc/whatsnew/3.11.rst

diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst
index 6040daaf8f846..70c5140ce13b5 100644
--- a/Doc/whatsnew/3.10.rst
+++ b/Doc/whatsnew/3.10.rst
@@ -883,6 +883,8 @@ Other Language Changes
   collisions when creating dictionaries and sets containing multiple NaNs.
   (Contributed by Raymond Hettinger in :issue:`43475`.)
 
+*  A :exc:`SyntaxError` (instead of a :exc:`NameError`) will be raised when deleting the :const:`__debug__` constant. (Contributed by Dong-hee Na in :issue:`45000`.)
+
 New Modules
 ===========
 
diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index 296b1b279d09b..306385c2a90aa 100644
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -176,8 +176,6 @@ Other CPython Implementation Changes
   support :class:`typing.SupportsComplex` and :class:`typing.SupportsBytes` protocols.
   (Contributed by Mark Dickinson and Dong-hee Na in :issue:`24234`.)
 
-*  A :exc:`SyntaxError` (instead of a :exc:`NameError`) will be raised when deleting the :const:`__debug__` constant. (Contributed by Dong-hee Na in :issue:`45000`.)
-
 
 New Modules
 ===========


From webhook-mailer at python.org  Thu Aug 26 01:49:11 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Thu, 26 Aug 2021 05:49:11 -0000
Subject: [Python-checkins] bpo-45003: Change __div__ to __truediv__ in py3
 language reference. (GH-27951)
Message-ID: <mailman.1181.1629956953.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/806e25fd3173a80021e6df87b81263b5f6056f38
commit: 806e25fd3173a80021e6df87b81263b5f6056f38
branch: main
author: Objectivitix <79152594+Objectivitix at users.noreply.github.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-26T08:49:02+03:00
summary:

bpo-45003: Change __div__ to __truediv__ in py3 language reference. (GH-27951)

files:
M Doc/reference/expressions.rst

diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst
index b1b32dfba26e5..d70fcb34d2168 100644
--- a/Doc/reference/expressions.rst
+++ b/Doc/reference/expressions.rst
@@ -1256,7 +1256,7 @@ integer; the result is that of mathematical division with the 'floor' function
 applied to the result.  Division by zero raises the :exc:`ZeroDivisionError`
 exception.
 
-This operation can be customized using the special :meth:`__div__` and
+This operation can be customized using the special :meth:`__truediv__` and
 :meth:`__floordiv__` methods.
 
 .. index::


From webhook-mailer at python.org  Thu Aug 26 03:03:27 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Thu, 26 Aug 2021 07:03:27 -0000
Subject: [Python-checkins] bpo-45003: Change __div__ to __truediv__ in py3
 language reference. (GH-27951) (GH-27962)
Message-ID: <mailman.1182.1629961408.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/46970fdd8ddc18823519d1e1c57136f6bc2a8dac
commit: 46970fdd8ddc18823519d1e1c57136f6bc2a8dac
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-26T10:03:18+03:00
summary:

bpo-45003: Change __div__ to __truediv__ in py3 language reference. (GH-27951) (GH-27962)

(cherry picked from commit 806e25fd3173a80021e6df87b81263b5f6056f38)

Co-authored-by: Objectivitix <79152594+Objectivitix at users.noreply.github.com>

files:
M Doc/reference/expressions.rst

diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst
index 6f6b67fb08c802..5333de911c2c88 100644
--- a/Doc/reference/expressions.rst
+++ b/Doc/reference/expressions.rst
@@ -1241,7 +1241,7 @@ integer; the result is that of mathematical division with the 'floor' function
 applied to the result.  Division by zero raises the :exc:`ZeroDivisionError`
 exception.
 
-This operation can be customized using the special :meth:`__div__` and
+This operation can be customized using the special :meth:`__truediv__` and
 :meth:`__floordiv__` methods.
 
 .. index::


From webhook-mailer at python.org  Thu Aug 26 03:04:10 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Thu, 26 Aug 2021 07:04:10 -0000
Subject: [Python-checkins] bpo-45003: Change __div__ to __truediv__ in py3
 language reference. (GH-27951) (GH-27963)
Message-ID: <mailman.1183.1629961452.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/ea39933b4b76da35874be79f2384e24b38c37351
commit: ea39933b4b76da35874be79f2384e24b38c37351
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-26T10:04:05+03:00
summary:

bpo-45003: Change __div__ to __truediv__ in py3 language reference. (GH-27951) (GH-27963)

(cherry picked from commit 806e25fd3173a80021e6df87b81263b5f6056f38)

Co-authored-by: Objectivitix <79152594+Objectivitix at users.noreply.github.com>

files:
M Doc/reference/expressions.rst

diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst
index 10e194c901030..ab47f37c77c79 100644
--- a/Doc/reference/expressions.rst
+++ b/Doc/reference/expressions.rst
@@ -1251,7 +1251,7 @@ integer; the result is that of mathematical division with the 'floor' function
 applied to the result.  Division by zero raises the :exc:`ZeroDivisionError`
 exception.
 
-This operation can be customized using the special :meth:`__div__` and
+This operation can be customized using the special :meth:`__truediv__` and
 :meth:`__floordiv__` methods.
 
 .. index::


From webhook-mailer at python.org  Thu Aug 26 04:45:32 2021
From: webhook-mailer at python.org (JulienPalard)
Date: Thu, 26 Aug 2021 08:45:32 -0000
Subject: [Python-checkins] bpo-42238: [doc] Some more make suspicious false
 positives. (GH-27945)
Message-ID: <mailman.1184.1629967533.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/21fa8547921d28b80b8a88d034081cab000d5480
commit: 21fa8547921d28b80b8a88d034081cab000d5480
branch: main
author: Julien Palard <julien at palard.fr>
committer: JulienPalard <julien at palard.fr>
date: 2021-08-26T10:45:01+02:00
summary:

bpo-42238: [doc] Some more make suspicious false positives. (GH-27945)

files:
M Doc/tools/susp-ignored.csv

diff --git a/Doc/tools/susp-ignored.csv b/Doc/tools/susp-ignored.csv
index 35bcbd0404976f..f9b76bfe64220c 100644
--- a/Doc/tools/susp-ignored.csv
+++ b/Doc/tools/susp-ignored.csv
@@ -380,3 +380,13 @@ library/typing,1004,`,# Type of ``val`` is narrowed to ``str``
 library/typing,1004,`,"# Else, type of ``val`` is narrowed to ``float``."
 library/typing,1004,`,# Type of ``val`` is narrowed to ``List[str]``.
 library/typing,1004,`,# Type of ``val`` remains as ``List[object]``.
+library/tkinter,312,::,ttk::frame .frm -padding 10
+library/tkinter,312,::,"grid [ttk::label .frm.lbl -text ""Hello World!""] -column 0 -row 0"
+library/tkinter,312,::,"grid [ttk::button .frm.btn -text ""Quit"" -command ""destroy .""] -column 1 -row 0"
+library/tkinter,322,::,ttk::frame
+library/tkinter,420,::,ttk::button
+library/tkinter,428,::,ttk::widget
+library/typing,1011,`,# Type of ``val`` is narrowed to ``str``
+library/typing,1011,`,"# Else, type of ``val`` is narrowed to ``float``."
+library/typing,1011,`,# Type of ``val`` is narrowed to ``List[str]``.
+library/typing,1011,`,# Type of ``val`` remains as ``List[object]``.


From webhook-mailer at python.org  Thu Aug 26 05:52:11 2021
From: webhook-mailer at python.org (pablogsal)
Date: Thu, 26 Aug 2021 09:52:11 -0000
Subject: [Python-checkins] [3.10] bpo-45000: Update whatsnews about deleting
 __debug__ (GH-27956) (GH-27958)
Message-ID: <mailman.1185.1629971531.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/6ea6cf22e9d084c27a4fffbbd298098a6ad5b776
commit: 6ea6cf22e9d084c27a4fffbbd298098a6ad5b776
branch: 3.10
author: Dong-hee Na <donghee.na at python.org>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-08-26T10:52:00+01:00
summary:

[3.10] bpo-45000: Update whatsnews about deleting __debug__ (GH-27956) (GH-27958)

(cherry picked from commit c764dfbcbc12c4653fc8ab39773cf973c9db2757)

Co-authored-by: Dong-hee Na <donghee.na at python.org>

files:
M Doc/whatsnew/3.10.rst

diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst
index d973448e07f80..129c0f77bf895 100644
--- a/Doc/whatsnew/3.10.rst
+++ b/Doc/whatsnew/3.10.rst
@@ -883,6 +883,8 @@ Other Language Changes
   collisions when creating dictionaries and sets containing multiple NaNs.
   (Contributed by Raymond Hettinger in :issue:`43475`.)
 
+*  A :exc:`SyntaxError` (instead of a :exc:`NameError`) will be raised when deleting the :const:`__debug__` constant. (Contributed by Dong-hee Na in :issue:`45000`.)
+
 New Modules
 ===========
 


From webhook-mailer at python.org  Thu Aug 26 05:52:31 2021
From: webhook-mailer at python.org (pablogsal)
Date: Thu, 26 Aug 2021 09:52:31 -0000
Subject: [Python-checkins] bpo-45000: Raise SyntaxError when try to delete
 __debug__ (GH-27947) (GH-27957)
Message-ID: <mailman.1186.1629971552.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/32c1caa87f68a650f2d009a589a1db30484499cb
commit: 32c1caa87f68a650f2d009a589a1db30484499cb
branch: 3.10
author: Dong-hee Na <donghee.na at python.org>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-08-26T10:52:21+01:00
summary:

bpo-45000: Raise SyntaxError when try to delete __debug__ (GH-27947) (GH-27957)

(cherry picked from commit 551da597a0996b0fb3af425f48aa5bc63ea6b963)

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-25-23-17-32.bpo-45000.XjmyLl.rst
M Lib/test/test_syntax.py
M Python/compile.c

diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
index 88503dcaad99b..43780ce273ef4 100644
--- a/Lib/test/test_syntax.py
+++ b/Lib/test/test_syntax.py
@@ -59,6 +59,10 @@
 Traceback (most recent call last):
 SyntaxError: cannot assign to __debug__
 
+>>> del __debug__
+Traceback (most recent call last):
+SyntaxError: cannot delete __debug__
+
 >>> f() = 1
 Traceback (most recent call last):
 SyntaxError: cannot assign to function call here. Maybe you meant '==' instead of '='?
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-25-23-17-32.bpo-45000.XjmyLl.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-25-23-17-32.bpo-45000.XjmyLl.rst
new file mode 100644
index 0000000000000..96c95cc6e0296
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-25-23-17-32.bpo-45000.XjmyLl.rst	
@@ -0,0 +1,2 @@
+A :exc:`SyntaxError` is now raised when trying to delete :const:`__debug__`.
+Patch by Dong-hee Na.
diff --git a/Python/compile.c b/Python/compile.c
index a2378992fd408..d55b0beaec77c 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -2264,6 +2264,10 @@ forbidden_name(struct compiler *c, identifier name, expr_context_ty ctx)
         compiler_error(c, "cannot assign to __debug__");
         return 1;
     }
+    if (ctx == Del && _PyUnicode_EqualToASCIIString(name, "__debug__")) {
+        compiler_error(c, "cannot delete __debug__");
+        return 1;
+    }
     return 0;
 }
 


From webhook-mailer at python.org  Thu Aug 26 08:22:06 2021
From: webhook-mailer at python.org (ambv)
Date: Thu, 26 Aug 2021 12:22:06 -0000
Subject: [Python-checkins] bpo-44967: pydoc: return non-zero exit code when
 query is not found (GH-27868)
Message-ID: <mailman.1187.1629980527.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/8868d48712aee2b490efaf60bed8dfe9fb14d6b7
commit: 8868d48712aee2b490efaf60bed8dfe9fb14d6b7
branch: main
author: Gregory Anders <github at gpanders.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-26T14:22:02+02:00
summary:

bpo-44967: pydoc: return non-zero exit code when query is not found (GH-27868)

files:
A Misc/NEWS.d/next/Tools-Demos/2021-08-26-11-57-31.bpo-44967.UT1RMV.rst
M Lib/pydoc.py
M Lib/test/test_pydoc.py

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index 9f0acd0271e07..b2915bfdfc0ff 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -1775,24 +1775,18 @@ def render_doc(thing, title='Python Library Documentation: %s', forceload=0,
 def doc(thing, title='Python Library Documentation: %s', forceload=0,
         output=None):
     """Display text documentation, given an object or a path to an object."""
-    try:
-        if output is None:
-            pager(render_doc(thing, title, forceload))
-        else:
-            output.write(render_doc(thing, title, forceload, plaintext))
-    except (ImportError, ErrorDuringImport) as value:
-        print(value)
+    if output is None:
+        pager(render_doc(thing, title, forceload))
+    else:
+        output.write(render_doc(thing, title, forceload, plaintext))
 
 def writedoc(thing, forceload=0):
     """Write HTML documentation to a file in the current directory."""
-    try:
-        object, name = resolve(thing, forceload)
-        page = html.page(describe(object), html.document(object, name))
-        with open(name + '.html', 'w', encoding='utf-8') as file:
-            file.write(page)
-        print('wrote', name + '.html')
-    except (ImportError, ErrorDuringImport) as value:
-        print(value)
+    object, name = resolve(thing, forceload)
+    page = html.page(describe(object), html.document(object, name))
+    with open(name + '.html', 'w', encoding='utf-8') as file:
+        file.write(page)
+    print('wrote', name + '.html')
 
 def writedocs(dir, pkgpath='', done=None):
     """Write out HTML documentation for all modules in a directory tree."""
@@ -2786,7 +2780,7 @@ class BadUsage(Exception): pass
         for arg in args:
             if ispath(arg) and not os.path.exists(arg):
                 print('file %r does not exist' % arg)
-                break
+                sys.exit(1)
             try:
                 if ispath(arg) and os.path.isfile(arg):
                     arg = importfile(arg)
@@ -2797,8 +2791,9 @@ class BadUsage(Exception): pass
                         writedoc(arg)
                 else:
                     help.help(arg)
-            except ErrorDuringImport as value:
+            except (ImportError, ErrorDuringImport) as value:
                 print(value)
+                sys.exit(1)
 
     except (getopt.error, BadUsage):
         cmd = os.path.splitext(os.path.basename(sys.argv[0]))[0]
diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py
index c862a805bbcce..80a09a99aea97 100644
--- a/Lib/test/test_pydoc.py
+++ b/Lib/test/test_pydoc.py
@@ -24,7 +24,7 @@
 from io import StringIO
 from collections import namedtuple
 from test.support import os_helper
-from test.support.script_helper import assert_python_ok
+from test.support.script_helper import assert_python_ok, assert_python_failure
 from test.support import threading_helper
 from test.support import (reap_children, captured_output, captured_stdout,
                           captured_stderr, requires_docstrings)
@@ -345,6 +345,14 @@ def run_pydoc(module_name, *args, **env):
     rc, out, err = assert_python_ok('-B', pydoc.__file__, *args, **env)
     return out.strip()
 
+def run_pydoc_fail(module_name, *args, **env):
+    """
+    Runs pydoc on the specified module expecting a failure.
+    """
+    args = args + (module_name,)
+    rc, out, err = assert_python_failure('-B', pydoc.__file__, *args, **env)
+    return out.strip()
+
 def get_pydoc_html(module):
     "Returns pydoc generated output as html"
     doc = pydoc.HTMLDoc()
@@ -487,7 +495,7 @@ class B:
 
     def test_not_here(self):
         missing_module = "test.i_am_not_here"
-        result = str(run_pydoc(missing_module), 'ascii')
+        result = str(run_pydoc_fail(missing_module), 'ascii')
         expected = missing_pattern % missing_module
         self.assertEqual(expected, result,
             "documentation for missing module found")
@@ -501,7 +509,7 @@ def test_not_ascii(self):
 
     def test_input_strip(self):
         missing_module = " test.i_am_not_here "
-        result = str(run_pydoc(missing_module), 'ascii')
+        result = str(run_pydoc_fail(missing_module), 'ascii')
         expected = missing_pattern % missing_module.strip()
         self.assertEqual(expected, result)
 
@@ -902,7 +910,7 @@ def test_badimport(self):
         for importstring, expectedinmsg in testpairs:
             with open(sourcefn, 'w') as f:
                 f.write("import {}\n".format(importstring))
-            result = run_pydoc(modname, PYTHONPATH=TESTFN).decode("ascii")
+            result = run_pydoc_fail(modname, PYTHONPATH=TESTFN).decode("ascii")
             expected = badimport_pattern % (modname, expectedinmsg)
             self.assertEqual(expected, result)
 
diff --git a/Misc/NEWS.d/next/Tools-Demos/2021-08-26-11-57-31.bpo-44967.UT1RMV.rst b/Misc/NEWS.d/next/Tools-Demos/2021-08-26-11-57-31.bpo-44967.UT1RMV.rst
new file mode 100644
index 0000000000000..564a5c7d76894
--- /dev/null
+++ b/Misc/NEWS.d/next/Tools-Demos/2021-08-26-11-57-31.bpo-44967.UT1RMV.rst
@@ -0,0 +1 @@
+pydoc now returns a non-zero status code when a module cannot be found.
\ No newline at end of file


From webhook-mailer at python.org  Thu Aug 26 08:48:33 2021
From: webhook-mailer at python.org (ambv)
Date: Thu, 26 Aug 2021 12:48:33 -0000
Subject: [Python-checkins] bpo-45011: Fix test_asyncio without C module
 _asyncio (GH-27968)
Message-ID: <mailman.1188.1629982114.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/7dc505b8655b3e48b93a4274dfd26e5856d9c64f
commit: 7dc505b8655b3e48b93a4274dfd26e5856d9c64f
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-26T14:48:24+02:00
summary:

bpo-45011: Fix test_asyncio without C module _asyncio (GH-27968)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Misc/NEWS.d/next/Tests/2021-08-26-14-20-44.bpo-45011.mQZdXU.rst
M Lib/test/test_asyncio/functional.py
M Lib/test/test_asyncio/test_futures.py
M Lib/test/test_asyncio/test_sslproto.py
M Lib/test/test_asyncio/test_tasks.py

diff --git a/Lib/test/test_asyncio/functional.py b/Lib/test/test_asyncio/functional.py
index 74490a869de9d9..d19c7a612ccf86 100644
--- a/Lib/test/test_asyncio/functional.py
+++ b/Lib/test/test_asyncio/functional.py
@@ -29,10 +29,6 @@ def setUp(self):
         self.loop.set_exception_handler(self.loop_exception_handler)
         self.__unhandled_exceptions = []
 
-        # Disable `_get_running_loop`.
-        self._old_get_running_loop = asyncio.events._get_running_loop
-        asyncio.events._get_running_loop = lambda: None
-
     def tearDown(self):
         try:
             self.loop.close()
@@ -43,7 +39,6 @@ def tearDown(self):
                 self.fail('unexpected calls to loop.call_exception_handler()')
 
         finally:
-            asyncio.events._get_running_loop = self._old_get_running_loop
             asyncio.set_event_loop(None)
             self.loop = None
 
diff --git a/Lib/test/test_asyncio/test_futures.py b/Lib/test/test_asyncio/test_futures.py
index fe3d44227c83cc..42b9499edd78bd 100644
--- a/Lib/test/test_asyncio/test_futures.py
+++ b/Lib/test/test_asyncio/test_futures.py
@@ -918,6 +918,8 @@ def _get_future_cls(self):
         return futures._PyFuture
 
 
+ at unittest.skipUnless(hasattr(futures, '_CFuture'),
+                     'requires the C _asyncio module')
 class CFutureInheritanceTests(BaseFutureInheritanceTests,
                               test_utils.TestCase):
     def _get_future_cls(self):
diff --git a/Lib/test/test_asyncio/test_sslproto.py b/Lib/test/test_asyncio/test_sslproto.py
index e87863eb712373..a47e43dd4cadb4 100644
--- a/Lib/test/test_asyncio/test_sslproto.py
+++ b/Lib/test/test_asyncio/test_sslproto.py
@@ -278,6 +278,7 @@ async def client(addr):
 
         # No garbage is left if SSL is closed uncleanly
         client_context = weakref.ref(client_context)
+        support.gc_collect()
         self.assertIsNone(client_context())
 
     def test_create_connection_memory_leak(self):
@@ -341,6 +342,7 @@ async def client(addr):
         # No garbage is left for SSL client from loop.create_connection, even
         # if user stores the SSLTransport in corresponding protocol instance
         client_context = weakref.ref(client_context)
+        support.gc_collect()
         self.assertIsNone(client_context())
 
     def test_start_tls_client_buf_proto_1(self):
@@ -640,6 +642,7 @@ async def client(addr):
         # The 10s handshake timeout should be cancelled to free related
         # objects without really waiting for 10s
         client_sslctx = weakref.ref(client_sslctx)
+        support.gc_collect()
         self.assertIsNone(client_sslctx())
 
     def test_create_connection_ssl_slow_handshake(self):
diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py
index 86710872ace024..de003737f906ef 100644
--- a/Lib/test/test_asyncio/test_tasks.py
+++ b/Lib/test/test_asyncio/test_tasks.py
@@ -2875,15 +2875,18 @@ class GenericTaskTests(test_utils.TestCase):
     def test_future_subclass(self):
         self.assertTrue(issubclass(asyncio.Task, asyncio.Future))
 
+    @support.cpython_only
     def test_asyncio_module_compiled(self):
         # Because of circular imports it's easy to make _asyncio
         # module non-importable.  This is a simple test that will
         # fail on systems where C modules were successfully compiled
-        # (hence the test for _functools), but _asyncio somehow didn't.
+        # (hence the test for _functools etc), but _asyncio somehow didn't.
         try:
             import _functools
+            import _json
+            import _pickle
         except ImportError:
-            pass
+            self.skipTest('C modules are not available')
         else:
             try:
                 import _asyncio
diff --git a/Misc/NEWS.d/next/Tests/2021-08-26-14-20-44.bpo-45011.mQZdXU.rst b/Misc/NEWS.d/next/Tests/2021-08-26-14-20-44.bpo-45011.mQZdXU.rst
new file mode 100644
index 00000000000000..64e701e2f29f49
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2021-08-26-14-20-44.bpo-45011.mQZdXU.rst
@@ -0,0 +1,3 @@
+Made tests relying on the :mod:`_asyncio` C extension module optional to
+allow running on alternative Python implementations. Patch by Serhiy
+Storchaka.


From webhook-mailer at python.org  Thu Aug 26 09:41:39 2021
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 26 Aug 2021 13:41:39 -0000
Subject: [Python-checkins] bpo-45011: Fix test_asyncio without C module
 _asyncio (GH-27968)
Message-ID: <mailman.1189.1629985300.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/9f814beadb3ee2c7b37e949a2acf72117a449ffd
commit: 9f814beadb3ee2c7b37e949a2acf72117a449ffd
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-26T06:41:29-07:00
summary:

bpo-45011: Fix test_asyncio without C module _asyncio (GH-27968)


Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 7dc505b8655b3e48b93a4274dfd26e5856d9c64f)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
A Misc/NEWS.d/next/Tests/2021-08-26-14-20-44.bpo-45011.mQZdXU.rst
M Lib/test/test_asyncio/functional.py
M Lib/test/test_asyncio/test_futures.py
M Lib/test/test_asyncio/test_sslproto.py
M Lib/test/test_asyncio/test_tasks.py

diff --git a/Lib/test/test_asyncio/functional.py b/Lib/test/test_asyncio/functional.py
index 74490a869de9d..d19c7a612ccf8 100644
--- a/Lib/test/test_asyncio/functional.py
+++ b/Lib/test/test_asyncio/functional.py
@@ -29,10 +29,6 @@ def setUp(self):
         self.loop.set_exception_handler(self.loop_exception_handler)
         self.__unhandled_exceptions = []
 
-        # Disable `_get_running_loop`.
-        self._old_get_running_loop = asyncio.events._get_running_loop
-        asyncio.events._get_running_loop = lambda: None
-
     def tearDown(self):
         try:
             self.loop.close()
@@ -43,7 +39,6 @@ def tearDown(self):
                 self.fail('unexpected calls to loop.call_exception_handler()')
 
         finally:
-            asyncio.events._get_running_loop = self._old_get_running_loop
             asyncio.set_event_loop(None)
             self.loop = None
 
diff --git a/Lib/test/test_asyncio/test_futures.py b/Lib/test/test_asyncio/test_futures.py
index fe3d44227c83c..42b9499edd78b 100644
--- a/Lib/test/test_asyncio/test_futures.py
+++ b/Lib/test/test_asyncio/test_futures.py
@@ -918,6 +918,8 @@ def _get_future_cls(self):
         return futures._PyFuture
 
 
+ at unittest.skipUnless(hasattr(futures, '_CFuture'),
+                     'requires the C _asyncio module')
 class CFutureInheritanceTests(BaseFutureInheritanceTests,
                               test_utils.TestCase):
     def _get_future_cls(self):
diff --git a/Lib/test/test_asyncio/test_sslproto.py b/Lib/test/test_asyncio/test_sslproto.py
index e87863eb71237..a47e43dd4cadb 100644
--- a/Lib/test/test_asyncio/test_sslproto.py
+++ b/Lib/test/test_asyncio/test_sslproto.py
@@ -278,6 +278,7 @@ async def client(addr):
 
         # No garbage is left if SSL is closed uncleanly
         client_context = weakref.ref(client_context)
+        support.gc_collect()
         self.assertIsNone(client_context())
 
     def test_create_connection_memory_leak(self):
@@ -341,6 +342,7 @@ async def client(addr):
         # No garbage is left for SSL client from loop.create_connection, even
         # if user stores the SSLTransport in corresponding protocol instance
         client_context = weakref.ref(client_context)
+        support.gc_collect()
         self.assertIsNone(client_context())
 
     def test_start_tls_client_buf_proto_1(self):
@@ -640,6 +642,7 @@ async def client(addr):
         # The 10s handshake timeout should be cancelled to free related
         # objects without really waiting for 10s
         client_sslctx = weakref.ref(client_sslctx)
+        support.gc_collect()
         self.assertIsNone(client_sslctx())
 
     def test_create_connection_ssl_slow_handshake(self):
diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py
index a9e4cf53566ca..f7345c5c40688 100644
--- a/Lib/test/test_asyncio/test_tasks.py
+++ b/Lib/test/test_asyncio/test_tasks.py
@@ -3275,15 +3275,18 @@ class GenericTaskTests(test_utils.TestCase):
     def test_future_subclass(self):
         self.assertTrue(issubclass(asyncio.Task, asyncio.Future))
 
+    @support.cpython_only
     def test_asyncio_module_compiled(self):
         # Because of circular imports it's easy to make _asyncio
         # module non-importable.  This is a simple test that will
         # fail on systems where C modules were successfully compiled
-        # (hence the test for _functools), but _asyncio somehow didn't.
+        # (hence the test for _functools etc), but _asyncio somehow didn't.
         try:
             import _functools
+            import _json
+            import _pickle
         except ImportError:
-            pass
+            self.skipTest('C modules are not available')
         else:
             try:
                 import _asyncio
diff --git a/Misc/NEWS.d/next/Tests/2021-08-26-14-20-44.bpo-45011.mQZdXU.rst b/Misc/NEWS.d/next/Tests/2021-08-26-14-20-44.bpo-45011.mQZdXU.rst
new file mode 100644
index 0000000000000..64e701e2f29f4
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2021-08-26-14-20-44.bpo-45011.mQZdXU.rst
@@ -0,0 +1,3 @@
+Made tests relying on the :mod:`_asyncio` C extension module optional to
+allow running on alternative Python implementations. Patch by Serhiy
+Storchaka.


From webhook-mailer at python.org  Thu Aug 26 10:49:23 2021
From: webhook-mailer at python.org (ambv)
Date: Thu, 26 Aug 2021 14:49:23 -0000
Subject: [Python-checkins] bpo-45001: Make email date parsing more robust
 against malformed input (GH-27946)
Message-ID: <mailman.1190.1629989364.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/989f6a3800f06b2bd31cfef7c3269a443ad94fac
commit: 989f6a3800f06b2bd31cfef7c3269a443ad94fac
branch: main
author: wouter bolsterlee <wouter at bolsterl.ee>
committer: ambv <lukasz at langa.pl>
date: 2021-08-26T16:49:03+02:00
summary:

bpo-45001: Make email date parsing more robust against malformed input (GH-27946)

Various date parsing utilities in the email module, such as
email.utils.parsedate(), are supposed to gracefully handle invalid
input, typically by raising an appropriate exception or by returning
None.

The internal email._parseaddr._parsedate_tz() helper used by some of
these date parsing routines tries to be robust against malformed input,
but unfortunately it can still crash ungracefully when a non-empty but
whitespace-only input is passed. This manifests as an unexpected
IndexError.

In practice, this can happen when parsing an email with only a newline
inside a ?Date:? header, which unfortunately happens occasionally in the
real world.

Here's a minimal example:

    $ python
    Python 3.9.6 (default, Jun 30 2021, 10:22:16)
    [GCC 11.1.0] on linux
    Type "help", "copyright", "credits" or "license" for more information.
    >>> import email.utils
    >>> email.utils.parsedate('foo')
    >>> email.utils.parsedate(' ')
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
      File "/usr/lib/python3.9/email/_parseaddr.py", line 176, in parsedate
        t = parsedate_tz(data)
      File "/usr/lib/python3.9/email/_parseaddr.py", line 50, in parsedate_tz
        res = _parsedate_tz(data)
      File "/usr/lib/python3.9/email/_parseaddr.py", line 72, in _parsedate_tz
        if data[0].endswith(',') or data[0].lower() in _daynames:
    IndexError: list index out of range

The fix is rather straight-forward: guard against empty lists, after
splitting on whitespace, but before accessing the first element.

files:
A Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst
M Lib/email/_parseaddr.py
M Lib/test/test_email/test_email.py

diff --git a/Lib/email/_parseaddr.py b/Lib/email/_parseaddr.py
index 4d27f87974b20d..977fedf67b1591 100644
--- a/Lib/email/_parseaddr.py
+++ b/Lib/email/_parseaddr.py
@@ -67,6 +67,8 @@ def _parsedate_tz(data):
     if not data:
         return None
     data = data.split()
+    if not data:  # This happens for whitespace-only input.
+        return None
     # The FWS after the comma after the day-of-week is optional, so search and
     # adjust for this.
     if data[0].endswith(',') or data[0].lower() in _daynames:
diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py
index 0154bbad1f63f4..4001f716471dc2 100644
--- a/Lib/test/test_email/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@ -3003,6 +3003,8 @@ def test_formatdate_usegmt(self):
     def test_parsedate_returns_None_for_invalid_strings(self):
         self.assertIsNone(utils.parsedate(''))
         self.assertIsNone(utils.parsedate_tz(''))
+        self.assertIsNone(utils.parsedate(' '))
+        self.assertIsNone(utils.parsedate_tz(' '))
         self.assertIsNone(utils.parsedate('0'))
         self.assertIsNone(utils.parsedate_tz('0'))
         self.assertIsNone(utils.parsedate('A Complete Waste of Time'))
diff --git a/Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst b/Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst
new file mode 100644
index 00000000000000..55cc409d0da30f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst
@@ -0,0 +1,2 @@
+Made email date parsing more robust against malformed input, namely a
+whitespace-only ``Date:`` header. Patch by Wouter Bolsterlee.


From webhook-mailer at python.org  Thu Aug 26 11:47:35 2021
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 26 Aug 2021 15:47:35 -0000
Subject: [Python-checkins] bpo-45001: Make email date parsing more robust
 against malformed input (GH-27946)
Message-ID: <mailman.1191.1629992856.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/9a79242567d79f42ad1a953cce2b1c4a94df23ea
commit: 9a79242567d79f42ad1a953cce2b1c4a94df23ea
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-26T08:47:27-07:00
summary:

bpo-45001: Make email date parsing more robust against malformed input (GH-27946)


Various date parsing utilities in the email module, such as
email.utils.parsedate(), are supposed to gracefully handle invalid
input, typically by raising an appropriate exception or by returning
None.

The internal email._parseaddr._parsedate_tz() helper used by some of
these date parsing routines tries to be robust against malformed input,
but unfortunately it can still crash ungracefully when a non-empty but
whitespace-only input is passed. This manifests as an unexpected
IndexError.

In practice, this can happen when parsing an email with only a newline
inside a ?Date:? header, which unfortunately happens occasionally in the
real world.

Here's a minimal example:

    $ python
    Python 3.9.6 (default, Jun 30 2021, 10:22:16)
    [GCC 11.1.0] on linux
    Type "help", "copyright", "credits" or "license" for more information.
    >>> import email.utils
    >>> email.utils.parsedate('foo')
    >>> email.utils.parsedate(' ')
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
      File "/usr/lib/python3.9/email/_parseaddr.py", line 176, in parsedate
        t = parsedate_tz(data)
      File "/usr/lib/python3.9/email/_parseaddr.py", line 50, in parsedate_tz
        res = _parsedate_tz(data)
      File "/usr/lib/python3.9/email/_parseaddr.py", line 72, in _parsedate_tz
        if data[0].endswith(',') or data[0].lower() in _daynames:
    IndexError: list index out of range

The fix is rather straight-forward: guard against empty lists, after
splitting on whitespace, but before accessing the first element.
(cherry picked from commit 989f6a3800f06b2bd31cfef7c3269a443ad94fac)

Co-authored-by: wouter bolsterlee <wouter at bolsterl.ee>

files:
A Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst
M Lib/email/_parseaddr.py
M Lib/test/test_email/test_email.py

diff --git a/Lib/email/_parseaddr.py b/Lib/email/_parseaddr.py
index 4d27f87974b20..977fedf67b159 100644
--- a/Lib/email/_parseaddr.py
+++ b/Lib/email/_parseaddr.py
@@ -67,6 +67,8 @@ def _parsedate_tz(data):
     if not data:
         return None
     data = data.split()
+    if not data:  # This happens for whitespace-only input.
+        return None
     # The FWS after the comma after the day-of-week is optional, so search and
     # adjust for this.
     if data[0].endswith(',') or data[0].lower() in _daynames:
diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py
index 0154bbad1f63f..4001f716471dc 100644
--- a/Lib/test/test_email/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@ -3003,6 +3003,8 @@ def test_formatdate_usegmt(self):
     def test_parsedate_returns_None_for_invalid_strings(self):
         self.assertIsNone(utils.parsedate(''))
         self.assertIsNone(utils.parsedate_tz(''))
+        self.assertIsNone(utils.parsedate(' '))
+        self.assertIsNone(utils.parsedate_tz(' '))
         self.assertIsNone(utils.parsedate('0'))
         self.assertIsNone(utils.parsedate_tz('0'))
         self.assertIsNone(utils.parsedate('A Complete Waste of Time'))
diff --git a/Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst b/Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst
new file mode 100644
index 0000000000000..55cc409d0da30
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst
@@ -0,0 +1,2 @@
+Made email date parsing more robust against malformed input, namely a
+whitespace-only ``Date:`` header. Patch by Wouter Bolsterlee.


From webhook-mailer at python.org  Thu Aug 26 11:48:24 2021
From: webhook-mailer at python.org (ambv)
Date: Thu, 26 Aug 2021 15:48:24 -0000
Subject: [Python-checkins] bpo-45001: Make email date parsing more robust
 against malformed input (GH-27946) (GH-27973)
Message-ID: <mailman.1192.1629992905.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/2cdbd3b8b2bb4fa0dbcc04ce305fbafaeedd9e67
commit: 2cdbd3b8b2bb4fa0dbcc04ce305fbafaeedd9e67
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-26T17:48:20+02:00
summary:

bpo-45001: Make email date parsing more robust against malformed input (GH-27946) (GH-27973)

Various date parsing utilities in the email module, such as
email.utils.parsedate(), are supposed to gracefully handle invalid
input, typically by raising an appropriate exception or by returning
None.

The internal email._parseaddr._parsedate_tz() helper used by some of
these date parsing routines tries to be robust against malformed input,
but unfortunately it can still crash ungracefully when a non-empty but
whitespace-only input is passed. This manifests as an unexpected
IndexError.

In practice, this can happen when parsing an email with only a newline
inside a ?Date:? header, which unfortunately happens occasionally in the
real world.

Here's a minimal example:

    $ python
    Python 3.9.6 (default, Jun 30 2021, 10:22:16)
    [GCC 11.1.0] on linux
    Type "help", "copyright", "credits" or "license" for more information.
    >>> import email.utils
    >>> email.utils.parsedate('foo')
    >>> email.utils.parsedate(' ')
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
      File "/usr/lib/python3.9/email/_parseaddr.py", line 176, in parsedate
        t = parsedate_tz(data)
      File "/usr/lib/python3.9/email/_parseaddr.py", line 50, in parsedate_tz
        res = _parsedate_tz(data)
      File "/usr/lib/python3.9/email/_parseaddr.py", line 72, in _parsedate_tz
        if data[0].endswith(',') or data[0].lower() in _daynames:
    IndexError: list index out of range

The fix is rather straight-forward: guard against empty lists, after
splitting on whitespace, but before accessing the first element.
(cherry picked from commit 989f6a3800f06b2bd31cfef7c3269a443ad94fac)

Co-authored-by: wouter bolsterlee <wouter at bolsterl.ee>

files:
A Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst
M Lib/email/_parseaddr.py
M Lib/test/test_email/test_email.py

diff --git a/Lib/email/_parseaddr.py b/Lib/email/_parseaddr.py
index 41ff6f8c000d57..178329fbc6aacd 100644
--- a/Lib/email/_parseaddr.py
+++ b/Lib/email/_parseaddr.py
@@ -67,6 +67,8 @@ def _parsedate_tz(data):
     if not data:
         return
     data = data.split()
+    if not data:  # This happens for whitespace-only input.
+        return None
     # The FWS after the comma after the day-of-week is optional, so search and
     # adjust for this.
     if data[0].endswith(',') or data[0].lower() in _daynames:
diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py
index 0421055ccfde9d..217a5b87109096 100644
--- a/Lib/test/test_email/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@ -3002,6 +3002,8 @@ def test_formatdate_usegmt(self):
     def test_parsedate_returns_None_for_invalid_strings(self):
         self.assertIsNone(utils.parsedate(''))
         self.assertIsNone(utils.parsedate_tz(''))
+        self.assertIsNone(utils.parsedate(' '))
+        self.assertIsNone(utils.parsedate_tz(' '))
         self.assertIsNone(utils.parsedate('0'))
         self.assertIsNone(utils.parsedate_tz('0'))
         self.assertIsNone(utils.parsedate('A Complete Waste of Time'))
diff --git a/Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst b/Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst
new file mode 100644
index 00000000000000..55cc409d0da30f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst
@@ -0,0 +1,2 @@
+Made email date parsing more robust against malformed input, namely a
+whitespace-only ``Date:`` header. Patch by Wouter Bolsterlee.


From webhook-mailer at python.org  Thu Aug 26 11:49:16 2021
From: webhook-mailer at python.org (ambv)
Date: Thu, 26 Aug 2021 15:49:16 -0000
Subject: [Python-checkins] bpo-45001: Make email date parsing more robust
 against malformed input (GH-27946) (GH-27974)
Message-ID: <mailman.1193.1629992957.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/81148c6f91092c3aa207a53b657b2548a20b230c
commit: 81148c6f91092c3aa207a53b657b2548a20b230c
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-26T17:49:12+02:00
summary:

bpo-45001: Make email date parsing more robust against malformed input (GH-27946) (GH-27974)

Various date parsing utilities in the email module, such as
email.utils.parsedate(), are supposed to gracefully handle invalid
input, typically by raising an appropriate exception or by returning
None.

The internal email._parseaddr._parsedate_tz() helper used by some of
these date parsing routines tries to be robust against malformed input,
but unfortunately it can still crash ungracefully when a non-empty but
whitespace-only input is passed. This manifests as an unexpected
IndexError.

In practice, this can happen when parsing an email with only a newline
inside a ?Date:? header, which unfortunately happens occasionally in the
real world.

Here's a minimal example:

    $ python
    Python 3.9.6 (default, Jun 30 2021, 10:22:16)
    [GCC 11.1.0] on linux
    Type "help", "copyright", "credits" or "license" for more information.
    >>> import email.utils
    >>> email.utils.parsedate('foo')
    >>> email.utils.parsedate(' ')
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
      File "/usr/lib/python3.9/email/_parseaddr.py", line 176, in parsedate
        t = parsedate_tz(data)
      File "/usr/lib/python3.9/email/_parseaddr.py", line 50, in parsedate_tz
        res = _parsedate_tz(data)
      File "/usr/lib/python3.9/email/_parseaddr.py", line 72, in _parsedate_tz
        if data[0].endswith(',') or data[0].lower() in _daynames:
    IndexError: list index out of range

The fix is rather straight-forward: guard against empty lists, after
splitting on whitespace, but before accessing the first element.
(cherry picked from commit 989f6a3800f06b2bd31cfef7c3269a443ad94fac)

Co-authored-by: wouter bolsterlee <wouter at bolsterl.ee>

files:
A Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst
M Lib/email/_parseaddr.py
M Lib/test/test_email/test_email.py

diff --git a/Lib/email/_parseaddr.py b/Lib/email/_parseaddr.py
index 41ff6f8c000d5..178329fbc6aac 100644
--- a/Lib/email/_parseaddr.py
+++ b/Lib/email/_parseaddr.py
@@ -67,6 +67,8 @@ def _parsedate_tz(data):
     if not data:
         return
     data = data.split()
+    if not data:  # This happens for whitespace-only input.
+        return None
     # The FWS after the comma after the day-of-week is optional, so search and
     # adjust for this.
     if data[0].endswith(',') or data[0].lower() in _daynames:
diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py
index d262dd043c0cd..d68de61bb696b 100644
--- a/Lib/test/test_email/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@ -3002,6 +3002,8 @@ def test_formatdate_usegmt(self):
     def test_parsedate_returns_None_for_invalid_strings(self):
         self.assertIsNone(utils.parsedate(''))
         self.assertIsNone(utils.parsedate_tz(''))
+        self.assertIsNone(utils.parsedate(' '))
+        self.assertIsNone(utils.parsedate_tz(' '))
         self.assertIsNone(utils.parsedate('0'))
         self.assertIsNone(utils.parsedate_tz('0'))
         self.assertIsNone(utils.parsedate('A Complete Waste of Time'))
diff --git a/Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst b/Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst
new file mode 100644
index 0000000000000..55cc409d0da30
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst
@@ -0,0 +1,2 @@
+Made email date parsing more robust against malformed input, namely a
+whitespace-only ``Date:`` header. Patch by Wouter Bolsterlee.


From webhook-mailer at python.org  Thu Aug 26 13:56:58 2021
From: webhook-mailer at python.org (ambv)
Date: Thu, 26 Aug 2021 17:56:58 -0000
Subject: [Python-checkins] [3.9] bpo-45011: Fix test_asyncio without C
 module _asyncio (GH-27968) (GH-27970)
Message-ID: <mailman.1194.1630000619.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/970533e65c1a1129dfc1cc1867f6ad075f7f5bf6
commit: 970533e65c1a1129dfc1cc1867f6ad075f7f5bf6
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-26T19:56:50+02:00
summary:

[3.9] bpo-45011: Fix test_asyncio without C module _asyncio (GH-27968) (GH-27970)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 7dc505b8655b3e48b93a4274dfd26e5856d9c64f)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
A Misc/NEWS.d/next/Tests/2021-08-26-14-20-44.bpo-45011.mQZdXU.rst
M Lib/test/test_asyncio/__init__.py
M Lib/test/test_asyncio/functional.py
M Lib/test/test_asyncio/test_futures.py
M Lib/test/test_asyncio/test_sslproto.py
M Lib/test/test_asyncio/test_tasks.py

diff --git a/Lib/test/test_asyncio/__init__.py b/Lib/test/test_asyncio/__init__.py
index 230c35cfcf12c..4a7a868980d88 100644
--- a/Lib/test/test_asyncio/__init__.py
+++ b/Lib/test/test_asyncio/__init__.py
@@ -28,6 +28,7 @@ def run(self, result, debug=False):
             ignore("asyncio.runners", like=r".*loop argument.*"),
             ignore("asyncio.subprocess", like=r".*loop argument.*"),
             ignore("asyncio.tasks", like=r".*loop argument.*"),
+            ignore("test.test_asyncio.test_events", like=r".*loop argument.*"),
             ignore("test.test_asyncio.test_queues", like=r".*loop argument.*"),
             ignore("test.test_asyncio.test_tasks", like=r".*loop argument.*"),
         }
diff --git a/Lib/test/test_asyncio/functional.py b/Lib/test/test_asyncio/functional.py
index 5cd0659387d84..70bc40892cca5 100644
--- a/Lib/test/test_asyncio/functional.py
+++ b/Lib/test/test_asyncio/functional.py
@@ -29,10 +29,6 @@ def setUp(self):
         self.loop.set_exception_handler(self.loop_exception_handler)
         self.__unhandled_exceptions = []
 
-        # Disable `_get_running_loop`.
-        self._old_get_running_loop = asyncio.events._get_running_loop
-        asyncio.events._get_running_loop = lambda: None
-
     def tearDown(self):
         try:
             self.loop.close()
@@ -43,7 +39,6 @@ def tearDown(self):
                 self.fail('unexpected calls to loop.call_exception_handler()')
 
         finally:
-            asyncio.events._get_running_loop = self._old_get_running_loop
             asyncio.set_event_loop(None)
             self.loop = None
 
diff --git a/Lib/test/test_asyncio/test_futures.py b/Lib/test/test_asyncio/test_futures.py
index ec00896cc620b..c16bfc08a7abe 100644
--- a/Lib/test/test_asyncio/test_futures.py
+++ b/Lib/test/test_asyncio/test_futures.py
@@ -876,6 +876,8 @@ def _get_future_cls(self):
         return futures._PyFuture
 
 
+ at unittest.skipUnless(hasattr(futures, '_CFuture'),
+                     'requires the C _asyncio module')
 class CFutureInheritanceTests(BaseFutureInheritanceTests,
                               test_utils.TestCase):
     def _get_future_cls(self):
diff --git a/Lib/test/test_asyncio/test_sslproto.py b/Lib/test/test_asyncio/test_sslproto.py
index 948820c82f3bf..bc01a8bbf2d35 100644
--- a/Lib/test/test_asyncio/test_sslproto.py
+++ b/Lib/test/test_asyncio/test_sslproto.py
@@ -278,6 +278,7 @@ async def client(addr):
 
         # No garbage is left if SSL is closed uncleanly
         client_context = weakref.ref(client_context)
+        support.gc_collect()
         self.assertIsNone(client_context())
 
     def test_create_connection_memory_leak(self):
@@ -341,6 +342,7 @@ async def client(addr):
         # No garbage is left for SSL client from loop.create_connection, even
         # if user stores the SSLTransport in corresponding protocol instance
         client_context = weakref.ref(client_context)
+        support.gc_collect()
         self.assertIsNone(client_context())
 
     def test_start_tls_client_buf_proto_1(self):
@@ -640,6 +642,7 @@ async def client(addr):
         # The 10s handshake timeout should be cancelled to free related
         # objects without really waiting for 10s
         client_sslctx = weakref.ref(client_sslctx)
+        support.gc_collect()
         self.assertIsNone(client_sslctx())
 
     def test_create_connection_ssl_slow_handshake(self):
diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py
index 01f62b7f40872..24d04feb950d3 100644
--- a/Lib/test/test_asyncio/test_tasks.py
+++ b/Lib/test/test_asyncio/test_tasks.py
@@ -3196,15 +3196,18 @@ class GenericTaskTests(test_utils.TestCase):
     def test_future_subclass(self):
         self.assertTrue(issubclass(asyncio.Task, asyncio.Future))
 
+    @support.cpython_only
     def test_asyncio_module_compiled(self):
         # Because of circular imports it's easy to make _asyncio
         # module non-importable.  This is a simple test that will
         # fail on systems where C modules were successfully compiled
-        # (hence the test for _functools), but _asyncio somehow didn't.
+        # (hence the test for _functools etc), but _asyncio somehow didn't.
         try:
             import _functools
+            import _json
+            import _pickle
         except ImportError:
-            pass
+            self.skipTest('C modules are not available')
         else:
             try:
                 import _asyncio
diff --git a/Misc/NEWS.d/next/Tests/2021-08-26-14-20-44.bpo-45011.mQZdXU.rst b/Misc/NEWS.d/next/Tests/2021-08-26-14-20-44.bpo-45011.mQZdXU.rst
new file mode 100644
index 0000000000000..64e701e2f29f4
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2021-08-26-14-20-44.bpo-45011.mQZdXU.rst
@@ -0,0 +1,3 @@
+Made tests relying on the :mod:`_asyncio` C extension module optional to
+allow running on alternative Python implementations. Patch by Serhiy
+Storchaka.


From webhook-mailer at python.org  Thu Aug 26 14:19:51 2021
From: webhook-mailer at python.org (ambv)
Date: Thu, 26 Aug 2021 18:19:51 -0000
Subject: [Python-checkins] bpo-45010: Remove support of special method
 __div__ in unittest.mock (GH-27965)
Message-ID: <mailman.1195.1630001993.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/f9cd40f5e242d3c64cc20a5064500f5fe864f91f
commit: f9cd40f5e242d3c64cc20a5064500f5fe864f91f
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-26T20:19:47+02:00
summary:

bpo-45010: Remove support of special method __div__ in unittest.mock (GH-27965)

files:
A Misc/NEWS.d/next/Library/2021-08-26-09-54-14.bpo-45010.Cn23bQ.rst
M Doc/library/unittest.mock.rst
M Lib/unittest/mock.py

diff --git a/Doc/library/unittest.mock.rst b/Doc/library/unittest.mock.rst
index 2f82fded9943d..0856c3fbded08 100644
--- a/Doc/library/unittest.mock.rst
+++ b/Doc/library/unittest.mock.rst
@@ -2020,7 +2020,7 @@ The full list of supported magic methods is:
 * Context manager: ``__enter__``, ``__exit__``, ``__aenter__`` and ``__aexit__``
 * Unary numeric methods: ``__neg__``, ``__pos__`` and ``__invert__``
 * The numeric methods (including right hand and in-place variants):
-  ``__add__``, ``__sub__``, ``__mul__``, ``__matmul__``, ``__div__``, ``__truediv__``,
+  ``__add__``, ``__sub__``, ``__mul__``, ``__matmul__``, ``__truediv__``,
   ``__floordiv__``, ``__mod__``, ``__divmod__``, ``__lshift__``,
   ``__rshift__``, ``__and__``, ``__xor__``, ``__or__``, and ``__pow__``
 * Numeric conversion methods: ``__complex__``, ``__int__``, ``__float__``
diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py
index ecf84d224fce3..8193efc7cf125 100644
--- a/Lib/unittest/mock.py
+++ b/Lib/unittest/mock.py
@@ -1929,7 +1929,7 @@ def _patch_stopall():
 )
 
 numerics = (
-    "add sub mul matmul div floordiv mod lshift rshift and xor or pow truediv"
+    "add sub mul matmul truediv floordiv mod lshift rshift and xor or pow"
 )
 inplace = ' '.join('i%s' % n for n in numerics.split())
 right = ' '.join('r%s' % n for n in numerics.split())
diff --git a/Misc/NEWS.d/next/Library/2021-08-26-09-54-14.bpo-45010.Cn23bQ.rst b/Misc/NEWS.d/next/Library/2021-08-26-09-54-14.bpo-45010.Cn23bQ.rst
new file mode 100644
index 0000000000000..bdf1bfe1ffe06
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-26-09-54-14.bpo-45010.Cn23bQ.rst
@@ -0,0 +1,2 @@
+Remove support of special method ``__div__`` in :mod:`unittest.mock`. It is
+not used in Python 3.


From webhook-mailer at python.org  Thu Aug 26 14:40:32 2021
From: webhook-mailer at python.org (ambv)
Date: Thu, 26 Aug 2021 18:40:32 -0000
Subject: [Python-checkins] bpo-40635: Fix getfqdn() docstring and docs
 (GH-27971)
Message-ID: <mailman.1196.1630003234.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/fdcb675eed47b1f6054fae381af4388b16a6fff4
commit: fdcb675eed47b1f6054fae381af4388b16a6fff4
branch: main
author: andrei kulakov <andrei.avk at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-26T20:40:28+02:00
summary:

bpo-40635: Fix getfqdn() docstring and docs (GH-27971)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
M Doc/library/socket.rst
M Lib/socket.py

diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 95c7d7e0699f0..d668c6b797271 100755
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -808,8 +808,9 @@ The :mod:`socket` module also offers various network-related services:
    it is interpreted as the local host.  To find the fully qualified name, the
    hostname returned by :func:`gethostbyaddr` is checked, followed by aliases for the
    host, if available.  The first name which includes a period is selected.  In
-   case no fully qualified domain name is available, the hostname as returned by
-   :func:`gethostname` is returned.
+   case no fully qualified domain name is available and *name* was provided,
+   it is returned unchanged.  If *name* was empty or equal to ``'0.0.0.0'``,
+   the hostname from :func:`gethostname` is returned.
 
 
 .. function:: gethostbyname(hostname)
diff --git a/Lib/socket.py b/Lib/socket.py
index a64ae400ce988..ef82c496cb85a 100755
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -782,8 +782,9 @@ def getfqdn(name=''):
     An empty argument is interpreted as meaning the local host.
 
     First the hostname returned by gethostbyaddr() is checked, then
-    possibly existing aliases. In case no FQDN is available, hostname
-    from gethostname() is returned.
+    possibly existing aliases. In case no FQDN is available and `name`
+    was given, it is returned unchanged. If `name` was empty or '0.0.0.0',
+    hostname from gethostname() is returned.
     """
     name = name.strip()
     if not name or name == '0.0.0.0':


From webhook-mailer at python.org  Thu Aug 26 15:55:01 2021
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 26 Aug 2021 19:55:01 -0000
Subject: [Python-checkins] bpo-40635: Fix getfqdn() docstring and docs
 (GH-27971)
Message-ID: <mailman.1197.1630007702.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/719af92e108ea3b31729cb09077673b8f13905d2
commit: 719af92e108ea3b31729cb09077673b8f13905d2
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-26T12:54:52-07:00
summary:

bpo-40635: Fix getfqdn() docstring and docs (GH-27971)


Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit fdcb675eed47b1f6054fae381af4388b16a6fff4)

Co-authored-by: andrei kulakov <andrei.avk at gmail.com>

files:
M Doc/library/socket.rst
M Lib/socket.py

diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index e1db1b5e66629e..1b6dc4d1ed08dc 100755
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -808,8 +808,9 @@ The :mod:`socket` module also offers various network-related services:
    it is interpreted as the local host.  To find the fully qualified name, the
    hostname returned by :func:`gethostbyaddr` is checked, followed by aliases for the
    host, if available.  The first name which includes a period is selected.  In
-   case no fully qualified domain name is available, the hostname as returned by
-   :func:`gethostname` is returned.
+   case no fully qualified domain name is available and *name* was provided,
+   it is returned unchanged.  If *name* was empty or equal to ``'0.0.0.0'``,
+   the hostname from :func:`gethostname` is returned.
 
 
 .. function:: gethostbyname(hostname)
diff --git a/Lib/socket.py b/Lib/socket.py
index fc11eb783c3dd1..63ba0acc908c3c 100755
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -782,8 +782,9 @@ def getfqdn(name=''):
     An empty argument is interpreted as meaning the local host.
 
     First the hostname returned by gethostbyaddr() is checked, then
-    possibly existing aliases. In case no FQDN is available, hostname
-    from gethostname() is returned.
+    possibly existing aliases. In case no FQDN is available and `name`
+    was given, it is returned unchanged. If `name` was empty or '0.0.0.0',
+    hostname from gethostname() is returned.
     """
     name = name.strip()
     if not name or name == '0.0.0.0':


From webhook-mailer at python.org  Thu Aug 26 15:55:32 2021
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 26 Aug 2021 19:55:32 -0000
Subject: [Python-checkins] bpo-40635: Fix getfqdn() docstring and docs
 (GH-27971)
Message-ID: <mailman.1198.1630007733.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/f1e3fc4631da5e6ca1ea047c82bd9b42db9dd9ae
commit: f1e3fc4631da5e6ca1ea047c82bd9b42db9dd9ae
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-26T12:55:22-07:00
summary:

bpo-40635: Fix getfqdn() docstring and docs (GH-27971)


Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit fdcb675eed47b1f6054fae381af4388b16a6fff4)

Co-authored-by: andrei kulakov <andrei.avk at gmail.com>

files:
M Doc/library/socket.rst
M Lib/socket.py

diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 26892c99268ba9..609fbe86b31449 100755
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -795,8 +795,9 @@ The :mod:`socket` module also offers various network-related services:
    it is interpreted as the local host.  To find the fully qualified name, the
    hostname returned by :func:`gethostbyaddr` is checked, followed by aliases for the
    host, if available.  The first name which includes a period is selected.  In
-   case no fully qualified domain name is available, the hostname as returned by
-   :func:`gethostname` is returned.
+   case no fully qualified domain name is available and *name* was provided,
+   it is returned unchanged.  If *name* was empty or equal to ``'0.0.0.0'``,
+   the hostname from :func:`gethostname` is returned.
 
 
 .. function:: gethostbyname(hostname)
diff --git a/Lib/socket.py b/Lib/socket.py
index cafa573a30c052..46fc49ca3233e0 100755
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -781,8 +781,9 @@ def getfqdn(name=''):
     An empty argument is interpreted as meaning the local host.
 
     First the hostname returned by gethostbyaddr() is checked, then
-    possibly existing aliases. In case no FQDN is available, hostname
-    from gethostname() is returned.
+    possibly existing aliases. In case no FQDN is available and `name`
+    was given, it is returned unchanged. If `name` was empty or '0.0.0.0',
+    hostname from gethostname() is returned.
     """
     name = name.strip()
     if not name or name == '0.0.0.0':


From webhook-mailer at python.org  Thu Aug 26 19:57:07 2021
From: webhook-mailer at python.org (zooba)
Date: Thu, 26 Aug 2021 23:57:07 -0000
Subject: [Python-checkins] bpo-45022: Pin current libffi build to fixed
 version in preparation for upcoming update (GH-27982)
Message-ID: <mailman.1199.1630022228.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/969ae7f7356584e30667b4e490ffa2ffa1810429
commit: 969ae7f7356584e30667b4e490ffa2ffa1810429
branch: main
author: Steve Dower <steve.dower at python.org>
committer: zooba <steve.dower at microsoft.com>
date: 2021-08-27T00:57:00+01:00
summary:

bpo-45022: Pin current libffi build to fixed version in preparation for upcoming update (GH-27982)

Also improve the build script for libffi, which is not used as part of the regular build.

files:
M PCbuild/get_externals.bat
M PCbuild/prepare_libffi.bat
M PCbuild/python.props

diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 63e3bb47672cc9..8a1ab21d743c71 100644
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -52,7 +52,7 @@ echo.Fetching external libraries...
 
 set libraries=
 set libraries=%libraries%                                       bzip2-1.0.6
-if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries%  libffi
+if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries%  libffi-3.3.0
 if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries%     openssl-1.1.1k
 set libraries=%libraries%                                       sqlite-3.35.5.0
 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.11.0
@@ -76,7 +76,7 @@ for %%e in (%libraries%) do (
 echo.Fetching external binaries...
 
 set binaries=
-if NOT "%IncludeLibffi%"=="false"  set binaries=%binaries% libffi
+if NOT "%IncludeLibffi%"=="false"  set binaries=%binaries% libffi-3.3.0
 if NOT "%IncludeSSL%"=="false"     set binaries=%binaries% openssl-bin-1.1.1k-1
 if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.11.0
 if NOT "%IncludeSSLSrc%"=="false"  set binaries=%binaries% nasm-2.11.06
diff --git a/PCbuild/prepare_libffi.bat b/PCbuild/prepare_libffi.bat
index 922a47565c8da5..7e7842a2fc97a4 100644
--- a/PCbuild/prepare_libffi.bat
+++ b/PCbuild/prepare_libffi.bat
@@ -38,6 +38,7 @@ set BUILD_ARM32=
 set BUILD_ARM64=
 set BUILD_PDB=
 set BUILD_NOOPT=
+set COPY_LICENSE=
 set INSTALL_CYGWIN=
 
 :CheckOpts
@@ -49,6 +50,7 @@ if /I "%1"=="-arm32" (set BUILD_ARM32=1) & shift & goto :CheckOpts
 if /I "%1"=="-arm64" (set BUILD_ARM64=1) & shift & goto :CheckOpts
 if /I "%1"=="-pdb" (set BUILD_PDB=-g) & shift & goto :CheckOpts
 if /I "%1"=="-noopt" (set BUILD_NOOPT=CFLAGS='-Od -warn all') & shift & goto :CheckOpts
+if /I "%1"=="-license" (set COPY_LICENSE=1) & shift & goto :CheckOpts
 if /I "%1"=="-?" goto :Usage
 if /I "%1"=="--install-cygwin" (set INSTALL_CYGWIN=1) & shift & goto :CheckOpts
 goto :Usage
@@ -60,6 +62,7 @@ if NOT DEFINED BUILD_X64 if NOT DEFINED BUILD_X86 if NOT DEFINED BUILD_ARM32 if
     set BUILD_X86=1
     set BUILD_ARM32=1
     set BUILD_ARM64=1
+    set COPY_LICENSE=1
 )
 
 if "%INSTALL_CYGWIN%"=="1" call :InstallCygwin
@@ -98,9 +101,14 @@ if not exist Makefile.in (
 )
 
 if "%BUILD_X64%"=="1" call :BuildOne x64 x86_64-w64-cygwin x86_64-w64-cygwin
+if errorlevel 1 exit /B %ERRORLEVEL%
 if "%BUILD_X86%"=="1" call :BuildOne x86 i686-pc-cygwin i686-pc-cygwin
+if errorlevel 1 exit /B %ERRORLEVEL%
 if "%BUILD_ARM32%"=="1" call :BuildOne x86_arm i686-pc-cygwin arm-w32-cygwin
+if errorlevel 1 exit /B %ERRORLEVEL%
 if "%BUILD_ARM64%"=="1" call :BuildOne x86_arm64 i686-pc-cygwin aarch64-w64-cygwin
+if errorlevel 1 exit /B %ERRORLEVEL%
+if "%COPY_LICENSE%"=="1" copy /y "%LIBFFI_SOURCE%\LICENSE" "%LIBFFI_OUT%\LICENSE"
 
 popd
 endlocal
@@ -179,11 +187,11 @@ if "%LIBFFI_TEST%" EQU "1" (
 
 echo copying files to %_LIBFFI_OUT%
 if not exist %_LIBFFI_OUT%\include (md %_LIBFFI_OUT%\include)
-copy %ARTIFACTS%\.libs\libffi-7.dll %_LIBFFI_OUT%
-copy %ARTIFACTS%\.libs\libffi-7.lib %_LIBFFI_OUT%
-copy %ARTIFACTS%\.libs\libffi-7.pdb %_LIBFFI_OUT%
-copy %ARTIFACTS%\fficonfig.h %_LIBFFI_OUT%\include
-copy %ARTIFACTS%\include\*.h %_LIBFFI_OUT%\include
+copy %ARTIFACTS%\.libs\libffi-*.dll %_LIBFFI_OUT% || exit /B 1
+copy %ARTIFACTS%\.libs\libffi-*.lib %_LIBFFI_OUT% || exit /B 1
+copy %ARTIFACTS%\.libs\libffi-*.pdb %_LIBFFI_OUT%
+copy %ARTIFACTS%\fficonfig.h %_LIBFFI_OUT%\include || exit /B 1
+copy %ARTIFACTS%\include\*.h %_LIBFFI_OUT%\include || exit /B 1
 
 endlocal
 exit /b
diff --git a/PCbuild/python.props b/PCbuild/python.props
index 60625101b47287..da65df58e227d9 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -60,8 +60,8 @@
     <sqlite3Dir>$(ExternalsDir)sqlite-3.35.5.0\</sqlite3Dir>
     <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
     <lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
-    <libffiDir>$(ExternalsDir)libffi\</libffiDir>
-    <libffiOutDir>$(ExternalsDir)libffi\$(ArchName)\</libffiOutDir>
+    <libffiDir>$(ExternalsDir)libffi-3.3.0\</libffiDir>
+    <libffiOutDir>$(ExternalsDir)libffi-3.3.0\$(ArchName)\</libffiOutDir>
     <libffiIncludeDir>$(libffiOutDir)include</libffiIncludeDir>
     <opensslDir>$(ExternalsDir)openssl-1.1.1k\</opensslDir>
     <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1k-1\$(ArchName)\</opensslOutDir>


From webhook-mailer at python.org  Thu Aug 26 22:56:34 2021
From: webhook-mailer at python.org (gpshead)
Date: Fri, 27 Aug 2021 02:56:34 -0000
Subject: [Python-checkins] bpo-41818: Add termios.tcgetwinsize(),
 termios.tcsetwinsize(). (GH-23686)
Message-ID: <mailman.1200.1630032995.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/ae224bb566301d3602e9b090e37c1dcf5a48c914
commit: ae224bb566301d3602e9b090e37c1dcf5a48c914
branch: main
author: Soumendra Ganguly <67527439+8vasu at users.noreply.github.com>
committer: gpshead <greg at krypto.org>
date: 2021-08-26T19:56:26-07:00
summary:

bpo-41818: Add termios.tcgetwinsize(), termios.tcsetwinsize(). (GH-23686)

* Add termios.tcgetwinsize(), termios.tcsetwinsize(). Update docs.
* Add TIOCGSIZE support to termios.tcgetwinsize()
* Add TIOCSSIZE support to termios.tcsetwinsize()

Authored-by: Soumendra Ganguly <soumendraganguly at gmail.com>

* termios.tcgetwinsize() and termios.tcsetwinsize() should return/accept two-item tuples instead of lists.
* Refactor tcsetwinsize to share common code and accept any two item sequence, with overflow checking.

Co-authored-by: Gregory P. Smith <greg at krypto.org> [Google]

files:
A Misc/NEWS.d/next/Library/2020-12-08-01-08-58.bpo-41818.zO8vV7.rst
M Doc/library/termios.rst
M Modules/clinic/termios.c.h
M Modules/termios.c

diff --git a/Doc/library/termios.rst b/Doc/library/termios.rst
index d75a87c55a46e..8ced0bbbd7757 100644
--- a/Doc/library/termios.rst
+++ b/Doc/library/termios.rst
@@ -74,6 +74,22 @@ The module defines the following functions:
    output, :const:`TCIOFF` to suspend input, or :const:`TCION` to restart input.
 
 
+.. function:: tcgetwinsize(fd)
+
+   Return a tuple ``(ws_row, ws_col)`` containing the tty window size for file
+   descriptor *fd*. Requires :const:`termios.TIOCGWINSZ` or
+   :const:`termios.TIOCGSIZE`.
+
+
+.. function:: tcsetwinsize(fd, winsize)
+
+    Set the tty window size for file descriptor *fd* from *winsize*, which is
+    a two-item tuple ``(ws_row, ws_col)`` like the one returned by
+    :func:`tcgetwinsize`. Requires at least one of the pairs
+    (:const:`termios.TIOCGWINSZ`, :const:`termios.TIOCSWINSZ`);
+    (:const:`termios.TIOCGSIZE`, :const:`termios.TIOCSSIZE`) to be defined.
+
+
 .. seealso::
 
    Module :mod:`tty`
diff --git a/Misc/NEWS.d/next/Library/2020-12-08-01-08-58.bpo-41818.zO8vV7.rst b/Misc/NEWS.d/next/Library/2020-12-08-01-08-58.bpo-41818.zO8vV7.rst
new file mode 100644
index 0000000000000..e8d6063d4b5e7
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-12-08-01-08-58.bpo-41818.zO8vV7.rst
@@ -0,0 +1 @@
+Soumendra Ganguly: add termios.tcgetwinsize(), termios.tcsetwinsize().
\ No newline at end of file
diff --git a/Modules/clinic/termios.c.h b/Modules/clinic/termios.c.h
index a45c1f64262f8..b4d179abbe490 100644
--- a/Modules/clinic/termios.c.h
+++ b/Modules/clinic/termios.c.h
@@ -222,4 +222,68 @@ termios_tcflow(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=a129179f1e2545cc input=a9049054013a1b77]*/
+
+PyDoc_STRVAR(termios_tcgetwinsize__doc__,
+"tcgetwinsize($module, fd, /)\n"
+"--\n"
+"\n"
+"Get the tty winsize for file descriptor fd.\n"
+"\n"
+"Returns a tuple (ws_row, ws_col).");
+
+#define TERMIOS_TCGETWINSIZE_METHODDEF    \
+    {"tcgetwinsize", (PyCFunction)termios_tcgetwinsize, METH_O, termios_tcgetwinsize__doc__},
+
+static PyObject *
+termios_tcgetwinsize_impl(PyObject *module, int fd);
+
+static PyObject *
+termios_tcgetwinsize(PyObject *module, PyObject *arg)
+{
+    PyObject *return_value = NULL;
+    int fd;
+
+    if (!_PyLong_FileDescriptor_Converter(arg, &fd)) {
+        goto exit;
+    }
+    return_value = termios_tcgetwinsize_impl(module, fd);
+
+exit:
+    return return_value;
+}
+
+PyDoc_STRVAR(termios_tcsetwinsize__doc__,
+"tcsetwinsize($module, fd, winsize, /)\n"
+"--\n"
+"\n"
+"Set the tty winsize for file descriptor fd.\n"
+"\n"
+"The winsize to be set is taken from the winsize argument, which\n"
+"is a two-item tuple (ws_row, ws_col) like the one returned by tcgetwinsize().");
+
+#define TERMIOS_TCSETWINSIZE_METHODDEF    \
+    {"tcsetwinsize", (PyCFunction)(void(*)(void))termios_tcsetwinsize, METH_FASTCALL, termios_tcsetwinsize__doc__},
+
+static PyObject *
+termios_tcsetwinsize_impl(PyObject *module, int fd, PyObject *winsz);
+
+static PyObject *
+termios_tcsetwinsize(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
+{
+    PyObject *return_value = NULL;
+    int fd;
+    PyObject *winsz;
+
+    if (!_PyArg_CheckPositional("tcsetwinsize", nargs, 2, 2)) {
+        goto exit;
+    }
+    if (!_PyLong_FileDescriptor_Converter(args[0], &fd)) {
+        goto exit;
+    }
+    winsz = args[1];
+    return_value = termios_tcsetwinsize_impl(module, fd, winsz);
+
+exit:
+    return return_value;
+}
+/*[clinic end generated code: output=db808d31296f6643 input=a9049054013a1b77]*/
diff --git a/Modules/termios.c b/Modules/termios.c
index fdfe589eb80c1..38573e25f51dd 100644
--- a/Modules/termios.c
+++ b/Modules/termios.c
@@ -315,6 +315,156 @@ termios_tcflow_impl(PyObject *module, int fd, int action)
     Py_RETURN_NONE;
 }
 
+/*[clinic input]
+termios.tcgetwinsize
+
+    fd: fildes
+    /
+
+Get the tty winsize for file descriptor fd.
+
+Returns a tuple (ws_row, ws_col).
+[clinic start generated code]*/
+
+static PyObject *
+termios_tcgetwinsize_impl(PyObject *module, int fd)
+/*[clinic end generated code: output=31825977d5325fb6 input=5706c379d7fd984d]*/
+{
+#if defined(TIOCGWINSZ)
+    termiosmodulestate *state = PyModule_GetState(module);
+    struct winsize w;
+    if (ioctl(fd, TIOCGWINSZ, &w) == -1) {
+        return PyErr_SetFromErrno(state->TermiosError);
+    }
+
+    PyObject *v;
+    if (!(v = PyTuple_New(2))) {
+        return NULL;
+    }
+
+    PyTuple_SetItem(v, 0, PyLong_FromLong((long)w.ws_row));
+    PyTuple_SetItem(v, 1, PyLong_FromLong((long)w.ws_col));
+    if (PyErr_Occurred()) {
+        Py_DECREF(v);
+        return NULL;
+    }
+    return v;
+#elif defined(TIOCGSIZE)
+    termiosmodulestate *state = PyModule_GetState(module);
+    struct ttysize s;
+    if (ioctl(fd, TIOCGSIZE, &s) == -1) {
+        return PyErr_SetFromErrno(state->TermiosError);
+    }
+
+    PyObject *v;
+    if (!(v = PyTuple_New(2))) {
+        return NULL;
+    }
+
+    PyTuple_SetItem(v, 0, PyLong_FromLong((long)s.ts_lines));
+    PyTuple_SetItem(v, 1, PyLong_FromLong((long)s.ts_cols));
+    if (PyErr_Occurred()) {
+        Py_DECREF(v);
+        return NULL;
+    }
+    return v;
+#else
+    PyErr_SetString(PyExc_NotImplementedError,
+                    "requires termios.TIOCGWINSZ and/or termios.TIOCGSIZE");
+    return NULL;
+#endif /* defined(TIOCGWINSZ) */
+}
+
+/*[clinic input]
+termios.tcsetwinsize
+
+    fd: fildes
+    winsize as winsz: object
+    /
+
+Set the tty winsize for file descriptor fd.
+
+The winsize to be set is taken from the winsize argument, which
+is a two-item tuple (ws_row, ws_col) like the one returned by tcgetwinsize().
+[clinic start generated code]*/
+
+static PyObject *
+termios_tcsetwinsize_impl(PyObject *module, int fd, PyObject *winsz)
+/*[clinic end generated code: output=2ac3c9bb6eda83e1 input=4a06424465b24aee]*/
+{
+    if (!PySequence_Check(winsz) || PySequence_Size(winsz) != 2) {
+        PyErr_SetString(PyExc_TypeError,
+                     "tcsetwinsize, arg 2: must be a two-item sequence");
+        return NULL;
+    }
+
+    PyObject *tmp_item;
+    long winsz_0, winsz_1;
+    tmp_item = PySequence_GetItem(winsz, 0);
+    winsz_0 = PyLong_AsLong(tmp_item);
+    if (winsz_0 == -1 && PyErr_Occurred()) {
+        Py_XDECREF(tmp_item);
+        return NULL;
+    }
+    Py_XDECREF(tmp_item);
+    tmp_item = PySequence_GetItem(winsz, 1);
+    winsz_1 = PyLong_AsLong(tmp_item);                             
+    if (winsz_1 == -1 && PyErr_Occurred()) {
+        Py_XDECREF(tmp_item);
+        return NULL;
+    }
+    Py_XDECREF(tmp_item);
+
+    termiosmodulestate *state = PyModule_GetState(module);
+
+#if defined(TIOCGWINSZ) && defined(TIOCSWINSZ)
+    struct winsize w;
+    /* Get the old winsize because it might have
+       more fields such as xpixel, ypixel. */
+    if (ioctl(fd, TIOCGWINSZ, &w) == -1) {
+        return PyErr_SetFromErrno(state->TermiosError);
+    }
+
+    w.ws_row = (unsigned short) winsz_0;
+    w.ws_col = (unsigned short) winsz_1;
+    if ((((long)w.ws_row) != winsz_0) || (((long)w.ws_col) != winsz_1)) {
+        PyErr_SetString(PyExc_OverflowError,
+                        "winsize value(s) out of range.");
+        return NULL;
+    }
+
+    if (ioctl(fd, TIOCSWINSZ, &w) == -1) {
+        return PyErr_SetFromErrno(state->TermiosError);
+    }
+
+    Py_RETURN_NONE;
+#elif defined(TIOCGSIZE) && defined(TIOCSSIZE)
+    struct ttysize s;
+    /* Get the old ttysize because it might have more fields. */
+    if (ioctl(fd, TIOCGSIZE, &s) == -1) {
+        return PyErr_SetFromErrno(state->TermiosError);
+    }
+
+    s.ts_lines = (int) winsz_0;
+    s.ts_cols = (int) winsz_1;
+    if ((((long)s.ts_lines) != winsz_0) || (((long)s.ts_cols) != winsz_1)) {
+        PyErr_SetString(PyExc_OverflowError,
+                        "winsize value(s) out of range.");
+        return NULL;
+    }
+
+    if (ioctl(fd, TIOCSSIZE, &s) == -1) {
+        return PyErr_SetFromErrno(state->TermiosError);
+    }
+
+    Py_RETURN_NONE;
+#else
+    PyErr_SetString(PyExc_NotImplementedError,
+                    "requires termios.TIOCGWINSZ, termios.TIOCSWINSZ and/or termios.TIOCGSIZE, termios.TIOCSSIZE");
+    return NULL;
+#endif /* defined(TIOCGWINSZ) && defined(TIOCSWINSZ) */
+}
+
 static PyMethodDef termios_methods[] =
 {
     TERMIOS_TCGETATTR_METHODDEF
@@ -323,6 +473,8 @@ static PyMethodDef termios_methods[] =
     TERMIOS_TCDRAIN_METHODDEF
     TERMIOS_TCFLUSH_METHODDEF
     TERMIOS_TCFLOW_METHODDEF
+    TERMIOS_TCGETWINSIZE_METHODDEF
+    TERMIOS_TCSETWINSIZE_METHODDEF
     {NULL, NULL}
 };
 
@@ -841,6 +993,9 @@ static struct constant {
 #ifdef TIOCGSERIAL
     {"TIOCGSERIAL", TIOCGSERIAL},
 #endif
+#ifdef TIOCGSIZE
+    {"TIOCGSIZE", TIOCGSIZE},
+#endif
 #ifdef TIOCGSOFTCAR
     {"TIOCGSOFTCAR", TIOCGSOFTCAR},
 #endif
@@ -973,6 +1128,9 @@ static struct constant {
 #ifdef TIOCSSERIAL
     {"TIOCSSERIAL", TIOCSSERIAL},
 #endif
+#ifdef TIOCSSIZE
+    {"TIOCSSIZE", TIOCSSIZE},
+#endif
 #ifdef TIOCSSOFTCAR
     {"TIOCSSOFTCAR", TIOCSSOFTCAR},
 #endif


From webhook-mailer at python.org  Thu Aug 26 23:29:38 2021
From: webhook-mailer at python.org (gpshead)
Date: Fri, 27 Aug 2021 03:29:38 -0000
Subject: [Python-checkins] bpo-41818: ++ termios versionadded markers.
 (GH-27987)
Message-ID: <mailman.1201.1630034979.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/245f1f260577a005fd631144b4377febef0b47ed
commit: 245f1f260577a005fd631144b4377febef0b47ed
branch: main
author: Gregory P. Smith <greg at krypto.org>
committer: gpshead <greg at krypto.org>
date: 2021-08-26T20:29:27-07:00
summary:

bpo-41818: ++ termios versionadded markers. (GH-27987)

overlooked in https://github.com/python/cpython/pull/23686

files:
M Doc/library/termios.rst

diff --git a/Doc/library/termios.rst b/Doc/library/termios.rst
index 8ced0bbbd7757e..3b0cb60f874522 100644
--- a/Doc/library/termios.rst
+++ b/Doc/library/termios.rst
@@ -80,6 +80,8 @@ The module defines the following functions:
    descriptor *fd*. Requires :const:`termios.TIOCGWINSZ` or
    :const:`termios.TIOCGSIZE`.
 
+   .. versionadded:: 3.11
+
 
 .. function:: tcsetwinsize(fd, winsize)
 
@@ -89,6 +91,8 @@ The module defines the following functions:
     (:const:`termios.TIOCGWINSZ`, :const:`termios.TIOCSWINSZ`);
     (:const:`termios.TIOCGSIZE`, :const:`termios.TIOCSSIZE`) to be defined.
 
+   .. versionadded:: 3.11
+
 
 .. seealso::
 


From webhook-mailer at python.org  Fri Aug 27 04:21:31 2021
From: webhook-mailer at python.org (markshannon)
Date: Fri, 27 Aug 2021 08:21:31 -0000
Subject: [Python-checkins] bpo-44945: Specialize BINARY_ADD (GH-27967)
Message-ID: <mailman.1202.1630052492.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/d3eaf0cc5b311ad023fd13e367f817d528403306
commit: d3eaf0cc5b311ad023fd13e367f817d528403306
branch: main
author: Mark Shannon <mark at hotpy.org>
committer: markshannon <mark at hotpy.org>
date: 2021-08-27T09:21:01+01:00
summary:

bpo-44945: Specialize BINARY_ADD (GH-27967)

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-18-11-14-38.bpo-44945.CO3s77.rst
M Include/internal/pycore_code.h
M Include/internal/pycore_long.h
M Include/opcode.h
M Lib/opcode.py
M Objects/longobject.c
M Python/ceval.c
M Python/opcode_targets.h
M Python/specialize.c

diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
index 6289acdd968a12..0b127ed28993b7 100644
--- a/Include/internal/pycore_code.h
+++ b/Include/internal/pycore_code.h
@@ -307,6 +307,7 @@ int _Py_Specialize_StoreAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *nam
 int _Py_Specialize_LoadGlobal(PyObject *globals, PyObject *builtins, _Py_CODEUNIT *instr, PyObject *name, SpecializedCacheEntry *cache);
 int _Py_Specialize_LoadMethod(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name, SpecializedCacheEntry *cache);
 int _Py_Specialize_BinarySubscr(PyObject *sub, PyObject *container, _Py_CODEUNIT *instr);
+int _Py_Specialize_BinaryAdd(PyObject *sub, PyObject *container, _Py_CODEUNIT *instr);
 
 #define PRINT_SPECIALIZATION_STATS 0
 #define PRINT_SPECIALIZATION_STATS_DETAILED 0
diff --git a/Include/internal/pycore_long.h b/Include/internal/pycore_long.h
index 2bea3a55ec8735..7336c317c3f2c8 100644
--- a/Include/internal/pycore_long.h
+++ b/Include/internal/pycore_long.h
@@ -34,6 +34,8 @@ static inline PyObject* _PyLong_GetZero(void)
 static inline PyObject* _PyLong_GetOne(void)
 { return __PyLong_GetSmallInt_internal(1); }
 
+PyObject *_PyLong_Add(PyLongObject *left, PyLongObject *right);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/Include/opcode.h b/Include/opcode.h
index 6b0298224ae7bb..0043cc2d209aaa 100644
--- a/Include/opcode.h
+++ b/Include/opcode.h
@@ -136,32 +136,37 @@ extern "C" {
 #define DICT_MERGE              164
 #define DICT_UPDATE             165
 #define CALL_METHOD_KW          166
-#define BINARY_SUBSCR_ADAPTIVE    7
-#define BINARY_SUBSCR_LIST_INT    8
-#define BINARY_SUBSCR_TUPLE_INT  13
-#define BINARY_SUBSCR_DICT       14
-#define JUMP_ABSOLUTE_QUICK      18
-#define LOAD_ATTR_ADAPTIVE       21
-#define LOAD_ATTR_SPLIT_KEYS     36
-#define LOAD_ATTR_WITH_HINT      38
-#define LOAD_ATTR_SLOT           39
-#define LOAD_ATTR_MODULE         40
-#define LOAD_GLOBAL_ADAPTIVE     41
-#define LOAD_GLOBAL_MODULE       42
-#define LOAD_GLOBAL_BUILTIN      43
-#define LOAD_METHOD_ADAPTIVE     44
-#define LOAD_METHOD_CACHED       45
-#define LOAD_METHOD_CLASS        46
-#define LOAD_METHOD_MODULE       47
-#define STORE_ATTR_ADAPTIVE      48
-#define STORE_ATTR_SPLIT_KEYS    58
-#define STORE_ATTR_SLOT          80
-#define STORE_ATTR_WITH_HINT     81
-#define LOAD_FAST__LOAD_FAST     87
-#define STORE_FAST__LOAD_FAST    88
-#define LOAD_FAST__LOAD_CONST   120
-#define LOAD_CONST__LOAD_FAST   122
-#define STORE_FAST__STORE_FAST  123
+#define BINARY_ADD_ADAPTIVE       7
+#define BINARY_ADD_INT            8
+#define BINARY_ADD_FLOAT         13
+#define BINARY_ADD_UNICODE       14
+#define BINARY_ADD_UNICODE_INPLACE_FAST  18
+#define BINARY_SUBSCR_ADAPTIVE   21
+#define BINARY_SUBSCR_LIST_INT   36
+#define BINARY_SUBSCR_TUPLE_INT  38
+#define BINARY_SUBSCR_DICT       39
+#define JUMP_ABSOLUTE_QUICK      40
+#define LOAD_ATTR_ADAPTIVE       41
+#define LOAD_ATTR_SPLIT_KEYS     42
+#define LOAD_ATTR_WITH_HINT      43
+#define LOAD_ATTR_SLOT           44
+#define LOAD_ATTR_MODULE         45
+#define LOAD_GLOBAL_ADAPTIVE     46
+#define LOAD_GLOBAL_MODULE       47
+#define LOAD_GLOBAL_BUILTIN      48
+#define LOAD_METHOD_ADAPTIVE     58
+#define LOAD_METHOD_CACHED       80
+#define LOAD_METHOD_CLASS        81
+#define LOAD_METHOD_MODULE       87
+#define STORE_ATTR_ADAPTIVE      88
+#define STORE_ATTR_SPLIT_KEYS   120
+#define STORE_ATTR_SLOT         122
+#define STORE_ATTR_WITH_HINT    123
+#define LOAD_FAST__LOAD_FAST    127
+#define STORE_FAST__LOAD_FAST   128
+#define LOAD_FAST__LOAD_CONST   134
+#define LOAD_CONST__LOAD_FAST   140
+#define STORE_FAST__STORE_FAST  143
 #ifdef NEED_OPCODE_JUMP_TABLES
 static uint32_t _PyOpcode_RelativeJump[8] = {
     0U,
diff --git a/Lib/opcode.py b/Lib/opcode.py
index d3a7c8bf16f4fe..5d356746888757 100644
--- a/Lib/opcode.py
+++ b/Lib/opcode.py
@@ -220,6 +220,11 @@ def jabs_op(name, op):
 del def_op, name_op, jrel_op, jabs_op
 
 _specialized_instructions = [
+    "BINARY_ADD_ADAPTIVE",
+    "BINARY_ADD_INT",
+    "BINARY_ADD_FLOAT",
+    "BINARY_ADD_UNICODE",
+    "BINARY_ADD_UNICODE_INPLACE_FAST",
     "BINARY_SUBSCR_ADAPTIVE",
     "BINARY_SUBSCR_LIST_INT",
     "BINARY_SUBSCR_TUPLE_INT",
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-18-11-14-38.bpo-44945.CO3s77.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-18-11-14-38.bpo-44945.CO3s77.rst
new file mode 100644
index 00000000000000..66d53ec523de3c
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-18-11-14-38.bpo-44945.CO3s77.rst	
@@ -0,0 +1,7 @@
+Specialize the BINARY_ADD instruction using the PEP 659 machinery. Adds five new instructions:
+
+* BINARY_ADD_ADAPTIVE
+* BINARY_ADD_FLOAT
+* BINARY_ADD_INT
+* BINARY_ADD_UNICODE
+* BINARY_ADD_UNICODE_INPLACE_FAST
diff --git a/Objects/longobject.c b/Objects/longobject.c
index 18b0839adb6b05..3b6df12212c8d6 100644
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -3119,16 +3119,14 @@ x_sub(PyLongObject *a, PyLongObject *b)
     return maybe_small_long(long_normalize(z));
 }
 
-static PyObject *
-long_add(PyLongObject *a, PyLongObject *b)
+PyObject *
+_PyLong_Add(PyLongObject *a, PyLongObject *b)
 {
-    PyLongObject *z;
-
-    CHECK_BINOP(a, b);
-
     if (IS_MEDIUM_VALUE(a) && IS_MEDIUM_VALUE(b)) {
         return _PyLong_FromSTwoDigits(medium_value(a) + medium_value(b));
     }
+
+    PyLongObject *z;
     if (Py_SIZE(a) < 0) {
         if (Py_SIZE(b) < 0) {
             z = x_add(a, b);
@@ -3153,6 +3151,14 @@ long_add(PyLongObject *a, PyLongObject *b)
     return (PyObject *)z;
 }
 
+static PyObject *
+long_add(PyLongObject *a, PyLongObject *b)
+{
+    CHECK_BINOP(a, b);
+    return _PyLong_Add(a, b);
+}
+
+
 static PyObject *
 long_sub(PyLongObject *a, PyLongObject *b)
 {
diff --git a/Python/ceval.c b/Python/ceval.c
index 5fec90b10483ab..8aaa83b1b74bf4 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1435,6 +1435,12 @@ eval_frame_handle_pending(PyThreadState *tstate)
 
 #define UPDATE_PREV_INSTR_OPARG(instr, oparg) ((uint8_t*)(instr))[-1] = (oparg)
 
+static inline void
+record_hit_inline(_Py_CODEUNIT *next_instr, int oparg)
+{
+    UPDATE_PREV_INSTR_OPARG(next_instr, saturating_increment(oparg));
+}
+
 #define GLOBALS() frame->f_globals
 #define BUILTINS() frame->f_builtins
 #define LOCALS() frame->f_locals
@@ -1980,28 +1986,120 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
         }
 
         TARGET(BINARY_ADD): {
+            PREDICTED(BINARY_ADD);
+            STAT_INC(BINARY_ADD, unquickened);
             PyObject *right = POP();
             PyObject *left = TOP();
-            PyObject *sum;
-            /* NOTE(vstinner): Please don't try to micro-optimize int+int on
-               CPython using bytecode, it is simply worthless.
-               See http://bugs.python.org/issue21955 and
-               http://bugs.python.org/issue10044 for the discussion. In short,
-               no patch shown any impact on a realistic benchmark, only a minor
-               speedup on microbenchmarks. */
-            if (PyUnicode_CheckExact(left) &&
-                     PyUnicode_CheckExact(right)) {
-                sum = unicode_concatenate(tstate, left, right, frame, next_instr);
-                /* unicode_concatenate consumed the ref to left */
+            PyObject *sum = PyNumber_Add(left, right);
+            SET_TOP(sum);
+            Py_DECREF(left);
+            Py_DECREF(right);
+            if (sum == NULL) {
+                goto error;
+            }
+            DISPATCH();
+        }
+
+        TARGET(BINARY_ADD_ADAPTIVE): {
+            if (oparg == 0) {
+                PyObject *left = SECOND();
+                PyObject *right = TOP();
+                next_instr--;
+                if (_Py_Specialize_BinaryAdd(left, right, next_instr) < 0) {
+                    goto error;
+                }
+                DISPATCH();
             }
             else {
-                sum = PyNumber_Add(left, right);
-                Py_DECREF(left);
+                STAT_INC(BINARY_ADD, deferred);
+                UPDATE_PREV_INSTR_OPARG(next_instr, oparg - 1);
+                STAT_DEC(BINARY_ADD, unquickened);
+                JUMP_TO_INSTRUCTION(BINARY_ADD);
             }
+        }
+
+        TARGET(BINARY_ADD_UNICODE): {
+            PyObject *left = SECOND();
+            PyObject *right = TOP();
+            DEOPT_IF(!PyUnicode_CheckExact(left), BINARY_ADD);
+            DEOPT_IF(Py_TYPE(right) != Py_TYPE(left), BINARY_ADD);
+            STAT_INC(BINARY_ADD, hit);
+            record_hit_inline(next_instr, oparg);
+            PyObject *res = PyUnicode_Concat(left, right);
+            STACK_SHRINK(1);
+            SET_TOP(res);
+            Py_DECREF(left);
             Py_DECREF(right);
-            SET_TOP(sum);
-            if (sum == NULL)
+            if (TOP() == NULL) {
+                goto error;
+            }
+            DISPATCH();
+        }
+
+        TARGET(BINARY_ADD_UNICODE_INPLACE_FAST): {
+            PyObject *left = SECOND();
+            PyObject *right = TOP();
+            DEOPT_IF(!PyUnicode_CheckExact(left), BINARY_ADD);
+            DEOPT_IF(Py_TYPE(right) != Py_TYPE(left), BINARY_ADD);
+            DEOPT_IF(Py_REFCNT(left) != 2, BINARY_ADD);
+            int next_oparg = _Py_OPARG(*next_instr);
+            assert(_Py_OPCODE(*next_instr) == STORE_FAST);
+            /* In the common case, there are 2 references to the value
+            * stored in 'variable' when the v = v + ... is performed: one
+            * on the value stack (in 'v') and one still stored in the
+            * 'variable'.  We try to delete the variable now to reduce
+            * the refcnt to 1.
+            */
+            PyObject *var = GETLOCAL(next_oparg);
+            DEOPT_IF(var != left, BINARY_ADD);
+            STAT_INC(BINARY_ADD, hit);
+            record_hit_inline(next_instr, oparg);
+            GETLOCAL(next_oparg) = NULL;
+            Py_DECREF(left);
+            STACK_SHRINK(1);
+            PyUnicode_Append(&TOP(), right);
+            Py_DECREF(right);
+            if (TOP() == NULL) {
                 goto error;
+            }
+            DISPATCH();
+        }
+
+        TARGET(BINARY_ADD_FLOAT): {
+            PyObject *left = SECOND();
+            PyObject *right = TOP();
+            DEOPT_IF(!PyFloat_CheckExact(left), BINARY_ADD);
+            DEOPT_IF(Py_TYPE(right) != Py_TYPE(left), BINARY_ADD);
+            STAT_INC(BINARY_ADD, hit);
+            record_hit_inline(next_instr, oparg);
+            double dsum = ((PyFloatObject *)left)->ob_fval +
+                ((PyFloatObject *)right)->ob_fval;
+            PyObject *sum = PyFloat_FromDouble(dsum);
+            SET_SECOND(sum);
+            Py_DECREF(right);
+            Py_DECREF(left);
+            STACK_SHRINK(1);
+            if (sum == NULL) {
+                goto error;
+            }
+            DISPATCH();
+        }
+
+        TARGET(BINARY_ADD_INT): {
+            PyObject *left = SECOND();
+            PyObject *right = TOP();
+            DEOPT_IF(!PyLong_CheckExact(left), BINARY_ADD);
+            DEOPT_IF(Py_TYPE(right) != Py_TYPE(left), BINARY_ADD);
+            STAT_INC(BINARY_ADD, hit);
+            record_hit_inline(next_instr, oparg);
+            PyObject *sum = _PyLong_Add((PyLongObject *)left, (PyLongObject *)right);
+            SET_SECOND(sum);
+            Py_DECREF(right);
+            Py_DECREF(left);
+            STACK_SHRINK(1);
+            if (sum == NULL) {
+                goto error;
+            }
             DISPATCH();
         }
 
@@ -4761,6 +4859,7 @@ MISS_WITH_CACHE(STORE_ATTR)
 MISS_WITH_CACHE(LOAD_GLOBAL)
 MISS_WITH_CACHE(LOAD_METHOD)
 MISS_WITH_OPARG_COUNTER(BINARY_SUBSCR)
+MISS_WITH_OPARG_COUNTER(BINARY_ADD)
 
 binary_subscr_dict_error:
         {
diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h
index f97eaf808156fc..f3bfae545bcd48 100644
--- a/Python/opcode_targets.h
+++ b/Python/opcode_targets.h
@@ -6,21 +6,21 @@ static void *opcode_targets[256] = {
     &&TARGET_DUP_TOP,
     &&TARGET_DUP_TOP_TWO,
     &&TARGET_ROT_FOUR,
-    &&TARGET_BINARY_SUBSCR_ADAPTIVE,
-    &&TARGET_BINARY_SUBSCR_LIST_INT,
+    &&TARGET_BINARY_ADD_ADAPTIVE,
+    &&TARGET_BINARY_ADD_INT,
     &&TARGET_NOP,
     &&TARGET_UNARY_POSITIVE,
     &&TARGET_UNARY_NEGATIVE,
     &&TARGET_UNARY_NOT,
-    &&TARGET_BINARY_SUBSCR_TUPLE_INT,
-    &&TARGET_BINARY_SUBSCR_DICT,
+    &&TARGET_BINARY_ADD_FLOAT,
+    &&TARGET_BINARY_ADD_UNICODE,
     &&TARGET_UNARY_INVERT,
     &&TARGET_BINARY_MATRIX_MULTIPLY,
     &&TARGET_INPLACE_MATRIX_MULTIPLY,
-    &&TARGET_JUMP_ABSOLUTE_QUICK,
+    &&TARGET_BINARY_ADD_UNICODE_INPLACE_FAST,
     &&TARGET_BINARY_POWER,
     &&TARGET_BINARY_MULTIPLY,
-    &&TARGET_LOAD_ATTR_ADAPTIVE,
+    &&TARGET_BINARY_SUBSCR_ADAPTIVE,
     &&TARGET_BINARY_MODULO,
     &&TARGET_BINARY_ADD,
     &&TARGET_BINARY_SUBTRACT,
@@ -35,19 +35,19 @@ static void *opcode_targets[256] = {
     &&TARGET_MATCH_KEYS,
     &&TARGET_COPY_DICT_WITHOUT_KEYS,
     &&TARGET_PUSH_EXC_INFO,
-    &&TARGET_LOAD_ATTR_SPLIT_KEYS,
+    &&TARGET_BINARY_SUBSCR_LIST_INT,
     &&TARGET_POP_EXCEPT_AND_RERAISE,
+    &&TARGET_BINARY_SUBSCR_TUPLE_INT,
+    &&TARGET_BINARY_SUBSCR_DICT,
+    &&TARGET_JUMP_ABSOLUTE_QUICK,
+    &&TARGET_LOAD_ATTR_ADAPTIVE,
+    &&TARGET_LOAD_ATTR_SPLIT_KEYS,
     &&TARGET_LOAD_ATTR_WITH_HINT,
     &&TARGET_LOAD_ATTR_SLOT,
     &&TARGET_LOAD_ATTR_MODULE,
     &&TARGET_LOAD_GLOBAL_ADAPTIVE,
     &&TARGET_LOAD_GLOBAL_MODULE,
     &&TARGET_LOAD_GLOBAL_BUILTIN,
-    &&TARGET_LOAD_METHOD_ADAPTIVE,
-    &&TARGET_LOAD_METHOD_CACHED,
-    &&TARGET_LOAD_METHOD_CLASS,
-    &&TARGET_LOAD_METHOD_MODULE,
-    &&TARGET_STORE_ATTR_ADAPTIVE,
     &&TARGET_WITH_EXCEPT_START,
     &&TARGET_GET_AITER,
     &&TARGET_GET_ANEXT,
@@ -57,7 +57,7 @@ static void *opcode_targets[256] = {
     &&TARGET_INPLACE_ADD,
     &&TARGET_INPLACE_SUBTRACT,
     &&TARGET_INPLACE_MULTIPLY,
-    &&TARGET_STORE_ATTR_SPLIT_KEYS,
+    &&TARGET_LOAD_METHOD_ADAPTIVE,
     &&TARGET_INPLACE_MODULO,
     &&TARGET_STORE_SUBSCR,
     &&TARGET_DELETE_SUBSCR,
@@ -79,15 +79,15 @@ static void *opcode_targets[256] = {
     &&TARGET_INPLACE_AND,
     &&TARGET_INPLACE_XOR,
     &&TARGET_INPLACE_OR,
-    &&TARGET_STORE_ATTR_SLOT,
-    &&TARGET_STORE_ATTR_WITH_HINT,
+    &&TARGET_LOAD_METHOD_CACHED,
+    &&TARGET_LOAD_METHOD_CLASS,
     &&TARGET_LIST_TO_TUPLE,
     &&TARGET_RETURN_VALUE,
     &&TARGET_IMPORT_STAR,
     &&TARGET_SETUP_ANNOTATIONS,
     &&TARGET_YIELD_VALUE,
-    &&TARGET_LOAD_FAST__LOAD_FAST,
-    &&TARGET_STORE_FAST__LOAD_FAST,
+    &&TARGET_LOAD_METHOD_MODULE,
+    &&TARGET_STORE_ATTR_ADAPTIVE,
     &&TARGET_POP_EXCEPT,
     &&TARGET_STORE_NAME,
     &&TARGET_DELETE_NAME,
@@ -119,30 +119,30 @@ static void *opcode_targets[256] = {
     &&TARGET_IS_OP,
     &&TARGET_CONTAINS_OP,
     &&TARGET_RERAISE,
-    &&TARGET_LOAD_FAST__LOAD_CONST,
+    &&TARGET_STORE_ATTR_SPLIT_KEYS,
     &&TARGET_JUMP_IF_NOT_EXC_MATCH,
-    &&TARGET_LOAD_CONST__LOAD_FAST,
-    &&TARGET_STORE_FAST__STORE_FAST,
+    &&TARGET_STORE_ATTR_SLOT,
+    &&TARGET_STORE_ATTR_WITH_HINT,
     &&TARGET_LOAD_FAST,
     &&TARGET_STORE_FAST,
     &&TARGET_DELETE_FAST,
-    &&_unknown_opcode,
-    &&_unknown_opcode,
+    &&TARGET_LOAD_FAST__LOAD_FAST,
+    &&TARGET_STORE_FAST__LOAD_FAST,
     &&TARGET_GEN_START,
     &&TARGET_RAISE_VARARGS,
     &&TARGET_CALL_FUNCTION,
     &&TARGET_MAKE_FUNCTION,
     &&TARGET_BUILD_SLICE,
-    &&_unknown_opcode,
+    &&TARGET_LOAD_FAST__LOAD_CONST,
     &&TARGET_MAKE_CELL,
     &&TARGET_LOAD_CLOSURE,
     &&TARGET_LOAD_DEREF,
     &&TARGET_STORE_DEREF,
     &&TARGET_DELETE_DEREF,
-    &&_unknown_opcode,
+    &&TARGET_LOAD_CONST__LOAD_FAST,
     &&TARGET_CALL_FUNCTION_KW,
     &&TARGET_CALL_FUNCTION_EX,
-    &&_unknown_opcode,
+    &&TARGET_STORE_FAST__STORE_FAST,
     &&TARGET_EXTENDED_ARG,
     &&TARGET_LIST_APPEND,
     &&TARGET_SET_ADD,
diff --git a/Python/specialize.c b/Python/specialize.c
index 359bec5719363b..b321368148f023 100644
--- a/Python/specialize.c
+++ b/Python/specialize.c
@@ -121,7 +121,8 @@ _Py_GetSpecializationStats(void) {
     int err = 0;
     err += add_stat_dict(stats, LOAD_ATTR, "load_attr");
     err += add_stat_dict(stats, LOAD_GLOBAL, "load_global");
-    err += add_stat_dict(stats, LOAD_GLOBAL, "load_method");
+    err += add_stat_dict(stats, LOAD_METHOD, "load_method");
+    err += add_stat_dict(stats, BINARY_ADD, "binary_add");
     err += add_stat_dict(stats, BINARY_SUBSCR, "binary_subscr");
     err += add_stat_dict(stats, STORE_ATTR, "store_attr");
     if (err < 0) {
@@ -177,6 +178,7 @@ _Py_PrintSpecializationStats(void)
     print_stats(out, &_specialization_stats[LOAD_ATTR], "load_attr");
     print_stats(out, &_specialization_stats[LOAD_GLOBAL], "load_global");
     print_stats(out, &_specialization_stats[LOAD_METHOD], "load_method");
+    print_stats(out, &_specialization_stats[BINARY_ADD], "binary_add");
     print_stats(out, &_specialization_stats[BINARY_SUBSCR], "binary_subscr");
     print_stats(out, &_specialization_stats[STORE_ATTR], "store_attr");
     if (out != stderr) {
@@ -226,6 +228,7 @@ static uint8_t adaptive_opcodes[256] = {
     [LOAD_ATTR] = LOAD_ATTR_ADAPTIVE,
     [LOAD_GLOBAL] = LOAD_GLOBAL_ADAPTIVE,
     [LOAD_METHOD] = LOAD_METHOD_ADAPTIVE,
+    [BINARY_ADD] = BINARY_ADD_ADAPTIVE,
     [BINARY_SUBSCR] = BINARY_SUBSCR_ADAPTIVE,
     [STORE_ATTR] = STORE_ATTR_ADAPTIVE,
 };
@@ -235,6 +238,7 @@ static uint8_t cache_requirements[256] = {
     [LOAD_ATTR] = 2, /* _PyAdaptiveEntry and _PyAttrCache */
     [LOAD_GLOBAL] = 2, /* _PyAdaptiveEntry and _PyLoadGlobalCache */
     [LOAD_METHOD] = 3, /* _PyAdaptiveEntry, _PyAttrCache and _PyObjectCache */
+    [BINARY_ADD] = 0,
     [BINARY_SUBSCR] = 0,
     [STORE_ATTR] = 2, /* _PyAdaptiveEntry and _PyAttrCache */
 };
@@ -436,6 +440,12 @@ _Py_Quicken(PyCodeObject *code) {
 #define SPEC_FAIL_TUPLE_NON_INT_SUBSCRIPT 9
 #define SPEC_FAIL_NOT_TUPLE_LIST_OR_DICT 10
 
+/* Binary add */
+
+#define SPEC_FAIL_NON_FUNCTION_SCOPE 11
+#define SPEC_FAIL_DIFFERENT_TYPES 12
+#define SPEC_FAIL_OTHER_TYPE 13
+
 
 static int
 specialize_module_load_attr(
@@ -898,7 +908,7 @@ _Py_Specialize_LoadMethod(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name,
             SPECIALIZATION_FAIL(LOAD_METHOD, SPEC_FAIL_NOT_METHOD);
             goto fail;
     }
-    
+
     assert(kind == METHOD);
     // If o.__dict__ changes, the method might be found in o.__dict__
     // instead of old type lookup. So record o.__dict__'s keys.
@@ -933,15 +943,15 @@ _Py_Specialize_LoadMethod(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name,
         }
         // Fall through.
     } // Else owner is maybe a builtin with no dict, or __slots__. Doesn't matter.
-        
+
     /* `descr` is borrowed. Just check tp_version_tag before accessing in case
     *  it's deleted.  This is safe for methods (even inherited ones from super
     *  classes!) as long as tp_version_tag is validated for two main reasons:
-    * 
+    *
     *  1. The class will always hold a reference to the method so it will
     *  usually not be GC-ed. Should it be deleted in Python, e.g.
     *  `del obj.meth`, tp_version_tag will be invalidated, because of reason 2.
-    * 
+    *
     *  2. The pre-existing type method cache (MCACHE) uses the same principles
     *  of caching a borrowed descriptor. It does all the heavy lifting for us.
     *  E.g. it invalidates on any MRO modification, on any type object
@@ -968,6 +978,7 @@ _Py_Specialize_LoadMethod(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name,
     return 0;
 
 }
+
 int
 _Py_Specialize_LoadGlobal(
     PyObject *globals, PyObject *builtins,
@@ -1035,7 +1046,6 @@ _Py_Specialize_LoadGlobal(
     return 0;
 }
 
-
 int
 _Py_Specialize_BinarySubscr(
      PyObject *container, PyObject *sub, _Py_CODEUNIT *instr)
@@ -1076,3 +1086,43 @@ _Py_Specialize_BinarySubscr(
     return 0;
 }
 
+int
+_Py_Specialize_BinaryAdd(PyObject *left, PyObject *right, _Py_CODEUNIT *instr)
+{
+    PyTypeObject *left_type = Py_TYPE(left);
+    if (left_type != Py_TYPE(right)) {
+        SPECIALIZATION_FAIL(BINARY_ADD, SPEC_FAIL_DIFFERENT_TYPES);
+        goto fail;
+    }
+    if (left_type == &PyUnicode_Type) {
+        int next_opcode = _Py_OPCODE(instr[1]);
+        if (next_opcode == STORE_FAST) {
+            *instr = _Py_MAKECODEUNIT(BINARY_ADD_UNICODE_INPLACE_FAST, saturating_start());
+        }
+        else {
+            *instr = _Py_MAKECODEUNIT(BINARY_ADD_UNICODE, saturating_start());
+        }
+        goto success;
+    }
+    else if (left_type == &PyLong_Type) {
+        *instr = _Py_MAKECODEUNIT(BINARY_ADD_INT, saturating_start());
+        goto success;
+    }
+    else if (left_type == &PyFloat_Type) {
+        *instr = _Py_MAKECODEUNIT(BINARY_ADD_FLOAT, saturating_start());
+        goto success;
+
+    }
+    else {
+        SPECIALIZATION_FAIL(BINARY_ADD, SPEC_FAIL_OTHER_TYPE);
+    }
+fail:
+    STAT_INC(BINARY_ADD, specialization_failure);
+    assert(!PyErr_Occurred());
+    *instr = _Py_MAKECODEUNIT(_Py_OPCODE(*instr), ADAPTIVE_CACHE_BACKOFF);
+    return 0;
+success:
+    STAT_INC(BINARY_ADD, specialization_success);
+    assert(!PyErr_Occurred());
+    return 0;
+}


From webhook-mailer at python.org  Fri Aug 27 05:35:15 2021
From: webhook-mailer at python.org (Fidget-Spinner)
Date: Fri, 27 Aug 2021 09:35:15 -0000
Subject: [Python-checkins] Update ACKS (GH-27988)
Message-ID: <mailman.1203.1630056916.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/3331fd264dfcf45d8a78a07da4e5022cd94e0f6b
commit: 3331fd264dfcf45d8a78a07da4e5022cd94e0f6b
branch: main
author: Soumendra Ganguly <67527439+8vasu at users.noreply.github.com>
committer: Fidget-Spinner <28750310+Fidget-Spinner at users.noreply.github.com>
date: 2021-08-27T17:35:07+08:00
summary:

Update ACKS (GH-27988)

files:
M Misc/ACKS

diff --git a/Misc/ACKS b/Misc/ACKS
index 91233509b7e8b..df0b92c72df86 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -585,6 +585,7 @@ Quentin Gallet-Gilles
 Riccardo Attilio Galli
 Raymund Galvin
 Nitin Ganatra
+Soumendra Ganguly (????????????)
 Fred Gansevles
 Paul Ganssle
 Lars Marius Garshol


From webhook-mailer at python.org  Fri Aug 27 06:27:23 2021
From: webhook-mailer at python.org (ambv)
Date: Fri, 27 Aug 2021 10:27:23 -0000
Subject: [Python-checkins] bpo-45018: Fix rangeiter_reduce in rangeobject.c
 (GH-27938)
Message-ID: <mailman.1204.1630060045.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/94a3d2a6329ab7941e93ad2f5bcbb8af2b8b80d2
commit: 94a3d2a6329ab7941e93ad2f5bcbb8af2b8b80d2
branch: main
author: chilaxan <chilaxan at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-27T12:27:19+02:00
summary:

bpo-45018: Fix rangeiter_reduce in rangeobject.c (GH-27938)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-26-18-44-03.bpo-45018.pu8H9L.rst
M Lib/test/test_range.py
M Objects/rangeobject.c

diff --git a/Lib/test/test_range.py b/Lib/test/test_range.py
index 107c0e2e11c7c..897162b2b1745 100644
--- a/Lib/test/test_range.py
+++ b/Lib/test/test_range.py
@@ -374,26 +374,41 @@ def test_pickling(self):
                                      list(r))
 
     def test_iterator_pickling(self):
-        testcases = [(13,), (0, 11), (-22, 10), (20, 3, -1),
-                     (13, 21, 3), (-2, 2, 2), (2**65, 2**65+2)]
+        testcases = [(13,), (0, 11), (-22, 10), (20, 3, -1), (13, 21, 3),
+                     (-2, 2, 2), (2**31-3, 2**31-1), (2**33, 2**33+2),
+                     (2**63-3, 2**63-1), (2**65, 2**65+2)]
         for proto in range(pickle.HIGHEST_PROTOCOL + 1):
             for t in testcases:
-                it = itorg = iter(range(*t))
-                data = list(range(*t))
-
-                d = pickle.dumps(it, proto)
-                it = pickle.loads(d)
-                self.assertEqual(type(itorg), type(it))
-                self.assertEqual(list(it), data)
-
-                it = pickle.loads(d)
-                try:
-                    next(it)
-                except StopIteration:
-                    continue
+                with self.subTest(proto=proto, t=t):
+                    it = itorg = iter(range(*t))
+                    data = list(range(*t))
+
+                    d = pickle.dumps(it, proto)
+                    it = pickle.loads(d)
+                    self.assertEqual(type(itorg), type(it))
+                    self.assertEqual(list(it), data)
+
+                    it = pickle.loads(d)
+                    try:
+                        next(it)
+                    except StopIteration:
+                        continue
+                    d = pickle.dumps(it, proto)
+                    it = pickle.loads(d)
+                    self.assertEqual(list(it), data[1:])
+
+    def test_iterator_pickling_overflowing_index(self):
+        for proto in range(pickle.HIGHEST_PROTOCOL + 1):
+            with self.subTest(proto=proto):
+                it = iter(range(2**32 + 2))
+                _, _, idx = it.__reduce__()
+                self.assertEqual(idx, 0)
+                it.__setstate__(2**32 + 1)  # undocumented way to set r->index
+                _, _, idx = it.__reduce__()
+                self.assertEqual(idx, 2**32 + 1)
                 d = pickle.dumps(it, proto)
                 it = pickle.loads(d)
-                self.assertEqual(list(it), data[1:])
+                self.assertEqual(next(it), 2**32 + 1)
 
     def test_exhausted_iterator_pickling(self):
         for proto in range(pickle.HIGHEST_PROTOCOL + 1):
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-26-18-44-03.bpo-45018.pu8H9L.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-26-18-44-03.bpo-45018.pu8H9L.rst
new file mode 100644
index 0000000000000..5bf13ef06f34c
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-26-18-44-03.bpo-45018.pu8H9L.rst	
@@ -0,0 +1 @@
+Fixed pickling of range iterators that iterated for over 2**32 times.
diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c
index 3e05707b1cee6..5c3230d860f8f 100644
--- a/Objects/rangeobject.c
+++ b/Objects/rangeobject.c
@@ -813,7 +813,7 @@ rangeiter_reduce(rangeiterobject *r, PyObject *Py_UNUSED(ignored))
     if (range == NULL)
         goto err;
     /* return the result */
-    return Py_BuildValue("N(N)i", _PyEval_GetBuiltinId(&PyId_iter),
+    return Py_BuildValue("N(N)l", _PyEval_GetBuiltinId(&PyId_iter),
                          range, r->index);
 err:
     Py_XDECREF(start);


From webhook-mailer at python.org  Fri Aug 27 06:52:16 2021
From: webhook-mailer at python.org (ambv)
Date: Fri, 27 Aug 2021 10:52:16 -0000
Subject: [Python-checkins] bpo-45018: Fix rangeiter_reduce in rangeobject.c
 (GH-27938) (GH-27991)
Message-ID: <mailman.1205.1630061537.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/02437641d20f58191558ba52570832ef3a30cfef
commit: 02437641d20f58191558ba52570832ef3a30cfef
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-27T12:52:07+02:00
summary:

bpo-45018: Fix rangeiter_reduce in rangeobject.c (GH-27938) (GH-27991)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 94a3d2a6329ab7941e93ad2f5bcbb8af2b8b80d2)

Co-authored-by: chilaxan <chilaxan at gmail.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-26-18-44-03.bpo-45018.pu8H9L.rst
M Lib/test/test_range.py
M Objects/rangeobject.c

diff --git a/Lib/test/test_range.py b/Lib/test/test_range.py
index 30fa129b50ecb..16b0fc060aaed 100644
--- a/Lib/test/test_range.py
+++ b/Lib/test/test_range.py
@@ -374,26 +374,41 @@ def test_pickling(self):
                                      list(r))
 
     def test_iterator_pickling(self):
-        testcases = [(13,), (0, 11), (-22, 10), (20, 3, -1),
-                     (13, 21, 3), (-2, 2, 2), (2**65, 2**65+2)]
+        testcases = [(13,), (0, 11), (-22, 10), (20, 3, -1), (13, 21, 3),
+                     (-2, 2, 2), (2**31-3, 2**31-1), (2**33, 2**33+2),
+                     (2**63-3, 2**63-1), (2**65, 2**65+2)]
         for proto in range(pickle.HIGHEST_PROTOCOL + 1):
             for t in testcases:
-                it = itorg = iter(range(*t))
-                data = list(range(*t))
-
-                d = pickle.dumps(it, proto)
-                it = pickle.loads(d)
-                self.assertEqual(type(itorg), type(it))
-                self.assertEqual(list(it), data)
-
-                it = pickle.loads(d)
-                try:
-                    next(it)
-                except StopIteration:
-                    continue
+                with self.subTest(proto=proto, t=t):
+                    it = itorg = iter(range(*t))
+                    data = list(range(*t))
+
+                    d = pickle.dumps(it, proto)
+                    it = pickle.loads(d)
+                    self.assertEqual(type(itorg), type(it))
+                    self.assertEqual(list(it), data)
+
+                    it = pickle.loads(d)
+                    try:
+                        next(it)
+                    except StopIteration:
+                        continue
+                    d = pickle.dumps(it, proto)
+                    it = pickle.loads(d)
+                    self.assertEqual(list(it), data[1:])
+
+    def test_iterator_pickling_overflowing_index(self):
+        for proto in range(pickle.HIGHEST_PROTOCOL + 1):
+            with self.subTest(proto=proto):
+                it = iter(range(2**32 + 2))
+                _, _, idx = it.__reduce__()
+                self.assertEqual(idx, 0)
+                it.__setstate__(2**32 + 1)  # undocumented way to set r->index
+                _, _, idx = it.__reduce__()
+                self.assertEqual(idx, 2**32 + 1)
                 d = pickle.dumps(it, proto)
                 it = pickle.loads(d)
-                self.assertEqual(list(it), data[1:])
+                self.assertEqual(next(it), 2**32 + 1)
 
     def test_exhausted_iterator_pickling(self):
         for proto in range(pickle.HIGHEST_PROTOCOL + 1):
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-26-18-44-03.bpo-45018.pu8H9L.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-26-18-44-03.bpo-45018.pu8H9L.rst
new file mode 100644
index 0000000000000..5bf13ef06f34c
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-26-18-44-03.bpo-45018.pu8H9L.rst	
@@ -0,0 +1 @@
+Fixed pickling of range iterators that iterated for over 2**32 times.
diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c
index 751dbb9815d82..dd027936589ac 100644
--- a/Objects/rangeobject.c
+++ b/Objects/rangeobject.c
@@ -793,7 +793,7 @@ rangeiter_reduce(rangeiterobject *r, PyObject *Py_UNUSED(ignored))
     if (range == NULL)
         goto err;
     /* return the result */
-    return Py_BuildValue("N(N)i", _PyEval_GetBuiltinId(&PyId_iter),
+    return Py_BuildValue("N(N)l", _PyEval_GetBuiltinId(&PyId_iter),
                          range, r->index);
 err:
     Py_XDECREF(start);


From webhook-mailer at python.org  Fri Aug 27 06:59:15 2021
From: webhook-mailer at python.org (ambv)
Date: Fri, 27 Aug 2021 10:59:15 -0000
Subject: [Python-checkins] bpo-44997: macOS does not support loadable SQLite
 extensions (GH-27979)
Message-ID: <mailman.1206.1630061957.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/2ec9428e3516b6e7c6583687aa3b39fb96925577
commit: 2ec9428e3516b6e7c6583687aa3b39fb96925577
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: ambv <lukasz at langa.pl>
date: 2021-08-27T12:59:07+02:00
summary:

bpo-44997: macOS does not support loadable SQLite extensions (GH-27979)

Authored-by: Ronald Oussoren <ronaldoussoren at mac.com>

files:
M setup.py

diff --git a/setup.py b/setup.py
index 59b2548810cbf..9e411cb35e00b 100644
--- a/setup.py
+++ b/setup.py
@@ -1605,6 +1605,8 @@ def detect_sqlite(self):
             # if --enable-loadable-sqlite-extensions configure option is used.
             if '--enable-loadable-sqlite-extensions' not in sysconfig.get_config_var("CONFIG_ARGS"):
                 sqlite_defines.append(("SQLITE_OMIT_LOAD_EXTENSION", "1"))
+            elif MACOS and sqlite_incdir == os.path.join(MACOS_SDK_ROOT, "usr/include"):
+                raise DistutilsError("System version of SQLite does not support loadable extensions")
 
             if MACOS:
                 # In every directory on the search path search for a dynamic


From webhook-mailer at python.org  Fri Aug 27 07:01:26 2021
From: webhook-mailer at python.org (markshannon)
Date: Fri, 27 Aug 2021 11:01:26 -0000
Subject: [Python-checkins] Refine specialization stats (GH-27992)
Message-ID: <mailman.1207.1630062087.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/ee9c0527ae4b3868ab6162bb6f423645bf182022
commit: ee9c0527ae4b3868ab6162bb6f423645bf182022
branch: main
author: Mark Shannon <mark at hotpy.org>
committer: markshannon <mark at hotpy.org>
date: 2021-08-27T12:01:22+01:00
summary:

Refine specialization stats (GH-27992)

files:
M Python/specialize.c

diff --git a/Python/specialize.c b/Python/specialize.c
index b321368148f023..6c76fa6b05fbbe 100644
--- a/Python/specialize.c
+++ b/Python/specialize.c
@@ -405,6 +405,7 @@ _Py_Quicken(PyCodeObject *code) {
 
 /* Common */
 
+#define SPEC_FAIL_OTHER 0
 #define SPEC_FAIL_NO_DICT 1
 #define SPEC_FAIL_OVERRIDDEN 2
 #define SPEC_FAIL_OUT_OF_VERSIONS 3
@@ -427,24 +428,28 @@ _Py_Quicken(PyCodeObject *code) {
 
 /* Methods */
 
-#define SPEC_FAIL_NEGATIVE_DICTOFFSET 14
 #define SPEC_FAIL_IS_ATTR 15
 #define SPEC_FAIL_DICT_SUBCLASS 16
 #define SPEC_FAIL_BUILTIN_CLASS_METHOD 17
 #define SPEC_FAIL_CLASS_METHOD_OBJ 18
-#define SPEC_FAIL_NOT_METHOD 19
+#define SPEC_FAIL_OBJECT_SLOT 19
 
 /* Binary subscr */
 
-#define SPEC_FAIL_LIST_NON_INT_SUBSCRIPT 8
-#define SPEC_FAIL_TUPLE_NON_INT_SUBSCRIPT 9
-#define SPEC_FAIL_NOT_TUPLE_LIST_OR_DICT 10
+#define SPEC_FAIL_ARRAY_INT 8
+#define SPEC_FAIL_ARRAY_SLICE 9
+#define SPEC_FAIL_LIST_SLICE 10
+#define SPEC_FAIL_TUPLE_SLICE 11
+#define SPEC_FAIL_STRING_INT 12
+#define SPEC_FAIL_STRING_SLICE 13
+#define SPEC_FAIL_BUFFER_INT 15
+#define SPEC_FAIL_BUFFER_SLICE 16
+#define SPEC_FAIL_SEQUENCE_INT 17
 
 /* Binary add */
 
 #define SPEC_FAIL_NON_FUNCTION_SCOPE 11
 #define SPEC_FAIL_DIFFERENT_TYPES 12
-#define SPEC_FAIL_OTHER_TYPE 13
 
 
 static int
@@ -870,7 +875,7 @@ _Py_Specialize_LoadMethod(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name,
     // Technically this is fine for bound method calls, but it's uncommon and
     // slightly slower at runtime to get dict.
     if (owner_cls->tp_dictoffset < 0) {
-        SPECIALIZATION_FAIL(LOAD_METHOD, SPEC_FAIL_NEGATIVE_DICTOFFSET);
+        SPECIALIZATION_FAIL(LOAD_METHOD, SPEC_FAIL_OUT_OF_RANGE);
         goto fail;
     }
     PyObject **owner_dictptr = _PyObject_GetDictPtr(owner);
@@ -896,16 +901,43 @@ _Py_Specialize_LoadMethod(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name,
 
     assert(descr != NULL || kind == ABSENT || kind == GETSET_OVERRIDDEN);
     switch (kind) {
+        case OVERRIDING:
+            SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_OVERRIDING_DESCRIPTOR);
+            goto fail;
         case METHOD:
             break;
+        case PROPERTY:
+            SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_PROPERTY);
+            goto fail;
+        case OBJECT_SLOT:
+            SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_OBJECT_SLOT);
+            goto fail;
+        case OTHER_SLOT:
+            SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_NON_OBJECT_SLOT);
+            goto fail;
+        case DUNDER_CLASS:
+            SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_OTHER);
+            goto fail;
+        case MUTABLE:
+            SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_MUTABLE_CLASS);
+            goto fail;
+        case GETSET_OVERRIDDEN:
+            SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_OVERRIDDEN);
+            goto fail;
         case BUILTIN_CLASSMETHOD:
             SPECIALIZATION_FAIL(LOAD_METHOD, SPEC_FAIL_BUILTIN_CLASS_METHOD);
             goto fail;
         case PYTHON_CLASSMETHOD:
             SPECIALIZATION_FAIL(LOAD_METHOD, SPEC_FAIL_CLASS_METHOD_OBJ);
             goto fail;
-        default:
-            SPECIALIZATION_FAIL(LOAD_METHOD, SPEC_FAIL_NOT_METHOD);
+        case NON_OVERRIDING:
+            SPECIALIZATION_FAIL(LOAD_METHOD, SPEC_FAIL_NON_OVERRIDING_DESCRIPTOR);
+            goto fail;
+        case NON_DESCRIPTOR:
+            SPECIALIZATION_FAIL(LOAD_METHOD, SPEC_FAIL_NOT_DESCRIPTOR);
+            goto fail;
+        case ABSENT:
+            SPECIALIZATION_FAIL(LOAD_METHOD, SPEC_FAIL_EXPECTED_ERROR);
             goto fail;
     }
 
@@ -1046,6 +1078,45 @@ _Py_Specialize_LoadGlobal(
     return 0;
 }
 
+#if COLLECT_SPECIALIZATION_STATS_DETAILED
+static int
+binary_subscr_faiL_kind(PyTypeObject *container_type, PyObject *sub)
+{
+    if (container_type == &PyUnicode_Type) {
+        if (PyLong_CheckExact(sub)) {
+            return SPEC_FAIL_STRING_INT;
+        }
+        if (PySlice_Check(sub)) {
+            return SPEC_FAIL_STRING_SLICE;
+        }
+        return SPEC_FAIL_OTHER;
+    }
+    else if (strcmp(container_type->tp_name, "array.array") == 0) {
+        if (PyLong_CheckExact(sub)) {
+            return SPEC_FAIL_ARRAY_INT;
+        }
+        if (PySlice_Check(sub)) {
+            return SPEC_FAIL_ARRAY_SLICE;
+        }
+        return SPEC_FAIL_OTHER;
+    }
+    else if (container_type->tp_as_buffer) {
+        if (PyLong_CheckExact(sub)) {
+            return SPEC_FAIL_BUFFER_INT;
+        }
+        if (PySlice_Check(sub)) {
+            return SPEC_FAIL_BUFFER_SLICE;
+        }
+        return SPEC_FAIL_OTHER;
+    }
+    else if (container_type->tp_as_sequence) {
+        if (PyLong_CheckExact(sub) && container_type->tp_as_sequence->sq_item) {
+            return SPEC_FAIL_SEQUENCE_INT;
+        }
+    }
+    return SPEC_FAIL_OTHER;
+}
+#endif
 int
 _Py_Specialize_BinarySubscr(
      PyObject *container, PyObject *sub, _Py_CODEUNIT *instr)
@@ -1055,25 +1126,26 @@ _Py_Specialize_BinarySubscr(
         if (PyLong_CheckExact(sub)) {
             *instr = _Py_MAKECODEUNIT(BINARY_SUBSCR_LIST_INT, saturating_start());
             goto success;
-        } else {
-            SPECIALIZATION_FAIL(BINARY_SUBSCR, SPEC_FAIL_LIST_NON_INT_SUBSCRIPT);
-            goto fail;
         }
+        SPECIALIZATION_FAIL(BINARY_SUBSCR,
+            PySlice_Check(sub) ? SPEC_FAIL_LIST_SLICE : SPEC_FAIL_OTHER);
+        goto fail;
     }
     if (container_type == &PyTuple_Type) {
         if (PyLong_CheckExact(sub)) {
             *instr = _Py_MAKECODEUNIT(BINARY_SUBSCR_TUPLE_INT, saturating_start());
             goto success;
-        } else {
-            SPECIALIZATION_FAIL(BINARY_SUBSCR, SPEC_FAIL_TUPLE_NON_INT_SUBSCRIPT);
-            goto fail;
         }
+        SPECIALIZATION_FAIL(BINARY_SUBSCR,
+            PySlice_Check(sub) ? SPEC_FAIL_TUPLE_SLICE : SPEC_FAIL_OTHER);
+        goto fail;
     }
     if (container_type == &PyDict_Type) {
         *instr = _Py_MAKECODEUNIT(BINARY_SUBSCR_DICT, saturating_start());
         goto success;
     }
-    SPECIALIZATION_FAIL(BINARY_SUBSCR,SPEC_FAIL_NOT_TUPLE_LIST_OR_DICT);
+    SPECIALIZATION_FAIL(BINARY_SUBSCR,
+                        binary_subscr_faiL_kind(container_type, sub));
     goto fail;
 fail:
     STAT_INC(BINARY_SUBSCR, specialization_failure);
@@ -1114,7 +1186,7 @@ _Py_Specialize_BinaryAdd(PyObject *left, PyObject *right, _Py_CODEUNIT *instr)
 
     }
     else {
-        SPECIALIZATION_FAIL(BINARY_ADD, SPEC_FAIL_OTHER_TYPE);
+        SPECIALIZATION_FAIL(BINARY_ADD, SPEC_FAIL_OTHER);
     }
 fail:
     STAT_INC(BINARY_ADD, specialization_failure);


From webhook-mailer at python.org  Fri Aug 27 07:27:55 2021
From: webhook-mailer at python.org (ambv)
Date: Fri, 27 Aug 2021 11:27:55 -0000
Subject: [Python-checkins] bpo-44997: macOS does not support loadable SQLite
 extensions (GH-27979) (GH-27996)
Message-ID: <mailman.1208.1630063676.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/9c74678d53847f61df255435a0e5a6e3e1d657f5
commit: 9c74678d53847f61df255435a0e5a6e3e1d657f5
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-27T13:27:45+02:00
summary:

bpo-44997: macOS does not support loadable SQLite extensions (GH-27979) (GH-27996)

Authored-by: Ronald Oussoren <ronaldoussoren at mac.com>
(cherry picked from commit 2ec9428e3516b6e7c6583687aa3b39fb96925577)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at innova.no>

files:
M setup.py

diff --git a/setup.py b/setup.py
index 0a2a435c609045..2d6b05682d2ba9 100644
--- a/setup.py
+++ b/setup.py
@@ -1416,6 +1416,8 @@ def detect_sqlite(self):
             # if --enable-loadable-sqlite-extensions configure option is used.
             if '--enable-loadable-sqlite-extensions' not in sysconfig.get_config_var("CONFIG_ARGS"):
                 sqlite_defines.append(("SQLITE_OMIT_LOAD_EXTENSION", "1"))
+            elif MACOS and sqlite_incdir == os.path.join(MACOS_SDK_ROOT, "usr/include"):
+                raise DistutilsError("System version of SQLite does not support loadable extensions")
 
             if MACOS:
                 # In every directory on the search path search for a dynamic


From webhook-mailer at python.org  Fri Aug 27 07:29:33 2021
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 27 Aug 2021 11:29:33 -0000
Subject: [Python-checkins] bpo-44997: macOS does not support loadable SQLite
 extensions (GH-27979)
Message-ID: <mailman.1209.1630063773.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/baa8d48230e3ab8a504f39ee800f8852897cb3be
commit: baa8d48230e3ab8a504f39ee800f8852897cb3be
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-27T04:29:24-07:00
summary:

bpo-44997: macOS does not support loadable SQLite extensions (GH-27979)


Authored-by: Ronald Oussoren <ronaldoussoren at mac.com>
(cherry picked from commit 2ec9428e3516b6e7c6583687aa3b39fb96925577)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at innova.no>

files:
M setup.py

diff --git a/setup.py b/setup.py
index 16081a069697b..3d250e7249d70 100644
--- a/setup.py
+++ b/setup.py
@@ -1603,6 +1603,8 @@ def detect_sqlite(self):
             # if --enable-loadable-sqlite-extensions configure option is used.
             if '--enable-loadable-sqlite-extensions' not in sysconfig.get_config_var("CONFIG_ARGS"):
                 sqlite_defines.append(("SQLITE_OMIT_LOAD_EXTENSION", "1"))
+            elif MACOS and sqlite_incdir == os.path.join(MACOS_SDK_ROOT, "usr/include"):
+                raise DistutilsError("System version of SQLite does not support loadable extensions")
 
             if MACOS:
                 # In every directory on the search path search for a dynamic


From webhook-mailer at python.org  Fri Aug 27 07:36:26 2021
From: webhook-mailer at python.org (ambv)
Date: Fri, 27 Aug 2021 11:36:26 -0000
Subject: [Python-checkins] bpo-44997: macOS does not support loadable SQLite
 extensions (GH-27979) (GH-27995)
Message-ID: <mailman.1210.1630064187.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/9500dd5144cb911cf4e6fb027bb25b675f0e3643
commit: 9500dd5144cb911cf4e6fb027bb25b675f0e3643
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-27T13:36:17+02:00
summary:

bpo-44997: macOS does not support loadable SQLite extensions (GH-27979) (GH-27995)

Authored-by: Ronald Oussoren <ronaldoussoren at mac.com>
(cherry picked from commit 2ec9428e3516b6e7c6583687aa3b39fb96925577)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at innova.no>

files:
M setup.py

diff --git a/setup.py b/setup.py
index 06fd9be194b2f..54d4b942bd5af 100644
--- a/setup.py
+++ b/setup.py
@@ -1524,6 +1524,8 @@ def detect_sqlite(self):
             # if --enable-loadable-sqlite-extensions configure option is used.
             if '--enable-loadable-sqlite-extensions' not in sysconfig.get_config_var("CONFIG_ARGS"):
                 sqlite_defines.append(("SQLITE_OMIT_LOAD_EXTENSION", "1"))
+            elif MACOS and sqlite_incdir == os.path.join(MACOS_SDK_ROOT, "usr/include"):
+                raise DistutilsError("System version of SQLite does not support loadable extensions")
 
             if MACOS:
                 # In every directory on the search path search for a dynamic


From webhook-mailer at python.org  Fri Aug 27 07:38:33 2021
From: webhook-mailer at python.org (ambv)
Date: Fri, 27 Aug 2021 11:38:33 -0000
Subject: [Python-checkins] Fix typo in a comment in Modules/_ssl.c:
 s/validata/validate/ (GH-27993)
Message-ID: <mailman.1211.1630064315.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/28db1f61f20352c02e4ae1518e5aeb6505df3045
commit: 28db1f61f20352c02e4ae1518e5aeb6505df3045
branch: main
author: Adam Dangoor <adamdangoor at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-27T13:38:24+02:00
summary:

Fix typo in a comment in Modules/_ssl.c: s/validata/validate/ (GH-27993)

files:
M Modules/_ssl.c

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 84cc3697b0706..6c63301b2a7d8 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -4047,7 +4047,7 @@ _ssl__SSLContext_load_verify_locations_impl(PySSLContext *self,
         goto error;
     }
 
-    /* validata cadata type and load cadata */
+    /* validate cadata type and load cadata */
     if (cadata) {
         if (PyUnicode_Check(cadata)) {
             PyObject *cadata_ascii = PyUnicode_AsASCIIString(cadata);


From webhook-mailer at python.org  Fri Aug 27 07:59:28 2021
From: webhook-mailer at python.org (ambv)
Date: Fri, 27 Aug 2021 11:59:28 -0000
Subject: [Python-checkins] Fix typo in a comment in Modules/_ssl.c:
 s/validata/validate/ (GH-27993) (GH-27998)
Message-ID: <mailman.1212.1630065569.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/2351ff2c8f9f4ff0d3eb5cfa8c354ee8864789cc
commit: 2351ff2c8f9f4ff0d3eb5cfa8c354ee8864789cc
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-27T13:59:23+02:00
summary:

Fix typo in a comment in Modules/_ssl.c: s/validata/validate/ (GH-27993) (GH-27998)

(cherry picked from commit 28db1f61f20352c02e4ae1518e5aeb6505df3045)

Co-authored-by: Adam Dangoor <adamdangoor at gmail.com>

files:
M Modules/_ssl.c

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 97e314b21fd1a..0498c153caaf2 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -4229,7 +4229,7 @@ _ssl__SSLContext_load_verify_locations_impl(PySSLContext *self,
         goto error;
     }
 
-    /* validata cadata type and load cadata */
+    /* validate cadata type and load cadata */
     if (cadata) {
         if (PyUnicode_Check(cadata)) {
             PyObject *cadata_ascii = PyUnicode_AsASCIIString(cadata);


From webhook-mailer at python.org  Fri Aug 27 08:33:44 2021
From: webhook-mailer at python.org (ambv)
Date: Fri, 27 Aug 2021 12:33:44 -0000
Subject: [Python-checkins] Fix typo in a comment in Modules/_ssl.c:
 s/validata/validate/ (GH-27993) (GH-27999)
Message-ID: <mailman.1213.1630067625.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/44dd2ecb143b7ef39b22e76d7d24f62dc65eb359
commit: 44dd2ecb143b7ef39b22e76d7d24f62dc65eb359
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-27T14:33:33+02:00
summary:

Fix typo in a comment in Modules/_ssl.c: s/validata/validate/ (GH-27993) (GH-27999)

(cherry picked from commit 28db1f61f20352c02e4ae1518e5aeb6505df3045)

Co-authored-by: Adam Dangoor <adamdangoor at gmail.com>

files:
M Modules/_ssl.c

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index d6a2fb814adcd8..35d9d65f8c0722 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -4231,7 +4231,7 @@ _ssl__SSLContext_load_verify_locations_impl(PySSLContext *self,
         goto error;
     }
 
-    /* validata cadata type and load cadata */
+    /* validate cadata type and load cadata */
     if (cadata) {
         if (PyUnicode_Check(cadata)) {
             PyObject *cadata_ascii = PyUnicode_AsASCIIString(cadata);


From webhook-mailer at python.org  Fri Aug 27 12:28:39 2021
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 27 Aug 2021 16:28:39 -0000
Subject: [Python-checkins] bpo-45022: Pin current libffi build to fixed
 version in preparation for upcoming update (GH-27982)
Message-ID: <mailman.1214.1630081720.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/399cd466d0379d12e4af343a49ca7e8ec84997fa
commit: 399cd466d0379d12e4af343a49ca7e8ec84997fa
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-27T09:28:30-07:00
summary:

bpo-45022: Pin current libffi build to fixed version in preparation for upcoming update (GH-27982)


Also improve the build script for libffi, which is not used as part of the regular build.
(cherry picked from commit 969ae7f7356584e30667b4e490ffa2ffa1810429)

Co-authored-by: Steve Dower <steve.dower at python.org>

files:
M PCbuild/get_externals.bat
M PCbuild/prepare_libffi.bat
M PCbuild/python.props

diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index b5a44e3e959b42..dbd2ff1afd78ba 100644
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -52,7 +52,7 @@ echo.Fetching external libraries...
 
 set libraries=
 set libraries=%libraries%                                       bzip2-1.0.6
-if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries%  libffi
+if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries%  libffi-3.3.0
 if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries%     openssl-1.1.1k
 set libraries=%libraries%                                       sqlite-3.35.5.0
 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.9.0
@@ -76,7 +76,7 @@ for %%e in (%libraries%) do (
 echo.Fetching external binaries...
 
 set binaries=
-if NOT "%IncludeLibffi%"=="false"  set binaries=%binaries% libffi
+if NOT "%IncludeLibffi%"=="false"  set binaries=%binaries% libffi-3.3.0
 if NOT "%IncludeSSL%"=="false"     set binaries=%binaries% openssl-bin-1.1.1k-1
 if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.9.0
 if NOT "%IncludeSSLSrc%"=="false"  set binaries=%binaries% nasm-2.11.06
diff --git a/PCbuild/prepare_libffi.bat b/PCbuild/prepare_libffi.bat
index 922a47565c8da5..7e7842a2fc97a4 100644
--- a/PCbuild/prepare_libffi.bat
+++ b/PCbuild/prepare_libffi.bat
@@ -38,6 +38,7 @@ set BUILD_ARM32=
 set BUILD_ARM64=
 set BUILD_PDB=
 set BUILD_NOOPT=
+set COPY_LICENSE=
 set INSTALL_CYGWIN=
 
 :CheckOpts
@@ -49,6 +50,7 @@ if /I "%1"=="-arm32" (set BUILD_ARM32=1) & shift & goto :CheckOpts
 if /I "%1"=="-arm64" (set BUILD_ARM64=1) & shift & goto :CheckOpts
 if /I "%1"=="-pdb" (set BUILD_PDB=-g) & shift & goto :CheckOpts
 if /I "%1"=="-noopt" (set BUILD_NOOPT=CFLAGS='-Od -warn all') & shift & goto :CheckOpts
+if /I "%1"=="-license" (set COPY_LICENSE=1) & shift & goto :CheckOpts
 if /I "%1"=="-?" goto :Usage
 if /I "%1"=="--install-cygwin" (set INSTALL_CYGWIN=1) & shift & goto :CheckOpts
 goto :Usage
@@ -60,6 +62,7 @@ if NOT DEFINED BUILD_X64 if NOT DEFINED BUILD_X86 if NOT DEFINED BUILD_ARM32 if
     set BUILD_X86=1
     set BUILD_ARM32=1
     set BUILD_ARM64=1
+    set COPY_LICENSE=1
 )
 
 if "%INSTALL_CYGWIN%"=="1" call :InstallCygwin
@@ -98,9 +101,14 @@ if not exist Makefile.in (
 )
 
 if "%BUILD_X64%"=="1" call :BuildOne x64 x86_64-w64-cygwin x86_64-w64-cygwin
+if errorlevel 1 exit /B %ERRORLEVEL%
 if "%BUILD_X86%"=="1" call :BuildOne x86 i686-pc-cygwin i686-pc-cygwin
+if errorlevel 1 exit /B %ERRORLEVEL%
 if "%BUILD_ARM32%"=="1" call :BuildOne x86_arm i686-pc-cygwin arm-w32-cygwin
+if errorlevel 1 exit /B %ERRORLEVEL%
 if "%BUILD_ARM64%"=="1" call :BuildOne x86_arm64 i686-pc-cygwin aarch64-w64-cygwin
+if errorlevel 1 exit /B %ERRORLEVEL%
+if "%COPY_LICENSE%"=="1" copy /y "%LIBFFI_SOURCE%\LICENSE" "%LIBFFI_OUT%\LICENSE"
 
 popd
 endlocal
@@ -179,11 +187,11 @@ if "%LIBFFI_TEST%" EQU "1" (
 
 echo copying files to %_LIBFFI_OUT%
 if not exist %_LIBFFI_OUT%\include (md %_LIBFFI_OUT%\include)
-copy %ARTIFACTS%\.libs\libffi-7.dll %_LIBFFI_OUT%
-copy %ARTIFACTS%\.libs\libffi-7.lib %_LIBFFI_OUT%
-copy %ARTIFACTS%\.libs\libffi-7.pdb %_LIBFFI_OUT%
-copy %ARTIFACTS%\fficonfig.h %_LIBFFI_OUT%\include
-copy %ARTIFACTS%\include\*.h %_LIBFFI_OUT%\include
+copy %ARTIFACTS%\.libs\libffi-*.dll %_LIBFFI_OUT% || exit /B 1
+copy %ARTIFACTS%\.libs\libffi-*.lib %_LIBFFI_OUT% || exit /B 1
+copy %ARTIFACTS%\.libs\libffi-*.pdb %_LIBFFI_OUT%
+copy %ARTIFACTS%\fficonfig.h %_LIBFFI_OUT%\include || exit /B 1
+copy %ARTIFACTS%\include\*.h %_LIBFFI_OUT%\include || exit /B 1
 
 endlocal
 exit /b
diff --git a/PCbuild/python.props b/PCbuild/python.props
index 60625101b47287..da65df58e227d9 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -60,8 +60,8 @@
     <sqlite3Dir>$(ExternalsDir)sqlite-3.35.5.0\</sqlite3Dir>
     <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
     <lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
-    <libffiDir>$(ExternalsDir)libffi\</libffiDir>
-    <libffiOutDir>$(ExternalsDir)libffi\$(ArchName)\</libffiOutDir>
+    <libffiDir>$(ExternalsDir)libffi-3.3.0\</libffiDir>
+    <libffiOutDir>$(ExternalsDir)libffi-3.3.0\$(ArchName)\</libffiOutDir>
     <libffiIncludeDir>$(libffiOutDir)include</libffiIncludeDir>
     <opensslDir>$(ExternalsDir)openssl-1.1.1k\</opensslDir>
     <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1k-1\$(ArchName)\</opensslOutDir>


From webhook-mailer at python.org  Fri Aug 27 12:28:59 2021
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 27 Aug 2021 16:28:59 -0000
Subject: [Python-checkins] bpo-45022: Pin current libffi build to fixed
 version in preparation for upcoming update (GH-27982)
Message-ID: <mailman.1215.1630081740.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/db36fdb1f42f490b7c2a3484a69aa1e6c72b6a4c
commit: db36fdb1f42f490b7c2a3484a69aa1e6c72b6a4c
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-27T09:28:54-07:00
summary:

bpo-45022: Pin current libffi build to fixed version in preparation for upcoming update (GH-27982)


Also improve the build script for libffi, which is not used as part of the regular build.
(cherry picked from commit 969ae7f7356584e30667b4e490ffa2ffa1810429)

Co-authored-by: Steve Dower <steve.dower at python.org>

files:
M PCbuild/get_externals.bat
M PCbuild/prepare_libffi.bat
M PCbuild/python.props

diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 63e3bb47672cc..8a1ab21d743c7 100644
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -52,7 +52,7 @@ echo.Fetching external libraries...
 
 set libraries=
 set libraries=%libraries%                                       bzip2-1.0.6
-if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries%  libffi
+if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries%  libffi-3.3.0
 if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries%     openssl-1.1.1k
 set libraries=%libraries%                                       sqlite-3.35.5.0
 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.11.0
@@ -76,7 +76,7 @@ for %%e in (%libraries%) do (
 echo.Fetching external binaries...
 
 set binaries=
-if NOT "%IncludeLibffi%"=="false"  set binaries=%binaries% libffi
+if NOT "%IncludeLibffi%"=="false"  set binaries=%binaries% libffi-3.3.0
 if NOT "%IncludeSSL%"=="false"     set binaries=%binaries% openssl-bin-1.1.1k-1
 if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.11.0
 if NOT "%IncludeSSLSrc%"=="false"  set binaries=%binaries% nasm-2.11.06
diff --git a/PCbuild/prepare_libffi.bat b/PCbuild/prepare_libffi.bat
index 922a47565c8da..7e7842a2fc97a 100644
--- a/PCbuild/prepare_libffi.bat
+++ b/PCbuild/prepare_libffi.bat
@@ -38,6 +38,7 @@ set BUILD_ARM32=
 set BUILD_ARM64=
 set BUILD_PDB=
 set BUILD_NOOPT=
+set COPY_LICENSE=
 set INSTALL_CYGWIN=
 
 :CheckOpts
@@ -49,6 +50,7 @@ if /I "%1"=="-arm32" (set BUILD_ARM32=1) & shift & goto :CheckOpts
 if /I "%1"=="-arm64" (set BUILD_ARM64=1) & shift & goto :CheckOpts
 if /I "%1"=="-pdb" (set BUILD_PDB=-g) & shift & goto :CheckOpts
 if /I "%1"=="-noopt" (set BUILD_NOOPT=CFLAGS='-Od -warn all') & shift & goto :CheckOpts
+if /I "%1"=="-license" (set COPY_LICENSE=1) & shift & goto :CheckOpts
 if /I "%1"=="-?" goto :Usage
 if /I "%1"=="--install-cygwin" (set INSTALL_CYGWIN=1) & shift & goto :CheckOpts
 goto :Usage
@@ -60,6 +62,7 @@ if NOT DEFINED BUILD_X64 if NOT DEFINED BUILD_X86 if NOT DEFINED BUILD_ARM32 if
     set BUILD_X86=1
     set BUILD_ARM32=1
     set BUILD_ARM64=1
+    set COPY_LICENSE=1
 )
 
 if "%INSTALL_CYGWIN%"=="1" call :InstallCygwin
@@ -98,9 +101,14 @@ if not exist Makefile.in (
 )
 
 if "%BUILD_X64%"=="1" call :BuildOne x64 x86_64-w64-cygwin x86_64-w64-cygwin
+if errorlevel 1 exit /B %ERRORLEVEL%
 if "%BUILD_X86%"=="1" call :BuildOne x86 i686-pc-cygwin i686-pc-cygwin
+if errorlevel 1 exit /B %ERRORLEVEL%
 if "%BUILD_ARM32%"=="1" call :BuildOne x86_arm i686-pc-cygwin arm-w32-cygwin
+if errorlevel 1 exit /B %ERRORLEVEL%
 if "%BUILD_ARM64%"=="1" call :BuildOne x86_arm64 i686-pc-cygwin aarch64-w64-cygwin
+if errorlevel 1 exit /B %ERRORLEVEL%
+if "%COPY_LICENSE%"=="1" copy /y "%LIBFFI_SOURCE%\LICENSE" "%LIBFFI_OUT%\LICENSE"
 
 popd
 endlocal
@@ -179,11 +187,11 @@ if "%LIBFFI_TEST%" EQU "1" (
 
 echo copying files to %_LIBFFI_OUT%
 if not exist %_LIBFFI_OUT%\include (md %_LIBFFI_OUT%\include)
-copy %ARTIFACTS%\.libs\libffi-7.dll %_LIBFFI_OUT%
-copy %ARTIFACTS%\.libs\libffi-7.lib %_LIBFFI_OUT%
-copy %ARTIFACTS%\.libs\libffi-7.pdb %_LIBFFI_OUT%
-copy %ARTIFACTS%\fficonfig.h %_LIBFFI_OUT%\include
-copy %ARTIFACTS%\include\*.h %_LIBFFI_OUT%\include
+copy %ARTIFACTS%\.libs\libffi-*.dll %_LIBFFI_OUT% || exit /B 1
+copy %ARTIFACTS%\.libs\libffi-*.lib %_LIBFFI_OUT% || exit /B 1
+copy %ARTIFACTS%\.libs\libffi-*.pdb %_LIBFFI_OUT%
+copy %ARTIFACTS%\fficonfig.h %_LIBFFI_OUT%\include || exit /B 1
+copy %ARTIFACTS%\include\*.h %_LIBFFI_OUT%\include || exit /B 1
 
 endlocal
 exit /b
diff --git a/PCbuild/python.props b/PCbuild/python.props
index 60625101b4728..da65df58e227d 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -60,8 +60,8 @@
     <sqlite3Dir>$(ExternalsDir)sqlite-3.35.5.0\</sqlite3Dir>
     <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
     <lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
-    <libffiDir>$(ExternalsDir)libffi\</libffiDir>
-    <libffiOutDir>$(ExternalsDir)libffi\$(ArchName)\</libffiOutDir>
+    <libffiDir>$(ExternalsDir)libffi-3.3.0\</libffiDir>
+    <libffiOutDir>$(ExternalsDir)libffi-3.3.0\$(ArchName)\</libffiOutDir>
     <libffiIncludeDir>$(libffiOutDir)include</libffiIncludeDir>
     <opensslDir>$(ExternalsDir)openssl-1.1.1k\</opensslDir>
     <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1k-1\$(ArchName)\</opensslOutDir>


From webhook-mailer at python.org  Sat Aug 28 13:07:56 2021
From: webhook-mailer at python.org (ambv)
Date: Sat, 28 Aug 2021 17:07:56 -0000
Subject: [Python-checkins] bpo-44962: Fix a race in WeakKeyDict,
 WeakValueDict and WeakSet when two threads attempt to commit the
 last pending removal (GH-27921)
Message-ID: <mailman.1216.1630170477.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/206b21ed9f64fedff67bfea7cf73e423e3e32393
commit: 206b21ed9f64fedff67bfea7cf73e423e3e32393
branch: main
author: Thomas Grainger <tagrain at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-28T19:07:37+02:00
summary:

bpo-44962: Fix a race in WeakKeyDict, WeakValueDict and WeakSet when two threads attempt to commit the last pending removal (GH-27921)

Fixes:
Traceback (most recent call last):
  File "/home/graingert/projects/asyncio-demo/demo.py", line 36, in <module>
    sys.exit(main())
  File "/home/graingert/projects/asyncio-demo/demo.py", line 30, in main
    test_all_tasks_threading()
  File "/home/graingert/projects/asyncio-demo/demo.py", line 24, in test_all_tasks_threading
    results.append(f.result())
  File "/usr/lib/python3.10/concurrent/futures/_base.py", line 438, in result
    return self.__get_result()
  File "/usr/lib/python3.10/concurrent/futures/_base.py", line 390, in __get_result
    raise self._exception
  File "/usr/lib/python3.10/concurrent/futures/thread.py", line 52, in run
    result = self.fn(*self.args, **self.kwargs)
  File "/usr/lib/python3.10/asyncio/runners.py", line 47, in run
    _cancel_all_tasks(loop)
  File "/usr/lib/python3.10/asyncio/runners.py", line 56, in _cancel_all_tasks
    to_cancel = tasks.all_tasks(loop)
  File "/usr/lib/python3.10/asyncio/tasks.py", line 53, in all_tasks
    tasks = list(_all_tasks)
  File "/usr/lib/python3.10/_weakrefset.py", line 60, in __iter__
    with _IterationGuard(self):
  File "/usr/lib/python3.10/_weakrefset.py", line 33, in __exit__
    w._commit_removals()
  File "/usr/lib/python3.10/_weakrefset.py", line 57, in _commit_removals
    discard(l.pop())
IndexError: pop from empty list

Also fixes:
Exception ignored in: weakref callback <function WeakKeyDictionary.__init__.<locals>.remove at 0x00007fe82245d2e0>
Traceback (most recent call last):
  File "/usr/lib/pypy3/lib-python/3/weakref.py", line 390, in remove
    del self.data[k]
KeyError: <weakref at 0x00007fe76e8d8180; dead>
Exception ignored in: weakref callback <function WeakKeyDictionary.__init__.<locals>.remove at 0x00007fe82245d2e0>
Traceback (most recent call last):
  File "/usr/lib/pypy3/lib-python/3/weakref.py", line 390, in remove
    del self.data[k]
KeyError: <weakref at 0x00007fe76e8d81a0; dead>
Exception ignored in: weakref callback <function WeakKeyDictionary.__init__.<locals>.remove at 0x00007fe82245d2e0>
Traceback (most recent call last):
  File "/usr/lib/pypy3/lib-python/3/weakref.py", line 390, in remove
    del self.data[k]
KeyError: <weakref at 0x000056548f1e24a0; dead>

See: https://github.com/agronholm/anyio/issues/362#issuecomment-904424310
See also: https://bugs.python.org/issue29519

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-23-19-55-08.bpo-44962.J00ftt.rst
M Lib/_weakrefset.py
M Lib/weakref.py

diff --git a/Lib/_weakrefset.py b/Lib/_weakrefset.py
index b267780f0ced7..2a27684324d80 100644
--- a/Lib/_weakrefset.py
+++ b/Lib/_weakrefset.py
@@ -51,10 +51,14 @@ def _remove(item, selfref=ref(self)):
             self.update(data)
 
     def _commit_removals(self):
-        l = self._pending_removals
+        pop = self._pending_removals.pop
         discard = self.data.discard
-        while l:
-            discard(l.pop())
+        while True:
+            try:
+                item = pop()
+            except IndexError:
+                return
+            discard(item)
 
     def __iter__(self):
         with _IterationGuard(self):
diff --git a/Lib/weakref.py b/Lib/weakref.py
index a968139f98631..994ea8aa37de5 100644
--- a/Lib/weakref.py
+++ b/Lib/weakref.py
@@ -119,14 +119,17 @@ def remove(wr, selfref=ref(self), _atomic_removal=_remove_dead_weakref):
         self.data = {}
         self.update(other, **kw)
 
-    def _commit_removals(self):
-        l = self._pending_removals
+    def _commit_removals(self, _atomic_removal=_remove_dead_weakref):
+        pop = self._pending_removals.pop
         d = self.data
         # We shouldn't encounter any KeyError, because this method should
         # always be called *before* mutating the dict.
-        while l:
-            key = l.pop()
-            _remove_dead_weakref(d, key)
+        while True:
+            try:
+                key = pop()
+            except IndexError:
+                return
+            _atomic_removal(d, key)
 
     def __getitem__(self, key):
         if self._pending_removals:
@@ -370,7 +373,10 @@ def remove(k, selfref=ref(self)):
                 if self._iterating:
                     self._pending_removals.append(k)
                 else:
-                    del self.data[k]
+                    try:
+                        del self.data[k]
+                    except KeyError:
+                        pass
         self._remove = remove
         # A list of dead weakrefs (keys to be removed)
         self._pending_removals = []
@@ -384,11 +390,16 @@ def _commit_removals(self):
         # because a dead weakref never compares equal to a live weakref,
         # even if they happened to refer to equal objects.
         # However, it means keys may already have been removed.
-        l = self._pending_removals
+        pop = self._pending_removals.pop
         d = self.data
-        while l:
+        while True:
+            try:
+                key = pop()
+            except IndexError:
+                return
+
             try:
-                del d[l.pop()]
+                del d[key]
             except KeyError:
                 pass
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-23-19-55-08.bpo-44962.J00ftt.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-23-19-55-08.bpo-44962.J00ftt.rst
new file mode 100644
index 0000000000000..6b4b9dfd8bc3c
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-23-19-55-08.bpo-44962.J00ftt.rst	
@@ -0,0 +1 @@
+Fix a race in WeakKeyDictionary, WeakValueDictionary and WeakSet when two threads attempt to commit the last pending removal. This fixes asyncio.create_task and fixes a data loss in asyncio.run where shutdown_asyncgens is not run
\ No newline at end of file


From webhook-mailer at python.org  Sat Aug 28 14:09:30 2021
From: webhook-mailer at python.org (miss-islington)
Date: Sat, 28 Aug 2021 18:09:30 -0000
Subject: [Python-checkins] bpo-44962: Fix a race in WeakKeyDict,
 WeakValueDict and WeakSet when two threads attempt to commit the
 last pending removal (GH-27921)
Message-ID: <mailman.1217.1630174171.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/8aa64cc45bff516a6db1f3a3c037cbcce9417fea
commit: 8aa64cc45bff516a6db1f3a3c037cbcce9417fea
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-28T11:09:21-07:00
summary:

bpo-44962: Fix a race in WeakKeyDict, WeakValueDict and WeakSet when two threads attempt to commit the last pending removal (GH-27921)


Fixes:
Traceback (most recent call last):
  File "/home/graingert/projects/asyncio-demo/demo.py", line 36, in <module>
    sys.exit(main())
  File "/home/graingert/projects/asyncio-demo/demo.py", line 30, in main
    test_all_tasks_threading()
  File "/home/graingert/projects/asyncio-demo/demo.py", line 24, in test_all_tasks_threading
    results.append(f.result())
  File "/usr/lib/python3.10/concurrent/futures/_base.py", line 438, in result
    return self.__get_result()
  File "/usr/lib/python3.10/concurrent/futures/_base.py", line 390, in __get_result
    raise self._exception
  File "/usr/lib/python3.10/concurrent/futures/thread.py", line 52, in run
    result = self.fn(*self.args, **self.kwargs)
  File "/usr/lib/python3.10/asyncio/runners.py", line 47, in run
    _cancel_all_tasks(loop)
  File "/usr/lib/python3.10/asyncio/runners.py", line 56, in _cancel_all_tasks
    to_cancel = tasks.all_tasks(loop)
  File "/usr/lib/python3.10/asyncio/tasks.py", line 53, in all_tasks
    tasks = list(_all_tasks)
  File "/usr/lib/python3.10/_weakrefset.py", line 60, in __iter__
    with _IterationGuard(self):
  File "/usr/lib/python3.10/_weakrefset.py", line 33, in __exit__
    w._commit_removals()
  File "/usr/lib/python3.10/_weakrefset.py", line 57, in _commit_removals
    discard(l.pop())
IndexError: pop from empty list

Also fixes:
Exception ignored in: weakref callback <function WeakKeyDictionary.__init__.<locals>.remove at 0x00007fe82245d2e0>
Traceback (most recent call last):
  File "/usr/lib/pypy3/lib-python/3/weakref.py", line 390, in remove
    del self.data[k]
KeyError: <weakref at 0x00007fe76e8d8180; dead>
Exception ignored in: weakref callback <function WeakKeyDictionary.__init__.<locals>.remove at 0x00007fe82245d2e0>
Traceback (most recent call last):
  File "/usr/lib/pypy3/lib-python/3/weakref.py", line 390, in remove
    del self.data[k]
KeyError: <weakref at 0x00007fe76e8d81a0; dead>
Exception ignored in: weakref callback <function WeakKeyDictionary.__init__.<locals>.remove at 0x00007fe82245d2e0>
Traceback (most recent call last):
  File "/usr/lib/pypy3/lib-python/3/weakref.py", line 390, in remove
    del self.data[k]
KeyError: <weakref at 0x000056548f1e24a0; dead>

See: https://github.com/agronholm/anyio/issues/362GH-issuecomment-904424310
See also: https://bugs.python.org/issue29519

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 206b21ed9f64fedff67bfea7cf73e423e3e32393)

Co-authored-by: Thomas Grainger <tagrain at gmail.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-23-19-55-08.bpo-44962.J00ftt.rst
M Lib/_weakrefset.py
M Lib/weakref.py

diff --git a/Lib/_weakrefset.py b/Lib/_weakrefset.py
index b267780f0ced73..2a27684324d80a 100644
--- a/Lib/_weakrefset.py
+++ b/Lib/_weakrefset.py
@@ -51,10 +51,14 @@ def _remove(item, selfref=ref(self)):
             self.update(data)
 
     def _commit_removals(self):
-        l = self._pending_removals
+        pop = self._pending_removals.pop
         discard = self.data.discard
-        while l:
-            discard(l.pop())
+        while True:
+            try:
+                item = pop()
+            except IndexError:
+                return
+            discard(item)
 
     def __iter__(self):
         with _IterationGuard(self):
diff --git a/Lib/weakref.py b/Lib/weakref.py
index a968139f986314..994ea8aa37de58 100644
--- a/Lib/weakref.py
+++ b/Lib/weakref.py
@@ -119,14 +119,17 @@ def remove(wr, selfref=ref(self), _atomic_removal=_remove_dead_weakref):
         self.data = {}
         self.update(other, **kw)
 
-    def _commit_removals(self):
-        l = self._pending_removals
+    def _commit_removals(self, _atomic_removal=_remove_dead_weakref):
+        pop = self._pending_removals.pop
         d = self.data
         # We shouldn't encounter any KeyError, because this method should
         # always be called *before* mutating the dict.
-        while l:
-            key = l.pop()
-            _remove_dead_weakref(d, key)
+        while True:
+            try:
+                key = pop()
+            except IndexError:
+                return
+            _atomic_removal(d, key)
 
     def __getitem__(self, key):
         if self._pending_removals:
@@ -370,7 +373,10 @@ def remove(k, selfref=ref(self)):
                 if self._iterating:
                     self._pending_removals.append(k)
                 else:
-                    del self.data[k]
+                    try:
+                        del self.data[k]
+                    except KeyError:
+                        pass
         self._remove = remove
         # A list of dead weakrefs (keys to be removed)
         self._pending_removals = []
@@ -384,11 +390,16 @@ def _commit_removals(self):
         # because a dead weakref never compares equal to a live weakref,
         # even if they happened to refer to equal objects.
         # However, it means keys may already have been removed.
-        l = self._pending_removals
+        pop = self._pending_removals.pop
         d = self.data
-        while l:
+        while True:
+            try:
+                key = pop()
+            except IndexError:
+                return
+
             try:
-                del d[l.pop()]
+                del d[key]
             except KeyError:
                 pass
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-23-19-55-08.bpo-44962.J00ftt.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-23-19-55-08.bpo-44962.J00ftt.rst
new file mode 100644
index 00000000000000..6b4b9dfd8bc3c0
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-23-19-55-08.bpo-44962.J00ftt.rst	
@@ -0,0 +1 @@
+Fix a race in WeakKeyDictionary, WeakValueDictionary and WeakSet when two threads attempt to commit the last pending removal. This fixes asyncio.create_task and fixes a data loss in asyncio.run where shutdown_asyncgens is not run
\ No newline at end of file


From webhook-mailer at python.org  Sat Aug 28 14:09:34 2021
From: webhook-mailer at python.org (miss-islington)
Date: Sat, 28 Aug 2021 18:09:34 -0000
Subject: [Python-checkins] bpo-45018: Fix rangeiter_reduce in rangeobject.c
 (GH-27938)
Message-ID: <mailman.1218.1630174175.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/cd986e903176d28ed795f65ba14e6fcbf2a65e3d
commit: cd986e903176d28ed795f65ba14e6fcbf2a65e3d
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-28T11:09:29-07:00
summary:

bpo-45018: Fix rangeiter_reduce in rangeobject.c (GH-27938)


Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 94a3d2a6329ab7941e93ad2f5bcbb8af2b8b80d2)

Co-authored-by: chilaxan <chilaxan at gmail.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-26-18-44-03.bpo-45018.pu8H9L.rst
M Lib/test/test_range.py
M Objects/rangeobject.c

diff --git a/Lib/test/test_range.py b/Lib/test/test_range.py
index 107c0e2e11c7ce..897162b2b17457 100644
--- a/Lib/test/test_range.py
+++ b/Lib/test/test_range.py
@@ -374,26 +374,41 @@ def test_pickling(self):
                                      list(r))
 
     def test_iterator_pickling(self):
-        testcases = [(13,), (0, 11), (-22, 10), (20, 3, -1),
-                     (13, 21, 3), (-2, 2, 2), (2**65, 2**65+2)]
+        testcases = [(13,), (0, 11), (-22, 10), (20, 3, -1), (13, 21, 3),
+                     (-2, 2, 2), (2**31-3, 2**31-1), (2**33, 2**33+2),
+                     (2**63-3, 2**63-1), (2**65, 2**65+2)]
         for proto in range(pickle.HIGHEST_PROTOCOL + 1):
             for t in testcases:
-                it = itorg = iter(range(*t))
-                data = list(range(*t))
-
-                d = pickle.dumps(it, proto)
-                it = pickle.loads(d)
-                self.assertEqual(type(itorg), type(it))
-                self.assertEqual(list(it), data)
-
-                it = pickle.loads(d)
-                try:
-                    next(it)
-                except StopIteration:
-                    continue
+                with self.subTest(proto=proto, t=t):
+                    it = itorg = iter(range(*t))
+                    data = list(range(*t))
+
+                    d = pickle.dumps(it, proto)
+                    it = pickle.loads(d)
+                    self.assertEqual(type(itorg), type(it))
+                    self.assertEqual(list(it), data)
+
+                    it = pickle.loads(d)
+                    try:
+                        next(it)
+                    except StopIteration:
+                        continue
+                    d = pickle.dumps(it, proto)
+                    it = pickle.loads(d)
+                    self.assertEqual(list(it), data[1:])
+
+    def test_iterator_pickling_overflowing_index(self):
+        for proto in range(pickle.HIGHEST_PROTOCOL + 1):
+            with self.subTest(proto=proto):
+                it = iter(range(2**32 + 2))
+                _, _, idx = it.__reduce__()
+                self.assertEqual(idx, 0)
+                it.__setstate__(2**32 + 1)  # undocumented way to set r->index
+                _, _, idx = it.__reduce__()
+                self.assertEqual(idx, 2**32 + 1)
                 d = pickle.dumps(it, proto)
                 it = pickle.loads(d)
-                self.assertEqual(list(it), data[1:])
+                self.assertEqual(next(it), 2**32 + 1)
 
     def test_exhausted_iterator_pickling(self):
         for proto in range(pickle.HIGHEST_PROTOCOL + 1):
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-26-18-44-03.bpo-45018.pu8H9L.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-26-18-44-03.bpo-45018.pu8H9L.rst
new file mode 100644
index 00000000000000..5bf13ef06f34c3
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-26-18-44-03.bpo-45018.pu8H9L.rst	
@@ -0,0 +1 @@
+Fixed pickling of range iterators that iterated for over 2**32 times.
diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c
index 3e05707b1cee69..5c3230d860f8f1 100644
--- a/Objects/rangeobject.c
+++ b/Objects/rangeobject.c
@@ -813,7 +813,7 @@ rangeiter_reduce(rangeiterobject *r, PyObject *Py_UNUSED(ignored))
     if (range == NULL)
         goto err;
     /* return the result */
-    return Py_BuildValue("N(N)i", _PyEval_GetBuiltinId(&PyId_iter),
+    return Py_BuildValue("N(N)l", _PyEval_GetBuiltinId(&PyId_iter),
                          range, r->index);
 err:
     Py_XDECREF(start);


From webhook-mailer at python.org  Sat Aug 28 14:09:49 2021
From: webhook-mailer at python.org (miss-islington)
Date: Sat, 28 Aug 2021 18:09:49 -0000
Subject: [Python-checkins] bpo-44524: Fix cryptic TypeError message when
 trying to subclass special forms in `typing` (GH-27710)
Message-ID: <mailman.1219.1630174190.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/81fa08c5ea2cf15254b951034b9d6c7358f96d79
commit: 81fa08c5ea2cf15254b951034b9d6c7358f96d79
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-28T11:09:45-07:00
summary:

bpo-44524: Fix cryptic TypeError message when trying to subclass special forms in `typing` (GH-27710)


This was a Python 3.9 regression.
(cherry picked from commit a3a4d20d6798aa2975428d51f3a4f890248810cb)

Co-authored-by: Yurii Karabas <1998uriyyo at gmail.com>

files:
A Misc/NEWS.d/next/Library/2021-08-10-16-57-10.bpo-44524.dk9QX4.rst
M Lib/test/test_typing.py
M Lib/typing.py

diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index 7b2fd698089938..459af253e2ce14 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -2418,6 +2418,22 @@ def __new__(cls, arg):
         self.assertEqual(c.from_b, 'b')
         self.assertEqual(c.from_c, 'c')
 
+    def test_subclass_special_form(self):
+        for obj in (
+            ClassVar[int],
+            Final[int],
+            Union[int, float],
+            Optional[int],
+            Literal[1, 2],
+            Concatenate[int, ParamSpec("P")],
+            TypeGuard[int],
+        ):
+            with self.subTest(msg=obj):
+                with self.assertRaisesRegex(
+                        TypeError, f'^{re.escape(f"Cannot subclass {obj!r}")}$'
+                ):
+                    class Foo(obj):
+                        pass
 
 class ClassVarTests(BaseTestCase):
 
diff --git a/Lib/typing.py b/Lib/typing.py
index 423329a98005c8..4c2d9fc3320f34 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -1081,6 +1081,9 @@ def __reduce__(self):
         return operator.getitem, (origin, args)
 
     def __mro_entries__(self, bases):
+        if isinstance(self.__origin__, _SpecialForm):
+            raise TypeError(f"Cannot subclass {self!r}")
+
         if self._name:  # generic version of an ABC or built-in class
             return super().__mro_entries__(bases)
         if self.__origin__ is Generic:
diff --git a/Misc/NEWS.d/next/Library/2021-08-10-16-57-10.bpo-44524.dk9QX4.rst b/Misc/NEWS.d/next/Library/2021-08-10-16-57-10.bpo-44524.dk9QX4.rst
new file mode 100644
index 00000000000000..bc3659fca52098
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-10-16-57-10.bpo-44524.dk9QX4.rst
@@ -0,0 +1,2 @@
+Make exception message more useful when subclass from typing special form
+alias. Patch provided by Yurii Karabas.


From webhook-mailer at python.org  Sat Aug 28 14:26:09 2021
From: webhook-mailer at python.org (pablogsal)
Date: Sat, 28 Aug 2021 18:26:09 -0000
Subject: [Python-checkins] [3.10] bpo-27334: roll back transaction if
 sqlite3 context manager fails to commit (GH-26202) (GH-27943)
Message-ID: <mailman.1220.1630175170.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/2a80893e5c023a73ccd32cc319f4f0404f548c00
commit: 2a80893e5c023a73ccd32cc319f4f0404f548c00
branch: 3.10
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-08-28T19:26:00+01:00
summary:

[3.10] bpo-27334: roll back transaction if sqlite3 context manager fails to commit (GH-26202) (GH-27943)

files:
A Misc/NEWS.d/next/Library/2021-05-18-00-17-21.bpo-27334.32EJZi.rst
M Lib/sqlite3/test/dbapi.py
M Modules/_sqlite/connection.c

diff --git a/Lib/sqlite3/test/dbapi.py b/Lib/sqlite3/test/dbapi.py
index 2d02045b72e8d..5d521d0cce5e1 100644
--- a/Lib/sqlite3/test/dbapi.py
+++ b/Lib/sqlite3/test/dbapi.py
@@ -20,12 +20,13 @@
 #    misrepresented as being the original software.
 # 3. This notice may not be removed or altered from any source distribution.
 
+import subprocess
 import threading
 import unittest
 import sqlite3 as sqlite
 import sys
 
-from test.support import check_disallow_instantiation
+from test.support import check_disallow_instantiation, SHORT_TIMEOUT
 from test.support.os_helper import TESTFN, unlink
 
 
@@ -958,6 +959,77 @@ def test_on_conflict_replace(self):
         self.assertEqual(self.cu.fetchall(), [('Very different data!', 'foo')])
 
 
+class MultiprocessTests(unittest.TestCase):
+    CONNECTION_TIMEOUT = SHORT_TIMEOUT / 1000.  # Defaults to 30 ms
+
+    def tearDown(self):
+        unlink(TESTFN)
+
+    def test_ctx_mgr_rollback_if_commit_failed(self):
+        # bpo-27334: ctx manager does not rollback if commit fails
+        SCRIPT = f"""if 1:
+            import sqlite3
+            def wait():
+                print("started")
+                assert "database is locked" in input()
+
+            cx = sqlite3.connect("{TESTFN}", timeout={self.CONNECTION_TIMEOUT})
+            cx.create_function("wait", 0, wait)
+            with cx:
+                cx.execute("create table t(t)")
+            try:
+                # execute two transactions; both will try to lock the db
+                cx.executescript('''
+                    -- start a transaction and wait for parent
+                    begin transaction;
+                    select * from t;
+                    select wait();
+                    rollback;
+
+                    -- start a new transaction; would fail if parent holds lock
+                    begin transaction;
+                    select * from t;
+                    rollback;
+                ''')
+            finally:
+                cx.close()
+        """
+
+        # spawn child process
+        proc = subprocess.Popen(
+            [sys.executable, "-c", SCRIPT],
+            encoding="utf-8",
+            bufsize=0,
+            stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE,
+        )
+        self.addCleanup(proc.communicate)
+
+        # wait for child process to start
+        self.assertEqual("started", proc.stdout.readline().strip())
+
+        cx = sqlite.connect(TESTFN, timeout=self.CONNECTION_TIMEOUT)
+        try:  # context manager should correctly release the db lock
+            with cx:
+                cx.execute("insert into t values('test')")
+        except sqlite.OperationalError as exc:
+            proc.stdin.write(str(exc))
+        else:
+            proc.stdin.write("no error")
+        finally:
+            cx.close()
+
+        # terminate child process
+        self.assertIsNone(proc.returncode)
+        try:
+            proc.communicate(input="end", timeout=SHORT_TIMEOUT)
+        except subprocess.TimeoutExpired:
+            proc.kill()
+            proc.communicate()
+            raise
+        self.assertEqual(proc.returncode, 0)
+
+
 def suite():
     tests = [
         ClosedConTests,
@@ -967,6 +1039,7 @@ def suite():
         CursorTests,
         ExtensionTests,
         ModuleTests,
+        MultiprocessTests,
         SqliteOnConflictTests,
         ThreadTests,
         UninitialisedConnectionTests,
diff --git a/Misc/NEWS.d/next/Library/2021-05-18-00-17-21.bpo-27334.32EJZi.rst b/Misc/NEWS.d/next/Library/2021-05-18-00-17-21.bpo-27334.32EJZi.rst
new file mode 100644
index 0000000000000..dc0cdf33ec5ac
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-05-18-00-17-21.bpo-27334.32EJZi.rst
@@ -0,0 +1,2 @@
+The :mod:`sqlite3` context manager now performs a rollback (thus releasing the
+database lock) if commit failed.  Patch by Luca Citi and Erlend E. Aasland.
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index f060ef1ef4248..5813e34d57afe 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -1871,17 +1871,32 @@ pysqlite_connection_exit_impl(pysqlite_Connection *self, PyObject *exc_type,
                               PyObject *exc_value, PyObject *exc_tb)
 /*[clinic end generated code: output=0705200e9321202a input=bd66f1532c9c54a7]*/
 {
-    const char* method_name;
+    int commit = 0;
     PyObject* result;
 
     if (exc_type == Py_None && exc_value == Py_None && exc_tb == Py_None) {
-        method_name = "commit";
-    } else {
-        method_name = "rollback";
+        commit = 1;
+        result = pysqlite_connection_commit_impl(self);
     }
-
-    result = PyObject_CallMethod((PyObject*)self, method_name, NULL);
-    if (!result) {
+    else {
+        result = pysqlite_connection_rollback_impl(self);
+    }
+
+    if (result == NULL) {
+        if (commit) {
+            /* Commit failed; try to rollback in order to unlock the database.
+             * If rollback also fails, chain the exceptions. */
+            PyObject *exc, *val, *tb;
+            PyErr_Fetch(&exc, &val, &tb);
+            result = pysqlite_connection_rollback_impl(self);
+            if (result == NULL) {
+                _PyErr_ChainExceptions(exc, val, tb);
+            }
+            else {
+                Py_DECREF(result);
+                PyErr_Restore(exc, val, tb);
+            }
+        }
         return NULL;
     }
     Py_DECREF(result);


From webhook-mailer at python.org  Sat Aug 28 14:33:59 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Sat, 28 Aug 2021 18:33:59 -0000
Subject: [Python-checkins] bpo-25130: Make unit-test about restricting the
 maximum number of nested blocks cpython-only (GH-28002)
Message-ID: <mailman.1221.1630175640.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/eb263f9a356f5c5f21b8d5ce20bac92f31c40cad
commit: eb263f9a356f5c5f21b8d5ce20bac92f31c40cad
branch: main
author: Carl Friedrich Bolz-Tereick <cfbolz at gmx.de>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-28T21:33:50+03:00
summary:

bpo-25130: Make unit-test about restricting the maximum number of nested blocks cpython-only (GH-28002)

PyPy and potentially other implementations have different or no
contraints on the number of blocks that can be statically nested. move
the test that checks for this behaviour into a unit test and mark it as
CPython-only.

files:
M Lib/test/test_syntax.py

diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
index 43780ce273ef4..be8be898d0196 100644
--- a/Lib/test/test_syntax.py
+++ b/Lib/test/test_syntax.py
@@ -629,38 +629,6 @@
      ...
    SyntaxError: 'break' outside loop
 
-This raises a SyntaxError, it used to raise a SystemError.
-Context for this change can be found on issue #27514
-
-In 2.5 there was a missing exception and an assert was triggered in a debug
-build.  The number of blocks must be greater than CO_MAXBLOCKS.  SF #1565514
-
-   >>> while 1:
-   ...  while 2:
-   ...   while 3:
-   ...    while 4:
-   ...     while 5:
-   ...      while 6:
-   ...       while 8:
-   ...        while 9:
-   ...         while 10:
-   ...          while 11:
-   ...           while 12:
-   ...            while 13:
-   ...             while 14:
-   ...              while 15:
-   ...               while 16:
-   ...                while 17:
-   ...                 while 18:
-   ...                  while 19:
-   ...                   while 20:
-   ...                    while 21:
-   ...                     while 22:
-   ...                      break
-   Traceback (most recent call last):
-     ...
-   SyntaxError: too many statically nested blocks
-
 Misuse of the nonlocal and global statement can lead to a few unique syntax errors.
 
    >>> def f():
@@ -1550,6 +1518,41 @@ def test_multiline_compiler_error_points_to_the_end(self):
             lineno=3
         )
 
+    @support.cpython_only
+    def test_syntax_error_on_deeply_nested_blocks(self):
+        # This raises a SyntaxError, it used to raise a SystemError. Context
+        # for this change can be found on issue #27514
+
+        # In 2.5 there was a missing exception and an assert was triggered in a
+        # debug build.  The number of blocks must be greater than CO_MAXBLOCKS.
+        # SF #1565514
+
+        source = """
+while 1:
+ while 2:
+  while 3:
+   while 4:
+    while 5:
+     while 6:
+      while 8:
+       while 9:
+        while 10:
+         while 11:
+          while 12:
+           while 13:
+            while 14:
+             while 15:
+              while 16:
+               while 17:
+                while 18:
+                 while 19:
+                  while 20:
+                   while 21:
+                    while 22:
+                     break
+"""
+        self._check_error(source, "too many statically nested blocks")
+
 
 def test_main():
     support.run_unittest(SyntaxTestCase)


From webhook-mailer at python.org  Sat Aug 28 14:54:53 2021
From: webhook-mailer at python.org (ambv)
Date: Sat, 28 Aug 2021 18:54:53 -0000
Subject: [Python-checkins] bpo-44962: Fix a race in WeakKeyDict,
 WeakValueDict and WeakSet when two threads attempt to commit the
 last pending removal (GH-27921) (GH-28014)
Message-ID: <mailman.1222.1630176894.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/166ad706066a2aad84d0ae5b1594c88904fbb939
commit: 166ad706066a2aad84d0ae5b1594c88904fbb939
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-28T20:54:48+02:00
summary:

bpo-44962: Fix a race in WeakKeyDict, WeakValueDict and WeakSet when two threads attempt to commit the last pending removal (GH-27921) (GH-28014)

Fixes:
Traceback (most recent call last):
  File "/home/graingert/projects/asyncio-demo/demo.py", line 36, in <module>
    sys.exit(main())
  File "/home/graingert/projects/asyncio-demo/demo.py", line 30, in main
    test_all_tasks_threading()
  File "/home/graingert/projects/asyncio-demo/demo.py", line 24, in test_all_tasks_threading
    results.append(f.result())
  File "/usr/lib/python3.10/concurrent/futures/_base.py", line 438, in result
    return self.__get_result()
  File "/usr/lib/python3.10/concurrent/futures/_base.py", line 390, in __get_result
    raise self._exception
  File "/usr/lib/python3.10/concurrent/futures/thread.py", line 52, in run
    result = self.fn(*self.args, **self.kwargs)
  File "/usr/lib/python3.10/asyncio/runners.py", line 47, in run
    _cancel_all_tasks(loop)
  File "/usr/lib/python3.10/asyncio/runners.py", line 56, in _cancel_all_tasks
    to_cancel = tasks.all_tasks(loop)
  File "/usr/lib/python3.10/asyncio/tasks.py", line 53, in all_tasks
    tasks = list(_all_tasks)
  File "/usr/lib/python3.10/_weakrefset.py", line 60, in __iter__
    with _IterationGuard(self):
  File "/usr/lib/python3.10/_weakrefset.py", line 33, in __exit__
    w._commit_removals()
  File "/usr/lib/python3.10/_weakrefset.py", line 57, in _commit_removals
    discard(l.pop())
IndexError: pop from empty list

Also fixes:
Exception ignored in: weakref callback <function WeakKeyDictionary.__init__.<locals>.remove at 0x00007fe82245d2e0>
Traceback (most recent call last):
  File "/usr/lib/pypy3/lib-python/3/weakref.py", line 390, in remove
    del self.data[k]
KeyError: <weakref at 0x00007fe76e8d8180; dead>
Exception ignored in: weakref callback <function WeakKeyDictionary.__init__.<locals>.remove at 0x00007fe82245d2e0>
Traceback (most recent call last):
  File "/usr/lib/pypy3/lib-python/3/weakref.py", line 390, in remove
    del self.data[k]
KeyError: <weakref at 0x00007fe76e8d81a0; dead>
Exception ignored in: weakref callback <function WeakKeyDictionary.__init__.<locals>.remove at 0x00007fe82245d2e0>
Traceback (most recent call last):
  File "/usr/lib/pypy3/lib-python/3/weakref.py", line 390, in remove
    del self.data[k]
KeyError: <weakref at 0x000056548f1e24a0; dead>

See: https://github.com/agronholm/anyio/issues/362GH-issuecomment-904424310
See also: https://bugs.python.org/issue29519

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 206b21ed9f64fedff67bfea7cf73e423e3e32393)

Co-authored-by: Thomas Grainger <tagrain at gmail.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2021-08-23-19-55-08.bpo-44962.J00ftt.rst
M Lib/_weakrefset.py
M Lib/weakref.py

diff --git a/Lib/_weakrefset.py b/Lib/_weakrefset.py
index b267780f0ced7..2a27684324d80 100644
--- a/Lib/_weakrefset.py
+++ b/Lib/_weakrefset.py
@@ -51,10 +51,14 @@ def _remove(item, selfref=ref(self)):
             self.update(data)
 
     def _commit_removals(self):
-        l = self._pending_removals
+        pop = self._pending_removals.pop
         discard = self.data.discard
-        while l:
-            discard(l.pop())
+        while True:
+            try:
+                item = pop()
+            except IndexError:
+                return
+            discard(item)
 
     def __iter__(self):
         with _IterationGuard(self):
diff --git a/Lib/weakref.py b/Lib/weakref.py
index a968139f98631..994ea8aa37de5 100644
--- a/Lib/weakref.py
+++ b/Lib/weakref.py
@@ -119,14 +119,17 @@ def remove(wr, selfref=ref(self), _atomic_removal=_remove_dead_weakref):
         self.data = {}
         self.update(other, **kw)
 
-    def _commit_removals(self):
-        l = self._pending_removals
+    def _commit_removals(self, _atomic_removal=_remove_dead_weakref):
+        pop = self._pending_removals.pop
         d = self.data
         # We shouldn't encounter any KeyError, because this method should
         # always be called *before* mutating the dict.
-        while l:
-            key = l.pop()
-            _remove_dead_weakref(d, key)
+        while True:
+            try:
+                key = pop()
+            except IndexError:
+                return
+            _atomic_removal(d, key)
 
     def __getitem__(self, key):
         if self._pending_removals:
@@ -370,7 +373,10 @@ def remove(k, selfref=ref(self)):
                 if self._iterating:
                     self._pending_removals.append(k)
                 else:
-                    del self.data[k]
+                    try:
+                        del self.data[k]
+                    except KeyError:
+                        pass
         self._remove = remove
         # A list of dead weakrefs (keys to be removed)
         self._pending_removals = []
@@ -384,11 +390,16 @@ def _commit_removals(self):
         # because a dead weakref never compares equal to a live weakref,
         # even if they happened to refer to equal objects.
         # However, it means keys may already have been removed.
-        l = self._pending_removals
+        pop = self._pending_removals.pop
         d = self.data
-        while l:
+        while True:
+            try:
+                key = pop()
+            except IndexError:
+                return
+
             try:
-                del d[l.pop()]
+                del d[key]
             except KeyError:
                 pass
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-23-19-55-08.bpo-44962.J00ftt.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-23-19-55-08.bpo-44962.J00ftt.rst
new file mode 100644
index 0000000000000..6b4b9dfd8bc3c
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-23-19-55-08.bpo-44962.J00ftt.rst	
@@ -0,0 +1 @@
+Fix a race in WeakKeyDictionary, WeakValueDictionary and WeakSet when two threads attempt to commit the last pending removal. This fixes asyncio.create_task and fixes a data loss in asyncio.run where shutdown_asyncgens is not run
\ No newline at end of file


From webhook-mailer at python.org  Sat Aug 28 15:24:10 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Sat, 28 Aug 2021 19:24:10 -0000
Subject: [Python-checkins] bpo-25130: Make unit-test about restricting the
 maximum number of nested blocks cpython-only (GH-28002) (GH-28016)
Message-ID: <mailman.1223.1630178651.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/779b9aef4fb2750f57ce07f0efbc8ce8406e43ab
commit: 779b9aef4fb2750f57ce07f0efbc8ce8406e43ab
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-28T22:24:02+03:00
summary:

bpo-25130: Make unit-test about restricting the maximum number of nested blocks cpython-only (GH-28002) (GH-28016)

PyPy and potentially other implementations have different or no
contraints on the number of blocks that can be statically nested. move
the test that checks for this behaviour into a unit test and mark it as
CPython-only.
(cherry picked from commit eb263f9a356f5c5f21b8d5ce20bac92f31c40cad)

Co-authored-by: Carl Friedrich Bolz-Tereick <cfbolz at gmx.de>

files:
M Lib/test/test_syntax.py

diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
index 43780ce273ef4..be8be898d0196 100644
--- a/Lib/test/test_syntax.py
+++ b/Lib/test/test_syntax.py
@@ -629,38 +629,6 @@
      ...
    SyntaxError: 'break' outside loop
 
-This raises a SyntaxError, it used to raise a SystemError.
-Context for this change can be found on issue #27514
-
-In 2.5 there was a missing exception and an assert was triggered in a debug
-build.  The number of blocks must be greater than CO_MAXBLOCKS.  SF #1565514
-
-   >>> while 1:
-   ...  while 2:
-   ...   while 3:
-   ...    while 4:
-   ...     while 5:
-   ...      while 6:
-   ...       while 8:
-   ...        while 9:
-   ...         while 10:
-   ...          while 11:
-   ...           while 12:
-   ...            while 13:
-   ...             while 14:
-   ...              while 15:
-   ...               while 16:
-   ...                while 17:
-   ...                 while 18:
-   ...                  while 19:
-   ...                   while 20:
-   ...                    while 21:
-   ...                     while 22:
-   ...                      break
-   Traceback (most recent call last):
-     ...
-   SyntaxError: too many statically nested blocks
-
 Misuse of the nonlocal and global statement can lead to a few unique syntax errors.
 
    >>> def f():
@@ -1550,6 +1518,41 @@ def test_multiline_compiler_error_points_to_the_end(self):
             lineno=3
         )
 
+    @support.cpython_only
+    def test_syntax_error_on_deeply_nested_blocks(self):
+        # This raises a SyntaxError, it used to raise a SystemError. Context
+        # for this change can be found on issue #27514
+
+        # In 2.5 there was a missing exception and an assert was triggered in a
+        # debug build.  The number of blocks must be greater than CO_MAXBLOCKS.
+        # SF #1565514
+
+        source = """
+while 1:
+ while 2:
+  while 3:
+   while 4:
+    while 5:
+     while 6:
+      while 8:
+       while 9:
+        while 10:
+         while 11:
+          while 12:
+           while 13:
+            while 14:
+             while 15:
+              while 16:
+               while 17:
+                while 18:
+                 while 19:
+                  while 20:
+                   while 21:
+                    while 22:
+                     break
+"""
+        self._check_error(source, "too many statically nested blocks")
+
 
 def test_main():
     support.run_unittest(SyntaxTestCase)


From webhook-mailer at python.org  Sat Aug 28 15:24:43 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Sat, 28 Aug 2021 19:24:43 -0000
Subject: [Python-checkins] [3.9] bpo-25130: Make unit-test about restricting
 the maximum number of nested blocks cpython-only (GH-28002) (GH-28017)
Message-ID: <mailman.1224.1630178683.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/1046cd06b0e2f20b3be93de83d49b684956af98d
commit: 1046cd06b0e2f20b3be93de83d49b684956af98d
branch: 3.9
author: Serhiy Storchaka <storchaka at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-28T22:24:39+03:00
summary:

[3.9] bpo-25130: Make unit-test about restricting the maximum number of nested blocks cpython-only (GH-28002) (GH-28017)

PyPy and potentially other implementations have different or no
contraints on the number of blocks that can be statically nested. move
the test that checks for this behaviour into a unit test and mark it as
CPython-only..
(cherry picked from commit eb263f9a356f5c5f21b8d5ce20bac92f31c40cad)

Co-authored-by: Carl Friedrich Bolz-Tereick <cfbolz at gmx.de>

files:
M Lib/test/test_syntax.py

diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
index f54b09f54f03d..eaa94ea92b5cd 100644
--- a/Lib/test/test_syntax.py
+++ b/Lib/test/test_syntax.py
@@ -531,38 +531,6 @@
      ...
    SyntaxError: 'break' outside loop
 
-This raises a SyntaxError, it used to raise a SystemError.
-Context for this change can be found on issue #27514
-
-In 2.5 there was a missing exception and an assert was triggered in a debug
-build.  The number of blocks must be greater than CO_MAXBLOCKS.  SF #1565514
-
-   >>> while 1:
-   ...  while 2:
-   ...   while 3:
-   ...    while 4:
-   ...     while 5:
-   ...      while 6:
-   ...       while 8:
-   ...        while 9:
-   ...         while 10:
-   ...          while 11:
-   ...           while 12:
-   ...            while 13:
-   ...             while 14:
-   ...              while 15:
-   ...               while 16:
-   ...                while 17:
-   ...                 while 18:
-   ...                  while 19:
-   ...                   while 20:
-   ...                    while 21:
-   ...                     while 22:
-   ...                      break
-   Traceback (most recent call last):
-     ...
-   SyntaxError: too many statically nested blocks
-
 Misuse of the nonlocal and global statement can lead to a few unique syntax errors.
 
    >>> def f():
@@ -995,6 +963,42 @@ def test_invalid_line_continuation_left_recursive(self):
         self._check_error("A.\u03bc\\\n",
                           "unexpected EOF while parsing")
 
+    @support.cpython_only
+    def test_syntax_error_on_deeply_nested_blocks(self):
+        # This raises a SyntaxError, it used to raise a SystemError. Context
+        # for this change can be found on issue #27514
+
+        # In 2.5 there was a missing exception and an assert was triggered in a
+        # debug build.  The number of blocks must be greater than CO_MAXBLOCKS.
+        # SF #1565514
+
+        source = """
+while 1:
+ while 2:
+  while 3:
+   while 4:
+    while 5:
+     while 6:
+      while 8:
+       while 9:
+        while 10:
+         while 11:
+          while 12:
+           while 13:
+            while 14:
+             while 15:
+              while 16:
+               while 17:
+                while 18:
+                 while 19:
+                  while 20:
+                   while 21:
+                    while 22:
+                     break
+"""
+        self._check_error(source, "too many statically nested blocks")
+
+
 def test_main():
     support.run_unittest(SyntaxTestCase)
     from test import test_syntax


From webhook-mailer at python.org  Sun Aug 29 06:08:11 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Sun, 29 Aug 2021 10:08:11 -0000
Subject: [Python-checkins] bpo-25130: Make SQLite tests more compatible with
 PyPy (GH-28021)
Message-ID: <mailman.1225.1630231692.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/07d3d54f4e84b1259b800884b202701f69e408d8
commit: 07d3d54f4e84b1259b800884b202701f69e408d8
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-29T13:07:40+03:00
summary:

bpo-25130: Make SQLite tests more compatible with PyPy (GH-28021)

files:
M Lib/sqlite3/test/dbapi.py
M Lib/sqlite3/test/regression.py

diff --git a/Lib/sqlite3/test/dbapi.py b/Lib/sqlite3/test/dbapi.py
index bb9d5a7ce3e001..aadecad32adb2b 100644
--- a/Lib/sqlite3/test/dbapi.py
+++ b/Lib/sqlite3/test/dbapi.py
@@ -476,6 +476,9 @@ class MyIter:
             def __init__(self):
                 self.value = 5
 
+            def __iter__(self):
+                return self
+
             def __next__(self):
                 if self.value == 10:
                     raise StopIteration
diff --git a/Lib/sqlite3/test/regression.py b/Lib/sqlite3/test/regression.py
index ddf36e71819445..4a422c8d43daa0 100644
--- a/Lib/sqlite3/test/regression.py
+++ b/Lib/sqlite3/test/regression.py
@@ -126,11 +126,11 @@ def test_type_map_usage(self):
         con = sqlite.connect(":memory:",detect_types=sqlite.PARSE_DECLTYPES)
         con.execute("create table foo(bar timestamp)")
         con.execute("insert into foo(bar) values (?)", (datetime.datetime.now(),))
-        con.execute(SELECT)
+        con.execute(SELECT).close()
         con.execute("drop table foo")
         con.execute("create table foo(bar integer)")
         con.execute("insert into foo(bar) values (5)")
-        con.execute(SELECT)
+        con.execute(SELECT).close()
 
     def test_bind_mutating_list(self):
         # Issue41662: Crash when mutate a list of parameters during iteration.


From webhook-mailer at python.org  Sun Aug 29 06:43:52 2021
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 29 Aug 2021 10:43:52 -0000
Subject: [Python-checkins] bpo-25130: Make SQLite tests more compatible with
 PyPy (GH-28021)
Message-ID: <mailman.1226.1630233833.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/a49398b643b3a2e6f9cc39729c528eb1e4385b1a
commit: a49398b643b3a2e6f9cc39729c528eb1e4385b1a
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-29T03:43:48-07:00
summary:

bpo-25130: Make SQLite tests more compatible with PyPy (GH-28021)

(cherry picked from commit 07d3d54f4e84b1259b800884b202701f69e408d8)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
M Lib/sqlite3/test/dbapi.py
M Lib/sqlite3/test/regression.py

diff --git a/Lib/sqlite3/test/dbapi.py b/Lib/sqlite3/test/dbapi.py
index 5d521d0cce5e1..a8dcd7e8bfedd 100644
--- a/Lib/sqlite3/test/dbapi.py
+++ b/Lib/sqlite3/test/dbapi.py
@@ -398,6 +398,9 @@ class MyIter:
             def __init__(self):
                 self.value = 5
 
+            def __iter__(self):
+                return self
+
             def __next__(self):
                 if self.value == 10:
                     raise StopIteration
diff --git a/Lib/sqlite3/test/regression.py b/Lib/sqlite3/test/regression.py
index 417a53109c87c..70d0ff9af1071 100644
--- a/Lib/sqlite3/test/regression.py
+++ b/Lib/sqlite3/test/regression.py
@@ -125,11 +125,11 @@ def test_type_map_usage(self):
         con = sqlite.connect(":memory:",detect_types=sqlite.PARSE_DECLTYPES)
         con.execute("create table foo(bar timestamp)")
         con.execute("insert into foo(bar) values (?)", (datetime.datetime.now(),))
-        con.execute(SELECT)
+        con.execute(SELECT).close()
         con.execute("drop table foo")
         con.execute("create table foo(bar integer)")
         con.execute("insert into foo(bar) values (5)")
-        con.execute(SELECT)
+        con.execute(SELECT).close()
 
     def test_bind_mutating_list(self):
         # Issue41662: Crash when mutate a list of parameters during iteration.


From webhook-mailer at python.org  Sun Aug 29 07:03:15 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Sun, 29 Aug 2021 11:03:15 -0000
Subject: [Python-checkins] [3.9] bpo-25130: Make SQLite tests more
 compatible with PyPy (GH-28021) (GH-28023)
Message-ID: <mailman.1227.1630234996.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/dab74d68e3f8391cb4b404b397ab80e2e0188d1f
commit: dab74d68e3f8391cb4b404b397ab80e2e0188d1f
branch: 3.9
author: Serhiy Storchaka <storchaka at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-29T14:03:11+03:00
summary:

[3.9] bpo-25130: Make SQLite tests more compatible with PyPy (GH-28021) (GH-28023)

(cherry picked from commit 07d3d54)

files:
M Lib/sqlite3/test/backup.py
M Lib/sqlite3/test/dbapi.py
M Lib/sqlite3/test/regression.py

diff --git a/Lib/sqlite3/test/backup.py b/Lib/sqlite3/test/backup.py
index ad1da9721527c2..6a772c64b2dfbc 100644
--- a/Lib/sqlite3/test/backup.py
+++ b/Lib/sqlite3/test/backup.py
@@ -150,7 +150,8 @@ def test_database_source_name(self):
                 self.cx.backup(bck, name='non-existing')
         self.assertIn(
             str(cm.exception),
-            ['SQL logic error', 'SQL logic error or missing database']
+            ['SQL logic error', 'SQL logic error or missing database',
+             'unknown database non-existing']
         )
 
         self.cx.execute("ATTACH DATABASE ':memory:' AS attached_db")
diff --git a/Lib/sqlite3/test/dbapi.py b/Lib/sqlite3/test/dbapi.py
index 38e9fbd9d1dd60..d00b60cac4e389 100644
--- a/Lib/sqlite3/test/dbapi.py
+++ b/Lib/sqlite3/test/dbapi.py
@@ -395,6 +395,9 @@ class MyIter:
             def __init__(self):
                 self.value = 5
 
+            def __iter__(self):
+                return self
+
             def __next__(self):
                 if self.value == 10:
                     raise StopIteration
diff --git a/Lib/sqlite3/test/regression.py b/Lib/sqlite3/test/regression.py
index 6aa86d5766e568..6ba33564795536 100644
--- a/Lib/sqlite3/test/regression.py
+++ b/Lib/sqlite3/test/regression.py
@@ -127,11 +127,11 @@ def CheckTypeMapUsage(self):
         con = sqlite.connect(":memory:",detect_types=sqlite.PARSE_DECLTYPES)
         con.execute("create table foo(bar timestamp)")
         con.execute("insert into foo(bar) values (?)", (datetime.datetime.now(),))
-        con.execute(SELECT)
+        con.execute(SELECT).close()
         con.execute("drop table foo")
         con.execute("create table foo(bar integer)")
         con.execute("insert into foo(bar) values (5)")
-        con.execute(SELECT)
+        con.execute(SELECT).close()
 
     def CheckBindMutatingList(self):
         # Issue41662: Crash when mutate a list of parameters during iteration.


From webhook-mailer at python.org  Sun Aug 29 07:04:44 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Sun, 29 Aug 2021 11:04:44 -0000
Subject: [Python-checkins] bpo-25130: Add calls of gc.collect() in tests to
 support PyPy (GH-28005)
Message-ID: <mailman.1228.1630235084.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/2a8127cafe1d196f858a3ecabf5f1df3eebf9a12
commit: 2a8127cafe1d196f858a3ecabf5f1df3eebf9a12
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-29T14:04:40+03:00
summary:

bpo-25130: Add calls of gc.collect() in tests to support PyPy (GH-28005)

files:
A Misc/NEWS.d/next/Tests/2021-08-27-22-37-19.bpo-25130.ig4oJe.rst
M Lib/test/_test_multiprocessing.py
M Lib/test/lock_tests.py
M Lib/test/test_array.py
M Lib/test/test_asyncgen.py
M Lib/test/test_asyncio/test_tasks.py
M Lib/test/test_code.py
M Lib/test/test_concurrent_futures.py
M Lib/test/test_copy.py
M Lib/test/test_deque.py
M Lib/test/test_enum.py
M Lib/test/test_exceptions.py
M Lib/test/test_file.py
M Lib/test/test_fileio.py
M Lib/test/test_functools.py
M Lib/test/test_generators.py
M Lib/test/test_io.py
M Lib/test/test_itertools.py
M Lib/test/test_queue.py
M Lib/test/test_raise.py
M Lib/test/test_scope.py
M Lib/test/test_set.py
M Lib/test/test_socket.py
M Lib/test/test_subprocess.py
M Lib/test/test_tempfile.py
M Lib/test/test_thread.py
M Lib/test/test_threading_local.py
M Lib/test/test_weakref.py
M Lib/test/test_weakset.py
M Lib/test/test_xml_etree.py
M Lib/tkinter/test/test_tkinter/test_images.py
M Lib/tkinter/test/test_tkinter/test_variables.py
M Lib/tkinter/test/test_ttk/test_extensions.py
M Lib/tkinter/test/test_ttk/test_widgets.py
M Lib/unittest/test/test_assertions.py
M Lib/unittest/test/test_case.py

diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index 4c4da24a30c37..7e0b757109766 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -611,6 +611,7 @@ def test_lose_target_ref(self):
         del c
         p.start()
         p.join()
+        gc.collect()  # For PyPy or other GCs.
         self.assertIs(wr(), None)
         self.assertEqual(q.get(), 5)
         close_queue(q)
@@ -2667,6 +2668,7 @@ def test_release_task_refs(self):
         self.pool.map(identity, objs)
 
         del objs
+        gc.collect()  # For PyPy or other GCs.
         time.sleep(DELTA)  # let threaded cleanup code run
         self.assertEqual(set(wr() for wr in refs), {None})
         # With a process pool, copies of the objects are returned, check
@@ -4198,6 +4200,7 @@ def setUp(self):
         util._finalizer_registry.clear()
 
     def tearDown(self):
+        gc.collect()  # For PyPy or other GCs.
         self.assertFalse(util._finalizer_registry)
         util._finalizer_registry.update(self.registry_backup)
 
@@ -4209,12 +4212,14 @@ class Foo(object):
         a = Foo()
         util.Finalize(a, conn.send, args=('a',))
         del a           # triggers callback for a
+        gc.collect()  # For PyPy or other GCs.
 
         b = Foo()
         close_b = util.Finalize(b, conn.send, args=('b',))
         close_b()       # triggers callback for b
         close_b()       # does nothing because callback has already been called
         del b           # does nothing because callback has already been called
+        gc.collect()  # For PyPy or other GCs.
 
         c = Foo()
         util.Finalize(c, conn.send, args=('c',))
diff --git a/Lib/test/lock_tests.py b/Lib/test/lock_tests.py
index d69bcc9496843..dffb7d4418dfe 100644
--- a/Lib/test/lock_tests.py
+++ b/Lib/test/lock_tests.py
@@ -3,6 +3,7 @@
 """
 
 import os
+import gc
 import sys
 import time
 from _thread import start_new_thread, TIMEOUT_MAX
@@ -221,6 +222,7 @@ def test_weakref_deleted(self):
         lock = self.locktype()
         ref = weakref.ref(lock)
         del lock
+        gc.collect()  # For PyPy or other GCs.
         self.assertIsNone(ref())
 
 
diff --git a/Lib/test/test_array.py b/Lib/test/test_array.py
old mode 100644
new mode 100755
index 18f78d52467e2..6a48c1cc97572
--- a/Lib/test/test_array.py
+++ b/Lib/test/test_array.py
@@ -1097,6 +1097,7 @@ def test_weakref(self):
         p = weakref.proxy(s)
         self.assertEqual(p.tobytes(), s.tobytes())
         s = None
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertRaises(ReferenceError, len, p)
 
     @unittest.skipUnless(hasattr(sys, 'getrefcount'),
diff --git a/Lib/test/test_asyncgen.py b/Lib/test/test_asyncgen.py
index 77c15c02bc891..a557cb570514d 100644
--- a/Lib/test/test_asyncgen.py
+++ b/Lib/test/test_asyncgen.py
@@ -3,6 +3,7 @@
 import unittest
 
 from test.support.import_helper import import_module
+from test.support import gc_collect
 asyncio = import_module("asyncio")
 
 
@@ -871,6 +872,7 @@ async def run():
             await g.__anext__()
             await g.__anext__()
             del g
+            gc_collect()  # For PyPy or other GCs.
 
             await asyncio.sleep(0.1)
 
diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py
index de003737f906e..92b1a43500311 100644
--- a/Lib/test/test_asyncio/test_tasks.py
+++ b/Lib/test/test_asyncio/test_tasks.py
@@ -2307,6 +2307,7 @@ async def coro():
                 self.new_task(self.loop, gen)
             finally:
                 gen.close()
+        gc.collect()  # For PyPy or other GCs.
 
         self.assertTrue(m_log.error.called)
         message = m_log.error.call_args[0][0]
diff --git a/Lib/test/test_code.py b/Lib/test/test_code.py
index 66c84a953cb3d..64fd10da1ef21 100644
--- a/Lib/test/test_code.py
+++ b/Lib/test/test_code.py
@@ -137,7 +137,8 @@
 except ImportError:
     ctypes = None
 from test.support import (run_doctest, run_unittest, cpython_only,
-                          check_impl_detail, requires_debug_ranges)
+                          check_impl_detail, requires_debug_ranges,
+                          gc_collect)
 from test.support.script_helper import assert_python_ok
 
 
@@ -510,6 +511,7 @@ def callback(code):
         coderef = weakref.ref(f.__code__, callback)
         self.assertTrue(bool(coderef()))
         del f
+        gc_collect()  # For PyPy or other GCs.
         self.assertFalse(bool(coderef()))
         self.assertTrue(self.called)
 
diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py
index 99651f5f4ed4d..eae98d690bd97 100644
--- a/Lib/test/test_concurrent_futures.py
+++ b/Lib/test/test_concurrent_futures.py
@@ -463,6 +463,7 @@ def test_thread_names_assigned(self):
         executor.map(abs, range(-5, 5))
         threads = executor._threads
         del executor
+        support.gc_collect()  # For PyPy or other GCs.
 
         for t in threads:
             self.assertRegex(t.name, r'^SpecialPool_[0-4]$')
@@ -473,6 +474,7 @@ def test_thread_names_default(self):
         executor.map(abs, range(-5, 5))
         threads = executor._threads
         del executor
+        support.gc_collect()  # For PyPy or other GCs.
 
         for t in threads:
             # Ensure that our default name is reasonably sane and unique when
@@ -535,6 +537,7 @@ def test_del_shutdown(self):
         call_queue = executor._call_queue
         executor_manager_thread = executor._executor_manager_thread
         del executor
+        support.gc_collect()  # For PyPy or other GCs.
 
         # Make sure that all the executor resources were properly cleaned by
         # the shutdown process
@@ -759,6 +762,7 @@ def test_free_reference_yielded_future(self):
                 futures_list.remove(future)
                 wr = weakref.ref(future)
                 del future
+                support.gc_collect()  # For PyPy or other GCs.
                 self.assertIsNone(wr())
 
         futures_list[0].set_result("test")
@@ -766,6 +770,7 @@ def test_free_reference_yielded_future(self):
             futures_list.remove(future)
             wr = weakref.ref(future)
             del future
+            support.gc_collect()  # For PyPy or other GCs.
             self.assertIsNone(wr())
             if futures_list:
                 futures_list[0].set_result("test")
@@ -865,6 +870,7 @@ def test_free_reference(self):
         for obj in self.executor.map(make_dummy_object, range(10)):
             wr = weakref.ref(obj)
             del obj
+            support.gc_collect()  # For PyPy or other GCs.
             self.assertIsNone(wr())
 
 
diff --git a/Lib/test/test_copy.py b/Lib/test/test_copy.py
index ba3d233f63d1c..f1ca8cb254d18 100644
--- a/Lib/test/test_copy.py
+++ b/Lib/test/test_copy.py
@@ -7,6 +7,7 @@
 from operator import le, lt, ge, gt, eq, ne
 
 import unittest
+from test import support
 
 order_comparisons = le, lt, ge, gt
 equality_comparisons = eq, ne
@@ -805,6 +806,7 @@ class C(object):
         self.assertEqual(v[c], d)
         self.assertEqual(len(v), 2)
         del c, d
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertEqual(len(v), 1)
         x, y = C(), C()
         # The underlying containers are decoupled
@@ -834,6 +836,7 @@ def __init__(self, i):
         self.assertEqual(v[a].i, b.i)
         self.assertEqual(v[c].i, d.i)
         del c
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertEqual(len(v), 1)
 
     def test_deepcopy_weakvaluedict(self):
@@ -857,6 +860,7 @@ def __init__(self, i):
         self.assertIs(t, d)
         del x, y, z, t
         del d
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertEqual(len(v), 1)
 
     def test_deepcopy_bound_method(self):
diff --git a/Lib/test/test_deque.py b/Lib/test/test_deque.py
index ffe0e204a0e8c..20cfc88b16031 100644
--- a/Lib/test/test_deque.py
+++ b/Lib/test/test_deque.py
@@ -870,6 +870,7 @@ def test_weakref(self):
         p = weakref.proxy(d)
         self.assertEqual(str(p), str(d))
         d = None
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertRaises(ReferenceError, str, p)
 
     def test_strange_subclass(self):
diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py
index 52d7756da98bd..7d220871a35cc 100644
--- a/Lib/test/test_enum.py
+++ b/Lib/test/test_enum.py
@@ -2044,6 +2044,7 @@ def _missing_(cls, item):
             raise Exception('Exception not raised.')
 
     def test_missing_exceptions_reset(self):
+        import gc
         import weakref
         #
         class TestEnum(enum.Enum):
@@ -2070,8 +2071,9 @@ def __init__(self):
         class_2_ref = weakref.ref(Class2())
         #
         # The exception raised by Enum creates a reference loop and thus
-        # Class2 instances will stick around until the next gargage collection
+        # Class2 instances will stick around until the next garbage collection
         # cycle, unlike Class1.
+        gc.collect()  # For PyPy or other GCs.
         self.assertIs(class_1_ref(), None)
         self.assertIs(class_2_ref(), None)
 
diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index ce7b86880e69f..6141f2e8f62b0 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -656,6 +656,7 @@ def inner_raising_func():
         except MyException as e:
             pass
         obj = None
+        gc_collect()  # For PyPy or other GCs.
         obj = wr()
         self.assertIsNone(obj)
 
@@ -667,6 +668,7 @@ def inner_raising_func():
         except MyException:
             pass
         obj = None
+        gc_collect()  # For PyPy or other GCs.
         obj = wr()
         self.assertIsNone(obj)
 
@@ -678,6 +680,7 @@ def inner_raising_func():
         except:
             pass
         obj = None
+        gc_collect()  # For PyPy or other GCs.
         obj = wr()
         self.assertIsNone(obj)
 
@@ -690,6 +693,7 @@ def inner_raising_func():
             except:
                 break
         obj = None
+        gc_collect()  # For PyPy or other GCs.
         obj = wr()
         self.assertIsNone(obj)
 
@@ -708,6 +712,7 @@ def inner_raising_func():
             # must clear the latter manually for our test to succeed.
             e.__context__ = None
             obj = None
+            gc_collect()  # For PyPy or other GCs.
             obj = wr()
             # guarantee no ref cycles on CPython (don't gc_collect)
             if check_impl_detail(cpython=False):
@@ -898,6 +903,7 @@ def raising_gen():
         next(g)
         testfunc(g)
         g = obj = None
+        gc_collect()  # For PyPy or other GCs.
         obj = wr()
         self.assertIsNone(obj)
 
@@ -951,6 +957,7 @@ def __del__(self):
             raise Exception(MyObject())
         except:
             pass
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(e, (None, None, None))
 
     def test_raise_does_not_create_context_chain_cycle(self):
@@ -1413,6 +1420,7 @@ def inner():
             self.assertNotEqual(wr(), None)
         else:
             self.fail("MemoryError not raised")
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(wr(), None)
 
     @no_tracing
@@ -1433,6 +1441,7 @@ def inner():
             self.assertNotEqual(wr(), None)
         else:
             self.fail("RecursionError not raised")
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(wr(), None)
 
     def test_errno_ENOTDIR(self):
@@ -1453,6 +1462,7 @@ def __del__(self):
         with support.catch_unraisable_exception() as cm:
             del obj
 
+            gc_collect()  # For PyPy or other GCs.
             self.assertEqual(cm.unraisable.object, BrokenDel.__del__)
             self.assertIsNotNone(cm.unraisable.exc_traceback)
 
diff --git a/Lib/test/test_file.py b/Lib/test/test_file.py
index 1ec756f334d28..1146a37323c9b 100644
--- a/Lib/test/test_file.py
+++ b/Lib/test/test_file.py
@@ -7,6 +7,7 @@
 import io
 import _pyio as pyio
 
+from test.support import gc_collect
 from test.support.os_helper import TESTFN
 from test.support import os_helper
 from test.support import warnings_helper
@@ -30,6 +31,7 @@ def testWeakRefs(self):
         self.assertEqual(self.f.tell(), p.tell())
         self.f.close()
         self.f = None
+        gc_collect()  # For PyPy or other GCs.
         self.assertRaises(ReferenceError, getattr, p, 'tell')
 
     def testAttributes(self):
diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py
index ff611a90eede3..cdca5a8599655 100644
--- a/Lib/test/test_fileio.py
+++ b/Lib/test/test_fileio.py
@@ -9,7 +9,7 @@
 from weakref import proxy
 from functools import wraps
 
-from test.support import (run_unittest, cpython_only, swap_attr)
+from test.support import run_unittest, cpython_only, swap_attr, gc_collect
 from test.support.os_helper import (TESTFN, TESTFN_UNICODE, make_bad_fd)
 from test.support.warnings_helper import check_warnings
 from collections import UserList
@@ -36,6 +36,7 @@ def testWeakRefs(self):
         self.assertEqual(self.f.tell(), p.tell())
         self.f.close()
         self.f = None
+        gc_collect()  # For PyPy or other GCs.
         self.assertRaises(ReferenceError, getattr, p, 'tell')
 
     def testSeekTell(self):
diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py
index fbf5578872e6b..fece8256a3e26 100644
--- a/Lib/test/test_functools.py
+++ b/Lib/test/test_functools.py
@@ -167,6 +167,7 @@ def test_weakref(self):
         p = proxy(f)
         self.assertEqual(f.func, p.func)
         f = None
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertRaises(ReferenceError, getattr, p, 'func')
 
     def test_with_bound_and_unbound_methods(self):
diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py
index 53d579e723c47..d14c757c7b6e4 100644
--- a/Lib/test/test_generators.py
+++ b/Lib/test/test_generators.py
@@ -1966,6 +1966,8 @@ def printsolution(self, x):
 """
 
 coroutine_tests = """\
+>>> from test.support import gc_collect
+
 Sending a value into a started generator:
 
 >>> def f():
@@ -2189,7 +2191,7 @@ def printsolution(self, x):
 
 >>> g = f()
 >>> next(g)
->>> del g
+>>> del g; gc_collect()  # For PyPy or other GCs.
 exiting
 
 
@@ -2204,7 +2206,7 @@ def printsolution(self, x):
 
 >>> g = f()
 >>> next(g)
->>> del g
+>>> del g; gc_collect()  # For PyPy or other GCs.
 finally
 
 
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index 32c29ea5dc4a7..273545a2a2cbb 100644
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -4372,6 +4372,31 @@ def check_interrupted_write(self, item, bytes, **fdopen_kwargs):
         """Check that a partial write, when it gets interrupted, properly
         invokes the signal handler, and bubbles up the exception raised
         in the latter."""
+
+        # XXX This test has three flaws that appear when objects are
+        # XXX not reference counted.
+
+        # - if wio.write() happens to trigger a garbage collection,
+        #   the signal exception may be raised when some __del__
+        #   method is running; it will not reach the assertRaises()
+        #   call.
+
+        # - more subtle, if the wio object is not destroyed at once
+        #   and survives this function, the next opened file is likely
+        #   to have the same fileno (since the file descriptor was
+        #   actively closed).  When wio.__del__ is finally called, it
+        #   will close the other's test file...  To trigger this with
+        #   CPython, try adding "global wio" in this function.
+
+        # - This happens only for streams created by the _pyio module,
+        #   because a wio.close() that fails still consider that the
+        #   file needs to be closed again.  You can try adding an
+        #   "assert wio.closed" at the end of the function.
+
+        # Fortunately, a little gc.collect() seems to be enough to
+        # work around all these issues.
+        support.gc_collect()  # For PyPy or other GCs.
+
         read_results = []
         def _read():
             s = os.read(r, 1)
diff --git a/Lib/test/test_itertools.py b/Lib/test/test_itertools.py
index a99b5e2bb71db..4019af05e028c 100644
--- a/Lib/test/test_itertools.py
+++ b/Lib/test/test_itertools.py
@@ -1442,6 +1442,7 @@ def test_tee(self):
         p = weakref.proxy(a)
         self.assertEqual(getattr(p, '__class__'), type(b))
         del a
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertRaises(ReferenceError, getattr, p, '__class__')
 
         ans = list('abc')
diff --git a/Lib/test/test_queue.py b/Lib/test/test_queue.py
index 508b739019593..9bb5181377698 100644
--- a/Lib/test/test_queue.py
+++ b/Lib/test/test_queue.py
@@ -6,6 +6,7 @@
 import time
 import unittest
 import weakref
+from test.support import gc_collect
 from test.support import import_helper
 from test.support import threading_helper
 
@@ -590,6 +591,7 @@ class C:
             q.put(C())
         for i in range(N):
             wr = weakref.ref(q.get())
+            gc_collect()  # For PyPy or other GCs.
             self.assertIsNone(wr())
 
 
diff --git a/Lib/test/test_raise.py b/Lib/test/test_raise.py
index 57da0e15a756b..8dc62a933e872 100644
--- a/Lib/test/test_raise.py
+++ b/Lib/test/test_raise.py
@@ -438,6 +438,7 @@ def f():
         f()
 
     def test_3611(self):
+        import gc
         # A re-raised exception in a __del__ caused the __context__
         # to be cleared
         class C:
@@ -451,9 +452,11 @@ def f():
             x = C()
             try:
                 try:
-                    x.x
+                    f.x
                 except AttributeError:
+                    # make x.__del__ trigger
                     del x
+                    gc.collect()  # For PyPy or other GCs.
                     raise TypeError
             except Exception as e:
                 self.assertNotEqual(e.__context__, None)
diff --git a/Lib/test/test_scope.py b/Lib/test/test_scope.py
index 29d60ffe53f03..6e46dfa96a664 100644
--- a/Lib/test/test_scope.py
+++ b/Lib/test/test_scope.py
@@ -2,6 +2,7 @@
 import weakref
 
 from test.support import check_syntax_error, cpython_only
+from test.support import gc_collect
 
 
 class ScopeTests(unittest.TestCase):
@@ -473,6 +474,7 @@ def f2():
         for i in range(100):
             f1()
 
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(Foo.count, 0)
 
     def testClassAndGlobal(self):
@@ -805,6 +807,7 @@ def dig(self):
         tester.dig()
         ref = weakref.ref(tester)
         del tester
+        gc_collect()  # For PyPy or other GCs.
         self.assertIsNone(ref())
 
 
diff --git a/Lib/test/test_set.py b/Lib/test/test_set.py
index b1fab0f6207f4..29bb39df76c8a 100644
--- a/Lib/test/test_set.py
+++ b/Lib/test/test_set.py
@@ -593,6 +593,7 @@ def test_weakref(self):
         p = weakref.proxy(s)
         self.assertEqual(str(p), str(s))
         s = None
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertRaises(ReferenceError, str, p)
 
     def test_rich_compare(self):
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index c09f11e0f000f..7ac92608f7ce8 100755
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -870,6 +870,7 @@ def test_weakref(self):
             p = proxy(s)
             self.assertEqual(p.fileno(), s.fileno())
         s = None
+        support.gc_collect()  # For PyPy or other GCs.
         try:
             p.fileno()
         except ReferenceError:
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 94a95c7a00bf2..87967ca7f3c93 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -3026,6 +3026,7 @@ def test_leak_fast_process_del_killed(self):
         pid = p.pid
         with warnings_helper.check_warnings(('', ResourceWarning)):
             p = None
+            support.gc_collect()  # For PyPy or other GCs.
 
         os.kill(pid, signal.SIGKILL)
         if mswindows:
diff --git a/Lib/test/test_tempfile.py b/Lib/test/test_tempfile.py
index 3a3f6a999ce0a..f1d483733e267 100644
--- a/Lib/test/test_tempfile.py
+++ b/Lib/test/test_tempfile.py
@@ -430,6 +430,7 @@ def test_choose_directory(self):
             self.do_create(dir=dir).write(b"blat")
             self.do_create(dir=pathlib.Path(dir)).write(b"blat")
         finally:
+            support.gc_collect()  # For PyPy or other GCs.
             os.rmdir(dir)
 
     def test_file_mode(self):
@@ -880,6 +881,8 @@ def test_many(self):
         extant = list(range(TEST_FILES))
         for i in extant:
             extant[i] = self.do_create(pre="aa")
+        del extant
+        support.gc_collect()  # For PyPy or other GCs.
 
 ##     def test_warning(self):
 ##         # mktemp issues a warning when used
diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py
index 62b57fa338837..4ae8a833b990d 100644
--- a/Lib/test/test_thread.py
+++ b/Lib/test/test_thread.py
@@ -132,6 +132,7 @@ def task():
             del task
             while not done:
                 time.sleep(POLL_SLEEP)
+                support.gc_collect()  # For PyPy or other GCs.
             self.assertEqual(thread._count(), orig)
 
     def test_unraisable_exception(self):
diff --git a/Lib/test/test_threading_local.py b/Lib/test/test_threading_local.py
index 9862094eaccd8..13facb513367a 100644
--- a/Lib/test/test_threading_local.py
+++ b/Lib/test/test_threading_local.py
@@ -37,7 +37,7 @@ def _local_refs(self, n):
             t.join()
         del t
 
-        gc.collect()
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertEqual(len(weaklist), n)
 
         # XXX _threading_local keeps the local of the last stopped thread alive.
@@ -46,7 +46,7 @@ def _local_refs(self, n):
 
         # Assignment to the same thread local frees it sometimes (!)
         local.someothervar = None
-        gc.collect()
+        support.gc_collect()  # For PyPy or other GCs.
         deadlist = [weak for weak in weaklist if weak() is None]
         self.assertIn(len(deadlist), (n-1, n), (n, len(deadlist)))
 
@@ -89,7 +89,7 @@ def f():
             # 2) GC the cycle (triggers threadmodule.c::local_clear
             # before local_dealloc)
             del cycle
-            gc.collect()
+            support.gc_collect()  # For PyPy or other GCs.
             e1.set()
             e2.wait()
 
@@ -190,7 +190,7 @@ class X:
         x.local.x = x
         wr = weakref.ref(x)
         del x
-        gc.collect()
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertIsNone(wr())
 
 
diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py
index 1a5314ccff315..5a3e59c3e9ef1 100644
--- a/Lib/test/test_weakref.py
+++ b/Lib/test/test_weakref.py
@@ -12,6 +12,7 @@
 
 from test import support
 from test.support import script_helper, ALWAYS_EQ
+from test.support import gc_collect
 
 # Used in ReferencesTestCase.test_ref_created_during_del() .
 ref_from_del = None
@@ -135,6 +136,7 @@ def test_multiple_callbacks(self):
         ref1 = weakref.ref(o, self.callback)
         ref2 = weakref.ref(o, self.callback)
         del o
+        gc_collect()  # For PyPy or other GCs.
         self.assertIsNone(ref1(), "expected reference to be invalidated")
         self.assertIsNone(ref2(), "expected reference to be invalidated")
         self.assertEqual(self.cbcalled, 2,
@@ -168,13 +170,16 @@ def test_proxy_ref(self):
         ref1 = weakref.proxy(o, self.callback)
         ref2 = weakref.proxy(o, self.callback)
         del o
+        gc_collect()  # For PyPy or other GCs.
 
         def check(proxy):
             proxy.bar
 
         self.assertRaises(ReferenceError, check, ref1)
         self.assertRaises(ReferenceError, check, ref2)
-        self.assertRaises(ReferenceError, bool, weakref.proxy(C()))
+        ref3 = weakref.proxy(C())
+        gc_collect()  # For PyPy or other GCs.
+        self.assertRaises(ReferenceError, bool, ref3)
         self.assertEqual(self.cbcalled, 2)
 
     def check_basic_ref(self, factory):
@@ -191,6 +196,7 @@ def check_basic_callback(self, factory):
         o = factory()
         ref = weakref.ref(o, self.callback)
         del o
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(self.cbcalled, 1,
                      "callback did not properly set 'cbcalled'")
         self.assertIsNone(ref(),
@@ -215,6 +221,7 @@ def test_ref_reuse(self):
         self.assertEqual(weakref.getweakrefcount(o), 2,
                      "wrong weak ref count for object")
         del proxy
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(weakref.getweakrefcount(o), 1,
                      "wrong weak ref count for object after deleting proxy")
 
@@ -480,6 +487,7 @@ def test_getweakrefcount(self):
                      "got wrong number of weak reference objects")
 
         del ref1, ref2, proxy1, proxy2
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(weakref.getweakrefcount(o), 0,
                      "weak reference objects not unlinked from"
                      " referent when discarded.")
@@ -493,6 +501,7 @@ def test_getweakrefs(self):
         ref1 = weakref.ref(o, self.callback)
         ref2 = weakref.ref(o, self.callback)
         del ref1
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(weakref.getweakrefs(o), [ref2],
                      "list of refs does not match")
 
@@ -500,10 +509,12 @@ def test_getweakrefs(self):
         ref1 = weakref.ref(o, self.callback)
         ref2 = weakref.ref(o, self.callback)
         del ref2
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(weakref.getweakrefs(o), [ref1],
                      "list of refs does not match")
 
         del ref1
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(weakref.getweakrefs(o), [],
                      "list of refs not cleared")
 
@@ -989,6 +1000,7 @@ def __call__(self):
         self.assertTrue(mr.called)
         self.assertEqual(mr.value, 24)
         del o
+        gc_collect()  # For PyPy or other GCs.
         self.assertIsNone(mr())
         self.assertTrue(mr.called)
 
@@ -1291,15 +1303,18 @@ def test_weak_values(self):
         del items1, items2
         self.assertEqual(len(dict), self.COUNT)
         del objects[0]
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(len(dict), self.COUNT - 1,
                      "deleting object did not cause dictionary update")
         del objects, o
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(len(dict), 0,
                      "deleting the values did not clear the dictionary")
         # regression on SF bug #447152:
         dict = weakref.WeakValueDictionary()
         self.assertRaises(KeyError, dict.__getitem__, 1)
         dict[2] = C()
+        gc_collect()  # For PyPy or other GCs.
         self.assertRaises(KeyError, dict.__getitem__, 2)
 
     def test_weak_keys(self):
@@ -1320,9 +1335,11 @@ def test_weak_keys(self):
         del items1, items2
         self.assertEqual(len(dict), self.COUNT)
         del objects[0]
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(len(dict), (self.COUNT - 1),
                      "deleting object did not cause dictionary update")
         del objects, o
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(len(dict), 0,
                      "deleting the keys did not clear the dictionary")
         o = Object(42)
@@ -1821,6 +1838,7 @@ def __eq__(self, other):
         for o in objs:
             count += 1
             del d[o]
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(len(d), 0)
         self.assertEqual(count, 2)
 
@@ -2129,6 +2147,7 @@ def test_atexit(self):
 
 libreftest = """ Doctest for examples in the library reference: weakref.rst
 
+>>> from test.support import gc_collect
 >>> import weakref
 >>> class Dict(dict):
 ...     pass
@@ -2148,6 +2167,7 @@ def test_atexit(self):
 >>> o is o2
 True
 >>> del o, o2
+>>> gc_collect()  # For PyPy or other GCs.
 >>> print(r())
 None
 
@@ -2200,6 +2220,7 @@ def test_atexit(self):
 >>> id2obj(a_id) is a
 True
 >>> del a
+>>> gc_collect()  # For PyPy or other GCs.
 >>> try:
 ...     id2obj(a_id)
 ... except KeyError:
diff --git a/Lib/test/test_weakset.py b/Lib/test/test_weakset.py
index 49a9b5c3c658a..9b31d5fce3472 100644
--- a/Lib/test/test_weakset.py
+++ b/Lib/test/test_weakset.py
@@ -5,6 +5,7 @@
 from collections.abc import Set, MutableSet
 import gc
 import contextlib
+from test import support
 
 
 class Foo:
@@ -48,6 +49,7 @@ def test_len(self):
         self.assertEqual(len(self.s), len(self.d))
         self.assertEqual(len(self.fs), 1)
         del self.obj
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertEqual(len(self.fs), 0)
 
     def test_contains(self):
@@ -57,6 +59,7 @@ def test_contains(self):
         self.assertNotIn(1, self.s)
         self.assertIn(self.obj, self.fs)
         del self.obj
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertNotIn(ustr('F'), self.fs)
 
     def test_union(self):
@@ -215,6 +218,7 @@ def test_add(self):
         self.assertEqual(self.s, dup)
         self.assertRaises(TypeError, self.s.add, [])
         self.fs.add(Foo())
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertTrue(len(self.fs) == 1)
         self.fs.add(self.obj)
         self.assertTrue(len(self.fs) == 1)
@@ -406,6 +410,7 @@ def test_len_cycles(self):
         n1 = len(s)
         del it
         gc.collect()
+        gc.collect()  # For PyPy or other GCs.
         n2 = len(s)
         # one item may be kept alive inside the iterator
         self.assertIn(n1, (0, 1))
diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
index 553529a300170..c79b5462b931d 100644
--- a/Lib/test/test_xml_etree.py
+++ b/Lib/test/test_xml_etree.py
@@ -2480,6 +2480,7 @@ def wref_cb(w):
         wref = weakref.ref(e, wref_cb)
         self.assertEqual(wref().tag, 'e')
         del e
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(flag, True)
         self.assertEqual(wref(), None)
 
diff --git a/Lib/tkinter/test/test_tkinter/test_images.py b/Lib/tkinter/test/test_tkinter/test_images.py
index 2526e92200d90..c7b468044d55e 100644
--- a/Lib/tkinter/test/test_tkinter/test_images.py
+++ b/Lib/tkinter/test/test_tkinter/test_images.py
@@ -78,6 +78,7 @@ def test_create_from_file(self):
         self.assertEqual(image.height(), 16)
         self.assertIn('::img::test', self.root.image_names())
         del image
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertNotIn('::img::test', self.root.image_names())
 
     def test_create_from_data(self):
@@ -92,6 +93,7 @@ def test_create_from_data(self):
         self.assertEqual(image.height(), 16)
         self.assertIn('::img::test', self.root.image_names())
         del image
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertNotIn('::img::test', self.root.image_names())
 
     def assertEqualStrList(self, actual, expected):
@@ -172,6 +174,7 @@ def check_create_from_file(self, ext):
         self.assertEqual(image['file'], testfile)
         self.assertIn('::img::test', self.root.image_names())
         del image
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertNotIn('::img::test', self.root.image_names())
 
     def check_create_from_data(self, ext):
@@ -189,6 +192,7 @@ def check_create_from_data(self, ext):
         self.assertEqual(image['file'], '')
         self.assertIn('::img::test', self.root.image_names())
         del image
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertNotIn('::img::test', self.root.image_names())
 
     def test_create_from_ppm_file(self):
diff --git a/Lib/tkinter/test/test_tkinter/test_variables.py b/Lib/tkinter/test/test_tkinter/test_variables.py
index 6aebe8d16d556..0be5282a3a3b3 100644
--- a/Lib/tkinter/test/test_tkinter/test_variables.py
+++ b/Lib/tkinter/test/test_tkinter/test_variables.py
@@ -1,4 +1,6 @@
 import unittest
+from test import support
+
 import gc
 import tkinter
 from tkinter import (Variable, StringVar, IntVar, DoubleVar, BooleanVar, Tcl,
@@ -46,6 +48,7 @@ def test___del__(self):
         v = Variable(self.root, "sample string", "varname")
         self.assertTrue(self.info_exists("varname"))
         del v
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertFalse(self.info_exists("varname"))
 
     def test_dont_unset_not_existing(self):
@@ -53,9 +56,11 @@ def test_dont_unset_not_existing(self):
         v1 = Variable(self.root, name="name")
         v2 = Variable(self.root, name="name")
         del v1
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertFalse(self.info_exists("name"))
         # shouldn't raise exception
         del v2
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertFalse(self.info_exists("name"))
 
     def test_equality(self):
diff --git a/Lib/tkinter/test/test_ttk/test_extensions.py b/Lib/tkinter/test/test_ttk/test_extensions.py
index 1a70e0befe623..e6b3eccf7afb8 100644
--- a/Lib/tkinter/test/test_ttk/test_extensions.py
+++ b/Lib/tkinter/test/test_ttk/test_extensions.py
@@ -2,7 +2,7 @@
 import unittest
 import tkinter
 from tkinter import ttk
-from test.support import requires, run_unittest
+from test.support import requires, run_unittest, gc_collect
 from tkinter.test.support import AbstractTkTest, AbstractDefaultRootTest
 
 requires('gui')
@@ -18,6 +18,7 @@ def test_widget_destroy(self):
         x = ttk.LabeledScale(self.root)
         var = x._variable._name
         x.destroy()
+        gc_collect()  # For PyPy or other GCs.
         self.assertRaises(tkinter.TclError, x.tk.globalgetvar, var)
 
         # manually created variable
@@ -30,6 +31,7 @@ def test_widget_destroy(self):
         else:
             self.assertEqual(float(x.tk.globalgetvar(name)), myvar.get())
         del myvar
+        gc_collect()  # For PyPy or other GCs.
         self.assertRaises(tkinter.TclError, x.tk.globalgetvar, name)
 
         # checking that the tracing callback is properly removed
@@ -171,6 +173,7 @@ def test_variable_change(self):
     def test_resize(self):
         x = ttk.LabeledScale(self.root)
         x.pack(expand=True, fill='both')
+        gc_collect()  # For PyPy or other GCs.
         x.update()
 
         width, height = x.master.winfo_width(), x.master.winfo_height()
@@ -206,6 +209,7 @@ def test_widget_destroy(self):
         optmenu.destroy()
         self.assertEqual(optmenu.tk.globalgetvar(name), var.get())
         del var
+        gc_collect()  # For PyPy or other GCs.
         self.assertRaises(tkinter.TclError, optmenu.tk.globalgetvar, name)
 
 
@@ -251,6 +255,7 @@ def test_menu(self):
 
         # check that variable is updated correctly
         optmenu.pack()
+        gc_collect()  # For PyPy or other GCs.
         optmenu['menu'].invoke(0)
         self.assertEqual(optmenu._variable.get(), items[0])
 
diff --git a/Lib/tkinter/test/test_ttk/test_widgets.py b/Lib/tkinter/test/test_ttk/test_widgets.py
index 1fac83a004a6d..ee5af82fd1b44 100644
--- a/Lib/tkinter/test/test_ttk/test_widgets.py
+++ b/Lib/tkinter/test/test_ttk/test_widgets.py
@@ -1,7 +1,7 @@
 import unittest
 import tkinter
 from tkinter import ttk, TclError
-from test.support import requires
+from test.support import requires, gc_collect
 import sys
 
 from tkinter.test.test_ttk.test_functions import MockTclObj
@@ -839,6 +839,7 @@ def test_set(self):
         self.assertEqual(conv(self.scale.get()), var.get())
         self.assertEqual(conv(self.scale.get()), max + 5)
         del var
+        gc_collect()  # For PyPy or other GCs.
 
         # the same happens with the value option
         self.scale['value'] = max + 10
diff --git a/Lib/unittest/test/test_assertions.py b/Lib/unittest/test/test_assertions.py
index f5e64d68e7b10..a0db3423b868a 100644
--- a/Lib/unittest/test/test_assertions.py
+++ b/Lib/unittest/test/test_assertions.py
@@ -2,6 +2,7 @@
 import warnings
 import weakref
 import unittest
+from test.support import gc_collect
 from itertools import product
 
 
@@ -124,8 +125,10 @@ def test_with(self):
                     self.foo()
 
         Foo("test_functional").run()
+        gc_collect()  # For PyPy or other GCs.
         self.assertIsNone(wr())
         Foo("test_with").run()
+        gc_collect()  # For PyPy or other GCs.
         self.assertIsNone(wr())
 
     def testAssertNotRegex(self):
diff --git a/Lib/unittest/test/test_case.py b/Lib/unittest/test/test_case.py
index f3cabe44d1c88..9b32da1a9f536 100644
--- a/Lib/unittest/test/test_case.py
+++ b/Lib/unittest/test/test_case.py
@@ -19,7 +19,7 @@
     TestEquality, TestHashing, LoggingResult, LegacyLoggingResult,
     ResultWithNoStartTestRunStopTestRun
 )
-from test.support import captured_stderr
+from test.support import captured_stderr, gc_collect
 
 
 log_foo = logging.getLogger('foo')
@@ -1967,6 +1967,7 @@ def test2(self):
         for method_name in ('test1', 'test2'):
             testcase = TestCase(method_name)
             testcase.run()
+            gc_collect()  # For PyPy or other GCs.
             self.assertEqual(MyException.ninstance, 0)
 
 
diff --git a/Misc/NEWS.d/next/Tests/2021-08-27-22-37-19.bpo-25130.ig4oJe.rst b/Misc/NEWS.d/next/Tests/2021-08-27-22-37-19.bpo-25130.ig4oJe.rst
new file mode 100644
index 0000000000000..43ce68bef4609
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2021-08-27-22-37-19.bpo-25130.ig4oJe.rst
@@ -0,0 +1 @@
+Add calls of :func:`gc.collect` in tests to support PyPy.


From webhook-mailer at python.org  Sun Aug 29 07:07:56 2021
From: webhook-mailer at python.org (ambv)
Date: Sun, 29 Aug 2021 11:07:56 -0000
Subject: [Python-checkins] bpo-42278: Use tempfile.TemporaryDirectory rather
 than tempfile.mktemp in pydoc (GH-23200)
Message-ID: <mailman.1229.1630235277.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/c9227df5a9d8e958a2324cf0deba8524d1ded26a
commit: c9227df5a9d8e958a2324cf0deba8524d1ded26a
branch: main
author: E-Paine <63801254+E-Paine at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-29T13:07:51+02:00
summary:

bpo-42278: Use tempfile.TemporaryDirectory rather than tempfile.mktemp in pydoc (GH-23200)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Misc/NEWS.d/next/Security/2021-08-29-12-39-44.bpo-42278.jvmQz_.rst
M Lib/pydoc.py

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index b2915bfdfc0ff0..34a608760338e3 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -1618,13 +1618,14 @@ def pipepager(text, cmd):
 def tempfilepager(text, cmd):
     """Page through text by invoking a program on a temporary file."""
     import tempfile
-    filename = tempfile.mktemp()
-    with open(filename, 'w', errors='backslashreplace') as file:
-        file.write(text)
-    try:
+    with tempfile.TemporaryDirectory() as tempdir:
+        filename = os.path.join(tempdir, 'pydoc.out')
+        with open(filename, 'w', errors='backslashreplace',
+                  encoding=os.device_encoding(0) if
+                  sys.platform == 'win32' else None
+                  ) as file:
+            file.write(text)
         os.system(cmd + ' "' + filename + '"')
-    finally:
-        os.unlink(filename)
 
 def _escape_stdout(text):
     # Escape non-encodable characters to avoid encoding errors later
diff --git a/Misc/NEWS.d/next/Security/2021-08-29-12-39-44.bpo-42278.jvmQz_.rst b/Misc/NEWS.d/next/Security/2021-08-29-12-39-44.bpo-42278.jvmQz_.rst
new file mode 100644
index 00000000000000..db880cd9026da4
--- /dev/null
+++ b/Misc/NEWS.d/next/Security/2021-08-29-12-39-44.bpo-42278.jvmQz_.rst
@@ -0,0 +1,2 @@
+Replaced usage of :func:`tempfile.mktemp` with
+:class:`~tempfile.TemporaryDirectory` to avoid a potential race condition.


From webhook-mailer at python.org  Sun Aug 29 08:08:36 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Sun, 29 Aug 2021 12:08:36 -0000
Subject: [Python-checkins] [3.9] bpo-25130: Add calls of gc.collect() in
 tests to support PyPy (GH-28005). (GH-28028)
Message-ID: <mailman.1230.1630238917.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/330aabbbbee39cbc556be01534b1dbf65d20f04c
commit: 330aabbbbee39cbc556be01534b1dbf65d20f04c
branch: 3.9
author: Serhiy Storchaka <storchaka at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-29T15:08:32+03:00
summary:

[3.9] bpo-25130: Add calls of gc.collect() in tests to support PyPy (GH-28005). (GH-28028)

(cherry picked from commit 2a8127cafe1d196f858a3ecabf5f1df3eebf9a12)

files:
A Misc/NEWS.d/next/Tests/2021-08-27-22-37-19.bpo-25130.ig4oJe.rst
M Lib/test/_test_multiprocessing.py
M Lib/test/lock_tests.py
M Lib/test/test_array.py
M Lib/test/test_asyncgen.py
M Lib/test/test_asyncio/test_tasks.py
M Lib/test/test_code.py
M Lib/test/test_concurrent_futures.py
M Lib/test/test_copy.py
M Lib/test/test_deque.py
M Lib/test/test_enum.py
M Lib/test/test_exceptions.py
M Lib/test/test_file.py
M Lib/test/test_fileio.py
M Lib/test/test_functools.py
M Lib/test/test_generators.py
M Lib/test/test_io.py
M Lib/test/test_itertools.py
M Lib/test/test_queue.py
M Lib/test/test_raise.py
M Lib/test/test_scope.py
M Lib/test/test_set.py
M Lib/test/test_socket.py
M Lib/test/test_subprocess.py
M Lib/test/test_tempfile.py
M Lib/test/test_thread.py
M Lib/test/test_threading_local.py
M Lib/test/test_weakref.py
M Lib/test/test_weakset.py
M Lib/test/test_xml_etree.py
M Lib/tkinter/test/test_tkinter/test_images.py
M Lib/tkinter/test/test_tkinter/test_variables.py
M Lib/tkinter/test/test_ttk/test_extensions.py
M Lib/tkinter/test/test_ttk/test_widgets.py
M Lib/unittest/test/test_assertions.py
M Lib/unittest/test/test_case.py

diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index ebd44f9700363..3072e5860189a 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -607,6 +607,7 @@ def test_lose_target_ref(self):
         del c
         p.start()
         p.join()
+        gc.collect()  # For PyPy or other GCs.
         self.assertIs(wr(), None)
         self.assertEqual(q.get(), 5)
         close_queue(q)
@@ -2663,6 +2664,7 @@ def test_release_task_refs(self):
         self.pool.map(identity, objs)
 
         del objs
+        gc.collect()  # For PyPy or other GCs.
         time.sleep(DELTA)  # let threaded cleanup code run
         self.assertEqual(set(wr() for wr in refs), {None})
         # With a process pool, copies of the objects are returned, check
@@ -4165,6 +4167,7 @@ def setUp(self):
         util._finalizer_registry.clear()
 
     def tearDown(self):
+        gc.collect()  # For PyPy or other GCs.
         self.assertFalse(util._finalizer_registry)
         util._finalizer_registry.update(self.registry_backup)
 
@@ -4176,12 +4179,14 @@ class Foo(object):
         a = Foo()
         util.Finalize(a, conn.send, args=('a',))
         del a           # triggers callback for a
+        gc.collect()  # For PyPy or other GCs.
 
         b = Foo()
         close_b = util.Finalize(b, conn.send, args=('b',))
         close_b()       # triggers callback for b
         close_b()       # does nothing because callback has already been called
         del b           # does nothing because callback has already been called
+        gc.collect()  # For PyPy or other GCs.
 
         c = Foo()
         util.Finalize(c, conn.send, args=('c',))
diff --git a/Lib/test/lock_tests.py b/Lib/test/lock_tests.py
index b3975254c79b5..4b378a7d1c25d 100644
--- a/Lib/test/lock_tests.py
+++ b/Lib/test/lock_tests.py
@@ -3,6 +3,7 @@
 """
 
 import os
+import gc
 import sys
 import time
 from _thread import start_new_thread, TIMEOUT_MAX
@@ -220,6 +221,7 @@ def test_weakref_deleted(self):
         lock = self.locktype()
         ref = weakref.ref(lock)
         del lock
+        gc.collect()  # For PyPy or other GCs.
         self.assertIsNone(ref())
 
 
diff --git a/Lib/test/test_array.py b/Lib/test/test_array.py
old mode 100644
new mode 100755
index f731b70415e7f..05d638a1f54f3
--- a/Lib/test/test_array.py
+++ b/Lib/test/test_array.py
@@ -1006,6 +1006,7 @@ def test_weakref(self):
         p = weakref.proxy(s)
         self.assertEqual(p.tobytes(), s.tobytes())
         s = None
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertRaises(ReferenceError, len, p)
 
     @unittest.skipUnless(hasattr(sys, 'getrefcount'),
diff --git a/Lib/test/test_asyncgen.py b/Lib/test/test_asyncgen.py
index 62bf877416652..8d2ad2233ae1f 100644
--- a/Lib/test/test_asyncgen.py
+++ b/Lib/test/test_asyncgen.py
@@ -3,6 +3,7 @@
 import unittest
 
 from test.support import import_module
+from test.support import gc_collect
 asyncio = import_module("asyncio")
 
 
@@ -659,6 +660,7 @@ async def run():
             await g.__anext__()
             await g.__anext__()
             del g
+            gc_collect()  # For PyPy or other GCs.
 
             await asyncio.sleep(0.1)
 
diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py
index 24d04feb950d3..d2d78033aa481 100644
--- a/Lib/test/test_asyncio/test_tasks.py
+++ b/Lib/test/test_asyncio/test_tasks.py
@@ -2611,6 +2611,7 @@ def coro():
                 self.new_task(self.loop, gen)
             finally:
                 gen.close()
+        gc.collect()  # For PyPy or other GCs.
 
         self.assertTrue(m_log.error.called)
         message = m_log.error.call_args[0][0]
diff --git a/Lib/test/test_code.py b/Lib/test/test_code.py
index 7d77d7a7bec86..c696ede842a58 100644
--- a/Lib/test/test_code.py
+++ b/Lib/test/test_code.py
@@ -135,7 +135,7 @@
 except ImportError:
     ctypes = None
 from test.support import (run_doctest, run_unittest, cpython_only,
-                          check_impl_detail)
+                          check_impl_detail, gc_collect)
 
 
 def consts(t):
@@ -337,6 +337,7 @@ def callback(code):
         coderef = weakref.ref(f.__code__, callback)
         self.assertTrue(bool(coderef()))
         del f
+        gc_collect()  # For PyPy or other GCs.
         self.assertFalse(bool(coderef()))
         self.assertTrue(self.called)
 
diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py
index 4fe4bf792710f..ad64f4bdb5322 100644
--- a/Lib/test/test_concurrent_futures.py
+++ b/Lib/test/test_concurrent_futures.py
@@ -448,6 +448,7 @@ def test_thread_names_assigned(self):
         executor.map(abs, range(-5, 5))
         threads = executor._threads
         del executor
+        support.gc_collect()  # For PyPy or other GCs.
 
         for t in threads:
             self.assertRegex(t.name, r'^SpecialPool_[0-4]$')
@@ -458,6 +459,7 @@ def test_thread_names_default(self):
         executor.map(abs, range(-5, 5))
         threads = executor._threads
         del executor
+        support.gc_collect()  # For PyPy or other GCs.
 
         for t in threads:
             # Ensure that our default name is reasonably sane and unique when
@@ -520,6 +522,7 @@ def test_del_shutdown(self):
         call_queue = executor._call_queue
         executor_manager_thread = executor._executor_manager_thread
         del executor
+        support.gc_collect()  # For PyPy or other GCs.
 
         # Make sure that all the executor resources were properly cleaned by
         # the shutdown process
@@ -744,6 +747,7 @@ def test_free_reference_yielded_future(self):
                 futures_list.remove(future)
                 wr = weakref.ref(future)
                 del future
+                support.gc_collect()  # For PyPy or other GCs.
                 self.assertIsNone(wr())
 
         futures_list[0].set_result("test")
@@ -751,6 +755,7 @@ def test_free_reference_yielded_future(self):
             futures_list.remove(future)
             wr = weakref.ref(future)
             del future
+            support.gc_collect()  # For PyPy or other GCs.
             self.assertIsNone(wr())
             if futures_list:
                 futures_list[0].set_result("test")
@@ -850,6 +855,7 @@ def test_free_reference(self):
         for obj in self.executor.map(make_dummy_object, range(10)):
             wr = weakref.ref(obj)
             del obj
+            support.gc_collect()  # For PyPy or other GCs.
             self.assertIsNone(wr())
 
 
diff --git a/Lib/test/test_copy.py b/Lib/test/test_copy.py
index 35f72fb216b64..4db2f39d0e036 100644
--- a/Lib/test/test_copy.py
+++ b/Lib/test/test_copy.py
@@ -7,6 +7,7 @@
 from operator import le, lt, ge, gt, eq, ne
 
 import unittest
+from test import support
 
 order_comparisons = le, lt, ge, gt
 equality_comparisons = eq, ne
@@ -816,6 +817,7 @@ class C(object):
         self.assertEqual(v[c], d)
         self.assertEqual(len(v), 2)
         del c, d
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertEqual(len(v), 1)
         x, y = C(), C()
         # The underlying containers are decoupled
@@ -845,6 +847,7 @@ def __init__(self, i):
         self.assertEqual(v[a].i, b.i)
         self.assertEqual(v[c].i, d.i)
         del c
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertEqual(len(v), 1)
 
     def test_deepcopy_weakvaluedict(self):
@@ -868,6 +871,7 @@ def __init__(self, i):
         self.assertIs(t, d)
         del x, y, z, t
         del d
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertEqual(len(v), 1)
 
     def test_deepcopy_bound_method(self):
diff --git a/Lib/test/test_deque.py b/Lib/test/test_deque.py
index 67c0ace3bc868..f913c76ff267d 100644
--- a/Lib/test/test_deque.py
+++ b/Lib/test/test_deque.py
@@ -902,6 +902,7 @@ def test_weakref(self):
         p = weakref.proxy(d)
         self.assertEqual(str(p), str(d))
         d = None
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertRaises(ReferenceError, str, p)
 
     def test_strange_subclass(self):
diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py
index 5e73044a3910f..12bf2121730b2 100644
--- a/Lib/test/test_enum.py
+++ b/Lib/test/test_enum.py
@@ -1934,6 +1934,7 @@ def _missing_(cls, item):
             raise Exception('Exception not raised.')
 
     def test_missing_exceptions_reset(self):
+        import gc
         import weakref
         #
         class TestEnum(enum.Enum):
@@ -1960,8 +1961,9 @@ def __init__(self):
         class_2_ref = weakref.ref(Class2())
         #
         # The exception raised by Enum creates a reference loop and thus
-        # Class2 instances will stick around until the next gargage collection
+        # Class2 instances will stick around until the next garbage collection
         # cycle, unlike Class1.
+        gc.collect()  # For PyPy or other GCs.
         self.assertIs(class_1_ref(), None)
         self.assertIs(class_2_ref(), None)
 
diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 6f192d7d079eb..70e438d2ee943 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -627,6 +627,7 @@ def inner_raising_func():
         except MyException as e:
             pass
         obj = None
+        gc_collect()  # For PyPy or other GCs.
         obj = wr()
         self.assertIsNone(obj)
 
@@ -638,6 +639,7 @@ def inner_raising_func():
         except MyException:
             pass
         obj = None
+        gc_collect()  # For PyPy or other GCs.
         obj = wr()
         self.assertIsNone(obj)
 
@@ -649,6 +651,7 @@ def inner_raising_func():
         except:
             pass
         obj = None
+        gc_collect()  # For PyPy or other GCs.
         obj = wr()
         self.assertIsNone(obj)
 
@@ -661,6 +664,7 @@ def inner_raising_func():
             except:
                 break
         obj = None
+        gc_collect()  # For PyPy or other GCs.
         obj = wr()
         self.assertIsNone(obj)
 
@@ -679,6 +683,7 @@ def inner_raising_func():
             # must clear the latter manually for our test to succeed.
             e.__context__ = None
             obj = None
+            gc_collect()  # For PyPy or other GCs.
             obj = wr()
             # guarantee no ref cycles on CPython (don't gc_collect)
             if check_impl_detail(cpython=False):
@@ -869,6 +874,7 @@ def raising_gen():
         next(g)
         testfunc(g)
         g = obj = None
+        gc_collect()  # For PyPy or other GCs.
         obj = wr()
         self.assertIsNone(obj)
 
@@ -922,6 +928,7 @@ def __del__(self):
             raise Exception(MyObject())
         except:
             pass
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(e, (None, None, None))
 
     def test_raise_does_not_create_context_chain_cycle(self):
@@ -1335,6 +1342,7 @@ def inner():
             self.assertNotEqual(wr(), None)
         else:
             self.fail("MemoryError not raised")
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(wr(), None)
 
     @no_tracing
@@ -1355,6 +1363,7 @@ def inner():
             self.assertNotEqual(wr(), None)
         else:
             self.fail("RecursionError not raised")
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(wr(), None)
 
     def test_errno_ENOTDIR(self):
@@ -1375,6 +1384,7 @@ def __del__(self):
         with support.catch_unraisable_exception() as cm:
             del obj
 
+            gc_collect()  # For PyPy or other GCs.
             self.assertEqual(cm.unraisable.object, BrokenDel.__del__)
             self.assertIsNotNone(cm.unraisable.exc_traceback)
 
diff --git a/Lib/test/test_file.py b/Lib/test/test_file.py
index 6504aa0707053..155914e5beaf6 100644
--- a/Lib/test/test_file.py
+++ b/Lib/test/test_file.py
@@ -7,7 +7,7 @@
 import io
 import _pyio as pyio
 
-from test.support import TESTFN
+from test.support import TESTFN, gc_collect
 from test import support
 from collections import UserList
 
@@ -29,6 +29,7 @@ def testWeakRefs(self):
         self.assertEqual(self.f.tell(), p.tell())
         self.f.close()
         self.f = None
+        gc_collect()  # For PyPy or other GCs.
         self.assertRaises(ReferenceError, getattr, p, 'tell')
 
     def testAttributes(self):
diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py
index 26e4500ae8cfc..77c7f69a03e1d 100644
--- a/Lib/test/test_fileio.py
+++ b/Lib/test/test_fileio.py
@@ -10,7 +10,7 @@
 from functools import wraps
 
 from test.support import (TESTFN, TESTFN_UNICODE, check_warnings, run_unittest,
-                          make_bad_fd, cpython_only, swap_attr)
+                          make_bad_fd, cpython_only, swap_attr, gc_collect)
 from collections import UserList
 
 import _io  # C implementation of io
@@ -35,6 +35,7 @@ def testWeakRefs(self):
         self.assertEqual(self.f.tell(), p.tell())
         self.f.close()
         self.f = None
+        gc_collect()  # For PyPy or other GCs.
         self.assertRaises(ReferenceError, getattr, p, 'tell')
 
     def testSeekTell(self):
diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py
index ffe2456a2a9fc..987020ea007fa 100644
--- a/Lib/test/test_functools.py
+++ b/Lib/test/test_functools.py
@@ -164,6 +164,7 @@ def test_weakref(self):
         p = proxy(f)
         self.assertEqual(f.func, p.func)
         f = None
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertRaises(ReferenceError, getattr, p, 'func')
 
     def test_with_bound_and_unbound_methods(self):
diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py
index 17fb87acc8f67..f919f9c24106e 100644
--- a/Lib/test/test_generators.py
+++ b/Lib/test/test_generators.py
@@ -1966,6 +1966,8 @@ def printsolution(self, x):
 """
 
 coroutine_tests = """\
+>>> from test.support import gc_collect
+
 Sending a value into a started generator:
 
 >>> def f():
@@ -2189,7 +2191,7 @@ def printsolution(self, x):
 
 >>> g = f()
 >>> next(g)
->>> del g
+>>> del g; gc_collect()  # For PyPy or other GCs.
 exiting
 
 
@@ -2204,7 +2206,7 @@ def printsolution(self, x):
 
 >>> g = f()
 >>> next(g)
->>> del g
+>>> del g; gc_collect()  # For PyPy or other GCs.
 finally
 
 
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index 1f0210f857a67..8622939c4e619 100644
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -4310,6 +4310,31 @@ def check_interrupted_write(self, item, bytes, **fdopen_kwargs):
         """Check that a partial write, when it gets interrupted, properly
         invokes the signal handler, and bubbles up the exception raised
         in the latter."""
+
+        # XXX This test has three flaws that appear when objects are
+        # XXX not reference counted.
+
+        # - if wio.write() happens to trigger a garbage collection,
+        #   the signal exception may be raised when some __del__
+        #   method is running; it will not reach the assertRaises()
+        #   call.
+
+        # - more subtle, if the wio object is not destroyed at once
+        #   and survives this function, the next opened file is likely
+        #   to have the same fileno (since the file descriptor was
+        #   actively closed).  When wio.__del__ is finally called, it
+        #   will close the other's test file...  To trigger this with
+        #   CPython, try adding "global wio" in this function.
+
+        # - This happens only for streams created by the _pyio module,
+        #   because a wio.close() that fails still consider that the
+        #   file needs to be closed again.  You can try adding an
+        #   "assert wio.closed" at the end of the function.
+
+        # Fortunately, a little gc.collect() seems to be enough to
+        # work around all these issues.
+        support.gc_collect()  # For PyPy or other GCs.
+
         read_results = []
         def _read():
             s = os.read(r, 1)
diff --git a/Lib/test/test_itertools.py b/Lib/test/test_itertools.py
index 7101264284919..802f7b8f851dc 100644
--- a/Lib/test/test_itertools.py
+++ b/Lib/test/test_itertools.py
@@ -1423,6 +1423,7 @@ def test_tee(self):
         p = weakref.proxy(a)
         self.assertEqual(getattr(p, '__class__'), type(b))
         del a
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertRaises(ReferenceError, getattr, p, '__class__')
 
         ans = list('abc')
diff --git a/Lib/test/test_queue.py b/Lib/test/test_queue.py
index d88e28a9146ef..dd7f0b1124c7a 100644
--- a/Lib/test/test_queue.py
+++ b/Lib/test/test_queue.py
@@ -7,6 +7,7 @@
 import unittest
 import weakref
 from test import support
+from test.support import gc_collect
 
 py_queue = support.import_fresh_module('queue', blocked=['_queue'])
 c_queue = support.import_fresh_module('queue', fresh=['_queue'])
@@ -588,6 +589,7 @@ class C:
             q.put(C())
         for i in range(N):
             wr = weakref.ref(q.get())
+            gc_collect()  # For PyPy or other GCs.
             self.assertIsNone(wr())
 
 
diff --git a/Lib/test/test_raise.py b/Lib/test/test_raise.py
index 57da0e15a756b..8dc62a933e872 100644
--- a/Lib/test/test_raise.py
+++ b/Lib/test/test_raise.py
@@ -438,6 +438,7 @@ def f():
         f()
 
     def test_3611(self):
+        import gc
         # A re-raised exception in a __del__ caused the __context__
         # to be cleared
         class C:
@@ -451,9 +452,11 @@ def f():
             x = C()
             try:
                 try:
-                    x.x
+                    f.x
                 except AttributeError:
+                    # make x.__del__ trigger
                     del x
+                    gc.collect()  # For PyPy or other GCs.
                     raise TypeError
             except Exception as e:
                 self.assertNotEqual(e.__context__, None)
diff --git a/Lib/test/test_scope.py b/Lib/test/test_scope.py
index 4239b26408ecd..59d59127982e3 100644
--- a/Lib/test/test_scope.py
+++ b/Lib/test/test_scope.py
@@ -2,6 +2,7 @@
 import weakref
 
 from test.support import check_syntax_error, cpython_only
+from test.support import gc_collect
 
 
 class ScopeTests(unittest.TestCase):
@@ -422,6 +423,7 @@ def f2():
         for i in range(100):
             f1()
 
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(Foo.count, 0)
 
     def testClassAndGlobal(self):
@@ -754,6 +756,7 @@ def dig(self):
         tester.dig()
         ref = weakref.ref(tester)
         del tester
+        gc_collect()  # For PyPy or other GCs.
         self.assertIsNone(ref())
 
 
diff --git a/Lib/test/test_set.py b/Lib/test/test_set.py
index faf25a79e8021..ca2f4e28ae80b 100644
--- a/Lib/test/test_set.py
+++ b/Lib/test/test_set.py
@@ -606,6 +606,7 @@ def test_weakref(self):
         p = weakref.proxy(s)
         self.assertEqual(str(p), str(s))
         s = None
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertRaises(ReferenceError, str, p)
 
     def test_rich_compare(self):
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 595cae6b640f7..e0f80ca59cbff 100755
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -868,6 +868,7 @@ def test_weakref(self):
             p = proxy(s)
             self.assertEqual(p.fileno(), s.fileno())
         s = None
+        support.gc_collect()  # For PyPy or other GCs.
         try:
             p.fileno()
         except ReferenceError:
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index ed04813384a5d..f93fbe9264667 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -2969,6 +2969,7 @@ def test_leak_fast_process_del_killed(self):
         pid = p.pid
         with support.check_warnings(('', ResourceWarning)):
             p = None
+            support.gc_collect()  # For PyPy or other GCs.
 
         os.kill(pid, signal.SIGKILL)
         if mswindows:
diff --git a/Lib/test/test_tempfile.py b/Lib/test/test_tempfile.py
index fcc706ede5aaa..7dbbf9b7e51e2 100644
--- a/Lib/test/test_tempfile.py
+++ b/Lib/test/test_tempfile.py
@@ -428,6 +428,7 @@ def test_choose_directory(self):
             self.do_create(dir=dir).write(b"blat")
             self.do_create(dir=pathlib.Path(dir)).write(b"blat")
         finally:
+            support.gc_collect()  # For PyPy or other GCs.
             os.rmdir(dir)
 
     def test_file_mode(self):
@@ -821,6 +822,8 @@ def test_many(self):
         extant = list(range(TEST_FILES))
         for i in extant:
             extant[i] = self.do_create(pre="aa")
+        del extant
+        support.gc_collect()  # For PyPy or other GCs.
 
 ##     def test_warning(self):
 ##         # mktemp issues a warning when used
diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py
index 77e46f2c2f15a..3f8a539f85e09 100644
--- a/Lib/test/test_thread.py
+++ b/Lib/test/test_thread.py
@@ -131,6 +131,7 @@ def task():
             del task
             while not done:
                 time.sleep(POLL_SLEEP)
+                support.gc_collect()  # For PyPy or other GCs.
             self.assertEqual(thread._count(), orig)
 
     def test_unraisable_exception(self):
diff --git a/Lib/test/test_threading_local.py b/Lib/test/test_threading_local.py
index 2fd14ae2e16f3..5ddb8c41c5f34 100644
--- a/Lib/test/test_threading_local.py
+++ b/Lib/test/test_threading_local.py
@@ -36,7 +36,7 @@ def _local_refs(self, n):
             t.join()
         del t
 
-        gc.collect()
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertEqual(len(weaklist), n)
 
         # XXX _threading_local keeps the local of the last stopped thread alive.
@@ -45,7 +45,7 @@ def _local_refs(self, n):
 
         # Assignment to the same thread local frees it sometimes (!)
         local.someothervar = None
-        gc.collect()
+        support.gc_collect()  # For PyPy or other GCs.
         deadlist = [weak for weak in weaklist if weak() is None]
         self.assertIn(len(deadlist), (n-1, n), (n, len(deadlist)))
 
@@ -88,7 +88,7 @@ def f():
             # 2) GC the cycle (triggers threadmodule.c::local_clear
             # before local_dealloc)
             del cycle
-            gc.collect()
+            support.gc_collect()  # For PyPy or other GCs.
             e1.set()
             e2.wait()
 
@@ -189,7 +189,7 @@ class X:
         x.local.x = x
         wr = weakref.ref(x)
         del x
-        gc.collect()
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertIsNone(wr())
 
 
diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py
index 1a5314ccff315..5a3e59c3e9ef1 100644
--- a/Lib/test/test_weakref.py
+++ b/Lib/test/test_weakref.py
@@ -12,6 +12,7 @@
 
 from test import support
 from test.support import script_helper, ALWAYS_EQ
+from test.support import gc_collect
 
 # Used in ReferencesTestCase.test_ref_created_during_del() .
 ref_from_del = None
@@ -135,6 +136,7 @@ def test_multiple_callbacks(self):
         ref1 = weakref.ref(o, self.callback)
         ref2 = weakref.ref(o, self.callback)
         del o
+        gc_collect()  # For PyPy or other GCs.
         self.assertIsNone(ref1(), "expected reference to be invalidated")
         self.assertIsNone(ref2(), "expected reference to be invalidated")
         self.assertEqual(self.cbcalled, 2,
@@ -168,13 +170,16 @@ def test_proxy_ref(self):
         ref1 = weakref.proxy(o, self.callback)
         ref2 = weakref.proxy(o, self.callback)
         del o
+        gc_collect()  # For PyPy or other GCs.
 
         def check(proxy):
             proxy.bar
 
         self.assertRaises(ReferenceError, check, ref1)
         self.assertRaises(ReferenceError, check, ref2)
-        self.assertRaises(ReferenceError, bool, weakref.proxy(C()))
+        ref3 = weakref.proxy(C())
+        gc_collect()  # For PyPy or other GCs.
+        self.assertRaises(ReferenceError, bool, ref3)
         self.assertEqual(self.cbcalled, 2)
 
     def check_basic_ref(self, factory):
@@ -191,6 +196,7 @@ def check_basic_callback(self, factory):
         o = factory()
         ref = weakref.ref(o, self.callback)
         del o
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(self.cbcalled, 1,
                      "callback did not properly set 'cbcalled'")
         self.assertIsNone(ref(),
@@ -215,6 +221,7 @@ def test_ref_reuse(self):
         self.assertEqual(weakref.getweakrefcount(o), 2,
                      "wrong weak ref count for object")
         del proxy
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(weakref.getweakrefcount(o), 1,
                      "wrong weak ref count for object after deleting proxy")
 
@@ -480,6 +487,7 @@ def test_getweakrefcount(self):
                      "got wrong number of weak reference objects")
 
         del ref1, ref2, proxy1, proxy2
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(weakref.getweakrefcount(o), 0,
                      "weak reference objects not unlinked from"
                      " referent when discarded.")
@@ -493,6 +501,7 @@ def test_getweakrefs(self):
         ref1 = weakref.ref(o, self.callback)
         ref2 = weakref.ref(o, self.callback)
         del ref1
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(weakref.getweakrefs(o), [ref2],
                      "list of refs does not match")
 
@@ -500,10 +509,12 @@ def test_getweakrefs(self):
         ref1 = weakref.ref(o, self.callback)
         ref2 = weakref.ref(o, self.callback)
         del ref2
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(weakref.getweakrefs(o), [ref1],
                      "list of refs does not match")
 
         del ref1
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(weakref.getweakrefs(o), [],
                      "list of refs not cleared")
 
@@ -989,6 +1000,7 @@ def __call__(self):
         self.assertTrue(mr.called)
         self.assertEqual(mr.value, 24)
         del o
+        gc_collect()  # For PyPy or other GCs.
         self.assertIsNone(mr())
         self.assertTrue(mr.called)
 
@@ -1291,15 +1303,18 @@ def test_weak_values(self):
         del items1, items2
         self.assertEqual(len(dict), self.COUNT)
         del objects[0]
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(len(dict), self.COUNT - 1,
                      "deleting object did not cause dictionary update")
         del objects, o
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(len(dict), 0,
                      "deleting the values did not clear the dictionary")
         # regression on SF bug #447152:
         dict = weakref.WeakValueDictionary()
         self.assertRaises(KeyError, dict.__getitem__, 1)
         dict[2] = C()
+        gc_collect()  # For PyPy or other GCs.
         self.assertRaises(KeyError, dict.__getitem__, 2)
 
     def test_weak_keys(self):
@@ -1320,9 +1335,11 @@ def test_weak_keys(self):
         del items1, items2
         self.assertEqual(len(dict), self.COUNT)
         del objects[0]
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(len(dict), (self.COUNT - 1),
                      "deleting object did not cause dictionary update")
         del objects, o
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(len(dict), 0,
                      "deleting the keys did not clear the dictionary")
         o = Object(42)
@@ -1821,6 +1838,7 @@ def __eq__(self, other):
         for o in objs:
             count += 1
             del d[o]
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(len(d), 0)
         self.assertEqual(count, 2)
 
@@ -2129,6 +2147,7 @@ def test_atexit(self):
 
 libreftest = """ Doctest for examples in the library reference: weakref.rst
 
+>>> from test.support import gc_collect
 >>> import weakref
 >>> class Dict(dict):
 ...     pass
@@ -2148,6 +2167,7 @@ def test_atexit(self):
 >>> o is o2
 True
 >>> del o, o2
+>>> gc_collect()  # For PyPy or other GCs.
 >>> print(r())
 None
 
@@ -2200,6 +2220,7 @@ def test_atexit(self):
 >>> id2obj(a_id) is a
 True
 >>> del a
+>>> gc_collect()  # For PyPy or other GCs.
 >>> try:
 ...     id2obj(a_id)
 ... except KeyError:
diff --git a/Lib/test/test_weakset.py b/Lib/test/test_weakset.py
index 49a9b5c3c658a..9b31d5fce3472 100644
--- a/Lib/test/test_weakset.py
+++ b/Lib/test/test_weakset.py
@@ -5,6 +5,7 @@
 from collections.abc import Set, MutableSet
 import gc
 import contextlib
+from test import support
 
 
 class Foo:
@@ -48,6 +49,7 @@ def test_len(self):
         self.assertEqual(len(self.s), len(self.d))
         self.assertEqual(len(self.fs), 1)
         del self.obj
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertEqual(len(self.fs), 0)
 
     def test_contains(self):
@@ -57,6 +59,7 @@ def test_contains(self):
         self.assertNotIn(1, self.s)
         self.assertIn(self.obj, self.fs)
         del self.obj
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertNotIn(ustr('F'), self.fs)
 
     def test_union(self):
@@ -215,6 +218,7 @@ def test_add(self):
         self.assertEqual(self.s, dup)
         self.assertRaises(TypeError, self.s.add, [])
         self.fs.add(Foo())
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertTrue(len(self.fs) == 1)
         self.fs.add(self.obj)
         self.assertTrue(len(self.fs) == 1)
@@ -406,6 +410,7 @@ def test_len_cycles(self):
         n1 = len(s)
         del it
         gc.collect()
+        gc.collect()  # For PyPy or other GCs.
         n2 = len(s)
         # one item may be kept alive inside the iterator
         self.assertIn(n1, (0, 1))
diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
index bfc0d054ba8b7..3a6d43b8c85bd 100644
--- a/Lib/test/test_xml_etree.py
+++ b/Lib/test/test_xml_etree.py
@@ -2456,6 +2456,7 @@ def wref_cb(w):
         wref = weakref.ref(e, wref_cb)
         self.assertEqual(wref().tag, 'e')
         del e
+        gc_collect()  # For PyPy or other GCs.
         self.assertEqual(flag, True)
         self.assertEqual(wref(), None)
 
diff --git a/Lib/tkinter/test/test_tkinter/test_images.py b/Lib/tkinter/test/test_tkinter/test_images.py
index 94bba8518fdaa..c798966e0b69f 100644
--- a/Lib/tkinter/test/test_tkinter/test_images.py
+++ b/Lib/tkinter/test/test_tkinter/test_images.py
@@ -77,6 +77,7 @@ def test_create_from_file(self):
         self.assertEqual(image.height(), 16)
         self.assertIn('::img::test', self.root.image_names())
         del image
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertNotIn('::img::test', self.root.image_names())
 
     def test_create_from_data(self):
@@ -91,6 +92,7 @@ def test_create_from_data(self):
         self.assertEqual(image.height(), 16)
         self.assertIn('::img::test', self.root.image_names())
         del image
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertNotIn('::img::test', self.root.image_names())
 
     def assertEqualStrList(self, actual, expected):
@@ -171,6 +173,7 @@ def check_create_from_file(self, ext):
         self.assertEqual(image['file'], testfile)
         self.assertIn('::img::test', self.root.image_names())
         del image
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertNotIn('::img::test', self.root.image_names())
 
     def check_create_from_data(self, ext):
@@ -188,6 +191,7 @@ def check_create_from_data(self, ext):
         self.assertEqual(image['file'], '')
         self.assertIn('::img::test', self.root.image_names())
         del image
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertNotIn('::img::test', self.root.image_names())
 
     def test_create_from_ppm_file(self):
diff --git a/Lib/tkinter/test/test_tkinter/test_variables.py b/Lib/tkinter/test/test_tkinter/test_variables.py
index 6aebe8d16d556..0be5282a3a3b3 100644
--- a/Lib/tkinter/test/test_tkinter/test_variables.py
+++ b/Lib/tkinter/test/test_tkinter/test_variables.py
@@ -1,4 +1,6 @@
 import unittest
+from test import support
+
 import gc
 import tkinter
 from tkinter import (Variable, StringVar, IntVar, DoubleVar, BooleanVar, Tcl,
@@ -46,6 +48,7 @@ def test___del__(self):
         v = Variable(self.root, "sample string", "varname")
         self.assertTrue(self.info_exists("varname"))
         del v
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertFalse(self.info_exists("varname"))
 
     def test_dont_unset_not_existing(self):
@@ -53,9 +56,11 @@ def test_dont_unset_not_existing(self):
         v1 = Variable(self.root, name="name")
         v2 = Variable(self.root, name="name")
         del v1
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertFalse(self.info_exists("name"))
         # shouldn't raise exception
         del v2
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertFalse(self.info_exists("name"))
 
     def test_equality(self):
diff --git a/Lib/tkinter/test/test_ttk/test_extensions.py b/Lib/tkinter/test/test_ttk/test_extensions.py
index 1a70e0befe623..e6b3eccf7afb8 100644
--- a/Lib/tkinter/test/test_ttk/test_extensions.py
+++ b/Lib/tkinter/test/test_ttk/test_extensions.py
@@ -2,7 +2,7 @@
 import unittest
 import tkinter
 from tkinter import ttk
-from test.support import requires, run_unittest
+from test.support import requires, run_unittest, gc_collect
 from tkinter.test.support import AbstractTkTest, AbstractDefaultRootTest
 
 requires('gui')
@@ -18,6 +18,7 @@ def test_widget_destroy(self):
         x = ttk.LabeledScale(self.root)
         var = x._variable._name
         x.destroy()
+        gc_collect()  # For PyPy or other GCs.
         self.assertRaises(tkinter.TclError, x.tk.globalgetvar, var)
 
         # manually created variable
@@ -30,6 +31,7 @@ def test_widget_destroy(self):
         else:
             self.assertEqual(float(x.tk.globalgetvar(name)), myvar.get())
         del myvar
+        gc_collect()  # For PyPy or other GCs.
         self.assertRaises(tkinter.TclError, x.tk.globalgetvar, name)
 
         # checking that the tracing callback is properly removed
@@ -171,6 +173,7 @@ def test_variable_change(self):
     def test_resize(self):
         x = ttk.LabeledScale(self.root)
         x.pack(expand=True, fill='both')
+        gc_collect()  # For PyPy or other GCs.
         x.update()
 
         width, height = x.master.winfo_width(), x.master.winfo_height()
@@ -206,6 +209,7 @@ def test_widget_destroy(self):
         optmenu.destroy()
         self.assertEqual(optmenu.tk.globalgetvar(name), var.get())
         del var
+        gc_collect()  # For PyPy or other GCs.
         self.assertRaises(tkinter.TclError, optmenu.tk.globalgetvar, name)
 
 
@@ -251,6 +255,7 @@ def test_menu(self):
 
         # check that variable is updated correctly
         optmenu.pack()
+        gc_collect()  # For PyPy or other GCs.
         optmenu['menu'].invoke(0)
         self.assertEqual(optmenu._variable.get(), items[0])
 
diff --git a/Lib/tkinter/test/test_ttk/test_widgets.py b/Lib/tkinter/test/test_ttk/test_widgets.py
index 1fac83a004a6d..ee5af82fd1b44 100644
--- a/Lib/tkinter/test/test_ttk/test_widgets.py
+++ b/Lib/tkinter/test/test_ttk/test_widgets.py
@@ -1,7 +1,7 @@
 import unittest
 import tkinter
 from tkinter import ttk, TclError
-from test.support import requires
+from test.support import requires, gc_collect
 import sys
 
 from tkinter.test.test_ttk.test_functions import MockTclObj
@@ -839,6 +839,7 @@ def test_set(self):
         self.assertEqual(conv(self.scale.get()), var.get())
         self.assertEqual(conv(self.scale.get()), max + 5)
         del var
+        gc_collect()  # For PyPy or other GCs.
 
         # the same happens with the value option
         self.scale['value'] = max + 10
diff --git a/Lib/unittest/test/test_assertions.py b/Lib/unittest/test/test_assertions.py
index f5e64d68e7b10..a0db3423b868a 100644
--- a/Lib/unittest/test/test_assertions.py
+++ b/Lib/unittest/test/test_assertions.py
@@ -2,6 +2,7 @@
 import warnings
 import weakref
 import unittest
+from test.support import gc_collect
 from itertools import product
 
 
@@ -124,8 +125,10 @@ def test_with(self):
                     self.foo()
 
         Foo("test_functional").run()
+        gc_collect()  # For PyPy or other GCs.
         self.assertIsNone(wr())
         Foo("test_with").run()
+        gc_collect()  # For PyPy or other GCs.
         self.assertIsNone(wr())
 
     def testAssertNotRegex(self):
diff --git a/Lib/unittest/test/test_case.py b/Lib/unittest/test/test_case.py
index f855c4dc00b31..590dd74997aaf 100644
--- a/Lib/unittest/test/test_case.py
+++ b/Lib/unittest/test/test_case.py
@@ -18,7 +18,7 @@
     TestEquality, TestHashing, LoggingResult, LegacyLoggingResult,
     ResultWithNoStartTestRunStopTestRun
 )
-from test.support import captured_stderr
+from test.support import captured_stderr, gc_collect
 
 
 log_foo = logging.getLogger('foo')
@@ -1845,6 +1845,7 @@ def test2(self):
         for method_name in ('test1', 'test2'):
             testcase = TestCase(method_name)
             testcase.run()
+            gc_collect()  # For PyPy or other GCs.
             self.assertEqual(MyException.ninstance, 0)
 
 
diff --git a/Misc/NEWS.d/next/Tests/2021-08-27-22-37-19.bpo-25130.ig4oJe.rst b/Misc/NEWS.d/next/Tests/2021-08-27-22-37-19.bpo-25130.ig4oJe.rst
new file mode 100644
index 0000000000000..43ce68bef4609
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2021-08-27-22-37-19.bpo-25130.ig4oJe.rst
@@ -0,0 +1 @@
+Add calls of :func:`gc.collect` in tests to support PyPy.


From webhook-mailer at python.org  Sun Aug 29 08:56:50 2021
From: webhook-mailer at python.org (ambv)
Date: Sun, 29 Aug 2021 12:56:50 -0000
Subject: [Python-checkins] bpo-42278: Use tempfile.TemporaryDirectory rather
 than tempfile.mktemp in pydoc (GH-23200) (GH-28025)
Message-ID: <mailman.1231.1630241811.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/45409518c1cec5ee91d49f69a2f8eb4196d242f0
commit: 45409518c1cec5ee91d49f69a2f8eb4196d242f0
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-29T14:56:45+02:00
summary:

bpo-42278: Use tempfile.TemporaryDirectory rather than tempfile.mktemp in pydoc (GH-23200) (GH-28025)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit c9227df5a9d8e958a2324cf0deba8524d1ded26a)

Co-authored-by: E-Paine <63801254+E-Paine at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Security/2021-08-29-12-39-44.bpo-42278.jvmQz_.rst
M Lib/pydoc.py

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index bdc0849f6af7a..4f9d227ff4603 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -1617,13 +1617,14 @@ def pipepager(text, cmd):
 def tempfilepager(text, cmd):
     """Page through text by invoking a program on a temporary file."""
     import tempfile
-    filename = tempfile.mktemp()
-    with open(filename, 'w', errors='backslashreplace') as file:
-        file.write(text)
-    try:
+    with tempfile.TemporaryDirectory() as tempdir:
+        filename = os.path.join(tempdir, 'pydoc.out')
+        with open(filename, 'w', errors='backslashreplace',
+                  encoding=os.device_encoding(0) if
+                  sys.platform == 'win32' else None
+                  ) as file:
+            file.write(text)
         os.system(cmd + ' "' + filename + '"')
-    finally:
-        os.unlink(filename)
 
 def _escape_stdout(text):
     # Escape non-encodable characters to avoid encoding errors later
diff --git a/Misc/NEWS.d/next/Security/2021-08-29-12-39-44.bpo-42278.jvmQz_.rst b/Misc/NEWS.d/next/Security/2021-08-29-12-39-44.bpo-42278.jvmQz_.rst
new file mode 100644
index 0000000000000..db880cd9026da
--- /dev/null
+++ b/Misc/NEWS.d/next/Security/2021-08-29-12-39-44.bpo-42278.jvmQz_.rst
@@ -0,0 +1,2 @@
+Replaced usage of :func:`tempfile.mktemp` with
+:class:`~tempfile.TemporaryDirectory` to avoid a potential race condition.


From webhook-mailer at python.org  Sun Aug 29 08:57:09 2021
From: webhook-mailer at python.org (ambv)
Date: Sun, 29 Aug 2021 12:57:09 -0000
Subject: [Python-checkins] bpo-42278: Use tempfile.TemporaryDirectory rather
 than tempfile.mktemp in pydoc (GH-23200) (GH-28026)
Message-ID: <mailman.1232.1630241831.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/193443bb708cba3a72e99e61dd6615a94f22f9e1
commit: 193443bb708cba3a72e99e61dd6615a94f22f9e1
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-29T14:57:05+02:00
summary:

bpo-42278: Use tempfile.TemporaryDirectory rather than tempfile.mktemp in pydoc (GH-23200) (GH-28026)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit c9227df5a9d8e958a2324cf0deba8524d1ded26a)

Co-authored-by: E-Paine <63801254+E-Paine at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Security/2021-08-29-12-39-44.bpo-42278.jvmQz_.rst
M Lib/pydoc.py

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index afec613dd85a0..fe4e230e4d5eb 100644
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -1529,13 +1529,14 @@ def pipepager(text, cmd):
 def tempfilepager(text, cmd):
     """Page through text by invoking a program on a temporary file."""
     import tempfile
-    filename = tempfile.mktemp()
-    with open(filename, 'w', errors='backslashreplace') as file:
-        file.write(text)
-    try:
+    with tempfile.TemporaryDirectory() as tempdir:
+        filename = os.path.join(tempdir, 'pydoc.out')
+        with open(filename, 'w', errors='backslashreplace',
+                  encoding=os.device_encoding(0) if
+                  sys.platform == 'win32' else None
+                  ) as file:
+            file.write(text)
         os.system(cmd + ' "' + filename + '"')
-    finally:
-        os.unlink(filename)
 
 def _escape_stdout(text):
     # Escape non-encodable characters to avoid encoding errors later
diff --git a/Misc/NEWS.d/next/Security/2021-08-29-12-39-44.bpo-42278.jvmQz_.rst b/Misc/NEWS.d/next/Security/2021-08-29-12-39-44.bpo-42278.jvmQz_.rst
new file mode 100644
index 0000000000000..db880cd9026da
--- /dev/null
+++ b/Misc/NEWS.d/next/Security/2021-08-29-12-39-44.bpo-42278.jvmQz_.rst
@@ -0,0 +1,2 @@
+Replaced usage of :func:`tempfile.mktemp` with
+:class:`~tempfile.TemporaryDirectory` to avoid a potential race condition.


From webhook-mailer at python.org  Sun Aug 29 08:57:26 2021
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 29 Aug 2021 12:57:26 -0000
Subject: [Python-checkins] bpo-42278: Use tempfile.TemporaryDirectory rather
 than tempfile.mktemp in pydoc (GH-23200)
Message-ID: <mailman.1233.1630241847.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/532ebba6c8697d214a0d94514ad0b2464a59cb7c
commit: 532ebba6c8697d214a0d94514ad0b2464a59cb7c
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-29T05:57:22-07:00
summary:

bpo-42278: Use tempfile.TemporaryDirectory rather than tempfile.mktemp in pydoc (GH-23200)


Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit c9227df5a9d8e958a2324cf0deba8524d1ded26a)

Co-authored-by: E-Paine <63801254+E-Paine at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Security/2021-08-29-12-39-44.bpo-42278.jvmQz_.rst
M Lib/pydoc.py

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index 9f0acd0271e07..4a8c10a379ed8 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -1618,13 +1618,14 @@ def pipepager(text, cmd):
 def tempfilepager(text, cmd):
     """Page through text by invoking a program on a temporary file."""
     import tempfile
-    filename = tempfile.mktemp()
-    with open(filename, 'w', errors='backslashreplace') as file:
-        file.write(text)
-    try:
+    with tempfile.TemporaryDirectory() as tempdir:
+        filename = os.path.join(tempdir, 'pydoc.out')
+        with open(filename, 'w', errors='backslashreplace',
+                  encoding=os.device_encoding(0) if
+                  sys.platform == 'win32' else None
+                  ) as file:
+            file.write(text)
         os.system(cmd + ' "' + filename + '"')
-    finally:
-        os.unlink(filename)
 
 def _escape_stdout(text):
     # Escape non-encodable characters to avoid encoding errors later
diff --git a/Misc/NEWS.d/next/Security/2021-08-29-12-39-44.bpo-42278.jvmQz_.rst b/Misc/NEWS.d/next/Security/2021-08-29-12-39-44.bpo-42278.jvmQz_.rst
new file mode 100644
index 0000000000000..db880cd9026da
--- /dev/null
+++ b/Misc/NEWS.d/next/Security/2021-08-29-12-39-44.bpo-42278.jvmQz_.rst
@@ -0,0 +1,2 @@
+Replaced usage of :func:`tempfile.mktemp` with
+:class:`~tempfile.TemporaryDirectory` to avoid a potential race condition.


From webhook-mailer at python.org  Sun Aug 29 10:08:32 2021
From: webhook-mailer at python.org (ambv)
Date: Sun, 29 Aug 2021 14:08:32 -0000
Subject: [Python-checkins] bpo-44394: Update libexpat copy to 2.4.1
 (GH-26945)
Message-ID: <mailman.1234.1630246113.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/3fc5d84046ddbd66abac5b598956ea34605a4e5d
commit: 3fc5d84046ddbd66abac5b598956ea34605a4e5d
branch: main
author: Victor Stinner <vstinner at python.org>
committer: ambv <lukasz at langa.pl>
date: 2021-08-29T16:08:24+02:00
summary:

bpo-44394: Update libexpat copy to 2.4.1 (GH-26945)

Update the vendored copy of libexpat to 2.4.1 (from 2.2.8) to get the
fix for the CVE-2013-0340 "Billion Laughs" vulnerability. This copy
is most used on Windows and macOS.

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst
M Doc/library/xml.rst
M Modules/expat/COPYING
M Modules/expat/ascii.h
M Modules/expat/asciitab.h
M Modules/expat/expat.h
M Modules/expat/expat_external.h
M Modules/expat/iasciitab.h
M Modules/expat/internal.h
M Modules/expat/latin1tab.h
M Modules/expat/nametab.h
M Modules/expat/siphash.h
M Modules/expat/utf8tab.h
M Modules/expat/winconfig.h
M Modules/expat/xmlparse.c
M Modules/expat/xmlrole.c
M Modules/expat/xmlrole.h
M Modules/expat/xmltok.c
M Modules/expat/xmltok.h
M Modules/expat/xmltok_impl.c
M Modules/expat/xmltok_impl.h
M Modules/expat/xmltok_ns.c

diff --git a/Doc/library/xml.rst b/Doc/library/xml.rst
index 1981cab7cd438d..e3b35162961147 100644
--- a/Doc/library/xml.rst
+++ b/Doc/library/xml.rst
@@ -60,22 +60,26 @@ circumvent firewalls.
 The following table gives an overview of the known attacks and whether
 the various modules are vulnerable to them.
 
-=========================  ==============   ===============   ==============   ==============   ==============
-kind                       sax              etree             minidom          pulldom          xmlrpc
-=========================  ==============   ===============   ==============   ==============   ==============
-billion laughs             **Vulnerable**   **Vulnerable**    **Vulnerable**   **Vulnerable**   **Vulnerable**
-quadratic blowup           **Vulnerable**   **Vulnerable**    **Vulnerable**   **Vulnerable**   **Vulnerable**
-external entity expansion  Safe (4)         Safe    (1)       Safe    (2)      Safe (4)         Safe    (3)
-`DTD`_ retrieval           Safe (4)         Safe              Safe             Safe (4)         Safe
-decompression bomb         Safe             Safe              Safe             Safe             **Vulnerable**
-=========================  ==============   ===============   ==============   ==============   ==============
-
-1. :mod:`xml.etree.ElementTree` doesn't expand external entities and raises a
+=========================  ==================  ==================  ==================  ==================  ==================
+kind                       sax                 etree               minidom             pulldom             xmlrpc
+=========================  ==================  ==================  ==================  ==================  ==================
+billion laughs             **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)
+quadratic blowup           **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)
+external entity expansion  Safe (5)            Safe (2)            Safe (3)            Safe (5)            Safe (4)
+`DTD`_ retrieval           Safe (5)            Safe                Safe                Safe (5)            Safe
+decompression bomb         Safe                Safe                Safe                Safe                **Vulnerable**
+=========================  ==================  ==================  ==================  ==================  ==================
+
+1. Expat 2.4.1 and newer is not vulnerable to the "billion laughs" and
+   "quadratic blowup" vulnerabilities. Items still listed as vulnerable due to
+   potential reliance on system-provided libraries. Check
+   :data:`pyexpat.EXPAT_VERSION`.
+2. :mod:`xml.etree.ElementTree` doesn't expand external entities and raises a
    :exc:`ParserError` when an entity occurs.
-2. :mod:`xml.dom.minidom` doesn't expand external entities and simply returns
+3. :mod:`xml.dom.minidom` doesn't expand external entities and simply returns
    the unexpanded entity verbatim.
-3. :mod:`xmlrpclib` doesn't expand external entities and omits them.
-4. Since Python 3.7.1, external general entities are no longer processed by
+4. :mod:`xmlrpclib` doesn't expand external entities and omits them.
+5. Since Python 3.7.1, external general entities are no longer processed by
    default.
 
 
diff --git a/Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst b/Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst
new file mode 100644
index 00000000000000..e32563d2535c7e
--- /dev/null
+++ b/Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst
@@ -0,0 +1,3 @@
+Update the vendored copy of libexpat to 2.4.1 (from 2.2.8) to get the fix
+for the CVE-2013-0340 "Billion Laughs" vulnerability. This copy is most used
+on Windows and macOS.
diff --git a/Modules/expat/COPYING b/Modules/expat/COPYING
index 8d288f0f28fddd..3c0142e71c8d4f 100644
--- a/Modules/expat/COPYING
+++ b/Modules/expat/COPYING
@@ -1,5 +1,5 @@
 Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
-Copyright (c) 2001-2017 Expat maintainers
+Copyright (c) 2001-2019 Expat maintainers
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/Modules/expat/ascii.h b/Modules/expat/ascii.h
index c3587e57332bff..1f594d2e54b4d2 100644
--- a/Modules/expat/ascii.h
+++ b/Modules/expat/ascii.h
@@ -6,8 +6,11 @@
                         \___/_/\_\ .__/ \__,_|\__|
                                  |_| XML parser
 
-   Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 1999-2000 Thai Open Source Software Center Ltd
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2007      Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/asciitab.h b/Modules/expat/asciitab.h
index 63b1d1b4482efa..af766fb24785ea 100644
--- a/Modules/expat/asciitab.h
+++ b/Modules/expat/asciitab.h
@@ -7,7 +7,9 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/expat.h b/Modules/expat/expat.h
index 6c8eb1fda4a30c..b7d6d354801b3d 100644
--- a/Modules/expat/expat.h
+++ b/Modules/expat/expat.h
@@ -7,7 +7,14 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2000-2005 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2001-2002 Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2016 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2016      Cristian Rodr?guez <crrodriguez at opensuse.org>
+   Copyright (c) 2016      Thomas Beutlich <tc at tbeu.de>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -115,7 +122,11 @@ enum XML_Error {
   XML_ERROR_RESERVED_PREFIX_XMLNS,
   XML_ERROR_RESERVED_NAMESPACE_URI,
   /* Added in 2.2.1. */
-  XML_ERROR_INVALID_ARGUMENT
+  XML_ERROR_INVALID_ARGUMENT,
+  /* Added in 2.3.0. */
+  XML_ERROR_NO_BUFFER,
+  /* Added in 2.4.0. */
+  XML_ERROR_AMPLIFICATION_LIMIT_BREACH
 };
 
 enum XML_Content_Type {
@@ -318,7 +329,7 @@ typedef void(XMLCALL *XML_EndDoctypeDeclHandler)(void *userData);
 
    For internal entities (<!ENTITY foo "bar">), value will
    be non-NULL and systemId, publicID, and notationName will be NULL.
-   The value string is NOT nul-terminated; the length is provided in
+   The value string is NOT null-terminated; the length is provided in
    the value_length argument. Since it is legal to have zero-length
    values, do not use this argument to test for internal entities.
 
@@ -513,7 +524,7 @@ typedef struct {
    Otherwise it must return XML_STATUS_ERROR.
 
    If info does not describe a suitable encoding, then the parser will
-   return an XML_UNKNOWN_ENCODING error.
+   return an XML_ERROR_UNKNOWN_ENCODING error.
 */
 typedef int(XMLCALL *XML_UnknownEncodingHandler)(void *encodingHandlerData,
                                                  const XML_Char *name,
@@ -707,7 +718,7 @@ XML_GetBase(XML_Parser parser);
 /* Returns the number of the attribute/value pairs passed in last call
    to the XML_StartElementHandler that were specified in the start-tag
    rather than defaulted. Each attribute/value pair counts as 2; thus
-   this correspondds to an index into the atts array passed to the
+   this corresponds to an index into the atts array passed to the
    XML_StartElementHandler.  Returns -1 if parser == NULL.
 */
 XMLPARSEAPI(int)
@@ -716,7 +727,7 @@ XML_GetSpecifiedAttributeCount(XML_Parser parser);
 /* Returns the index of the ID attribute passed in the last call to
    XML_StartElementHandler, or -1 if there is no ID attribute or
    parser == NULL.  Each attribute/value pair counts as 2; thus this
-   correspondds to an index into the atts array passed to the
+   corresponds to an index into the atts array passed to the
    XML_StartElementHandler.
 */
 XMLPARSEAPI(int)
@@ -997,7 +1008,10 @@ enum XML_FeatureEnum {
   XML_FEATURE_SIZEOF_XML_LCHAR,
   XML_FEATURE_NS,
   XML_FEATURE_LARGE_SIZE,
-  XML_FEATURE_ATTR_INFO
+  XML_FEATURE_ATTR_INFO,
+  /* Added in Expat 2.4.0. */
+  XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT,
+  XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT
   /* Additional features must be added to the end of this enum. */
 };
 
@@ -1010,12 +1024,24 @@ typedef struct {
 XMLPARSEAPI(const XML_Feature *)
 XML_GetFeatureList(void);
 
+#ifdef XML_DTD
+/* Added in Expat 2.4.0. */
+XMLPARSEAPI(XML_Bool)
+XML_SetBillionLaughsAttackProtectionMaximumAmplification(
+    XML_Parser parser, float maximumAmplificationFactor);
+
+/* Added in Expat 2.4.0. */
+XMLPARSEAPI(XML_Bool)
+XML_SetBillionLaughsAttackProtectionActivationThreshold(
+    XML_Parser parser, unsigned long long activationThresholdBytes);
+#endif
+
 /* Expat follows the semantic versioning convention.
    See http://semver.org.
 */
 #define XML_MAJOR_VERSION 2
-#define XML_MINOR_VERSION 2
-#define XML_MICRO_VERSION 8
+#define XML_MINOR_VERSION 4
+#define XML_MICRO_VERSION 1
 
 #ifdef __cplusplus
 }
diff --git a/Modules/expat/expat_external.h b/Modules/expat/expat_external.h
index f2b75dda8e2798..12c560e14716ff 100644
--- a/Modules/expat/expat_external.h
+++ b/Modules/expat/expat_external.h
@@ -7,7 +7,14 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2000-2004 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2001-2002 Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2006 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2016      Cristian Rodr?guez <crrodriguez at opensuse.org>
+   Copyright (c) 2016-2019 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2018      Yury Gribov <tetra2005 at gmail.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/iasciitab.h b/Modules/expat/iasciitab.h
index ea97cfcf678e06..5d8646f2a318b8 100644
--- a/Modules/expat/iasciitab.h
+++ b/Modules/expat/iasciitab.h
@@ -7,7 +7,9 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/internal.h b/Modules/expat/internal.h
index 60913dab762f8f..444eba0fb03170 100644
--- a/Modules/expat/internal.h
+++ b/Modules/expat/internal.h
@@ -25,8 +25,12 @@
                         \___/_/\_\ .__/ \__,_|\__|
                                  |_| XML parser
 
-   Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2002-2003 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002-2006 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2003      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2018      Yury Gribov <tetra2005 at gmail.com>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -101,22 +105,58 @@
 #  endif
 #endif
 
+#include <limits.h> // ULONG_MAX
+
+#if defined(_WIN32) && ! defined(__USE_MINGW_ANSI_STDIO)
+#  define EXPAT_FMT_ULL(midpart) "%" midpart "I64u"
+#  if defined(_WIN64) // Note: modifiers "td" and "zu" do not work for MinGW
+#    define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "I64d"
+#    define EXPAT_FMT_SIZE_T(midpart) "%" midpart "I64u"
+#  else
+#    define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "d"
+#    define EXPAT_FMT_SIZE_T(midpart) "%" midpart "u"
+#  endif
+#else
+#  define EXPAT_FMT_ULL(midpart) "%" midpart "llu"
+#  if ! defined(ULONG_MAX)
+#    error Compiler did not define ULONG_MAX for us
+#  elif ULONG_MAX == 18446744073709551615u // 2^64-1
+#    define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "ld"
+#    define EXPAT_FMT_SIZE_T(midpart) "%" midpart "lu"
+#  else
+#    define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "d"
+#    define EXPAT_FMT_SIZE_T(midpart) "%" midpart "u"
+#  endif
+#endif
+
 #ifndef UNUSED_P
 #  define UNUSED_P(p) (void)p
 #endif
 
+/* NOTE BEGIN If you ever patch these defaults to greater values
+              for non-attack XML payload in your environment,
+              please file a bug report with libexpat.  Thank you!
+*/
+#define EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT   \
+  100.0f
+#define EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT    \
+  8388608 // 8 MiB, 2^23
+/* NOTE END */
+
+#include "expat.h" // so we can use type XML_Parser below
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifdef XML_ENABLE_VISIBILITY
-#  if XML_ENABLE_VISIBILITY
-__attribute__((visibility("default")))
-#  endif
+void _INTERNAL_trim_to_complete_utf8_characters(const char *from,
+                                                const char **fromLimRef);
+
+#if defined(XML_DTD)
+unsigned long long testingAccountingGetCountBytesDirect(XML_Parser parser);
+unsigned long long testingAccountingGetCountBytesIndirect(XML_Parser parser);
+const char *unsignedCharToPrintable(unsigned char c);
 #endif
-void
-_INTERNAL_trim_to_complete_utf8_characters(const char *from,
-                                           const char **fromLimRef);
 
 #ifdef __cplusplus
 }
diff --git a/Modules/expat/latin1tab.h b/Modules/expat/latin1tab.h
index 6f916041355a86..b681d278af6569 100644
--- a/Modules/expat/latin1tab.h
+++ b/Modules/expat/latin1tab.h
@@ -7,7 +7,9 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/nametab.h b/Modules/expat/nametab.h
index 3681df348eebd6..63485446b96727 100644
--- a/Modules/expat/nametab.h
+++ b/Modules/expat/nametab.h
@@ -6,8 +6,8 @@
                         \___/_/\_\ .__/ \__,_|\__|
                                  |_| XML parser
 
-   Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000 Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2017 Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/siphash.h b/Modules/expat/siphash.h
index bfee65a332f1bf..e5406d7ee9eb54 100644
--- a/Modules/expat/siphash.h
+++ b/Modules/expat/siphash.h
@@ -11,6 +11,9 @@
  * --------------------------------------------------------------------------
  * HISTORY:
  *
+ * 2020-10-03  (Sebastian Pipping)
+ *   - Drop support for Visual Studio 9.0/2008 and earlier
+ *
  * 2019-08-03  (Sebastian Pipping)
  *   - Mark part of sip24_valid as to be excluded from clang-format
  *   - Re-format code using clang-format 9
@@ -96,15 +99,7 @@
 #define SIPHASH_H
 
 #include <stddef.h> /* size_t */
-
-#if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER < 1600)
-/* For vs2003/7.1 up to vs2008/9.0; _MSC_VER 1600 is vs2010/10.0 */
-typedef unsigned __int8 uint8_t;
-typedef unsigned __int32 uint32_t;
-typedef unsigned __int64 uint64_t;
-#else
-#  include <stdint.h> /* uint64_t uint32_t uint8_t */
-#endif
+#include <stdint.h> /* uint64_t uint32_t uint8_t */
 
 /*
  * Workaround to not require a C++11 compiler for using ULL suffix
diff --git a/Modules/expat/utf8tab.h b/Modules/expat/utf8tab.h
index a22986acbb9526..88efcf91cc16a6 100644
--- a/Modules/expat/utf8tab.h
+++ b/Modules/expat/utf8tab.h
@@ -7,7 +7,9 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/winconfig.h b/Modules/expat/winconfig.h
index 562a4a82dc1d63..2ecd61b5b94820 100644
--- a/Modules/expat/winconfig.h
+++ b/Modules/expat/winconfig.h
@@ -6,8 +6,10 @@
                         \___/_/\_\ .__/ \__,_|\__|
                                  |_| XML parser
 
-   Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2005      Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2017-2021 Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -40,17 +42,4 @@
 #include <memory.h>
 #include <string.h>
 
-#if defined(HAVE_EXPAT_CONFIG_H) /* e.g. MinGW */
-#  include <expat_config.h>
-#else /* !defined(HAVE_EXPAT_CONFIG_H) */
-
-#  define XML_NS 1
-#  define XML_DTD 1
-#  define XML_CONTEXT_BYTES 1024
-
-/* we will assume all Windows platforms are little endian */
-#  define BYTEORDER 1234
-
-#endif /* !defined(HAVE_EXPAT_CONFIG_H) */
-
 #endif /* ndef WINCONFIG_H */
diff --git a/Modules/expat/xmlparse.c b/Modules/expat/xmlparse.c
index e740f0e19c7d4a..5ba56eaea6357a 100644
--- a/Modules/expat/xmlparse.c
+++ b/Modules/expat/xmlparse.c
@@ -1,4 +1,4 @@
-/* f2d0ab6d1d4422a08cf1cf3bbdfba96b49dea42fb5ff4615e03a2a25c306e769 (2.2.8+)
+/* 8539b9040d9d901366a62560a064af7cb99811335784b363abc039c5b0ebc416 (2.4.1+)
                             __  __            _
                          ___\ \/ /_ __   __ _| |_
                         / _ \\  /| '_ \ / _` | __|
@@ -7,7 +7,31 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2000-2006 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2001-2002 Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2016 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2005-2009 Steven Solie <ssolie at users.sourceforge.net>
+   Copyright (c) 2016      Eric Rahm <erahm at mozilla.com>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2016      Gaurav <g.gupta at samsung.com>
+   Copyright (c) 2016      Thomas Beutlich <tc at tbeu.de>
+   Copyright (c) 2016      Gustavo Grieco <gustavo.grieco at imag.fr>
+   Copyright (c) 2016      Pascal Cuoq <cuoq at trust-in-soft.com>
+   Copyright (c) 2016      Ed Schouten <ed at nuxi.nl>
+   Copyright (c) 2017-2018 Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2017      V?clav Slav?k <vaclav at slavik.io>
+   Copyright (c) 2017      Viktor Szakats <commit at vsz.me>
+   Copyright (c) 2017      Chanho Park <chanho61.park at samsung.com>
+   Copyright (c) 2017      Rolf Eike Beer <eike at sf-mail.de>
+   Copyright (c) 2017      Hans Wennborg <hans at chromium.org>
+   Copyright (c) 2018      Anton Maklakov <antmak.pub at gmail.com>
+   Copyright (c) 2018      Benjamin Peterson <benjamin at python.org>
+   Copyright (c) 2018      Marco Maggi <marco.maggi-ipsu at poste.it>
+   Copyright (c) 2018      Mariusz Zaborski <oshogbo at vexillium.org>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
+   Copyright (c) 2019-2020 Ben Wagner <bungeman at chromium.org>
+   Copyright (c) 2019      Vadim Zeitlin <vadim at zeitlins.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -36,7 +60,9 @@
 
 #ifdef _WIN32
 /* force stdlib to define rand_s() */
-#  define _CRT_RAND_S
+#  if ! defined(_CRT_RAND_S)
+#    define _CRT_RAND_S
+#  endif
 #endif
 
 #include <stddef.h>
@@ -45,6 +71,8 @@
 #include <limits.h> /* UINT_MAX */
 #include <stdio.h>  /* fprintf */
 #include <stdlib.h> /* getenv, rand_s */
+#include <stdint.h> /* uintptr_t */
+#include <math.h>   /* isnan */
 
 #ifdef _WIN32
 #  define getpid GetCurrentProcessId
@@ -60,9 +88,9 @@
 
 #ifdef _WIN32
 #  include "winconfig.h"
-#elif defined(HAVE_EXPAT_CONFIG_H)
-#  include <expat_config.h>
-#endif /* ndef _WIN32 */
+#endif
+
+#include <expat_config.h>
 
 #include "ascii.h"
 #include "expat.h"
@@ -97,14 +125,14 @@
     enabled.  For end user security, that is probably not what you want. \
     \
     Your options include: \
-      * Linux + glibc >=2.25 (getrandom): HAVE_GETRANDOM, \
-      * Linux + glibc <2.25 (syscall SYS_getrandom): HAVE_SYSCALL_GETRANDOM, \
+      * Linux >=3.17 + glibc >=2.25 (getrandom): HAVE_GETRANDOM, \
+      * Linux >=3.17 + glibc (including <2.25) (syscall SYS_getrandom): HAVE_SYSCALL_GETRANDOM, \
       * BSD / macOS >=10.7 (arc4random_buf): HAVE_ARC4RANDOM_BUF, \
-      * BSD / macOS <10.7 (arc4random): HAVE_ARC4RANDOM, \
+      * BSD / macOS (including <10.7) (arc4random): HAVE_ARC4RANDOM, \
       * libbsd (arc4random_buf): HAVE_ARC4RANDOM_BUF + HAVE_LIBBSD, \
       * libbsd (arc4random): HAVE_ARC4RANDOM + HAVE_LIBBSD, \
-      * Linux / BSD / macOS (/dev/urandom): XML_DEV_URANDOM \
-      * Windows (rand_s): _WIN32. \
+      * Linux (including <3.17) / BSD / macOS (including <10.7) (/dev/urandom): XML_DEV_URANDOM, \
+      * Windows >=Vista (rand_s): _WIN32. \
     \
     If insist on not using any of these, bypass this error by defining \
     XML_POOR_ENTROPY; you have been warned. \
@@ -119,9 +147,7 @@
 #  define XmlGetInternalEncoding XmlGetUtf16InternalEncoding
 #  define XmlGetInternalEncodingNS XmlGetUtf16InternalEncodingNS
 #  define XmlEncode XmlUtf16Encode
-/* Using pointer subtraction to convert to integer type. */
-#  define MUST_CONVERT(enc, s)                                                 \
-    (! (enc)->isUtf16 || (((char *)(s) - (char *)NULL) & 1))
+#  define MUST_CONVERT(enc, s) (! (enc)->isUtf16 || (((uintptr_t)(s)) & 1))
 typedef unsigned short ICHAR;
 #else
 #  define XML_ENCODE_MAX XML_UTF8_ENCODE_MAX
@@ -371,6 +397,31 @@ typedef struct open_internal_entity {
   XML_Bool betweenDecl; /* WFC: PE Between Declarations */
 } OPEN_INTERNAL_ENTITY;
 
+enum XML_Account {
+  XML_ACCOUNT_DIRECT,           /* bytes directly passed to the Expat parser */
+  XML_ACCOUNT_ENTITY_EXPANSION, /* intermediate bytes produced during entity
+                                   expansion */
+  XML_ACCOUNT_NONE              /* i.e. do not account, was accounted already */
+};
+
+#ifdef XML_DTD
+typedef unsigned long long XmlBigCount;
+typedef struct accounting {
+  XmlBigCount countBytesDirect;
+  XmlBigCount countBytesIndirect;
+  int debugLevel;
+  float maximumAmplificationFactor; // >=1.0
+  unsigned long long activationThresholdBytes;
+} ACCOUNTING;
+
+typedef struct entity_stats {
+  unsigned int countEverOpened;
+  unsigned int currentDepth;
+  unsigned int maximumDepthSeen;
+  int debugLevel;
+} ENTITY_STATS;
+#endif /* XML_DTD */
+
 typedef enum XML_Error PTRCALL Processor(XML_Parser parser, const char *start,
                                          const char *end, const char **endPtr);
 
@@ -401,16 +452,18 @@ static enum XML_Error initializeEncoding(XML_Parser parser);
 static enum XML_Error doProlog(XML_Parser parser, const ENCODING *enc,
                                const char *s, const char *end, int tok,
                                const char *next, const char **nextPtr,
-                               XML_Bool haveMore, XML_Bool allowClosingDoctype);
+                               XML_Bool haveMore, XML_Bool allowClosingDoctype,
+                               enum XML_Account account);
 static enum XML_Error processInternalEntity(XML_Parser parser, ENTITY *entity,
                                             XML_Bool betweenDecl);
 static enum XML_Error doContent(XML_Parser parser, int startTagLevel,
                                 const ENCODING *enc, const char *start,
                                 const char *end, const char **endPtr,
-                                XML_Bool haveMore);
+                                XML_Bool haveMore, enum XML_Account account);
 static enum XML_Error doCdataSection(XML_Parser parser, const ENCODING *,
                                      const char **startPtr, const char *end,
-                                     const char **nextPtr, XML_Bool haveMore);
+                                     const char **nextPtr, XML_Bool haveMore,
+                                     enum XML_Account account);
 #ifdef XML_DTD
 static enum XML_Error doIgnoreSection(XML_Parser parser, const ENCODING *,
                                       const char **startPtr, const char *end,
@@ -420,7 +473,8 @@ static enum XML_Error doIgnoreSection(XML_Parser parser, const ENCODING *,
 static void freeBindings(XML_Parser parser, BINDING *bindings);
 static enum XML_Error storeAtts(XML_Parser parser, const ENCODING *,
                                 const char *s, TAG_NAME *tagNamePtr,
-                                BINDING **bindingsPtr);
+                                BINDING **bindingsPtr,
+                                enum XML_Account account);
 static enum XML_Error addBinding(XML_Parser parser, PREFIX *prefix,
                                  const ATTRIBUTE_ID *attId, const XML_Char *uri,
                                  BINDING **bindingsPtr);
@@ -429,15 +483,18 @@ static int defineAttribute(ELEMENT_TYPE *type, ATTRIBUTE_ID *, XML_Bool isCdata,
                            XML_Parser parser);
 static enum XML_Error storeAttributeValue(XML_Parser parser, const ENCODING *,
                                           XML_Bool isCdata, const char *,
-                                          const char *, STRING_POOL *);
+                                          const char *, STRING_POOL *,
+                                          enum XML_Account account);
 static enum XML_Error appendAttributeValue(XML_Parser parser, const ENCODING *,
                                            XML_Bool isCdata, const char *,
-                                           const char *, STRING_POOL *);
+                                           const char *, STRING_POOL *,
+                                           enum XML_Account account);
 static ATTRIBUTE_ID *getAttributeId(XML_Parser parser, const ENCODING *enc,
                                     const char *start, const char *end);
 static int setElementTypePrefix(XML_Parser parser, ELEMENT_TYPE *);
 static enum XML_Error storeEntityValue(XML_Parser parser, const ENCODING *enc,
-                                       const char *start, const char *end);
+                                       const char *start, const char *end,
+                                       enum XML_Account account);
 static int reportProcessingInstruction(XML_Parser parser, const ENCODING *enc,
                                        const char *start, const char *end);
 static int reportComment(XML_Parser parser, const ENCODING *enc,
@@ -501,6 +558,34 @@ static XML_Parser parserCreate(const XML_Char *encodingName,
 
 static void parserInit(XML_Parser parser, const XML_Char *encodingName);
 
+#ifdef XML_DTD
+static float accountingGetCurrentAmplification(XML_Parser rootParser);
+static void accountingReportStats(XML_Parser originParser, const char *epilog);
+static void accountingOnAbort(XML_Parser originParser);
+static void accountingReportDiff(XML_Parser rootParser,
+                                 unsigned int levelsAwayFromRootParser,
+                                 const char *before, const char *after,
+                                 ptrdiff_t bytesMore, int source_line,
+                                 enum XML_Account account);
+static XML_Bool accountingDiffTolerated(XML_Parser originParser, int tok,
+                                        const char *before, const char *after,
+                                        int source_line,
+                                        enum XML_Account account);
+
+static void entityTrackingReportStats(XML_Parser parser, ENTITY *entity,
+                                      const char *action, int sourceLine);
+static void entityTrackingOnOpen(XML_Parser parser, ENTITY *entity,
+                                 int sourceLine);
+static void entityTrackingOnClose(XML_Parser parser, ENTITY *entity,
+                                  int sourceLine);
+
+static XML_Parser getRootParserOf(XML_Parser parser,
+                                  unsigned int *outLevelDiff);
+#endif /* XML_DTD */
+
+static unsigned long getDebugLevel(const char *variableName,
+                                   unsigned long defaultDebugLevel);
+
 #define poolStart(pool) ((pool)->start)
 #define poolEnd(pool) ((pool)->ptr)
 #define poolLength(pool) ((pool)->ptr - (pool)->start)
@@ -614,6 +699,10 @@ struct XML_ParserStruct {
   enum XML_ParamEntityParsing m_paramEntityParsing;
 #endif
   unsigned long m_hash_secret_salt;
+#ifdef XML_DTD
+  ACCOUNTING m_accounting;
+  ENTITY_STATS m_entity_stats;
+#endif
 };
 
 #define MALLOC(parser, s) (parser->m_mem.malloc_fcn((s)))
@@ -734,6 +823,15 @@ writeRandomBytes_arc4random(void *target, size_t count) {
 
 #ifdef _WIN32
 
+/* Provide declaration of rand_s() for MinGW-32 (not 64, which has it),
+   as it didn't declare it in its header prior to version 5.3.0 of its
+   runtime package (mingwrt, containing stdlib.h).  The upstream fix
+   was introduced at https://osdn.net/projects/mingw/ticket/39658 . */
+#  if defined(__MINGW32__) && defined(__MINGW32_VERSION)                       \
+      && __MINGW32_VERSION < 5003000L && ! defined(__MINGW64_VERSION_MAJOR)
+__declspec(dllimport) int rand_s(unsigned int *);
+#  endif
+
 /* Obtain entropy on Windows using the rand_s() function which
  * generates cryptographically secure random numbers.  Internally it
  * uses RtlGenRandom API which is present in Windows XP and later.
@@ -789,9 +887,8 @@ gather_time_entropy(void) {
 
 static unsigned long
 ENTROPY_DEBUG(const char *label, unsigned long entropy) {
-  const char *const EXPAT_ENTROPY_DEBUG = getenv("EXPAT_ENTROPY_DEBUG");
-  if (EXPAT_ENTROPY_DEBUG && ! strcmp(EXPAT_ENTROPY_DEBUG, "1")) {
-    fprintf(stderr, "Entropy: %s --> 0x%0*lx (%lu bytes)\n", label,
+  if (getDebugLevel("EXPAT_ENTROPY_DEBUG", 0) >= 1u) {
+    fprintf(stderr, "expat: Entropy: %s --> 0x%0*lx (%lu bytes)\n", label,
             (int)sizeof(entropy) * 2, entropy, (unsigned long)sizeof(entropy));
   }
   return entropy;
@@ -1053,6 +1150,18 @@ parserInit(XML_Parser parser, const XML_Char *encodingName) {
   parser->m_paramEntityParsing = XML_PARAM_ENTITY_PARSING_NEVER;
 #endif
   parser->m_hash_secret_salt = 0;
+
+#ifdef XML_DTD
+  memset(&parser->m_accounting, 0, sizeof(ACCOUNTING));
+  parser->m_accounting.debugLevel = getDebugLevel("EXPAT_ACCOUNTING_DEBUG", 0u);
+  parser->m_accounting.maximumAmplificationFactor
+      = EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT;
+  parser->m_accounting.activationThresholdBytes
+      = EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT;
+
+  memset(&parser->m_entity_stats, 0, sizeof(ENTITY_STATS));
+  parser->m_entity_stats.debugLevel = getDebugLevel("EXPAT_ENTITY_DEBUG", 0u);
+#endif
 }
 
 /* moves list of bindings to m_freeBindingList */
@@ -1399,6 +1508,7 @@ XML_UseForeignDTD(XML_Parser parser, XML_Bool useDTD) {
   parser->m_useForeignDTD = useDTD;
   return XML_ERROR_NONE;
 #else
+  UNUSED_P(useDTD);
   return XML_ERROR_FEATURE_REQUIRES_XML_DTD;
 #endif
 }
@@ -1780,7 +1890,7 @@ XML_Parse(XML_Parser parser, const char *s, int len, int isFinal) {
     int nLeftOver;
     enum XML_Status result;
     /* Detect overflow (a+b > MAX <==> b > MAX-a) */
-    if (len > ((XML_Size)-1) / 2 - parser->m_parseEndByteIndex) {
+    if ((XML_Size)len > ((XML_Size)-1) / 2 - parser->m_parseEndByteIndex) {
       parser->m_errorCode = XML_ERROR_NO_MEMORY;
       parser->m_eventPtr = parser->m_eventEndPtr = NULL;
       parser->m_processor = errorProcessor;
@@ -1872,6 +1982,12 @@ XML_ParseBuffer(XML_Parser parser, int len, int isFinal) {
     parser->m_errorCode = XML_ERROR_FINISHED;
     return XML_STATUS_ERROR;
   case XML_INITIALIZED:
+    /* Has someone called XML_GetBuffer successfully before? */
+    if (! parser->m_bufferPtr) {
+      parser->m_errorCode = XML_ERROR_NO_BUFFER;
+      return XML_STATUS_ERROR;
+    }
+
     if (parser->m_parentParser == NULL && ! startParsing(parser)) {
       parser->m_errorCode = XML_ERROR_NO_MEMORY;
       return XML_STATUS_ERROR;
@@ -2155,7 +2271,7 @@ XML_GetInputContext(XML_Parser parser, int *offset, int *size) {
   (void)offset;
   (void)size;
 #endif /* defined XML_CONTEXT_BYTES */
-  return (char *)0;
+  return (const char *)0;
 }
 
 XML_Size XMLCALL
@@ -2316,6 +2432,14 @@ XML_ErrorString(enum XML_Error code) {
   /* Added in 2.2.5. */
   case XML_ERROR_INVALID_ARGUMENT: /* Constant added in 2.2.1, already */
     return XML_L("invalid argument");
+    /* Added in 2.3.0. */
+  case XML_ERROR_NO_BUFFER:
+    return XML_L(
+        "a successful prior call to function XML_GetBuffer is required");
+  /* Added in 2.4.0. */
+  case XML_ERROR_AMPLIFICATION_LIMIT_BREACH:
+    return XML_L(
+        "limit on input amplification factor (from DTD and entities) breached");
   }
   return NULL;
 }
@@ -2352,41 +2476,75 @@ XML_ExpatVersionInfo(void) {
 
 const XML_Feature *XMLCALL
 XML_GetFeatureList(void) {
-  static const XML_Feature features[]
-      = {{XML_FEATURE_SIZEOF_XML_CHAR, XML_L("sizeof(XML_Char)"),
-          sizeof(XML_Char)},
-         {XML_FEATURE_SIZEOF_XML_LCHAR, XML_L("sizeof(XML_LChar)"),
-          sizeof(XML_LChar)},
+  static const XML_Feature features[] = {
+      {XML_FEATURE_SIZEOF_XML_CHAR, XML_L("sizeof(XML_Char)"),
+       sizeof(XML_Char)},
+      {XML_FEATURE_SIZEOF_XML_LCHAR, XML_L("sizeof(XML_LChar)"),
+       sizeof(XML_LChar)},
 #ifdef XML_UNICODE
-         {XML_FEATURE_UNICODE, XML_L("XML_UNICODE"), 0},
+      {XML_FEATURE_UNICODE, XML_L("XML_UNICODE"), 0},
 #endif
 #ifdef XML_UNICODE_WCHAR_T
-         {XML_FEATURE_UNICODE_WCHAR_T, XML_L("XML_UNICODE_WCHAR_T"), 0},
+      {XML_FEATURE_UNICODE_WCHAR_T, XML_L("XML_UNICODE_WCHAR_T"), 0},
 #endif
 #ifdef XML_DTD
-         {XML_FEATURE_DTD, XML_L("XML_DTD"), 0},
+      {XML_FEATURE_DTD, XML_L("XML_DTD"), 0},
 #endif
 #ifdef XML_CONTEXT_BYTES
-         {XML_FEATURE_CONTEXT_BYTES, XML_L("XML_CONTEXT_BYTES"),
-          XML_CONTEXT_BYTES},
+      {XML_FEATURE_CONTEXT_BYTES, XML_L("XML_CONTEXT_BYTES"),
+       XML_CONTEXT_BYTES},
 #endif
 #ifdef XML_MIN_SIZE
-         {XML_FEATURE_MIN_SIZE, XML_L("XML_MIN_SIZE"), 0},
+      {XML_FEATURE_MIN_SIZE, XML_L("XML_MIN_SIZE"), 0},
 #endif
 #ifdef XML_NS
-         {XML_FEATURE_NS, XML_L("XML_NS"), 0},
+      {XML_FEATURE_NS, XML_L("XML_NS"), 0},
 #endif
 #ifdef XML_LARGE_SIZE
-         {XML_FEATURE_LARGE_SIZE, XML_L("XML_LARGE_SIZE"), 0},
+      {XML_FEATURE_LARGE_SIZE, XML_L("XML_LARGE_SIZE"), 0},
 #endif
 #ifdef XML_ATTR_INFO
-         {XML_FEATURE_ATTR_INFO, XML_L("XML_ATTR_INFO"), 0},
+      {XML_FEATURE_ATTR_INFO, XML_L("XML_ATTR_INFO"), 0},
+#endif
+#ifdef XML_DTD
+      /* Added in Expat 2.4.0. */
+      {XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT,
+       XML_L("XML_BLAP_MAX_AMP"),
+       (long int)
+           EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT},
+      {XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT,
+       XML_L("XML_BLAP_ACT_THRES"),
+       EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT},
 #endif
-         {XML_FEATURE_END, NULL, 0}};
+      {XML_FEATURE_END, NULL, 0}};
 
   return features;
 }
 
+#ifdef XML_DTD
+XML_Bool XMLCALL
+XML_SetBillionLaughsAttackProtectionMaximumAmplification(
+    XML_Parser parser, float maximumAmplificationFactor) {
+  if ((parser == NULL) || (parser->m_parentParser != NULL)
+      || isnan(maximumAmplificationFactor)
+      || (maximumAmplificationFactor < 1.0f)) {
+    return XML_FALSE;
+  }
+  parser->m_accounting.maximumAmplificationFactor = maximumAmplificationFactor;
+  return XML_TRUE;
+}
+
+XML_Bool XMLCALL
+XML_SetBillionLaughsAttackProtectionActivationThreshold(
+    XML_Parser parser, unsigned long long activationThresholdBytes) {
+  if ((parser == NULL) || (parser->m_parentParser != NULL)) {
+    return XML_FALSE;
+  }
+  parser->m_accounting.activationThresholdBytes = activationThresholdBytes;
+  return XML_TRUE;
+}
+#endif /* XML_DTD */
+
 /* Initially tag->rawName always points into the parse buffer;
    for those TAG instances opened while the current parse buffer was
    processed, and not yet closed, we need to store tag->rawName in a more
@@ -2439,9 +2597,9 @@ storeRawNames(XML_Parser parser) {
 static enum XML_Error PTRCALL
 contentProcessor(XML_Parser parser, const char *start, const char *end,
                  const char **endPtr) {
-  enum XML_Error result
-      = doContent(parser, 0, parser->m_encoding, start, end, endPtr,
-                  (XML_Bool)! parser->m_parsingStatus.finalBuffer);
+  enum XML_Error result = doContent(
+      parser, 0, parser->m_encoding, start, end, endPtr,
+      (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_ACCOUNT_DIRECT);
   if (result == XML_ERROR_NONE) {
     if (! storeRawNames(parser))
       return XML_ERROR_NO_MEMORY;
@@ -2466,6 +2624,14 @@ externalEntityInitProcessor2(XML_Parser parser, const char *start,
   int tok = XmlContentTok(parser->m_encoding, start, end, &next);
   switch (tok) {
   case XML_TOK_BOM:
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, start, next, __LINE__,
+                                  XML_ACCOUNT_DIRECT)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#endif /* XML_DTD */
+
     /* If we are at the end of the buffer, this would cause the next stage,
        i.e. externalEntityInitProcessor3, to pass control directly to
        doContent (by detecting XML_TOK_NONE) without processing any xml text
@@ -2503,6 +2669,10 @@ externalEntityInitProcessor3(XML_Parser parser, const char *start,
   const char *next = start; /* XmlContentTok doesn't always set the last arg */
   parser->m_eventPtr = start;
   tok = XmlContentTok(parser->m_encoding, start, end, &next);
+  /* Note: These bytes are accounted later in:
+           - processXmlDecl
+           - externalEntityContentProcessor
+  */
   parser->m_eventEndPtr = next;
 
   switch (tok) {
@@ -2544,7 +2714,8 @@ externalEntityContentProcessor(XML_Parser parser, const char *start,
                                const char *end, const char **endPtr) {
   enum XML_Error result
       = doContent(parser, 1, parser->m_encoding, start, end, endPtr,
-                  (XML_Bool)! parser->m_parsingStatus.finalBuffer);
+                  (XML_Bool)! parser->m_parsingStatus.finalBuffer,
+                  XML_ACCOUNT_ENTITY_EXPANSION);
   if (result == XML_ERROR_NONE) {
     if (! storeRawNames(parser))
       return XML_ERROR_NO_MEMORY;
@@ -2555,7 +2726,7 @@ externalEntityContentProcessor(XML_Parser parser, const char *start,
 static enum XML_Error
 doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
           const char *s, const char *end, const char **nextPtr,
-          XML_Bool haveMore) {
+          XML_Bool haveMore, enum XML_Account account) {
   /* save one level of indirection */
   DTD *const dtd = parser->m_dtd;
 
@@ -2573,6 +2744,17 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
   for (;;) {
     const char *next = s; /* XmlContentTok doesn't always set the last arg */
     int tok = XmlContentTok(enc, s, end, &next);
+#ifdef XML_DTD
+    const char *accountAfter
+        = ((tok == XML_TOK_TRAILING_RSQB) || (tok == XML_TOK_TRAILING_CR))
+              ? (haveMore ? s /* i.e. 0 bytes */ : end)
+              : next;
+    if (! accountingDiffTolerated(parser, tok, s, accountAfter, __LINE__,
+                                  account)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#endif
     *eventEndPP = next;
     switch (tok) {
     case XML_TOK_TRAILING_CR:
@@ -2628,6 +2810,14 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
       XML_Char ch = (XML_Char)XmlPredefinedEntityName(
           enc, s + enc->minBytesPerChar, next - enc->minBytesPerChar);
       if (ch) {
+#ifdef XML_DTD
+        /* NOTE: We are replacing 4-6 characters original input for 1 character
+         *       so there is no amplification and hence recording without
+         *       protection. */
+        accountingDiffTolerated(parser, tok, (char *)&ch,
+                                ((char *)&ch) + sizeof(XML_Char), __LINE__,
+                                XML_ACCOUNT_ENTITY_EXPANSION);
+#endif /* XML_DTD */
         if (parser->m_characterDataHandler)
           parser->m_characterDataHandler(parser->m_handlerArg, &ch, 1);
         else if (parser->m_defaultHandler)
@@ -2746,7 +2936,8 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
       }
       tag->name.str = (XML_Char *)tag->buf;
       *toPtr = XML_T('\0');
-      result = storeAtts(parser, enc, s, &(tag->name), &(tag->bindings));
+      result
+          = storeAtts(parser, enc, s, &(tag->name), &(tag->bindings), account);
       if (result)
         return result;
       if (parser->m_startElementHandler)
@@ -2770,7 +2961,8 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
       if (! name.str)
         return XML_ERROR_NO_MEMORY;
       poolFinish(&parser->m_tempPool);
-      result = storeAtts(parser, enc, s, &name, &bindings);
+      result = storeAtts(parser, enc, s, &name, &bindings,
+                         XML_ACCOUNT_NONE /* token spans whole start tag */);
       if (result != XML_ERROR_NONE) {
         freeBindings(parser, bindings);
         return result;
@@ -2905,7 +3097,8 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
       /* END disabled code */
       else if (parser->m_defaultHandler)
         reportDefault(parser, enc, s, next);
-      result = doCdataSection(parser, enc, &next, end, nextPtr, haveMore);
+      result
+          = doCdataSection(parser, enc, &next, end, nextPtr, haveMore, account);
       if (result != XML_ERROR_NONE)
         return result;
       else if (! next) {
@@ -3034,7 +3227,8 @@ freeBindings(XML_Parser parser, BINDING *bindings) {
 */
 static enum XML_Error
 storeAtts(XML_Parser parser, const ENCODING *enc, const char *attStr,
-          TAG_NAME *tagNamePtr, BINDING **bindingsPtr) {
+          TAG_NAME *tagNamePtr, BINDING **bindingsPtr,
+          enum XML_Account account) {
   DTD *const dtd = parser->m_dtd; /* save one level of indirection */
   ELEMENT_TYPE *elementType;
   int nDefaultAtts;
@@ -3144,7 +3338,7 @@ storeAtts(XML_Parser parser, const ENCODING *enc, const char *attStr,
       /* normalize the attribute value */
       result = storeAttributeValue(
           parser, enc, isCdata, parser->m_atts[i].valuePtr,
-          parser->m_atts[i].valueEnd, &parser->m_tempPool);
+          parser->m_atts[i].valueEnd, &parser->m_tempPool, account);
       if (result)
         return result;
       appAtts[attIndex] = poolStart(&parser->m_tempPool);
@@ -3533,9 +3727,9 @@ addBinding(XML_Parser parser, PREFIX *prefix, const ATTRIBUTE_ID *attId,
 static enum XML_Error PTRCALL
 cdataSectionProcessor(XML_Parser parser, const char *start, const char *end,
                       const char **endPtr) {
-  enum XML_Error result
-      = doCdataSection(parser, parser->m_encoding, &start, end, endPtr,
-                       (XML_Bool)! parser->m_parsingStatus.finalBuffer);
+  enum XML_Error result = doCdataSection(
+      parser, parser->m_encoding, &start, end, endPtr,
+      (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_ACCOUNT_DIRECT);
   if (result != XML_ERROR_NONE)
     return result;
   if (start) {
@@ -3555,7 +3749,8 @@ cdataSectionProcessor(XML_Parser parser, const char *start, const char *end,
 */
 static enum XML_Error
 doCdataSection(XML_Parser parser, const ENCODING *enc, const char **startPtr,
-               const char *end, const char **nextPtr, XML_Bool haveMore) {
+               const char *end, const char **nextPtr, XML_Bool haveMore,
+               enum XML_Account account) {
   const char *s = *startPtr;
   const char **eventPP;
   const char **eventEndPP;
@@ -3571,8 +3766,16 @@ doCdataSection(XML_Parser parser, const ENCODING *enc, const char **startPtr,
   *startPtr = NULL;
 
   for (;;) {
-    const char *next;
+    const char *next = s; /* in case of XML_TOK_NONE or XML_TOK_PARTIAL */
     int tok = XmlCdataSectionTok(enc, s, end, &next);
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, s, next, __LINE__, account)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#else
+    UNUSED_P(account);
+#endif
     *eventEndPP = next;
     switch (tok) {
     case XML_TOK_CDATA_SECT_CLOSE:
@@ -3689,7 +3892,7 @@ ignoreSectionProcessor(XML_Parser parser, const char *start, const char *end,
 static enum XML_Error
 doIgnoreSection(XML_Parser parser, const ENCODING *enc, const char **startPtr,
                 const char *end, const char **nextPtr, XML_Bool haveMore) {
-  const char *next;
+  const char *next = *startPtr; /* in case of XML_TOK_NONE or XML_TOK_PARTIAL */
   int tok;
   const char *s = *startPtr;
   const char **eventPP;
@@ -3717,6 +3920,13 @@ doIgnoreSection(XML_Parser parser, const ENCODING *enc, const char **startPtr,
   *eventPP = s;
   *startPtr = NULL;
   tok = XmlIgnoreSectionTok(enc, s, end, &next);
+#  ifdef XML_DTD
+  if (! accountingDiffTolerated(parser, tok, s, next, __LINE__,
+                                XML_ACCOUNT_DIRECT)) {
+    accountingOnAbort(parser);
+    return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+  }
+#  endif
   *eventEndPP = next;
   switch (tok) {
   case XML_TOK_IGNORE_SECT:
@@ -3801,6 +4011,15 @@ processXmlDecl(XML_Parser parser, int isGeneralTextEntity, const char *s,
   const char *versionend;
   const XML_Char *storedversion = NULL;
   int standalone = -1;
+
+#ifdef XML_DTD
+  if (! accountingDiffTolerated(parser, XML_TOK_XML_DECL, s, next, __LINE__,
+                                XML_ACCOUNT_DIRECT)) {
+    accountingOnAbort(parser);
+    return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+  }
+#endif
+
   if (! (parser->m_ns ? XmlParseXmlDeclNS : XmlParseXmlDecl)(
           isGeneralTextEntity, parser->m_encoding, s, next, &parser->m_eventPtr,
           &version, &versionend, &encodingName, &newEncoding, &standalone)) {
@@ -3950,6 +4169,10 @@ entityValueInitProcessor(XML_Parser parser, const char *s, const char *end,
 
   for (;;) {
     tok = XmlPrologTok(parser->m_encoding, start, end, &next);
+    /* Note: Except for XML_TOK_BOM below, these bytes are accounted later in:
+             - storeEntityValue
+             - processXmlDecl
+    */
     parser->m_eventEndPtr = next;
     if (tok <= 0) {
       if (! parser->m_parsingStatus.finalBuffer && tok != XML_TOK_INVALID) {
@@ -3968,7 +4191,8 @@ entityValueInitProcessor(XML_Parser parser, const char *s, const char *end,
         break;
       }
       /* found end of entity value - can store it now */
-      return storeEntityValue(parser, parser->m_encoding, s, end);
+      return storeEntityValue(parser, parser->m_encoding, s, end,
+                              XML_ACCOUNT_DIRECT);
     } else if (tok == XML_TOK_XML_DECL) {
       enum XML_Error result;
       result = processXmlDecl(parser, 0, start, next);
@@ -3995,6 +4219,14 @@ entityValueInitProcessor(XML_Parser parser, const char *s, const char *end,
     */
     else if (tok == XML_TOK_BOM && next == end
              && ! parser->m_parsingStatus.finalBuffer) {
+#  ifdef XML_DTD
+      if (! accountingDiffTolerated(parser, tok, s, next, __LINE__,
+                                    XML_ACCOUNT_DIRECT)) {
+        accountingOnAbort(parser);
+        return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+      }
+#  endif
+
       *nextPtr = next;
       return XML_ERROR_NONE;
     }
@@ -4037,16 +4269,24 @@ externalParEntProcessor(XML_Parser parser, const char *s, const char *end,
   }
   /* This would cause the next stage, i.e. doProlog to be passed XML_TOK_BOM.
      However, when parsing an external subset, doProlog will not accept a BOM
-     as valid, and report a syntax error, so we have to skip the BOM
+     as valid, and report a syntax error, so we have to skip the BOM, and
+     account for the BOM bytes.
   */
   else if (tok == XML_TOK_BOM) {
+    if (! accountingDiffTolerated(parser, tok, s, next, __LINE__,
+                                  XML_ACCOUNT_DIRECT)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+
     s = next;
     tok = XmlPrologTok(parser->m_encoding, s, end, &next);
   }
 
   parser->m_processor = prologProcessor;
   return doProlog(parser, parser->m_encoding, s, end, tok, next, nextPtr,
-                  (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE);
+                  (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE,
+                  XML_ACCOUNT_DIRECT);
 }
 
 static enum XML_Error PTRCALL
@@ -4059,6 +4299,9 @@ entityValueProcessor(XML_Parser parser, const char *s, const char *end,
 
   for (;;) {
     tok = XmlPrologTok(enc, start, end, &next);
+    /* Note: These bytes are accounted later in:
+             - storeEntityValue
+    */
     if (tok <= 0) {
       if (! parser->m_parsingStatus.finalBuffer && tok != XML_TOK_INVALID) {
         *nextPtr = s;
@@ -4076,7 +4319,7 @@ entityValueProcessor(XML_Parser parser, const char *s, const char *end,
         break;
       }
       /* found end of entity value - can store it now */
-      return storeEntityValue(parser, enc, s, end);
+      return storeEntityValue(parser, enc, s, end, XML_ACCOUNT_DIRECT);
     }
     start = next;
   }
@@ -4090,13 +4333,14 @@ prologProcessor(XML_Parser parser, const char *s, const char *end,
   const char *next = s;
   int tok = XmlPrologTok(parser->m_encoding, s, end, &next);
   return doProlog(parser, parser->m_encoding, s, end, tok, next, nextPtr,
-                  (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE);
+                  (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE,
+                  XML_ACCOUNT_DIRECT);
 }
 
 static enum XML_Error
 doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
          int tok, const char *next, const char **nextPtr, XML_Bool haveMore,
-         XML_Bool allowClosingDoctype) {
+         XML_Bool allowClosingDoctype, enum XML_Account account) {
 #ifdef XML_DTD
   static const XML_Char externalSubsetName[] = {ASCII_HASH, '\0'};
 #endif /* XML_DTD */
@@ -4123,6 +4367,10 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
   static const XML_Char enumValueSep[] = {ASCII_PIPE, '\0'};
   static const XML_Char enumValueStart[] = {ASCII_LPAREN, '\0'};
 
+#ifndef XML_DTD
+  UNUSED_P(account);
+#endif
+
   /* save one level of indirection */
   DTD *const dtd = parser->m_dtd;
 
@@ -4187,6 +4435,19 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
       }
     }
     role = XmlTokenRole(&parser->m_prologState, tok, s, next, enc);
+#ifdef XML_DTD
+    switch (role) {
+    case XML_ROLE_INSTANCE_START: // bytes accounted in contentProcessor
+    case XML_ROLE_XML_DECL:       // bytes accounted in processXmlDecl
+    case XML_ROLE_TEXT_DECL:      // bytes accounted in processXmlDecl
+      break;
+    default:
+      if (! accountingDiffTolerated(parser, tok, s, next, __LINE__, account)) {
+        accountingOnAbort(parser);
+        return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+      }
+    }
+#endif
     switch (role) {
     case XML_ROLE_XML_DECL: {
       enum XML_Error result = processXmlDecl(parser, 0, s, next);
@@ -4462,7 +4723,8 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
         const XML_Char *attVal;
         enum XML_Error result = storeAttributeValue(
             parser, enc, parser->m_declAttributeIsCdata,
-            s + enc->minBytesPerChar, next - enc->minBytesPerChar, &dtd->pool);
+            s + enc->minBytesPerChar, next - enc->minBytesPerChar, &dtd->pool,
+            XML_ACCOUNT_NONE);
         if (result)
           return result;
         attVal = poolStart(&dtd->pool);
@@ -4495,8 +4757,9 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
       break;
     case XML_ROLE_ENTITY_VALUE:
       if (dtd->keepProcessing) {
-        enum XML_Error result = storeEntityValue(
-            parser, enc, s + enc->minBytesPerChar, next - enc->minBytesPerChar);
+        enum XML_Error result
+            = storeEntityValue(parser, enc, s + enc->minBytesPerChar,
+                               next - enc->minBytesPerChar, XML_ACCOUNT_NONE);
         if (parser->m_declEntity) {
           parser->m_declEntity->textPtr = poolStart(&dtd->entityValuePool);
           parser->m_declEntity->textLen
@@ -4886,12 +5149,15 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
         if (parser->m_externalEntityRefHandler) {
           dtd->paramEntityRead = XML_FALSE;
           entity->open = XML_TRUE;
+          entityTrackingOnOpen(parser, entity, __LINE__);
           if (! parser->m_externalEntityRefHandler(
                   parser->m_externalEntityRefHandlerArg, 0, entity->base,
                   entity->systemId, entity->publicId)) {
+            entityTrackingOnClose(parser, entity, __LINE__);
             entity->open = XML_FALSE;
             return XML_ERROR_EXTERNAL_ENTITY_HANDLING;
           }
+          entityTrackingOnClose(parser, entity, __LINE__);
           entity->open = XML_FALSE;
           handleDefault = XML_FALSE;
           if (! dtd->paramEntityRead) {
@@ -5089,6 +5355,13 @@ epilogProcessor(XML_Parser parser, const char *s, const char *end,
   for (;;) {
     const char *next = NULL;
     int tok = XmlPrologTok(parser->m_encoding, s, end, &next);
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, s, next, __LINE__,
+                                  XML_ACCOUNT_DIRECT)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#endif
     parser->m_eventEndPtr = next;
     switch (tok) {
     /* report partial linebreak - it might be the last token */
@@ -5162,6 +5435,9 @@ processInternalEntity(XML_Parser parser, ENTITY *entity, XML_Bool betweenDecl) {
       return XML_ERROR_NO_MEMORY;
   }
   entity->open = XML_TRUE;
+#ifdef XML_DTD
+  entityTrackingOnOpen(parser, entity, __LINE__);
+#endif
   entity->processed = 0;
   openEntity->next = parser->m_openInternalEntities;
   parser->m_openInternalEntities = openEntity;
@@ -5170,8 +5446,8 @@ processInternalEntity(XML_Parser parser, ENTITY *entity, XML_Bool betweenDecl) {
   openEntity->betweenDecl = betweenDecl;
   openEntity->internalEventPtr = NULL;
   openEntity->internalEventEndPtr = NULL;
-  textStart = (char *)entity->textPtr;
-  textEnd = (char *)(entity->textPtr + entity->textLen);
+  textStart = (const char *)entity->textPtr;
+  textEnd = (const char *)(entity->textPtr + entity->textLen);
   /* Set a safe default value in case 'next' does not get set */
   next = textStart;
 
@@ -5180,17 +5456,22 @@ processInternalEntity(XML_Parser parser, ENTITY *entity, XML_Bool betweenDecl) {
     int tok
         = XmlPrologTok(parser->m_internalEncoding, textStart, textEnd, &next);
     result = doProlog(parser, parser->m_internalEncoding, textStart, textEnd,
-                      tok, next, &next, XML_FALSE, XML_FALSE);
+                      tok, next, &next, XML_FALSE, XML_FALSE,
+                      XML_ACCOUNT_ENTITY_EXPANSION);
   } else
 #endif /* XML_DTD */
     result = doContent(parser, parser->m_tagLevel, parser->m_internalEncoding,
-                       textStart, textEnd, &next, XML_FALSE);
+                       textStart, textEnd, &next, XML_FALSE,
+                       XML_ACCOUNT_ENTITY_EXPANSION);
 
   if (result == XML_ERROR_NONE) {
     if (textEnd != next && parser->m_parsingStatus.parsing == XML_SUSPENDED) {
       entity->processed = (int)(next - textStart);
       parser->m_processor = internalEntityProcessor;
     } else {
+#ifdef XML_DTD
+      entityTrackingOnClose(parser, entity, __LINE__);
+#endif /* XML_DTD */
       entity->open = XML_FALSE;
       parser->m_openInternalEntities = openEntity->next;
       /* put openEntity back in list of free instances */
@@ -5213,8 +5494,8 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,
     return XML_ERROR_UNEXPECTED_STATE;
 
   entity = openEntity->entity;
-  textStart = ((char *)entity->textPtr) + entity->processed;
-  textEnd = (char *)(entity->textPtr + entity->textLen);
+  textStart = ((const char *)entity->textPtr) + entity->processed;
+  textEnd = (const char *)(entity->textPtr + entity->textLen);
   /* Set a safe default value in case 'next' does not get set */
   next = textStart;
 
@@ -5223,20 +5504,24 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,
     int tok
         = XmlPrologTok(parser->m_internalEncoding, textStart, textEnd, &next);
     result = doProlog(parser, parser->m_internalEncoding, textStart, textEnd,
-                      tok, next, &next, XML_FALSE, XML_TRUE);
+                      tok, next, &next, XML_FALSE, XML_TRUE,
+                      XML_ACCOUNT_ENTITY_EXPANSION);
   } else
 #endif /* XML_DTD */
     result = doContent(parser, openEntity->startTagLevel,
                        parser->m_internalEncoding, textStart, textEnd, &next,
-                       XML_FALSE);
+                       XML_FALSE, XML_ACCOUNT_ENTITY_EXPANSION);
 
   if (result != XML_ERROR_NONE)
     return result;
   else if (textEnd != next
            && parser->m_parsingStatus.parsing == XML_SUSPENDED) {
-    entity->processed = (int)(next - (char *)entity->textPtr);
+    entity->processed = (int)(next - (const char *)entity->textPtr);
     return result;
   } else {
+#ifdef XML_DTD
+    entityTrackingOnClose(parser, entity, __LINE__);
+#endif
     entity->open = XML_FALSE;
     parser->m_openInternalEntities = openEntity->next;
     /* put openEntity back in list of free instances */
@@ -5250,7 +5535,8 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,
     parser->m_processor = prologProcessor;
     tok = XmlPrologTok(parser->m_encoding, s, end, &next);
     return doProlog(parser, parser->m_encoding, s, end, tok, next, nextPtr,
-                    (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE);
+                    (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE,
+                    XML_ACCOUNT_DIRECT);
   } else
 #endif /* XML_DTD */
   {
@@ -5258,7 +5544,8 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,
     /* see externalEntityContentProcessor vs contentProcessor */
     return doContent(parser, parser->m_parentParser ? 1 : 0, parser->m_encoding,
                      s, end, nextPtr,
-                     (XML_Bool)! parser->m_parsingStatus.finalBuffer);
+                     (XML_Bool)! parser->m_parsingStatus.finalBuffer,
+                     XML_ACCOUNT_DIRECT);
   }
 }
 
@@ -5273,9 +5560,10 @@ errorProcessor(XML_Parser parser, const char *s, const char *end,
 
 static enum XML_Error
 storeAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
-                    const char *ptr, const char *end, STRING_POOL *pool) {
+                    const char *ptr, const char *end, STRING_POOL *pool,
+                    enum XML_Account account) {
   enum XML_Error result
-      = appendAttributeValue(parser, enc, isCdata, ptr, end, pool);
+      = appendAttributeValue(parser, enc, isCdata, ptr, end, pool, account);
   if (result)
     return result;
   if (! isCdata && poolLength(pool) && poolLastChar(pool) == 0x20)
@@ -5287,11 +5575,23 @@ storeAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
 
 static enum XML_Error
 appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
-                     const char *ptr, const char *end, STRING_POOL *pool) {
+                     const char *ptr, const char *end, STRING_POOL *pool,
+                     enum XML_Account account) {
   DTD *const dtd = parser->m_dtd; /* save one level of indirection */
+#ifndef XML_DTD
+  UNUSED_P(account);
+#endif
+
   for (;;) {
-    const char *next;
+    const char *next
+        = ptr; /* XmlAttributeValueTok doesn't always set the last arg */
     int tok = XmlAttributeValueTok(enc, ptr, end, &next);
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, ptr, next, __LINE__, account)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#endif
     switch (tok) {
     case XML_TOK_NONE:
       return XML_ERROR_NONE;
@@ -5351,6 +5651,14 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
       XML_Char ch = (XML_Char)XmlPredefinedEntityName(
           enc, ptr + enc->minBytesPerChar, next - enc->minBytesPerChar);
       if (ch) {
+#ifdef XML_DTD
+        /* NOTE: We are replacing 4-6 characters original input for 1 character
+         *       so there is no amplification and hence recording without
+         *       protection. */
+        accountingDiffTolerated(parser, tok, (char *)&ch,
+                                ((char *)&ch) + sizeof(XML_Char), __LINE__,
+                                XML_ACCOUNT_ENTITY_EXPANSION);
+#endif /* XML_DTD */
         if (! poolAppendChar(pool, ch))
           return XML_ERROR_NO_MEMORY;
         break;
@@ -5428,9 +5736,16 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
         enum XML_Error result;
         const XML_Char *textEnd = entity->textPtr + entity->textLen;
         entity->open = XML_TRUE;
+#ifdef XML_DTD
+        entityTrackingOnOpen(parser, entity, __LINE__);
+#endif
         result = appendAttributeValue(parser, parser->m_internalEncoding,
-                                      isCdata, (char *)entity->textPtr,
-                                      (char *)textEnd, pool);
+                                      isCdata, (const char *)entity->textPtr,
+                                      (const char *)textEnd, pool,
+                                      XML_ACCOUNT_ENTITY_EXPANSION);
+#ifdef XML_DTD
+        entityTrackingOnClose(parser, entity, __LINE__);
+#endif
         entity->open = XML_FALSE;
         if (result)
           return result;
@@ -5460,13 +5775,16 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
 
 static enum XML_Error
 storeEntityValue(XML_Parser parser, const ENCODING *enc,
-                 const char *entityTextPtr, const char *entityTextEnd) {
+                 const char *entityTextPtr, const char *entityTextEnd,
+                 enum XML_Account account) {
   DTD *const dtd = parser->m_dtd; /* save one level of indirection */
   STRING_POOL *pool = &(dtd->entityValuePool);
   enum XML_Error result = XML_ERROR_NONE;
 #ifdef XML_DTD
   int oldInEntityValue = parser->m_prologState.inEntityValue;
   parser->m_prologState.inEntityValue = 1;
+#else
+  UNUSED_P(account);
 #endif /* XML_DTD */
   /* never return Null for the value argument in EntityDeclHandler,
      since this would indicate an external entity; therefore we
@@ -5477,8 +5795,19 @@ storeEntityValue(XML_Parser parser, const ENCODING *enc,
   }
 
   for (;;) {
-    const char *next;
+    const char *next
+        = entityTextPtr; /* XmlEntityValueTok doesn't always set the last arg */
     int tok = XmlEntityValueTok(enc, entityTextPtr, entityTextEnd, &next);
+
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, entityTextPtr, next, __LINE__,
+                                  account)) {
+      accountingOnAbort(parser);
+      result = XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+      goto endEntityValue;
+    }
+#endif
+
     switch (tok) {
     case XML_TOK_PARAM_ENTITY_REF:
 #ifdef XML_DTD
@@ -5514,13 +5843,16 @@ storeEntityValue(XML_Parser parser, const ENCODING *enc,
           if (parser->m_externalEntityRefHandler) {
             dtd->paramEntityRead = XML_FALSE;
             entity->open = XML_TRUE;
+            entityTrackingOnOpen(parser, entity, __LINE__);
             if (! parser->m_externalEntityRefHandler(
                     parser->m_externalEntityRefHandlerArg, 0, entity->base,
                     entity->systemId, entity->publicId)) {
+              entityTrackingOnClose(parser, entity, __LINE__);
               entity->open = XML_FALSE;
               result = XML_ERROR_EXTERNAL_ENTITY_HANDLING;
               goto endEntityValue;
             }
+            entityTrackingOnClose(parser, entity, __LINE__);
             entity->open = XML_FALSE;
             if (! dtd->paramEntityRead)
               dtd->keepProcessing = dtd->standalone;
@@ -5528,9 +5860,12 @@ storeEntityValue(XML_Parser parser, const ENCODING *enc,
             dtd->keepProcessing = dtd->standalone;
         } else {
           entity->open = XML_TRUE;
+          entityTrackingOnOpen(parser, entity, __LINE__);
           result = storeEntityValue(
-              parser, parser->m_internalEncoding, (char *)entity->textPtr,
-              (char *)(entity->textPtr + entity->textLen));
+              parser, parser->m_internalEncoding, (const char *)entity->textPtr,
+              (const char *)(entity->textPtr + entity->textLen),
+              XML_ACCOUNT_ENTITY_EXPANSION);
+          entityTrackingOnClose(parser, entity, __LINE__);
           entity->open = XML_FALSE;
           if (result)
             goto endEntityValue;
@@ -6485,7 +6820,7 @@ hashTableInit(HASH_TABLE *p, const XML_Memory_Handling_Suite *ms) {
 static void FASTCALL
 hashTableIterInit(HASH_TABLE_ITER *iter, const HASH_TABLE *table) {
   iter->p = table->v;
-  iter->end = iter->p + table->size;
+  iter->end = iter->p ? iter->p + table->size : NULL;
 }
 
 static NAMED *FASTCALL
@@ -6891,3 +7226,755 @@ copyString(const XML_Char *s, const XML_Memory_Handling_Suite *memsuite) {
   memcpy(result, s, charsRequired * sizeof(XML_Char));
   return result;
 }
+
+#ifdef XML_DTD
+
+static float
+accountingGetCurrentAmplification(XML_Parser rootParser) {
+  const XmlBigCount countBytesOutput
+      = rootParser->m_accounting.countBytesDirect
+        + rootParser->m_accounting.countBytesIndirect;
+  const float amplificationFactor
+      = rootParser->m_accounting.countBytesDirect
+            ? (countBytesOutput
+               / (float)(rootParser->m_accounting.countBytesDirect))
+            : 1.0f;
+  assert(! rootParser->m_parentParser);
+  return amplificationFactor;
+}
+
+static void
+accountingReportStats(XML_Parser originParser, const char *epilog) {
+  const XML_Parser rootParser = getRootParserOf(originParser, NULL);
+  assert(! rootParser->m_parentParser);
+
+  if (rootParser->m_accounting.debugLevel < 1) {
+    return;
+  }
+
+  const float amplificationFactor
+      = accountingGetCurrentAmplification(rootParser);
+  fprintf(stderr,
+          "expat: Accounting(%p): Direct " EXPAT_FMT_ULL(
+              "10") ", indirect " EXPAT_FMT_ULL("10") ", amplification %8.2f%s",
+          (void *)rootParser, rootParser->m_accounting.countBytesDirect,
+          rootParser->m_accounting.countBytesIndirect,
+          (double)amplificationFactor, epilog);
+}
+
+static void
+accountingOnAbort(XML_Parser originParser) {
+  accountingReportStats(originParser, " ABORTING\n");
+}
+
+static void
+accountingReportDiff(XML_Parser rootParser,
+                     unsigned int levelsAwayFromRootParser, const char *before,
+                     const char *after, ptrdiff_t bytesMore, int source_line,
+                     enum XML_Account account) {
+  assert(! rootParser->m_parentParser);
+
+  fprintf(stderr,
+          " (+" EXPAT_FMT_PTRDIFF_T("6") " bytes %s|%d, xmlparse.c:%d) %*s\"",
+          bytesMore, (account == XML_ACCOUNT_DIRECT) ? "DIR" : "EXP",
+          levelsAwayFromRootParser, source_line, 10, "");
+
+  const char ellipis[] = "[..]";
+  const size_t ellipsisLength = sizeof(ellipis) /* because compile-time */ - 1;
+  const unsigned int contextLength = 10;
+
+  /* Note: Performance is of no concern here */
+  const char *walker = before;
+  if ((rootParser->m_accounting.debugLevel >= 3)
+      || (after - before)
+             <= (ptrdiff_t)(contextLength + ellipsisLength + contextLength)) {
+    for (; walker < after; walker++) {
+      fprintf(stderr, "%s", unsignedCharToPrintable(walker[0]));
+    }
+  } else {
+    for (; walker < before + contextLength; walker++) {
+      fprintf(stderr, "%s", unsignedCharToPrintable(walker[0]));
+    }
+    fprintf(stderr, ellipis);
+    walker = after - contextLength;
+    for (; walker < after; walker++) {
+      fprintf(stderr, "%s", unsignedCharToPrintable(walker[0]));
+    }
+  }
+  fprintf(stderr, "\"\n");
+}
+
+static XML_Bool
+accountingDiffTolerated(XML_Parser originParser, int tok, const char *before,
+                        const char *after, int source_line,
+                        enum XML_Account account) {
+  /* Note: We need to check the token type *first* to be sure that
+   *       we can even access variable <after>, safely.
+   *       E.g. for XML_TOK_NONE <after> may hold an invalid pointer. */
+  switch (tok) {
+  case XML_TOK_INVALID:
+  case XML_TOK_PARTIAL:
+  case XML_TOK_PARTIAL_CHAR:
+  case XML_TOK_NONE:
+    return XML_TRUE;
+  }
+
+  if (account == XML_ACCOUNT_NONE)
+    return XML_TRUE; /* because these bytes have been accounted for, already */
+
+  unsigned int levelsAwayFromRootParser;
+  const XML_Parser rootParser
+      = getRootParserOf(originParser, &levelsAwayFromRootParser);
+  assert(! rootParser->m_parentParser);
+
+  const int isDirect
+      = (account == XML_ACCOUNT_DIRECT) && (originParser == rootParser);
+  const ptrdiff_t bytesMore = after - before;
+
+  XmlBigCount *const additionTarget
+      = isDirect ? &rootParser->m_accounting.countBytesDirect
+                 : &rootParser->m_accounting.countBytesIndirect;
+
+  /* Detect and avoid integer overflow */
+  if (*additionTarget > (XmlBigCount)(-1) - (XmlBigCount)bytesMore)
+    return XML_FALSE;
+  *additionTarget += bytesMore;
+
+  const XmlBigCount countBytesOutput
+      = rootParser->m_accounting.countBytesDirect
+        + rootParser->m_accounting.countBytesIndirect;
+  const float amplificationFactor
+      = accountingGetCurrentAmplification(rootParser);
+  const XML_Bool tolerated
+      = (countBytesOutput < rootParser->m_accounting.activationThresholdBytes)
+        || (amplificationFactor
+            <= rootParser->m_accounting.maximumAmplificationFactor);
+
+  if (rootParser->m_accounting.debugLevel >= 2) {
+    accountingReportStats(rootParser, "");
+    accountingReportDiff(rootParser, levelsAwayFromRootParser, before, after,
+                         bytesMore, source_line, account);
+  }
+
+  return tolerated;
+}
+
+unsigned long long
+testingAccountingGetCountBytesDirect(XML_Parser parser) {
+  if (! parser)
+    return 0;
+  return parser->m_accounting.countBytesDirect;
+}
+
+unsigned long long
+testingAccountingGetCountBytesIndirect(XML_Parser parser) {
+  if (! parser)
+    return 0;
+  return parser->m_accounting.countBytesIndirect;
+}
+
+static void
+entityTrackingReportStats(XML_Parser rootParser, ENTITY *entity,
+                          const char *action, int sourceLine) {
+  assert(! rootParser->m_parentParser);
+  if (rootParser->m_entity_stats.debugLevel < 1)
+    return;
+
+#  if defined(XML_UNICODE)
+  const char *const entityName = "[..]";
+#  else
+  const char *const entityName = entity->name;
+#  endif
+
+  fprintf(
+      stderr,
+      "expat: Entities(%p): Count %9d, depth %2d/%2d %*s%s%s; %s length %d (xmlparse.c:%d)\n",
+      (void *)rootParser, rootParser->m_entity_stats.countEverOpened,
+      rootParser->m_entity_stats.currentDepth,
+      rootParser->m_entity_stats.maximumDepthSeen,
+      (rootParser->m_entity_stats.currentDepth - 1) * 2, "",
+      entity->is_param ? "%" : "&", entityName, action, entity->textLen,
+      sourceLine);
+}
+
+static void
+entityTrackingOnOpen(XML_Parser originParser, ENTITY *entity, int sourceLine) {
+  const XML_Parser rootParser = getRootParserOf(originParser, NULL);
+  assert(! rootParser->m_parentParser);
+
+  rootParser->m_entity_stats.countEverOpened++;
+  rootParser->m_entity_stats.currentDepth++;
+  if (rootParser->m_entity_stats.currentDepth
+      > rootParser->m_entity_stats.maximumDepthSeen) {
+    rootParser->m_entity_stats.maximumDepthSeen++;
+  }
+
+  entityTrackingReportStats(rootParser, entity, "OPEN ", sourceLine);
+}
+
+static void
+entityTrackingOnClose(XML_Parser originParser, ENTITY *entity, int sourceLine) {
+  const XML_Parser rootParser = getRootParserOf(originParser, NULL);
+  assert(! rootParser->m_parentParser);
+
+  entityTrackingReportStats(rootParser, entity, "CLOSE", sourceLine);
+  rootParser->m_entity_stats.currentDepth--;
+}
+
+static XML_Parser
+getRootParserOf(XML_Parser parser, unsigned int *outLevelDiff) {
+  XML_Parser rootParser = parser;
+  unsigned int stepsTakenUpwards = 0;
+  while (rootParser->m_parentParser) {
+    rootParser = rootParser->m_parentParser;
+    stepsTakenUpwards++;
+  }
+  assert(! rootParser->m_parentParser);
+  if (outLevelDiff != NULL) {
+    *outLevelDiff = stepsTakenUpwards;
+  }
+  return rootParser;
+}
+
+const char *
+unsignedCharToPrintable(unsigned char c) {
+  switch (c) {
+  case 0:
+    return "\\0";
+  case 1:
+    return "\\x1";
+  case 2:
+    return "\\x2";
+  case 3:
+    return "\\x3";
+  case 4:
+    return "\\x4";
+  case 5:
+    return "\\x5";
+  case 6:
+    return "\\x6";
+  case 7:
+    return "\\x7";
+  case 8:
+    return "\\x8";
+  case 9:
+    return "\\t";
+  case 10:
+    return "\\n";
+  case 11:
+    return "\\xB";
+  case 12:
+    return "\\xC";
+  case 13:
+    return "\\r";
+  case 14:
+    return "\\xE";
+  case 15:
+    return "\\xF";
+  case 16:
+    return "\\x10";
+  case 17:
+    return "\\x11";
+  case 18:
+    return "\\x12";
+  case 19:
+    return "\\x13";
+  case 20:
+    return "\\x14";
+  case 21:
+    return "\\x15";
+  case 22:
+    return "\\x16";
+  case 23:
+    return "\\x17";
+  case 24:
+    return "\\x18";
+  case 25:
+    return "\\x19";
+  case 26:
+    return "\\x1A";
+  case 27:
+    return "\\x1B";
+  case 28:
+    return "\\x1C";
+  case 29:
+    return "\\x1D";
+  case 30:
+    return "\\x1E";
+  case 31:
+    return "\\x1F";
+  case 32:
+    return " ";
+  case 33:
+    return "!";
+  case 34:
+    return "\\\"";
+  case 35:
+    return "#";
+  case 36:
+    return "$";
+  case 37:
+    return "%";
+  case 38:
+    return "&";
+  case 39:
+    return "'";
+  case 40:
+    return "(";
+  case 41:
+    return ")";
+  case 42:
+    return "*";
+  case 43:
+    return "+";
+  case 44:
+    return ",";
+  case 45:
+    return "-";
+  case 46:
+    return ".";
+  case 47:
+    return "/";
+  case 48:
+    return "0";
+  case 49:
+    return "1";
+  case 50:
+    return "2";
+  case 51:
+    return "3";
+  case 52:
+    return "4";
+  case 53:
+    return "5";
+  case 54:
+    return "6";
+  case 55:
+    return "7";
+  case 56:
+    return "8";
+  case 57:
+    return "9";
+  case 58:
+    return ":";
+  case 59:
+    return ";";
+  case 60:
+    return "<";
+  case 61:
+    return "=";
+  case 62:
+    return ">";
+  case 63:
+    return "?";
+  case 64:
+    return "@";
+  case 65:
+    return "A";
+  case 66:
+    return "B";
+  case 67:
+    return "C";
+  case 68:
+    return "D";
+  case 69:
+    return "E";
+  case 70:
+    return "F";
+  case 71:
+    return "G";
+  case 72:
+    return "H";
+  case 73:
+    return "I";
+  case 74:
+    return "J";
+  case 75:
+    return "K";
+  case 76:
+    return "L";
+  case 77:
+    return "M";
+  case 78:
+    return "N";
+  case 79:
+    return "O";
+  case 80:
+    return "P";
+  case 81:
+    return "Q";
+  case 82:
+    return "R";
+  case 83:
+    return "S";
+  case 84:
+    return "T";
+  case 85:
+    return "U";
+  case 86:
+    return "V";
+  case 87:
+    return "W";
+  case 88:
+    return "X";
+  case 89:
+    return "Y";
+  case 90:
+    return "Z";
+  case 91:
+    return "[";
+  case 92:
+    return "\\\\";
+  case 93:
+    return "]";
+  case 94:
+    return "^";
+  case 95:
+    return "_";
+  case 96:
+    return "`";
+  case 97:
+    return "a";
+  case 98:
+    return "b";
+  case 99:
+    return "c";
+  case 100:
+    return "d";
+  case 101:
+    return "e";
+  case 102:
+    return "f";
+  case 103:
+    return "g";
+  case 104:
+    return "h";
+  case 105:
+    return "i";
+  case 106:
+    return "j";
+  case 107:
+    return "k";
+  case 108:
+    return "l";
+  case 109:
+    return "m";
+  case 110:
+    return "n";
+  case 111:
+    return "o";
+  case 112:
+    return "p";
+  case 113:
+    return "q";
+  case 114:
+    return "r";
+  case 115:
+    return "s";
+  case 116:
+    return "t";
+  case 117:
+    return "u";
+  case 118:
+    return "v";
+  case 119:
+    return "w";
+  case 120:
+    return "x";
+  case 121:
+    return "y";
+  case 122:
+    return "z";
+  case 123:
+    return "{";
+  case 124:
+    return "|";
+  case 125:
+    return "}";
+  case 126:
+    return "~";
+  case 127:
+    return "\\x7F";
+  case 128:
+    return "\\x80";
+  case 129:
+    return "\\x81";
+  case 130:
+    return "\\x82";
+  case 131:
+    return "\\x83";
+  case 132:
+    return "\\x84";
+  case 133:
+    return "\\x85";
+  case 134:
+    return "\\x86";
+  case 135:
+    return "\\x87";
+  case 136:
+    return "\\x88";
+  case 137:
+    return "\\x89";
+  case 138:
+    return "\\x8A";
+  case 139:
+    return "\\x8B";
+  case 140:
+    return "\\x8C";
+  case 141:
+    return "\\x8D";
+  case 142:
+    return "\\x8E";
+  case 143:
+    return "\\x8F";
+  case 144:
+    return "\\x90";
+  case 145:
+    return "\\x91";
+  case 146:
+    return "\\x92";
+  case 147:
+    return "\\x93";
+  case 148:
+    return "\\x94";
+  case 149:
+    return "\\x95";
+  case 150:
+    return "\\x96";
+  case 151:
+    return "\\x97";
+  case 152:
+    return "\\x98";
+  case 153:
+    return "\\x99";
+  case 154:
+    return "\\x9A";
+  case 155:
+    return "\\x9B";
+  case 156:
+    return "\\x9C";
+  case 157:
+    return "\\x9D";
+  case 158:
+    return "\\x9E";
+  case 159:
+    return "\\x9F";
+  case 160:
+    return "\\xA0";
+  case 161:
+    return "\\xA1";
+  case 162:
+    return "\\xA2";
+  case 163:
+    return "\\xA3";
+  case 164:
+    return "\\xA4";
+  case 165:
+    return "\\xA5";
+  case 166:
+    return "\\xA6";
+  case 167:
+    return "\\xA7";
+  case 168:
+    return "\\xA8";
+  case 169:
+    return "\\xA9";
+  case 170:
+    return "\\xAA";
+  case 171:
+    return "\\xAB";
+  case 172:
+    return "\\xAC";
+  case 173:
+    return "\\xAD";
+  case 174:
+    return "\\xAE";
+  case 175:
+    return "\\xAF";
+  case 176:
+    return "\\xB0";
+  case 177:
+    return "\\xB1";
+  case 178:
+    return "\\xB2";
+  case 179:
+    return "\\xB3";
+  case 180:
+    return "\\xB4";
+  case 181:
+    return "\\xB5";
+  case 182:
+    return "\\xB6";
+  case 183:
+    return "\\xB7";
+  case 184:
+    return "\\xB8";
+  case 185:
+    return "\\xB9";
+  case 186:
+    return "\\xBA";
+  case 187:
+    return "\\xBB";
+  case 188:
+    return "\\xBC";
+  case 189:
+    return "\\xBD";
+  case 190:
+    return "\\xBE";
+  case 191:
+    return "\\xBF";
+  case 192:
+    return "\\xC0";
+  case 193:
+    return "\\xC1";
+  case 194:
+    return "\\xC2";
+  case 195:
+    return "\\xC3";
+  case 196:
+    return "\\xC4";
+  case 197:
+    return "\\xC5";
+  case 198:
+    return "\\xC6";
+  case 199:
+    return "\\xC7";
+  case 200:
+    return "\\xC8";
+  case 201:
+    return "\\xC9";
+  case 202:
+    return "\\xCA";
+  case 203:
+    return "\\xCB";
+  case 204:
+    return "\\xCC";
+  case 205:
+    return "\\xCD";
+  case 206:
+    return "\\xCE";
+  case 207:
+    return "\\xCF";
+  case 208:
+    return "\\xD0";
+  case 209:
+    return "\\xD1";
+  case 210:
+    return "\\xD2";
+  case 211:
+    return "\\xD3";
+  case 212:
+    return "\\xD4";
+  case 213:
+    return "\\xD5";
+  case 214:
+    return "\\xD6";
+  case 215:
+    return "\\xD7";
+  case 216:
+    return "\\xD8";
+  case 217:
+    return "\\xD9";
+  case 218:
+    return "\\xDA";
+  case 219:
+    return "\\xDB";
+  case 220:
+    return "\\xDC";
+  case 221:
+    return "\\xDD";
+  case 222:
+    return "\\xDE";
+  case 223:
+    return "\\xDF";
+  case 224:
+    return "\\xE0";
+  case 225:
+    return "\\xE1";
+  case 226:
+    return "\\xE2";
+  case 227:
+    return "\\xE3";
+  case 228:
+    return "\\xE4";
+  case 229:
+    return "\\xE5";
+  case 230:
+    return "\\xE6";
+  case 231:
+    return "\\xE7";
+  case 232:
+    return "\\xE8";
+  case 233:
+    return "\\xE9";
+  case 234:
+    return "\\xEA";
+  case 235:
+    return "\\xEB";
+  case 236:
+    return "\\xEC";
+  case 237:
+    return "\\xED";
+  case 238:
+    return "\\xEE";
+  case 239:
+    return "\\xEF";
+  case 240:
+    return "\\xF0";
+  case 241:
+    return "\\xF1";
+  case 242:
+    return "\\xF2";
+  case 243:
+    return "\\xF3";
+  case 244:
+    return "\\xF4";
+  case 245:
+    return "\\xF5";
+  case 246:
+    return "\\xF6";
+  case 247:
+    return "\\xF7";
+  case 248:
+    return "\\xF8";
+  case 249:
+    return "\\xF9";
+  case 250:
+    return "\\xFA";
+  case 251:
+    return "\\xFB";
+  case 252:
+    return "\\xFC";
+  case 253:
+    return "\\xFD";
+  case 254:
+    return "\\xFE";
+  case 255:
+    return "\\xFF";
+  default:
+    assert(0); /* never gets here */
+    return "dead code";
+  }
+  assert(0); /* never gets here */
+}
+
+#endif /* XML_DTD */
+
+static unsigned long
+getDebugLevel(const char *variableName, unsigned long defaultDebugLevel) {
+  const char *const valueOrNull = getenv(variableName);
+  if (valueOrNull == NULL) {
+    return defaultDebugLevel;
+  }
+  const char *const value = valueOrNull;
+
+  errno = 0;
+  char *afterValue = (char *)value;
+  unsigned long debugLevel = strtoul(value, &afterValue, 10);
+  if ((errno != 0) || (afterValue[0] != '\0')) {
+    errno = 0;
+    return defaultDebugLevel;
+  }
+
+  return debugLevel;
+}
diff --git a/Modules/expat/xmlrole.c b/Modules/expat/xmlrole.c
index 4d3e3e86e9e864..08173b0fd541d2 100644
--- a/Modules/expat/xmlrole.c
+++ b/Modules/expat/xmlrole.c
@@ -7,7 +7,14 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2006 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2002-2003 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2005-2009 Steven Solie <ssolie at users.sourceforge.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -34,11 +41,9 @@
 
 #ifdef _WIN32
 #  include "winconfig.h"
-#else
-#  ifdef HAVE_EXPAT_CONFIG_H
-#    include <expat_config.h>
-#  endif
-#endif /* ndef _WIN32 */
+#endif
+
+#include <expat_config.h>
 
 #include "expat_external.h"
 #include "internal.h"
@@ -1220,6 +1225,8 @@ common(PROLOG_STATE *state, int tok) {
 #ifdef XML_DTD
   if (! state->documentEntity && tok == XML_TOK_PARAM_ENTITY_REF)
     return XML_ROLE_INNER_PARAM_ENTITY_REF;
+#else
+  UNUSED_P(tok);
 #endif
   state->handler = error;
   return XML_ROLE_ERROR;
diff --git a/Modules/expat/xmlrole.h b/Modules/expat/xmlrole.h
index 036aba64fd29c6..d6e1fa150a108a 100644
--- a/Modules/expat/xmlrole.h
+++ b/Modules/expat/xmlrole.h
@@ -7,7 +7,10 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/xmltok.c b/Modules/expat/xmltok.c
index 54cfedb85c28c4..f2b6b406067ea9 100644
--- a/Modules/expat/xmltok.c
+++ b/Modules/expat/xmltok.c
@@ -7,7 +7,19 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2001-2003 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2016 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2005-2009 Steven Solie <ssolie at users.sourceforge.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2016      Pascal Cuoq <cuoq at trust-in-soft.com>
+   Copyright (c) 2016      Don Lewis <truckman at apache.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2017      Alexander Bluhm <alexander.bluhm at gmx.net>
+   Copyright (c) 2017      Benbuck Nason <bnason at netflix.com>
+   Copyright (c) 2017      Jos? Guti?rrez de la Concha <jose at zeroc.com>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -30,26 +42,16 @@
    USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#ifdef _WIN32
-#  include "winconfig.h"
-#else
-#  ifdef HAVE_EXPAT_CONFIG_H
-#    include <expat_config.h>
-#  endif
-#endif /* ndef _WIN32 */
-
 #include <stddef.h>
 #include <string.h> /* memcpy */
+#include <stdbool.h>
 
-#if defined(_MSC_VER) && (_MSC_VER <= 1700)
-/* for vs2012/11.0/1700 and earlier Visual Studio compilers */
-#  define bool int
-#  define false 0
-#  define true 1
-#else
-#  include <stdbool.h>
+#ifdef _WIN32
+#  include "winconfig.h"
 #endif
 
+#include <expat_config.h>
+
 #include "expat_external.h"
 #include "internal.h"
 #include "xmltok.h"
@@ -269,8 +271,14 @@ sb_byteToAscii(const ENCODING *enc, const char *p) {
 
 #define IS_NAME_CHAR(enc, p, n) (AS_NORMAL_ENCODING(enc)->isName##n(enc, p))
 #define IS_NMSTRT_CHAR(enc, p, n) (AS_NORMAL_ENCODING(enc)->isNmstrt##n(enc, p))
-#define IS_INVALID_CHAR(enc, p, n)                                             \
-  (AS_NORMAL_ENCODING(enc)->isInvalid##n(enc, p))
+#ifdef XML_MIN_SIZE
+#  define IS_INVALID_CHAR(enc, p, n)                                           \
+    (AS_NORMAL_ENCODING(enc)->isInvalid##n                                     \
+     && AS_NORMAL_ENCODING(enc)->isInvalid##n(enc, p))
+#else
+#  define IS_INVALID_CHAR(enc, p, n)                                           \
+    (AS_NORMAL_ENCODING(enc)->isInvalid##n(enc, p))
+#endif
 
 #ifdef XML_MIN_SIZE
 #  define IS_NAME_CHAR_MINBPC(enc, p)                                          \
@@ -589,13 +597,13 @@ static const struct normal_encoding ascii_encoding
 static int PTRFASTCALL
 unicode_byte_type(char hi, char lo) {
   switch ((unsigned char)hi) {
-  /* 0xD800?0xDBFF first 16-bit code unit or high surrogate (W1) */
+  /* 0xD800-0xDBFF first 16-bit code unit or high surrogate (W1) */
   case 0xD8:
   case 0xD9:
   case 0xDA:
   case 0xDB:
     return BT_LEAD4;
-  /* 0xDC00?0xDFFF second 16-bit code unit or low surrogate (W2) */
+  /* 0xDC00-0xDFFF second 16-bit code unit or low surrogate (W2) */
   case 0xDC:
   case 0xDD:
   case 0xDE:
diff --git a/Modules/expat/xmltok.h b/Modules/expat/xmltok.h
index 2adbf5307befae..6f630c2f9ba96d 100644
--- a/Modules/expat/xmltok.h
+++ b/Modules/expat/xmltok.h
@@ -7,7 +7,11 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002-2005 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2016-2017 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/xmltok_impl.c b/Modules/expat/xmltok_impl.c
index c209221cd79d13..0430591b42636e 100644
--- a/Modules/expat/xmltok_impl.c
+++ b/Modules/expat/xmltok_impl.c
@@ -1,4 +1,4 @@
-/* This file is included!
+/* This file is included (from xmltok.c, 1-3 times depending on XML_MIN_SIZE)!
                             __  __            _
                          ___\ \/ /_ __   __ _| |_
                         / _ \\  /| '_ \ / _` | __|
@@ -7,7 +7,15 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002-2016 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2018      Benjamin Peterson <benjamin at python.org>
+   Copyright (c) 2018      Anton Maklakov <antmak.pub at gmail.com>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
+   Copyright (c) 2020      Boris Kolpackov <boris at codesynthesis.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -32,7 +40,7 @@
 
 #ifdef XML_TOK_IMPL_C
 
-#  ifndef IS_INVALID_CHAR
+#  ifndef IS_INVALID_CHAR // i.e. for UTF-16 and XML_MIN_SIZE not defined
 #    define IS_INVALID_CHAR(enc, ptr, n) (0)
 #  endif
 
@@ -1768,13 +1776,14 @@ PREFIX(updatePosition)(const ENCODING *enc, const char *ptr, const char *end,
 #  define LEAD_CASE(n)                                                         \
   case BT_LEAD##n:                                                             \
     ptr += n;                                                                  \
+    pos->columnNumber++;                                                       \
     break;
       LEAD_CASE(2)
       LEAD_CASE(3)
       LEAD_CASE(4)
 #  undef LEAD_CASE
     case BT_LF:
-      pos->columnNumber = (XML_Size)-1;
+      pos->columnNumber = 0;
       pos->lineNumber++;
       ptr += MINBPC(enc);
       break;
@@ -1783,13 +1792,13 @@ PREFIX(updatePosition)(const ENCODING *enc, const char *ptr, const char *end,
       ptr += MINBPC(enc);
       if (HAS_CHAR(enc, ptr, end) && BYTE_TYPE(enc, ptr) == BT_LF)
         ptr += MINBPC(enc);
-      pos->columnNumber = (XML_Size)-1;
+      pos->columnNumber = 0;
       break;
     default:
       ptr += MINBPC(enc);
+      pos->columnNumber++;
       break;
     }
-    pos->columnNumber++;
   }
 }
 
diff --git a/Modules/expat/xmltok_impl.h b/Modules/expat/xmltok_impl.h
index e925dbc7e2c833..c518aada013df2 100644
--- a/Modules/expat/xmltok_impl.h
+++ b/Modules/expat/xmltok_impl.h
@@ -7,7 +7,8 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2017-2019 Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/xmltok_ns.c b/Modules/expat/xmltok_ns.c
index e1b46a7c04c4ed..5fd83922359400 100644
--- a/Modules/expat/xmltok_ns.c
+++ b/Modules/expat/xmltok_ns.c
@@ -7,7 +7,11 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002-2006 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -89,7 +93,7 @@ NS(XmlInitEncoding)(INIT_ENCODING *p, const ENCODING **encPtr,
 static const ENCODING *
 NS(findEncoding)(const ENCODING *enc, const char *ptr, const char *end) {
 #  define ENCODING_MAX 128
-  char buf[ENCODING_MAX] = {0};
+  char buf[ENCODING_MAX];
   char *p = buf;
   int i;
   XmlUtf8Convert(enc, &ptr, end, &p, p + ENCODING_MAX - 1);


From webhook-mailer at python.org  Sun Aug 29 10:10:54 2021
From: webhook-mailer at python.org (ambv)
Date: Sun, 29 Aug 2021 14:10:54 -0000
Subject: [Python-checkins] bpo-43124: Fix smtplib multiple CRLF injection
 (GH-25987)
Message-ID: <mailman.1235.1630246256.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/0897253f426068ea6a6fbe0ada01689af9ef1019
commit: 0897253f426068ea6a6fbe0ada01689af9ef1019
branch: main
author: Miguel Brito <5544985+miguendes at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-29T16:10:50+02:00
summary:

bpo-43124: Fix smtplib multiple CRLF injection (GH-25987)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst
M Lib/smtplib.py
M Lib/test/test_smtplib.py

diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index 7e984e8c0fa1a1..324a1c19f12afe 100755
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -367,10 +367,15 @@ def send(self, s):
     def putcmd(self, cmd, args=""):
         """Send a command to the server."""
         if args == "":
-            str = '%s%s' % (cmd, CRLF)
+            s = cmd
         else:
-            str = '%s %s%s' % (cmd, args, CRLF)
-        self.send(str)
+            s = f'{cmd} {args}'
+        if '\r' in s or '\n' in s:
+            s = s.replace('\n', '\\n').replace('\r', '\\r')
+            raise ValueError(
+                f'command and arguments contain prohibited newline characters: {s}'
+            )
+        self.send(f'{s}{CRLF}')
 
     def getreply(self):
         """Get a reply from the server.
diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py
index 483d747ee6a495..9761a372517315 100644
--- a/Lib/test/test_smtplib.py
+++ b/Lib/test/test_smtplib.py
@@ -336,6 +336,16 @@ def testEXPNNotImplemented(self):
         self.assertEqual(smtp.getreply(), expected)
         smtp.quit()
 
+    def test_issue43124_putcmd_escapes_newline(self):
+        # see: https://bugs.python.org/issue43124
+        smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost',
+                            timeout=support.LOOPBACK_TIMEOUT)
+        self.addCleanup(smtp.close)
+        with self.assertRaises(ValueError) as exc:
+            smtp.putcmd('helo\nX-INJECTED')
+        self.assertIn("prohibited newline characters", str(exc.exception))
+        smtp.quit()
+
     def testVRFY(self):
         smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost',
                             timeout=support.LOOPBACK_TIMEOUT)
@@ -417,6 +427,51 @@ def testSendNeedingDotQuote(self):
         mexpect = '%s%s\n%s' % (MSG_BEGIN, m, MSG_END)
         self.assertEqual(self.output.getvalue(), mexpect)
 
+    def test_issue43124_escape_localhostname(self):
+        # see: https://bugs.python.org/issue43124
+        # connect and send mail
+        m = 'wazzuuup\nlinetwo'
+        smtp = smtplib.SMTP(HOST, self.port, local_hostname='hi\nX-INJECTED',
+                            timeout=support.LOOPBACK_TIMEOUT)
+        self.addCleanup(smtp.close)
+        with self.assertRaises(ValueError) as exc:
+            smtp.sendmail("hi at me.com", "you at me.com", m)
+        self.assertIn(
+            "prohibited newline characters: ehlo hi\\nX-INJECTED",
+            str(exc.exception),
+        )
+        # XXX (see comment in testSend)
+        time.sleep(0.01)
+        smtp.quit()
+
+        debugout = smtpd.DEBUGSTREAM.getvalue()
+        self.assertNotIn("X-INJECTED", debugout)
+
+    def test_issue43124_escape_options(self):
+        # see: https://bugs.python.org/issue43124
+        # connect and send mail
+        m = 'wazzuuup\nlinetwo'
+        smtp = smtplib.SMTP(
+            HOST, self.port, local_hostname='localhost',
+            timeout=support.LOOPBACK_TIMEOUT)
+
+        self.addCleanup(smtp.close)
+        smtp.sendmail("hi at me.com", "you at me.com", m)
+        with self.assertRaises(ValueError) as exc:
+            smtp.mail("hi at me.com", ["X-OPTION\nX-INJECTED-1", "X-OPTION2\nX-INJECTED-2"])
+        msg = str(exc.exception)
+        self.assertIn("prohibited newline characters", msg)
+        self.assertIn("X-OPTION\\nX-INJECTED-1 X-OPTION2\\nX-INJECTED-2", msg)
+        # XXX (see comment in testSend)
+        time.sleep(0.01)
+        smtp.quit()
+
+        debugout = smtpd.DEBUGSTREAM.getvalue()
+        self.assertNotIn("X-OPTION", debugout)
+        self.assertNotIn("X-OPTION2", debugout)
+        self.assertNotIn("X-INJECTED-1", debugout)
+        self.assertNotIn("X-INJECTED-2", debugout)
+
     def testSendNullSender(self):
         m = 'A test message'
         smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost',
diff --git a/Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst b/Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst
new file mode 100644
index 00000000000000..e897d6cd3641d7
--- /dev/null
+++ b/Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst
@@ -0,0 +1,2 @@
+Made the internal ``putcmd`` function in :mod:`smtplib` sanitize input for
+presence of ``\r`` and ``\n`` characters to avoid (unlikely) command injection.


From webhook-mailer at python.org  Sun Aug 29 10:19:02 2021
From: webhook-mailer at python.org (ambv)
Date: Sun, 29 Aug 2021 14:19:02 -0000
Subject: [Python-checkins] bpo-45007: Update to OpenSSL 1.1.1l in Windows
 build and CI (GH-28009)
Message-ID: <mailman.1236.1630246743.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/d3bdbbf9a4352a24fc2bfc7a63a024b244b61aba
commit: d3bdbbf9a4352a24fc2bfc7a63a024b244b61aba
branch: main
author: Steve Dower <steve.dower at python.org>
committer: ambv <lukasz at langa.pl>
date: 2021-08-29T16:18:57+02:00
summary:

bpo-45007: Update to OpenSSL 1.1.1l in Windows build and CI (GH-28009)

files:
A Misc/NEWS.d/next/Windows/2021-08-27-23-50-02.bpo-45007.NIBlVG.rst
M .azure-pipelines/ci.yml
M .azure-pipelines/pr.yml
M .github/workflows/build.yml
M PCbuild/get_externals.bat
M PCbuild/python.props

diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml
index b2ce9e75df64f7..2284a5fb36b195 100644
--- a/.azure-pipelines/ci.yml
+++ b/.azure-pipelines/ci.yml
@@ -1,14 +1,14 @@
 variables:
   coverage: false
 
-trigger: ['main', '3.9', '3.8', '3.7']
+trigger: ['main', '3.10', '3.9', '3.8', '3.7']
 
 jobs:
 - job: Prebuild
   displayName: Pre-build checks
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   steps:
   - template: ./prebuild-checks.yml
@@ -20,7 +20,7 @@ jobs:
   condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   steps:
   - template: ./docs-steps.yml
@@ -40,7 +40,7 @@ jobs:
     testRunPlatform: macos
 
   pool:
-    vmImage: macos-10.14
+    vmImage: macos-10.15
 
   steps:
   - template: ./macos-steps.yml
@@ -52,12 +52,12 @@ jobs:
   condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   variables:
     testRunTitle: '$(build.sourceBranchName)-linux'
     testRunPlatform: linux
-    openssl_version: 1.1.1k
+    openssl_version: 1.1.1l
 
   steps:
   - template: ./posix-steps.yml
@@ -78,12 +78,12 @@ jobs:
     )
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   variables:
     testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
     testRunPlatform: linux-coverage
-    openssl_version: 1.1.1k
+    openssl_version: 1.1.1l
 
   steps:
   - template: ./posix-steps.yml
diff --git a/.azure-pipelines/pr.yml b/.azure-pipelines/pr.yml
index 9360d37baec682..1a3bf75ed4c1ea 100644
--- a/.azure-pipelines/pr.yml
+++ b/.azure-pipelines/pr.yml
@@ -1,14 +1,14 @@
 variables:
   coverage: false
 
-pr: ['main', '3.9', '3.8', '3.7']
+pr: ['main', '3.10', '3.9', '3.8', '3.7']
 
 jobs:
 - job: Prebuild
   displayName: Pre-build checks
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   steps:
   - template: ./prebuild-checks.yml
@@ -20,7 +20,7 @@ jobs:
   condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   steps:
   - template: ./docs-steps.yml
@@ -38,7 +38,7 @@ jobs:
     testRunPlatform: macos
 
   pool:
-    vmImage: macos-10.14
+    vmImage: macos-10.15
 
   steps:
   - template: ./macos-steps.yml
@@ -52,12 +52,12 @@ jobs:
   condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   variables:
     testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
     testRunPlatform: linux
-    openssl_version: 1.1.1k
+    openssl_version: 1.1.1l
 
   steps:
   - template: ./posix-steps.yml
@@ -78,12 +78,12 @@ jobs:
     )
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   variables:
     testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
     testRunPlatform: linux-coverage
-    openssl_version: 1.1.1k
+    openssl_version: 1.1.1l
 
   steps:
   - template: ./posix-steps.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4081b36f926a2a..c5d967dec7e4b7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -138,7 +138,7 @@ jobs:
     needs: check_source
     if: needs.check_source.outputs.run_tests == 'true'
     env:
-      OPENSSL_VER: 1.1.1k
+      OPENSSL_VER: 1.1.1l
       PYTHONSTRICTEXTENSIONBUILD: 1
     steps:
     - uses: actions/checkout at v2
@@ -182,7 +182,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        openssl_ver: [1.1.1k, 3.0.0-beta1]
+        openssl_ver: [1.1.1l, 3.0.0-beta1]
     env:
       OPENSSL_VER: ${{ matrix.openssl_ver }}
       MULTISSL_DIR: ${{ github.workspace }}/multissl
@@ -229,7 +229,7 @@ jobs:
     needs: check_source
     if: needs.check_source.outputs.run_tests == 'true'
     env:
-      OPENSSL_VER: 1.1.1k
+      OPENSSL_VER: 1.1.1l
       PYTHONSTRICTEXTENSIONBUILD: 1
       ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
     steps:
diff --git a/Misc/NEWS.d/next/Windows/2021-08-27-23-50-02.bpo-45007.NIBlVG.rst b/Misc/NEWS.d/next/Windows/2021-08-27-23-50-02.bpo-45007.NIBlVG.rst
new file mode 100644
index 00000000000000..fa076ee4c8b8ad
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2021-08-27-23-50-02.bpo-45007.NIBlVG.rst
@@ -0,0 +1 @@
+Update to OpenSSL 1.1.1l in Windows build
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 8a1ab21d743c71..ea85d98e12bbd1 100644
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -53,7 +53,7 @@ echo.Fetching external libraries...
 set libraries=
 set libraries=%libraries%                                       bzip2-1.0.6
 if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries%  libffi-3.3.0
-if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries%     openssl-1.1.1k
+if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries%     openssl-1.1.1l
 set libraries=%libraries%                                       sqlite-3.35.5.0
 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.11.0
 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.11.0
@@ -77,7 +77,7 @@ echo.Fetching external binaries...
 
 set binaries=
 if NOT "%IncludeLibffi%"=="false"  set binaries=%binaries% libffi-3.3.0
-if NOT "%IncludeSSL%"=="false"     set binaries=%binaries% openssl-bin-1.1.1k-1
+if NOT "%IncludeSSL%"=="false"     set binaries=%binaries% openssl-bin-1.1.1l
 if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.11.0
 if NOT "%IncludeSSLSrc%"=="false"  set binaries=%binaries% nasm-2.11.06
 
diff --git a/PCbuild/python.props b/PCbuild/python.props
index da65df58e227d9..42c67de4afa343 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -63,8 +63,8 @@
     <libffiDir>$(ExternalsDir)libffi-3.3.0\</libffiDir>
     <libffiOutDir>$(ExternalsDir)libffi-3.3.0\$(ArchName)\</libffiOutDir>
     <libffiIncludeDir>$(libffiOutDir)include</libffiIncludeDir>
-    <opensslDir>$(ExternalsDir)openssl-1.1.1k\</opensslDir>
-    <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1k-1\$(ArchName)\</opensslOutDir>
+    <opensslDir>$(ExternalsDir)openssl-1.1.1l\</opensslDir>
+    <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1l\$(ArchName)\</opensslOutDir>
     <opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir>
     <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
     <zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir>


From webhook-mailer at python.org  Sun Aug 29 10:31:36 2021
From: webhook-mailer at python.org (ambv)
Date: Sun, 29 Aug 2021 14:31:36 -0000
Subject: [Python-checkins] bpo-44394: Update libexpat copy to 2.4.1
 (GH-26945) (GH-28033)
Message-ID: <mailman.1237.1630247497.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/c9c2a0bc9820f93f1020f3498f6893a3544c9b76
commit: c9c2a0bc9820f93f1020f3498f6893a3544c9b76
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-29T16:31:27+02:00
summary:

bpo-44394: Update libexpat copy to 2.4.1 (GH-26945) (GH-28033)

Update the vendored copy of libexpat to 2.4.1 (from 2.2.8) to get the
fix for the CVE-2013-0340 "Billion Laughs" vulnerability. This copy
is most used on Windows and macOS.

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 3fc5d84046ddbd66abac5b598956ea34605a4e5d)

Co-authored-by: Victor Stinner <vstinner at python.org>

files:
A Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst
M Doc/library/xml.rst
M Modules/expat/COPYING
M Modules/expat/ascii.h
M Modules/expat/asciitab.h
M Modules/expat/expat.h
M Modules/expat/expat_external.h
M Modules/expat/iasciitab.h
M Modules/expat/internal.h
M Modules/expat/latin1tab.h
M Modules/expat/nametab.h
M Modules/expat/siphash.h
M Modules/expat/utf8tab.h
M Modules/expat/winconfig.h
M Modules/expat/xmlparse.c
M Modules/expat/xmlrole.c
M Modules/expat/xmlrole.h
M Modules/expat/xmltok.c
M Modules/expat/xmltok.h
M Modules/expat/xmltok_impl.c
M Modules/expat/xmltok_impl.h
M Modules/expat/xmltok_ns.c

diff --git a/Doc/library/xml.rst b/Doc/library/xml.rst
index 1981cab7cd438..e3b3516296114 100644
--- a/Doc/library/xml.rst
+++ b/Doc/library/xml.rst
@@ -60,22 +60,26 @@ circumvent firewalls.
 The following table gives an overview of the known attacks and whether
 the various modules are vulnerable to them.
 
-=========================  ==============   ===============   ==============   ==============   ==============
-kind                       sax              etree             minidom          pulldom          xmlrpc
-=========================  ==============   ===============   ==============   ==============   ==============
-billion laughs             **Vulnerable**   **Vulnerable**    **Vulnerable**   **Vulnerable**   **Vulnerable**
-quadratic blowup           **Vulnerable**   **Vulnerable**    **Vulnerable**   **Vulnerable**   **Vulnerable**
-external entity expansion  Safe (4)         Safe    (1)       Safe    (2)      Safe (4)         Safe    (3)
-`DTD`_ retrieval           Safe (4)         Safe              Safe             Safe (4)         Safe
-decompression bomb         Safe             Safe              Safe             Safe             **Vulnerable**
-=========================  ==============   ===============   ==============   ==============   ==============
-
-1. :mod:`xml.etree.ElementTree` doesn't expand external entities and raises a
+=========================  ==================  ==================  ==================  ==================  ==================
+kind                       sax                 etree               minidom             pulldom             xmlrpc
+=========================  ==================  ==================  ==================  ==================  ==================
+billion laughs             **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)
+quadratic blowup           **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)
+external entity expansion  Safe (5)            Safe (2)            Safe (3)            Safe (5)            Safe (4)
+`DTD`_ retrieval           Safe (5)            Safe                Safe                Safe (5)            Safe
+decompression bomb         Safe                Safe                Safe                Safe                **Vulnerable**
+=========================  ==================  ==================  ==================  ==================  ==================
+
+1. Expat 2.4.1 and newer is not vulnerable to the "billion laughs" and
+   "quadratic blowup" vulnerabilities. Items still listed as vulnerable due to
+   potential reliance on system-provided libraries. Check
+   :data:`pyexpat.EXPAT_VERSION`.
+2. :mod:`xml.etree.ElementTree` doesn't expand external entities and raises a
    :exc:`ParserError` when an entity occurs.
-2. :mod:`xml.dom.minidom` doesn't expand external entities and simply returns
+3. :mod:`xml.dom.minidom` doesn't expand external entities and simply returns
    the unexpanded entity verbatim.
-3. :mod:`xmlrpclib` doesn't expand external entities and omits them.
-4. Since Python 3.7.1, external general entities are no longer processed by
+4. :mod:`xmlrpclib` doesn't expand external entities and omits them.
+5. Since Python 3.7.1, external general entities are no longer processed by
    default.
 
 
diff --git a/Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst b/Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst
new file mode 100644
index 0000000000000..e32563d2535c7
--- /dev/null
+++ b/Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst
@@ -0,0 +1,3 @@
+Update the vendored copy of libexpat to 2.4.1 (from 2.2.8) to get the fix
+for the CVE-2013-0340 "Billion Laughs" vulnerability. This copy is most used
+on Windows and macOS.
diff --git a/Modules/expat/COPYING b/Modules/expat/COPYING
index 8d288f0f28fdd..3c0142e71c8d4 100644
--- a/Modules/expat/COPYING
+++ b/Modules/expat/COPYING
@@ -1,5 +1,5 @@
 Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
-Copyright (c) 2001-2017 Expat maintainers
+Copyright (c) 2001-2019 Expat maintainers
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/Modules/expat/ascii.h b/Modules/expat/ascii.h
index c3587e57332bf..1f594d2e54b4d 100644
--- a/Modules/expat/ascii.h
+++ b/Modules/expat/ascii.h
@@ -6,8 +6,11 @@
                         \___/_/\_\ .__/ \__,_|\__|
                                  |_| XML parser
 
-   Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 1999-2000 Thai Open Source Software Center Ltd
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2007      Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/asciitab.h b/Modules/expat/asciitab.h
index 63b1d1b4482ef..af766fb24785e 100644
--- a/Modules/expat/asciitab.h
+++ b/Modules/expat/asciitab.h
@@ -7,7 +7,9 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/expat.h b/Modules/expat/expat.h
index 6c8eb1fda4a30..b7d6d354801b3 100644
--- a/Modules/expat/expat.h
+++ b/Modules/expat/expat.h
@@ -7,7 +7,14 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2000-2005 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2001-2002 Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2016 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2016      Cristian Rodr?guez <crrodriguez at opensuse.org>
+   Copyright (c) 2016      Thomas Beutlich <tc at tbeu.de>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -115,7 +122,11 @@ enum XML_Error {
   XML_ERROR_RESERVED_PREFIX_XMLNS,
   XML_ERROR_RESERVED_NAMESPACE_URI,
   /* Added in 2.2.1. */
-  XML_ERROR_INVALID_ARGUMENT
+  XML_ERROR_INVALID_ARGUMENT,
+  /* Added in 2.3.0. */
+  XML_ERROR_NO_BUFFER,
+  /* Added in 2.4.0. */
+  XML_ERROR_AMPLIFICATION_LIMIT_BREACH
 };
 
 enum XML_Content_Type {
@@ -318,7 +329,7 @@ typedef void(XMLCALL *XML_EndDoctypeDeclHandler)(void *userData);
 
    For internal entities (<!ENTITY foo "bar">), value will
    be non-NULL and systemId, publicID, and notationName will be NULL.
-   The value string is NOT nul-terminated; the length is provided in
+   The value string is NOT null-terminated; the length is provided in
    the value_length argument. Since it is legal to have zero-length
    values, do not use this argument to test for internal entities.
 
@@ -513,7 +524,7 @@ typedef struct {
    Otherwise it must return XML_STATUS_ERROR.
 
    If info does not describe a suitable encoding, then the parser will
-   return an XML_UNKNOWN_ENCODING error.
+   return an XML_ERROR_UNKNOWN_ENCODING error.
 */
 typedef int(XMLCALL *XML_UnknownEncodingHandler)(void *encodingHandlerData,
                                                  const XML_Char *name,
@@ -707,7 +718,7 @@ XML_GetBase(XML_Parser parser);
 /* Returns the number of the attribute/value pairs passed in last call
    to the XML_StartElementHandler that were specified in the start-tag
    rather than defaulted. Each attribute/value pair counts as 2; thus
-   this correspondds to an index into the atts array passed to the
+   this corresponds to an index into the atts array passed to the
    XML_StartElementHandler.  Returns -1 if parser == NULL.
 */
 XMLPARSEAPI(int)
@@ -716,7 +727,7 @@ XML_GetSpecifiedAttributeCount(XML_Parser parser);
 /* Returns the index of the ID attribute passed in the last call to
    XML_StartElementHandler, or -1 if there is no ID attribute or
    parser == NULL.  Each attribute/value pair counts as 2; thus this
-   correspondds to an index into the atts array passed to the
+   corresponds to an index into the atts array passed to the
    XML_StartElementHandler.
 */
 XMLPARSEAPI(int)
@@ -997,7 +1008,10 @@ enum XML_FeatureEnum {
   XML_FEATURE_SIZEOF_XML_LCHAR,
   XML_FEATURE_NS,
   XML_FEATURE_LARGE_SIZE,
-  XML_FEATURE_ATTR_INFO
+  XML_FEATURE_ATTR_INFO,
+  /* Added in Expat 2.4.0. */
+  XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT,
+  XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT
   /* Additional features must be added to the end of this enum. */
 };
 
@@ -1010,12 +1024,24 @@ typedef struct {
 XMLPARSEAPI(const XML_Feature *)
 XML_GetFeatureList(void);
 
+#ifdef XML_DTD
+/* Added in Expat 2.4.0. */
+XMLPARSEAPI(XML_Bool)
+XML_SetBillionLaughsAttackProtectionMaximumAmplification(
+    XML_Parser parser, float maximumAmplificationFactor);
+
+/* Added in Expat 2.4.0. */
+XMLPARSEAPI(XML_Bool)
+XML_SetBillionLaughsAttackProtectionActivationThreshold(
+    XML_Parser parser, unsigned long long activationThresholdBytes);
+#endif
+
 /* Expat follows the semantic versioning convention.
    See http://semver.org.
 */
 #define XML_MAJOR_VERSION 2
-#define XML_MINOR_VERSION 2
-#define XML_MICRO_VERSION 8
+#define XML_MINOR_VERSION 4
+#define XML_MICRO_VERSION 1
 
 #ifdef __cplusplus
 }
diff --git a/Modules/expat/expat_external.h b/Modules/expat/expat_external.h
index f2b75dda8e279..12c560e14716f 100644
--- a/Modules/expat/expat_external.h
+++ b/Modules/expat/expat_external.h
@@ -7,7 +7,14 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2000-2004 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2001-2002 Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2006 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2016      Cristian Rodr?guez <crrodriguez at opensuse.org>
+   Copyright (c) 2016-2019 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2018      Yury Gribov <tetra2005 at gmail.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/iasciitab.h b/Modules/expat/iasciitab.h
index ea97cfcf678e0..5d8646f2a318b 100644
--- a/Modules/expat/iasciitab.h
+++ b/Modules/expat/iasciitab.h
@@ -7,7 +7,9 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/internal.h b/Modules/expat/internal.h
index 60913dab762f8..444eba0fb0317 100644
--- a/Modules/expat/internal.h
+++ b/Modules/expat/internal.h
@@ -25,8 +25,12 @@
                         \___/_/\_\ .__/ \__,_|\__|
                                  |_| XML parser
 
-   Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2002-2003 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002-2006 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2003      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2018      Yury Gribov <tetra2005 at gmail.com>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -101,22 +105,58 @@
 #  endif
 #endif
 
+#include <limits.h> // ULONG_MAX
+
+#if defined(_WIN32) && ! defined(__USE_MINGW_ANSI_STDIO)
+#  define EXPAT_FMT_ULL(midpart) "%" midpart "I64u"
+#  if defined(_WIN64) // Note: modifiers "td" and "zu" do not work for MinGW
+#    define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "I64d"
+#    define EXPAT_FMT_SIZE_T(midpart) "%" midpart "I64u"
+#  else
+#    define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "d"
+#    define EXPAT_FMT_SIZE_T(midpart) "%" midpart "u"
+#  endif
+#else
+#  define EXPAT_FMT_ULL(midpart) "%" midpart "llu"
+#  if ! defined(ULONG_MAX)
+#    error Compiler did not define ULONG_MAX for us
+#  elif ULONG_MAX == 18446744073709551615u // 2^64-1
+#    define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "ld"
+#    define EXPAT_FMT_SIZE_T(midpart) "%" midpart "lu"
+#  else
+#    define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "d"
+#    define EXPAT_FMT_SIZE_T(midpart) "%" midpart "u"
+#  endif
+#endif
+
 #ifndef UNUSED_P
 #  define UNUSED_P(p) (void)p
 #endif
 
+/* NOTE BEGIN If you ever patch these defaults to greater values
+              for non-attack XML payload in your environment,
+              please file a bug report with libexpat.  Thank you!
+*/
+#define EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT   \
+  100.0f
+#define EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT    \
+  8388608 // 8 MiB, 2^23
+/* NOTE END */
+
+#include "expat.h" // so we can use type XML_Parser below
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifdef XML_ENABLE_VISIBILITY
-#  if XML_ENABLE_VISIBILITY
-__attribute__((visibility("default")))
-#  endif
+void _INTERNAL_trim_to_complete_utf8_characters(const char *from,
+                                                const char **fromLimRef);
+
+#if defined(XML_DTD)
+unsigned long long testingAccountingGetCountBytesDirect(XML_Parser parser);
+unsigned long long testingAccountingGetCountBytesIndirect(XML_Parser parser);
+const char *unsignedCharToPrintable(unsigned char c);
 #endif
-void
-_INTERNAL_trim_to_complete_utf8_characters(const char *from,
-                                           const char **fromLimRef);
 
 #ifdef __cplusplus
 }
diff --git a/Modules/expat/latin1tab.h b/Modules/expat/latin1tab.h
index 6f916041355a8..b681d278af656 100644
--- a/Modules/expat/latin1tab.h
+++ b/Modules/expat/latin1tab.h
@@ -7,7 +7,9 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/nametab.h b/Modules/expat/nametab.h
index 3681df348eebd..63485446b9672 100644
--- a/Modules/expat/nametab.h
+++ b/Modules/expat/nametab.h
@@ -6,8 +6,8 @@
                         \___/_/\_\ .__/ \__,_|\__|
                                  |_| XML parser
 
-   Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000 Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2017 Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/siphash.h b/Modules/expat/siphash.h
index bfee65a332f1b..e5406d7ee9eb5 100644
--- a/Modules/expat/siphash.h
+++ b/Modules/expat/siphash.h
@@ -11,6 +11,9 @@
  * --------------------------------------------------------------------------
  * HISTORY:
  *
+ * 2020-10-03  (Sebastian Pipping)
+ *   - Drop support for Visual Studio 9.0/2008 and earlier
+ *
  * 2019-08-03  (Sebastian Pipping)
  *   - Mark part of sip24_valid as to be excluded from clang-format
  *   - Re-format code using clang-format 9
@@ -96,15 +99,7 @@
 #define SIPHASH_H
 
 #include <stddef.h> /* size_t */
-
-#if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER < 1600)
-/* For vs2003/7.1 up to vs2008/9.0; _MSC_VER 1600 is vs2010/10.0 */
-typedef unsigned __int8 uint8_t;
-typedef unsigned __int32 uint32_t;
-typedef unsigned __int64 uint64_t;
-#else
-#  include <stdint.h> /* uint64_t uint32_t uint8_t */
-#endif
+#include <stdint.h> /* uint64_t uint32_t uint8_t */
 
 /*
  * Workaround to not require a C++11 compiler for using ULL suffix
diff --git a/Modules/expat/utf8tab.h b/Modules/expat/utf8tab.h
index a22986acbb952..88efcf91cc16a 100644
--- a/Modules/expat/utf8tab.h
+++ b/Modules/expat/utf8tab.h
@@ -7,7 +7,9 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/winconfig.h b/Modules/expat/winconfig.h
index 562a4a82dc1d6..2ecd61b5b9482 100644
--- a/Modules/expat/winconfig.h
+++ b/Modules/expat/winconfig.h
@@ -6,8 +6,10 @@
                         \___/_/\_\ .__/ \__,_|\__|
                                  |_| XML parser
 
-   Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2005      Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2017-2021 Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -40,17 +42,4 @@
 #include <memory.h>
 #include <string.h>
 
-#if defined(HAVE_EXPAT_CONFIG_H) /* e.g. MinGW */
-#  include <expat_config.h>
-#else /* !defined(HAVE_EXPAT_CONFIG_H) */
-
-#  define XML_NS 1
-#  define XML_DTD 1
-#  define XML_CONTEXT_BYTES 1024
-
-/* we will assume all Windows platforms are little endian */
-#  define BYTEORDER 1234
-
-#endif /* !defined(HAVE_EXPAT_CONFIG_H) */
-
 #endif /* ndef WINCONFIG_H */
diff --git a/Modules/expat/xmlparse.c b/Modules/expat/xmlparse.c
index e740f0e19c7d4..5ba56eaea6357 100644
--- a/Modules/expat/xmlparse.c
+++ b/Modules/expat/xmlparse.c
@@ -1,4 +1,4 @@
-/* f2d0ab6d1d4422a08cf1cf3bbdfba96b49dea42fb5ff4615e03a2a25c306e769 (2.2.8+)
+/* 8539b9040d9d901366a62560a064af7cb99811335784b363abc039c5b0ebc416 (2.4.1+)
                             __  __            _
                          ___\ \/ /_ __   __ _| |_
                         / _ \\  /| '_ \ / _` | __|
@@ -7,7 +7,31 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2000-2006 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2001-2002 Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2016 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2005-2009 Steven Solie <ssolie at users.sourceforge.net>
+   Copyright (c) 2016      Eric Rahm <erahm at mozilla.com>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2016      Gaurav <g.gupta at samsung.com>
+   Copyright (c) 2016      Thomas Beutlich <tc at tbeu.de>
+   Copyright (c) 2016      Gustavo Grieco <gustavo.grieco at imag.fr>
+   Copyright (c) 2016      Pascal Cuoq <cuoq at trust-in-soft.com>
+   Copyright (c) 2016      Ed Schouten <ed at nuxi.nl>
+   Copyright (c) 2017-2018 Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2017      V?clav Slav?k <vaclav at slavik.io>
+   Copyright (c) 2017      Viktor Szakats <commit at vsz.me>
+   Copyright (c) 2017      Chanho Park <chanho61.park at samsung.com>
+   Copyright (c) 2017      Rolf Eike Beer <eike at sf-mail.de>
+   Copyright (c) 2017      Hans Wennborg <hans at chromium.org>
+   Copyright (c) 2018      Anton Maklakov <antmak.pub at gmail.com>
+   Copyright (c) 2018      Benjamin Peterson <benjamin at python.org>
+   Copyright (c) 2018      Marco Maggi <marco.maggi-ipsu at poste.it>
+   Copyright (c) 2018      Mariusz Zaborski <oshogbo at vexillium.org>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
+   Copyright (c) 2019-2020 Ben Wagner <bungeman at chromium.org>
+   Copyright (c) 2019      Vadim Zeitlin <vadim at zeitlins.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -36,7 +60,9 @@
 
 #ifdef _WIN32
 /* force stdlib to define rand_s() */
-#  define _CRT_RAND_S
+#  if ! defined(_CRT_RAND_S)
+#    define _CRT_RAND_S
+#  endif
 #endif
 
 #include <stddef.h>
@@ -45,6 +71,8 @@
 #include <limits.h> /* UINT_MAX */
 #include <stdio.h>  /* fprintf */
 #include <stdlib.h> /* getenv, rand_s */
+#include <stdint.h> /* uintptr_t */
+#include <math.h>   /* isnan */
 
 #ifdef _WIN32
 #  define getpid GetCurrentProcessId
@@ -60,9 +88,9 @@
 
 #ifdef _WIN32
 #  include "winconfig.h"
-#elif defined(HAVE_EXPAT_CONFIG_H)
-#  include <expat_config.h>
-#endif /* ndef _WIN32 */
+#endif
+
+#include <expat_config.h>
 
 #include "ascii.h"
 #include "expat.h"
@@ -97,14 +125,14 @@
     enabled.  For end user security, that is probably not what you want. \
     \
     Your options include: \
-      * Linux + glibc >=2.25 (getrandom): HAVE_GETRANDOM, \
-      * Linux + glibc <2.25 (syscall SYS_getrandom): HAVE_SYSCALL_GETRANDOM, \
+      * Linux >=3.17 + glibc >=2.25 (getrandom): HAVE_GETRANDOM, \
+      * Linux >=3.17 + glibc (including <2.25) (syscall SYS_getrandom): HAVE_SYSCALL_GETRANDOM, \
       * BSD / macOS >=10.7 (arc4random_buf): HAVE_ARC4RANDOM_BUF, \
-      * BSD / macOS <10.7 (arc4random): HAVE_ARC4RANDOM, \
+      * BSD / macOS (including <10.7) (arc4random): HAVE_ARC4RANDOM, \
       * libbsd (arc4random_buf): HAVE_ARC4RANDOM_BUF + HAVE_LIBBSD, \
       * libbsd (arc4random): HAVE_ARC4RANDOM + HAVE_LIBBSD, \
-      * Linux / BSD / macOS (/dev/urandom): XML_DEV_URANDOM \
-      * Windows (rand_s): _WIN32. \
+      * Linux (including <3.17) / BSD / macOS (including <10.7) (/dev/urandom): XML_DEV_URANDOM, \
+      * Windows >=Vista (rand_s): _WIN32. \
     \
     If insist on not using any of these, bypass this error by defining \
     XML_POOR_ENTROPY; you have been warned. \
@@ -119,9 +147,7 @@
 #  define XmlGetInternalEncoding XmlGetUtf16InternalEncoding
 #  define XmlGetInternalEncodingNS XmlGetUtf16InternalEncodingNS
 #  define XmlEncode XmlUtf16Encode
-/* Using pointer subtraction to convert to integer type. */
-#  define MUST_CONVERT(enc, s)                                                 \
-    (! (enc)->isUtf16 || (((char *)(s) - (char *)NULL) & 1))
+#  define MUST_CONVERT(enc, s) (! (enc)->isUtf16 || (((uintptr_t)(s)) & 1))
 typedef unsigned short ICHAR;
 #else
 #  define XML_ENCODE_MAX XML_UTF8_ENCODE_MAX
@@ -371,6 +397,31 @@ typedef struct open_internal_entity {
   XML_Bool betweenDecl; /* WFC: PE Between Declarations */
 } OPEN_INTERNAL_ENTITY;
 
+enum XML_Account {
+  XML_ACCOUNT_DIRECT,           /* bytes directly passed to the Expat parser */
+  XML_ACCOUNT_ENTITY_EXPANSION, /* intermediate bytes produced during entity
+                                   expansion */
+  XML_ACCOUNT_NONE              /* i.e. do not account, was accounted already */
+};
+
+#ifdef XML_DTD
+typedef unsigned long long XmlBigCount;
+typedef struct accounting {
+  XmlBigCount countBytesDirect;
+  XmlBigCount countBytesIndirect;
+  int debugLevel;
+  float maximumAmplificationFactor; // >=1.0
+  unsigned long long activationThresholdBytes;
+} ACCOUNTING;
+
+typedef struct entity_stats {
+  unsigned int countEverOpened;
+  unsigned int currentDepth;
+  unsigned int maximumDepthSeen;
+  int debugLevel;
+} ENTITY_STATS;
+#endif /* XML_DTD */
+
 typedef enum XML_Error PTRCALL Processor(XML_Parser parser, const char *start,
                                          const char *end, const char **endPtr);
 
@@ -401,16 +452,18 @@ static enum XML_Error initializeEncoding(XML_Parser parser);
 static enum XML_Error doProlog(XML_Parser parser, const ENCODING *enc,
                                const char *s, const char *end, int tok,
                                const char *next, const char **nextPtr,
-                               XML_Bool haveMore, XML_Bool allowClosingDoctype);
+                               XML_Bool haveMore, XML_Bool allowClosingDoctype,
+                               enum XML_Account account);
 static enum XML_Error processInternalEntity(XML_Parser parser, ENTITY *entity,
                                             XML_Bool betweenDecl);
 static enum XML_Error doContent(XML_Parser parser, int startTagLevel,
                                 const ENCODING *enc, const char *start,
                                 const char *end, const char **endPtr,
-                                XML_Bool haveMore);
+                                XML_Bool haveMore, enum XML_Account account);
 static enum XML_Error doCdataSection(XML_Parser parser, const ENCODING *,
                                      const char **startPtr, const char *end,
-                                     const char **nextPtr, XML_Bool haveMore);
+                                     const char **nextPtr, XML_Bool haveMore,
+                                     enum XML_Account account);
 #ifdef XML_DTD
 static enum XML_Error doIgnoreSection(XML_Parser parser, const ENCODING *,
                                       const char **startPtr, const char *end,
@@ -420,7 +473,8 @@ static enum XML_Error doIgnoreSection(XML_Parser parser, const ENCODING *,
 static void freeBindings(XML_Parser parser, BINDING *bindings);
 static enum XML_Error storeAtts(XML_Parser parser, const ENCODING *,
                                 const char *s, TAG_NAME *tagNamePtr,
-                                BINDING **bindingsPtr);
+                                BINDING **bindingsPtr,
+                                enum XML_Account account);
 static enum XML_Error addBinding(XML_Parser parser, PREFIX *prefix,
                                  const ATTRIBUTE_ID *attId, const XML_Char *uri,
                                  BINDING **bindingsPtr);
@@ -429,15 +483,18 @@ static int defineAttribute(ELEMENT_TYPE *type, ATTRIBUTE_ID *, XML_Bool isCdata,
                            XML_Parser parser);
 static enum XML_Error storeAttributeValue(XML_Parser parser, const ENCODING *,
                                           XML_Bool isCdata, const char *,
-                                          const char *, STRING_POOL *);
+                                          const char *, STRING_POOL *,
+                                          enum XML_Account account);
 static enum XML_Error appendAttributeValue(XML_Parser parser, const ENCODING *,
                                            XML_Bool isCdata, const char *,
-                                           const char *, STRING_POOL *);
+                                           const char *, STRING_POOL *,
+                                           enum XML_Account account);
 static ATTRIBUTE_ID *getAttributeId(XML_Parser parser, const ENCODING *enc,
                                     const char *start, const char *end);
 static int setElementTypePrefix(XML_Parser parser, ELEMENT_TYPE *);
 static enum XML_Error storeEntityValue(XML_Parser parser, const ENCODING *enc,
-                                       const char *start, const char *end);
+                                       const char *start, const char *end,
+                                       enum XML_Account account);
 static int reportProcessingInstruction(XML_Parser parser, const ENCODING *enc,
                                        const char *start, const char *end);
 static int reportComment(XML_Parser parser, const ENCODING *enc,
@@ -501,6 +558,34 @@ static XML_Parser parserCreate(const XML_Char *encodingName,
 
 static void parserInit(XML_Parser parser, const XML_Char *encodingName);
 
+#ifdef XML_DTD
+static float accountingGetCurrentAmplification(XML_Parser rootParser);
+static void accountingReportStats(XML_Parser originParser, const char *epilog);
+static void accountingOnAbort(XML_Parser originParser);
+static void accountingReportDiff(XML_Parser rootParser,
+                                 unsigned int levelsAwayFromRootParser,
+                                 const char *before, const char *after,
+                                 ptrdiff_t bytesMore, int source_line,
+                                 enum XML_Account account);
+static XML_Bool accountingDiffTolerated(XML_Parser originParser, int tok,
+                                        const char *before, const char *after,
+                                        int source_line,
+                                        enum XML_Account account);
+
+static void entityTrackingReportStats(XML_Parser parser, ENTITY *entity,
+                                      const char *action, int sourceLine);
+static void entityTrackingOnOpen(XML_Parser parser, ENTITY *entity,
+                                 int sourceLine);
+static void entityTrackingOnClose(XML_Parser parser, ENTITY *entity,
+                                  int sourceLine);
+
+static XML_Parser getRootParserOf(XML_Parser parser,
+                                  unsigned int *outLevelDiff);
+#endif /* XML_DTD */
+
+static unsigned long getDebugLevel(const char *variableName,
+                                   unsigned long defaultDebugLevel);
+
 #define poolStart(pool) ((pool)->start)
 #define poolEnd(pool) ((pool)->ptr)
 #define poolLength(pool) ((pool)->ptr - (pool)->start)
@@ -614,6 +699,10 @@ struct XML_ParserStruct {
   enum XML_ParamEntityParsing m_paramEntityParsing;
 #endif
   unsigned long m_hash_secret_salt;
+#ifdef XML_DTD
+  ACCOUNTING m_accounting;
+  ENTITY_STATS m_entity_stats;
+#endif
 };
 
 #define MALLOC(parser, s) (parser->m_mem.malloc_fcn((s)))
@@ -734,6 +823,15 @@ writeRandomBytes_arc4random(void *target, size_t count) {
 
 #ifdef _WIN32
 
+/* Provide declaration of rand_s() for MinGW-32 (not 64, which has it),
+   as it didn't declare it in its header prior to version 5.3.0 of its
+   runtime package (mingwrt, containing stdlib.h).  The upstream fix
+   was introduced at https://osdn.net/projects/mingw/ticket/39658 . */
+#  if defined(__MINGW32__) && defined(__MINGW32_VERSION)                       \
+      && __MINGW32_VERSION < 5003000L && ! defined(__MINGW64_VERSION_MAJOR)
+__declspec(dllimport) int rand_s(unsigned int *);
+#  endif
+
 /* Obtain entropy on Windows using the rand_s() function which
  * generates cryptographically secure random numbers.  Internally it
  * uses RtlGenRandom API which is present in Windows XP and later.
@@ -789,9 +887,8 @@ gather_time_entropy(void) {
 
 static unsigned long
 ENTROPY_DEBUG(const char *label, unsigned long entropy) {
-  const char *const EXPAT_ENTROPY_DEBUG = getenv("EXPAT_ENTROPY_DEBUG");
-  if (EXPAT_ENTROPY_DEBUG && ! strcmp(EXPAT_ENTROPY_DEBUG, "1")) {
-    fprintf(stderr, "Entropy: %s --> 0x%0*lx (%lu bytes)\n", label,
+  if (getDebugLevel("EXPAT_ENTROPY_DEBUG", 0) >= 1u) {
+    fprintf(stderr, "expat: Entropy: %s --> 0x%0*lx (%lu bytes)\n", label,
             (int)sizeof(entropy) * 2, entropy, (unsigned long)sizeof(entropy));
   }
   return entropy;
@@ -1053,6 +1150,18 @@ parserInit(XML_Parser parser, const XML_Char *encodingName) {
   parser->m_paramEntityParsing = XML_PARAM_ENTITY_PARSING_NEVER;
 #endif
   parser->m_hash_secret_salt = 0;
+
+#ifdef XML_DTD
+  memset(&parser->m_accounting, 0, sizeof(ACCOUNTING));
+  parser->m_accounting.debugLevel = getDebugLevel("EXPAT_ACCOUNTING_DEBUG", 0u);
+  parser->m_accounting.maximumAmplificationFactor
+      = EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT;
+  parser->m_accounting.activationThresholdBytes
+      = EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT;
+
+  memset(&parser->m_entity_stats, 0, sizeof(ENTITY_STATS));
+  parser->m_entity_stats.debugLevel = getDebugLevel("EXPAT_ENTITY_DEBUG", 0u);
+#endif
 }
 
 /* moves list of bindings to m_freeBindingList */
@@ -1399,6 +1508,7 @@ XML_UseForeignDTD(XML_Parser parser, XML_Bool useDTD) {
   parser->m_useForeignDTD = useDTD;
   return XML_ERROR_NONE;
 #else
+  UNUSED_P(useDTD);
   return XML_ERROR_FEATURE_REQUIRES_XML_DTD;
 #endif
 }
@@ -1780,7 +1890,7 @@ XML_Parse(XML_Parser parser, const char *s, int len, int isFinal) {
     int nLeftOver;
     enum XML_Status result;
     /* Detect overflow (a+b > MAX <==> b > MAX-a) */
-    if (len > ((XML_Size)-1) / 2 - parser->m_parseEndByteIndex) {
+    if ((XML_Size)len > ((XML_Size)-1) / 2 - parser->m_parseEndByteIndex) {
       parser->m_errorCode = XML_ERROR_NO_MEMORY;
       parser->m_eventPtr = parser->m_eventEndPtr = NULL;
       parser->m_processor = errorProcessor;
@@ -1872,6 +1982,12 @@ XML_ParseBuffer(XML_Parser parser, int len, int isFinal) {
     parser->m_errorCode = XML_ERROR_FINISHED;
     return XML_STATUS_ERROR;
   case XML_INITIALIZED:
+    /* Has someone called XML_GetBuffer successfully before? */
+    if (! parser->m_bufferPtr) {
+      parser->m_errorCode = XML_ERROR_NO_BUFFER;
+      return XML_STATUS_ERROR;
+    }
+
     if (parser->m_parentParser == NULL && ! startParsing(parser)) {
       parser->m_errorCode = XML_ERROR_NO_MEMORY;
       return XML_STATUS_ERROR;
@@ -2155,7 +2271,7 @@ XML_GetInputContext(XML_Parser parser, int *offset, int *size) {
   (void)offset;
   (void)size;
 #endif /* defined XML_CONTEXT_BYTES */
-  return (char *)0;
+  return (const char *)0;
 }
 
 XML_Size XMLCALL
@@ -2316,6 +2432,14 @@ XML_ErrorString(enum XML_Error code) {
   /* Added in 2.2.5. */
   case XML_ERROR_INVALID_ARGUMENT: /* Constant added in 2.2.1, already */
     return XML_L("invalid argument");
+    /* Added in 2.3.0. */
+  case XML_ERROR_NO_BUFFER:
+    return XML_L(
+        "a successful prior call to function XML_GetBuffer is required");
+  /* Added in 2.4.0. */
+  case XML_ERROR_AMPLIFICATION_LIMIT_BREACH:
+    return XML_L(
+        "limit on input amplification factor (from DTD and entities) breached");
   }
   return NULL;
 }
@@ -2352,41 +2476,75 @@ XML_ExpatVersionInfo(void) {
 
 const XML_Feature *XMLCALL
 XML_GetFeatureList(void) {
-  static const XML_Feature features[]
-      = {{XML_FEATURE_SIZEOF_XML_CHAR, XML_L("sizeof(XML_Char)"),
-          sizeof(XML_Char)},
-         {XML_FEATURE_SIZEOF_XML_LCHAR, XML_L("sizeof(XML_LChar)"),
-          sizeof(XML_LChar)},
+  static const XML_Feature features[] = {
+      {XML_FEATURE_SIZEOF_XML_CHAR, XML_L("sizeof(XML_Char)"),
+       sizeof(XML_Char)},
+      {XML_FEATURE_SIZEOF_XML_LCHAR, XML_L("sizeof(XML_LChar)"),
+       sizeof(XML_LChar)},
 #ifdef XML_UNICODE
-         {XML_FEATURE_UNICODE, XML_L("XML_UNICODE"), 0},
+      {XML_FEATURE_UNICODE, XML_L("XML_UNICODE"), 0},
 #endif
 #ifdef XML_UNICODE_WCHAR_T
-         {XML_FEATURE_UNICODE_WCHAR_T, XML_L("XML_UNICODE_WCHAR_T"), 0},
+      {XML_FEATURE_UNICODE_WCHAR_T, XML_L("XML_UNICODE_WCHAR_T"), 0},
 #endif
 #ifdef XML_DTD
-         {XML_FEATURE_DTD, XML_L("XML_DTD"), 0},
+      {XML_FEATURE_DTD, XML_L("XML_DTD"), 0},
 #endif
 #ifdef XML_CONTEXT_BYTES
-         {XML_FEATURE_CONTEXT_BYTES, XML_L("XML_CONTEXT_BYTES"),
-          XML_CONTEXT_BYTES},
+      {XML_FEATURE_CONTEXT_BYTES, XML_L("XML_CONTEXT_BYTES"),
+       XML_CONTEXT_BYTES},
 #endif
 #ifdef XML_MIN_SIZE
-         {XML_FEATURE_MIN_SIZE, XML_L("XML_MIN_SIZE"), 0},
+      {XML_FEATURE_MIN_SIZE, XML_L("XML_MIN_SIZE"), 0},
 #endif
 #ifdef XML_NS
-         {XML_FEATURE_NS, XML_L("XML_NS"), 0},
+      {XML_FEATURE_NS, XML_L("XML_NS"), 0},
 #endif
 #ifdef XML_LARGE_SIZE
-         {XML_FEATURE_LARGE_SIZE, XML_L("XML_LARGE_SIZE"), 0},
+      {XML_FEATURE_LARGE_SIZE, XML_L("XML_LARGE_SIZE"), 0},
 #endif
 #ifdef XML_ATTR_INFO
-         {XML_FEATURE_ATTR_INFO, XML_L("XML_ATTR_INFO"), 0},
+      {XML_FEATURE_ATTR_INFO, XML_L("XML_ATTR_INFO"), 0},
+#endif
+#ifdef XML_DTD
+      /* Added in Expat 2.4.0. */
+      {XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT,
+       XML_L("XML_BLAP_MAX_AMP"),
+       (long int)
+           EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT},
+      {XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT,
+       XML_L("XML_BLAP_ACT_THRES"),
+       EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT},
 #endif
-         {XML_FEATURE_END, NULL, 0}};
+      {XML_FEATURE_END, NULL, 0}};
 
   return features;
 }
 
+#ifdef XML_DTD
+XML_Bool XMLCALL
+XML_SetBillionLaughsAttackProtectionMaximumAmplification(
+    XML_Parser parser, float maximumAmplificationFactor) {
+  if ((parser == NULL) || (parser->m_parentParser != NULL)
+      || isnan(maximumAmplificationFactor)
+      || (maximumAmplificationFactor < 1.0f)) {
+    return XML_FALSE;
+  }
+  parser->m_accounting.maximumAmplificationFactor = maximumAmplificationFactor;
+  return XML_TRUE;
+}
+
+XML_Bool XMLCALL
+XML_SetBillionLaughsAttackProtectionActivationThreshold(
+    XML_Parser parser, unsigned long long activationThresholdBytes) {
+  if ((parser == NULL) || (parser->m_parentParser != NULL)) {
+    return XML_FALSE;
+  }
+  parser->m_accounting.activationThresholdBytes = activationThresholdBytes;
+  return XML_TRUE;
+}
+#endif /* XML_DTD */
+
 /* Initially tag->rawName always points into the parse buffer;
    for those TAG instances opened while the current parse buffer was
    processed, and not yet closed, we need to store tag->rawName in a more
@@ -2439,9 +2597,9 @@ storeRawNames(XML_Parser parser) {
 static enum XML_Error PTRCALL
 contentProcessor(XML_Parser parser, const char *start, const char *end,
                  const char **endPtr) {
-  enum XML_Error result
-      = doContent(parser, 0, parser->m_encoding, start, end, endPtr,
-                  (XML_Bool)! parser->m_parsingStatus.finalBuffer);
+  enum XML_Error result = doContent(
+      parser, 0, parser->m_encoding, start, end, endPtr,
+      (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_ACCOUNT_DIRECT);
   if (result == XML_ERROR_NONE) {
     if (! storeRawNames(parser))
       return XML_ERROR_NO_MEMORY;
@@ -2466,6 +2624,14 @@ externalEntityInitProcessor2(XML_Parser parser, const char *start,
   int tok = XmlContentTok(parser->m_encoding, start, end, &next);
   switch (tok) {
   case XML_TOK_BOM:
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, start, next, __LINE__,
+                                  XML_ACCOUNT_DIRECT)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#endif /* XML_DTD */
+
     /* If we are at the end of the buffer, this would cause the next stage,
        i.e. externalEntityInitProcessor3, to pass control directly to
        doContent (by detecting XML_TOK_NONE) without processing any xml text
@@ -2503,6 +2669,10 @@ externalEntityInitProcessor3(XML_Parser parser, const char *start,
   const char *next = start; /* XmlContentTok doesn't always set the last arg */
   parser->m_eventPtr = start;
   tok = XmlContentTok(parser->m_encoding, start, end, &next);
+  /* Note: These bytes are accounted later in:
+           - processXmlDecl
+           - externalEntityContentProcessor
+  */
   parser->m_eventEndPtr = next;
 
   switch (tok) {
@@ -2544,7 +2714,8 @@ externalEntityContentProcessor(XML_Parser parser, const char *start,
                                const char *end, const char **endPtr) {
   enum XML_Error result
       = doContent(parser, 1, parser->m_encoding, start, end, endPtr,
-                  (XML_Bool)! parser->m_parsingStatus.finalBuffer);
+                  (XML_Bool)! parser->m_parsingStatus.finalBuffer,
+                  XML_ACCOUNT_ENTITY_EXPANSION);
   if (result == XML_ERROR_NONE) {
     if (! storeRawNames(parser))
       return XML_ERROR_NO_MEMORY;
@@ -2555,7 +2726,7 @@ externalEntityContentProcessor(XML_Parser parser, const char *start,
 static enum XML_Error
 doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
           const char *s, const char *end, const char **nextPtr,
-          XML_Bool haveMore) {
+          XML_Bool haveMore, enum XML_Account account) {
   /* save one level of indirection */
   DTD *const dtd = parser->m_dtd;
 
@@ -2573,6 +2744,17 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
   for (;;) {
     const char *next = s; /* XmlContentTok doesn't always set the last arg */
     int tok = XmlContentTok(enc, s, end, &next);
+#ifdef XML_DTD
+    const char *accountAfter
+        = ((tok == XML_TOK_TRAILING_RSQB) || (tok == XML_TOK_TRAILING_CR))
+              ? (haveMore ? s /* i.e. 0 bytes */ : end)
+              : next;
+    if (! accountingDiffTolerated(parser, tok, s, accountAfter, __LINE__,
+                                  account)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#endif
     *eventEndPP = next;
     switch (tok) {
     case XML_TOK_TRAILING_CR:
@@ -2628,6 +2810,14 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
       XML_Char ch = (XML_Char)XmlPredefinedEntityName(
           enc, s + enc->minBytesPerChar, next - enc->minBytesPerChar);
       if (ch) {
+#ifdef XML_DTD
+        /* NOTE: We are replacing 4-6 characters original input for 1 character
+         *       so there is no amplification and hence recording without
+         *       protection. */
+        accountingDiffTolerated(parser, tok, (char *)&ch,
+                                ((char *)&ch) + sizeof(XML_Char), __LINE__,
+                                XML_ACCOUNT_ENTITY_EXPANSION);
+#endif /* XML_DTD */
         if (parser->m_characterDataHandler)
           parser->m_characterDataHandler(parser->m_handlerArg, &ch, 1);
         else if (parser->m_defaultHandler)
@@ -2746,7 +2936,8 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
       }
       tag->name.str = (XML_Char *)tag->buf;
       *toPtr = XML_T('\0');
-      result = storeAtts(parser, enc, s, &(tag->name), &(tag->bindings));
+      result
+          = storeAtts(parser, enc, s, &(tag->name), &(tag->bindings), account);
       if (result)
         return result;
       if (parser->m_startElementHandler)
@@ -2770,7 +2961,8 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
       if (! name.str)
         return XML_ERROR_NO_MEMORY;
       poolFinish(&parser->m_tempPool);
-      result = storeAtts(parser, enc, s, &name, &bindings);
+      result = storeAtts(parser, enc, s, &name, &bindings,
+                         XML_ACCOUNT_NONE /* token spans whole start tag */);
       if (result != XML_ERROR_NONE) {
         freeBindings(parser, bindings);
         return result;
@@ -2905,7 +3097,8 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
       /* END disabled code */
       else if (parser->m_defaultHandler)
         reportDefault(parser, enc, s, next);
-      result = doCdataSection(parser, enc, &next, end, nextPtr, haveMore);
+      result
+          = doCdataSection(parser, enc, &next, end, nextPtr, haveMore, account);
       if (result != XML_ERROR_NONE)
         return result;
       else if (! next) {
@@ -3034,7 +3227,8 @@ freeBindings(XML_Parser parser, BINDING *bindings) {
 */
 static enum XML_Error
 storeAtts(XML_Parser parser, const ENCODING *enc, const char *attStr,
-          TAG_NAME *tagNamePtr, BINDING **bindingsPtr) {
+          TAG_NAME *tagNamePtr, BINDING **bindingsPtr,
+          enum XML_Account account) {
   DTD *const dtd = parser->m_dtd; /* save one level of indirection */
   ELEMENT_TYPE *elementType;
   int nDefaultAtts;
@@ -3144,7 +3338,7 @@ storeAtts(XML_Parser parser, const ENCODING *enc, const char *attStr,
       /* normalize the attribute value */
       result = storeAttributeValue(
           parser, enc, isCdata, parser->m_atts[i].valuePtr,
-          parser->m_atts[i].valueEnd, &parser->m_tempPool);
+          parser->m_atts[i].valueEnd, &parser->m_tempPool, account);
       if (result)
         return result;
       appAtts[attIndex] = poolStart(&parser->m_tempPool);
@@ -3533,9 +3727,9 @@ addBinding(XML_Parser parser, PREFIX *prefix, const ATTRIBUTE_ID *attId,
 static enum XML_Error PTRCALL
 cdataSectionProcessor(XML_Parser parser, const char *start, const char *end,
                       const char **endPtr) {
-  enum XML_Error result
-      = doCdataSection(parser, parser->m_encoding, &start, end, endPtr,
-                       (XML_Bool)! parser->m_parsingStatus.finalBuffer);
+  enum XML_Error result = doCdataSection(
+      parser, parser->m_encoding, &start, end, endPtr,
+      (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_ACCOUNT_DIRECT);
   if (result != XML_ERROR_NONE)
     return result;
   if (start) {
@@ -3555,7 +3749,8 @@ cdataSectionProcessor(XML_Parser parser, const char *start, const char *end,
 */
 static enum XML_Error
 doCdataSection(XML_Parser parser, const ENCODING *enc, const char **startPtr,
-               const char *end, const char **nextPtr, XML_Bool haveMore) {
+               const char *end, const char **nextPtr, XML_Bool haveMore,
+               enum XML_Account account) {
   const char *s = *startPtr;
   const char **eventPP;
   const char **eventEndPP;
@@ -3571,8 +3766,16 @@ doCdataSection(XML_Parser parser, const ENCODING *enc, const char **startPtr,
   *startPtr = NULL;
 
   for (;;) {
-    const char *next;
+    const char *next = s; /* in case of XML_TOK_NONE or XML_TOK_PARTIAL */
     int tok = XmlCdataSectionTok(enc, s, end, &next);
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, s, next, __LINE__, account)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#else
+    UNUSED_P(account);
+#endif
     *eventEndPP = next;
     switch (tok) {
     case XML_TOK_CDATA_SECT_CLOSE:
@@ -3689,7 +3892,7 @@ ignoreSectionProcessor(XML_Parser parser, const char *start, const char *end,
 static enum XML_Error
 doIgnoreSection(XML_Parser parser, const ENCODING *enc, const char **startPtr,
                 const char *end, const char **nextPtr, XML_Bool haveMore) {
-  const char *next;
+  const char *next = *startPtr; /* in case of XML_TOK_NONE or XML_TOK_PARTIAL */
   int tok;
   const char *s = *startPtr;
   const char **eventPP;
@@ -3717,6 +3920,13 @@ doIgnoreSection(XML_Parser parser, const ENCODING *enc, const char **startPtr,
   *eventPP = s;
   *startPtr = NULL;
   tok = XmlIgnoreSectionTok(enc, s, end, &next);
+#  ifdef XML_DTD
+  if (! accountingDiffTolerated(parser, tok, s, next, __LINE__,
+                                XML_ACCOUNT_DIRECT)) {
+    accountingOnAbort(parser);
+    return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+  }
+#  endif
   *eventEndPP = next;
   switch (tok) {
   case XML_TOK_IGNORE_SECT:
@@ -3801,6 +4011,15 @@ processXmlDecl(XML_Parser parser, int isGeneralTextEntity, const char *s,
   const char *versionend;
   const XML_Char *storedversion = NULL;
   int standalone = -1;
+
+#ifdef XML_DTD
+  if (! accountingDiffTolerated(parser, XML_TOK_XML_DECL, s, next, __LINE__,
+                                XML_ACCOUNT_DIRECT)) {
+    accountingOnAbort(parser);
+    return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+  }
+#endif
+
   if (! (parser->m_ns ? XmlParseXmlDeclNS : XmlParseXmlDecl)(
           isGeneralTextEntity, parser->m_encoding, s, next, &parser->m_eventPtr,
           &version, &versionend, &encodingName, &newEncoding, &standalone)) {
@@ -3950,6 +4169,10 @@ entityValueInitProcessor(XML_Parser parser, const char *s, const char *end,
 
   for (;;) {
     tok = XmlPrologTok(parser->m_encoding, start, end, &next);
+    /* Note: Except for XML_TOK_BOM below, these bytes are accounted later in:
+             - storeEntityValue
+             - processXmlDecl
+    */
     parser->m_eventEndPtr = next;
     if (tok <= 0) {
       if (! parser->m_parsingStatus.finalBuffer && tok != XML_TOK_INVALID) {
@@ -3968,7 +4191,8 @@ entityValueInitProcessor(XML_Parser parser, const char *s, const char *end,
         break;
       }
       /* found end of entity value - can store it now */
-      return storeEntityValue(parser, parser->m_encoding, s, end);
+      return storeEntityValue(parser, parser->m_encoding, s, end,
+                              XML_ACCOUNT_DIRECT);
     } else if (tok == XML_TOK_XML_DECL) {
       enum XML_Error result;
       result = processXmlDecl(parser, 0, start, next);
@@ -3995,6 +4219,14 @@ entityValueInitProcessor(XML_Parser parser, const char *s, const char *end,
     */
     else if (tok == XML_TOK_BOM && next == end
              && ! parser->m_parsingStatus.finalBuffer) {
+#  ifdef XML_DTD
+      if (! accountingDiffTolerated(parser, tok, s, next, __LINE__,
+                                    XML_ACCOUNT_DIRECT)) {
+        accountingOnAbort(parser);
+        return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+      }
+#  endif
+
       *nextPtr = next;
       return XML_ERROR_NONE;
     }
@@ -4037,16 +4269,24 @@ externalParEntProcessor(XML_Parser parser, const char *s, const char *end,
   }
   /* This would cause the next stage, i.e. doProlog to be passed XML_TOK_BOM.
      However, when parsing an external subset, doProlog will not accept a BOM
-     as valid, and report a syntax error, so we have to skip the BOM
+     as valid, and report a syntax error, so we have to skip the BOM, and
+     account for the BOM bytes.
   */
   else if (tok == XML_TOK_BOM) {
+    if (! accountingDiffTolerated(parser, tok, s, next, __LINE__,
+                                  XML_ACCOUNT_DIRECT)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+
     s = next;
     tok = XmlPrologTok(parser->m_encoding, s, end, &next);
   }
 
   parser->m_processor = prologProcessor;
   return doProlog(parser, parser->m_encoding, s, end, tok, next, nextPtr,
-                  (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE);
+                  (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE,
+                  XML_ACCOUNT_DIRECT);
 }
 
 static enum XML_Error PTRCALL
@@ -4059,6 +4299,9 @@ entityValueProcessor(XML_Parser parser, const char *s, const char *end,
 
   for (;;) {
     tok = XmlPrologTok(enc, start, end, &next);
+    /* Note: These bytes are accounted later in:
+             - storeEntityValue
+    */
     if (tok <= 0) {
       if (! parser->m_parsingStatus.finalBuffer && tok != XML_TOK_INVALID) {
         *nextPtr = s;
@@ -4076,7 +4319,7 @@ entityValueProcessor(XML_Parser parser, const char *s, const char *end,
         break;
       }
       /* found end of entity value - can store it now */
-      return storeEntityValue(parser, enc, s, end);
+      return storeEntityValue(parser, enc, s, end, XML_ACCOUNT_DIRECT);
     }
     start = next;
   }
@@ -4090,13 +4333,14 @@ prologProcessor(XML_Parser parser, const char *s, const char *end,
   const char *next = s;
   int tok = XmlPrologTok(parser->m_encoding, s, end, &next);
   return doProlog(parser, parser->m_encoding, s, end, tok, next, nextPtr,
-                  (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE);
+                  (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE,
+                  XML_ACCOUNT_DIRECT);
 }
 
 static enum XML_Error
 doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
          int tok, const char *next, const char **nextPtr, XML_Bool haveMore,
-         XML_Bool allowClosingDoctype) {
+         XML_Bool allowClosingDoctype, enum XML_Account account) {
 #ifdef XML_DTD
   static const XML_Char externalSubsetName[] = {ASCII_HASH, '\0'};
 #endif /* XML_DTD */
@@ -4123,6 +4367,10 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
   static const XML_Char enumValueSep[] = {ASCII_PIPE, '\0'};
   static const XML_Char enumValueStart[] = {ASCII_LPAREN, '\0'};
 
+#ifndef XML_DTD
+  UNUSED_P(account);
+#endif
+
   /* save one level of indirection */
   DTD *const dtd = parser->m_dtd;
 
@@ -4187,6 +4435,19 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
       }
     }
     role = XmlTokenRole(&parser->m_prologState, tok, s, next, enc);
+#ifdef XML_DTD
+    switch (role) {
+    case XML_ROLE_INSTANCE_START: // bytes accounted in contentProcessor
+    case XML_ROLE_XML_DECL:       // bytes accounted in processXmlDecl
+    case XML_ROLE_TEXT_DECL:      // bytes accounted in processXmlDecl
+      break;
+    default:
+      if (! accountingDiffTolerated(parser, tok, s, next, __LINE__, account)) {
+        accountingOnAbort(parser);
+        return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+      }
+    }
+#endif
     switch (role) {
     case XML_ROLE_XML_DECL: {
       enum XML_Error result = processXmlDecl(parser, 0, s, next);
@@ -4462,7 +4723,8 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
         const XML_Char *attVal;
         enum XML_Error result = storeAttributeValue(
             parser, enc, parser->m_declAttributeIsCdata,
-            s + enc->minBytesPerChar, next - enc->minBytesPerChar, &dtd->pool);
+            s + enc->minBytesPerChar, next - enc->minBytesPerChar, &dtd->pool,
+            XML_ACCOUNT_NONE);
         if (result)
           return result;
         attVal = poolStart(&dtd->pool);
@@ -4495,8 +4757,9 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
       break;
     case XML_ROLE_ENTITY_VALUE:
       if (dtd->keepProcessing) {
-        enum XML_Error result = storeEntityValue(
-            parser, enc, s + enc->minBytesPerChar, next - enc->minBytesPerChar);
+        enum XML_Error result
+            = storeEntityValue(parser, enc, s + enc->minBytesPerChar,
+                               next - enc->minBytesPerChar, XML_ACCOUNT_NONE);
         if (parser->m_declEntity) {
           parser->m_declEntity->textPtr = poolStart(&dtd->entityValuePool);
           parser->m_declEntity->textLen
@@ -4886,12 +5149,15 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
         if (parser->m_externalEntityRefHandler) {
           dtd->paramEntityRead = XML_FALSE;
           entity->open = XML_TRUE;
+          entityTrackingOnOpen(parser, entity, __LINE__);
           if (! parser->m_externalEntityRefHandler(
                   parser->m_externalEntityRefHandlerArg, 0, entity->base,
                   entity->systemId, entity->publicId)) {
+            entityTrackingOnClose(parser, entity, __LINE__);
             entity->open = XML_FALSE;
             return XML_ERROR_EXTERNAL_ENTITY_HANDLING;
           }
+          entityTrackingOnClose(parser, entity, __LINE__);
           entity->open = XML_FALSE;
           handleDefault = XML_FALSE;
           if (! dtd->paramEntityRead) {
@@ -5089,6 +5355,13 @@ epilogProcessor(XML_Parser parser, const char *s, const char *end,
   for (;;) {
     const char *next = NULL;
     int tok = XmlPrologTok(parser->m_encoding, s, end, &next);
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, s, next, __LINE__,
+                                  XML_ACCOUNT_DIRECT)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#endif
     parser->m_eventEndPtr = next;
     switch (tok) {
     /* report partial linebreak - it might be the last token */
@@ -5162,6 +5435,9 @@ processInternalEntity(XML_Parser parser, ENTITY *entity, XML_Bool betweenDecl) {
       return XML_ERROR_NO_MEMORY;
   }
   entity->open = XML_TRUE;
+#ifdef XML_DTD
+  entityTrackingOnOpen(parser, entity, __LINE__);
+#endif
   entity->processed = 0;
   openEntity->next = parser->m_openInternalEntities;
   parser->m_openInternalEntities = openEntity;
@@ -5170,8 +5446,8 @@ processInternalEntity(XML_Parser parser, ENTITY *entity, XML_Bool betweenDecl) {
   openEntity->betweenDecl = betweenDecl;
   openEntity->internalEventPtr = NULL;
   openEntity->internalEventEndPtr = NULL;
-  textStart = (char *)entity->textPtr;
-  textEnd = (char *)(entity->textPtr + entity->textLen);
+  textStart = (const char *)entity->textPtr;
+  textEnd = (const char *)(entity->textPtr + entity->textLen);
   /* Set a safe default value in case 'next' does not get set */
   next = textStart;
 
@@ -5180,17 +5456,22 @@ processInternalEntity(XML_Parser parser, ENTITY *entity, XML_Bool betweenDecl) {
     int tok
         = XmlPrologTok(parser->m_internalEncoding, textStart, textEnd, &next);
     result = doProlog(parser, parser->m_internalEncoding, textStart, textEnd,
-                      tok, next, &next, XML_FALSE, XML_FALSE);
+                      tok, next, &next, XML_FALSE, XML_FALSE,
+                      XML_ACCOUNT_ENTITY_EXPANSION);
   } else
 #endif /* XML_DTD */
     result = doContent(parser, parser->m_tagLevel, parser->m_internalEncoding,
-                       textStart, textEnd, &next, XML_FALSE);
+                       textStart, textEnd, &next, XML_FALSE,
+                       XML_ACCOUNT_ENTITY_EXPANSION);
 
   if (result == XML_ERROR_NONE) {
     if (textEnd != next && parser->m_parsingStatus.parsing == XML_SUSPENDED) {
       entity->processed = (int)(next - textStart);
       parser->m_processor = internalEntityProcessor;
     } else {
+#ifdef XML_DTD
+      entityTrackingOnClose(parser, entity, __LINE__);
+#endif /* XML_DTD */
       entity->open = XML_FALSE;
       parser->m_openInternalEntities = openEntity->next;
       /* put openEntity back in list of free instances */
@@ -5213,8 +5494,8 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,
     return XML_ERROR_UNEXPECTED_STATE;
 
   entity = openEntity->entity;
-  textStart = ((char *)entity->textPtr) + entity->processed;
-  textEnd = (char *)(entity->textPtr + entity->textLen);
+  textStart = ((const char *)entity->textPtr) + entity->processed;
+  textEnd = (const char *)(entity->textPtr + entity->textLen);
   /* Set a safe default value in case 'next' does not get set */
   next = textStart;
 
@@ -5223,20 +5504,24 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,
     int tok
         = XmlPrologTok(parser->m_internalEncoding, textStart, textEnd, &next);
     result = doProlog(parser, parser->m_internalEncoding, textStart, textEnd,
-                      tok, next, &next, XML_FALSE, XML_TRUE);
+                      tok, next, &next, XML_FALSE, XML_TRUE,
+                      XML_ACCOUNT_ENTITY_EXPANSION);
   } else
 #endif /* XML_DTD */
     result = doContent(parser, openEntity->startTagLevel,
                        parser->m_internalEncoding, textStart, textEnd, &next,
-                       XML_FALSE);
+                       XML_FALSE, XML_ACCOUNT_ENTITY_EXPANSION);
 
   if (result != XML_ERROR_NONE)
     return result;
   else if (textEnd != next
            && parser->m_parsingStatus.parsing == XML_SUSPENDED) {
-    entity->processed = (int)(next - (char *)entity->textPtr);
+    entity->processed = (int)(next - (const char *)entity->textPtr);
     return result;
   } else {
+#ifdef XML_DTD
+    entityTrackingOnClose(parser, entity, __LINE__);
+#endif
     entity->open = XML_FALSE;
     parser->m_openInternalEntities = openEntity->next;
     /* put openEntity back in list of free instances */
@@ -5250,7 +5535,8 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,
     parser->m_processor = prologProcessor;
     tok = XmlPrologTok(parser->m_encoding, s, end, &next);
     return doProlog(parser, parser->m_encoding, s, end, tok, next, nextPtr,
-                    (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE);
+                    (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE,
+                    XML_ACCOUNT_DIRECT);
   } else
 #endif /* XML_DTD */
   {
@@ -5258,7 +5544,8 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,
     /* see externalEntityContentProcessor vs contentProcessor */
     return doContent(parser, parser->m_parentParser ? 1 : 0, parser->m_encoding,
                      s, end, nextPtr,
-                     (XML_Bool)! parser->m_parsingStatus.finalBuffer);
+                     (XML_Bool)! parser->m_parsingStatus.finalBuffer,
+                     XML_ACCOUNT_DIRECT);
   }
 }
 
@@ -5273,9 +5560,10 @@ errorProcessor(XML_Parser parser, const char *s, const char *end,
 
 static enum XML_Error
 storeAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
-                    const char *ptr, const char *end, STRING_POOL *pool) {
+                    const char *ptr, const char *end, STRING_POOL *pool,
+                    enum XML_Account account) {
   enum XML_Error result
-      = appendAttributeValue(parser, enc, isCdata, ptr, end, pool);
+      = appendAttributeValue(parser, enc, isCdata, ptr, end, pool, account);
   if (result)
     return result;
   if (! isCdata && poolLength(pool) && poolLastChar(pool) == 0x20)
@@ -5287,11 +5575,23 @@ storeAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
 
 static enum XML_Error
 appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
-                     const char *ptr, const char *end, STRING_POOL *pool) {
+                     const char *ptr, const char *end, STRING_POOL *pool,
+                     enum XML_Account account) {
   DTD *const dtd = parser->m_dtd; /* save one level of indirection */
+#ifndef XML_DTD
+  UNUSED_P(account);
+#endif
+
   for (;;) {
-    const char *next;
+    const char *next
+        = ptr; /* XmlAttributeValueTok doesn't always set the last arg */
     int tok = XmlAttributeValueTok(enc, ptr, end, &next);
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, ptr, next, __LINE__, account)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#endif
     switch (tok) {
     case XML_TOK_NONE:
       return XML_ERROR_NONE;
@@ -5351,6 +5651,14 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
       XML_Char ch = (XML_Char)XmlPredefinedEntityName(
           enc, ptr + enc->minBytesPerChar, next - enc->minBytesPerChar);
       if (ch) {
+#ifdef XML_DTD
+        /* NOTE: We are replacing 4-6 characters original input for 1 character
+         *       so there is no amplification and hence recording without
+         *       protection. */
+        accountingDiffTolerated(parser, tok, (char *)&ch,
+                                ((char *)&ch) + sizeof(XML_Char), __LINE__,
+                                XML_ACCOUNT_ENTITY_EXPANSION);
+#endif /* XML_DTD */
         if (! poolAppendChar(pool, ch))
           return XML_ERROR_NO_MEMORY;
         break;
@@ -5428,9 +5736,16 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
         enum XML_Error result;
         const XML_Char *textEnd = entity->textPtr + entity->textLen;
         entity->open = XML_TRUE;
+#ifdef XML_DTD
+        entityTrackingOnOpen(parser, entity, __LINE__);
+#endif
         result = appendAttributeValue(parser, parser->m_internalEncoding,
-                                      isCdata, (char *)entity->textPtr,
-                                      (char *)textEnd, pool);
+                                      isCdata, (const char *)entity->textPtr,
+                                      (const char *)textEnd, pool,
+                                      XML_ACCOUNT_ENTITY_EXPANSION);
+#ifdef XML_DTD
+        entityTrackingOnClose(parser, entity, __LINE__);
+#endif
         entity->open = XML_FALSE;
         if (result)
           return result;
@@ -5460,13 +5775,16 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
 
 static enum XML_Error
 storeEntityValue(XML_Parser parser, const ENCODING *enc,
-                 const char *entityTextPtr, const char *entityTextEnd) {
+                 const char *entityTextPtr, const char *entityTextEnd,
+                 enum XML_Account account) {
   DTD *const dtd = parser->m_dtd; /* save one level of indirection */
   STRING_POOL *pool = &(dtd->entityValuePool);
   enum XML_Error result = XML_ERROR_NONE;
 #ifdef XML_DTD
   int oldInEntityValue = parser->m_prologState.inEntityValue;
   parser->m_prologState.inEntityValue = 1;
+#else
+  UNUSED_P(account);
 #endif /* XML_DTD */
   /* never return Null for the value argument in EntityDeclHandler,
      since this would indicate an external entity; therefore we
@@ -5477,8 +5795,19 @@ storeEntityValue(XML_Parser parser, const ENCODING *enc,
   }
 
   for (;;) {
-    const char *next;
+    const char *next
+        = entityTextPtr; /* XmlEntityValueTok doesn't always set the last arg */
     int tok = XmlEntityValueTok(enc, entityTextPtr, entityTextEnd, &next);
+
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, entityTextPtr, next, __LINE__,
+                                  account)) {
+      accountingOnAbort(parser);
+      result = XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+      goto endEntityValue;
+    }
+#endif
+
     switch (tok) {
     case XML_TOK_PARAM_ENTITY_REF:
 #ifdef XML_DTD
@@ -5514,13 +5843,16 @@ storeEntityValue(XML_Parser parser, const ENCODING *enc,
           if (parser->m_externalEntityRefHandler) {
             dtd->paramEntityRead = XML_FALSE;
             entity->open = XML_TRUE;
+            entityTrackingOnOpen(parser, entity, __LINE__);
             if (! parser->m_externalEntityRefHandler(
                     parser->m_externalEntityRefHandlerArg, 0, entity->base,
                     entity->systemId, entity->publicId)) {
+              entityTrackingOnClose(parser, entity, __LINE__);
               entity->open = XML_FALSE;
               result = XML_ERROR_EXTERNAL_ENTITY_HANDLING;
               goto endEntityValue;
             }
+            entityTrackingOnClose(parser, entity, __LINE__);
             entity->open = XML_FALSE;
             if (! dtd->paramEntityRead)
               dtd->keepProcessing = dtd->standalone;
@@ -5528,9 +5860,12 @@ storeEntityValue(XML_Parser parser, const ENCODING *enc,
             dtd->keepProcessing = dtd->standalone;
         } else {
           entity->open = XML_TRUE;
+          entityTrackingOnOpen(parser, entity, __LINE__);
           result = storeEntityValue(
-              parser, parser->m_internalEncoding, (char *)entity->textPtr,
-              (char *)(entity->textPtr + entity->textLen));
+              parser, parser->m_internalEncoding, (const char *)entity->textPtr,
+              (const char *)(entity->textPtr + entity->textLen),
+              XML_ACCOUNT_ENTITY_EXPANSION);
+          entityTrackingOnClose(parser, entity, __LINE__);
           entity->open = XML_FALSE;
           if (result)
             goto endEntityValue;
@@ -6485,7 +6820,7 @@ hashTableInit(HASH_TABLE *p, const XML_Memory_Handling_Suite *ms) {
 static void FASTCALL
 hashTableIterInit(HASH_TABLE_ITER *iter, const HASH_TABLE *table) {
   iter->p = table->v;
-  iter->end = iter->p + table->size;
+  iter->end = iter->p ? iter->p + table->size : NULL;
 }
 
 static NAMED *FASTCALL
@@ -6891,3 +7226,755 @@ copyString(const XML_Char *s, const XML_Memory_Handling_Suite *memsuite) {
   memcpy(result, s, charsRequired * sizeof(XML_Char));
   return result;
 }
+
+#ifdef XML_DTD
+
+static float
+accountingGetCurrentAmplification(XML_Parser rootParser) {
+  const XmlBigCount countBytesOutput
+      = rootParser->m_accounting.countBytesDirect
+        + rootParser->m_accounting.countBytesIndirect;
+  const float amplificationFactor
+      = rootParser->m_accounting.countBytesDirect
+            ? (countBytesOutput
+               / (float)(rootParser->m_accounting.countBytesDirect))
+            : 1.0f;
+  assert(! rootParser->m_parentParser);
+  return amplificationFactor;
+}
+
+static void
+accountingReportStats(XML_Parser originParser, const char *epilog) {
+  const XML_Parser rootParser = getRootParserOf(originParser, NULL);
+  assert(! rootParser->m_parentParser);
+
+  if (rootParser->m_accounting.debugLevel < 1) {
+    return;
+  }
+
+  const float amplificationFactor
+      = accountingGetCurrentAmplification(rootParser);
+  fprintf(stderr,
+          "expat: Accounting(%p): Direct " EXPAT_FMT_ULL(
+              "10") ", indirect " EXPAT_FMT_ULL("10") ", amplification %8.2f%s",
+          (void *)rootParser, rootParser->m_accounting.countBytesDirect,
+          rootParser->m_accounting.countBytesIndirect,
+          (double)amplificationFactor, epilog);
+}
+
+static void
+accountingOnAbort(XML_Parser originParser) {
+  accountingReportStats(originParser, " ABORTING\n");
+}
+
+static void
+accountingReportDiff(XML_Parser rootParser,
+                     unsigned int levelsAwayFromRootParser, const char *before,
+                     const char *after, ptrdiff_t bytesMore, int source_line,
+                     enum XML_Account account) {
+  assert(! rootParser->m_parentParser);
+
+  fprintf(stderr,
+          " (+" EXPAT_FMT_PTRDIFF_T("6") " bytes %s|%d, xmlparse.c:%d) %*s\"",
+          bytesMore, (account == XML_ACCOUNT_DIRECT) ? "DIR" : "EXP",
+          levelsAwayFromRootParser, source_line, 10, "");
+
+  const char ellipis[] = "[..]";
+  const size_t ellipsisLength = sizeof(ellipis) /* because compile-time */ - 1;
+  const unsigned int contextLength = 10;
+
+  /* Note: Performance is of no concern here */
+  const char *walker = before;
+  if ((rootParser->m_accounting.debugLevel >= 3)
+      || (after - before)
+             <= (ptrdiff_t)(contextLength + ellipsisLength + contextLength)) {
+    for (; walker < after; walker++) {
+      fprintf(stderr, "%s", unsignedCharToPrintable(walker[0]));
+    }
+  } else {
+    for (; walker < before + contextLength; walker++) {
+      fprintf(stderr, "%s", unsignedCharToPrintable(walker[0]));
+    }
+    fprintf(stderr, ellipis);
+    walker = after - contextLength;
+    for (; walker < after; walker++) {
+      fprintf(stderr, "%s", unsignedCharToPrintable(walker[0]));
+    }
+  }
+  fprintf(stderr, "\"\n");
+}
+
+static XML_Bool
+accountingDiffTolerated(XML_Parser originParser, int tok, const char *before,
+                        const char *after, int source_line,
+                        enum XML_Account account) {
+  /* Note: We need to check the token type *first* to be sure that
+   *       we can even access variable <after>, safely.
+   *       E.g. for XML_TOK_NONE <after> may hold an invalid pointer. */
+  switch (tok) {
+  case XML_TOK_INVALID:
+  case XML_TOK_PARTIAL:
+  case XML_TOK_PARTIAL_CHAR:
+  case XML_TOK_NONE:
+    return XML_TRUE;
+  }
+
+  if (account == XML_ACCOUNT_NONE)
+    return XML_TRUE; /* because these bytes have been accounted for, already */
+
+  unsigned int levelsAwayFromRootParser;
+  const XML_Parser rootParser
+      = getRootParserOf(originParser, &levelsAwayFromRootParser);
+  assert(! rootParser->m_parentParser);
+
+  const int isDirect
+      = (account == XML_ACCOUNT_DIRECT) && (originParser == rootParser);
+  const ptrdiff_t bytesMore = after - before;
+
+  XmlBigCount *const additionTarget
+      = isDirect ? &rootParser->m_accounting.countBytesDirect
+                 : &rootParser->m_accounting.countBytesIndirect;
+
+  /* Detect and avoid integer overflow */
+  if (*additionTarget > (XmlBigCount)(-1) - (XmlBigCount)bytesMore)
+    return XML_FALSE;
+  *additionTarget += bytesMore;
+
+  const XmlBigCount countBytesOutput
+      = rootParser->m_accounting.countBytesDirect
+        + rootParser->m_accounting.countBytesIndirect;
+  const float amplificationFactor
+      = accountingGetCurrentAmplification(rootParser);
+  const XML_Bool tolerated
+      = (countBytesOutput < rootParser->m_accounting.activationThresholdBytes)
+        || (amplificationFactor
+            <= rootParser->m_accounting.maximumAmplificationFactor);
+
+  if (rootParser->m_accounting.debugLevel >= 2) {
+    accountingReportStats(rootParser, "");
+    accountingReportDiff(rootParser, levelsAwayFromRootParser, before, after,
+                         bytesMore, source_line, account);
+  }
+
+  return tolerated;
+}
+
+unsigned long long
+testingAccountingGetCountBytesDirect(XML_Parser parser) {
+  if (! parser)
+    return 0;
+  return parser->m_accounting.countBytesDirect;
+}
+
+unsigned long long
+testingAccountingGetCountBytesIndirect(XML_Parser parser) {
+  if (! parser)
+    return 0;
+  return parser->m_accounting.countBytesIndirect;
+}
+
+static void
+entityTrackingReportStats(XML_Parser rootParser, ENTITY *entity,
+                          const char *action, int sourceLine) {
+  assert(! rootParser->m_parentParser);
+  if (rootParser->m_entity_stats.debugLevel < 1)
+    return;
+
+#  if defined(XML_UNICODE)
+  const char *const entityName = "[..]";
+#  else
+  const char *const entityName = entity->name;
+#  endif
+
+  fprintf(
+      stderr,
+      "expat: Entities(%p): Count %9d, depth %2d/%2d %*s%s%s; %s length %d (xmlparse.c:%d)\n",
+      (void *)rootParser, rootParser->m_entity_stats.countEverOpened,
+      rootParser->m_entity_stats.currentDepth,
+      rootParser->m_entity_stats.maximumDepthSeen,
+      (rootParser->m_entity_stats.currentDepth - 1) * 2, "",
+      entity->is_param ? "%" : "&", entityName, action, entity->textLen,
+      sourceLine);
+}
+
+static void
+entityTrackingOnOpen(XML_Parser originParser, ENTITY *entity, int sourceLine) {
+  const XML_Parser rootParser = getRootParserOf(originParser, NULL);
+  assert(! rootParser->m_parentParser);
+
+  rootParser->m_entity_stats.countEverOpened++;
+  rootParser->m_entity_stats.currentDepth++;
+  if (rootParser->m_entity_stats.currentDepth
+      > rootParser->m_entity_stats.maximumDepthSeen) {
+    rootParser->m_entity_stats.maximumDepthSeen++;
+  }
+
+  entityTrackingReportStats(rootParser, entity, "OPEN ", sourceLine);
+}
+
+static void
+entityTrackingOnClose(XML_Parser originParser, ENTITY *entity, int sourceLine) {
+  const XML_Parser rootParser = getRootParserOf(originParser, NULL);
+  assert(! rootParser->m_parentParser);
+
+  entityTrackingReportStats(rootParser, entity, "CLOSE", sourceLine);
+  rootParser->m_entity_stats.currentDepth--;
+}
+
+static XML_Parser
+getRootParserOf(XML_Parser parser, unsigned int *outLevelDiff) {
+  XML_Parser rootParser = parser;
+  unsigned int stepsTakenUpwards = 0;
+  while (rootParser->m_parentParser) {
+    rootParser = rootParser->m_parentParser;
+    stepsTakenUpwards++;
+  }
+  assert(! rootParser->m_parentParser);
+  if (outLevelDiff != NULL) {
+    *outLevelDiff = stepsTakenUpwards;
+  }
+  return rootParser;
+}
+
+const char *
+unsignedCharToPrintable(unsigned char c) {
+  switch (c) {
+  case 0:
+    return "\\0";
+  case 1:
+    return "\\x1";
+  case 2:
+    return "\\x2";
+  case 3:
+    return "\\x3";
+  case 4:
+    return "\\x4";
+  case 5:
+    return "\\x5";
+  case 6:
+    return "\\x6";
+  case 7:
+    return "\\x7";
+  case 8:
+    return "\\x8";
+  case 9:
+    return "\\t";
+  case 10:
+    return "\\n";
+  case 11:
+    return "\\xB";
+  case 12:
+    return "\\xC";
+  case 13:
+    return "\\r";
+  case 14:
+    return "\\xE";
+  case 15:
+    return "\\xF";
+  case 16:
+    return "\\x10";
+  case 17:
+    return "\\x11";
+  case 18:
+    return "\\x12";
+  case 19:
+    return "\\x13";
+  case 20:
+    return "\\x14";
+  case 21:
+    return "\\x15";
+  case 22:
+    return "\\x16";
+  case 23:
+    return "\\x17";
+  case 24:
+    return "\\x18";
+  case 25:
+    return "\\x19";
+  case 26:
+    return "\\x1A";
+  case 27:
+    return "\\x1B";
+  case 28:
+    return "\\x1C";
+  case 29:
+    return "\\x1D";
+  case 30:
+    return "\\x1E";
+  case 31:
+    return "\\x1F";
+  case 32:
+    return " ";
+  case 33:
+    return "!";
+  case 34:
+    return "\\\"";
+  case 35:
+    return "#";
+  case 36:
+    return "$";
+  case 37:
+    return "%";
+  case 38:
+    return "&";
+  case 39:
+    return "'";
+  case 40:
+    return "(";
+  case 41:
+    return ")";
+  case 42:
+    return "*";
+  case 43:
+    return "+";
+  case 44:
+    return ",";
+  case 45:
+    return "-";
+  case 46:
+    return ".";
+  case 47:
+    return "/";
+  case 48:
+    return "0";
+  case 49:
+    return "1";
+  case 50:
+    return "2";
+  case 51:
+    return "3";
+  case 52:
+    return "4";
+  case 53:
+    return "5";
+  case 54:
+    return "6";
+  case 55:
+    return "7";
+  case 56:
+    return "8";
+  case 57:
+    return "9";
+  case 58:
+    return ":";
+  case 59:
+    return ";";
+  case 60:
+    return "<";
+  case 61:
+    return "=";
+  case 62:
+    return ">";
+  case 63:
+    return "?";
+  case 64:
+    return "@";
+  case 65:
+    return "A";
+  case 66:
+    return "B";
+  case 67:
+    return "C";
+  case 68:
+    return "D";
+  case 69:
+    return "E";
+  case 70:
+    return "F";
+  case 71:
+    return "G";
+  case 72:
+    return "H";
+  case 73:
+    return "I";
+  case 74:
+    return "J";
+  case 75:
+    return "K";
+  case 76:
+    return "L";
+  case 77:
+    return "M";
+  case 78:
+    return "N";
+  case 79:
+    return "O";
+  case 80:
+    return "P";
+  case 81:
+    return "Q";
+  case 82:
+    return "R";
+  case 83:
+    return "S";
+  case 84:
+    return "T";
+  case 85:
+    return "U";
+  case 86:
+    return "V";
+  case 87:
+    return "W";
+  case 88:
+    return "X";
+  case 89:
+    return "Y";
+  case 90:
+    return "Z";
+  case 91:
+    return "[";
+  case 92:
+    return "\\\\";
+  case 93:
+    return "]";
+  case 94:
+    return "^";
+  case 95:
+    return "_";
+  case 96:
+    return "`";
+  case 97:
+    return "a";
+  case 98:
+    return "b";
+  case 99:
+    return "c";
+  case 100:
+    return "d";
+  case 101:
+    return "e";
+  case 102:
+    return "f";
+  case 103:
+    return "g";
+  case 104:
+    return "h";
+  case 105:
+    return "i";
+  case 106:
+    return "j";
+  case 107:
+    return "k";
+  case 108:
+    return "l";
+  case 109:
+    return "m";
+  case 110:
+    return "n";
+  case 111:
+    return "o";
+  case 112:
+    return "p";
+  case 113:
+    return "q";
+  case 114:
+    return "r";
+  case 115:
+    return "s";
+  case 116:
+    return "t";
+  case 117:
+    return "u";
+  case 118:
+    return "v";
+  case 119:
+    return "w";
+  case 120:
+    return "x";
+  case 121:
+    return "y";
+  case 122:
+    return "z";
+  case 123:
+    return "{";
+  case 124:
+    return "|";
+  case 125:
+    return "}";
+  case 126:
+    return "~";
+  case 127:
+    return "\\x7F";
+  case 128:
+    return "\\x80";
+  case 129:
+    return "\\x81";
+  case 130:
+    return "\\x82";
+  case 131:
+    return "\\x83";
+  case 132:
+    return "\\x84";
+  case 133:
+    return "\\x85";
+  case 134:
+    return "\\x86";
+  case 135:
+    return "\\x87";
+  case 136:
+    return "\\x88";
+  case 137:
+    return "\\x89";
+  case 138:
+    return "\\x8A";
+  case 139:
+    return "\\x8B";
+  case 140:
+    return "\\x8C";
+  case 141:
+    return "\\x8D";
+  case 142:
+    return "\\x8E";
+  case 143:
+    return "\\x8F";
+  case 144:
+    return "\\x90";
+  case 145:
+    return "\\x91";
+  case 146:
+    return "\\x92";
+  case 147:
+    return "\\x93";
+  case 148:
+    return "\\x94";
+  case 149:
+    return "\\x95";
+  case 150:
+    return "\\x96";
+  case 151:
+    return "\\x97";
+  case 152:
+    return "\\x98";
+  case 153:
+    return "\\x99";
+  case 154:
+    return "\\x9A";
+  case 155:
+    return "\\x9B";
+  case 156:
+    return "\\x9C";
+  case 157:
+    return "\\x9D";
+  case 158:
+    return "\\x9E";
+  case 159:
+    return "\\x9F";
+  case 160:
+    return "\\xA0";
+  case 161:
+    return "\\xA1";
+  case 162:
+    return "\\xA2";
+  case 163:
+    return "\\xA3";
+  case 164:
+    return "\\xA4";
+  case 165:
+    return "\\xA5";
+  case 166:
+    return "\\xA6";
+  case 167:
+    return "\\xA7";
+  case 168:
+    return "\\xA8";
+  case 169:
+    return "\\xA9";
+  case 170:
+    return "\\xAA";
+  case 171:
+    return "\\xAB";
+  case 172:
+    return "\\xAC";
+  case 173:
+    return "\\xAD";
+  case 174:
+    return "\\xAE";
+  case 175:
+    return "\\xAF";
+  case 176:
+    return "\\xB0";
+  case 177:
+    return "\\xB1";
+  case 178:
+    return "\\xB2";
+  case 179:
+    return "\\xB3";
+  case 180:
+    return "\\xB4";
+  case 181:
+    return "\\xB5";
+  case 182:
+    return "\\xB6";
+  case 183:
+    return "\\xB7";
+  case 184:
+    return "\\xB8";
+  case 185:
+    return "\\xB9";
+  case 186:
+    return "\\xBA";
+  case 187:
+    return "\\xBB";
+  case 188:
+    return "\\xBC";
+  case 189:
+    return "\\xBD";
+  case 190:
+    return "\\xBE";
+  case 191:
+    return "\\xBF";
+  case 192:
+    return "\\xC0";
+  case 193:
+    return "\\xC1";
+  case 194:
+    return "\\xC2";
+  case 195:
+    return "\\xC3";
+  case 196:
+    return "\\xC4";
+  case 197:
+    return "\\xC5";
+  case 198:
+    return "\\xC6";
+  case 199:
+    return "\\xC7";
+  case 200:
+    return "\\xC8";
+  case 201:
+    return "\\xC9";
+  case 202:
+    return "\\xCA";
+  case 203:
+    return "\\xCB";
+  case 204:
+    return "\\xCC";
+  case 205:
+    return "\\xCD";
+  case 206:
+    return "\\xCE";
+  case 207:
+    return "\\xCF";
+  case 208:
+    return "\\xD0";
+  case 209:
+    return "\\xD1";
+  case 210:
+    return "\\xD2";
+  case 211:
+    return "\\xD3";
+  case 212:
+    return "\\xD4";
+  case 213:
+    return "\\xD5";
+  case 214:
+    return "\\xD6";
+  case 215:
+    return "\\xD7";
+  case 216:
+    return "\\xD8";
+  case 217:
+    return "\\xD9";
+  case 218:
+    return "\\xDA";
+  case 219:
+    return "\\xDB";
+  case 220:
+    return "\\xDC";
+  case 221:
+    return "\\xDD";
+  case 222:
+    return "\\xDE";
+  case 223:
+    return "\\xDF";
+  case 224:
+    return "\\xE0";
+  case 225:
+    return "\\xE1";
+  case 226:
+    return "\\xE2";
+  case 227:
+    return "\\xE3";
+  case 228:
+    return "\\xE4";
+  case 229:
+    return "\\xE5";
+  case 230:
+    return "\\xE6";
+  case 231:
+    return "\\xE7";
+  case 232:
+    return "\\xE8";
+  case 233:
+    return "\\xE9";
+  case 234:
+    return "\\xEA";
+  case 235:
+    return "\\xEB";
+  case 236:
+    return "\\xEC";
+  case 237:
+    return "\\xED";
+  case 238:
+    return "\\xEE";
+  case 239:
+    return "\\xEF";
+  case 240:
+    return "\\xF0";
+  case 241:
+    return "\\xF1";
+  case 242:
+    return "\\xF2";
+  case 243:
+    return "\\xF3";
+  case 244:
+    return "\\xF4";
+  case 245:
+    return "\\xF5";
+  case 246:
+    return "\\xF6";
+  case 247:
+    return "\\xF7";
+  case 248:
+    return "\\xF8";
+  case 249:
+    return "\\xF9";
+  case 250:
+    return "\\xFA";
+  case 251:
+    return "\\xFB";
+  case 252:
+    return "\\xFC";
+  case 253:
+    return "\\xFD";
+  case 254:
+    return "\\xFE";
+  case 255:
+    return "\\xFF";
+  default:
+    assert(0); /* never gets here */
+    return "dead code";
+  }
+  assert(0); /* never gets here */
+}
+
+#endif /* XML_DTD */
+
+static unsigned long
+getDebugLevel(const char *variableName, unsigned long defaultDebugLevel) {
+  const char *const valueOrNull = getenv(variableName);
+  if (valueOrNull == NULL) {
+    return defaultDebugLevel;
+  }
+  const char *const value = valueOrNull;
+
+  errno = 0;
+  char *afterValue = (char *)value;
+  unsigned long debugLevel = strtoul(value, &afterValue, 10);
+  if ((errno != 0) || (afterValue[0] != '\0')) {
+    errno = 0;
+    return defaultDebugLevel;
+  }
+
+  return debugLevel;
+}
diff --git a/Modules/expat/xmlrole.c b/Modules/expat/xmlrole.c
index 4d3e3e86e9e86..08173b0fd541d 100644
--- a/Modules/expat/xmlrole.c
+++ b/Modules/expat/xmlrole.c
@@ -7,7 +7,14 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2006 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2002-2003 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2005-2009 Steven Solie <ssolie at users.sourceforge.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -34,11 +41,9 @@
 
 #ifdef _WIN32
 #  include "winconfig.h"
-#else
-#  ifdef HAVE_EXPAT_CONFIG_H
-#    include <expat_config.h>
-#  endif
-#endif /* ndef _WIN32 */
+#endif
+
+#include <expat_config.h>
 
 #include "expat_external.h"
 #include "internal.h"
@@ -1220,6 +1225,8 @@ common(PROLOG_STATE *state, int tok) {
 #ifdef XML_DTD
   if (! state->documentEntity && tok == XML_TOK_PARAM_ENTITY_REF)
     return XML_ROLE_INNER_PARAM_ENTITY_REF;
+#else
+  UNUSED_P(tok);
 #endif
   state->handler = error;
   return XML_ROLE_ERROR;
diff --git a/Modules/expat/xmlrole.h b/Modules/expat/xmlrole.h
index 036aba64fd29c..d6e1fa150a108 100644
--- a/Modules/expat/xmlrole.h
+++ b/Modules/expat/xmlrole.h
@@ -7,7 +7,10 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/xmltok.c b/Modules/expat/xmltok.c
index 54cfedb85c28c..f2b6b406067ea 100644
--- a/Modules/expat/xmltok.c
+++ b/Modules/expat/xmltok.c
@@ -7,7 +7,19 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2001-2003 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2016 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2005-2009 Steven Solie <ssolie at users.sourceforge.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2016      Pascal Cuoq <cuoq at trust-in-soft.com>
+   Copyright (c) 2016      Don Lewis <truckman at apache.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2017      Alexander Bluhm <alexander.bluhm at gmx.net>
+   Copyright (c) 2017      Benbuck Nason <bnason at netflix.com>
+   Copyright (c) 2017      Jos? Guti?rrez de la Concha <jose at zeroc.com>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -30,26 +42,16 @@
    USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#ifdef _WIN32
-#  include "winconfig.h"
-#else
-#  ifdef HAVE_EXPAT_CONFIG_H
-#    include <expat_config.h>
-#  endif
-#endif /* ndef _WIN32 */
-
 #include <stddef.h>
 #include <string.h> /* memcpy */
+#include <stdbool.h>
 
-#if defined(_MSC_VER) && (_MSC_VER <= 1700)
-/* for vs2012/11.0/1700 and earlier Visual Studio compilers */
-#  define bool int
-#  define false 0
-#  define true 1
-#else
-#  include <stdbool.h>
+#ifdef _WIN32
+#  include "winconfig.h"
 #endif
 
+#include <expat_config.h>
+
 #include "expat_external.h"
 #include "internal.h"
 #include "xmltok.h"
@@ -269,8 +271,14 @@ sb_byteToAscii(const ENCODING *enc, const char *p) {
 
 #define IS_NAME_CHAR(enc, p, n) (AS_NORMAL_ENCODING(enc)->isName##n(enc, p))
 #define IS_NMSTRT_CHAR(enc, p, n) (AS_NORMAL_ENCODING(enc)->isNmstrt##n(enc, p))
-#define IS_INVALID_CHAR(enc, p, n)                                             \
-  (AS_NORMAL_ENCODING(enc)->isInvalid##n(enc, p))
+#ifdef XML_MIN_SIZE
+#  define IS_INVALID_CHAR(enc, p, n)                                           \
+    (AS_NORMAL_ENCODING(enc)->isInvalid##n                                     \
+     && AS_NORMAL_ENCODING(enc)->isInvalid##n(enc, p))
+#else
+#  define IS_INVALID_CHAR(enc, p, n)                                           \
+    (AS_NORMAL_ENCODING(enc)->isInvalid##n(enc, p))
+#endif
 
 #ifdef XML_MIN_SIZE
 #  define IS_NAME_CHAR_MINBPC(enc, p)                                          \
@@ -589,13 +597,13 @@ static const struct normal_encoding ascii_encoding
 static int PTRFASTCALL
 unicode_byte_type(char hi, char lo) {
   switch ((unsigned char)hi) {
-  /* 0xD800?0xDBFF first 16-bit code unit or high surrogate (W1) */
+  /* 0xD800-0xDBFF first 16-bit code unit or high surrogate (W1) */
   case 0xD8:
   case 0xD9:
   case 0xDA:
   case 0xDB:
     return BT_LEAD4;
-  /* 0xDC00?0xDFFF second 16-bit code unit or low surrogate (W2) */
+  /* 0xDC00-0xDFFF second 16-bit code unit or low surrogate (W2) */
   case 0xDC:
   case 0xDD:
   case 0xDE:
diff --git a/Modules/expat/xmltok.h b/Modules/expat/xmltok.h
index 2adbf5307befa..6f630c2f9ba96 100644
--- a/Modules/expat/xmltok.h
+++ b/Modules/expat/xmltok.h
@@ -7,7 +7,11 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002-2005 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2016-2017 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/xmltok_impl.c b/Modules/expat/xmltok_impl.c
index c209221cd79d1..0430591b42636 100644
--- a/Modules/expat/xmltok_impl.c
+++ b/Modules/expat/xmltok_impl.c
@@ -1,4 +1,4 @@
-/* This file is included!
+/* This file is included (from xmltok.c, 1-3 times depending on XML_MIN_SIZE)!
                             __  __            _
                          ___\ \/ /_ __   __ _| |_
                         / _ \\  /| '_ \ / _` | __|
@@ -7,7 +7,15 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002-2016 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2018      Benjamin Peterson <benjamin at python.org>
+   Copyright (c) 2018      Anton Maklakov <antmak.pub at gmail.com>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
+   Copyright (c) 2020      Boris Kolpackov <boris at codesynthesis.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -32,7 +40,7 @@
 
 #ifdef XML_TOK_IMPL_C
 
-#  ifndef IS_INVALID_CHAR
+#  ifndef IS_INVALID_CHAR // i.e. for UTF-16 and XML_MIN_SIZE not defined
 #    define IS_INVALID_CHAR(enc, ptr, n) (0)
 #  endif
 
@@ -1768,13 +1776,14 @@ PREFIX(updatePosition)(const ENCODING *enc, const char *ptr, const char *end,
 #  define LEAD_CASE(n)                                                         \
   case BT_LEAD##n:                                                             \
     ptr += n;                                                                  \
+    pos->columnNumber++;                                                       \
     break;
       LEAD_CASE(2)
       LEAD_CASE(3)
       LEAD_CASE(4)
 #  undef LEAD_CASE
     case BT_LF:
-      pos->columnNumber = (XML_Size)-1;
+      pos->columnNumber = 0;
       pos->lineNumber++;
       ptr += MINBPC(enc);
       break;
@@ -1783,13 +1792,13 @@ PREFIX(updatePosition)(const ENCODING *enc, const char *ptr, const char *end,
       ptr += MINBPC(enc);
       if (HAS_CHAR(enc, ptr, end) && BYTE_TYPE(enc, ptr) == BT_LF)
         ptr += MINBPC(enc);
-      pos->columnNumber = (XML_Size)-1;
+      pos->columnNumber = 0;
       break;
     default:
       ptr += MINBPC(enc);
+      pos->columnNumber++;
       break;
     }
-    pos->columnNumber++;
   }
 }
 
diff --git a/Modules/expat/xmltok_impl.h b/Modules/expat/xmltok_impl.h
index e925dbc7e2c83..c518aada013df 100644
--- a/Modules/expat/xmltok_impl.h
+++ b/Modules/expat/xmltok_impl.h
@@ -7,7 +7,8 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2017-2019 Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/xmltok_ns.c b/Modules/expat/xmltok_ns.c
index 919c74e9f97fe..5fd8392235940 100644
--- a/Modules/expat/xmltok_ns.c
+++ b/Modules/expat/xmltok_ns.c
@@ -7,7 +7,11 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002-2006 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining


From webhook-mailer at python.org  Sun Aug 29 10:32:59 2021
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 29 Aug 2021 14:32:59 -0000
Subject: [Python-checkins] bpo-44394: Update libexpat copy to 2.4.1
 (GH-26945)
Message-ID: <mailman.1238.1630247580.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/270678564c16452614a8acd93763bdf64fb4d286
commit: 270678564c16452614a8acd93763bdf64fb4d286
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-29T07:32:50-07:00
summary:

bpo-44394: Update libexpat copy to 2.4.1 (GH-26945)


Update the vendored copy of libexpat to 2.4.1 (from 2.2.8) to get the
fix for the CVE-2013-0340 "Billion Laughs" vulnerability. This copy
is most used on Windows and macOS.

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 3fc5d84046ddbd66abac5b598956ea34605a4e5d)

Co-authored-by: Victor Stinner <vstinner at python.org>

files:
A Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst
M Doc/library/xml.rst
M Modules/expat/COPYING
M Modules/expat/ascii.h
M Modules/expat/asciitab.h
M Modules/expat/expat.h
M Modules/expat/expat_external.h
M Modules/expat/iasciitab.h
M Modules/expat/internal.h
M Modules/expat/latin1tab.h
M Modules/expat/nametab.h
M Modules/expat/siphash.h
M Modules/expat/utf8tab.h
M Modules/expat/winconfig.h
M Modules/expat/xmlparse.c
M Modules/expat/xmlrole.c
M Modules/expat/xmlrole.h
M Modules/expat/xmltok.c
M Modules/expat/xmltok.h
M Modules/expat/xmltok_impl.c
M Modules/expat/xmltok_impl.h
M Modules/expat/xmltok_ns.c

diff --git a/Doc/library/xml.rst b/Doc/library/xml.rst
index 1981cab7cd438d..e3b35162961147 100644
--- a/Doc/library/xml.rst
+++ b/Doc/library/xml.rst
@@ -60,22 +60,26 @@ circumvent firewalls.
 The following table gives an overview of the known attacks and whether
 the various modules are vulnerable to them.
 
-=========================  ==============   ===============   ==============   ==============   ==============
-kind                       sax              etree             minidom          pulldom          xmlrpc
-=========================  ==============   ===============   ==============   ==============   ==============
-billion laughs             **Vulnerable**   **Vulnerable**    **Vulnerable**   **Vulnerable**   **Vulnerable**
-quadratic blowup           **Vulnerable**   **Vulnerable**    **Vulnerable**   **Vulnerable**   **Vulnerable**
-external entity expansion  Safe (4)         Safe    (1)       Safe    (2)      Safe (4)         Safe    (3)
-`DTD`_ retrieval           Safe (4)         Safe              Safe             Safe (4)         Safe
-decompression bomb         Safe             Safe              Safe             Safe             **Vulnerable**
-=========================  ==============   ===============   ==============   ==============   ==============
-
-1. :mod:`xml.etree.ElementTree` doesn't expand external entities and raises a
+=========================  ==================  ==================  ==================  ==================  ==================
+kind                       sax                 etree               minidom             pulldom             xmlrpc
+=========================  ==================  ==================  ==================  ==================  ==================
+billion laughs             **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)
+quadratic blowup           **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)
+external entity expansion  Safe (5)            Safe (2)            Safe (3)            Safe (5)            Safe (4)
+`DTD`_ retrieval           Safe (5)            Safe                Safe                Safe (5)            Safe
+decompression bomb         Safe                Safe                Safe                Safe                **Vulnerable**
+=========================  ==================  ==================  ==================  ==================  ==================
+
+1. Expat 2.4.1 and newer is not vulnerable to the "billion laughs" and
+   "quadratic blowup" vulnerabilities. Items still listed as vulnerable due to
+   potential reliance on system-provided libraries. Check
+   :data:`pyexpat.EXPAT_VERSION`.
+2. :mod:`xml.etree.ElementTree` doesn't expand external entities and raises a
    :exc:`ParserError` when an entity occurs.
-2. :mod:`xml.dom.minidom` doesn't expand external entities and simply returns
+3. :mod:`xml.dom.minidom` doesn't expand external entities and simply returns
    the unexpanded entity verbatim.
-3. :mod:`xmlrpclib` doesn't expand external entities and omits them.
-4. Since Python 3.7.1, external general entities are no longer processed by
+4. :mod:`xmlrpclib` doesn't expand external entities and omits them.
+5. Since Python 3.7.1, external general entities are no longer processed by
    default.
 
 
diff --git a/Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst b/Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst
new file mode 100644
index 00000000000000..e32563d2535c7e
--- /dev/null
+++ b/Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst
@@ -0,0 +1,3 @@
+Update the vendored copy of libexpat to 2.4.1 (from 2.2.8) to get the fix
+for the CVE-2013-0340 "Billion Laughs" vulnerability. This copy is most used
+on Windows and macOS.
diff --git a/Modules/expat/COPYING b/Modules/expat/COPYING
index 8d288f0f28fddd..3c0142e71c8d4f 100644
--- a/Modules/expat/COPYING
+++ b/Modules/expat/COPYING
@@ -1,5 +1,5 @@
 Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
-Copyright (c) 2001-2017 Expat maintainers
+Copyright (c) 2001-2019 Expat maintainers
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/Modules/expat/ascii.h b/Modules/expat/ascii.h
index c3587e57332bff..1f594d2e54b4d2 100644
--- a/Modules/expat/ascii.h
+++ b/Modules/expat/ascii.h
@@ -6,8 +6,11 @@
                         \___/_/\_\ .__/ \__,_|\__|
                                  |_| XML parser
 
-   Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 1999-2000 Thai Open Source Software Center Ltd
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2007      Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/asciitab.h b/Modules/expat/asciitab.h
index 63b1d1b4482efa..af766fb24785ea 100644
--- a/Modules/expat/asciitab.h
+++ b/Modules/expat/asciitab.h
@@ -7,7 +7,9 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/expat.h b/Modules/expat/expat.h
index 6c8eb1fda4a30c..b7d6d354801b3d 100644
--- a/Modules/expat/expat.h
+++ b/Modules/expat/expat.h
@@ -7,7 +7,14 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2000-2005 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2001-2002 Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2016 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2016      Cristian Rodr?guez <crrodriguez at opensuse.org>
+   Copyright (c) 2016      Thomas Beutlich <tc at tbeu.de>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -115,7 +122,11 @@ enum XML_Error {
   XML_ERROR_RESERVED_PREFIX_XMLNS,
   XML_ERROR_RESERVED_NAMESPACE_URI,
   /* Added in 2.2.1. */
-  XML_ERROR_INVALID_ARGUMENT
+  XML_ERROR_INVALID_ARGUMENT,
+  /* Added in 2.3.0. */
+  XML_ERROR_NO_BUFFER,
+  /* Added in 2.4.0. */
+  XML_ERROR_AMPLIFICATION_LIMIT_BREACH
 };
 
 enum XML_Content_Type {
@@ -318,7 +329,7 @@ typedef void(XMLCALL *XML_EndDoctypeDeclHandler)(void *userData);
 
    For internal entities (<!ENTITY foo "bar">), value will
    be non-NULL and systemId, publicID, and notationName will be NULL.
-   The value string is NOT nul-terminated; the length is provided in
+   The value string is NOT null-terminated; the length is provided in
    the value_length argument. Since it is legal to have zero-length
    values, do not use this argument to test for internal entities.
 
@@ -513,7 +524,7 @@ typedef struct {
    Otherwise it must return XML_STATUS_ERROR.
 
    If info does not describe a suitable encoding, then the parser will
-   return an XML_UNKNOWN_ENCODING error.
+   return an XML_ERROR_UNKNOWN_ENCODING error.
 */
 typedef int(XMLCALL *XML_UnknownEncodingHandler)(void *encodingHandlerData,
                                                  const XML_Char *name,
@@ -707,7 +718,7 @@ XML_GetBase(XML_Parser parser);
 /* Returns the number of the attribute/value pairs passed in last call
    to the XML_StartElementHandler that were specified in the start-tag
    rather than defaulted. Each attribute/value pair counts as 2; thus
-   this correspondds to an index into the atts array passed to the
+   this corresponds to an index into the atts array passed to the
    XML_StartElementHandler.  Returns -1 if parser == NULL.
 */
 XMLPARSEAPI(int)
@@ -716,7 +727,7 @@ XML_GetSpecifiedAttributeCount(XML_Parser parser);
 /* Returns the index of the ID attribute passed in the last call to
    XML_StartElementHandler, or -1 if there is no ID attribute or
    parser == NULL.  Each attribute/value pair counts as 2; thus this
-   correspondds to an index into the atts array passed to the
+   corresponds to an index into the atts array passed to the
    XML_StartElementHandler.
 */
 XMLPARSEAPI(int)
@@ -997,7 +1008,10 @@ enum XML_FeatureEnum {
   XML_FEATURE_SIZEOF_XML_LCHAR,
   XML_FEATURE_NS,
   XML_FEATURE_LARGE_SIZE,
-  XML_FEATURE_ATTR_INFO
+  XML_FEATURE_ATTR_INFO,
+  /* Added in Expat 2.4.0. */
+  XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT,
+  XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT
   /* Additional features must be added to the end of this enum. */
 };
 
@@ -1010,12 +1024,24 @@ typedef struct {
 XMLPARSEAPI(const XML_Feature *)
 XML_GetFeatureList(void);
 
+#ifdef XML_DTD
+/* Added in Expat 2.4.0. */
+XMLPARSEAPI(XML_Bool)
+XML_SetBillionLaughsAttackProtectionMaximumAmplification(
+    XML_Parser parser, float maximumAmplificationFactor);
+
+/* Added in Expat 2.4.0. */
+XMLPARSEAPI(XML_Bool)
+XML_SetBillionLaughsAttackProtectionActivationThreshold(
+    XML_Parser parser, unsigned long long activationThresholdBytes);
+#endif
+
 /* Expat follows the semantic versioning convention.
    See http://semver.org.
 */
 #define XML_MAJOR_VERSION 2
-#define XML_MINOR_VERSION 2
-#define XML_MICRO_VERSION 8
+#define XML_MINOR_VERSION 4
+#define XML_MICRO_VERSION 1
 
 #ifdef __cplusplus
 }
diff --git a/Modules/expat/expat_external.h b/Modules/expat/expat_external.h
index f2b75dda8e2798..12c560e14716ff 100644
--- a/Modules/expat/expat_external.h
+++ b/Modules/expat/expat_external.h
@@ -7,7 +7,14 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2000-2004 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2001-2002 Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2006 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2016      Cristian Rodr?guez <crrodriguez at opensuse.org>
+   Copyright (c) 2016-2019 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2018      Yury Gribov <tetra2005 at gmail.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/iasciitab.h b/Modules/expat/iasciitab.h
index ea97cfcf678e06..5d8646f2a318b8 100644
--- a/Modules/expat/iasciitab.h
+++ b/Modules/expat/iasciitab.h
@@ -7,7 +7,9 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/internal.h b/Modules/expat/internal.h
index 60913dab762f8f..444eba0fb03170 100644
--- a/Modules/expat/internal.h
+++ b/Modules/expat/internal.h
@@ -25,8 +25,12 @@
                         \___/_/\_\ .__/ \__,_|\__|
                                  |_| XML parser
 
-   Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2002-2003 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002-2006 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2003      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2018      Yury Gribov <tetra2005 at gmail.com>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -101,22 +105,58 @@
 #  endif
 #endif
 
+#include <limits.h> // ULONG_MAX
+
+#if defined(_WIN32) && ! defined(__USE_MINGW_ANSI_STDIO)
+#  define EXPAT_FMT_ULL(midpart) "%" midpart "I64u"
+#  if defined(_WIN64) // Note: modifiers "td" and "zu" do not work for MinGW
+#    define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "I64d"
+#    define EXPAT_FMT_SIZE_T(midpart) "%" midpart "I64u"
+#  else
+#    define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "d"
+#    define EXPAT_FMT_SIZE_T(midpart) "%" midpart "u"
+#  endif
+#else
+#  define EXPAT_FMT_ULL(midpart) "%" midpart "llu"
+#  if ! defined(ULONG_MAX)
+#    error Compiler did not define ULONG_MAX for us
+#  elif ULONG_MAX == 18446744073709551615u // 2^64-1
+#    define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "ld"
+#    define EXPAT_FMT_SIZE_T(midpart) "%" midpart "lu"
+#  else
+#    define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "d"
+#    define EXPAT_FMT_SIZE_T(midpart) "%" midpart "u"
+#  endif
+#endif
+
 #ifndef UNUSED_P
 #  define UNUSED_P(p) (void)p
 #endif
 
+/* NOTE BEGIN If you ever patch these defaults to greater values
+              for non-attack XML payload in your environment,
+              please file a bug report with libexpat.  Thank you!
+*/
+#define EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT   \
+  100.0f
+#define EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT    \
+  8388608 // 8 MiB, 2^23
+/* NOTE END */
+
+#include "expat.h" // so we can use type XML_Parser below
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifdef XML_ENABLE_VISIBILITY
-#  if XML_ENABLE_VISIBILITY
-__attribute__((visibility("default")))
-#  endif
+void _INTERNAL_trim_to_complete_utf8_characters(const char *from,
+                                                const char **fromLimRef);
+
+#if defined(XML_DTD)
+unsigned long long testingAccountingGetCountBytesDirect(XML_Parser parser);
+unsigned long long testingAccountingGetCountBytesIndirect(XML_Parser parser);
+const char *unsignedCharToPrintable(unsigned char c);
 #endif
-void
-_INTERNAL_trim_to_complete_utf8_characters(const char *from,
-                                           const char **fromLimRef);
 
 #ifdef __cplusplus
 }
diff --git a/Modules/expat/latin1tab.h b/Modules/expat/latin1tab.h
index 6f916041355a86..b681d278af6569 100644
--- a/Modules/expat/latin1tab.h
+++ b/Modules/expat/latin1tab.h
@@ -7,7 +7,9 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/nametab.h b/Modules/expat/nametab.h
index 3681df348eebd6..63485446b96727 100644
--- a/Modules/expat/nametab.h
+++ b/Modules/expat/nametab.h
@@ -6,8 +6,8 @@
                         \___/_/\_\ .__/ \__,_|\__|
                                  |_| XML parser
 
-   Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000 Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2017 Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/siphash.h b/Modules/expat/siphash.h
index bfee65a332f1bf..e5406d7ee9eb54 100644
--- a/Modules/expat/siphash.h
+++ b/Modules/expat/siphash.h
@@ -11,6 +11,9 @@
  * --------------------------------------------------------------------------
  * HISTORY:
  *
+ * 2020-10-03  (Sebastian Pipping)
+ *   - Drop support for Visual Studio 9.0/2008 and earlier
+ *
  * 2019-08-03  (Sebastian Pipping)
  *   - Mark part of sip24_valid as to be excluded from clang-format
  *   - Re-format code using clang-format 9
@@ -96,15 +99,7 @@
 #define SIPHASH_H
 
 #include <stddef.h> /* size_t */
-
-#if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER < 1600)
-/* For vs2003/7.1 up to vs2008/9.0; _MSC_VER 1600 is vs2010/10.0 */
-typedef unsigned __int8 uint8_t;
-typedef unsigned __int32 uint32_t;
-typedef unsigned __int64 uint64_t;
-#else
-#  include <stdint.h> /* uint64_t uint32_t uint8_t */
-#endif
+#include <stdint.h> /* uint64_t uint32_t uint8_t */
 
 /*
  * Workaround to not require a C++11 compiler for using ULL suffix
diff --git a/Modules/expat/utf8tab.h b/Modules/expat/utf8tab.h
index a22986acbb9526..88efcf91cc16a6 100644
--- a/Modules/expat/utf8tab.h
+++ b/Modules/expat/utf8tab.h
@@ -7,7 +7,9 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/winconfig.h b/Modules/expat/winconfig.h
index 562a4a82dc1d63..2ecd61b5b94820 100644
--- a/Modules/expat/winconfig.h
+++ b/Modules/expat/winconfig.h
@@ -6,8 +6,10 @@
                         \___/_/\_\ .__/ \__,_|\__|
                                  |_| XML parser
 
-   Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2005      Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2017-2021 Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -40,17 +42,4 @@
 #include <memory.h>
 #include <string.h>
 
-#if defined(HAVE_EXPAT_CONFIG_H) /* e.g. MinGW */
-#  include <expat_config.h>
-#else /* !defined(HAVE_EXPAT_CONFIG_H) */
-
-#  define XML_NS 1
-#  define XML_DTD 1
-#  define XML_CONTEXT_BYTES 1024
-
-/* we will assume all Windows platforms are little endian */
-#  define BYTEORDER 1234
-
-#endif /* !defined(HAVE_EXPAT_CONFIG_H) */
-
 #endif /* ndef WINCONFIG_H */
diff --git a/Modules/expat/xmlparse.c b/Modules/expat/xmlparse.c
index e740f0e19c7d4a..5ba56eaea6357a 100644
--- a/Modules/expat/xmlparse.c
+++ b/Modules/expat/xmlparse.c
@@ -1,4 +1,4 @@
-/* f2d0ab6d1d4422a08cf1cf3bbdfba96b49dea42fb5ff4615e03a2a25c306e769 (2.2.8+)
+/* 8539b9040d9d901366a62560a064af7cb99811335784b363abc039c5b0ebc416 (2.4.1+)
                             __  __            _
                          ___\ \/ /_ __   __ _| |_
                         / _ \\  /| '_ \ / _` | __|
@@ -7,7 +7,31 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2000-2006 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2001-2002 Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2016 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2005-2009 Steven Solie <ssolie at users.sourceforge.net>
+   Copyright (c) 2016      Eric Rahm <erahm at mozilla.com>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2016      Gaurav <g.gupta at samsung.com>
+   Copyright (c) 2016      Thomas Beutlich <tc at tbeu.de>
+   Copyright (c) 2016      Gustavo Grieco <gustavo.grieco at imag.fr>
+   Copyright (c) 2016      Pascal Cuoq <cuoq at trust-in-soft.com>
+   Copyright (c) 2016      Ed Schouten <ed at nuxi.nl>
+   Copyright (c) 2017-2018 Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2017      V?clav Slav?k <vaclav at slavik.io>
+   Copyright (c) 2017      Viktor Szakats <commit at vsz.me>
+   Copyright (c) 2017      Chanho Park <chanho61.park at samsung.com>
+   Copyright (c) 2017      Rolf Eike Beer <eike at sf-mail.de>
+   Copyright (c) 2017      Hans Wennborg <hans at chromium.org>
+   Copyright (c) 2018      Anton Maklakov <antmak.pub at gmail.com>
+   Copyright (c) 2018      Benjamin Peterson <benjamin at python.org>
+   Copyright (c) 2018      Marco Maggi <marco.maggi-ipsu at poste.it>
+   Copyright (c) 2018      Mariusz Zaborski <oshogbo at vexillium.org>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
+   Copyright (c) 2019-2020 Ben Wagner <bungeman at chromium.org>
+   Copyright (c) 2019      Vadim Zeitlin <vadim at zeitlins.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -36,7 +60,9 @@
 
 #ifdef _WIN32
 /* force stdlib to define rand_s() */
-#  define _CRT_RAND_S
+#  if ! defined(_CRT_RAND_S)
+#    define _CRT_RAND_S
+#  endif
 #endif
 
 #include <stddef.h>
@@ -45,6 +71,8 @@
 #include <limits.h> /* UINT_MAX */
 #include <stdio.h>  /* fprintf */
 #include <stdlib.h> /* getenv, rand_s */
+#include <stdint.h> /* uintptr_t */
+#include <math.h>   /* isnan */
 
 #ifdef _WIN32
 #  define getpid GetCurrentProcessId
@@ -60,9 +88,9 @@
 
 #ifdef _WIN32
 #  include "winconfig.h"
-#elif defined(HAVE_EXPAT_CONFIG_H)
-#  include <expat_config.h>
-#endif /* ndef _WIN32 */
+#endif
+
+#include <expat_config.h>
 
 #include "ascii.h"
 #include "expat.h"
@@ -97,14 +125,14 @@
     enabled.  For end user security, that is probably not what you want. \
     \
     Your options include: \
-      * Linux + glibc >=2.25 (getrandom): HAVE_GETRANDOM, \
-      * Linux + glibc <2.25 (syscall SYS_getrandom): HAVE_SYSCALL_GETRANDOM, \
+      * Linux >=3.17 + glibc >=2.25 (getrandom): HAVE_GETRANDOM, \
+      * Linux >=3.17 + glibc (including <2.25) (syscall SYS_getrandom): HAVE_SYSCALL_GETRANDOM, \
       * BSD / macOS >=10.7 (arc4random_buf): HAVE_ARC4RANDOM_BUF, \
-      * BSD / macOS <10.7 (arc4random): HAVE_ARC4RANDOM, \
+      * BSD / macOS (including <10.7) (arc4random): HAVE_ARC4RANDOM, \
       * libbsd (arc4random_buf): HAVE_ARC4RANDOM_BUF + HAVE_LIBBSD, \
       * libbsd (arc4random): HAVE_ARC4RANDOM + HAVE_LIBBSD, \
-      * Linux / BSD / macOS (/dev/urandom): XML_DEV_URANDOM \
-      * Windows (rand_s): _WIN32. \
+      * Linux (including <3.17) / BSD / macOS (including <10.7) (/dev/urandom): XML_DEV_URANDOM, \
+      * Windows >=Vista (rand_s): _WIN32. \
     \
     If insist on not using any of these, bypass this error by defining \
     XML_POOR_ENTROPY; you have been warned. \
@@ -119,9 +147,7 @@
 #  define XmlGetInternalEncoding XmlGetUtf16InternalEncoding
 #  define XmlGetInternalEncodingNS XmlGetUtf16InternalEncodingNS
 #  define XmlEncode XmlUtf16Encode
-/* Using pointer subtraction to convert to integer type. */
-#  define MUST_CONVERT(enc, s)                                                 \
-    (! (enc)->isUtf16 || (((char *)(s) - (char *)NULL) & 1))
+#  define MUST_CONVERT(enc, s) (! (enc)->isUtf16 || (((uintptr_t)(s)) & 1))
 typedef unsigned short ICHAR;
 #else
 #  define XML_ENCODE_MAX XML_UTF8_ENCODE_MAX
@@ -371,6 +397,31 @@ typedef struct open_internal_entity {
   XML_Bool betweenDecl; /* WFC: PE Between Declarations */
 } OPEN_INTERNAL_ENTITY;
 
+enum XML_Account {
+  XML_ACCOUNT_DIRECT,           /* bytes directly passed to the Expat parser */
+  XML_ACCOUNT_ENTITY_EXPANSION, /* intermediate bytes produced during entity
+                                   expansion */
+  XML_ACCOUNT_NONE              /* i.e. do not account, was accounted already */
+};
+
+#ifdef XML_DTD
+typedef unsigned long long XmlBigCount;
+typedef struct accounting {
+  XmlBigCount countBytesDirect;
+  XmlBigCount countBytesIndirect;
+  int debugLevel;
+  float maximumAmplificationFactor; // >=1.0
+  unsigned long long activationThresholdBytes;
+} ACCOUNTING;
+
+typedef struct entity_stats {
+  unsigned int countEverOpened;
+  unsigned int currentDepth;
+  unsigned int maximumDepthSeen;
+  int debugLevel;
+} ENTITY_STATS;
+#endif /* XML_DTD */
+
 typedef enum XML_Error PTRCALL Processor(XML_Parser parser, const char *start,
                                          const char *end, const char **endPtr);
 
@@ -401,16 +452,18 @@ static enum XML_Error initializeEncoding(XML_Parser parser);
 static enum XML_Error doProlog(XML_Parser parser, const ENCODING *enc,
                                const char *s, const char *end, int tok,
                                const char *next, const char **nextPtr,
-                               XML_Bool haveMore, XML_Bool allowClosingDoctype);
+                               XML_Bool haveMore, XML_Bool allowClosingDoctype,
+                               enum XML_Account account);
 static enum XML_Error processInternalEntity(XML_Parser parser, ENTITY *entity,
                                             XML_Bool betweenDecl);
 static enum XML_Error doContent(XML_Parser parser, int startTagLevel,
                                 const ENCODING *enc, const char *start,
                                 const char *end, const char **endPtr,
-                                XML_Bool haveMore);
+                                XML_Bool haveMore, enum XML_Account account);
 static enum XML_Error doCdataSection(XML_Parser parser, const ENCODING *,
                                      const char **startPtr, const char *end,
-                                     const char **nextPtr, XML_Bool haveMore);
+                                     const char **nextPtr, XML_Bool haveMore,
+                                     enum XML_Account account);
 #ifdef XML_DTD
 static enum XML_Error doIgnoreSection(XML_Parser parser, const ENCODING *,
                                       const char **startPtr, const char *end,
@@ -420,7 +473,8 @@ static enum XML_Error doIgnoreSection(XML_Parser parser, const ENCODING *,
 static void freeBindings(XML_Parser parser, BINDING *bindings);
 static enum XML_Error storeAtts(XML_Parser parser, const ENCODING *,
                                 const char *s, TAG_NAME *tagNamePtr,
-                                BINDING **bindingsPtr);
+                                BINDING **bindingsPtr,
+                                enum XML_Account account);
 static enum XML_Error addBinding(XML_Parser parser, PREFIX *prefix,
                                  const ATTRIBUTE_ID *attId, const XML_Char *uri,
                                  BINDING **bindingsPtr);
@@ -429,15 +483,18 @@ static int defineAttribute(ELEMENT_TYPE *type, ATTRIBUTE_ID *, XML_Bool isCdata,
                            XML_Parser parser);
 static enum XML_Error storeAttributeValue(XML_Parser parser, const ENCODING *,
                                           XML_Bool isCdata, const char *,
-                                          const char *, STRING_POOL *);
+                                          const char *, STRING_POOL *,
+                                          enum XML_Account account);
 static enum XML_Error appendAttributeValue(XML_Parser parser, const ENCODING *,
                                            XML_Bool isCdata, const char *,
-                                           const char *, STRING_POOL *);
+                                           const char *, STRING_POOL *,
+                                           enum XML_Account account);
 static ATTRIBUTE_ID *getAttributeId(XML_Parser parser, const ENCODING *enc,
                                     const char *start, const char *end);
 static int setElementTypePrefix(XML_Parser parser, ELEMENT_TYPE *);
 static enum XML_Error storeEntityValue(XML_Parser parser, const ENCODING *enc,
-                                       const char *start, const char *end);
+                                       const char *start, const char *end,
+                                       enum XML_Account account);
 static int reportProcessingInstruction(XML_Parser parser, const ENCODING *enc,
                                        const char *start, const char *end);
 static int reportComment(XML_Parser parser, const ENCODING *enc,
@@ -501,6 +558,34 @@ static XML_Parser parserCreate(const XML_Char *encodingName,
 
 static void parserInit(XML_Parser parser, const XML_Char *encodingName);
 
+#ifdef XML_DTD
+static float accountingGetCurrentAmplification(XML_Parser rootParser);
+static void accountingReportStats(XML_Parser originParser, const char *epilog);
+static void accountingOnAbort(XML_Parser originParser);
+static void accountingReportDiff(XML_Parser rootParser,
+                                 unsigned int levelsAwayFromRootParser,
+                                 const char *before, const char *after,
+                                 ptrdiff_t bytesMore, int source_line,
+                                 enum XML_Account account);
+static XML_Bool accountingDiffTolerated(XML_Parser originParser, int tok,
+                                        const char *before, const char *after,
+                                        int source_line,
+                                        enum XML_Account account);
+
+static void entityTrackingReportStats(XML_Parser parser, ENTITY *entity,
+                                      const char *action, int sourceLine);
+static void entityTrackingOnOpen(XML_Parser parser, ENTITY *entity,
+                                 int sourceLine);
+static void entityTrackingOnClose(XML_Parser parser, ENTITY *entity,
+                                  int sourceLine);
+
+static XML_Parser getRootParserOf(XML_Parser parser,
+                                  unsigned int *outLevelDiff);
+#endif /* XML_DTD */
+
+static unsigned long getDebugLevel(const char *variableName,
+                                   unsigned long defaultDebugLevel);
+
 #define poolStart(pool) ((pool)->start)
 #define poolEnd(pool) ((pool)->ptr)
 #define poolLength(pool) ((pool)->ptr - (pool)->start)
@@ -614,6 +699,10 @@ struct XML_ParserStruct {
   enum XML_ParamEntityParsing m_paramEntityParsing;
 #endif
   unsigned long m_hash_secret_salt;
+#ifdef XML_DTD
+  ACCOUNTING m_accounting;
+  ENTITY_STATS m_entity_stats;
+#endif
 };
 
 #define MALLOC(parser, s) (parser->m_mem.malloc_fcn((s)))
@@ -734,6 +823,15 @@ writeRandomBytes_arc4random(void *target, size_t count) {
 
 #ifdef _WIN32
 
+/* Provide declaration of rand_s() for MinGW-32 (not 64, which has it),
+   as it didn't declare it in its header prior to version 5.3.0 of its
+   runtime package (mingwrt, containing stdlib.h).  The upstream fix
+   was introduced at https://osdn.net/projects/mingw/ticket/39658 . */
+#  if defined(__MINGW32__) && defined(__MINGW32_VERSION)                       \
+      && __MINGW32_VERSION < 5003000L && ! defined(__MINGW64_VERSION_MAJOR)
+__declspec(dllimport) int rand_s(unsigned int *);
+#  endif
+
 /* Obtain entropy on Windows using the rand_s() function which
  * generates cryptographically secure random numbers.  Internally it
  * uses RtlGenRandom API which is present in Windows XP and later.
@@ -789,9 +887,8 @@ gather_time_entropy(void) {
 
 static unsigned long
 ENTROPY_DEBUG(const char *label, unsigned long entropy) {
-  const char *const EXPAT_ENTROPY_DEBUG = getenv("EXPAT_ENTROPY_DEBUG");
-  if (EXPAT_ENTROPY_DEBUG && ! strcmp(EXPAT_ENTROPY_DEBUG, "1")) {
-    fprintf(stderr, "Entropy: %s --> 0x%0*lx (%lu bytes)\n", label,
+  if (getDebugLevel("EXPAT_ENTROPY_DEBUG", 0) >= 1u) {
+    fprintf(stderr, "expat: Entropy: %s --> 0x%0*lx (%lu bytes)\n", label,
             (int)sizeof(entropy) * 2, entropy, (unsigned long)sizeof(entropy));
   }
   return entropy;
@@ -1053,6 +1150,18 @@ parserInit(XML_Parser parser, const XML_Char *encodingName) {
   parser->m_paramEntityParsing = XML_PARAM_ENTITY_PARSING_NEVER;
 #endif
   parser->m_hash_secret_salt = 0;
+
+#ifdef XML_DTD
+  memset(&parser->m_accounting, 0, sizeof(ACCOUNTING));
+  parser->m_accounting.debugLevel = getDebugLevel("EXPAT_ACCOUNTING_DEBUG", 0u);
+  parser->m_accounting.maximumAmplificationFactor
+      = EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT;
+  parser->m_accounting.activationThresholdBytes
+      = EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT;
+
+  memset(&parser->m_entity_stats, 0, sizeof(ENTITY_STATS));
+  parser->m_entity_stats.debugLevel = getDebugLevel("EXPAT_ENTITY_DEBUG", 0u);
+#endif
 }
 
 /* moves list of bindings to m_freeBindingList */
@@ -1399,6 +1508,7 @@ XML_UseForeignDTD(XML_Parser parser, XML_Bool useDTD) {
   parser->m_useForeignDTD = useDTD;
   return XML_ERROR_NONE;
 #else
+  UNUSED_P(useDTD);
   return XML_ERROR_FEATURE_REQUIRES_XML_DTD;
 #endif
 }
@@ -1780,7 +1890,7 @@ XML_Parse(XML_Parser parser, const char *s, int len, int isFinal) {
     int nLeftOver;
     enum XML_Status result;
     /* Detect overflow (a+b > MAX <==> b > MAX-a) */
-    if (len > ((XML_Size)-1) / 2 - parser->m_parseEndByteIndex) {
+    if ((XML_Size)len > ((XML_Size)-1) / 2 - parser->m_parseEndByteIndex) {
       parser->m_errorCode = XML_ERROR_NO_MEMORY;
       parser->m_eventPtr = parser->m_eventEndPtr = NULL;
       parser->m_processor = errorProcessor;
@@ -1872,6 +1982,12 @@ XML_ParseBuffer(XML_Parser parser, int len, int isFinal) {
     parser->m_errorCode = XML_ERROR_FINISHED;
     return XML_STATUS_ERROR;
   case XML_INITIALIZED:
+    /* Has someone called XML_GetBuffer successfully before? */
+    if (! parser->m_bufferPtr) {
+      parser->m_errorCode = XML_ERROR_NO_BUFFER;
+      return XML_STATUS_ERROR;
+    }
+
     if (parser->m_parentParser == NULL && ! startParsing(parser)) {
       parser->m_errorCode = XML_ERROR_NO_MEMORY;
       return XML_STATUS_ERROR;
@@ -2155,7 +2271,7 @@ XML_GetInputContext(XML_Parser parser, int *offset, int *size) {
   (void)offset;
   (void)size;
 #endif /* defined XML_CONTEXT_BYTES */
-  return (char *)0;
+  return (const char *)0;
 }
 
 XML_Size XMLCALL
@@ -2316,6 +2432,14 @@ XML_ErrorString(enum XML_Error code) {
   /* Added in 2.2.5. */
   case XML_ERROR_INVALID_ARGUMENT: /* Constant added in 2.2.1, already */
     return XML_L("invalid argument");
+    /* Added in 2.3.0. */
+  case XML_ERROR_NO_BUFFER:
+    return XML_L(
+        "a successful prior call to function XML_GetBuffer is required");
+  /* Added in 2.4.0. */
+  case XML_ERROR_AMPLIFICATION_LIMIT_BREACH:
+    return XML_L(
+        "limit on input amplification factor (from DTD and entities) breached");
   }
   return NULL;
 }
@@ -2352,41 +2476,75 @@ XML_ExpatVersionInfo(void) {
 
 const XML_Feature *XMLCALL
 XML_GetFeatureList(void) {
-  static const XML_Feature features[]
-      = {{XML_FEATURE_SIZEOF_XML_CHAR, XML_L("sizeof(XML_Char)"),
-          sizeof(XML_Char)},
-         {XML_FEATURE_SIZEOF_XML_LCHAR, XML_L("sizeof(XML_LChar)"),
-          sizeof(XML_LChar)},
+  static const XML_Feature features[] = {
+      {XML_FEATURE_SIZEOF_XML_CHAR, XML_L("sizeof(XML_Char)"),
+       sizeof(XML_Char)},
+      {XML_FEATURE_SIZEOF_XML_LCHAR, XML_L("sizeof(XML_LChar)"),
+       sizeof(XML_LChar)},
 #ifdef XML_UNICODE
-         {XML_FEATURE_UNICODE, XML_L("XML_UNICODE"), 0},
+      {XML_FEATURE_UNICODE, XML_L("XML_UNICODE"), 0},
 #endif
 #ifdef XML_UNICODE_WCHAR_T
-         {XML_FEATURE_UNICODE_WCHAR_T, XML_L("XML_UNICODE_WCHAR_T"), 0},
+      {XML_FEATURE_UNICODE_WCHAR_T, XML_L("XML_UNICODE_WCHAR_T"), 0},
 #endif
 #ifdef XML_DTD
-         {XML_FEATURE_DTD, XML_L("XML_DTD"), 0},
+      {XML_FEATURE_DTD, XML_L("XML_DTD"), 0},
 #endif
 #ifdef XML_CONTEXT_BYTES
-         {XML_FEATURE_CONTEXT_BYTES, XML_L("XML_CONTEXT_BYTES"),
-          XML_CONTEXT_BYTES},
+      {XML_FEATURE_CONTEXT_BYTES, XML_L("XML_CONTEXT_BYTES"),
+       XML_CONTEXT_BYTES},
 #endif
 #ifdef XML_MIN_SIZE
-         {XML_FEATURE_MIN_SIZE, XML_L("XML_MIN_SIZE"), 0},
+      {XML_FEATURE_MIN_SIZE, XML_L("XML_MIN_SIZE"), 0},
 #endif
 #ifdef XML_NS
-         {XML_FEATURE_NS, XML_L("XML_NS"), 0},
+      {XML_FEATURE_NS, XML_L("XML_NS"), 0},
 #endif
 #ifdef XML_LARGE_SIZE
-         {XML_FEATURE_LARGE_SIZE, XML_L("XML_LARGE_SIZE"), 0},
+      {XML_FEATURE_LARGE_SIZE, XML_L("XML_LARGE_SIZE"), 0},
 #endif
 #ifdef XML_ATTR_INFO
-         {XML_FEATURE_ATTR_INFO, XML_L("XML_ATTR_INFO"), 0},
+      {XML_FEATURE_ATTR_INFO, XML_L("XML_ATTR_INFO"), 0},
+#endif
+#ifdef XML_DTD
+      /* Added in Expat 2.4.0. */
+      {XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT,
+       XML_L("XML_BLAP_MAX_AMP"),
+       (long int)
+           EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT},
+      {XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT,
+       XML_L("XML_BLAP_ACT_THRES"),
+       EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT},
 #endif
-         {XML_FEATURE_END, NULL, 0}};
+      {XML_FEATURE_END, NULL, 0}};
 
   return features;
 }
 
+#ifdef XML_DTD
+XML_Bool XMLCALL
+XML_SetBillionLaughsAttackProtectionMaximumAmplification(
+    XML_Parser parser, float maximumAmplificationFactor) {
+  if ((parser == NULL) || (parser->m_parentParser != NULL)
+      || isnan(maximumAmplificationFactor)
+      || (maximumAmplificationFactor < 1.0f)) {
+    return XML_FALSE;
+  }
+  parser->m_accounting.maximumAmplificationFactor = maximumAmplificationFactor;
+  return XML_TRUE;
+}
+
+XML_Bool XMLCALL
+XML_SetBillionLaughsAttackProtectionActivationThreshold(
+    XML_Parser parser, unsigned long long activationThresholdBytes) {
+  if ((parser == NULL) || (parser->m_parentParser != NULL)) {
+    return XML_FALSE;
+  }
+  parser->m_accounting.activationThresholdBytes = activationThresholdBytes;
+  return XML_TRUE;
+}
+#endif /* XML_DTD */
+
 /* Initially tag->rawName always points into the parse buffer;
    for those TAG instances opened while the current parse buffer was
    processed, and not yet closed, we need to store tag->rawName in a more
@@ -2439,9 +2597,9 @@ storeRawNames(XML_Parser parser) {
 static enum XML_Error PTRCALL
 contentProcessor(XML_Parser parser, const char *start, const char *end,
                  const char **endPtr) {
-  enum XML_Error result
-      = doContent(parser, 0, parser->m_encoding, start, end, endPtr,
-                  (XML_Bool)! parser->m_parsingStatus.finalBuffer);
+  enum XML_Error result = doContent(
+      parser, 0, parser->m_encoding, start, end, endPtr,
+      (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_ACCOUNT_DIRECT);
   if (result == XML_ERROR_NONE) {
     if (! storeRawNames(parser))
       return XML_ERROR_NO_MEMORY;
@@ -2466,6 +2624,14 @@ externalEntityInitProcessor2(XML_Parser parser, const char *start,
   int tok = XmlContentTok(parser->m_encoding, start, end, &next);
   switch (tok) {
   case XML_TOK_BOM:
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, start, next, __LINE__,
+                                  XML_ACCOUNT_DIRECT)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#endif /* XML_DTD */
+
     /* If we are at the end of the buffer, this would cause the next stage,
        i.e. externalEntityInitProcessor3, to pass control directly to
        doContent (by detecting XML_TOK_NONE) without processing any xml text
@@ -2503,6 +2669,10 @@ externalEntityInitProcessor3(XML_Parser parser, const char *start,
   const char *next = start; /* XmlContentTok doesn't always set the last arg */
   parser->m_eventPtr = start;
   tok = XmlContentTok(parser->m_encoding, start, end, &next);
+  /* Note: These bytes are accounted later in:
+           - processXmlDecl
+           - externalEntityContentProcessor
+  */
   parser->m_eventEndPtr = next;
 
   switch (tok) {
@@ -2544,7 +2714,8 @@ externalEntityContentProcessor(XML_Parser parser, const char *start,
                                const char *end, const char **endPtr) {
   enum XML_Error result
       = doContent(parser, 1, parser->m_encoding, start, end, endPtr,
-                  (XML_Bool)! parser->m_parsingStatus.finalBuffer);
+                  (XML_Bool)! parser->m_parsingStatus.finalBuffer,
+                  XML_ACCOUNT_ENTITY_EXPANSION);
   if (result == XML_ERROR_NONE) {
     if (! storeRawNames(parser))
       return XML_ERROR_NO_MEMORY;
@@ -2555,7 +2726,7 @@ externalEntityContentProcessor(XML_Parser parser, const char *start,
 static enum XML_Error
 doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
           const char *s, const char *end, const char **nextPtr,
-          XML_Bool haveMore) {
+          XML_Bool haveMore, enum XML_Account account) {
   /* save one level of indirection */
   DTD *const dtd = parser->m_dtd;
 
@@ -2573,6 +2744,17 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
   for (;;) {
     const char *next = s; /* XmlContentTok doesn't always set the last arg */
     int tok = XmlContentTok(enc, s, end, &next);
+#ifdef XML_DTD
+    const char *accountAfter
+        = ((tok == XML_TOK_TRAILING_RSQB) || (tok == XML_TOK_TRAILING_CR))
+              ? (haveMore ? s /* i.e. 0 bytes */ : end)
+              : next;
+    if (! accountingDiffTolerated(parser, tok, s, accountAfter, __LINE__,
+                                  account)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#endif
     *eventEndPP = next;
     switch (tok) {
     case XML_TOK_TRAILING_CR:
@@ -2628,6 +2810,14 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
       XML_Char ch = (XML_Char)XmlPredefinedEntityName(
           enc, s + enc->minBytesPerChar, next - enc->minBytesPerChar);
       if (ch) {
+#ifdef XML_DTD
+        /* NOTE: We are replacing 4-6 characters original input for 1 character
+         *       so there is no amplification and hence recording without
+         *       protection. */
+        accountingDiffTolerated(parser, tok, (char *)&ch,
+                                ((char *)&ch) + sizeof(XML_Char), __LINE__,
+                                XML_ACCOUNT_ENTITY_EXPANSION);
+#endif /* XML_DTD */
         if (parser->m_characterDataHandler)
           parser->m_characterDataHandler(parser->m_handlerArg, &ch, 1);
         else if (parser->m_defaultHandler)
@@ -2746,7 +2936,8 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
       }
       tag->name.str = (XML_Char *)tag->buf;
       *toPtr = XML_T('\0');
-      result = storeAtts(parser, enc, s, &(tag->name), &(tag->bindings));
+      result
+          = storeAtts(parser, enc, s, &(tag->name), &(tag->bindings), account);
       if (result)
         return result;
       if (parser->m_startElementHandler)
@@ -2770,7 +2961,8 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
       if (! name.str)
         return XML_ERROR_NO_MEMORY;
       poolFinish(&parser->m_tempPool);
-      result = storeAtts(parser, enc, s, &name, &bindings);
+      result = storeAtts(parser, enc, s, &name, &bindings,
+                         XML_ACCOUNT_NONE /* token spans whole start tag */);
       if (result != XML_ERROR_NONE) {
         freeBindings(parser, bindings);
         return result;
@@ -2905,7 +3097,8 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
       /* END disabled code */
       else if (parser->m_defaultHandler)
         reportDefault(parser, enc, s, next);
-      result = doCdataSection(parser, enc, &next, end, nextPtr, haveMore);
+      result
+          = doCdataSection(parser, enc, &next, end, nextPtr, haveMore, account);
       if (result != XML_ERROR_NONE)
         return result;
       else if (! next) {
@@ -3034,7 +3227,8 @@ freeBindings(XML_Parser parser, BINDING *bindings) {
 */
 static enum XML_Error
 storeAtts(XML_Parser parser, const ENCODING *enc, const char *attStr,
-          TAG_NAME *tagNamePtr, BINDING **bindingsPtr) {
+          TAG_NAME *tagNamePtr, BINDING **bindingsPtr,
+          enum XML_Account account) {
   DTD *const dtd = parser->m_dtd; /* save one level of indirection */
   ELEMENT_TYPE *elementType;
   int nDefaultAtts;
@@ -3144,7 +3338,7 @@ storeAtts(XML_Parser parser, const ENCODING *enc, const char *attStr,
       /* normalize the attribute value */
       result = storeAttributeValue(
           parser, enc, isCdata, parser->m_atts[i].valuePtr,
-          parser->m_atts[i].valueEnd, &parser->m_tempPool);
+          parser->m_atts[i].valueEnd, &parser->m_tempPool, account);
       if (result)
         return result;
       appAtts[attIndex] = poolStart(&parser->m_tempPool);
@@ -3533,9 +3727,9 @@ addBinding(XML_Parser parser, PREFIX *prefix, const ATTRIBUTE_ID *attId,
 static enum XML_Error PTRCALL
 cdataSectionProcessor(XML_Parser parser, const char *start, const char *end,
                       const char **endPtr) {
-  enum XML_Error result
-      = doCdataSection(parser, parser->m_encoding, &start, end, endPtr,
-                       (XML_Bool)! parser->m_parsingStatus.finalBuffer);
+  enum XML_Error result = doCdataSection(
+      parser, parser->m_encoding, &start, end, endPtr,
+      (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_ACCOUNT_DIRECT);
   if (result != XML_ERROR_NONE)
     return result;
   if (start) {
@@ -3555,7 +3749,8 @@ cdataSectionProcessor(XML_Parser parser, const char *start, const char *end,
 */
 static enum XML_Error
 doCdataSection(XML_Parser parser, const ENCODING *enc, const char **startPtr,
-               const char *end, const char **nextPtr, XML_Bool haveMore) {
+               const char *end, const char **nextPtr, XML_Bool haveMore,
+               enum XML_Account account) {
   const char *s = *startPtr;
   const char **eventPP;
   const char **eventEndPP;
@@ -3571,8 +3766,16 @@ doCdataSection(XML_Parser parser, const ENCODING *enc, const char **startPtr,
   *startPtr = NULL;
 
   for (;;) {
-    const char *next;
+    const char *next = s; /* in case of XML_TOK_NONE or XML_TOK_PARTIAL */
     int tok = XmlCdataSectionTok(enc, s, end, &next);
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, s, next, __LINE__, account)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#else
+    UNUSED_P(account);
+#endif
     *eventEndPP = next;
     switch (tok) {
     case XML_TOK_CDATA_SECT_CLOSE:
@@ -3689,7 +3892,7 @@ ignoreSectionProcessor(XML_Parser parser, const char *start, const char *end,
 static enum XML_Error
 doIgnoreSection(XML_Parser parser, const ENCODING *enc, const char **startPtr,
                 const char *end, const char **nextPtr, XML_Bool haveMore) {
-  const char *next;
+  const char *next = *startPtr; /* in case of XML_TOK_NONE or XML_TOK_PARTIAL */
   int tok;
   const char *s = *startPtr;
   const char **eventPP;
@@ -3717,6 +3920,13 @@ doIgnoreSection(XML_Parser parser, const ENCODING *enc, const char **startPtr,
   *eventPP = s;
   *startPtr = NULL;
   tok = XmlIgnoreSectionTok(enc, s, end, &next);
+#  ifdef XML_DTD
+  if (! accountingDiffTolerated(parser, tok, s, next, __LINE__,
+                                XML_ACCOUNT_DIRECT)) {
+    accountingOnAbort(parser);
+    return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+  }
+#  endif
   *eventEndPP = next;
   switch (tok) {
   case XML_TOK_IGNORE_SECT:
@@ -3801,6 +4011,15 @@ processXmlDecl(XML_Parser parser, int isGeneralTextEntity, const char *s,
   const char *versionend;
   const XML_Char *storedversion = NULL;
   int standalone = -1;
+
+#ifdef XML_DTD
+  if (! accountingDiffTolerated(parser, XML_TOK_XML_DECL, s, next, __LINE__,
+                                XML_ACCOUNT_DIRECT)) {
+    accountingOnAbort(parser);
+    return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+  }
+#endif
+
   if (! (parser->m_ns ? XmlParseXmlDeclNS : XmlParseXmlDecl)(
           isGeneralTextEntity, parser->m_encoding, s, next, &parser->m_eventPtr,
           &version, &versionend, &encodingName, &newEncoding, &standalone)) {
@@ -3950,6 +4169,10 @@ entityValueInitProcessor(XML_Parser parser, const char *s, const char *end,
 
   for (;;) {
     tok = XmlPrologTok(parser->m_encoding, start, end, &next);
+    /* Note: Except for XML_TOK_BOM below, these bytes are accounted later in:
+             - storeEntityValue
+             - processXmlDecl
+    */
     parser->m_eventEndPtr = next;
     if (tok <= 0) {
       if (! parser->m_parsingStatus.finalBuffer && tok != XML_TOK_INVALID) {
@@ -3968,7 +4191,8 @@ entityValueInitProcessor(XML_Parser parser, const char *s, const char *end,
         break;
       }
       /* found end of entity value - can store it now */
-      return storeEntityValue(parser, parser->m_encoding, s, end);
+      return storeEntityValue(parser, parser->m_encoding, s, end,
+                              XML_ACCOUNT_DIRECT);
     } else if (tok == XML_TOK_XML_DECL) {
       enum XML_Error result;
       result = processXmlDecl(parser, 0, start, next);
@@ -3995,6 +4219,14 @@ entityValueInitProcessor(XML_Parser parser, const char *s, const char *end,
     */
     else if (tok == XML_TOK_BOM && next == end
              && ! parser->m_parsingStatus.finalBuffer) {
+#  ifdef XML_DTD
+      if (! accountingDiffTolerated(parser, tok, s, next, __LINE__,
+                                    XML_ACCOUNT_DIRECT)) {
+        accountingOnAbort(parser);
+        return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+      }
+#  endif
+
       *nextPtr = next;
       return XML_ERROR_NONE;
     }
@@ -4037,16 +4269,24 @@ externalParEntProcessor(XML_Parser parser, const char *s, const char *end,
   }
   /* This would cause the next stage, i.e. doProlog to be passed XML_TOK_BOM.
      However, when parsing an external subset, doProlog will not accept a BOM
-     as valid, and report a syntax error, so we have to skip the BOM
+     as valid, and report a syntax error, so we have to skip the BOM, and
+     account for the BOM bytes.
   */
   else if (tok == XML_TOK_BOM) {
+    if (! accountingDiffTolerated(parser, tok, s, next, __LINE__,
+                                  XML_ACCOUNT_DIRECT)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+
     s = next;
     tok = XmlPrologTok(parser->m_encoding, s, end, &next);
   }
 
   parser->m_processor = prologProcessor;
   return doProlog(parser, parser->m_encoding, s, end, tok, next, nextPtr,
-                  (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE);
+                  (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE,
+                  XML_ACCOUNT_DIRECT);
 }
 
 static enum XML_Error PTRCALL
@@ -4059,6 +4299,9 @@ entityValueProcessor(XML_Parser parser, const char *s, const char *end,
 
   for (;;) {
     tok = XmlPrologTok(enc, start, end, &next);
+    /* Note: These bytes are accounted later in:
+             - storeEntityValue
+    */
     if (tok <= 0) {
       if (! parser->m_parsingStatus.finalBuffer && tok != XML_TOK_INVALID) {
         *nextPtr = s;
@@ -4076,7 +4319,7 @@ entityValueProcessor(XML_Parser parser, const char *s, const char *end,
         break;
       }
       /* found end of entity value - can store it now */
-      return storeEntityValue(parser, enc, s, end);
+      return storeEntityValue(parser, enc, s, end, XML_ACCOUNT_DIRECT);
     }
     start = next;
   }
@@ -4090,13 +4333,14 @@ prologProcessor(XML_Parser parser, const char *s, const char *end,
   const char *next = s;
   int tok = XmlPrologTok(parser->m_encoding, s, end, &next);
   return doProlog(parser, parser->m_encoding, s, end, tok, next, nextPtr,
-                  (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE);
+                  (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE,
+                  XML_ACCOUNT_DIRECT);
 }
 
 static enum XML_Error
 doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
          int tok, const char *next, const char **nextPtr, XML_Bool haveMore,
-         XML_Bool allowClosingDoctype) {
+         XML_Bool allowClosingDoctype, enum XML_Account account) {
 #ifdef XML_DTD
   static const XML_Char externalSubsetName[] = {ASCII_HASH, '\0'};
 #endif /* XML_DTD */
@@ -4123,6 +4367,10 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
   static const XML_Char enumValueSep[] = {ASCII_PIPE, '\0'};
   static const XML_Char enumValueStart[] = {ASCII_LPAREN, '\0'};
 
+#ifndef XML_DTD
+  UNUSED_P(account);
+#endif
+
   /* save one level of indirection */
   DTD *const dtd = parser->m_dtd;
 
@@ -4187,6 +4435,19 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
       }
     }
     role = XmlTokenRole(&parser->m_prologState, tok, s, next, enc);
+#ifdef XML_DTD
+    switch (role) {
+    case XML_ROLE_INSTANCE_START: // bytes accounted in contentProcessor
+    case XML_ROLE_XML_DECL:       // bytes accounted in processXmlDecl
+    case XML_ROLE_TEXT_DECL:      // bytes accounted in processXmlDecl
+      break;
+    default:
+      if (! accountingDiffTolerated(parser, tok, s, next, __LINE__, account)) {
+        accountingOnAbort(parser);
+        return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+      }
+    }
+#endif
     switch (role) {
     case XML_ROLE_XML_DECL: {
       enum XML_Error result = processXmlDecl(parser, 0, s, next);
@@ -4462,7 +4723,8 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
         const XML_Char *attVal;
         enum XML_Error result = storeAttributeValue(
             parser, enc, parser->m_declAttributeIsCdata,
-            s + enc->minBytesPerChar, next - enc->minBytesPerChar, &dtd->pool);
+            s + enc->minBytesPerChar, next - enc->minBytesPerChar, &dtd->pool,
+            XML_ACCOUNT_NONE);
         if (result)
           return result;
         attVal = poolStart(&dtd->pool);
@@ -4495,8 +4757,9 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
       break;
     case XML_ROLE_ENTITY_VALUE:
       if (dtd->keepProcessing) {
-        enum XML_Error result = storeEntityValue(
-            parser, enc, s + enc->minBytesPerChar, next - enc->minBytesPerChar);
+        enum XML_Error result
+            = storeEntityValue(parser, enc, s + enc->minBytesPerChar,
+                               next - enc->minBytesPerChar, XML_ACCOUNT_NONE);
         if (parser->m_declEntity) {
           parser->m_declEntity->textPtr = poolStart(&dtd->entityValuePool);
           parser->m_declEntity->textLen
@@ -4886,12 +5149,15 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
         if (parser->m_externalEntityRefHandler) {
           dtd->paramEntityRead = XML_FALSE;
           entity->open = XML_TRUE;
+          entityTrackingOnOpen(parser, entity, __LINE__);
           if (! parser->m_externalEntityRefHandler(
                   parser->m_externalEntityRefHandlerArg, 0, entity->base,
                   entity->systemId, entity->publicId)) {
+            entityTrackingOnClose(parser, entity, __LINE__);
             entity->open = XML_FALSE;
             return XML_ERROR_EXTERNAL_ENTITY_HANDLING;
           }
+          entityTrackingOnClose(parser, entity, __LINE__);
           entity->open = XML_FALSE;
           handleDefault = XML_FALSE;
           if (! dtd->paramEntityRead) {
@@ -5089,6 +5355,13 @@ epilogProcessor(XML_Parser parser, const char *s, const char *end,
   for (;;) {
     const char *next = NULL;
     int tok = XmlPrologTok(parser->m_encoding, s, end, &next);
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, s, next, __LINE__,
+                                  XML_ACCOUNT_DIRECT)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#endif
     parser->m_eventEndPtr = next;
     switch (tok) {
     /* report partial linebreak - it might be the last token */
@@ -5162,6 +5435,9 @@ processInternalEntity(XML_Parser parser, ENTITY *entity, XML_Bool betweenDecl) {
       return XML_ERROR_NO_MEMORY;
   }
   entity->open = XML_TRUE;
+#ifdef XML_DTD
+  entityTrackingOnOpen(parser, entity, __LINE__);
+#endif
   entity->processed = 0;
   openEntity->next = parser->m_openInternalEntities;
   parser->m_openInternalEntities = openEntity;
@@ -5170,8 +5446,8 @@ processInternalEntity(XML_Parser parser, ENTITY *entity, XML_Bool betweenDecl) {
   openEntity->betweenDecl = betweenDecl;
   openEntity->internalEventPtr = NULL;
   openEntity->internalEventEndPtr = NULL;
-  textStart = (char *)entity->textPtr;
-  textEnd = (char *)(entity->textPtr + entity->textLen);
+  textStart = (const char *)entity->textPtr;
+  textEnd = (const char *)(entity->textPtr + entity->textLen);
   /* Set a safe default value in case 'next' does not get set */
   next = textStart;
 
@@ -5180,17 +5456,22 @@ processInternalEntity(XML_Parser parser, ENTITY *entity, XML_Bool betweenDecl) {
     int tok
         = XmlPrologTok(parser->m_internalEncoding, textStart, textEnd, &next);
     result = doProlog(parser, parser->m_internalEncoding, textStart, textEnd,
-                      tok, next, &next, XML_FALSE, XML_FALSE);
+                      tok, next, &next, XML_FALSE, XML_FALSE,
+                      XML_ACCOUNT_ENTITY_EXPANSION);
   } else
 #endif /* XML_DTD */
     result = doContent(parser, parser->m_tagLevel, parser->m_internalEncoding,
-                       textStart, textEnd, &next, XML_FALSE);
+                       textStart, textEnd, &next, XML_FALSE,
+                       XML_ACCOUNT_ENTITY_EXPANSION);
 
   if (result == XML_ERROR_NONE) {
     if (textEnd != next && parser->m_parsingStatus.parsing == XML_SUSPENDED) {
       entity->processed = (int)(next - textStart);
       parser->m_processor = internalEntityProcessor;
     } else {
+#ifdef XML_DTD
+      entityTrackingOnClose(parser, entity, __LINE__);
+#endif /* XML_DTD */
       entity->open = XML_FALSE;
       parser->m_openInternalEntities = openEntity->next;
       /* put openEntity back in list of free instances */
@@ -5213,8 +5494,8 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,
     return XML_ERROR_UNEXPECTED_STATE;
 
   entity = openEntity->entity;
-  textStart = ((char *)entity->textPtr) + entity->processed;
-  textEnd = (char *)(entity->textPtr + entity->textLen);
+  textStart = ((const char *)entity->textPtr) + entity->processed;
+  textEnd = (const char *)(entity->textPtr + entity->textLen);
   /* Set a safe default value in case 'next' does not get set */
   next = textStart;
 
@@ -5223,20 +5504,24 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,
     int tok
         = XmlPrologTok(parser->m_internalEncoding, textStart, textEnd, &next);
     result = doProlog(parser, parser->m_internalEncoding, textStart, textEnd,
-                      tok, next, &next, XML_FALSE, XML_TRUE);
+                      tok, next, &next, XML_FALSE, XML_TRUE,
+                      XML_ACCOUNT_ENTITY_EXPANSION);
   } else
 #endif /* XML_DTD */
     result = doContent(parser, openEntity->startTagLevel,
                        parser->m_internalEncoding, textStart, textEnd, &next,
-                       XML_FALSE);
+                       XML_FALSE, XML_ACCOUNT_ENTITY_EXPANSION);
 
   if (result != XML_ERROR_NONE)
     return result;
   else if (textEnd != next
            && parser->m_parsingStatus.parsing == XML_SUSPENDED) {
-    entity->processed = (int)(next - (char *)entity->textPtr);
+    entity->processed = (int)(next - (const char *)entity->textPtr);
     return result;
   } else {
+#ifdef XML_DTD
+    entityTrackingOnClose(parser, entity, __LINE__);
+#endif
     entity->open = XML_FALSE;
     parser->m_openInternalEntities = openEntity->next;
     /* put openEntity back in list of free instances */
@@ -5250,7 +5535,8 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,
     parser->m_processor = prologProcessor;
     tok = XmlPrologTok(parser->m_encoding, s, end, &next);
     return doProlog(parser, parser->m_encoding, s, end, tok, next, nextPtr,
-                    (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE);
+                    (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE,
+                    XML_ACCOUNT_DIRECT);
   } else
 #endif /* XML_DTD */
   {
@@ -5258,7 +5544,8 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,
     /* see externalEntityContentProcessor vs contentProcessor */
     return doContent(parser, parser->m_parentParser ? 1 : 0, parser->m_encoding,
                      s, end, nextPtr,
-                     (XML_Bool)! parser->m_parsingStatus.finalBuffer);
+                     (XML_Bool)! parser->m_parsingStatus.finalBuffer,
+                     XML_ACCOUNT_DIRECT);
   }
 }
 
@@ -5273,9 +5560,10 @@ errorProcessor(XML_Parser parser, const char *s, const char *end,
 
 static enum XML_Error
 storeAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
-                    const char *ptr, const char *end, STRING_POOL *pool) {
+                    const char *ptr, const char *end, STRING_POOL *pool,
+                    enum XML_Account account) {
   enum XML_Error result
-      = appendAttributeValue(parser, enc, isCdata, ptr, end, pool);
+      = appendAttributeValue(parser, enc, isCdata, ptr, end, pool, account);
   if (result)
     return result;
   if (! isCdata && poolLength(pool) && poolLastChar(pool) == 0x20)
@@ -5287,11 +5575,23 @@ storeAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
 
 static enum XML_Error
 appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
-                     const char *ptr, const char *end, STRING_POOL *pool) {
+                     const char *ptr, const char *end, STRING_POOL *pool,
+                     enum XML_Account account) {
   DTD *const dtd = parser->m_dtd; /* save one level of indirection */
+#ifndef XML_DTD
+  UNUSED_P(account);
+#endif
+
   for (;;) {
-    const char *next;
+    const char *next
+        = ptr; /* XmlAttributeValueTok doesn't always set the last arg */
     int tok = XmlAttributeValueTok(enc, ptr, end, &next);
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, ptr, next, __LINE__, account)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#endif
     switch (tok) {
     case XML_TOK_NONE:
       return XML_ERROR_NONE;
@@ -5351,6 +5651,14 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
       XML_Char ch = (XML_Char)XmlPredefinedEntityName(
           enc, ptr + enc->minBytesPerChar, next - enc->minBytesPerChar);
       if (ch) {
+#ifdef XML_DTD
+        /* NOTE: We are replacing 4-6 characters original input for 1 character
+         *       so there is no amplification and hence recording without
+         *       protection. */
+        accountingDiffTolerated(parser, tok, (char *)&ch,
+                                ((char *)&ch) + sizeof(XML_Char), __LINE__,
+                                XML_ACCOUNT_ENTITY_EXPANSION);
+#endif /* XML_DTD */
         if (! poolAppendChar(pool, ch))
           return XML_ERROR_NO_MEMORY;
         break;
@@ -5428,9 +5736,16 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
         enum XML_Error result;
         const XML_Char *textEnd = entity->textPtr + entity->textLen;
         entity->open = XML_TRUE;
+#ifdef XML_DTD
+        entityTrackingOnOpen(parser, entity, __LINE__);
+#endif
         result = appendAttributeValue(parser, parser->m_internalEncoding,
-                                      isCdata, (char *)entity->textPtr,
-                                      (char *)textEnd, pool);
+                                      isCdata, (const char *)entity->textPtr,
+                                      (const char *)textEnd, pool,
+                                      XML_ACCOUNT_ENTITY_EXPANSION);
+#ifdef XML_DTD
+        entityTrackingOnClose(parser, entity, __LINE__);
+#endif
         entity->open = XML_FALSE;
         if (result)
           return result;
@@ -5460,13 +5775,16 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
 
 static enum XML_Error
 storeEntityValue(XML_Parser parser, const ENCODING *enc,
-                 const char *entityTextPtr, const char *entityTextEnd) {
+                 const char *entityTextPtr, const char *entityTextEnd,
+                 enum XML_Account account) {
   DTD *const dtd = parser->m_dtd; /* save one level of indirection */
   STRING_POOL *pool = &(dtd->entityValuePool);
   enum XML_Error result = XML_ERROR_NONE;
 #ifdef XML_DTD
   int oldInEntityValue = parser->m_prologState.inEntityValue;
   parser->m_prologState.inEntityValue = 1;
+#else
+  UNUSED_P(account);
 #endif /* XML_DTD */
   /* never return Null for the value argument in EntityDeclHandler,
      since this would indicate an external entity; therefore we
@@ -5477,8 +5795,19 @@ storeEntityValue(XML_Parser parser, const ENCODING *enc,
   }
 
   for (;;) {
-    const char *next;
+    const char *next
+        = entityTextPtr; /* XmlEntityValueTok doesn't always set the last arg */
     int tok = XmlEntityValueTok(enc, entityTextPtr, entityTextEnd, &next);
+
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, entityTextPtr, next, __LINE__,
+                                  account)) {
+      accountingOnAbort(parser);
+      result = XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+      goto endEntityValue;
+    }
+#endif
+
     switch (tok) {
     case XML_TOK_PARAM_ENTITY_REF:
 #ifdef XML_DTD
@@ -5514,13 +5843,16 @@ storeEntityValue(XML_Parser parser, const ENCODING *enc,
           if (parser->m_externalEntityRefHandler) {
             dtd->paramEntityRead = XML_FALSE;
             entity->open = XML_TRUE;
+            entityTrackingOnOpen(parser, entity, __LINE__);
             if (! parser->m_externalEntityRefHandler(
                     parser->m_externalEntityRefHandlerArg, 0, entity->base,
                     entity->systemId, entity->publicId)) {
+              entityTrackingOnClose(parser, entity, __LINE__);
               entity->open = XML_FALSE;
               result = XML_ERROR_EXTERNAL_ENTITY_HANDLING;
               goto endEntityValue;
             }
+            entityTrackingOnClose(parser, entity, __LINE__);
             entity->open = XML_FALSE;
             if (! dtd->paramEntityRead)
               dtd->keepProcessing = dtd->standalone;
@@ -5528,9 +5860,12 @@ storeEntityValue(XML_Parser parser, const ENCODING *enc,
             dtd->keepProcessing = dtd->standalone;
         } else {
           entity->open = XML_TRUE;
+          entityTrackingOnOpen(parser, entity, __LINE__);
           result = storeEntityValue(
-              parser, parser->m_internalEncoding, (char *)entity->textPtr,
-              (char *)(entity->textPtr + entity->textLen));
+              parser, parser->m_internalEncoding, (const char *)entity->textPtr,
+              (const char *)(entity->textPtr + entity->textLen),
+              XML_ACCOUNT_ENTITY_EXPANSION);
+          entityTrackingOnClose(parser, entity, __LINE__);
           entity->open = XML_FALSE;
           if (result)
             goto endEntityValue;
@@ -6485,7 +6820,7 @@ hashTableInit(HASH_TABLE *p, const XML_Memory_Handling_Suite *ms) {
 static void FASTCALL
 hashTableIterInit(HASH_TABLE_ITER *iter, const HASH_TABLE *table) {
   iter->p = table->v;
-  iter->end = iter->p + table->size;
+  iter->end = iter->p ? iter->p + table->size : NULL;
 }
 
 static NAMED *FASTCALL
@@ -6891,3 +7226,755 @@ copyString(const XML_Char *s, const XML_Memory_Handling_Suite *memsuite) {
   memcpy(result, s, charsRequired * sizeof(XML_Char));
   return result;
 }
+
+#ifdef XML_DTD
+
+static float
+accountingGetCurrentAmplification(XML_Parser rootParser) {
+  const XmlBigCount countBytesOutput
+      = rootParser->m_accounting.countBytesDirect
+        + rootParser->m_accounting.countBytesIndirect;
+  const float amplificationFactor
+      = rootParser->m_accounting.countBytesDirect
+            ? (countBytesOutput
+               / (float)(rootParser->m_accounting.countBytesDirect))
+            : 1.0f;
+  assert(! rootParser->m_parentParser);
+  return amplificationFactor;
+}
+
+static void
+accountingReportStats(XML_Parser originParser, const char *epilog) {
+  const XML_Parser rootParser = getRootParserOf(originParser, NULL);
+  assert(! rootParser->m_parentParser);
+
+  if (rootParser->m_accounting.debugLevel < 1) {
+    return;
+  }
+
+  const float amplificationFactor
+      = accountingGetCurrentAmplification(rootParser);
+  fprintf(stderr,
+          "expat: Accounting(%p): Direct " EXPAT_FMT_ULL(
+              "10") ", indirect " EXPAT_FMT_ULL("10") ", amplification %8.2f%s",
+          (void *)rootParser, rootParser->m_accounting.countBytesDirect,
+          rootParser->m_accounting.countBytesIndirect,
+          (double)amplificationFactor, epilog);
+}
+
+static void
+accountingOnAbort(XML_Parser originParser) {
+  accountingReportStats(originParser, " ABORTING\n");
+}
+
+static void
+accountingReportDiff(XML_Parser rootParser,
+                     unsigned int levelsAwayFromRootParser, const char *before,
+                     const char *after, ptrdiff_t bytesMore, int source_line,
+                     enum XML_Account account) {
+  assert(! rootParser->m_parentParser);
+
+  fprintf(stderr,
+          " (+" EXPAT_FMT_PTRDIFF_T("6") " bytes %s|%d, xmlparse.c:%d) %*s\"",
+          bytesMore, (account == XML_ACCOUNT_DIRECT) ? "DIR" : "EXP",
+          levelsAwayFromRootParser, source_line, 10, "");
+
+  const char ellipis[] = "[..]";
+  const size_t ellipsisLength = sizeof(ellipis) /* because compile-time */ - 1;
+  const unsigned int contextLength = 10;
+
+  /* Note: Performance is of no concern here */
+  const char *walker = before;
+  if ((rootParser->m_accounting.debugLevel >= 3)
+      || (after - before)
+             <= (ptrdiff_t)(contextLength + ellipsisLength + contextLength)) {
+    for (; walker < after; walker++) {
+      fprintf(stderr, "%s", unsignedCharToPrintable(walker[0]));
+    }
+  } else {
+    for (; walker < before + contextLength; walker++) {
+      fprintf(stderr, "%s", unsignedCharToPrintable(walker[0]));
+    }
+    fprintf(stderr, ellipis);
+    walker = after - contextLength;
+    for (; walker < after; walker++) {
+      fprintf(stderr, "%s", unsignedCharToPrintable(walker[0]));
+    }
+  }
+  fprintf(stderr, "\"\n");
+}
+
+static XML_Bool
+accountingDiffTolerated(XML_Parser originParser, int tok, const char *before,
+                        const char *after, int source_line,
+                        enum XML_Account account) {
+  /* Note: We need to check the token type *first* to be sure that
+   *       we can even access variable <after>, safely.
+   *       E.g. for XML_TOK_NONE <after> may hold an invalid pointer. */
+  switch (tok) {
+  case XML_TOK_INVALID:
+  case XML_TOK_PARTIAL:
+  case XML_TOK_PARTIAL_CHAR:
+  case XML_TOK_NONE:
+    return XML_TRUE;
+  }
+
+  if (account == XML_ACCOUNT_NONE)
+    return XML_TRUE; /* because these bytes have been accounted for, already */
+
+  unsigned int levelsAwayFromRootParser;
+  const XML_Parser rootParser
+      = getRootParserOf(originParser, &levelsAwayFromRootParser);
+  assert(! rootParser->m_parentParser);
+
+  const int isDirect
+      = (account == XML_ACCOUNT_DIRECT) && (originParser == rootParser);
+  const ptrdiff_t bytesMore = after - before;
+
+  XmlBigCount *const additionTarget
+      = isDirect ? &rootParser->m_accounting.countBytesDirect
+                 : &rootParser->m_accounting.countBytesIndirect;
+
+  /* Detect and avoid integer overflow */
+  if (*additionTarget > (XmlBigCount)(-1) - (XmlBigCount)bytesMore)
+    return XML_FALSE;
+  *additionTarget += bytesMore;
+
+  const XmlBigCount countBytesOutput
+      = rootParser->m_accounting.countBytesDirect
+        + rootParser->m_accounting.countBytesIndirect;
+  const float amplificationFactor
+      = accountingGetCurrentAmplification(rootParser);
+  const XML_Bool tolerated
+      = (countBytesOutput < rootParser->m_accounting.activationThresholdBytes)
+        || (amplificationFactor
+            <= rootParser->m_accounting.maximumAmplificationFactor);
+
+  if (rootParser->m_accounting.debugLevel >= 2) {
+    accountingReportStats(rootParser, "");
+    accountingReportDiff(rootParser, levelsAwayFromRootParser, before, after,
+                         bytesMore, source_line, account);
+  }
+
+  return tolerated;
+}
+
+unsigned long long
+testingAccountingGetCountBytesDirect(XML_Parser parser) {
+  if (! parser)
+    return 0;
+  return parser->m_accounting.countBytesDirect;
+}
+
+unsigned long long
+testingAccountingGetCountBytesIndirect(XML_Parser parser) {
+  if (! parser)
+    return 0;
+  return parser->m_accounting.countBytesIndirect;
+}
+
+static void
+entityTrackingReportStats(XML_Parser rootParser, ENTITY *entity,
+                          const char *action, int sourceLine) {
+  assert(! rootParser->m_parentParser);
+  if (rootParser->m_entity_stats.debugLevel < 1)
+    return;
+
+#  if defined(XML_UNICODE)
+  const char *const entityName = "[..]";
+#  else
+  const char *const entityName = entity->name;
+#  endif
+
+  fprintf(
+      stderr,
+      "expat: Entities(%p): Count %9d, depth %2d/%2d %*s%s%s; %s length %d (xmlparse.c:%d)\n",
+      (void *)rootParser, rootParser->m_entity_stats.countEverOpened,
+      rootParser->m_entity_stats.currentDepth,
+      rootParser->m_entity_stats.maximumDepthSeen,
+      (rootParser->m_entity_stats.currentDepth - 1) * 2, "",
+      entity->is_param ? "%" : "&", entityName, action, entity->textLen,
+      sourceLine);
+}
+
+static void
+entityTrackingOnOpen(XML_Parser originParser, ENTITY *entity, int sourceLine) {
+  const XML_Parser rootParser = getRootParserOf(originParser, NULL);
+  assert(! rootParser->m_parentParser);
+
+  rootParser->m_entity_stats.countEverOpened++;
+  rootParser->m_entity_stats.currentDepth++;
+  if (rootParser->m_entity_stats.currentDepth
+      > rootParser->m_entity_stats.maximumDepthSeen) {
+    rootParser->m_entity_stats.maximumDepthSeen++;
+  }
+
+  entityTrackingReportStats(rootParser, entity, "OPEN ", sourceLine);
+}
+
+static void
+entityTrackingOnClose(XML_Parser originParser, ENTITY *entity, int sourceLine) {
+  const XML_Parser rootParser = getRootParserOf(originParser, NULL);
+  assert(! rootParser->m_parentParser);
+
+  entityTrackingReportStats(rootParser, entity, "CLOSE", sourceLine);
+  rootParser->m_entity_stats.currentDepth--;
+}
+
+static XML_Parser
+getRootParserOf(XML_Parser parser, unsigned int *outLevelDiff) {
+  XML_Parser rootParser = parser;
+  unsigned int stepsTakenUpwards = 0;
+  while (rootParser->m_parentParser) {
+    rootParser = rootParser->m_parentParser;
+    stepsTakenUpwards++;
+  }
+  assert(! rootParser->m_parentParser);
+  if (outLevelDiff != NULL) {
+    *outLevelDiff = stepsTakenUpwards;
+  }
+  return rootParser;
+}
+
+const char *
+unsignedCharToPrintable(unsigned char c) {
+  switch (c) {
+  case 0:
+    return "\\0";
+  case 1:
+    return "\\x1";
+  case 2:
+    return "\\x2";
+  case 3:
+    return "\\x3";
+  case 4:
+    return "\\x4";
+  case 5:
+    return "\\x5";
+  case 6:
+    return "\\x6";
+  case 7:
+    return "\\x7";
+  case 8:
+    return "\\x8";
+  case 9:
+    return "\\t";
+  case 10:
+    return "\\n";
+  case 11:
+    return "\\xB";
+  case 12:
+    return "\\xC";
+  case 13:
+    return "\\r";
+  case 14:
+    return "\\xE";
+  case 15:
+    return "\\xF";
+  case 16:
+    return "\\x10";
+  case 17:
+    return "\\x11";
+  case 18:
+    return "\\x12";
+  case 19:
+    return "\\x13";
+  case 20:
+    return "\\x14";
+  case 21:
+    return "\\x15";
+  case 22:
+    return "\\x16";
+  case 23:
+    return "\\x17";
+  case 24:
+    return "\\x18";
+  case 25:
+    return "\\x19";
+  case 26:
+    return "\\x1A";
+  case 27:
+    return "\\x1B";
+  case 28:
+    return "\\x1C";
+  case 29:
+    return "\\x1D";
+  case 30:
+    return "\\x1E";
+  case 31:
+    return "\\x1F";
+  case 32:
+    return " ";
+  case 33:
+    return "!";
+  case 34:
+    return "\\\"";
+  case 35:
+    return "#";
+  case 36:
+    return "$";
+  case 37:
+    return "%";
+  case 38:
+    return "&";
+  case 39:
+    return "'";
+  case 40:
+    return "(";
+  case 41:
+    return ")";
+  case 42:
+    return "*";
+  case 43:
+    return "+";
+  case 44:
+    return ",";
+  case 45:
+    return "-";
+  case 46:
+    return ".";
+  case 47:
+    return "/";
+  case 48:
+    return "0";
+  case 49:
+    return "1";
+  case 50:
+    return "2";
+  case 51:
+    return "3";
+  case 52:
+    return "4";
+  case 53:
+    return "5";
+  case 54:
+    return "6";
+  case 55:
+    return "7";
+  case 56:
+    return "8";
+  case 57:
+    return "9";
+  case 58:
+    return ":";
+  case 59:
+    return ";";
+  case 60:
+    return "<";
+  case 61:
+    return "=";
+  case 62:
+    return ">";
+  case 63:
+    return "?";
+  case 64:
+    return "@";
+  case 65:
+    return "A";
+  case 66:
+    return "B";
+  case 67:
+    return "C";
+  case 68:
+    return "D";
+  case 69:
+    return "E";
+  case 70:
+    return "F";
+  case 71:
+    return "G";
+  case 72:
+    return "H";
+  case 73:
+    return "I";
+  case 74:
+    return "J";
+  case 75:
+    return "K";
+  case 76:
+    return "L";
+  case 77:
+    return "M";
+  case 78:
+    return "N";
+  case 79:
+    return "O";
+  case 80:
+    return "P";
+  case 81:
+    return "Q";
+  case 82:
+    return "R";
+  case 83:
+    return "S";
+  case 84:
+    return "T";
+  case 85:
+    return "U";
+  case 86:
+    return "V";
+  case 87:
+    return "W";
+  case 88:
+    return "X";
+  case 89:
+    return "Y";
+  case 90:
+    return "Z";
+  case 91:
+    return "[";
+  case 92:
+    return "\\\\";
+  case 93:
+    return "]";
+  case 94:
+    return "^";
+  case 95:
+    return "_";
+  case 96:
+    return "`";
+  case 97:
+    return "a";
+  case 98:
+    return "b";
+  case 99:
+    return "c";
+  case 100:
+    return "d";
+  case 101:
+    return "e";
+  case 102:
+    return "f";
+  case 103:
+    return "g";
+  case 104:
+    return "h";
+  case 105:
+    return "i";
+  case 106:
+    return "j";
+  case 107:
+    return "k";
+  case 108:
+    return "l";
+  case 109:
+    return "m";
+  case 110:
+    return "n";
+  case 111:
+    return "o";
+  case 112:
+    return "p";
+  case 113:
+    return "q";
+  case 114:
+    return "r";
+  case 115:
+    return "s";
+  case 116:
+    return "t";
+  case 117:
+    return "u";
+  case 118:
+    return "v";
+  case 119:
+    return "w";
+  case 120:
+    return "x";
+  case 121:
+    return "y";
+  case 122:
+    return "z";
+  case 123:
+    return "{";
+  case 124:
+    return "|";
+  case 125:
+    return "}";
+  case 126:
+    return "~";
+  case 127:
+    return "\\x7F";
+  case 128:
+    return "\\x80";
+  case 129:
+    return "\\x81";
+  case 130:
+    return "\\x82";
+  case 131:
+    return "\\x83";
+  case 132:
+    return "\\x84";
+  case 133:
+    return "\\x85";
+  case 134:
+    return "\\x86";
+  case 135:
+    return "\\x87";
+  case 136:
+    return "\\x88";
+  case 137:
+    return "\\x89";
+  case 138:
+    return "\\x8A";
+  case 139:
+    return "\\x8B";
+  case 140:
+    return "\\x8C";
+  case 141:
+    return "\\x8D";
+  case 142:
+    return "\\x8E";
+  case 143:
+    return "\\x8F";
+  case 144:
+    return "\\x90";
+  case 145:
+    return "\\x91";
+  case 146:
+    return "\\x92";
+  case 147:
+    return "\\x93";
+  case 148:
+    return "\\x94";
+  case 149:
+    return "\\x95";
+  case 150:
+    return "\\x96";
+  case 151:
+    return "\\x97";
+  case 152:
+    return "\\x98";
+  case 153:
+    return "\\x99";
+  case 154:
+    return "\\x9A";
+  case 155:
+    return "\\x9B";
+  case 156:
+    return "\\x9C";
+  case 157:
+    return "\\x9D";
+  case 158:
+    return "\\x9E";
+  case 159:
+    return "\\x9F";
+  case 160:
+    return "\\xA0";
+  case 161:
+    return "\\xA1";
+  case 162:
+    return "\\xA2";
+  case 163:
+    return "\\xA3";
+  case 164:
+    return "\\xA4";
+  case 165:
+    return "\\xA5";
+  case 166:
+    return "\\xA6";
+  case 167:
+    return "\\xA7";
+  case 168:
+    return "\\xA8";
+  case 169:
+    return "\\xA9";
+  case 170:
+    return "\\xAA";
+  case 171:
+    return "\\xAB";
+  case 172:
+    return "\\xAC";
+  case 173:
+    return "\\xAD";
+  case 174:
+    return "\\xAE";
+  case 175:
+    return "\\xAF";
+  case 176:
+    return "\\xB0";
+  case 177:
+    return "\\xB1";
+  case 178:
+    return "\\xB2";
+  case 179:
+    return "\\xB3";
+  case 180:
+    return "\\xB4";
+  case 181:
+    return "\\xB5";
+  case 182:
+    return "\\xB6";
+  case 183:
+    return "\\xB7";
+  case 184:
+    return "\\xB8";
+  case 185:
+    return "\\xB9";
+  case 186:
+    return "\\xBA";
+  case 187:
+    return "\\xBB";
+  case 188:
+    return "\\xBC";
+  case 189:
+    return "\\xBD";
+  case 190:
+    return "\\xBE";
+  case 191:
+    return "\\xBF";
+  case 192:
+    return "\\xC0";
+  case 193:
+    return "\\xC1";
+  case 194:
+    return "\\xC2";
+  case 195:
+    return "\\xC3";
+  case 196:
+    return "\\xC4";
+  case 197:
+    return "\\xC5";
+  case 198:
+    return "\\xC6";
+  case 199:
+    return "\\xC7";
+  case 200:
+    return "\\xC8";
+  case 201:
+    return "\\xC9";
+  case 202:
+    return "\\xCA";
+  case 203:
+    return "\\xCB";
+  case 204:
+    return "\\xCC";
+  case 205:
+    return "\\xCD";
+  case 206:
+    return "\\xCE";
+  case 207:
+    return "\\xCF";
+  case 208:
+    return "\\xD0";
+  case 209:
+    return "\\xD1";
+  case 210:
+    return "\\xD2";
+  case 211:
+    return "\\xD3";
+  case 212:
+    return "\\xD4";
+  case 213:
+    return "\\xD5";
+  case 214:
+    return "\\xD6";
+  case 215:
+    return "\\xD7";
+  case 216:
+    return "\\xD8";
+  case 217:
+    return "\\xD9";
+  case 218:
+    return "\\xDA";
+  case 219:
+    return "\\xDB";
+  case 220:
+    return "\\xDC";
+  case 221:
+    return "\\xDD";
+  case 222:
+    return "\\xDE";
+  case 223:
+    return "\\xDF";
+  case 224:
+    return "\\xE0";
+  case 225:
+    return "\\xE1";
+  case 226:
+    return "\\xE2";
+  case 227:
+    return "\\xE3";
+  case 228:
+    return "\\xE4";
+  case 229:
+    return "\\xE5";
+  case 230:
+    return "\\xE6";
+  case 231:
+    return "\\xE7";
+  case 232:
+    return "\\xE8";
+  case 233:
+    return "\\xE9";
+  case 234:
+    return "\\xEA";
+  case 235:
+    return "\\xEB";
+  case 236:
+    return "\\xEC";
+  case 237:
+    return "\\xED";
+  case 238:
+    return "\\xEE";
+  case 239:
+    return "\\xEF";
+  case 240:
+    return "\\xF0";
+  case 241:
+    return "\\xF1";
+  case 242:
+    return "\\xF2";
+  case 243:
+    return "\\xF3";
+  case 244:
+    return "\\xF4";
+  case 245:
+    return "\\xF5";
+  case 246:
+    return "\\xF6";
+  case 247:
+    return "\\xF7";
+  case 248:
+    return "\\xF8";
+  case 249:
+    return "\\xF9";
+  case 250:
+    return "\\xFA";
+  case 251:
+    return "\\xFB";
+  case 252:
+    return "\\xFC";
+  case 253:
+    return "\\xFD";
+  case 254:
+    return "\\xFE";
+  case 255:
+    return "\\xFF";
+  default:
+    assert(0); /* never gets here */
+    return "dead code";
+  }
+  assert(0); /* never gets here */
+}
+
+#endif /* XML_DTD */
+
+static unsigned long
+getDebugLevel(const char *variableName, unsigned long defaultDebugLevel) {
+  const char *const valueOrNull = getenv(variableName);
+  if (valueOrNull == NULL) {
+    return defaultDebugLevel;
+  }
+  const char *const value = valueOrNull;
+
+  errno = 0;
+  char *afterValue = (char *)value;
+  unsigned long debugLevel = strtoul(value, &afterValue, 10);
+  if ((errno != 0) || (afterValue[0] != '\0')) {
+    errno = 0;
+    return defaultDebugLevel;
+  }
+
+  return debugLevel;
+}
diff --git a/Modules/expat/xmlrole.c b/Modules/expat/xmlrole.c
index 4d3e3e86e9e864..08173b0fd541d2 100644
--- a/Modules/expat/xmlrole.c
+++ b/Modules/expat/xmlrole.c
@@ -7,7 +7,14 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2006 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2002-2003 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2005-2009 Steven Solie <ssolie at users.sourceforge.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -34,11 +41,9 @@
 
 #ifdef _WIN32
 #  include "winconfig.h"
-#else
-#  ifdef HAVE_EXPAT_CONFIG_H
-#    include <expat_config.h>
-#  endif
-#endif /* ndef _WIN32 */
+#endif
+
+#include <expat_config.h>
 
 #include "expat_external.h"
 #include "internal.h"
@@ -1220,6 +1225,8 @@ common(PROLOG_STATE *state, int tok) {
 #ifdef XML_DTD
   if (! state->documentEntity && tok == XML_TOK_PARAM_ENTITY_REF)
     return XML_ROLE_INNER_PARAM_ENTITY_REF;
+#else
+  UNUSED_P(tok);
 #endif
   state->handler = error;
   return XML_ROLE_ERROR;
diff --git a/Modules/expat/xmlrole.h b/Modules/expat/xmlrole.h
index 036aba64fd29c6..d6e1fa150a108a 100644
--- a/Modules/expat/xmlrole.h
+++ b/Modules/expat/xmlrole.h
@@ -7,7 +7,10 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/xmltok.c b/Modules/expat/xmltok.c
index 54cfedb85c28c4..f2b6b406067ea9 100644
--- a/Modules/expat/xmltok.c
+++ b/Modules/expat/xmltok.c
@@ -7,7 +7,19 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2001-2003 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2016 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2005-2009 Steven Solie <ssolie at users.sourceforge.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2016      Pascal Cuoq <cuoq at trust-in-soft.com>
+   Copyright (c) 2016      Don Lewis <truckman at apache.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2017      Alexander Bluhm <alexander.bluhm at gmx.net>
+   Copyright (c) 2017      Benbuck Nason <bnason at netflix.com>
+   Copyright (c) 2017      Jos? Guti?rrez de la Concha <jose at zeroc.com>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -30,26 +42,16 @@
    USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#ifdef _WIN32
-#  include "winconfig.h"
-#else
-#  ifdef HAVE_EXPAT_CONFIG_H
-#    include <expat_config.h>
-#  endif
-#endif /* ndef _WIN32 */
-
 #include <stddef.h>
 #include <string.h> /* memcpy */
+#include <stdbool.h>
 
-#if defined(_MSC_VER) && (_MSC_VER <= 1700)
-/* for vs2012/11.0/1700 and earlier Visual Studio compilers */
-#  define bool int
-#  define false 0
-#  define true 1
-#else
-#  include <stdbool.h>
+#ifdef _WIN32
+#  include "winconfig.h"
 #endif
 
+#include <expat_config.h>
+
 #include "expat_external.h"
 #include "internal.h"
 #include "xmltok.h"
@@ -269,8 +271,14 @@ sb_byteToAscii(const ENCODING *enc, const char *p) {
 
 #define IS_NAME_CHAR(enc, p, n) (AS_NORMAL_ENCODING(enc)->isName##n(enc, p))
 #define IS_NMSTRT_CHAR(enc, p, n) (AS_NORMAL_ENCODING(enc)->isNmstrt##n(enc, p))
-#define IS_INVALID_CHAR(enc, p, n)                                             \
-  (AS_NORMAL_ENCODING(enc)->isInvalid##n(enc, p))
+#ifdef XML_MIN_SIZE
+#  define IS_INVALID_CHAR(enc, p, n)                                           \
+    (AS_NORMAL_ENCODING(enc)->isInvalid##n                                     \
+     && AS_NORMAL_ENCODING(enc)->isInvalid##n(enc, p))
+#else
+#  define IS_INVALID_CHAR(enc, p, n)                                           \
+    (AS_NORMAL_ENCODING(enc)->isInvalid##n(enc, p))
+#endif
 
 #ifdef XML_MIN_SIZE
 #  define IS_NAME_CHAR_MINBPC(enc, p)                                          \
@@ -589,13 +597,13 @@ static const struct normal_encoding ascii_encoding
 static int PTRFASTCALL
 unicode_byte_type(char hi, char lo) {
   switch ((unsigned char)hi) {
-  /* 0xD800?0xDBFF first 16-bit code unit or high surrogate (W1) */
+  /* 0xD800-0xDBFF first 16-bit code unit or high surrogate (W1) */
   case 0xD8:
   case 0xD9:
   case 0xDA:
   case 0xDB:
     return BT_LEAD4;
-  /* 0xDC00?0xDFFF second 16-bit code unit or low surrogate (W2) */
+  /* 0xDC00-0xDFFF second 16-bit code unit or low surrogate (W2) */
   case 0xDC:
   case 0xDD:
   case 0xDE:
diff --git a/Modules/expat/xmltok.h b/Modules/expat/xmltok.h
index 2adbf5307befae..6f630c2f9ba96d 100644
--- a/Modules/expat/xmltok.h
+++ b/Modules/expat/xmltok.h
@@ -7,7 +7,11 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002-2005 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2016-2017 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/xmltok_impl.c b/Modules/expat/xmltok_impl.c
index c209221cd79d13..0430591b42636e 100644
--- a/Modules/expat/xmltok_impl.c
+++ b/Modules/expat/xmltok_impl.c
@@ -1,4 +1,4 @@
-/* This file is included!
+/* This file is included (from xmltok.c, 1-3 times depending on XML_MIN_SIZE)!
                             __  __            _
                          ___\ \/ /_ __   __ _| |_
                         / _ \\  /| '_ \ / _` | __|
@@ -7,7 +7,15 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002-2016 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2018      Benjamin Peterson <benjamin at python.org>
+   Copyright (c) 2018      Anton Maklakov <antmak.pub at gmail.com>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
+   Copyright (c) 2020      Boris Kolpackov <boris at codesynthesis.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -32,7 +40,7 @@
 
 #ifdef XML_TOK_IMPL_C
 
-#  ifndef IS_INVALID_CHAR
+#  ifndef IS_INVALID_CHAR // i.e. for UTF-16 and XML_MIN_SIZE not defined
 #    define IS_INVALID_CHAR(enc, ptr, n) (0)
 #  endif
 
@@ -1768,13 +1776,14 @@ PREFIX(updatePosition)(const ENCODING *enc, const char *ptr, const char *end,
 #  define LEAD_CASE(n)                                                         \
   case BT_LEAD##n:                                                             \
     ptr += n;                                                                  \
+    pos->columnNumber++;                                                       \
     break;
       LEAD_CASE(2)
       LEAD_CASE(3)
       LEAD_CASE(4)
 #  undef LEAD_CASE
     case BT_LF:
-      pos->columnNumber = (XML_Size)-1;
+      pos->columnNumber = 0;
       pos->lineNumber++;
       ptr += MINBPC(enc);
       break;
@@ -1783,13 +1792,13 @@ PREFIX(updatePosition)(const ENCODING *enc, const char *ptr, const char *end,
       ptr += MINBPC(enc);
       if (HAS_CHAR(enc, ptr, end) && BYTE_TYPE(enc, ptr) == BT_LF)
         ptr += MINBPC(enc);
-      pos->columnNumber = (XML_Size)-1;
+      pos->columnNumber = 0;
       break;
     default:
       ptr += MINBPC(enc);
+      pos->columnNumber++;
       break;
     }
-    pos->columnNumber++;
   }
 }
 
diff --git a/Modules/expat/xmltok_impl.h b/Modules/expat/xmltok_impl.h
index e925dbc7e2c833..c518aada013df2 100644
--- a/Modules/expat/xmltok_impl.h
+++ b/Modules/expat/xmltok_impl.h
@@ -7,7 +7,8 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2017-2019 Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/xmltok_ns.c b/Modules/expat/xmltok_ns.c
index e1b46a7c04c4ed..5fd83922359400 100644
--- a/Modules/expat/xmltok_ns.c
+++ b/Modules/expat/xmltok_ns.c
@@ -7,7 +7,11 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002-2006 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -89,7 +93,7 @@ NS(XmlInitEncoding)(INIT_ENCODING *p, const ENCODING **encPtr,
 static const ENCODING *
 NS(findEncoding)(const ENCODING *enc, const char *ptr, const char *end) {
 #  define ENCODING_MAX 128
-  char buf[ENCODING_MAX] = {0};
+  char buf[ENCODING_MAX];
   char *p = buf;
   int i;
   XmlUtf8Convert(enc, &ptr, end, &p, p + ENCODING_MAX - 1);


From webhook-mailer at python.org  Sun Aug 29 10:36:45 2021
From: webhook-mailer at python.org (ambv)
Date: Sun, 29 Aug 2021 14:36:45 -0000
Subject: [Python-checkins] bpo-44394: Update libexpat copy to 2.4.1
 (GH-26945) (GH-28032)
Message-ID: <mailman.1239.1630247807.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/007221a43e566db08c0c5c00756d80dfd9dccafe
commit: 007221a43e566db08c0c5c00756d80dfd9dccafe
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-29T16:36:36+02:00
summary:

bpo-44394: Update libexpat copy to 2.4.1 (GH-26945) (GH-28032)

Update the vendored copy of libexpat to 2.4.1 (from 2.2.8) to get the
fix for the CVE-2013-0340 "Billion Laughs" vulnerability. This copy
is most used on Windows and macOS.

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 3fc5d84046ddbd66abac5b598956ea34605a4e5d)

Co-authored-by: Victor Stinner <vstinner at python.org>

files:
A Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst
M Doc/library/xml.rst
M Modules/expat/COPYING
M Modules/expat/ascii.h
M Modules/expat/asciitab.h
M Modules/expat/expat.h
M Modules/expat/expat_external.h
M Modules/expat/iasciitab.h
M Modules/expat/internal.h
M Modules/expat/latin1tab.h
M Modules/expat/nametab.h
M Modules/expat/siphash.h
M Modules/expat/utf8tab.h
M Modules/expat/winconfig.h
M Modules/expat/xmlparse.c
M Modules/expat/xmlrole.c
M Modules/expat/xmlrole.h
M Modules/expat/xmltok.c
M Modules/expat/xmltok.h
M Modules/expat/xmltok_impl.c
M Modules/expat/xmltok_impl.h
M Modules/expat/xmltok_ns.c

diff --git a/Doc/library/xml.rst b/Doc/library/xml.rst
index 1981cab7cd438..e3b3516296114 100644
--- a/Doc/library/xml.rst
+++ b/Doc/library/xml.rst
@@ -60,22 +60,26 @@ circumvent firewalls.
 The following table gives an overview of the known attacks and whether
 the various modules are vulnerable to them.
 
-=========================  ==============   ===============   ==============   ==============   ==============
-kind                       sax              etree             minidom          pulldom          xmlrpc
-=========================  ==============   ===============   ==============   ==============   ==============
-billion laughs             **Vulnerable**   **Vulnerable**    **Vulnerable**   **Vulnerable**   **Vulnerable**
-quadratic blowup           **Vulnerable**   **Vulnerable**    **Vulnerable**   **Vulnerable**   **Vulnerable**
-external entity expansion  Safe (4)         Safe    (1)       Safe    (2)      Safe (4)         Safe    (3)
-`DTD`_ retrieval           Safe (4)         Safe              Safe             Safe (4)         Safe
-decompression bomb         Safe             Safe              Safe             Safe             **Vulnerable**
-=========================  ==============   ===============   ==============   ==============   ==============
-
-1. :mod:`xml.etree.ElementTree` doesn't expand external entities and raises a
+=========================  ==================  ==================  ==================  ==================  ==================
+kind                       sax                 etree               minidom             pulldom             xmlrpc
+=========================  ==================  ==================  ==================  ==================  ==================
+billion laughs             **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)
+quadratic blowup           **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)
+external entity expansion  Safe (5)            Safe (2)            Safe (3)            Safe (5)            Safe (4)
+`DTD`_ retrieval           Safe (5)            Safe                Safe                Safe (5)            Safe
+decompression bomb         Safe                Safe                Safe                Safe                **Vulnerable**
+=========================  ==================  ==================  ==================  ==================  ==================
+
+1. Expat 2.4.1 and newer is not vulnerable to the "billion laughs" and
+   "quadratic blowup" vulnerabilities. Items still listed as vulnerable due to
+   potential reliance on system-provided libraries. Check
+   :data:`pyexpat.EXPAT_VERSION`.
+2. :mod:`xml.etree.ElementTree` doesn't expand external entities and raises a
    :exc:`ParserError` when an entity occurs.
-2. :mod:`xml.dom.minidom` doesn't expand external entities and simply returns
+3. :mod:`xml.dom.minidom` doesn't expand external entities and simply returns
    the unexpanded entity verbatim.
-3. :mod:`xmlrpclib` doesn't expand external entities and omits them.
-4. Since Python 3.7.1, external general entities are no longer processed by
+4. :mod:`xmlrpclib` doesn't expand external entities and omits them.
+5. Since Python 3.7.1, external general entities are no longer processed by
    default.
 
 
diff --git a/Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst b/Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst
new file mode 100644
index 0000000000000..e32563d2535c7
--- /dev/null
+++ b/Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst
@@ -0,0 +1,3 @@
+Update the vendored copy of libexpat to 2.4.1 (from 2.2.8) to get the fix
+for the CVE-2013-0340 "Billion Laughs" vulnerability. This copy is most used
+on Windows and macOS.
diff --git a/Modules/expat/COPYING b/Modules/expat/COPYING
index 8d288f0f28fdd..3c0142e71c8d4 100644
--- a/Modules/expat/COPYING
+++ b/Modules/expat/COPYING
@@ -1,5 +1,5 @@
 Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
-Copyright (c) 2001-2017 Expat maintainers
+Copyright (c) 2001-2019 Expat maintainers
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/Modules/expat/ascii.h b/Modules/expat/ascii.h
index c3587e57332bf..1f594d2e54b4d 100644
--- a/Modules/expat/ascii.h
+++ b/Modules/expat/ascii.h
@@ -6,8 +6,11 @@
                         \___/_/\_\ .__/ \__,_|\__|
                                  |_| XML parser
 
-   Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 1999-2000 Thai Open Source Software Center Ltd
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2007      Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/asciitab.h b/Modules/expat/asciitab.h
index 63b1d1b4482ef..af766fb24785e 100644
--- a/Modules/expat/asciitab.h
+++ b/Modules/expat/asciitab.h
@@ -7,7 +7,9 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/expat.h b/Modules/expat/expat.h
index 6c8eb1fda4a30..b7d6d354801b3 100644
--- a/Modules/expat/expat.h
+++ b/Modules/expat/expat.h
@@ -7,7 +7,14 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2000-2005 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2001-2002 Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2016 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2016      Cristian Rodr?guez <crrodriguez at opensuse.org>
+   Copyright (c) 2016      Thomas Beutlich <tc at tbeu.de>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -115,7 +122,11 @@ enum XML_Error {
   XML_ERROR_RESERVED_PREFIX_XMLNS,
   XML_ERROR_RESERVED_NAMESPACE_URI,
   /* Added in 2.2.1. */
-  XML_ERROR_INVALID_ARGUMENT
+  XML_ERROR_INVALID_ARGUMENT,
+  /* Added in 2.3.0. */
+  XML_ERROR_NO_BUFFER,
+  /* Added in 2.4.0. */
+  XML_ERROR_AMPLIFICATION_LIMIT_BREACH
 };
 
 enum XML_Content_Type {
@@ -318,7 +329,7 @@ typedef void(XMLCALL *XML_EndDoctypeDeclHandler)(void *userData);
 
    For internal entities (<!ENTITY foo "bar">), value will
    be non-NULL and systemId, publicID, and notationName will be NULL.
-   The value string is NOT nul-terminated; the length is provided in
+   The value string is NOT null-terminated; the length is provided in
    the value_length argument. Since it is legal to have zero-length
    values, do not use this argument to test for internal entities.
 
@@ -513,7 +524,7 @@ typedef struct {
    Otherwise it must return XML_STATUS_ERROR.
 
    If info does not describe a suitable encoding, then the parser will
-   return an XML_UNKNOWN_ENCODING error.
+   return an XML_ERROR_UNKNOWN_ENCODING error.
 */
 typedef int(XMLCALL *XML_UnknownEncodingHandler)(void *encodingHandlerData,
                                                  const XML_Char *name,
@@ -707,7 +718,7 @@ XML_GetBase(XML_Parser parser);
 /* Returns the number of the attribute/value pairs passed in last call
    to the XML_StartElementHandler that were specified in the start-tag
    rather than defaulted. Each attribute/value pair counts as 2; thus
-   this correspondds to an index into the atts array passed to the
+   this corresponds to an index into the atts array passed to the
    XML_StartElementHandler.  Returns -1 if parser == NULL.
 */
 XMLPARSEAPI(int)
@@ -716,7 +727,7 @@ XML_GetSpecifiedAttributeCount(XML_Parser parser);
 /* Returns the index of the ID attribute passed in the last call to
    XML_StartElementHandler, or -1 if there is no ID attribute or
    parser == NULL.  Each attribute/value pair counts as 2; thus this
-   correspondds to an index into the atts array passed to the
+   corresponds to an index into the atts array passed to the
    XML_StartElementHandler.
 */
 XMLPARSEAPI(int)
@@ -997,7 +1008,10 @@ enum XML_FeatureEnum {
   XML_FEATURE_SIZEOF_XML_LCHAR,
   XML_FEATURE_NS,
   XML_FEATURE_LARGE_SIZE,
-  XML_FEATURE_ATTR_INFO
+  XML_FEATURE_ATTR_INFO,
+  /* Added in Expat 2.4.0. */
+  XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT,
+  XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT
   /* Additional features must be added to the end of this enum. */
 };
 
@@ -1010,12 +1024,24 @@ typedef struct {
 XMLPARSEAPI(const XML_Feature *)
 XML_GetFeatureList(void);
 
+#ifdef XML_DTD
+/* Added in Expat 2.4.0. */
+XMLPARSEAPI(XML_Bool)
+XML_SetBillionLaughsAttackProtectionMaximumAmplification(
+    XML_Parser parser, float maximumAmplificationFactor);
+
+/* Added in Expat 2.4.0. */
+XMLPARSEAPI(XML_Bool)
+XML_SetBillionLaughsAttackProtectionActivationThreshold(
+    XML_Parser parser, unsigned long long activationThresholdBytes);
+#endif
+
 /* Expat follows the semantic versioning convention.
    See http://semver.org.
 */
 #define XML_MAJOR_VERSION 2
-#define XML_MINOR_VERSION 2
-#define XML_MICRO_VERSION 8
+#define XML_MINOR_VERSION 4
+#define XML_MICRO_VERSION 1
 
 #ifdef __cplusplus
 }
diff --git a/Modules/expat/expat_external.h b/Modules/expat/expat_external.h
index f2b75dda8e279..12c560e14716f 100644
--- a/Modules/expat/expat_external.h
+++ b/Modules/expat/expat_external.h
@@ -7,7 +7,14 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2000-2004 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2001-2002 Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2006 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2016      Cristian Rodr?guez <crrodriguez at opensuse.org>
+   Copyright (c) 2016-2019 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2018      Yury Gribov <tetra2005 at gmail.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/iasciitab.h b/Modules/expat/iasciitab.h
index ea97cfcf678e0..5d8646f2a318b 100644
--- a/Modules/expat/iasciitab.h
+++ b/Modules/expat/iasciitab.h
@@ -7,7 +7,9 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/internal.h b/Modules/expat/internal.h
index 60913dab762f8..444eba0fb0317 100644
--- a/Modules/expat/internal.h
+++ b/Modules/expat/internal.h
@@ -25,8 +25,12 @@
                         \___/_/\_\ .__/ \__,_|\__|
                                  |_| XML parser
 
-   Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2002-2003 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002-2006 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2003      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2018      Yury Gribov <tetra2005 at gmail.com>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -101,22 +105,58 @@
 #  endif
 #endif
 
+#include <limits.h> // ULONG_MAX
+
+#if defined(_WIN32) && ! defined(__USE_MINGW_ANSI_STDIO)
+#  define EXPAT_FMT_ULL(midpart) "%" midpart "I64u"
+#  if defined(_WIN64) // Note: modifiers "td" and "zu" do not work for MinGW
+#    define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "I64d"
+#    define EXPAT_FMT_SIZE_T(midpart) "%" midpart "I64u"
+#  else
+#    define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "d"
+#    define EXPAT_FMT_SIZE_T(midpart) "%" midpart "u"
+#  endif
+#else
+#  define EXPAT_FMT_ULL(midpart) "%" midpart "llu"
+#  if ! defined(ULONG_MAX)
+#    error Compiler did not define ULONG_MAX for us
+#  elif ULONG_MAX == 18446744073709551615u // 2^64-1
+#    define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "ld"
+#    define EXPAT_FMT_SIZE_T(midpart) "%" midpart "lu"
+#  else
+#    define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "d"
+#    define EXPAT_FMT_SIZE_T(midpart) "%" midpart "u"
+#  endif
+#endif
+
 #ifndef UNUSED_P
 #  define UNUSED_P(p) (void)p
 #endif
 
+/* NOTE BEGIN If you ever patch these defaults to greater values
+              for non-attack XML payload in your environment,
+              please file a bug report with libexpat.  Thank you!
+*/
+#define EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT   \
+  100.0f
+#define EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT    \
+  8388608 // 8 MiB, 2^23
+/* NOTE END */
+
+#include "expat.h" // so we can use type XML_Parser below
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifdef XML_ENABLE_VISIBILITY
-#  if XML_ENABLE_VISIBILITY
-__attribute__((visibility("default")))
-#  endif
+void _INTERNAL_trim_to_complete_utf8_characters(const char *from,
+                                                const char **fromLimRef);
+
+#if defined(XML_DTD)
+unsigned long long testingAccountingGetCountBytesDirect(XML_Parser parser);
+unsigned long long testingAccountingGetCountBytesIndirect(XML_Parser parser);
+const char *unsignedCharToPrintable(unsigned char c);
 #endif
-void
-_INTERNAL_trim_to_complete_utf8_characters(const char *from,
-                                           const char **fromLimRef);
 
 #ifdef __cplusplus
 }
diff --git a/Modules/expat/latin1tab.h b/Modules/expat/latin1tab.h
index 6f916041355a8..b681d278af656 100644
--- a/Modules/expat/latin1tab.h
+++ b/Modules/expat/latin1tab.h
@@ -7,7 +7,9 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/nametab.h b/Modules/expat/nametab.h
index 3681df348eebd..63485446b9672 100644
--- a/Modules/expat/nametab.h
+++ b/Modules/expat/nametab.h
@@ -6,8 +6,8 @@
                         \___/_/\_\ .__/ \__,_|\__|
                                  |_| XML parser
 
-   Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000 Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2017 Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/siphash.h b/Modules/expat/siphash.h
index bfee65a332f1b..e5406d7ee9eb5 100644
--- a/Modules/expat/siphash.h
+++ b/Modules/expat/siphash.h
@@ -11,6 +11,9 @@
  * --------------------------------------------------------------------------
  * HISTORY:
  *
+ * 2020-10-03  (Sebastian Pipping)
+ *   - Drop support for Visual Studio 9.0/2008 and earlier
+ *
  * 2019-08-03  (Sebastian Pipping)
  *   - Mark part of sip24_valid as to be excluded from clang-format
  *   - Re-format code using clang-format 9
@@ -96,15 +99,7 @@
 #define SIPHASH_H
 
 #include <stddef.h> /* size_t */
-
-#if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER < 1600)
-/* For vs2003/7.1 up to vs2008/9.0; _MSC_VER 1600 is vs2010/10.0 */
-typedef unsigned __int8 uint8_t;
-typedef unsigned __int32 uint32_t;
-typedef unsigned __int64 uint64_t;
-#else
-#  include <stdint.h> /* uint64_t uint32_t uint8_t */
-#endif
+#include <stdint.h> /* uint64_t uint32_t uint8_t */
 
 /*
  * Workaround to not require a C++11 compiler for using ULL suffix
diff --git a/Modules/expat/utf8tab.h b/Modules/expat/utf8tab.h
index a22986acbb952..88efcf91cc16a 100644
--- a/Modules/expat/utf8tab.h
+++ b/Modules/expat/utf8tab.h
@@ -7,7 +7,9 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/winconfig.h b/Modules/expat/winconfig.h
index 562a4a82dc1d6..2ecd61b5b9482 100644
--- a/Modules/expat/winconfig.h
+++ b/Modules/expat/winconfig.h
@@ -6,8 +6,10 @@
                         \___/_/\_\ .__/ \__,_|\__|
                                  |_| XML parser
 
-   Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2005      Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2017-2021 Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -40,17 +42,4 @@
 #include <memory.h>
 #include <string.h>
 
-#if defined(HAVE_EXPAT_CONFIG_H) /* e.g. MinGW */
-#  include <expat_config.h>
-#else /* !defined(HAVE_EXPAT_CONFIG_H) */
-
-#  define XML_NS 1
-#  define XML_DTD 1
-#  define XML_CONTEXT_BYTES 1024
-
-/* we will assume all Windows platforms are little endian */
-#  define BYTEORDER 1234
-
-#endif /* !defined(HAVE_EXPAT_CONFIG_H) */
-
 #endif /* ndef WINCONFIG_H */
diff --git a/Modules/expat/xmlparse.c b/Modules/expat/xmlparse.c
index e740f0e19c7d4..5ba56eaea6357 100644
--- a/Modules/expat/xmlparse.c
+++ b/Modules/expat/xmlparse.c
@@ -1,4 +1,4 @@
-/* f2d0ab6d1d4422a08cf1cf3bbdfba96b49dea42fb5ff4615e03a2a25c306e769 (2.2.8+)
+/* 8539b9040d9d901366a62560a064af7cb99811335784b363abc039c5b0ebc416 (2.4.1+)
                             __  __            _
                          ___\ \/ /_ __   __ _| |_
                         / _ \\  /| '_ \ / _` | __|
@@ -7,7 +7,31 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2000-2006 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2001-2002 Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2016 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2005-2009 Steven Solie <ssolie at users.sourceforge.net>
+   Copyright (c) 2016      Eric Rahm <erahm at mozilla.com>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2016      Gaurav <g.gupta at samsung.com>
+   Copyright (c) 2016      Thomas Beutlich <tc at tbeu.de>
+   Copyright (c) 2016      Gustavo Grieco <gustavo.grieco at imag.fr>
+   Copyright (c) 2016      Pascal Cuoq <cuoq at trust-in-soft.com>
+   Copyright (c) 2016      Ed Schouten <ed at nuxi.nl>
+   Copyright (c) 2017-2018 Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2017      V?clav Slav?k <vaclav at slavik.io>
+   Copyright (c) 2017      Viktor Szakats <commit at vsz.me>
+   Copyright (c) 2017      Chanho Park <chanho61.park at samsung.com>
+   Copyright (c) 2017      Rolf Eike Beer <eike at sf-mail.de>
+   Copyright (c) 2017      Hans Wennborg <hans at chromium.org>
+   Copyright (c) 2018      Anton Maklakov <antmak.pub at gmail.com>
+   Copyright (c) 2018      Benjamin Peterson <benjamin at python.org>
+   Copyright (c) 2018      Marco Maggi <marco.maggi-ipsu at poste.it>
+   Copyright (c) 2018      Mariusz Zaborski <oshogbo at vexillium.org>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
+   Copyright (c) 2019-2020 Ben Wagner <bungeman at chromium.org>
+   Copyright (c) 2019      Vadim Zeitlin <vadim at zeitlins.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -36,7 +60,9 @@
 
 #ifdef _WIN32
 /* force stdlib to define rand_s() */
-#  define _CRT_RAND_S
+#  if ! defined(_CRT_RAND_S)
+#    define _CRT_RAND_S
+#  endif
 #endif
 
 #include <stddef.h>
@@ -45,6 +71,8 @@
 #include <limits.h> /* UINT_MAX */
 #include <stdio.h>  /* fprintf */
 #include <stdlib.h> /* getenv, rand_s */
+#include <stdint.h> /* uintptr_t */
+#include <math.h>   /* isnan */
 
 #ifdef _WIN32
 #  define getpid GetCurrentProcessId
@@ -60,9 +88,9 @@
 
 #ifdef _WIN32
 #  include "winconfig.h"
-#elif defined(HAVE_EXPAT_CONFIG_H)
-#  include <expat_config.h>
-#endif /* ndef _WIN32 */
+#endif
+
+#include <expat_config.h>
 
 #include "ascii.h"
 #include "expat.h"
@@ -97,14 +125,14 @@
     enabled.  For end user security, that is probably not what you want. \
     \
     Your options include: \
-      * Linux + glibc >=2.25 (getrandom): HAVE_GETRANDOM, \
-      * Linux + glibc <2.25 (syscall SYS_getrandom): HAVE_SYSCALL_GETRANDOM, \
+      * Linux >=3.17 + glibc >=2.25 (getrandom): HAVE_GETRANDOM, \
+      * Linux >=3.17 + glibc (including <2.25) (syscall SYS_getrandom): HAVE_SYSCALL_GETRANDOM, \
       * BSD / macOS >=10.7 (arc4random_buf): HAVE_ARC4RANDOM_BUF, \
-      * BSD / macOS <10.7 (arc4random): HAVE_ARC4RANDOM, \
+      * BSD / macOS (including <10.7) (arc4random): HAVE_ARC4RANDOM, \
       * libbsd (arc4random_buf): HAVE_ARC4RANDOM_BUF + HAVE_LIBBSD, \
       * libbsd (arc4random): HAVE_ARC4RANDOM + HAVE_LIBBSD, \
-      * Linux / BSD / macOS (/dev/urandom): XML_DEV_URANDOM \
-      * Windows (rand_s): _WIN32. \
+      * Linux (including <3.17) / BSD / macOS (including <10.7) (/dev/urandom): XML_DEV_URANDOM, \
+      * Windows >=Vista (rand_s): _WIN32. \
     \
     If insist on not using any of these, bypass this error by defining \
     XML_POOR_ENTROPY; you have been warned. \
@@ -119,9 +147,7 @@
 #  define XmlGetInternalEncoding XmlGetUtf16InternalEncoding
 #  define XmlGetInternalEncodingNS XmlGetUtf16InternalEncodingNS
 #  define XmlEncode XmlUtf16Encode
-/* Using pointer subtraction to convert to integer type. */
-#  define MUST_CONVERT(enc, s)                                                 \
-    (! (enc)->isUtf16 || (((char *)(s) - (char *)NULL) & 1))
+#  define MUST_CONVERT(enc, s) (! (enc)->isUtf16 || (((uintptr_t)(s)) & 1))
 typedef unsigned short ICHAR;
 #else
 #  define XML_ENCODE_MAX XML_UTF8_ENCODE_MAX
@@ -371,6 +397,31 @@ typedef struct open_internal_entity {
   XML_Bool betweenDecl; /* WFC: PE Between Declarations */
 } OPEN_INTERNAL_ENTITY;
 
+enum XML_Account {
+  XML_ACCOUNT_DIRECT,           /* bytes directly passed to the Expat parser */
+  XML_ACCOUNT_ENTITY_EXPANSION, /* intermediate bytes produced during entity
+                                   expansion */
+  XML_ACCOUNT_NONE              /* i.e. do not account, was accounted already */
+};
+
+#ifdef XML_DTD
+typedef unsigned long long XmlBigCount;
+typedef struct accounting {
+  XmlBigCount countBytesDirect;
+  XmlBigCount countBytesIndirect;
+  int debugLevel;
+  float maximumAmplificationFactor; // >=1.0
+  unsigned long long activationThresholdBytes;
+} ACCOUNTING;
+
+typedef struct entity_stats {
+  unsigned int countEverOpened;
+  unsigned int currentDepth;
+  unsigned int maximumDepthSeen;
+  int debugLevel;
+} ENTITY_STATS;
+#endif /* XML_DTD */
+
 typedef enum XML_Error PTRCALL Processor(XML_Parser parser, const char *start,
                                          const char *end, const char **endPtr);
 
@@ -401,16 +452,18 @@ static enum XML_Error initializeEncoding(XML_Parser parser);
 static enum XML_Error doProlog(XML_Parser parser, const ENCODING *enc,
                                const char *s, const char *end, int tok,
                                const char *next, const char **nextPtr,
-                               XML_Bool haveMore, XML_Bool allowClosingDoctype);
+                               XML_Bool haveMore, XML_Bool allowClosingDoctype,
+                               enum XML_Account account);
 static enum XML_Error processInternalEntity(XML_Parser parser, ENTITY *entity,
                                             XML_Bool betweenDecl);
 static enum XML_Error doContent(XML_Parser parser, int startTagLevel,
                                 const ENCODING *enc, const char *start,
                                 const char *end, const char **endPtr,
-                                XML_Bool haveMore);
+                                XML_Bool haveMore, enum XML_Account account);
 static enum XML_Error doCdataSection(XML_Parser parser, const ENCODING *,
                                      const char **startPtr, const char *end,
-                                     const char **nextPtr, XML_Bool haveMore);
+                                     const char **nextPtr, XML_Bool haveMore,
+                                     enum XML_Account account);
 #ifdef XML_DTD
 static enum XML_Error doIgnoreSection(XML_Parser parser, const ENCODING *,
                                       const char **startPtr, const char *end,
@@ -420,7 +473,8 @@ static enum XML_Error doIgnoreSection(XML_Parser parser, const ENCODING *,
 static void freeBindings(XML_Parser parser, BINDING *bindings);
 static enum XML_Error storeAtts(XML_Parser parser, const ENCODING *,
                                 const char *s, TAG_NAME *tagNamePtr,
-                                BINDING **bindingsPtr);
+                                BINDING **bindingsPtr,
+                                enum XML_Account account);
 static enum XML_Error addBinding(XML_Parser parser, PREFIX *prefix,
                                  const ATTRIBUTE_ID *attId, const XML_Char *uri,
                                  BINDING **bindingsPtr);
@@ -429,15 +483,18 @@ static int defineAttribute(ELEMENT_TYPE *type, ATTRIBUTE_ID *, XML_Bool isCdata,
                            XML_Parser parser);
 static enum XML_Error storeAttributeValue(XML_Parser parser, const ENCODING *,
                                           XML_Bool isCdata, const char *,
-                                          const char *, STRING_POOL *);
+                                          const char *, STRING_POOL *,
+                                          enum XML_Account account);
 static enum XML_Error appendAttributeValue(XML_Parser parser, const ENCODING *,
                                            XML_Bool isCdata, const char *,
-                                           const char *, STRING_POOL *);
+                                           const char *, STRING_POOL *,
+                                           enum XML_Account account);
 static ATTRIBUTE_ID *getAttributeId(XML_Parser parser, const ENCODING *enc,
                                     const char *start, const char *end);
 static int setElementTypePrefix(XML_Parser parser, ELEMENT_TYPE *);
 static enum XML_Error storeEntityValue(XML_Parser parser, const ENCODING *enc,
-                                       const char *start, const char *end);
+                                       const char *start, const char *end,
+                                       enum XML_Account account);
 static int reportProcessingInstruction(XML_Parser parser, const ENCODING *enc,
                                        const char *start, const char *end);
 static int reportComment(XML_Parser parser, const ENCODING *enc,
@@ -501,6 +558,34 @@ static XML_Parser parserCreate(const XML_Char *encodingName,
 
 static void parserInit(XML_Parser parser, const XML_Char *encodingName);
 
+#ifdef XML_DTD
+static float accountingGetCurrentAmplification(XML_Parser rootParser);
+static void accountingReportStats(XML_Parser originParser, const char *epilog);
+static void accountingOnAbort(XML_Parser originParser);
+static void accountingReportDiff(XML_Parser rootParser,
+                                 unsigned int levelsAwayFromRootParser,
+                                 const char *before, const char *after,
+                                 ptrdiff_t bytesMore, int source_line,
+                                 enum XML_Account account);
+static XML_Bool accountingDiffTolerated(XML_Parser originParser, int tok,
+                                        const char *before, const char *after,
+                                        int source_line,
+                                        enum XML_Account account);
+
+static void entityTrackingReportStats(XML_Parser parser, ENTITY *entity,
+                                      const char *action, int sourceLine);
+static void entityTrackingOnOpen(XML_Parser parser, ENTITY *entity,
+                                 int sourceLine);
+static void entityTrackingOnClose(XML_Parser parser, ENTITY *entity,
+                                  int sourceLine);
+
+static XML_Parser getRootParserOf(XML_Parser parser,
+                                  unsigned int *outLevelDiff);
+#endif /* XML_DTD */
+
+static unsigned long getDebugLevel(const char *variableName,
+                                   unsigned long defaultDebugLevel);
+
 #define poolStart(pool) ((pool)->start)
 #define poolEnd(pool) ((pool)->ptr)
 #define poolLength(pool) ((pool)->ptr - (pool)->start)
@@ -614,6 +699,10 @@ struct XML_ParserStruct {
   enum XML_ParamEntityParsing m_paramEntityParsing;
 #endif
   unsigned long m_hash_secret_salt;
+#ifdef XML_DTD
+  ACCOUNTING m_accounting;
+  ENTITY_STATS m_entity_stats;
+#endif
 };
 
 #define MALLOC(parser, s) (parser->m_mem.malloc_fcn((s)))
@@ -734,6 +823,15 @@ writeRandomBytes_arc4random(void *target, size_t count) {
 
 #ifdef _WIN32
 
+/* Provide declaration of rand_s() for MinGW-32 (not 64, which has it),
+   as it didn't declare it in its header prior to version 5.3.0 of its
+   runtime package (mingwrt, containing stdlib.h).  The upstream fix
+   was introduced at https://osdn.net/projects/mingw/ticket/39658 . */
+#  if defined(__MINGW32__) && defined(__MINGW32_VERSION)                       \
+      && __MINGW32_VERSION < 5003000L && ! defined(__MINGW64_VERSION_MAJOR)
+__declspec(dllimport) int rand_s(unsigned int *);
+#  endif
+
 /* Obtain entropy on Windows using the rand_s() function which
  * generates cryptographically secure random numbers.  Internally it
  * uses RtlGenRandom API which is present in Windows XP and later.
@@ -789,9 +887,8 @@ gather_time_entropy(void) {
 
 static unsigned long
 ENTROPY_DEBUG(const char *label, unsigned long entropy) {
-  const char *const EXPAT_ENTROPY_DEBUG = getenv("EXPAT_ENTROPY_DEBUG");
-  if (EXPAT_ENTROPY_DEBUG && ! strcmp(EXPAT_ENTROPY_DEBUG, "1")) {
-    fprintf(stderr, "Entropy: %s --> 0x%0*lx (%lu bytes)\n", label,
+  if (getDebugLevel("EXPAT_ENTROPY_DEBUG", 0) >= 1u) {
+    fprintf(stderr, "expat: Entropy: %s --> 0x%0*lx (%lu bytes)\n", label,
             (int)sizeof(entropy) * 2, entropy, (unsigned long)sizeof(entropy));
   }
   return entropy;
@@ -1053,6 +1150,18 @@ parserInit(XML_Parser parser, const XML_Char *encodingName) {
   parser->m_paramEntityParsing = XML_PARAM_ENTITY_PARSING_NEVER;
 #endif
   parser->m_hash_secret_salt = 0;
+
+#ifdef XML_DTD
+  memset(&parser->m_accounting, 0, sizeof(ACCOUNTING));
+  parser->m_accounting.debugLevel = getDebugLevel("EXPAT_ACCOUNTING_DEBUG", 0u);
+  parser->m_accounting.maximumAmplificationFactor
+      = EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT;
+  parser->m_accounting.activationThresholdBytes
+      = EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT;
+
+  memset(&parser->m_entity_stats, 0, sizeof(ENTITY_STATS));
+  parser->m_entity_stats.debugLevel = getDebugLevel("EXPAT_ENTITY_DEBUG", 0u);
+#endif
 }
 
 /* moves list of bindings to m_freeBindingList */
@@ -1399,6 +1508,7 @@ XML_UseForeignDTD(XML_Parser parser, XML_Bool useDTD) {
   parser->m_useForeignDTD = useDTD;
   return XML_ERROR_NONE;
 #else
+  UNUSED_P(useDTD);
   return XML_ERROR_FEATURE_REQUIRES_XML_DTD;
 #endif
 }
@@ -1780,7 +1890,7 @@ XML_Parse(XML_Parser parser, const char *s, int len, int isFinal) {
     int nLeftOver;
     enum XML_Status result;
     /* Detect overflow (a+b > MAX <==> b > MAX-a) */
-    if (len > ((XML_Size)-1) / 2 - parser->m_parseEndByteIndex) {
+    if ((XML_Size)len > ((XML_Size)-1) / 2 - parser->m_parseEndByteIndex) {
       parser->m_errorCode = XML_ERROR_NO_MEMORY;
       parser->m_eventPtr = parser->m_eventEndPtr = NULL;
       parser->m_processor = errorProcessor;
@@ -1872,6 +1982,12 @@ XML_ParseBuffer(XML_Parser parser, int len, int isFinal) {
     parser->m_errorCode = XML_ERROR_FINISHED;
     return XML_STATUS_ERROR;
   case XML_INITIALIZED:
+    /* Has someone called XML_GetBuffer successfully before? */
+    if (! parser->m_bufferPtr) {
+      parser->m_errorCode = XML_ERROR_NO_BUFFER;
+      return XML_STATUS_ERROR;
+    }
+
     if (parser->m_parentParser == NULL && ! startParsing(parser)) {
       parser->m_errorCode = XML_ERROR_NO_MEMORY;
       return XML_STATUS_ERROR;
@@ -2155,7 +2271,7 @@ XML_GetInputContext(XML_Parser parser, int *offset, int *size) {
   (void)offset;
   (void)size;
 #endif /* defined XML_CONTEXT_BYTES */
-  return (char *)0;
+  return (const char *)0;
 }
 
 XML_Size XMLCALL
@@ -2316,6 +2432,14 @@ XML_ErrorString(enum XML_Error code) {
   /* Added in 2.2.5. */
   case XML_ERROR_INVALID_ARGUMENT: /* Constant added in 2.2.1, already */
     return XML_L("invalid argument");
+    /* Added in 2.3.0. */
+  case XML_ERROR_NO_BUFFER:
+    return XML_L(
+        "a successful prior call to function XML_GetBuffer is required");
+  /* Added in 2.4.0. */
+  case XML_ERROR_AMPLIFICATION_LIMIT_BREACH:
+    return XML_L(
+        "limit on input amplification factor (from DTD and entities) breached");
   }
   return NULL;
 }
@@ -2352,41 +2476,75 @@ XML_ExpatVersionInfo(void) {
 
 const XML_Feature *XMLCALL
 XML_GetFeatureList(void) {
-  static const XML_Feature features[]
-      = {{XML_FEATURE_SIZEOF_XML_CHAR, XML_L("sizeof(XML_Char)"),
-          sizeof(XML_Char)},
-         {XML_FEATURE_SIZEOF_XML_LCHAR, XML_L("sizeof(XML_LChar)"),
-          sizeof(XML_LChar)},
+  static const XML_Feature features[] = {
+      {XML_FEATURE_SIZEOF_XML_CHAR, XML_L("sizeof(XML_Char)"),
+       sizeof(XML_Char)},
+      {XML_FEATURE_SIZEOF_XML_LCHAR, XML_L("sizeof(XML_LChar)"),
+       sizeof(XML_LChar)},
 #ifdef XML_UNICODE
-         {XML_FEATURE_UNICODE, XML_L("XML_UNICODE"), 0},
+      {XML_FEATURE_UNICODE, XML_L("XML_UNICODE"), 0},
 #endif
 #ifdef XML_UNICODE_WCHAR_T
-         {XML_FEATURE_UNICODE_WCHAR_T, XML_L("XML_UNICODE_WCHAR_T"), 0},
+      {XML_FEATURE_UNICODE_WCHAR_T, XML_L("XML_UNICODE_WCHAR_T"), 0},
 #endif
 #ifdef XML_DTD
-         {XML_FEATURE_DTD, XML_L("XML_DTD"), 0},
+      {XML_FEATURE_DTD, XML_L("XML_DTD"), 0},
 #endif
 #ifdef XML_CONTEXT_BYTES
-         {XML_FEATURE_CONTEXT_BYTES, XML_L("XML_CONTEXT_BYTES"),
-          XML_CONTEXT_BYTES},
+      {XML_FEATURE_CONTEXT_BYTES, XML_L("XML_CONTEXT_BYTES"),
+       XML_CONTEXT_BYTES},
 #endif
 #ifdef XML_MIN_SIZE
-         {XML_FEATURE_MIN_SIZE, XML_L("XML_MIN_SIZE"), 0},
+      {XML_FEATURE_MIN_SIZE, XML_L("XML_MIN_SIZE"), 0},
 #endif
 #ifdef XML_NS
-         {XML_FEATURE_NS, XML_L("XML_NS"), 0},
+      {XML_FEATURE_NS, XML_L("XML_NS"), 0},
 #endif
 #ifdef XML_LARGE_SIZE
-         {XML_FEATURE_LARGE_SIZE, XML_L("XML_LARGE_SIZE"), 0},
+      {XML_FEATURE_LARGE_SIZE, XML_L("XML_LARGE_SIZE"), 0},
 #endif
 #ifdef XML_ATTR_INFO
-         {XML_FEATURE_ATTR_INFO, XML_L("XML_ATTR_INFO"), 0},
+      {XML_FEATURE_ATTR_INFO, XML_L("XML_ATTR_INFO"), 0},
+#endif
+#ifdef XML_DTD
+      /* Added in Expat 2.4.0. */
+      {XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT,
+       XML_L("XML_BLAP_MAX_AMP"),
+       (long int)
+           EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT},
+      {XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT,
+       XML_L("XML_BLAP_ACT_THRES"),
+       EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT},
 #endif
-         {XML_FEATURE_END, NULL, 0}};
+      {XML_FEATURE_END, NULL, 0}};
 
   return features;
 }
 
+#ifdef XML_DTD
+XML_Bool XMLCALL
+XML_SetBillionLaughsAttackProtectionMaximumAmplification(
+    XML_Parser parser, float maximumAmplificationFactor) {
+  if ((parser == NULL) || (parser->m_parentParser != NULL)
+      || isnan(maximumAmplificationFactor)
+      || (maximumAmplificationFactor < 1.0f)) {
+    return XML_FALSE;
+  }
+  parser->m_accounting.maximumAmplificationFactor = maximumAmplificationFactor;
+  return XML_TRUE;
+}
+
+XML_Bool XMLCALL
+XML_SetBillionLaughsAttackProtectionActivationThreshold(
+    XML_Parser parser, unsigned long long activationThresholdBytes) {
+  if ((parser == NULL) || (parser->m_parentParser != NULL)) {
+    return XML_FALSE;
+  }
+  parser->m_accounting.activationThresholdBytes = activationThresholdBytes;
+  return XML_TRUE;
+}
+#endif /* XML_DTD */
+
 /* Initially tag->rawName always points into the parse buffer;
    for those TAG instances opened while the current parse buffer was
    processed, and not yet closed, we need to store tag->rawName in a more
@@ -2439,9 +2597,9 @@ storeRawNames(XML_Parser parser) {
 static enum XML_Error PTRCALL
 contentProcessor(XML_Parser parser, const char *start, const char *end,
                  const char **endPtr) {
-  enum XML_Error result
-      = doContent(parser, 0, parser->m_encoding, start, end, endPtr,
-                  (XML_Bool)! parser->m_parsingStatus.finalBuffer);
+  enum XML_Error result = doContent(
+      parser, 0, parser->m_encoding, start, end, endPtr,
+      (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_ACCOUNT_DIRECT);
   if (result == XML_ERROR_NONE) {
     if (! storeRawNames(parser))
       return XML_ERROR_NO_MEMORY;
@@ -2466,6 +2624,14 @@ externalEntityInitProcessor2(XML_Parser parser, const char *start,
   int tok = XmlContentTok(parser->m_encoding, start, end, &next);
   switch (tok) {
   case XML_TOK_BOM:
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, start, next, __LINE__,
+                                  XML_ACCOUNT_DIRECT)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#endif /* XML_DTD */
+
     /* If we are at the end of the buffer, this would cause the next stage,
        i.e. externalEntityInitProcessor3, to pass control directly to
        doContent (by detecting XML_TOK_NONE) without processing any xml text
@@ -2503,6 +2669,10 @@ externalEntityInitProcessor3(XML_Parser parser, const char *start,
   const char *next = start; /* XmlContentTok doesn't always set the last arg */
   parser->m_eventPtr = start;
   tok = XmlContentTok(parser->m_encoding, start, end, &next);
+  /* Note: These bytes are accounted later in:
+           - processXmlDecl
+           - externalEntityContentProcessor
+  */
   parser->m_eventEndPtr = next;
 
   switch (tok) {
@@ -2544,7 +2714,8 @@ externalEntityContentProcessor(XML_Parser parser, const char *start,
                                const char *end, const char **endPtr) {
   enum XML_Error result
       = doContent(parser, 1, parser->m_encoding, start, end, endPtr,
-                  (XML_Bool)! parser->m_parsingStatus.finalBuffer);
+                  (XML_Bool)! parser->m_parsingStatus.finalBuffer,
+                  XML_ACCOUNT_ENTITY_EXPANSION);
   if (result == XML_ERROR_NONE) {
     if (! storeRawNames(parser))
       return XML_ERROR_NO_MEMORY;
@@ -2555,7 +2726,7 @@ externalEntityContentProcessor(XML_Parser parser, const char *start,
 static enum XML_Error
 doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
           const char *s, const char *end, const char **nextPtr,
-          XML_Bool haveMore) {
+          XML_Bool haveMore, enum XML_Account account) {
   /* save one level of indirection */
   DTD *const dtd = parser->m_dtd;
 
@@ -2573,6 +2744,17 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
   for (;;) {
     const char *next = s; /* XmlContentTok doesn't always set the last arg */
     int tok = XmlContentTok(enc, s, end, &next);
+#ifdef XML_DTD
+    const char *accountAfter
+        = ((tok == XML_TOK_TRAILING_RSQB) || (tok == XML_TOK_TRAILING_CR))
+              ? (haveMore ? s /* i.e. 0 bytes */ : end)
+              : next;
+    if (! accountingDiffTolerated(parser, tok, s, accountAfter, __LINE__,
+                                  account)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#endif
     *eventEndPP = next;
     switch (tok) {
     case XML_TOK_TRAILING_CR:
@@ -2628,6 +2810,14 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
       XML_Char ch = (XML_Char)XmlPredefinedEntityName(
           enc, s + enc->minBytesPerChar, next - enc->minBytesPerChar);
       if (ch) {
+#ifdef XML_DTD
+        /* NOTE: We are replacing 4-6 characters original input for 1 character
+         *       so there is no amplification and hence recording without
+         *       protection. */
+        accountingDiffTolerated(parser, tok, (char *)&ch,
+                                ((char *)&ch) + sizeof(XML_Char), __LINE__,
+                                XML_ACCOUNT_ENTITY_EXPANSION);
+#endif /* XML_DTD */
         if (parser->m_characterDataHandler)
           parser->m_characterDataHandler(parser->m_handlerArg, &ch, 1);
         else if (parser->m_defaultHandler)
@@ -2746,7 +2936,8 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
       }
       tag->name.str = (XML_Char *)tag->buf;
       *toPtr = XML_T('\0');
-      result = storeAtts(parser, enc, s, &(tag->name), &(tag->bindings));
+      result
+          = storeAtts(parser, enc, s, &(tag->name), &(tag->bindings), account);
       if (result)
         return result;
       if (parser->m_startElementHandler)
@@ -2770,7 +2961,8 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
       if (! name.str)
         return XML_ERROR_NO_MEMORY;
       poolFinish(&parser->m_tempPool);
-      result = storeAtts(parser, enc, s, &name, &bindings);
+      result = storeAtts(parser, enc, s, &name, &bindings,
+                         XML_ACCOUNT_NONE /* token spans whole start tag */);
       if (result != XML_ERROR_NONE) {
         freeBindings(parser, bindings);
         return result;
@@ -2905,7 +3097,8 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
       /* END disabled code */
       else if (parser->m_defaultHandler)
         reportDefault(parser, enc, s, next);
-      result = doCdataSection(parser, enc, &next, end, nextPtr, haveMore);
+      result
+          = doCdataSection(parser, enc, &next, end, nextPtr, haveMore, account);
       if (result != XML_ERROR_NONE)
         return result;
       else if (! next) {
@@ -3034,7 +3227,8 @@ freeBindings(XML_Parser parser, BINDING *bindings) {
 */
 static enum XML_Error
 storeAtts(XML_Parser parser, const ENCODING *enc, const char *attStr,
-          TAG_NAME *tagNamePtr, BINDING **bindingsPtr) {
+          TAG_NAME *tagNamePtr, BINDING **bindingsPtr,
+          enum XML_Account account) {
   DTD *const dtd = parser->m_dtd; /* save one level of indirection */
   ELEMENT_TYPE *elementType;
   int nDefaultAtts;
@@ -3144,7 +3338,7 @@ storeAtts(XML_Parser parser, const ENCODING *enc, const char *attStr,
       /* normalize the attribute value */
       result = storeAttributeValue(
           parser, enc, isCdata, parser->m_atts[i].valuePtr,
-          parser->m_atts[i].valueEnd, &parser->m_tempPool);
+          parser->m_atts[i].valueEnd, &parser->m_tempPool, account);
       if (result)
         return result;
       appAtts[attIndex] = poolStart(&parser->m_tempPool);
@@ -3533,9 +3727,9 @@ addBinding(XML_Parser parser, PREFIX *prefix, const ATTRIBUTE_ID *attId,
 static enum XML_Error PTRCALL
 cdataSectionProcessor(XML_Parser parser, const char *start, const char *end,
                       const char **endPtr) {
-  enum XML_Error result
-      = doCdataSection(parser, parser->m_encoding, &start, end, endPtr,
-                       (XML_Bool)! parser->m_parsingStatus.finalBuffer);
+  enum XML_Error result = doCdataSection(
+      parser, parser->m_encoding, &start, end, endPtr,
+      (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_ACCOUNT_DIRECT);
   if (result != XML_ERROR_NONE)
     return result;
   if (start) {
@@ -3555,7 +3749,8 @@ cdataSectionProcessor(XML_Parser parser, const char *start, const char *end,
 */
 static enum XML_Error
 doCdataSection(XML_Parser parser, const ENCODING *enc, const char **startPtr,
-               const char *end, const char **nextPtr, XML_Bool haveMore) {
+               const char *end, const char **nextPtr, XML_Bool haveMore,
+               enum XML_Account account) {
   const char *s = *startPtr;
   const char **eventPP;
   const char **eventEndPP;
@@ -3571,8 +3766,16 @@ doCdataSection(XML_Parser parser, const ENCODING *enc, const char **startPtr,
   *startPtr = NULL;
 
   for (;;) {
-    const char *next;
+    const char *next = s; /* in case of XML_TOK_NONE or XML_TOK_PARTIAL */
     int tok = XmlCdataSectionTok(enc, s, end, &next);
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, s, next, __LINE__, account)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#else
+    UNUSED_P(account);
+#endif
     *eventEndPP = next;
     switch (tok) {
     case XML_TOK_CDATA_SECT_CLOSE:
@@ -3689,7 +3892,7 @@ ignoreSectionProcessor(XML_Parser parser, const char *start, const char *end,
 static enum XML_Error
 doIgnoreSection(XML_Parser parser, const ENCODING *enc, const char **startPtr,
                 const char *end, const char **nextPtr, XML_Bool haveMore) {
-  const char *next;
+  const char *next = *startPtr; /* in case of XML_TOK_NONE or XML_TOK_PARTIAL */
   int tok;
   const char *s = *startPtr;
   const char **eventPP;
@@ -3717,6 +3920,13 @@ doIgnoreSection(XML_Parser parser, const ENCODING *enc, const char **startPtr,
   *eventPP = s;
   *startPtr = NULL;
   tok = XmlIgnoreSectionTok(enc, s, end, &next);
+#  ifdef XML_DTD
+  if (! accountingDiffTolerated(parser, tok, s, next, __LINE__,
+                                XML_ACCOUNT_DIRECT)) {
+    accountingOnAbort(parser);
+    return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+  }
+#  endif
   *eventEndPP = next;
   switch (tok) {
   case XML_TOK_IGNORE_SECT:
@@ -3801,6 +4011,15 @@ processXmlDecl(XML_Parser parser, int isGeneralTextEntity, const char *s,
   const char *versionend;
   const XML_Char *storedversion = NULL;
   int standalone = -1;
+
+#ifdef XML_DTD
+  if (! accountingDiffTolerated(parser, XML_TOK_XML_DECL, s, next, __LINE__,
+                                XML_ACCOUNT_DIRECT)) {
+    accountingOnAbort(parser);
+    return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+  }
+#endif
+
   if (! (parser->m_ns ? XmlParseXmlDeclNS : XmlParseXmlDecl)(
           isGeneralTextEntity, parser->m_encoding, s, next, &parser->m_eventPtr,
           &version, &versionend, &encodingName, &newEncoding, &standalone)) {
@@ -3950,6 +4169,10 @@ entityValueInitProcessor(XML_Parser parser, const char *s, const char *end,
 
   for (;;) {
     tok = XmlPrologTok(parser->m_encoding, start, end, &next);
+    /* Note: Except for XML_TOK_BOM below, these bytes are accounted later in:
+             - storeEntityValue
+             - processXmlDecl
+    */
     parser->m_eventEndPtr = next;
     if (tok <= 0) {
       if (! parser->m_parsingStatus.finalBuffer && tok != XML_TOK_INVALID) {
@@ -3968,7 +4191,8 @@ entityValueInitProcessor(XML_Parser parser, const char *s, const char *end,
         break;
       }
       /* found end of entity value - can store it now */
-      return storeEntityValue(parser, parser->m_encoding, s, end);
+      return storeEntityValue(parser, parser->m_encoding, s, end,
+                              XML_ACCOUNT_DIRECT);
     } else if (tok == XML_TOK_XML_DECL) {
       enum XML_Error result;
       result = processXmlDecl(parser, 0, start, next);
@@ -3995,6 +4219,14 @@ entityValueInitProcessor(XML_Parser parser, const char *s, const char *end,
     */
     else if (tok == XML_TOK_BOM && next == end
              && ! parser->m_parsingStatus.finalBuffer) {
+#  ifdef XML_DTD
+      if (! accountingDiffTolerated(parser, tok, s, next, __LINE__,
+                                    XML_ACCOUNT_DIRECT)) {
+        accountingOnAbort(parser);
+        return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+      }
+#  endif
+
       *nextPtr = next;
       return XML_ERROR_NONE;
     }
@@ -4037,16 +4269,24 @@ externalParEntProcessor(XML_Parser parser, const char *s, const char *end,
   }
   /* This would cause the next stage, i.e. doProlog to be passed XML_TOK_BOM.
      However, when parsing an external subset, doProlog will not accept a BOM
-     as valid, and report a syntax error, so we have to skip the BOM
+     as valid, and report a syntax error, so we have to skip the BOM, and
+     account for the BOM bytes.
   */
   else if (tok == XML_TOK_BOM) {
+    if (! accountingDiffTolerated(parser, tok, s, next, __LINE__,
+                                  XML_ACCOUNT_DIRECT)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+
     s = next;
     tok = XmlPrologTok(parser->m_encoding, s, end, &next);
   }
 
   parser->m_processor = prologProcessor;
   return doProlog(parser, parser->m_encoding, s, end, tok, next, nextPtr,
-                  (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE);
+                  (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE,
+                  XML_ACCOUNT_DIRECT);
 }
 
 static enum XML_Error PTRCALL
@@ -4059,6 +4299,9 @@ entityValueProcessor(XML_Parser parser, const char *s, const char *end,
 
   for (;;) {
     tok = XmlPrologTok(enc, start, end, &next);
+    /* Note: These bytes are accounted later in:
+             - storeEntityValue
+    */
     if (tok <= 0) {
       if (! parser->m_parsingStatus.finalBuffer && tok != XML_TOK_INVALID) {
         *nextPtr = s;
@@ -4076,7 +4319,7 @@ entityValueProcessor(XML_Parser parser, const char *s, const char *end,
         break;
       }
       /* found end of entity value - can store it now */
-      return storeEntityValue(parser, enc, s, end);
+      return storeEntityValue(parser, enc, s, end, XML_ACCOUNT_DIRECT);
     }
     start = next;
   }
@@ -4090,13 +4333,14 @@ prologProcessor(XML_Parser parser, const char *s, const char *end,
   const char *next = s;
   int tok = XmlPrologTok(parser->m_encoding, s, end, &next);
   return doProlog(parser, parser->m_encoding, s, end, tok, next, nextPtr,
-                  (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE);
+                  (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE,
+                  XML_ACCOUNT_DIRECT);
 }
 
 static enum XML_Error
 doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
          int tok, const char *next, const char **nextPtr, XML_Bool haveMore,
-         XML_Bool allowClosingDoctype) {
+         XML_Bool allowClosingDoctype, enum XML_Account account) {
 #ifdef XML_DTD
   static const XML_Char externalSubsetName[] = {ASCII_HASH, '\0'};
 #endif /* XML_DTD */
@@ -4123,6 +4367,10 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
   static const XML_Char enumValueSep[] = {ASCII_PIPE, '\0'};
   static const XML_Char enumValueStart[] = {ASCII_LPAREN, '\0'};
 
+#ifndef XML_DTD
+  UNUSED_P(account);
+#endif
+
   /* save one level of indirection */
   DTD *const dtd = parser->m_dtd;
 
@@ -4187,6 +4435,19 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
       }
     }
     role = XmlTokenRole(&parser->m_prologState, tok, s, next, enc);
+#ifdef XML_DTD
+    switch (role) {
+    case XML_ROLE_INSTANCE_START: // bytes accounted in contentProcessor
+    case XML_ROLE_XML_DECL:       // bytes accounted in processXmlDecl
+    case XML_ROLE_TEXT_DECL:      // bytes accounted in processXmlDecl
+      break;
+    default:
+      if (! accountingDiffTolerated(parser, tok, s, next, __LINE__, account)) {
+        accountingOnAbort(parser);
+        return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+      }
+    }
+#endif
     switch (role) {
     case XML_ROLE_XML_DECL: {
       enum XML_Error result = processXmlDecl(parser, 0, s, next);
@@ -4462,7 +4723,8 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
         const XML_Char *attVal;
         enum XML_Error result = storeAttributeValue(
             parser, enc, parser->m_declAttributeIsCdata,
-            s + enc->minBytesPerChar, next - enc->minBytesPerChar, &dtd->pool);
+            s + enc->minBytesPerChar, next - enc->minBytesPerChar, &dtd->pool,
+            XML_ACCOUNT_NONE);
         if (result)
           return result;
         attVal = poolStart(&dtd->pool);
@@ -4495,8 +4757,9 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
       break;
     case XML_ROLE_ENTITY_VALUE:
       if (dtd->keepProcessing) {
-        enum XML_Error result = storeEntityValue(
-            parser, enc, s + enc->minBytesPerChar, next - enc->minBytesPerChar);
+        enum XML_Error result
+            = storeEntityValue(parser, enc, s + enc->minBytesPerChar,
+                               next - enc->minBytesPerChar, XML_ACCOUNT_NONE);
         if (parser->m_declEntity) {
           parser->m_declEntity->textPtr = poolStart(&dtd->entityValuePool);
           parser->m_declEntity->textLen
@@ -4886,12 +5149,15 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
         if (parser->m_externalEntityRefHandler) {
           dtd->paramEntityRead = XML_FALSE;
           entity->open = XML_TRUE;
+          entityTrackingOnOpen(parser, entity, __LINE__);
           if (! parser->m_externalEntityRefHandler(
                   parser->m_externalEntityRefHandlerArg, 0, entity->base,
                   entity->systemId, entity->publicId)) {
+            entityTrackingOnClose(parser, entity, __LINE__);
             entity->open = XML_FALSE;
             return XML_ERROR_EXTERNAL_ENTITY_HANDLING;
           }
+          entityTrackingOnClose(parser, entity, __LINE__);
           entity->open = XML_FALSE;
           handleDefault = XML_FALSE;
           if (! dtd->paramEntityRead) {
@@ -5089,6 +5355,13 @@ epilogProcessor(XML_Parser parser, const char *s, const char *end,
   for (;;) {
     const char *next = NULL;
     int tok = XmlPrologTok(parser->m_encoding, s, end, &next);
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, s, next, __LINE__,
+                                  XML_ACCOUNT_DIRECT)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#endif
     parser->m_eventEndPtr = next;
     switch (tok) {
     /* report partial linebreak - it might be the last token */
@@ -5162,6 +5435,9 @@ processInternalEntity(XML_Parser parser, ENTITY *entity, XML_Bool betweenDecl) {
       return XML_ERROR_NO_MEMORY;
   }
   entity->open = XML_TRUE;
+#ifdef XML_DTD
+  entityTrackingOnOpen(parser, entity, __LINE__);
+#endif
   entity->processed = 0;
   openEntity->next = parser->m_openInternalEntities;
   parser->m_openInternalEntities = openEntity;
@@ -5170,8 +5446,8 @@ processInternalEntity(XML_Parser parser, ENTITY *entity, XML_Bool betweenDecl) {
   openEntity->betweenDecl = betweenDecl;
   openEntity->internalEventPtr = NULL;
   openEntity->internalEventEndPtr = NULL;
-  textStart = (char *)entity->textPtr;
-  textEnd = (char *)(entity->textPtr + entity->textLen);
+  textStart = (const char *)entity->textPtr;
+  textEnd = (const char *)(entity->textPtr + entity->textLen);
   /* Set a safe default value in case 'next' does not get set */
   next = textStart;
 
@@ -5180,17 +5456,22 @@ processInternalEntity(XML_Parser parser, ENTITY *entity, XML_Bool betweenDecl) {
     int tok
         = XmlPrologTok(parser->m_internalEncoding, textStart, textEnd, &next);
     result = doProlog(parser, parser->m_internalEncoding, textStart, textEnd,
-                      tok, next, &next, XML_FALSE, XML_FALSE);
+                      tok, next, &next, XML_FALSE, XML_FALSE,
+                      XML_ACCOUNT_ENTITY_EXPANSION);
   } else
 #endif /* XML_DTD */
     result = doContent(parser, parser->m_tagLevel, parser->m_internalEncoding,
-                       textStart, textEnd, &next, XML_FALSE);
+                       textStart, textEnd, &next, XML_FALSE,
+                       XML_ACCOUNT_ENTITY_EXPANSION);
 
   if (result == XML_ERROR_NONE) {
     if (textEnd != next && parser->m_parsingStatus.parsing == XML_SUSPENDED) {
       entity->processed = (int)(next - textStart);
       parser->m_processor = internalEntityProcessor;
     } else {
+#ifdef XML_DTD
+      entityTrackingOnClose(parser, entity, __LINE__);
+#endif /* XML_DTD */
       entity->open = XML_FALSE;
       parser->m_openInternalEntities = openEntity->next;
       /* put openEntity back in list of free instances */
@@ -5213,8 +5494,8 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,
     return XML_ERROR_UNEXPECTED_STATE;
 
   entity = openEntity->entity;
-  textStart = ((char *)entity->textPtr) + entity->processed;
-  textEnd = (char *)(entity->textPtr + entity->textLen);
+  textStart = ((const char *)entity->textPtr) + entity->processed;
+  textEnd = (const char *)(entity->textPtr + entity->textLen);
   /* Set a safe default value in case 'next' does not get set */
   next = textStart;
 
@@ -5223,20 +5504,24 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,
     int tok
         = XmlPrologTok(parser->m_internalEncoding, textStart, textEnd, &next);
     result = doProlog(parser, parser->m_internalEncoding, textStart, textEnd,
-                      tok, next, &next, XML_FALSE, XML_TRUE);
+                      tok, next, &next, XML_FALSE, XML_TRUE,
+                      XML_ACCOUNT_ENTITY_EXPANSION);
   } else
 #endif /* XML_DTD */
     result = doContent(parser, openEntity->startTagLevel,
                        parser->m_internalEncoding, textStart, textEnd, &next,
-                       XML_FALSE);
+                       XML_FALSE, XML_ACCOUNT_ENTITY_EXPANSION);
 
   if (result != XML_ERROR_NONE)
     return result;
   else if (textEnd != next
            && parser->m_parsingStatus.parsing == XML_SUSPENDED) {
-    entity->processed = (int)(next - (char *)entity->textPtr);
+    entity->processed = (int)(next - (const char *)entity->textPtr);
     return result;
   } else {
+#ifdef XML_DTD
+    entityTrackingOnClose(parser, entity, __LINE__);
+#endif
     entity->open = XML_FALSE;
     parser->m_openInternalEntities = openEntity->next;
     /* put openEntity back in list of free instances */
@@ -5250,7 +5535,8 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,
     parser->m_processor = prologProcessor;
     tok = XmlPrologTok(parser->m_encoding, s, end, &next);
     return doProlog(parser, parser->m_encoding, s, end, tok, next, nextPtr,
-                    (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE);
+                    (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE,
+                    XML_ACCOUNT_DIRECT);
   } else
 #endif /* XML_DTD */
   {
@@ -5258,7 +5544,8 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,
     /* see externalEntityContentProcessor vs contentProcessor */
     return doContent(parser, parser->m_parentParser ? 1 : 0, parser->m_encoding,
                      s, end, nextPtr,
-                     (XML_Bool)! parser->m_parsingStatus.finalBuffer);
+                     (XML_Bool)! parser->m_parsingStatus.finalBuffer,
+                     XML_ACCOUNT_DIRECT);
   }
 }
 
@@ -5273,9 +5560,10 @@ errorProcessor(XML_Parser parser, const char *s, const char *end,
 
 static enum XML_Error
 storeAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
-                    const char *ptr, const char *end, STRING_POOL *pool) {
+                    const char *ptr, const char *end, STRING_POOL *pool,
+                    enum XML_Account account) {
   enum XML_Error result
-      = appendAttributeValue(parser, enc, isCdata, ptr, end, pool);
+      = appendAttributeValue(parser, enc, isCdata, ptr, end, pool, account);
   if (result)
     return result;
   if (! isCdata && poolLength(pool) && poolLastChar(pool) == 0x20)
@@ -5287,11 +5575,23 @@ storeAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
 
 static enum XML_Error
 appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
-                     const char *ptr, const char *end, STRING_POOL *pool) {
+                     const char *ptr, const char *end, STRING_POOL *pool,
+                     enum XML_Account account) {
   DTD *const dtd = parser->m_dtd; /* save one level of indirection */
+#ifndef XML_DTD
+  UNUSED_P(account);
+#endif
+
   for (;;) {
-    const char *next;
+    const char *next
+        = ptr; /* XmlAttributeValueTok doesn't always set the last arg */
     int tok = XmlAttributeValueTok(enc, ptr, end, &next);
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, ptr, next, __LINE__, account)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#endif
     switch (tok) {
     case XML_TOK_NONE:
       return XML_ERROR_NONE;
@@ -5351,6 +5651,14 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
       XML_Char ch = (XML_Char)XmlPredefinedEntityName(
           enc, ptr + enc->minBytesPerChar, next - enc->minBytesPerChar);
       if (ch) {
+#ifdef XML_DTD
+        /* NOTE: We are replacing 4-6 characters original input for 1 character
+         *       so there is no amplification and hence recording without
+         *       protection. */
+        accountingDiffTolerated(parser, tok, (char *)&ch,
+                                ((char *)&ch) + sizeof(XML_Char), __LINE__,
+                                XML_ACCOUNT_ENTITY_EXPANSION);
+#endif /* XML_DTD */
         if (! poolAppendChar(pool, ch))
           return XML_ERROR_NO_MEMORY;
         break;
@@ -5428,9 +5736,16 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
         enum XML_Error result;
         const XML_Char *textEnd = entity->textPtr + entity->textLen;
         entity->open = XML_TRUE;
+#ifdef XML_DTD
+        entityTrackingOnOpen(parser, entity, __LINE__);
+#endif
         result = appendAttributeValue(parser, parser->m_internalEncoding,
-                                      isCdata, (char *)entity->textPtr,
-                                      (char *)textEnd, pool);
+                                      isCdata, (const char *)entity->textPtr,
+                                      (const char *)textEnd, pool,
+                                      XML_ACCOUNT_ENTITY_EXPANSION);
+#ifdef XML_DTD
+        entityTrackingOnClose(parser, entity, __LINE__);
+#endif
         entity->open = XML_FALSE;
         if (result)
           return result;
@@ -5460,13 +5775,16 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
 
 static enum XML_Error
 storeEntityValue(XML_Parser parser, const ENCODING *enc,
-                 const char *entityTextPtr, const char *entityTextEnd) {
+                 const char *entityTextPtr, const char *entityTextEnd,
+                 enum XML_Account account) {
   DTD *const dtd = parser->m_dtd; /* save one level of indirection */
   STRING_POOL *pool = &(dtd->entityValuePool);
   enum XML_Error result = XML_ERROR_NONE;
 #ifdef XML_DTD
   int oldInEntityValue = parser->m_prologState.inEntityValue;
   parser->m_prologState.inEntityValue = 1;
+#else
+  UNUSED_P(account);
 #endif /* XML_DTD */
   /* never return Null for the value argument in EntityDeclHandler,
      since this would indicate an external entity; therefore we
@@ -5477,8 +5795,19 @@ storeEntityValue(XML_Parser parser, const ENCODING *enc,
   }
 
   for (;;) {
-    const char *next;
+    const char *next
+        = entityTextPtr; /* XmlEntityValueTok doesn't always set the last arg */
     int tok = XmlEntityValueTok(enc, entityTextPtr, entityTextEnd, &next);
+
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, entityTextPtr, next, __LINE__,
+                                  account)) {
+      accountingOnAbort(parser);
+      result = XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+      goto endEntityValue;
+    }
+#endif
+
     switch (tok) {
     case XML_TOK_PARAM_ENTITY_REF:
 #ifdef XML_DTD
@@ -5514,13 +5843,16 @@ storeEntityValue(XML_Parser parser, const ENCODING *enc,
           if (parser->m_externalEntityRefHandler) {
             dtd->paramEntityRead = XML_FALSE;
             entity->open = XML_TRUE;
+            entityTrackingOnOpen(parser, entity, __LINE__);
             if (! parser->m_externalEntityRefHandler(
                     parser->m_externalEntityRefHandlerArg, 0, entity->base,
                     entity->systemId, entity->publicId)) {
+              entityTrackingOnClose(parser, entity, __LINE__);
               entity->open = XML_FALSE;
               result = XML_ERROR_EXTERNAL_ENTITY_HANDLING;
               goto endEntityValue;
             }
+            entityTrackingOnClose(parser, entity, __LINE__);
             entity->open = XML_FALSE;
             if (! dtd->paramEntityRead)
               dtd->keepProcessing = dtd->standalone;
@@ -5528,9 +5860,12 @@ storeEntityValue(XML_Parser parser, const ENCODING *enc,
             dtd->keepProcessing = dtd->standalone;
         } else {
           entity->open = XML_TRUE;
+          entityTrackingOnOpen(parser, entity, __LINE__);
           result = storeEntityValue(
-              parser, parser->m_internalEncoding, (char *)entity->textPtr,
-              (char *)(entity->textPtr + entity->textLen));
+              parser, parser->m_internalEncoding, (const char *)entity->textPtr,
+              (const char *)(entity->textPtr + entity->textLen),
+              XML_ACCOUNT_ENTITY_EXPANSION);
+          entityTrackingOnClose(parser, entity, __LINE__);
           entity->open = XML_FALSE;
           if (result)
             goto endEntityValue;
@@ -6485,7 +6820,7 @@ hashTableInit(HASH_TABLE *p, const XML_Memory_Handling_Suite *ms) {
 static void FASTCALL
 hashTableIterInit(HASH_TABLE_ITER *iter, const HASH_TABLE *table) {
   iter->p = table->v;
-  iter->end = iter->p + table->size;
+  iter->end = iter->p ? iter->p + table->size : NULL;
 }
 
 static NAMED *FASTCALL
@@ -6891,3 +7226,755 @@ copyString(const XML_Char *s, const XML_Memory_Handling_Suite *memsuite) {
   memcpy(result, s, charsRequired * sizeof(XML_Char));
   return result;
 }
+
+#ifdef XML_DTD
+
+static float
+accountingGetCurrentAmplification(XML_Parser rootParser) {
+  const XmlBigCount countBytesOutput
+      = rootParser->m_accounting.countBytesDirect
+        + rootParser->m_accounting.countBytesIndirect;
+  const float amplificationFactor
+      = rootParser->m_accounting.countBytesDirect
+            ? (countBytesOutput
+               / (float)(rootParser->m_accounting.countBytesDirect))
+            : 1.0f;
+  assert(! rootParser->m_parentParser);
+  return amplificationFactor;
+}
+
+static void
+accountingReportStats(XML_Parser originParser, const char *epilog) {
+  const XML_Parser rootParser = getRootParserOf(originParser, NULL);
+  assert(! rootParser->m_parentParser);
+
+  if (rootParser->m_accounting.debugLevel < 1) {
+    return;
+  }
+
+  const float amplificationFactor
+      = accountingGetCurrentAmplification(rootParser);
+  fprintf(stderr,
+          "expat: Accounting(%p): Direct " EXPAT_FMT_ULL(
+              "10") ", indirect " EXPAT_FMT_ULL("10") ", amplification %8.2f%s",
+          (void *)rootParser, rootParser->m_accounting.countBytesDirect,
+          rootParser->m_accounting.countBytesIndirect,
+          (double)amplificationFactor, epilog);
+}
+
+static void
+accountingOnAbort(XML_Parser originParser) {
+  accountingReportStats(originParser, " ABORTING\n");
+}
+
+static void
+accountingReportDiff(XML_Parser rootParser,
+                     unsigned int levelsAwayFromRootParser, const char *before,
+                     const char *after, ptrdiff_t bytesMore, int source_line,
+                     enum XML_Account account) {
+  assert(! rootParser->m_parentParser);
+
+  fprintf(stderr,
+          " (+" EXPAT_FMT_PTRDIFF_T("6") " bytes %s|%d, xmlparse.c:%d) %*s\"",
+          bytesMore, (account == XML_ACCOUNT_DIRECT) ? "DIR" : "EXP",
+          levelsAwayFromRootParser, source_line, 10, "");
+
+  const char ellipis[] = "[..]";
+  const size_t ellipsisLength = sizeof(ellipis) /* because compile-time */ - 1;
+  const unsigned int contextLength = 10;
+
+  /* Note: Performance is of no concern here */
+  const char *walker = before;
+  if ((rootParser->m_accounting.debugLevel >= 3)
+      || (after - before)
+             <= (ptrdiff_t)(contextLength + ellipsisLength + contextLength)) {
+    for (; walker < after; walker++) {
+      fprintf(stderr, "%s", unsignedCharToPrintable(walker[0]));
+    }
+  } else {
+    for (; walker < before + contextLength; walker++) {
+      fprintf(stderr, "%s", unsignedCharToPrintable(walker[0]));
+    }
+    fprintf(stderr, ellipis);
+    walker = after - contextLength;
+    for (; walker < after; walker++) {
+      fprintf(stderr, "%s", unsignedCharToPrintable(walker[0]));
+    }
+  }
+  fprintf(stderr, "\"\n");
+}
+
+static XML_Bool
+accountingDiffTolerated(XML_Parser originParser, int tok, const char *before,
+                        const char *after, int source_line,
+                        enum XML_Account account) {
+  /* Note: We need to check the token type *first* to be sure that
+   *       we can even access variable <after>, safely.
+   *       E.g. for XML_TOK_NONE <after> may hold an invalid pointer. */
+  switch (tok) {
+  case XML_TOK_INVALID:
+  case XML_TOK_PARTIAL:
+  case XML_TOK_PARTIAL_CHAR:
+  case XML_TOK_NONE:
+    return XML_TRUE;
+  }
+
+  if (account == XML_ACCOUNT_NONE)
+    return XML_TRUE; /* because these bytes have been accounted for, already */
+
+  unsigned int levelsAwayFromRootParser;
+  const XML_Parser rootParser
+      = getRootParserOf(originParser, &levelsAwayFromRootParser);
+  assert(! rootParser->m_parentParser);
+
+  const int isDirect
+      = (account == XML_ACCOUNT_DIRECT) && (originParser == rootParser);
+  const ptrdiff_t bytesMore = after - before;
+
+  XmlBigCount *const additionTarget
+      = isDirect ? &rootParser->m_accounting.countBytesDirect
+                 : &rootParser->m_accounting.countBytesIndirect;
+
+  /* Detect and avoid integer overflow */
+  if (*additionTarget > (XmlBigCount)(-1) - (XmlBigCount)bytesMore)
+    return XML_FALSE;
+  *additionTarget += bytesMore;
+
+  const XmlBigCount countBytesOutput
+      = rootParser->m_accounting.countBytesDirect
+        + rootParser->m_accounting.countBytesIndirect;
+  const float amplificationFactor
+      = accountingGetCurrentAmplification(rootParser);
+  const XML_Bool tolerated
+      = (countBytesOutput < rootParser->m_accounting.activationThresholdBytes)
+        || (amplificationFactor
+            <= rootParser->m_accounting.maximumAmplificationFactor);
+
+  if (rootParser->m_accounting.debugLevel >= 2) {
+    accountingReportStats(rootParser, "");
+    accountingReportDiff(rootParser, levelsAwayFromRootParser, before, after,
+                         bytesMore, source_line, account);
+  }
+
+  return tolerated;
+}
+
+unsigned long long
+testingAccountingGetCountBytesDirect(XML_Parser parser) {
+  if (! parser)
+    return 0;
+  return parser->m_accounting.countBytesDirect;
+}
+
+unsigned long long
+testingAccountingGetCountBytesIndirect(XML_Parser parser) {
+  if (! parser)
+    return 0;
+  return parser->m_accounting.countBytesIndirect;
+}
+
+static void
+entityTrackingReportStats(XML_Parser rootParser, ENTITY *entity,
+                          const char *action, int sourceLine) {
+  assert(! rootParser->m_parentParser);
+  if (rootParser->m_entity_stats.debugLevel < 1)
+    return;
+
+#  if defined(XML_UNICODE)
+  const char *const entityName = "[..]";
+#  else
+  const char *const entityName = entity->name;
+#  endif
+
+  fprintf(
+      stderr,
+      "expat: Entities(%p): Count %9d, depth %2d/%2d %*s%s%s; %s length %d (xmlparse.c:%d)\n",
+      (void *)rootParser, rootParser->m_entity_stats.countEverOpened,
+      rootParser->m_entity_stats.currentDepth,
+      rootParser->m_entity_stats.maximumDepthSeen,
+      (rootParser->m_entity_stats.currentDepth - 1) * 2, "",
+      entity->is_param ? "%" : "&", entityName, action, entity->textLen,
+      sourceLine);
+}
+
+static void
+entityTrackingOnOpen(XML_Parser originParser, ENTITY *entity, int sourceLine) {
+  const XML_Parser rootParser = getRootParserOf(originParser, NULL);
+  assert(! rootParser->m_parentParser);
+
+  rootParser->m_entity_stats.countEverOpened++;
+  rootParser->m_entity_stats.currentDepth++;
+  if (rootParser->m_entity_stats.currentDepth
+      > rootParser->m_entity_stats.maximumDepthSeen) {
+    rootParser->m_entity_stats.maximumDepthSeen++;
+  }
+
+  entityTrackingReportStats(rootParser, entity, "OPEN ", sourceLine);
+}
+
+static void
+entityTrackingOnClose(XML_Parser originParser, ENTITY *entity, int sourceLine) {
+  const XML_Parser rootParser = getRootParserOf(originParser, NULL);
+  assert(! rootParser->m_parentParser);
+
+  entityTrackingReportStats(rootParser, entity, "CLOSE", sourceLine);
+  rootParser->m_entity_stats.currentDepth--;
+}
+
+static XML_Parser
+getRootParserOf(XML_Parser parser, unsigned int *outLevelDiff) {
+  XML_Parser rootParser = parser;
+  unsigned int stepsTakenUpwards = 0;
+  while (rootParser->m_parentParser) {
+    rootParser = rootParser->m_parentParser;
+    stepsTakenUpwards++;
+  }
+  assert(! rootParser->m_parentParser);
+  if (outLevelDiff != NULL) {
+    *outLevelDiff = stepsTakenUpwards;
+  }
+  return rootParser;
+}
+
+const char *
+unsignedCharToPrintable(unsigned char c) {
+  switch (c) {
+  case 0:
+    return "\\0";
+  case 1:
+    return "\\x1";
+  case 2:
+    return "\\x2";
+  case 3:
+    return "\\x3";
+  case 4:
+    return "\\x4";
+  case 5:
+    return "\\x5";
+  case 6:
+    return "\\x6";
+  case 7:
+    return "\\x7";
+  case 8:
+    return "\\x8";
+  case 9:
+    return "\\t";
+  case 10:
+    return "\\n";
+  case 11:
+    return "\\xB";
+  case 12:
+    return "\\xC";
+  case 13:
+    return "\\r";
+  case 14:
+    return "\\xE";
+  case 15:
+    return "\\xF";
+  case 16:
+    return "\\x10";
+  case 17:
+    return "\\x11";
+  case 18:
+    return "\\x12";
+  case 19:
+    return "\\x13";
+  case 20:
+    return "\\x14";
+  case 21:
+    return "\\x15";
+  case 22:
+    return "\\x16";
+  case 23:
+    return "\\x17";
+  case 24:
+    return "\\x18";
+  case 25:
+    return "\\x19";
+  case 26:
+    return "\\x1A";
+  case 27:
+    return "\\x1B";
+  case 28:
+    return "\\x1C";
+  case 29:
+    return "\\x1D";
+  case 30:
+    return "\\x1E";
+  case 31:
+    return "\\x1F";
+  case 32:
+    return " ";
+  case 33:
+    return "!";
+  case 34:
+    return "\\\"";
+  case 35:
+    return "#";
+  case 36:
+    return "$";
+  case 37:
+    return "%";
+  case 38:
+    return "&";
+  case 39:
+    return "'";
+  case 40:
+    return "(";
+  case 41:
+    return ")";
+  case 42:
+    return "*";
+  case 43:
+    return "+";
+  case 44:
+    return ",";
+  case 45:
+    return "-";
+  case 46:
+    return ".";
+  case 47:
+    return "/";
+  case 48:
+    return "0";
+  case 49:
+    return "1";
+  case 50:
+    return "2";
+  case 51:
+    return "3";
+  case 52:
+    return "4";
+  case 53:
+    return "5";
+  case 54:
+    return "6";
+  case 55:
+    return "7";
+  case 56:
+    return "8";
+  case 57:
+    return "9";
+  case 58:
+    return ":";
+  case 59:
+    return ";";
+  case 60:
+    return "<";
+  case 61:
+    return "=";
+  case 62:
+    return ">";
+  case 63:
+    return "?";
+  case 64:
+    return "@";
+  case 65:
+    return "A";
+  case 66:
+    return "B";
+  case 67:
+    return "C";
+  case 68:
+    return "D";
+  case 69:
+    return "E";
+  case 70:
+    return "F";
+  case 71:
+    return "G";
+  case 72:
+    return "H";
+  case 73:
+    return "I";
+  case 74:
+    return "J";
+  case 75:
+    return "K";
+  case 76:
+    return "L";
+  case 77:
+    return "M";
+  case 78:
+    return "N";
+  case 79:
+    return "O";
+  case 80:
+    return "P";
+  case 81:
+    return "Q";
+  case 82:
+    return "R";
+  case 83:
+    return "S";
+  case 84:
+    return "T";
+  case 85:
+    return "U";
+  case 86:
+    return "V";
+  case 87:
+    return "W";
+  case 88:
+    return "X";
+  case 89:
+    return "Y";
+  case 90:
+    return "Z";
+  case 91:
+    return "[";
+  case 92:
+    return "\\\\";
+  case 93:
+    return "]";
+  case 94:
+    return "^";
+  case 95:
+    return "_";
+  case 96:
+    return "`";
+  case 97:
+    return "a";
+  case 98:
+    return "b";
+  case 99:
+    return "c";
+  case 100:
+    return "d";
+  case 101:
+    return "e";
+  case 102:
+    return "f";
+  case 103:
+    return "g";
+  case 104:
+    return "h";
+  case 105:
+    return "i";
+  case 106:
+    return "j";
+  case 107:
+    return "k";
+  case 108:
+    return "l";
+  case 109:
+    return "m";
+  case 110:
+    return "n";
+  case 111:
+    return "o";
+  case 112:
+    return "p";
+  case 113:
+    return "q";
+  case 114:
+    return "r";
+  case 115:
+    return "s";
+  case 116:
+    return "t";
+  case 117:
+    return "u";
+  case 118:
+    return "v";
+  case 119:
+    return "w";
+  case 120:
+    return "x";
+  case 121:
+    return "y";
+  case 122:
+    return "z";
+  case 123:
+    return "{";
+  case 124:
+    return "|";
+  case 125:
+    return "}";
+  case 126:
+    return "~";
+  case 127:
+    return "\\x7F";
+  case 128:
+    return "\\x80";
+  case 129:
+    return "\\x81";
+  case 130:
+    return "\\x82";
+  case 131:
+    return "\\x83";
+  case 132:
+    return "\\x84";
+  case 133:
+    return "\\x85";
+  case 134:
+    return "\\x86";
+  case 135:
+    return "\\x87";
+  case 136:
+    return "\\x88";
+  case 137:
+    return "\\x89";
+  case 138:
+    return "\\x8A";
+  case 139:
+    return "\\x8B";
+  case 140:
+    return "\\x8C";
+  case 141:
+    return "\\x8D";
+  case 142:
+    return "\\x8E";
+  case 143:
+    return "\\x8F";
+  case 144:
+    return "\\x90";
+  case 145:
+    return "\\x91";
+  case 146:
+    return "\\x92";
+  case 147:
+    return "\\x93";
+  case 148:
+    return "\\x94";
+  case 149:
+    return "\\x95";
+  case 150:
+    return "\\x96";
+  case 151:
+    return "\\x97";
+  case 152:
+    return "\\x98";
+  case 153:
+    return "\\x99";
+  case 154:
+    return "\\x9A";
+  case 155:
+    return "\\x9B";
+  case 156:
+    return "\\x9C";
+  case 157:
+    return "\\x9D";
+  case 158:
+    return "\\x9E";
+  case 159:
+    return "\\x9F";
+  case 160:
+    return "\\xA0";
+  case 161:
+    return "\\xA1";
+  case 162:
+    return "\\xA2";
+  case 163:
+    return "\\xA3";
+  case 164:
+    return "\\xA4";
+  case 165:
+    return "\\xA5";
+  case 166:
+    return "\\xA6";
+  case 167:
+    return "\\xA7";
+  case 168:
+    return "\\xA8";
+  case 169:
+    return "\\xA9";
+  case 170:
+    return "\\xAA";
+  case 171:
+    return "\\xAB";
+  case 172:
+    return "\\xAC";
+  case 173:
+    return "\\xAD";
+  case 174:
+    return "\\xAE";
+  case 175:
+    return "\\xAF";
+  case 176:
+    return "\\xB0";
+  case 177:
+    return "\\xB1";
+  case 178:
+    return "\\xB2";
+  case 179:
+    return "\\xB3";
+  case 180:
+    return "\\xB4";
+  case 181:
+    return "\\xB5";
+  case 182:
+    return "\\xB6";
+  case 183:
+    return "\\xB7";
+  case 184:
+    return "\\xB8";
+  case 185:
+    return "\\xB9";
+  case 186:
+    return "\\xBA";
+  case 187:
+    return "\\xBB";
+  case 188:
+    return "\\xBC";
+  case 189:
+    return "\\xBD";
+  case 190:
+    return "\\xBE";
+  case 191:
+    return "\\xBF";
+  case 192:
+    return "\\xC0";
+  case 193:
+    return "\\xC1";
+  case 194:
+    return "\\xC2";
+  case 195:
+    return "\\xC3";
+  case 196:
+    return "\\xC4";
+  case 197:
+    return "\\xC5";
+  case 198:
+    return "\\xC6";
+  case 199:
+    return "\\xC7";
+  case 200:
+    return "\\xC8";
+  case 201:
+    return "\\xC9";
+  case 202:
+    return "\\xCA";
+  case 203:
+    return "\\xCB";
+  case 204:
+    return "\\xCC";
+  case 205:
+    return "\\xCD";
+  case 206:
+    return "\\xCE";
+  case 207:
+    return "\\xCF";
+  case 208:
+    return "\\xD0";
+  case 209:
+    return "\\xD1";
+  case 210:
+    return "\\xD2";
+  case 211:
+    return "\\xD3";
+  case 212:
+    return "\\xD4";
+  case 213:
+    return "\\xD5";
+  case 214:
+    return "\\xD6";
+  case 215:
+    return "\\xD7";
+  case 216:
+    return "\\xD8";
+  case 217:
+    return "\\xD9";
+  case 218:
+    return "\\xDA";
+  case 219:
+    return "\\xDB";
+  case 220:
+    return "\\xDC";
+  case 221:
+    return "\\xDD";
+  case 222:
+    return "\\xDE";
+  case 223:
+    return "\\xDF";
+  case 224:
+    return "\\xE0";
+  case 225:
+    return "\\xE1";
+  case 226:
+    return "\\xE2";
+  case 227:
+    return "\\xE3";
+  case 228:
+    return "\\xE4";
+  case 229:
+    return "\\xE5";
+  case 230:
+    return "\\xE6";
+  case 231:
+    return "\\xE7";
+  case 232:
+    return "\\xE8";
+  case 233:
+    return "\\xE9";
+  case 234:
+    return "\\xEA";
+  case 235:
+    return "\\xEB";
+  case 236:
+    return "\\xEC";
+  case 237:
+    return "\\xED";
+  case 238:
+    return "\\xEE";
+  case 239:
+    return "\\xEF";
+  case 240:
+    return "\\xF0";
+  case 241:
+    return "\\xF1";
+  case 242:
+    return "\\xF2";
+  case 243:
+    return "\\xF3";
+  case 244:
+    return "\\xF4";
+  case 245:
+    return "\\xF5";
+  case 246:
+    return "\\xF6";
+  case 247:
+    return "\\xF7";
+  case 248:
+    return "\\xF8";
+  case 249:
+    return "\\xF9";
+  case 250:
+    return "\\xFA";
+  case 251:
+    return "\\xFB";
+  case 252:
+    return "\\xFC";
+  case 253:
+    return "\\xFD";
+  case 254:
+    return "\\xFE";
+  case 255:
+    return "\\xFF";
+  default:
+    assert(0); /* never gets here */
+    return "dead code";
+  }
+  assert(0); /* never gets here */
+}
+
+#endif /* XML_DTD */
+
+static unsigned long
+getDebugLevel(const char *variableName, unsigned long defaultDebugLevel) {
+  const char *const valueOrNull = getenv(variableName);
+  if (valueOrNull == NULL) {
+    return defaultDebugLevel;
+  }
+  const char *const value = valueOrNull;
+
+  errno = 0;
+  char *afterValue = (char *)value;
+  unsigned long debugLevel = strtoul(value, &afterValue, 10);
+  if ((errno != 0) || (afterValue[0] != '\0')) {
+    errno = 0;
+    return defaultDebugLevel;
+  }
+
+  return debugLevel;
+}
diff --git a/Modules/expat/xmlrole.c b/Modules/expat/xmlrole.c
index 4d3e3e86e9e86..08173b0fd541d 100644
--- a/Modules/expat/xmlrole.c
+++ b/Modules/expat/xmlrole.c
@@ -7,7 +7,14 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2006 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2002-2003 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2005-2009 Steven Solie <ssolie at users.sourceforge.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -34,11 +41,9 @@
 
 #ifdef _WIN32
 #  include "winconfig.h"
-#else
-#  ifdef HAVE_EXPAT_CONFIG_H
-#    include <expat_config.h>
-#  endif
-#endif /* ndef _WIN32 */
+#endif
+
+#include <expat_config.h>
 
 #include "expat_external.h"
 #include "internal.h"
@@ -1220,6 +1225,8 @@ common(PROLOG_STATE *state, int tok) {
 #ifdef XML_DTD
   if (! state->documentEntity && tok == XML_TOK_PARAM_ENTITY_REF)
     return XML_ROLE_INNER_PARAM_ENTITY_REF;
+#else
+  UNUSED_P(tok);
 #endif
   state->handler = error;
   return XML_ROLE_ERROR;
diff --git a/Modules/expat/xmlrole.h b/Modules/expat/xmlrole.h
index 036aba64fd29c..d6e1fa150a108 100644
--- a/Modules/expat/xmlrole.h
+++ b/Modules/expat/xmlrole.h
@@ -7,7 +7,10 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/xmltok.c b/Modules/expat/xmltok.c
index 54cfedb85c28c..f2b6b406067ea 100644
--- a/Modules/expat/xmltok.c
+++ b/Modules/expat/xmltok.c
@@ -7,7 +7,19 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2001-2003 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2016 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2005-2009 Steven Solie <ssolie at users.sourceforge.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2016      Pascal Cuoq <cuoq at trust-in-soft.com>
+   Copyright (c) 2016      Don Lewis <truckman at apache.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2017      Alexander Bluhm <alexander.bluhm at gmx.net>
+   Copyright (c) 2017      Benbuck Nason <bnason at netflix.com>
+   Copyright (c) 2017      Jos? Guti?rrez de la Concha <jose at zeroc.com>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -30,26 +42,16 @@
    USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#ifdef _WIN32
-#  include "winconfig.h"
-#else
-#  ifdef HAVE_EXPAT_CONFIG_H
-#    include <expat_config.h>
-#  endif
-#endif /* ndef _WIN32 */
-
 #include <stddef.h>
 #include <string.h> /* memcpy */
+#include <stdbool.h>
 
-#if defined(_MSC_VER) && (_MSC_VER <= 1700)
-/* for vs2012/11.0/1700 and earlier Visual Studio compilers */
-#  define bool int
-#  define false 0
-#  define true 1
-#else
-#  include <stdbool.h>
+#ifdef _WIN32
+#  include "winconfig.h"
 #endif
 
+#include <expat_config.h>
+
 #include "expat_external.h"
 #include "internal.h"
 #include "xmltok.h"
@@ -269,8 +271,14 @@ sb_byteToAscii(const ENCODING *enc, const char *p) {
 
 #define IS_NAME_CHAR(enc, p, n) (AS_NORMAL_ENCODING(enc)->isName##n(enc, p))
 #define IS_NMSTRT_CHAR(enc, p, n) (AS_NORMAL_ENCODING(enc)->isNmstrt##n(enc, p))
-#define IS_INVALID_CHAR(enc, p, n)                                             \
-  (AS_NORMAL_ENCODING(enc)->isInvalid##n(enc, p))
+#ifdef XML_MIN_SIZE
+#  define IS_INVALID_CHAR(enc, p, n)                                           \
+    (AS_NORMAL_ENCODING(enc)->isInvalid##n                                     \
+     && AS_NORMAL_ENCODING(enc)->isInvalid##n(enc, p))
+#else
+#  define IS_INVALID_CHAR(enc, p, n)                                           \
+    (AS_NORMAL_ENCODING(enc)->isInvalid##n(enc, p))
+#endif
 
 #ifdef XML_MIN_SIZE
 #  define IS_NAME_CHAR_MINBPC(enc, p)                                          \
@@ -589,13 +597,13 @@ static const struct normal_encoding ascii_encoding
 static int PTRFASTCALL
 unicode_byte_type(char hi, char lo) {
   switch ((unsigned char)hi) {
-  /* 0xD800?0xDBFF first 16-bit code unit or high surrogate (W1) */
+  /* 0xD800-0xDBFF first 16-bit code unit or high surrogate (W1) */
   case 0xD8:
   case 0xD9:
   case 0xDA:
   case 0xDB:
     return BT_LEAD4;
-  /* 0xDC00?0xDFFF second 16-bit code unit or low surrogate (W2) */
+  /* 0xDC00-0xDFFF second 16-bit code unit or low surrogate (W2) */
   case 0xDC:
   case 0xDD:
   case 0xDE:
diff --git a/Modules/expat/xmltok.h b/Modules/expat/xmltok.h
index 2adbf5307befa..6f630c2f9ba96 100644
--- a/Modules/expat/xmltok.h
+++ b/Modules/expat/xmltok.h
@@ -7,7 +7,11 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002-2005 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2016-2017 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/xmltok_impl.c b/Modules/expat/xmltok_impl.c
index c209221cd79d1..0430591b42636 100644
--- a/Modules/expat/xmltok_impl.c
+++ b/Modules/expat/xmltok_impl.c
@@ -1,4 +1,4 @@
-/* This file is included!
+/* This file is included (from xmltok.c, 1-3 times depending on XML_MIN_SIZE)!
                             __  __            _
                          ___\ \/ /_ __   __ _| |_
                         / _ \\  /| '_ \ / _` | __|
@@ -7,7 +7,15 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002-2016 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2018      Benjamin Peterson <benjamin at python.org>
+   Copyright (c) 2018      Anton Maklakov <antmak.pub at gmail.com>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
+   Copyright (c) 2020      Boris Kolpackov <boris at codesynthesis.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -32,7 +40,7 @@
 
 #ifdef XML_TOK_IMPL_C
 
-#  ifndef IS_INVALID_CHAR
+#  ifndef IS_INVALID_CHAR // i.e. for UTF-16 and XML_MIN_SIZE not defined
 #    define IS_INVALID_CHAR(enc, ptr, n) (0)
 #  endif
 
@@ -1768,13 +1776,14 @@ PREFIX(updatePosition)(const ENCODING *enc, const char *ptr, const char *end,
 #  define LEAD_CASE(n)                                                         \
   case BT_LEAD##n:                                                             \
     ptr += n;                                                                  \
+    pos->columnNumber++;                                                       \
     break;
       LEAD_CASE(2)
       LEAD_CASE(3)
       LEAD_CASE(4)
 #  undef LEAD_CASE
     case BT_LF:
-      pos->columnNumber = (XML_Size)-1;
+      pos->columnNumber = 0;
       pos->lineNumber++;
       ptr += MINBPC(enc);
       break;
@@ -1783,13 +1792,13 @@ PREFIX(updatePosition)(const ENCODING *enc, const char *ptr, const char *end,
       ptr += MINBPC(enc);
       if (HAS_CHAR(enc, ptr, end) && BYTE_TYPE(enc, ptr) == BT_LF)
         ptr += MINBPC(enc);
-      pos->columnNumber = (XML_Size)-1;
+      pos->columnNumber = 0;
       break;
     default:
       ptr += MINBPC(enc);
+      pos->columnNumber++;
       break;
     }
-    pos->columnNumber++;
   }
 }
 
diff --git a/Modules/expat/xmltok_impl.h b/Modules/expat/xmltok_impl.h
index e925dbc7e2c83..c518aada013df 100644
--- a/Modules/expat/xmltok_impl.h
+++ b/Modules/expat/xmltok_impl.h
@@ -7,7 +7,8 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2017-2019 Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/xmltok_ns.c b/Modules/expat/xmltok_ns.c
index e1b46a7c04c4e..5fd8392235940 100644
--- a/Modules/expat/xmltok_ns.c
+++ b/Modules/expat/xmltok_ns.c
@@ -7,7 +7,11 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002-2006 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -89,7 +93,7 @@ NS(XmlInitEncoding)(INIT_ENCODING *p, const ENCODING **encPtr,
 static const ENCODING *
 NS(findEncoding)(const ENCODING *enc, const char *ptr, const char *end) {
 #  define ENCODING_MAX 128
-  char buf[ENCODING_MAX] = {0};
+  char buf[ENCODING_MAX];
   char *p = buf;
   int i;
   XmlUtf8Convert(enc, &ptr, end, &p, p + ENCODING_MAX - 1);


From webhook-mailer at python.org  Sun Aug 29 10:43:47 2021
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 29 Aug 2021 14:43:47 -0000
Subject: [Python-checkins] bpo-43124: Fix smtplib multiple CRLF injection
 (GH-25987)
Message-ID: <mailman.1240.1630248229.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/9e6c317ab133cd8fa48d5ecd8568314ef2e98634
commit: 9e6c317ab133cd8fa48d5ecd8568314ef2e98634
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-29T07:43:39-07:00
summary:

bpo-43124: Fix smtplib multiple CRLF injection (GH-25987)


Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 0897253f426068ea6a6fbe0ada01689af9ef1019)

Co-authored-by: Miguel Brito <5544985+miguendes at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst
M Lib/smtplib.py
M Lib/test/test_smtplib.py

diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index 7e984e8c0fa1a1..324a1c19f12afe 100755
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -367,10 +367,15 @@ def send(self, s):
     def putcmd(self, cmd, args=""):
         """Send a command to the server."""
         if args == "":
-            str = '%s%s' % (cmd, CRLF)
+            s = cmd
         else:
-            str = '%s %s%s' % (cmd, args, CRLF)
-        self.send(str)
+            s = f'{cmd} {args}'
+        if '\r' in s or '\n' in s:
+            s = s.replace('\n', '\\n').replace('\r', '\\r')
+            raise ValueError(
+                f'command and arguments contain prohibited newline characters: {s}'
+            )
+        self.send(f'{s}{CRLF}')
 
     def getreply(self):
         """Get a reply from the server.
diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py
index 483d747ee6a495..9761a372517315 100644
--- a/Lib/test/test_smtplib.py
+++ b/Lib/test/test_smtplib.py
@@ -336,6 +336,16 @@ def testEXPNNotImplemented(self):
         self.assertEqual(smtp.getreply(), expected)
         smtp.quit()
 
+    def test_issue43124_putcmd_escapes_newline(self):
+        # see: https://bugs.python.org/issue43124
+        smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost',
+                            timeout=support.LOOPBACK_TIMEOUT)
+        self.addCleanup(smtp.close)
+        with self.assertRaises(ValueError) as exc:
+            smtp.putcmd('helo\nX-INJECTED')
+        self.assertIn("prohibited newline characters", str(exc.exception))
+        smtp.quit()
+
     def testVRFY(self):
         smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost',
                             timeout=support.LOOPBACK_TIMEOUT)
@@ -417,6 +427,51 @@ def testSendNeedingDotQuote(self):
         mexpect = '%s%s\n%s' % (MSG_BEGIN, m, MSG_END)
         self.assertEqual(self.output.getvalue(), mexpect)
 
+    def test_issue43124_escape_localhostname(self):
+        # see: https://bugs.python.org/issue43124
+        # connect and send mail
+        m = 'wazzuuup\nlinetwo'
+        smtp = smtplib.SMTP(HOST, self.port, local_hostname='hi\nX-INJECTED',
+                            timeout=support.LOOPBACK_TIMEOUT)
+        self.addCleanup(smtp.close)
+        with self.assertRaises(ValueError) as exc:
+            smtp.sendmail("hi at me.com", "you at me.com", m)
+        self.assertIn(
+            "prohibited newline characters: ehlo hi\\nX-INJECTED",
+            str(exc.exception),
+        )
+        # XXX (see comment in testSend)
+        time.sleep(0.01)
+        smtp.quit()
+
+        debugout = smtpd.DEBUGSTREAM.getvalue()
+        self.assertNotIn("X-INJECTED", debugout)
+
+    def test_issue43124_escape_options(self):
+        # see: https://bugs.python.org/issue43124
+        # connect and send mail
+        m = 'wazzuuup\nlinetwo'
+        smtp = smtplib.SMTP(
+            HOST, self.port, local_hostname='localhost',
+            timeout=support.LOOPBACK_TIMEOUT)
+
+        self.addCleanup(smtp.close)
+        smtp.sendmail("hi at me.com", "you at me.com", m)
+        with self.assertRaises(ValueError) as exc:
+            smtp.mail("hi at me.com", ["X-OPTION\nX-INJECTED-1", "X-OPTION2\nX-INJECTED-2"])
+        msg = str(exc.exception)
+        self.assertIn("prohibited newline characters", msg)
+        self.assertIn("X-OPTION\\nX-INJECTED-1 X-OPTION2\\nX-INJECTED-2", msg)
+        # XXX (see comment in testSend)
+        time.sleep(0.01)
+        smtp.quit()
+
+        debugout = smtpd.DEBUGSTREAM.getvalue()
+        self.assertNotIn("X-OPTION", debugout)
+        self.assertNotIn("X-OPTION2", debugout)
+        self.assertNotIn("X-INJECTED-1", debugout)
+        self.assertNotIn("X-INJECTED-2", debugout)
+
     def testSendNullSender(self):
         m = 'A test message'
         smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost',
diff --git a/Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst b/Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst
new file mode 100644
index 00000000000000..e897d6cd3641d7
--- /dev/null
+++ b/Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst
@@ -0,0 +1,2 @@
+Made the internal ``putcmd`` function in :mod:`smtplib` sanitize input for
+presence of ``\r`` and ``\n`` characters to avoid (unlikely) command injection.


From webhook-mailer at python.org  Sun Aug 29 10:45:29 2021
From: webhook-mailer at python.org (ambv)
Date: Sun, 29 Aug 2021 14:45:29 -0000
Subject: [Python-checkins] bpo-43124: Fix smtplib multiple CRLF injection
 (GH-25987) (GH-28035)
Message-ID: <mailman.1241.1630248330.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/24416e419194f11b639146c0d8bed9df315aca5a
commit: 24416e419194f11b639146c0d8bed9df315aca5a
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-29T16:45:25+02:00
summary:

bpo-43124: Fix smtplib multiple CRLF injection (GH-25987) (GH-28035)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 0897253f426068ea6a6fbe0ada01689af9ef1019)

Co-authored-by: Miguel Brito <5544985+miguendes at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst
M Lib/smtplib.py
M Lib/test/test_smtplib.py

diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index 4a5ca669f6926..b1fd45a003db6 100755
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -367,10 +367,15 @@ def send(self, s):
     def putcmd(self, cmd, args=""):
         """Send a command to the server."""
         if args == "":
-            str = '%s%s' % (cmd, CRLF)
+            s = cmd
         else:
-            str = '%s %s%s' % (cmd, args, CRLF)
-        self.send(str)
+            s = f'{cmd} {args}'
+        if '\r' in s or '\n' in s:
+            s = s.replace('\n', '\\n').replace('\r', '\\r')
+            raise ValueError(
+                f'command and arguments contain prohibited newline characters: {s}'
+            )
+        self.send(f'{s}{CRLF}')
 
     def getreply(self):
         """Get a reply from the server.
diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py
index c8c4d3ce49910..52e9d6beecfa0 100644
--- a/Lib/test/test_smtplib.py
+++ b/Lib/test/test_smtplib.py
@@ -332,6 +332,16 @@ def testEXPNNotImplemented(self):
         self.assertEqual(smtp.getreply(), expected)
         smtp.quit()
 
+    def test_issue43124_putcmd_escapes_newline(self):
+        # see: https://bugs.python.org/issue43124
+        smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost',
+                            timeout=support.LOOPBACK_TIMEOUT)
+        self.addCleanup(smtp.close)
+        with self.assertRaises(ValueError) as exc:
+            smtp.putcmd('helo\nX-INJECTED')
+        self.assertIn("prohibited newline characters", str(exc.exception))
+        smtp.quit()
+
     def testVRFY(self):
         smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost',
                             timeout=support.LOOPBACK_TIMEOUT)
@@ -413,6 +423,51 @@ def testSendNeedingDotQuote(self):
         mexpect = '%s%s\n%s' % (MSG_BEGIN, m, MSG_END)
         self.assertEqual(self.output.getvalue(), mexpect)
 
+    def test_issue43124_escape_localhostname(self):
+        # see: https://bugs.python.org/issue43124
+        # connect and send mail
+        m = 'wazzuuup\nlinetwo'
+        smtp = smtplib.SMTP(HOST, self.port, local_hostname='hi\nX-INJECTED',
+                            timeout=support.LOOPBACK_TIMEOUT)
+        self.addCleanup(smtp.close)
+        with self.assertRaises(ValueError) as exc:
+            smtp.sendmail("hi at me.com", "you at me.com", m)
+        self.assertIn(
+            "prohibited newline characters: ehlo hi\\nX-INJECTED",
+            str(exc.exception),
+        )
+        # XXX (see comment in testSend)
+        time.sleep(0.01)
+        smtp.quit()
+
+        debugout = smtpd.DEBUGSTREAM.getvalue()
+        self.assertNotIn("X-INJECTED", debugout)
+
+    def test_issue43124_escape_options(self):
+        # see: https://bugs.python.org/issue43124
+        # connect and send mail
+        m = 'wazzuuup\nlinetwo'
+        smtp = smtplib.SMTP(
+            HOST, self.port, local_hostname='localhost',
+            timeout=support.LOOPBACK_TIMEOUT)
+
+        self.addCleanup(smtp.close)
+        smtp.sendmail("hi at me.com", "you at me.com", m)
+        with self.assertRaises(ValueError) as exc:
+            smtp.mail("hi at me.com", ["X-OPTION\nX-INJECTED-1", "X-OPTION2\nX-INJECTED-2"])
+        msg = str(exc.exception)
+        self.assertIn("prohibited newline characters", msg)
+        self.assertIn("X-OPTION\\nX-INJECTED-1 X-OPTION2\\nX-INJECTED-2", msg)
+        # XXX (see comment in testSend)
+        time.sleep(0.01)
+        smtp.quit()
+
+        debugout = smtpd.DEBUGSTREAM.getvalue()
+        self.assertNotIn("X-OPTION", debugout)
+        self.assertNotIn("X-OPTION2", debugout)
+        self.assertNotIn("X-INJECTED-1", debugout)
+        self.assertNotIn("X-INJECTED-2", debugout)
+
     def testSendNullSender(self):
         m = 'A test message'
         smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost',
diff --git a/Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst b/Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst
new file mode 100644
index 0000000000000..e897d6cd3641d
--- /dev/null
+++ b/Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst
@@ -0,0 +1,2 @@
+Made the internal ``putcmd`` function in :mod:`smtplib` sanitize input for
+presence of ``\r`` and ``\n`` characters to avoid (unlikely) command injection.


From webhook-mailer at python.org  Sun Aug 29 11:04:28 2021
From: webhook-mailer at python.org (ambv)
Date: Sun, 29 Aug 2021 15:04:28 -0000
Subject: [Python-checkins] [3.8] bpo-43124: Fix smtplib multiple CRLF
 injection (GH-25987) (GH-28036)
Message-ID: <mailman.1242.1630249470.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/b93aea4c7e4553950daa5d47c3ef2dc8a9c4edff
commit: b93aea4c7e4553950daa5d47c3ef2dc8a9c4edff
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-29T17:04:17+02:00
summary:

[3.8] bpo-43124: Fix smtplib multiple CRLF injection (GH-25987) (GH-28036)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 0897253f426068ea6a6fbe0ada01689af9ef1019)

Co-authored-by: Miguel Brito <5544985+miguendes at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst
M Lib/smtplib.py
M Lib/test/test_smtplib.py

diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index 4c5ba7e10d0d9..9c390db0bfa7d 100755
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -365,10 +365,15 @@ def send(self, s):
     def putcmd(self, cmd, args=""):
         """Send a command to the server."""
         if args == "":
-            str = '%s%s' % (cmd, CRLF)
+            s = cmd
         else:
-            str = '%s %s%s' % (cmd, args, CRLF)
-        self.send(str)
+            s = f'{cmd} {args}'
+        if '\r' in s or '\n' in s:
+            s = s.replace('\n', '\\n').replace('\r', '\\r')
+            raise ValueError(
+                f'command and arguments contain prohibited newline characters: {s}'
+            )
+        self.send(f'{s}{CRLF}')
 
     def getreply(self):
         """Get a reply from the server.
diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py
index c9205ae7ffa50..d14eb455bc9ed 100644
--- a/Lib/test/test_smtplib.py
+++ b/Lib/test/test_smtplib.py
@@ -294,6 +294,16 @@ def testEXPNNotImplemented(self):
         self.assertEqual(smtp.getreply(), expected)
         smtp.quit()
 
+    def test_issue43124_putcmd_escapes_newline(self):
+        # see: https://bugs.python.org/issue43124
+        smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost',
+                            timeout=10)  # support.LOOPBACK_TIMEOUT in newer Pythons
+        self.addCleanup(smtp.close)
+        with self.assertRaises(ValueError) as exc:
+            smtp.putcmd('helo\nX-INJECTED')
+        self.assertIn("prohibited newline characters", str(exc.exception))
+        smtp.quit()
+
     def testVRFY(self):
         smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=3)
         self.addCleanup(smtp.close)
@@ -369,6 +379,51 @@ def testSendNeedingDotQuote(self):
         mexpect = '%s%s\n%s' % (MSG_BEGIN, m, MSG_END)
         self.assertEqual(self.output.getvalue(), mexpect)
 
+    def test_issue43124_escape_localhostname(self):
+        # see: https://bugs.python.org/issue43124
+        # connect and send mail
+        m = 'wazzuuup\nlinetwo'
+        smtp = smtplib.SMTP(HOST, self.port, local_hostname='hi\nX-INJECTED',
+                            timeout=10)  # support.LOOPBACK_TIMEOUT in newer Pythons
+        self.addCleanup(smtp.close)
+        with self.assertRaises(ValueError) as exc:
+            smtp.sendmail("hi at me.com", "you at me.com", m)
+        self.assertIn(
+            "prohibited newline characters: ehlo hi\\nX-INJECTED",
+            str(exc.exception),
+        )
+        # XXX (see comment in testSend)
+        time.sleep(0.01)
+        smtp.quit()
+
+        debugout = smtpd.DEBUGSTREAM.getvalue()
+        self.assertNotIn("X-INJECTED", debugout)
+
+    def test_issue43124_escape_options(self):
+        # see: https://bugs.python.org/issue43124
+        # connect and send mail
+        m = 'wazzuuup\nlinetwo'
+        smtp = smtplib.SMTP(
+            HOST, self.port, local_hostname='localhost',
+            timeout=10)  # support.LOOPBACK_TIMEOUT in newer Pythons
+
+        self.addCleanup(smtp.close)
+        smtp.sendmail("hi at me.com", "you at me.com", m)
+        with self.assertRaises(ValueError) as exc:
+            smtp.mail("hi at me.com", ["X-OPTION\nX-INJECTED-1", "X-OPTION2\nX-INJECTED-2"])
+        msg = str(exc.exception)
+        self.assertIn("prohibited newline characters", msg)
+        self.assertIn("X-OPTION\\nX-INJECTED-1 X-OPTION2\\nX-INJECTED-2", msg)
+        # XXX (see comment in testSend)
+        time.sleep(0.01)
+        smtp.quit()
+
+        debugout = smtpd.DEBUGSTREAM.getvalue()
+        self.assertNotIn("X-OPTION", debugout)
+        self.assertNotIn("X-OPTION2", debugout)
+        self.assertNotIn("X-INJECTED-1", debugout)
+        self.assertNotIn("X-INJECTED-2", debugout)
+
     def testSendNullSender(self):
         m = 'A test message'
         smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=3)
diff --git a/Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst b/Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst
new file mode 100644
index 0000000000000..e897d6cd3641d
--- /dev/null
+++ b/Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst
@@ -0,0 +1,2 @@
+Made the internal ``putcmd`` function in :mod:`smtplib` sanitize input for
+presence of ``\r`` and ``\n`` characters to avoid (unlikely) command injection.


From webhook-mailer at python.org  Sun Aug 29 11:07:56 2021
From: webhook-mailer at python.org (ambv)
Date: Sun, 29 Aug 2021 15:07:56 -0000
Subject: [Python-checkins] [3.9] bpo-45007: Update to OpenSSL 1.1.1l in
 Windows build and CI (GH-28009) (GH-28040)
Message-ID: <mailman.1243.1630249678.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/5720bcac7b08fe961835927933601da18b92bcd1
commit: 5720bcac7b08fe961835927933601da18b92bcd1
branch: 3.9
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2021-08-29T17:07:45+02:00
summary:

[3.9] bpo-45007: Update to OpenSSL 1.1.1l in Windows build and CI (GH-28009) (GH-28040)

(cherry picked from commit d3bdbbf9a4352a24fc2bfc7a63a024b244b61aba)

Co-authored-by: Steve Dower <steve.dower at python.org>

files:
A Misc/NEWS.d/next/Windows/2021-08-27-23-50-02.bpo-45007.NIBlVG.rst
M .azure-pipelines/ci.yml
M .azure-pipelines/pr.yml
M .github/workflows/build.yml
M PCbuild/get_externals.bat
M PCbuild/python.props

diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml
index 0fe754bb071ea3..2284a5fb36b195 100644
--- a/.azure-pipelines/ci.yml
+++ b/.azure-pipelines/ci.yml
@@ -1,14 +1,14 @@
 variables:
   coverage: false
 
-trigger: ['master', '3.9', '3.8', '3.7']
+trigger: ['main', '3.10', '3.9', '3.8', '3.7']
 
 jobs:
 - job: Prebuild
   displayName: Pre-build checks
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   steps:
   - template: ./prebuild-checks.yml
@@ -20,7 +20,7 @@ jobs:
   condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   steps:
   - template: ./docs-steps.yml
@@ -40,7 +40,7 @@ jobs:
     testRunPlatform: macos
 
   pool:
-    vmImage: macos-10.14
+    vmImage: macos-10.15
 
   steps:
   - template: ./macos-steps.yml
@@ -52,12 +52,12 @@ jobs:
   condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   variables:
     testRunTitle: '$(build.sourceBranchName)-linux'
     testRunPlatform: linux
-    openssl_version: 1.1.1k
+    openssl_version: 1.1.1l
 
   steps:
   - template: ./posix-steps.yml
@@ -78,12 +78,12 @@ jobs:
     )
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   variables:
     testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
     testRunPlatform: linux-coverage
-    openssl_version: 1.1.1k
+    openssl_version: 1.1.1l
 
   steps:
   - template: ./posix-steps.yml
diff --git a/.azure-pipelines/pr.yml b/.azure-pipelines/pr.yml
index 2d32e6d49bcc0e..1a3bf75ed4c1ea 100644
--- a/.azure-pipelines/pr.yml
+++ b/.azure-pipelines/pr.yml
@@ -1,14 +1,14 @@
 variables:
   coverage: false
 
-pr: ['master', '3.9', '3.8', '3.7']
+pr: ['main', '3.10', '3.9', '3.8', '3.7']
 
 jobs:
 - job: Prebuild
   displayName: Pre-build checks
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   steps:
   - template: ./prebuild-checks.yml
@@ -20,7 +20,7 @@ jobs:
   condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   steps:
   - template: ./docs-steps.yml
@@ -38,7 +38,7 @@ jobs:
     testRunPlatform: macos
 
   pool:
-    vmImage: macos-10.14
+    vmImage: macos-10.15
 
   steps:
   - template: ./macos-steps.yml
@@ -52,12 +52,12 @@ jobs:
   condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   variables:
     testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
     testRunPlatform: linux
-    openssl_version: 1.1.1k
+    openssl_version: 1.1.1l
 
   steps:
   - template: ./posix-steps.yml
@@ -78,12 +78,12 @@ jobs:
     )
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   variables:
     testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
     testRunPlatform: linux-coverage
-    openssl_version: 1.1.1k
+    openssl_version: 1.1.1l
 
   steps:
   - template: ./posix-steps.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3c0a41478e2ed1..e37e1d3cf1855f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -152,7 +152,7 @@ jobs:
     needs: check_source
     if: needs.check_source.outputs.run_tests == 'true'
     env:
-      OPENSSL_VER: 1.1.1k
+      OPENSSL_VER: 1.1.1l
       PYTHONSTRICTEXTENSIONBUILD: 1
     steps:
     - uses: actions/checkout at v2
@@ -194,7 +194,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        openssl_ver: [1.0.2u, 1.1.0l, 1.1.1k, 3.0.0-alpha16]
+        openssl_ver: [1.0.2u, 1.1.0l, 1.1.1l, 3.0.0-beta1]
     env:
       OPENSSL_VER: ${{ matrix.openssl_ver }}
       MULTISSL_DIR: ${{ github.workspace }}/multissl
diff --git a/Misc/NEWS.d/next/Windows/2021-08-27-23-50-02.bpo-45007.NIBlVG.rst b/Misc/NEWS.d/next/Windows/2021-08-27-23-50-02.bpo-45007.NIBlVG.rst
new file mode 100644
index 00000000000000..fa076ee4c8b8ad
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2021-08-27-23-50-02.bpo-45007.NIBlVG.rst
@@ -0,0 +1 @@
+Update to OpenSSL 1.1.1l in Windows build
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index dbd2ff1afd78ba..d975f05d8f3a94 100644
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -53,7 +53,7 @@ echo.Fetching external libraries...
 set libraries=
 set libraries=%libraries%                                       bzip2-1.0.6
 if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries%  libffi-3.3.0
-if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries%     openssl-1.1.1k
+if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries%     openssl-1.1.1l
 set libraries=%libraries%                                       sqlite-3.35.5.0
 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.9.0
 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.9.0
@@ -77,7 +77,7 @@ echo.Fetching external binaries...
 
 set binaries=
 if NOT "%IncludeLibffi%"=="false"  set binaries=%binaries% libffi-3.3.0
-if NOT "%IncludeSSL%"=="false"     set binaries=%binaries% openssl-bin-1.1.1k-1
+if NOT "%IncludeSSL%"=="false"     set binaries=%binaries% openssl-bin-1.1.1l
 if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.9.0
 if NOT "%IncludeSSLSrc%"=="false"  set binaries=%binaries% nasm-2.11.06
 
diff --git a/PCbuild/python.props b/PCbuild/python.props
index da65df58e227d9..42c67de4afa343 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -63,8 +63,8 @@
     <libffiDir>$(ExternalsDir)libffi-3.3.0\</libffiDir>
     <libffiOutDir>$(ExternalsDir)libffi-3.3.0\$(ArchName)\</libffiOutDir>
     <libffiIncludeDir>$(libffiOutDir)include</libffiIncludeDir>
-    <opensslDir>$(ExternalsDir)openssl-1.1.1k\</opensslDir>
-    <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1k-1\$(ArchName)\</opensslOutDir>
+    <opensslDir>$(ExternalsDir)openssl-1.1.1l\</opensslDir>
+    <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1l\$(ArchName)\</opensslOutDir>
     <opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir>
     <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
     <zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir>


From webhook-mailer at python.org  Sun Aug 29 12:27:09 2021
From: webhook-mailer at python.org (ambv)
Date: Sun, 29 Aug 2021 16:27:09 -0000
Subject: [Python-checkins] [3.8] bpo-45007: Update to OpenSSL 1.1.1l in
 Windows build and CI (GH-28009) (GH-28041)
Message-ID: <mailman.1244.1630254430.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/803c60789b5b6566cb0b71f6b83464e61731d09b
commit: 803c60789b5b6566cb0b71f6b83464e61731d09b
branch: 3.8
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2021-08-29T18:27:01+02:00
summary:

[3.8] bpo-45007: Update to OpenSSL 1.1.1l in Windows build and CI (GH-28009) (GH-28041)

(cherry picked from commit d3bdbbf9a4352a24fc2bfc7a63a024b244b61aba)

Co-authored-by: Steve Dower <steve.dower at python.org>

files:
A Misc/NEWS.d/next/Windows/2021-08-27-23-50-02.bpo-45007.NIBlVG.rst
M .azure-pipelines/ci.yml
M .azure-pipelines/pr.yml
M .github/workflows/build.yml
M PCbuild/get_externals.bat
M PCbuild/python.props

diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml
index 0fe754bb071ea3..2284a5fb36b195 100644
--- a/.azure-pipelines/ci.yml
+++ b/.azure-pipelines/ci.yml
@@ -1,14 +1,14 @@
 variables:
   coverage: false
 
-trigger: ['master', '3.9', '3.8', '3.7']
+trigger: ['main', '3.10', '3.9', '3.8', '3.7']
 
 jobs:
 - job: Prebuild
   displayName: Pre-build checks
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   steps:
   - template: ./prebuild-checks.yml
@@ -20,7 +20,7 @@ jobs:
   condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   steps:
   - template: ./docs-steps.yml
@@ -40,7 +40,7 @@ jobs:
     testRunPlatform: macos
 
   pool:
-    vmImage: macos-10.14
+    vmImage: macos-10.15
 
   steps:
   - template: ./macos-steps.yml
@@ -52,12 +52,12 @@ jobs:
   condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   variables:
     testRunTitle: '$(build.sourceBranchName)-linux'
     testRunPlatform: linux
-    openssl_version: 1.1.1k
+    openssl_version: 1.1.1l
 
   steps:
   - template: ./posix-steps.yml
@@ -78,12 +78,12 @@ jobs:
     )
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   variables:
     testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
     testRunPlatform: linux-coverage
-    openssl_version: 1.1.1k
+    openssl_version: 1.1.1l
 
   steps:
   - template: ./posix-steps.yml
diff --git a/.azure-pipelines/pr.yml b/.azure-pipelines/pr.yml
index 2d32e6d49bcc0e..1a3bf75ed4c1ea 100644
--- a/.azure-pipelines/pr.yml
+++ b/.azure-pipelines/pr.yml
@@ -1,14 +1,14 @@
 variables:
   coverage: false
 
-pr: ['master', '3.9', '3.8', '3.7']
+pr: ['main', '3.10', '3.9', '3.8', '3.7']
 
 jobs:
 - job: Prebuild
   displayName: Pre-build checks
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   steps:
   - template: ./prebuild-checks.yml
@@ -20,7 +20,7 @@ jobs:
   condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   steps:
   - template: ./docs-steps.yml
@@ -38,7 +38,7 @@ jobs:
     testRunPlatform: macos
 
   pool:
-    vmImage: macos-10.14
+    vmImage: macos-10.15
 
   steps:
   - template: ./macos-steps.yml
@@ -52,12 +52,12 @@ jobs:
   condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   variables:
     testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
     testRunPlatform: linux
-    openssl_version: 1.1.1k
+    openssl_version: 1.1.1l
 
   steps:
   - template: ./posix-steps.yml
@@ -78,12 +78,12 @@ jobs:
     )
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   variables:
     testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
     testRunPlatform: linux-coverage
-    openssl_version: 1.1.1k
+    openssl_version: 1.1.1l
 
   steps:
   - template: ./posix-steps.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 79d7efa7684bea..29810c4df1cc5b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -143,7 +143,7 @@ jobs:
     needs: check_source
     if: needs.check_source.outputs.run_tests == 'true'
     env:
-      OPENSSL_VER: 1.1.1k
+      OPENSSL_VER: 1.1.1l
     steps:
     - uses: actions/checkout at v2
     - name: Install Dependencies
@@ -184,7 +184,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        openssl_ver: [1.0.2u, 1.1.0l, 1.1.1k, 3.0.0-alpha14]
+        openssl_ver: [1.0.2u, 1.1.0l, 1.1.1l, 3.0.0-beta1]
     env:
       OPENSSL_VER: ${{ matrix.openssl_ver }}
       MULTISSL_DIR: ${{ github.workspace }}/multissl
diff --git a/Misc/NEWS.d/next/Windows/2021-08-27-23-50-02.bpo-45007.NIBlVG.rst b/Misc/NEWS.d/next/Windows/2021-08-27-23-50-02.bpo-45007.NIBlVG.rst
new file mode 100644
index 00000000000000..fa076ee4c8b8ad
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2021-08-27-23-50-02.bpo-45007.NIBlVG.rst
@@ -0,0 +1 @@
+Update to OpenSSL 1.1.1l in Windows build
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index d818f9d7006016..ad92c303ee5368 100644
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -53,7 +53,7 @@ echo.Fetching external libraries...
 set libraries=
 set libraries=%libraries%                                       bzip2-1.0.6
 if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries%  libffi-3.3.0-rc0-r1
-if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries%     openssl-1.1.1k
+if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries%     openssl-1.1.1l
 set libraries=%libraries%                                       sqlite-3.35.5.0
 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.9.0
 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.9.0
@@ -77,7 +77,7 @@ echo.Fetching external binaries...
 
 set binaries=
 if NOT "%IncludeLibffi%"=="false"  set binaries=%binaries% libffi
-if NOT "%IncludeSSL%"=="false"     set binaries=%binaries% openssl-bin-1.1.1k-1
+if NOT "%IncludeSSL%"=="false"     set binaries=%binaries% openssl-bin-1.1.1l
 if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.9.0
 if NOT "%IncludeSSLSrc%"=="false"  set binaries=%binaries% nasm-2.11.06
 
diff --git a/PCbuild/python.props b/PCbuild/python.props
index 419d5ebe84c2d1..6e03cc762da76e 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -62,8 +62,8 @@
     <libffiDir>$(ExternalsDir)libffi\</libffiDir>
     <libffiOutDir>$(ExternalsDir)libffi\$(ArchName)\</libffiOutDir>
     <libffiIncludeDir>$(libffiOutDir)include</libffiIncludeDir>
-    <opensslDir>$(ExternalsDir)openssl-1.1.1k\</opensslDir>
-    <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1k-1\$(ArchName)\</opensslOutDir>
+    <opensslDir>$(ExternalsDir)openssl-1.1.1l\</opensslDir>
+    <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1l\$(ArchName)\</opensslOutDir>
     <opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir>
     <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
     <zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir>


From webhook-mailer at python.org  Mon Aug 30 02:56:03 2021
From: webhook-mailer at python.org (ned-deily)
Date: Mon, 30 Aug 2021 06:56:03 -0000
Subject: [Python-checkins] bpo-44689: ctypes.util.find_library() now finds
 macOS 11+ system libraries when built on older macOS systems (#27251)
Message-ID: <mailman.1245.1630306564.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/71853a73024a98aa38a3c0444fe364dbd9709134
commit: 71853a73024a98aa38a3c0444fe364dbd9709134
branch: main
author: Tobias Bergkvist <tobias at bergkv.ist>
committer: ned-deily <nad at python.org>
date: 2021-08-30T02:55:47-04:00
summary:

bpo-44689: ctypes.util.find_library() now finds macOS 11+ system libraries when built on older macOS systems (#27251)

Previously, when built on older macOS systems, `find_library` was not able to find macOS system libraries when running on Big Sur due to changes in how system libraries are stored.

files:
A Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst
M Modules/_ctypes/callproc.c

diff --git a/Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst b/Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst
new file mode 100644
index 00000000000000..b1e878d1ee44af
--- /dev/null
+++ b/Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst
@@ -0,0 +1,5 @@
+ :meth:`ctypes.util.find_library` now works correctly on macOS 11 Big Sur
+ even if Python is built on an older version of macOS.  Previously, when
+ built on older macOS systems, ``find_library`` was not able to find
+ macOS system libraries when running on Big Sur due to changes in
+ how system libraries are stored.
diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
index 56ccc2f1e0b5da..f8f8efa4ee8793 100644
--- a/Modules/_ctypes/callproc.c
+++ b/Modules/_ctypes/callproc.c
@@ -1442,14 +1442,37 @@ copy_com_pointer(PyObject *self, PyObject *args)
     return r;
 }
 #else
-
+#ifdef __APPLE__
 #ifdef HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH
+#define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME \
+    __builtin_available(macOS 11.0, iOS 14.0, tvOS 14.0, watchOS 7.0, *)
+#else
+// Support the deprecated case of compiling on an older macOS version
+static void *libsystem_b_handle;
+static bool (*_dyld_shared_cache_contains_path)(const char *path);
+
+__attribute__((constructor)) void load_dyld_shared_cache_contains_path(void) {
+    libsystem_b_handle = dlopen("/usr/lib/libSystem.B.dylib", RTLD_LAZY);
+    if (libsystem_b_handle != NULL) {
+        _dyld_shared_cache_contains_path = dlsym(libsystem_b_handle, "_dyld_shared_cache_contains_path");
+    }
+}
+
+__attribute__((destructor)) void unload_dyld_shared_cache_contains_path(void) {
+    if (libsystem_b_handle != NULL) {
+        dlclose(libsystem_b_handle);
+    }
+}
+#define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME \
+    _dyld_shared_cache_contains_path != NULL
+#endif
+
 static PyObject *py_dyld_shared_cache_contains_path(PyObject *self, PyObject *args)
 {
      PyObject *name, *name2;
      char *name_str;
 
-     if (__builtin_available(macOS 11.0, iOS 14.0, tvOS 14.0, watchOS 7.0, *)) {
+     if (HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME) {
          int r;
 
          if (!PyArg_ParseTuple(args, "O", &name))
@@ -1992,7 +2015,7 @@ PyMethodDef _ctypes_module_methods[] = {
     {"dlclose", py_dl_close, METH_VARARGS, "dlclose a library"},
     {"dlsym", py_dl_sym, METH_VARARGS, "find symbol in shared library"},
 #endif
-#ifdef HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH
+#ifdef __APPLE__
      {"_dyld_shared_cache_contains_path", py_dyld_shared_cache_contains_path, METH_VARARGS, "check if path is in the shared cache"},
 #endif
     {"alignment", align_func, METH_O, alignment_doc},


From webhook-mailer at python.org  Mon Aug 30 03:10:29 2021
From: webhook-mailer at python.org (ned-deily)
Date: Mon, 30 Aug 2021 07:10:29 -0000
Subject: [Python-checkins] bpo 45007: Update macOS installer builds to use
 OpenSSL 1.1.1l. (GH-28051)
Message-ID: <mailman.1246.1630307430.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/94b2639fad50d7ff8acd12c11e5fe5f9a6e1da5c
commit: 94b2639fad50d7ff8acd12c11e5fe5f9a6e1da5c
branch: main
author: Ned Deily <nad at python.org>
committer: ned-deily <nad at python.org>
date: 2021-08-30T03:10:21-04:00
summary:

bpo 45007: Update macOS installer builds to use OpenSSL 1.1.1l. (GH-28051)

files:
A Mac/BuildScript/0001-Darwin-platform-allows-to-build-on-releases-before-Y.patch
A Misc/NEWS.d/next/macOS/2021-08-30-00-04-10.bpo-45007.pixqUB.rst
M Mac/BuildScript/build-installer.py

diff --git a/Mac/BuildScript/0001-Darwin-platform-allows-to-build-on-releases-before-Y.patch b/Mac/BuildScript/0001-Darwin-platform-allows-to-build-on-releases-before-Y.patch
new file mode 100644
index 00000000000000..51ccdc2267ee89
--- /dev/null
+++ b/Mac/BuildScript/0001-Darwin-platform-allows-to-build-on-releases-before-Y.patch
@@ -0,0 +1,59 @@
+From cef404f1e7a598166cbc2fd2e0048f7e2d752ad5 Mon Sep 17 00:00:00 2001
+From: David Carlier <devnexen at gmail.com>
+Date: Tue, 24 Aug 2021 22:40:14 +0100
+Subject: [PATCH] Darwin platform allows to build on releases before
+ Yosemite/ios 8.
+
+issue #16407 #16408
+---
+ crypto/rand/rand_unix.c |  5 +----
+ include/crypto/rand.h   | 10 ++++++++++
+ 2 files changed, 11 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c
+index 43f1069d15..0f4525106a 100644
+--- a/crypto/rand/rand_unix.c
++++ b/crypto/rand/rand_unix.c
+@@ -34,9 +34,6 @@
+ #if defined(__OpenBSD__)
+ # include <sys/param.h>
+ #endif
+-#if defined(__APPLE__)
+-# include <CommonCrypto/CommonRandom.h>
+-#endif
+ 
+ #if defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__)
+ # include <sys/types.h>
+@@ -381,7 +378,7 @@ static ssize_t syscall_random(void *buf, size_t buflen)
+         if (errno != ENOSYS)
+             return -1;
+     }
+-#  elif defined(__APPLE__)
++#  elif defined(OPENSSL_APPLE_CRYPTO_RANDOM)
+     if (CCRandomGenerateBytes(buf, buflen) == kCCSuccess)
+ 	    return (ssize_t)buflen;
+ 
+diff --git a/include/crypto/rand.h b/include/crypto/rand.h
+index 5350d3a931..674f840fd1 100644
+--- a/include/crypto/rand.h
++++ b/include/crypto/rand.h
+@@ -20,6 +20,16 @@
+ 
+ # include <openssl/rand.h>
+ 
++# if defined(__APPLE__) && !defined(OPENSSL_NO_APPLE_CRYPTO_RANDOM)
++#  include <Availability.h>
++#  if (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || \
++     (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000)
++#   define OPENSSL_APPLE_CRYPTO_RANDOM 1
++#   include <CommonCrypto/CommonCryptoError.h>
++#   include <CommonCrypto/CommonRandom.h>
++#  endif
++# endif
++
+ /* forward declaration */
+ typedef struct rand_pool_st RAND_POOL;
+ 
+-- 
+2.33.0
+
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 56d3d4ba380edd..e89b1c1a421006 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -246,9 +246,10 @@ def library_recipes():
 
     result.extend([
           dict(
-              name="OpenSSL 1.1.1k",
-              url="https://www.openssl.org/source/openssl-1.1.1k.tar.gz",
-              checksum='c4e7d95f782b08116afa27b30393dd27',
+              name="OpenSSL 1.1.1l",
+              url="https://www.openssl.org/source/openssl-1.1.1l.tar.gz",
+              checksum='ac0d4387f3ba0ad741b0580dd45f6ff3',
+              patches=['0001-Darwin-platform-allows-to-build-on-releases-before-Y.patch'],
               buildrecipe=build_universal_openssl,
               configure=None,
               install=None,
diff --git a/Misc/NEWS.d/next/macOS/2021-08-30-00-04-10.bpo-45007.pixqUB.rst b/Misc/NEWS.d/next/macOS/2021-08-30-00-04-10.bpo-45007.pixqUB.rst
new file mode 100644
index 00000000000000..e4f1ac6de313d4
--- /dev/null
+++ b/Misc/NEWS.d/next/macOS/2021-08-30-00-04-10.bpo-45007.pixqUB.rst
@@ -0,0 +1 @@
+Update macOS installer builds to use OpenSSL 1.1.1l.


From webhook-mailer at python.org  Mon Aug 30 03:34:15 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 30 Aug 2021 07:34:15 -0000
Subject: [Python-checkins] bpo 45007: Update macOS installer builds to use
 OpenSSL 1.1.1l. (GH-28051)
Message-ID: <mailman.1247.1630308856.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/66b8202c079f3891ff398fec25bb898297ddd5af
commit: 66b8202c079f3891ff398fec25bb898297ddd5af
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-30T00:33:57-07:00
summary:

bpo 45007: Update macOS installer builds to use OpenSSL 1.1.1l. (GH-28051)

(cherry picked from commit 94b2639fad50d7ff8acd12c11e5fe5f9a6e1da5c)

Co-authored-by: Ned Deily <nad at python.org>

files:
A Mac/BuildScript/0001-Darwin-platform-allows-to-build-on-releases-before-Y.patch
A Misc/NEWS.d/next/macOS/2021-08-30-00-04-10.bpo-45007.pixqUB.rst
M Mac/BuildScript/build-installer.py

diff --git a/Mac/BuildScript/0001-Darwin-platform-allows-to-build-on-releases-before-Y.patch b/Mac/BuildScript/0001-Darwin-platform-allows-to-build-on-releases-before-Y.patch
new file mode 100644
index 00000000000000..51ccdc2267ee89
--- /dev/null
+++ b/Mac/BuildScript/0001-Darwin-platform-allows-to-build-on-releases-before-Y.patch
@@ -0,0 +1,59 @@
+From cef404f1e7a598166cbc2fd2e0048f7e2d752ad5 Mon Sep 17 00:00:00 2001
+From: David Carlier <devnexen at gmail.com>
+Date: Tue, 24 Aug 2021 22:40:14 +0100
+Subject: [PATCH] Darwin platform allows to build on releases before
+ Yosemite/ios 8.
+
+issue #16407 #16408
+---
+ crypto/rand/rand_unix.c |  5 +----
+ include/crypto/rand.h   | 10 ++++++++++
+ 2 files changed, 11 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c
+index 43f1069d15..0f4525106a 100644
+--- a/crypto/rand/rand_unix.c
++++ b/crypto/rand/rand_unix.c
+@@ -34,9 +34,6 @@
+ #if defined(__OpenBSD__)
+ # include <sys/param.h>
+ #endif
+-#if defined(__APPLE__)
+-# include <CommonCrypto/CommonRandom.h>
+-#endif
+ 
+ #if defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__)
+ # include <sys/types.h>
+@@ -381,7 +378,7 @@ static ssize_t syscall_random(void *buf, size_t buflen)
+         if (errno != ENOSYS)
+             return -1;
+     }
+-#  elif defined(__APPLE__)
++#  elif defined(OPENSSL_APPLE_CRYPTO_RANDOM)
+     if (CCRandomGenerateBytes(buf, buflen) == kCCSuccess)
+ 	    return (ssize_t)buflen;
+ 
+diff --git a/include/crypto/rand.h b/include/crypto/rand.h
+index 5350d3a931..674f840fd1 100644
+--- a/include/crypto/rand.h
++++ b/include/crypto/rand.h
+@@ -20,6 +20,16 @@
+ 
+ # include <openssl/rand.h>
+ 
++# if defined(__APPLE__) && !defined(OPENSSL_NO_APPLE_CRYPTO_RANDOM)
++#  include <Availability.h>
++#  if (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || \
++     (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000)
++#   define OPENSSL_APPLE_CRYPTO_RANDOM 1
++#   include <CommonCrypto/CommonCryptoError.h>
++#   include <CommonCrypto/CommonRandom.h>
++#  endif
++# endif
++
+ /* forward declaration */
+ typedef struct rand_pool_st RAND_POOL;
+ 
+-- 
+2.33.0
+
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 56d3d4ba380edd..e89b1c1a421006 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -246,9 +246,10 @@ def library_recipes():
 
     result.extend([
           dict(
-              name="OpenSSL 1.1.1k",
-              url="https://www.openssl.org/source/openssl-1.1.1k.tar.gz",
-              checksum='c4e7d95f782b08116afa27b30393dd27',
+              name="OpenSSL 1.1.1l",
+              url="https://www.openssl.org/source/openssl-1.1.1l.tar.gz",
+              checksum='ac0d4387f3ba0ad741b0580dd45f6ff3',
+              patches=['0001-Darwin-platform-allows-to-build-on-releases-before-Y.patch'],
               buildrecipe=build_universal_openssl,
               configure=None,
               install=None,
diff --git a/Misc/NEWS.d/next/macOS/2021-08-30-00-04-10.bpo-45007.pixqUB.rst b/Misc/NEWS.d/next/macOS/2021-08-30-00-04-10.bpo-45007.pixqUB.rst
new file mode 100644
index 00000000000000..e4f1ac6de313d4
--- /dev/null
+++ b/Misc/NEWS.d/next/macOS/2021-08-30-00-04-10.bpo-45007.pixqUB.rst
@@ -0,0 +1 @@
+Update macOS installer builds to use OpenSSL 1.1.1l.


From webhook-mailer at python.org  Mon Aug 30 03:36:13 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 30 Aug 2021 07:36:13 -0000
Subject: [Python-checkins] bpo 45007: Update macOS installer builds to use
 OpenSSL 1.1.1l. (GH-28051)
Message-ID: <mailman.1248.1630308973.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/d0f94ab01400249bffa2ab7f7d0bd86f42ca068f
commit: d0f94ab01400249bffa2ab7f7d0bd86f42ca068f
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-30T00:36:02-07:00
summary:

bpo 45007: Update macOS installer builds to use OpenSSL 1.1.1l. (GH-28051)

(cherry picked from commit 94b2639fad50d7ff8acd12c11e5fe5f9a6e1da5c)

Co-authored-by: Ned Deily <nad at python.org>

files:
A Mac/BuildScript/0001-Darwin-platform-allows-to-build-on-releases-before-Y.patch
A Misc/NEWS.d/next/macOS/2021-08-30-00-04-10.bpo-45007.pixqUB.rst
M Mac/BuildScript/build-installer.py

diff --git a/Mac/BuildScript/0001-Darwin-platform-allows-to-build-on-releases-before-Y.patch b/Mac/BuildScript/0001-Darwin-platform-allows-to-build-on-releases-before-Y.patch
new file mode 100644
index 0000000000000..51ccdc2267ee8
--- /dev/null
+++ b/Mac/BuildScript/0001-Darwin-platform-allows-to-build-on-releases-before-Y.patch
@@ -0,0 +1,59 @@
+From cef404f1e7a598166cbc2fd2e0048f7e2d752ad5 Mon Sep 17 00:00:00 2001
+From: David Carlier <devnexen at gmail.com>
+Date: Tue, 24 Aug 2021 22:40:14 +0100
+Subject: [PATCH] Darwin platform allows to build on releases before
+ Yosemite/ios 8.
+
+issue #16407 #16408
+---
+ crypto/rand/rand_unix.c |  5 +----
+ include/crypto/rand.h   | 10 ++++++++++
+ 2 files changed, 11 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c
+index 43f1069d15..0f4525106a 100644
+--- a/crypto/rand/rand_unix.c
++++ b/crypto/rand/rand_unix.c
+@@ -34,9 +34,6 @@
+ #if defined(__OpenBSD__)
+ # include <sys/param.h>
+ #endif
+-#if defined(__APPLE__)
+-# include <CommonCrypto/CommonRandom.h>
+-#endif
+ 
+ #if defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__)
+ # include <sys/types.h>
+@@ -381,7 +378,7 @@ static ssize_t syscall_random(void *buf, size_t buflen)
+         if (errno != ENOSYS)
+             return -1;
+     }
+-#  elif defined(__APPLE__)
++#  elif defined(OPENSSL_APPLE_CRYPTO_RANDOM)
+     if (CCRandomGenerateBytes(buf, buflen) == kCCSuccess)
+ 	    return (ssize_t)buflen;
+ 
+diff --git a/include/crypto/rand.h b/include/crypto/rand.h
+index 5350d3a931..674f840fd1 100644
+--- a/include/crypto/rand.h
++++ b/include/crypto/rand.h
+@@ -20,6 +20,16 @@
+ 
+ # include <openssl/rand.h>
+ 
++# if defined(__APPLE__) && !defined(OPENSSL_NO_APPLE_CRYPTO_RANDOM)
++#  include <Availability.h>
++#  if (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || \
++     (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000)
++#   define OPENSSL_APPLE_CRYPTO_RANDOM 1
++#   include <CommonCrypto/CommonCryptoError.h>
++#   include <CommonCrypto/CommonRandom.h>
++#  endif
++# endif
++
+ /* forward declaration */
+ typedef struct rand_pool_st RAND_POOL;
+ 
+-- 
+2.33.0
+
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 66bff60007d9b..cbb6cab9e3563 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -244,9 +244,10 @@ def library_recipes():
 
     result.extend([
           dict(
-              name="OpenSSL 1.1.1k",
-              url="https://www.openssl.org/source/openssl-1.1.1k.tar.gz",
-              checksum='c4e7d95f782b08116afa27b30393dd27',
+              name="OpenSSL 1.1.1l",
+              url="https://www.openssl.org/source/openssl-1.1.1l.tar.gz",
+              checksum='ac0d4387f3ba0ad741b0580dd45f6ff3',
+              patches=['0001-Darwin-platform-allows-to-build-on-releases-before-Y.patch'],
               buildrecipe=build_universal_openssl,
               configure=None,
               install=None,
diff --git a/Misc/NEWS.d/next/macOS/2021-08-30-00-04-10.bpo-45007.pixqUB.rst b/Misc/NEWS.d/next/macOS/2021-08-30-00-04-10.bpo-45007.pixqUB.rst
new file mode 100644
index 0000000000000..e4f1ac6de313d
--- /dev/null
+++ b/Misc/NEWS.d/next/macOS/2021-08-30-00-04-10.bpo-45007.pixqUB.rst
@@ -0,0 +1 @@
+Update macOS installer builds to use OpenSSL 1.1.1l.


From webhook-mailer at python.org  Mon Aug 30 05:07:28 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 30 Aug 2021 09:07:28 -0000
Subject: [Python-checkins] bpo-44689: ctypes.util.find_library() now finds
 macOS 11+ system libraries when built on older macOS systems (GH-27251)
 (GH-28054)
Message-ID: <mailman.1249.1630314450.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/7234e67642bc8e75f44a2e1f2ce06687b5ac72ec
commit: 7234e67642bc8e75f44a2e1f2ce06687b5ac72ec
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-30T11:07:19+02:00
summary:

bpo-44689: ctypes.util.find_library() now finds macOS 11+ system libraries when built on older macOS systems (GH-27251) (GH-28054)

Previously, when built on older macOS systems, `find_library` was not able to find macOS system libraries when running on Big Sur due to changes in how system libraries are stored.
(cherry picked from commit 71853a73024a98aa38a3c0444fe364dbd9709134)

Co-authored-by: Tobias Bergkvist <tobias at bergkv.ist>

files:
A Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst
M Modules/_ctypes/callproc.c

diff --git a/Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst b/Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst
new file mode 100644
index 0000000000000..b1e878d1ee44a
--- /dev/null
+++ b/Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst
@@ -0,0 +1,5 @@
+ :meth:`ctypes.util.find_library` now works correctly on macOS 11 Big Sur
+ even if Python is built on an older version of macOS.  Previously, when
+ built on older macOS systems, ``find_library`` was not able to find
+ macOS system libraries when running on Big Sur due to changes in
+ how system libraries are stored.
diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
index e326cd84f8c49..05d28a883b766 100644
--- a/Modules/_ctypes/callproc.c
+++ b/Modules/_ctypes/callproc.c
@@ -1447,14 +1447,37 @@ copy_com_pointer(PyObject *self, PyObject *args)
     return r;
 }
 #else
-
+#ifdef __APPLE__
 #ifdef HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH
+#define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME \
+    __builtin_available(macOS 11.0, iOS 14.0, tvOS 14.0, watchOS 7.0, *)
+#else
+// Support the deprecated case of compiling on an older macOS version
+static void *libsystem_b_handle;
+static bool (*_dyld_shared_cache_contains_path)(const char *path);
+
+__attribute__((constructor)) void load_dyld_shared_cache_contains_path(void) {
+    libsystem_b_handle = dlopen("/usr/lib/libSystem.B.dylib", RTLD_LAZY);
+    if (libsystem_b_handle != NULL) {
+        _dyld_shared_cache_contains_path = dlsym(libsystem_b_handle, "_dyld_shared_cache_contains_path");
+    }
+}
+
+__attribute__((destructor)) void unload_dyld_shared_cache_contains_path(void) {
+    if (libsystem_b_handle != NULL) {
+        dlclose(libsystem_b_handle);
+    }
+}
+#define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME \
+    _dyld_shared_cache_contains_path != NULL
+#endif
+
 static PyObject *py_dyld_shared_cache_contains_path(PyObject *self, PyObject *args)
 {
      PyObject *name, *name2;
      char *name_str;
 
-     if (__builtin_available(macOS 11.0, iOS 14.0, tvOS 14.0, watchOS 7.0, *)) {
+     if (HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME) {
          int r;
 
          if (!PyArg_ParseTuple(args, "O", &name))
@@ -1998,7 +2021,7 @@ PyMethodDef _ctypes_module_methods[] = {
     {"dlclose", py_dl_close, METH_VARARGS, "dlclose a library"},
     {"dlsym", py_dl_sym, METH_VARARGS, "find symbol in shared library"},
 #endif
-#ifdef HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH
+#ifdef __APPLE__
      {"_dyld_shared_cache_contains_path", py_dyld_shared_cache_contains_path, METH_VARARGS, "check if path is in the shared cache"},
 #endif
     {"alignment", align_func, METH_O, alignment_doc},


From webhook-mailer at python.org  Mon Aug 30 05:08:21 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 30 Aug 2021 09:08:21 -0000
Subject: [Python-checkins] bpo-44689: ctypes.util.find_library() now finds
 macOS 11+ system libraries when built on older macOS systems (GH-27251)
 (GH-28053)
Message-ID: <mailman.1250.1630314501.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/4b55837e7c747e0f3bd2df1b5c8996ce86c6f60a
commit: 4b55837e7c747e0f3bd2df1b5c8996ce86c6f60a
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-30T11:08:16+02:00
summary:

bpo-44689: ctypes.util.find_library() now finds macOS 11+ system libraries when built on older macOS systems (GH-27251) (GH-28053)

Previously, when built on older macOS systems, `find_library` was not able to find macOS system libraries when running on Big Sur due to changes in how system libraries are stored.
(cherry picked from commit 71853a73024a98aa38a3c0444fe364dbd9709134)

Co-authored-by: Tobias Bergkvist <tobias at bergkv.ist>

files:
A Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst
M Modules/_ctypes/callproc.c

diff --git a/Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst b/Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst
new file mode 100644
index 00000000000000..b1e878d1ee44af
--- /dev/null
+++ b/Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst
@@ -0,0 +1,5 @@
+ :meth:`ctypes.util.find_library` now works correctly on macOS 11 Big Sur
+ even if Python is built on an older version of macOS.  Previously, when
+ built on older macOS systems, ``find_library`` was not able to find
+ macOS system libraries when running on Big Sur due to changes in
+ how system libraries are stored.
diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
index 18984d15abe176..b0f1e0bd0409be 100644
--- a/Modules/_ctypes/callproc.c
+++ b/Modules/_ctypes/callproc.c
@@ -1449,14 +1449,37 @@ copy_com_pointer(PyObject *self, PyObject *args)
     return r;
 }
 #else
-
+#ifdef __APPLE__
 #ifdef HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH
+#define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME \
+    __builtin_available(macOS 11.0, iOS 14.0, tvOS 14.0, watchOS 7.0, *)
+#else
+// Support the deprecated case of compiling on an older macOS version
+static void *libsystem_b_handle;
+static bool (*_dyld_shared_cache_contains_path)(const char *path);
+
+__attribute__((constructor)) void load_dyld_shared_cache_contains_path(void) {
+    libsystem_b_handle = dlopen("/usr/lib/libSystem.B.dylib", RTLD_LAZY);
+    if (libsystem_b_handle != NULL) {
+        _dyld_shared_cache_contains_path = dlsym(libsystem_b_handle, "_dyld_shared_cache_contains_path");
+    }
+}
+
+__attribute__((destructor)) void unload_dyld_shared_cache_contains_path(void) {
+    if (libsystem_b_handle != NULL) {
+        dlclose(libsystem_b_handle);
+    }
+}
+#define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME \
+    _dyld_shared_cache_contains_path != NULL
+#endif
+
 static PyObject *py_dyld_shared_cache_contains_path(PyObject *self, PyObject *args)
 {
      PyObject *name, *name2;
      char *name_str;
 
-     if (__builtin_available(macOS 11.0, iOS 14.0, tvOS 14.0, watchOS 7.0, *)) {
+     if (HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME) {
          int r;
 
          if (!PyArg_ParseTuple(args, "O", &name))
@@ -1999,7 +2022,7 @@ PyMethodDef _ctypes_module_methods[] = {
     {"dlclose", py_dl_close, METH_VARARGS, "dlclose a library"},
     {"dlsym", py_dl_sym, METH_VARARGS, "find symbol in shared library"},
 #endif
-#ifdef HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH
+#ifdef __APPLE__
      {"_dyld_shared_cache_contains_path", py_dyld_shared_cache_contains_path, METH_VARARGS, "check if path is in the shared cache"},
 #endif
     {"alignment", align_func, METH_O, alignment_doc},


From webhook-mailer at python.org  Mon Aug 30 05:09:40 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 30 Aug 2021 09:09:40 -0000
Subject: [Python-checkins] bpo-44689: ctypes.util.find_library() now finds
 macOS 11+ system libraries when built on older macOS systems (GH-27251)
Message-ID: <mailman.1251.1630314581.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/41c87c41761739e90867a43de26e0f6755c80ff7
commit: 41c87c41761739e90867a43de26e0f6755c80ff7
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-30T02:09:34-07:00
summary:

bpo-44689: ctypes.util.find_library() now finds macOS 11+ system libraries when built on older macOS systems (GH-27251)


Previously, when built on older macOS systems, `find_library` was not able to find macOS system libraries when running on Big Sur due to changes in how system libraries are stored.
(cherry picked from commit 71853a73024a98aa38a3c0444fe364dbd9709134)

Co-authored-by: Tobias Bergkvist <tobias at bergkv.ist>

files:
A Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst
M Modules/_ctypes/callproc.c

diff --git a/Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst b/Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst
new file mode 100644
index 0000000000000..b1e878d1ee44a
--- /dev/null
+++ b/Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst
@@ -0,0 +1,5 @@
+ :meth:`ctypes.util.find_library` now works correctly on macOS 11 Big Sur
+ even if Python is built on an older version of macOS.  Previously, when
+ built on older macOS systems, ``find_library`` was not able to find
+ macOS system libraries when running on Big Sur due to changes in
+ how system libraries are stored.
diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
index 56ccc2f1e0b5d..f8f8efa4ee879 100644
--- a/Modules/_ctypes/callproc.c
+++ b/Modules/_ctypes/callproc.c
@@ -1442,14 +1442,37 @@ copy_com_pointer(PyObject *self, PyObject *args)
     return r;
 }
 #else
-
+#ifdef __APPLE__
 #ifdef HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH
+#define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME \
+    __builtin_available(macOS 11.0, iOS 14.0, tvOS 14.0, watchOS 7.0, *)
+#else
+// Support the deprecated case of compiling on an older macOS version
+static void *libsystem_b_handle;
+static bool (*_dyld_shared_cache_contains_path)(const char *path);
+
+__attribute__((constructor)) void load_dyld_shared_cache_contains_path(void) {
+    libsystem_b_handle = dlopen("/usr/lib/libSystem.B.dylib", RTLD_LAZY);
+    if (libsystem_b_handle != NULL) {
+        _dyld_shared_cache_contains_path = dlsym(libsystem_b_handle, "_dyld_shared_cache_contains_path");
+    }
+}
+
+__attribute__((destructor)) void unload_dyld_shared_cache_contains_path(void) {
+    if (libsystem_b_handle != NULL) {
+        dlclose(libsystem_b_handle);
+    }
+}
+#define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME \
+    _dyld_shared_cache_contains_path != NULL
+#endif
+
 static PyObject *py_dyld_shared_cache_contains_path(PyObject *self, PyObject *args)
 {
      PyObject *name, *name2;
      char *name_str;
 
-     if (__builtin_available(macOS 11.0, iOS 14.0, tvOS 14.0, watchOS 7.0, *)) {
+     if (HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME) {
          int r;
 
          if (!PyArg_ParseTuple(args, "O", &name))
@@ -1992,7 +2015,7 @@ PyMethodDef _ctypes_module_methods[] = {
     {"dlclose", py_dl_close, METH_VARARGS, "dlclose a library"},
     {"dlsym", py_dl_sym, METH_VARARGS, "find symbol in shared library"},
 #endif
-#ifdef HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH
+#ifdef __APPLE__
      {"_dyld_shared_cache_contains_path", py_dyld_shared_cache_contains_path, METH_VARARGS, "check if path is in the shared cache"},
 #endif
     {"alignment", align_func, METH_O, alignment_doc},


From webhook-mailer at python.org  Mon Aug 30 05:50:37 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 30 Aug 2021 09:50:37 -0000
Subject: [Python-checkins] bpo-45007: Update macOS installer builds to use
 OpenSSL 1.1.1l (GH-28051) (GH-28059)
Message-ID: <mailman.1252.1630317037.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/1f89e51fef8f4c15a719fbb3d1cec8ca7e2bc46f
commit: 1f89e51fef8f4c15a719fbb3d1cec8ca7e2bc46f
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-30T11:50:25+02:00
summary:

bpo-45007: Update macOS installer builds to use OpenSSL 1.1.1l (GH-28051) (GH-28059)

(cherry picked from commit 94b2639fad50d7ff8acd12c11e5fe5f9a6e1da5c)

Co-authored-by: Ned Deily <nad at python.org>

files:
A Mac/BuildScript/0001-Darwin-platform-allows-to-build-on-releases-before-Y.patch
A Misc/NEWS.d/next/macOS/2021-08-30-00-04-10.bpo-45007.pixqUB.rst
M Mac/BuildScript/build-installer.py

diff --git a/Mac/BuildScript/0001-Darwin-platform-allows-to-build-on-releases-before-Y.patch b/Mac/BuildScript/0001-Darwin-platform-allows-to-build-on-releases-before-Y.patch
new file mode 100644
index 0000000000000..51ccdc2267ee8
--- /dev/null
+++ b/Mac/BuildScript/0001-Darwin-platform-allows-to-build-on-releases-before-Y.patch
@@ -0,0 +1,59 @@
+From cef404f1e7a598166cbc2fd2e0048f7e2d752ad5 Mon Sep 17 00:00:00 2001
+From: David Carlier <devnexen at gmail.com>
+Date: Tue, 24 Aug 2021 22:40:14 +0100
+Subject: [PATCH] Darwin platform allows to build on releases before
+ Yosemite/ios 8.
+
+issue #16407 #16408
+---
+ crypto/rand/rand_unix.c |  5 +----
+ include/crypto/rand.h   | 10 ++++++++++
+ 2 files changed, 11 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c
+index 43f1069d15..0f4525106a 100644
+--- a/crypto/rand/rand_unix.c
++++ b/crypto/rand/rand_unix.c
+@@ -34,9 +34,6 @@
+ #if defined(__OpenBSD__)
+ # include <sys/param.h>
+ #endif
+-#if defined(__APPLE__)
+-# include <CommonCrypto/CommonRandom.h>
+-#endif
+ 
+ #if defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__)
+ # include <sys/types.h>
+@@ -381,7 +378,7 @@ static ssize_t syscall_random(void *buf, size_t buflen)
+         if (errno != ENOSYS)
+             return -1;
+     }
+-#  elif defined(__APPLE__)
++#  elif defined(OPENSSL_APPLE_CRYPTO_RANDOM)
+     if (CCRandomGenerateBytes(buf, buflen) == kCCSuccess)
+ 	    return (ssize_t)buflen;
+ 
+diff --git a/include/crypto/rand.h b/include/crypto/rand.h
+index 5350d3a931..674f840fd1 100644
+--- a/include/crypto/rand.h
++++ b/include/crypto/rand.h
+@@ -20,6 +20,16 @@
+ 
+ # include <openssl/rand.h>
+ 
++# if defined(__APPLE__) && !defined(OPENSSL_NO_APPLE_CRYPTO_RANDOM)
++#  include <Availability.h>
++#  if (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || \
++     (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000)
++#   define OPENSSL_APPLE_CRYPTO_RANDOM 1
++#   include <CommonCrypto/CommonCryptoError.h>
++#   include <CommonCrypto/CommonRandom.h>
++#  endif
++# endif
++
+ /* forward declaration */
+ typedef struct rand_pool_st RAND_POOL;
+ 
+-- 
+2.33.0
+
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index b07def17476ac..ec2be50883015 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -242,9 +242,10 @@ def library_recipes():
 
     result.extend([
           dict(
-              name="OpenSSL 1.1.1k",
-              url="https://www.openssl.org/source/openssl-1.1.1k.tar.gz",
-              checksum='c4e7d95f782b08116afa27b30393dd27',
+              name="OpenSSL 1.1.1l",
+              url="https://www.openssl.org/source/openssl-1.1.1l.tar.gz",
+              checksum='ac0d4387f3ba0ad741b0580dd45f6ff3',
+              patches=['0001-Darwin-platform-allows-to-build-on-releases-before-Y.patch'],
               buildrecipe=build_universal_openssl,
               configure=None,
               install=None,
diff --git a/Misc/NEWS.d/next/macOS/2021-08-30-00-04-10.bpo-45007.pixqUB.rst b/Misc/NEWS.d/next/macOS/2021-08-30-00-04-10.bpo-45007.pixqUB.rst
new file mode 100644
index 0000000000000..e4f1ac6de313d
--- /dev/null
+++ b/Misc/NEWS.d/next/macOS/2021-08-30-00-04-10.bpo-45007.pixqUB.rst
@@ -0,0 +1 @@
+Update macOS installer builds to use OpenSSL 1.1.1l.


From webhook-mailer at python.org  Mon Aug 30 06:02:43 2021
From: webhook-mailer at python.org (corona10)
Date: Mon, 30 Aug 2021 10:02:43 -0000
Subject: [Python-checkins] bpo-45045: Optimize mapping patterns of
 structural pattern matching (GH-28043)
Message-ID: <mailman.1253.1630317764.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/e6497fe698f6e87344501a68ffdea106eafcb257
commit: e6497fe698f6e87344501a68ffdea106eafcb257
branch: main
author: Dong-hee Na <donghee.na at python.org>
committer: corona10 <donghee.na92 at gmail.com>
date: 2021-08-30T19:02:32+09:00
summary:

bpo-45045: Optimize mapping patterns of structural pattern matching (GH-28043)

files:
M Lib/test/test_patma.py
M Python/ceval.c

diff --git a/Lib/test/test_patma.py b/Lib/test/test_patma.py
index aa18e29e22548f..57d3b1ec701ca4 100644
--- a/Lib/test/test_patma.py
+++ b/Lib/test/test_patma.py
@@ -2641,6 +2641,19 @@ def f(x):
         self.assertEqual(f((False, range(-1, -11, -1), True)), alts[3])
         self.assertEqual(f((False, range(10, 20), True)), alts[4])
 
+    def test_patma_248(self):
+        class C(dict):
+            @staticmethod
+            def get(key, default=None):
+                return 'bar'
+
+        x = C({'foo': 'bar'})
+        match x:
+            case {'foo': bar}:
+                y = bar
+
+        self.assertEqual(y, 'bar')
+
 
 class TestSyntaxErrors(unittest.TestCase):
 
diff --git a/Python/ceval.c b/Python/ceval.c
index 8aaa83b1b74bf4..bf95d50b629582 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -841,12 +841,18 @@ match_keys(PyThreadState *tstate, PyObject *map, PyObject *keys)
     PyObject *seen = NULL;
     PyObject *dummy = NULL;
     PyObject *values = NULL;
+    PyObject *get_name = NULL;
+    PyObject *get = NULL;
     // We use the two argument form of map.get(key, default) for two reasons:
     // - Atomically check for a key and get its value without error handling.
     // - Don't cause key creation or resizing in dict subclasses like
     //   collections.defaultdict that define __missing__ (or similar).
     _Py_IDENTIFIER(get);
-    PyObject *get = _PyObject_GetAttrId(map, &PyId_get);
+    get_name = _PyUnicode_FromId(&PyId_get); // borrowed
+    if (get_name == NULL) {
+        return NULL;
+    }
+    int meth_found = _PyObject_GetMethod(map, get_name, &get);
     if (get == NULL) {
         goto fail;
     }
@@ -859,7 +865,7 @@ match_keys(PyThreadState *tstate, PyObject *map, PyObject *keys)
     if (dummy == NULL) {
         goto fail;
     }
-    values = PyList_New(0);
+    values = PyTuple_New(nkeys);
     if (values == NULL) {
         goto fail;
     }
@@ -873,7 +879,14 @@ match_keys(PyThreadState *tstate, PyObject *map, PyObject *keys)
             }
             goto fail;
         }
-        PyObject *value = PyObject_CallFunctionObjArgs(get, key, dummy, NULL);
+        PyObject *args[] = { map, key, dummy };
+        PyObject *value = NULL;
+        if (meth_found) {
+            value = PyObject_Vectorcall(get, args, 3, NULL);
+        }
+        else {
+            value = PyObject_Vectorcall(get, &args[1], 2, NULL);
+        }
         if (value == NULL) {
             goto fail;
         }
@@ -886,10 +899,8 @@ match_keys(PyThreadState *tstate, PyObject *map, PyObject *keys)
             values = Py_None;
             goto done;
         }
-        PyList_Append(values, value);
-        Py_DECREF(value);
+        PyTuple_SET_ITEM(values, i, value);
     }
-    Py_SETREF(values, PyList_AsTuple(values));
     // Success:
 done:
     Py_DECREF(get);


From webhook-mailer at python.org  Mon Aug 30 08:25:00 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 30 Aug 2021 12:25:00 -0000
Subject: [Python-checkins] bpo-45007: Update multissl to openssl 1.1.1l as
 well (GH-28044)
Message-ID: <mailman.1254.1630326301.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/d6cb5dd9e19210f5963ff8beadde7ca2fda71574
commit: d6cb5dd9e19210f5963ff8beadde7ca2fda71574
branch: main
author: ?ukasz Langa <lukasz at langa.pl>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-30T05:24:51-07:00
summary:

bpo-45007: Update multissl to openssl 1.1.1l as well (GH-28044)



This was missed while upgrading CI.

files:
M Tools/ssl/multissltests.py

diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py
index 25ce2faffacfc3..9b46c8c7c09d5c 100755
--- a/Tools/ssl/multissltests.py
+++ b/Tools/ssl/multissltests.py
@@ -47,7 +47,7 @@
 ]
 
 OPENSSL_RECENT_VERSIONS = [
-    "1.1.1k",
+    "1.1.1l",
     "3.0.0-beta1"
 ]
 


From webhook-mailer at python.org  Mon Aug 30 09:07:52 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 30 Aug 2021 13:07:52 -0000
Subject: [Python-checkins] bpo-45007: Update multissl to openssl 1.1.1l as
 well (GH-28044)
Message-ID: <mailman.1255.1630328873.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/dc46f4c9846ad16567ab293b405efc3ed10ab9d5
commit: dc46f4c9846ad16567ab293b405efc3ed10ab9d5
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-30T06:07:38-07:00
summary:

bpo-45007: Update multissl to openssl 1.1.1l as well (GH-28044)


This was missed while upgrading CI.
(cherry picked from commit d6cb5dd9e19210f5963ff8beadde7ca2fda71574)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
M Tools/ssl/multissltests.py

diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py
index 25ce2faffacfc3..9b46c8c7c09d5c 100755
--- a/Tools/ssl/multissltests.py
+++ b/Tools/ssl/multissltests.py
@@ -47,7 +47,7 @@
 ]
 
 OPENSSL_RECENT_VERSIONS = [
-    "1.1.1k",
+    "1.1.1l",
     "3.0.0-beta1"
 ]
 


From webhook-mailer at python.org  Mon Aug 30 09:07:59 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 30 Aug 2021 13:07:59 -0000
Subject: [Python-checkins] [3.9] bpo-45007: Update multissl to openssl
 1.1.1l as well (GH-28044) (GH-28062)
Message-ID: <mailman.1256.1630328880.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/576803d7a8083cb25c58be08d3cb31e05d5d2f8a
commit: 576803d7a8083cb25c58be08d3cb31e05d5d2f8a
branch: 3.9
author: Christian Heimes <christian at python.org>
committer: ambv <lukasz at langa.pl>
date: 2021-08-30T15:07:55+02:00
summary:

[3.9] bpo-45007: Update multissl to openssl 1.1.1l as well (GH-28044) (GH-28062)

This was missed while upgrading CI..
(cherry picked from commit d6cb5dd9e19210f5963ff8beadde7ca2fda71574)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
M Tools/ssl/multissltests.py

diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py
index a9c4f6dacd4499..6baec7bc31a581 100755
--- a/Tools/ssl/multissltests.py
+++ b/Tools/ssl/multissltests.py
@@ -49,8 +49,8 @@
 ]
 
 OPENSSL_RECENT_VERSIONS = [
-    "1.1.1k",
-    "3.0.0-alpha16"
+    "1.1.1l",
+    "3.0.0-beta1"
 ]
 
 LIBRESSL_OLD_VERSIONS = [


From webhook-mailer at python.org  Mon Aug 30 09:08:17 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 30 Aug 2021 13:08:17 -0000
Subject: [Python-checkins] [3.8] bpo-45007: Update multissl to openssl
 1.1.1l as well (GH-28044) (GH-28063)
Message-ID: <mailman.1257.1630328897.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/8371290753bed7fbb939a51ea7ff0991ea32a89c
commit: 8371290753bed7fbb939a51ea7ff0991ea32a89c
branch: 3.8
author: Christian Heimes <christian at python.org>
committer: ambv <lukasz at langa.pl>
date: 2021-08-30T15:08:12+02:00
summary:

[3.8] bpo-45007: Update multissl to openssl 1.1.1l as well (GH-28044) (GH-28063)

This was missed while upgrading CI..
(cherry picked from commit d6cb5dd9e19210f5963ff8beadde7ca2fda71574)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
M Tools/ssl/multissltests.py

diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py
index 1904f3bf25bee2..41d964ec3ff14f 100755
--- a/Tools/ssl/multissltests.py
+++ b/Tools/ssl/multissltests.py
@@ -49,8 +49,8 @@
 ]
 
 OPENSSL_RECENT_VERSIONS = [
-    "1.1.1k",
-    # "3.0.0-alpha14"
+    "1.1.1l",
+    "3.0.0-beta1"
 ]
 
 LIBRESSL_OLD_VERSIONS = [


From webhook-mailer at python.org  Mon Aug 30 09:16:33 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 30 Aug 2021 13:16:33 -0000
Subject: [Python-checkins] bpo-41620: TestCase.run() now always return a
 TestResult instance (GH-28030)
Message-ID: <mailman.1258.1630329395.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/7e246a3a7b43762480ee4fe0cfb859e8e997a8c8
commit: 7e246a3a7b43762480ee4fe0cfb859e8e997a8c8
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-30T15:16:25+02:00
summary:

bpo-41620: TestCase.run() now always return a TestResult instance (GH-28030)

Previously it returned None if the test class or method was
decorated with a skipping decorator.

Co-authored-by: Iman Tabrizian <iman.tabrizian at gmail.com>

files:
A Misc/NEWS.d/next/Library/2021-08-29-14-49-22.bpo-41620.WJ6PFL.rst
M Lib/unittest/case.py
M Lib/unittest/test/test_skipping.py

diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index 8775ba9e241c44..2d193eb144a23d 100644
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -575,7 +575,7 @@ def run(self, result=None):
                 skip_why = (getattr(self.__class__, '__unittest_skip_why__', '')
                             or getattr(testMethod, '__unittest_skip_why__', ''))
                 self._addSkip(result, self, skip_why)
-                return
+                return result
 
             expecting_failure = (
                 getattr(self, "__unittest_expecting_failure__", False) or
diff --git a/Lib/unittest/test/test_skipping.py b/Lib/unittest/test/test_skipping.py
index 3adde41b04e737..79b27e6daae255 100644
--- a/Lib/unittest/test/test_skipping.py
+++ b/Lib/unittest/test/test_skipping.py
@@ -14,14 +14,16 @@ def test_skip_me(self):
         events = []
         result = LoggingResult(events)
         test = Foo("test_skip_me")
-        test.run(result)
+        self.assertIs(test.run(result), result)
         self.assertEqual(events, ['startTest', 'addSkip', 'stopTest'])
         self.assertEqual(result.skipped, [(test, "skip")])
 
         events = []
-        test.run()
+        result = test.run()
         self.assertEqual(events, ['startTestRun', 'startTest', 'addSkip',
                                   'stopTest', 'stopTestRun'])
+        self.assertEqual(result.skipped, [(test, "skip")])
+        self.assertEqual(result.testsRun, 1)
 
         # Try letting setUp skip the test now.
         class Foo(unittest.TestCase):
@@ -33,15 +35,17 @@ def test_nothing(self): pass
         events = []
         result = LoggingResult(events)
         test = Foo("test_nothing")
-        test.run(result)
+        self.assertIs(test.run(result), result)
         self.assertEqual(events, ['startTest', 'addSkip', 'stopTest'])
         self.assertEqual(result.skipped, [(test, "testing")])
         self.assertEqual(result.testsRun, 1)
 
         events = []
-        test.run()
+        result = test.run()
         self.assertEqual(events, ['startTestRun', 'startTest', 'addSkip',
                                   'stopTest', 'stopTestRun'])
+        self.assertEqual(result.skipped, [(test, "testing")])
+        self.assertEqual(result.testsRun, 1)
 
     def test_skipping_subtests(self):
         class Foo(unittest.TestCase):
@@ -56,7 +60,7 @@ def test_skip_me(self):
         events = []
         result = LoggingResult(events)
         test = Foo("test_skip_me")
-        test.run(result)
+        self.assertIs(test.run(result), result)
         self.assertEqual(events, ['startTest', 'addSkip', 'addSkip',
                                   'addSkip', 'stopTest'])
         self.assertEqual(len(result.skipped), 3)
@@ -71,10 +75,12 @@ def test_skip_me(self):
         self.assertEqual(result.skipped[2], (test, "skip 3"))
 
         events = []
-        test.run()
+        result = test.run()
         self.assertEqual(events,
                          ['startTestRun', 'startTest', 'addSkip', 'addSkip',
                           'addSkip', 'stopTest', 'stopTestRun'])
+        self.assertEqual([msg for subtest, msg in result.skipped],
+                         ['skip 1', 'skip 2', 'skip 3'])
 
     def test_skipping_decorators(self):
         op_table = ((unittest.skipUnless, False, True),
@@ -95,7 +101,7 @@ def test_dont_skip(self): pass
             suite = unittest.TestSuite([test_do_skip, test_dont_skip])
             events = []
             result = LoggingResult(events)
-            suite.run(result)
+            self.assertIs(suite.run(result), result)
             self.assertEqual(len(result.skipped), 1)
             expected = ['startTest', 'addSkip', 'stopTest',
                         'startTest', 'addSuccess', 'stopTest']
@@ -105,16 +111,16 @@ def test_dont_skip(self): pass
             self.assertTrue(result.wasSuccessful())
 
             events = []
-            test_do_skip.run()
-            self.assertEqual(len(result.skipped), 1)
+            result = test_do_skip.run()
             self.assertEqual(events, ['startTestRun', 'startTest', 'addSkip',
                                       'stopTest', 'stopTestRun'])
+            self.assertEqual(result.skipped, [(test_do_skip, "testing")])
 
             events = []
-            test_dont_skip.run()
-            self.assertEqual(len(result.skipped), 1)
+            result = test_dont_skip.run()
             self.assertEqual(events, ['startTestRun', 'startTest', 'addSuccess',
                                       'stopTest', 'stopTestRun'])
+            self.assertEqual(result.skipped, [])
 
     def test_skip_class(self):
         @unittest.skip("testing")
@@ -128,15 +134,16 @@ def test_1(self):
         result = LoggingResult(events)
         test = Foo("test_1")
         suite = unittest.TestSuite([test])
-        suite.run(result)
+        self.assertIs(suite.run(result), result)
         self.assertEqual(events, ['startTest', 'addSkip', 'stopTest'])
         self.assertEqual(result.skipped, [(test, "testing")])
         self.assertEqual(record, [])
 
         events = []
-        test.run()
+        result = test.run()
         self.assertEqual(events, ['startTestRun', 'startTest', 'addSkip',
                                   'stopTest', 'stopTestRun'])
+        self.assertEqual(result.skipped, [(test, "testing")])
         self.assertEqual(record, [])
 
     def test_skip_non_unittest_class(self):
@@ -150,7 +157,7 @@ class Foo(Mixin, unittest.TestCase):
         result = unittest.TestResult()
         test = Foo("test_1")
         suite = unittest.TestSuite([test])
-        suite.run(result)
+        self.assertIs(suite.run(result), result)
         self.assertEqual(result.skipped, [(test, "testing")])
         self.assertEqual(record, [])
 
@@ -162,7 +169,7 @@ def test_die(self):
         events = []
         result = LoggingResult(events)
         test = Foo("test_die")
-        test.run(result)
+        self.assertIs(test.run(result), result)
         self.assertEqual(events,
                          ['startTest', 'addExpectedFailure', 'stopTest'])
         self.assertEqual(result.expectedFailures[0][0], test)
@@ -177,7 +184,7 @@ def test_1(self):
         events = []
         result = LoggingResult(events)
         test = Foo("test_1")
-        test.run(result)
+        self.assertIs(test.run(result), result)
         self.assertEqual(events,
                          ['startTest', 'addExpectedFailure', 'stopTest'])
         self.assertEqual(result.expectedFailures[0][0], test)
@@ -195,7 +202,7 @@ class Bar(Foo):
         events = []
         result = LoggingResult(events)
         test = Bar("test_1")
-        test.run(result)
+        self.assertIs(test.run(result), result)
         self.assertEqual(events,
                          ['startTest', 'addExpectedFailure', 'stopTest'])
         self.assertEqual(result.expectedFailures[0][0], test)
@@ -218,7 +225,7 @@ def test_die(self):
         events = []
         result = LoggingResult(events)
         test = Foo("test_die")
-        test.run(result)
+        self.assertIs(test.run(result), result)
         self.assertEqual(events,
                          ['startTest', 'addSubTestSuccess',
                           'addExpectedFailure', 'stopTest'])
@@ -234,7 +241,7 @@ def test_die(self):
         events = []
         result = LoggingResult(events)
         test = Foo("test_die")
-        test.run(result)
+        self.assertIs(test.run(result), result)
         self.assertEqual(events,
                          ['startTest', 'addUnexpectedSuccess', 'stopTest'])
         self.assertFalse(result.failures)
@@ -256,7 +263,7 @@ def test_die(self):
         events = []
         result = LoggingResult(events)
         test = Foo("test_die")
-        test.run(result)
+        self.assertIs(test.run(result), result)
         self.assertEqual(events,
                          ['startTest',
                           'addSubTestSuccess', 'addSubTestSuccess',
@@ -280,7 +287,7 @@ def test_1(self):
         result = unittest.TestResult()
         test = Foo("test_1")
         suite = unittest.TestSuite([test])
-        suite.run(result)
+        self.assertIs(suite.run(result), result)
         self.assertEqual(result.skipped, [(test, "testing")])
         self.assertFalse(Foo.wasSetUp)
         self.assertFalse(Foo.wasTornDown)
@@ -300,7 +307,7 @@ def test_1(self):
         result = unittest.TestResult()
         test = Foo("test_1")
         suite = unittest.TestSuite([test])
-        suite.run(result)
+        self.assertIs(suite.run(result), result)
         self.assertEqual(result.skipped, [(test, "testing")])
 
     def test_skip_without_reason(self):
@@ -312,7 +319,7 @@ def test_1(self):
         result = unittest.TestResult()
         test = Foo("test_1")
         suite = unittest.TestSuite([test])
-        suite.run(result)
+        self.assertIs(suite.run(result), result)
         self.assertEqual(result.skipped, [(test, "")])
 
 if __name__ == "__main__":
diff --git a/Misc/NEWS.d/next/Library/2021-08-29-14-49-22.bpo-41620.WJ6PFL.rst b/Misc/NEWS.d/next/Library/2021-08-29-14-49-22.bpo-41620.WJ6PFL.rst
new file mode 100644
index 00000000000000..7674d4c9532a27
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-29-14-49-22.bpo-41620.WJ6PFL.rst
@@ -0,0 +1,3 @@
+:meth:`~unittest.TestCase.run` now always return a
+:class:`~unittest.TestResult` instance. Previously it returned ``None`` if
+the test class or method was decorated with a skipping decorator.


From webhook-mailer at python.org  Mon Aug 30 09:19:21 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 30 Aug 2021 13:19:21 -0000
Subject: [Python-checkins] [3.10] bpo-45007: Update to OpenSSL 1.1.1l in
 Windows build and CI (GH-28009) (GH-28039)
Message-ID: <mailman.1259.1630329562.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/52bdda50d7b79e1ad7e57967850beff64c3ede92
commit: 52bdda50d7b79e1ad7e57967850beff64c3ede92
branch: 3.10
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2021-08-30T15:19:16+02:00
summary:

[3.10] bpo-45007: Update to OpenSSL 1.1.1l in Windows build and CI (GH-28009) (GH-28039)

(cherry picked from commit d3bdbbf9a4352a24fc2bfc7a63a024b244b61aba)

Co-authored-by: Steve Dower <steve.dower at python.org>

files:
A Misc/NEWS.d/next/Windows/2021-08-27-23-50-02.bpo-45007.NIBlVG.rst
M .azure-pipelines/ci.yml
M .azure-pipelines/pr.yml
M .github/workflows/build.yml
M PCbuild/get_externals.bat
M PCbuild/python.props

diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml
index fd7b9c6f635ff6..2284a5fb36b195 100644
--- a/.azure-pipelines/ci.yml
+++ b/.azure-pipelines/ci.yml
@@ -1,14 +1,14 @@
 variables:
   coverage: false
 
-trigger: ['master', '3.10', '3.9', '3.8', '3.7']
+trigger: ['main', '3.10', '3.9', '3.8', '3.7']
 
 jobs:
 - job: Prebuild
   displayName: Pre-build checks
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   steps:
   - template: ./prebuild-checks.yml
@@ -20,7 +20,7 @@ jobs:
   condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   steps:
   - template: ./docs-steps.yml
@@ -40,7 +40,7 @@ jobs:
     testRunPlatform: macos
 
   pool:
-    vmImage: macos-10.14
+    vmImage: macos-10.15
 
   steps:
   - template: ./macos-steps.yml
@@ -52,12 +52,12 @@ jobs:
   condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   variables:
     testRunTitle: '$(build.sourceBranchName)-linux'
     testRunPlatform: linux
-    openssl_version: 1.1.1k
+    openssl_version: 1.1.1l
 
   steps:
   - template: ./posix-steps.yml
@@ -78,12 +78,12 @@ jobs:
     )
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   variables:
     testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
     testRunPlatform: linux-coverage
-    openssl_version: 1.1.1k
+    openssl_version: 1.1.1l
 
   steps:
   - template: ./posix-steps.yml
diff --git a/.azure-pipelines/pr.yml b/.azure-pipelines/pr.yml
index a5840b73c8cb11..1a3bf75ed4c1ea 100644
--- a/.azure-pipelines/pr.yml
+++ b/.azure-pipelines/pr.yml
@@ -1,14 +1,14 @@
 variables:
   coverage: false
 
-pr: ['master', '3.10', '3.9', '3.8', '3.7']
+pr: ['main', '3.10', '3.9', '3.8', '3.7']
 
 jobs:
 - job: Prebuild
   displayName: Pre-build checks
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   steps:
   - template: ./prebuild-checks.yml
@@ -20,7 +20,7 @@ jobs:
   condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   steps:
   - template: ./docs-steps.yml
@@ -38,7 +38,7 @@ jobs:
     testRunPlatform: macos
 
   pool:
-    vmImage: macos-10.14
+    vmImage: macos-10.15
 
   steps:
   - template: ./macos-steps.yml
@@ -52,12 +52,12 @@ jobs:
   condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   variables:
     testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
     testRunPlatform: linux
-    openssl_version: 1.1.1k
+    openssl_version: 1.1.1l
 
   steps:
   - template: ./posix-steps.yml
@@ -78,12 +78,12 @@ jobs:
     )
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   variables:
     testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
     testRunPlatform: linux-coverage
-    openssl_version: 1.1.1k
+    openssl_version: 1.1.1l
 
   steps:
   - template: ./posix-steps.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2ebb9e006dccfa..7b6ec726b651ea 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -160,7 +160,7 @@ jobs:
     needs: check_source
     if: needs.check_source.outputs.run_tests == 'true'
     env:
-      OPENSSL_VER: 1.1.1k
+      OPENSSL_VER: 1.1.1l
       PYTHONSTRICTEXTENSIONBUILD: 1
     steps:
     - uses: actions/checkout at v2
@@ -204,7 +204,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        openssl_ver: [1.1.1k, 3.0.0-beta1]
+        openssl_ver: [1.1.1l, 3.0.0-beta1]
     env:
       OPENSSL_VER: ${{ matrix.openssl_ver }}
       MULTISSL_DIR: ${{ github.workspace }}/multissl
diff --git a/Misc/NEWS.d/next/Windows/2021-08-27-23-50-02.bpo-45007.NIBlVG.rst b/Misc/NEWS.d/next/Windows/2021-08-27-23-50-02.bpo-45007.NIBlVG.rst
new file mode 100644
index 00000000000000..fa076ee4c8b8ad
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2021-08-27-23-50-02.bpo-45007.NIBlVG.rst
@@ -0,0 +1 @@
+Update to OpenSSL 1.1.1l in Windows build
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 8a1ab21d743c71..ea85d98e12bbd1 100644
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -53,7 +53,7 @@ echo.Fetching external libraries...
 set libraries=
 set libraries=%libraries%                                       bzip2-1.0.6
 if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries%  libffi-3.3.0
-if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries%     openssl-1.1.1k
+if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries%     openssl-1.1.1l
 set libraries=%libraries%                                       sqlite-3.35.5.0
 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.11.0
 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.11.0
@@ -77,7 +77,7 @@ echo.Fetching external binaries...
 
 set binaries=
 if NOT "%IncludeLibffi%"=="false"  set binaries=%binaries% libffi-3.3.0
-if NOT "%IncludeSSL%"=="false"     set binaries=%binaries% openssl-bin-1.1.1k-1
+if NOT "%IncludeSSL%"=="false"     set binaries=%binaries% openssl-bin-1.1.1l
 if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.11.0
 if NOT "%IncludeSSLSrc%"=="false"  set binaries=%binaries% nasm-2.11.06
 
diff --git a/PCbuild/python.props b/PCbuild/python.props
index da65df58e227d9..42c67de4afa343 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -63,8 +63,8 @@
     <libffiDir>$(ExternalsDir)libffi-3.3.0\</libffiDir>
     <libffiOutDir>$(ExternalsDir)libffi-3.3.0\$(ArchName)\</libffiOutDir>
     <libffiIncludeDir>$(libffiOutDir)include</libffiIncludeDir>
-    <opensslDir>$(ExternalsDir)openssl-1.1.1k\</opensslDir>
-    <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1k-1\$(ArchName)\</opensslOutDir>
+    <opensslDir>$(ExternalsDir)openssl-1.1.1l\</opensslDir>
+    <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1l\$(ArchName)\</opensslOutDir>
     <opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir>
     <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
     <zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir>


From webhook-mailer at python.org  Mon Aug 30 09:24:47 2021
From: webhook-mailer at python.org (vstinner)
Date: Mon, 30 Aug 2021 13:24:47 -0000
Subject: [Python-checkins] bpo-44449: faulthandler don't modify frame refcnt
 (GH-27850)
Message-ID: <mailman.1260.1630329888.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/fe997e1a67835a929705c8c305d41c4d7dd326e3
commit: fe997e1a67835a929705c8c305d41c4d7dd326e3
branch: 3.10
author: Victor Stinner <vstinner at python.org>
committer: vstinner <vstinner at python.org>
date: 2021-08-30T15:24:39+02:00
summary:

bpo-44449: faulthandler don't modify frame refcnt (GH-27850)

Fix a crash in the signal handler of the faulthandler module: no
longer modify the reference count of frame objects.

files:
A Misc/NEWS.d/next/Library/2021-08-20-11-30-52.bpo-44449.1r2-lS.rst
M Python/traceback.c

diff --git a/Misc/NEWS.d/next/Library/2021-08-20-11-30-52.bpo-44449.1r2-lS.rst b/Misc/NEWS.d/next/Library/2021-08-20-11-30-52.bpo-44449.1r2-lS.rst
new file mode 100644
index 00000000000000..52f01541fca6a7
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-20-11-30-52.bpo-44449.1r2-lS.rst
@@ -0,0 +1,2 @@
+Fix a crash in the signal handler of the :mod:`faulthandler` module: no
+longer modify the reference count of frame objects. Patch by Victor Stinner.
diff --git a/Python/traceback.c b/Python/traceback.c
index f7dc5ad6864762..88ffc01c6eca3a 100644
--- a/Python/traceback.c
+++ b/Python/traceback.c
@@ -796,7 +796,10 @@ dump_traceback(int fd, PyThreadState *tstate, int write_header)
         PUTS(fd, "Stack (most recent call first):\n");
     }
 
-    frame = PyThreadState_GetFrame(tstate);
+    // Use a borrowed reference. Avoid Py_INCREF/Py_DECREF, since this function
+    // can be called in a signal handler by the faulthandler module which must
+    // not modify Python objects.
+    frame = tstate->frame;
     if (frame == NULL) {
         PUTS(fd, "<no Python frame>\n");
         return;
@@ -805,17 +808,14 @@ dump_traceback(int fd, PyThreadState *tstate, int write_header)
     depth = 0;
     while (1) {
         if (MAX_FRAME_DEPTH <= depth) {
-            Py_DECREF(frame);
             PUTS(fd, "  ...\n");
             break;
         }
         if (!PyFrame_Check(frame)) {
-            Py_DECREF(frame);
             break;
         }
         dump_frame(fd, frame);
-        PyFrameObject *back = PyFrame_GetBack(frame);
-        Py_DECREF(frame);
+        PyFrameObject *back = frame->f_back;
 
         if (back == NULL) {
             break;


From webhook-mailer at python.org  Mon Aug 30 09:42:42 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 30 Aug 2021 13:42:42 -0000
Subject: [Python-checkins] bpo-41620: TestCase.run() now always return a
 TestResult instance (GH-28030) (GH-28065)
Message-ID: <mailman.1261.1630330963.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/0c5e0aa73f6f70d16d21ad9e1eb2d0fe3a334f0a
commit: 0c5e0aa73f6f70d16d21ad9e1eb2d0fe3a334f0a
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-30T15:42:34+02:00
summary:

bpo-41620: TestCase.run() now always return a TestResult instance (GH-28030) (GH-28065)

Previously it returned None if the test class or method was
decorated with a skipping decorator.

Co-authored-by: Iman Tabrizian <iman.tabrizian at gmail.com>
(cherry picked from commit 7e246a3a7b43762480ee4fe0cfb859e8e997a8c8)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
A Misc/NEWS.d/next/Library/2021-08-29-14-49-22.bpo-41620.WJ6PFL.rst
M Lib/unittest/case.py
M Lib/unittest/test/test_skipping.py

diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index 325e2d4a7b0262..735da3750b7f4b 100644
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -574,7 +574,7 @@ def run(self, result=None):
                 skip_why = (getattr(self.__class__, '__unittest_skip_why__', '')
                             or getattr(testMethod, '__unittest_skip_why__', ''))
                 self._addSkip(result, self, skip_why)
-                return
+                return result
 
             expecting_failure = (
                 getattr(self, "__unittest_expecting_failure__", False) or
diff --git a/Lib/unittest/test/test_skipping.py b/Lib/unittest/test/test_skipping.py
index 3adde41b04e737..79b27e6daae255 100644
--- a/Lib/unittest/test/test_skipping.py
+++ b/Lib/unittest/test/test_skipping.py
@@ -14,14 +14,16 @@ def test_skip_me(self):
         events = []
         result = LoggingResult(events)
         test = Foo("test_skip_me")
-        test.run(result)
+        self.assertIs(test.run(result), result)
         self.assertEqual(events, ['startTest', 'addSkip', 'stopTest'])
         self.assertEqual(result.skipped, [(test, "skip")])
 
         events = []
-        test.run()
+        result = test.run()
         self.assertEqual(events, ['startTestRun', 'startTest', 'addSkip',
                                   'stopTest', 'stopTestRun'])
+        self.assertEqual(result.skipped, [(test, "skip")])
+        self.assertEqual(result.testsRun, 1)
 
         # Try letting setUp skip the test now.
         class Foo(unittest.TestCase):
@@ -33,15 +35,17 @@ def test_nothing(self): pass
         events = []
         result = LoggingResult(events)
         test = Foo("test_nothing")
-        test.run(result)
+        self.assertIs(test.run(result), result)
         self.assertEqual(events, ['startTest', 'addSkip', 'stopTest'])
         self.assertEqual(result.skipped, [(test, "testing")])
         self.assertEqual(result.testsRun, 1)
 
         events = []
-        test.run()
+        result = test.run()
         self.assertEqual(events, ['startTestRun', 'startTest', 'addSkip',
                                   'stopTest', 'stopTestRun'])
+        self.assertEqual(result.skipped, [(test, "testing")])
+        self.assertEqual(result.testsRun, 1)
 
     def test_skipping_subtests(self):
         class Foo(unittest.TestCase):
@@ -56,7 +60,7 @@ def test_skip_me(self):
         events = []
         result = LoggingResult(events)
         test = Foo("test_skip_me")
-        test.run(result)
+        self.assertIs(test.run(result), result)
         self.assertEqual(events, ['startTest', 'addSkip', 'addSkip',
                                   'addSkip', 'stopTest'])
         self.assertEqual(len(result.skipped), 3)
@@ -71,10 +75,12 @@ def test_skip_me(self):
         self.assertEqual(result.skipped[2], (test, "skip 3"))
 
         events = []
-        test.run()
+        result = test.run()
         self.assertEqual(events,
                          ['startTestRun', 'startTest', 'addSkip', 'addSkip',
                           'addSkip', 'stopTest', 'stopTestRun'])
+        self.assertEqual([msg for subtest, msg in result.skipped],
+                         ['skip 1', 'skip 2', 'skip 3'])
 
     def test_skipping_decorators(self):
         op_table = ((unittest.skipUnless, False, True),
@@ -95,7 +101,7 @@ def test_dont_skip(self): pass
             suite = unittest.TestSuite([test_do_skip, test_dont_skip])
             events = []
             result = LoggingResult(events)
-            suite.run(result)
+            self.assertIs(suite.run(result), result)
             self.assertEqual(len(result.skipped), 1)
             expected = ['startTest', 'addSkip', 'stopTest',
                         'startTest', 'addSuccess', 'stopTest']
@@ -105,16 +111,16 @@ def test_dont_skip(self): pass
             self.assertTrue(result.wasSuccessful())
 
             events = []
-            test_do_skip.run()
-            self.assertEqual(len(result.skipped), 1)
+            result = test_do_skip.run()
             self.assertEqual(events, ['startTestRun', 'startTest', 'addSkip',
                                       'stopTest', 'stopTestRun'])
+            self.assertEqual(result.skipped, [(test_do_skip, "testing")])
 
             events = []
-            test_dont_skip.run()
-            self.assertEqual(len(result.skipped), 1)
+            result = test_dont_skip.run()
             self.assertEqual(events, ['startTestRun', 'startTest', 'addSuccess',
                                       'stopTest', 'stopTestRun'])
+            self.assertEqual(result.skipped, [])
 
     def test_skip_class(self):
         @unittest.skip("testing")
@@ -128,15 +134,16 @@ def test_1(self):
         result = LoggingResult(events)
         test = Foo("test_1")
         suite = unittest.TestSuite([test])
-        suite.run(result)
+        self.assertIs(suite.run(result), result)
         self.assertEqual(events, ['startTest', 'addSkip', 'stopTest'])
         self.assertEqual(result.skipped, [(test, "testing")])
         self.assertEqual(record, [])
 
         events = []
-        test.run()
+        result = test.run()
         self.assertEqual(events, ['startTestRun', 'startTest', 'addSkip',
                                   'stopTest', 'stopTestRun'])
+        self.assertEqual(result.skipped, [(test, "testing")])
         self.assertEqual(record, [])
 
     def test_skip_non_unittest_class(self):
@@ -150,7 +157,7 @@ class Foo(Mixin, unittest.TestCase):
         result = unittest.TestResult()
         test = Foo("test_1")
         suite = unittest.TestSuite([test])
-        suite.run(result)
+        self.assertIs(suite.run(result), result)
         self.assertEqual(result.skipped, [(test, "testing")])
         self.assertEqual(record, [])
 
@@ -162,7 +169,7 @@ def test_die(self):
         events = []
         result = LoggingResult(events)
         test = Foo("test_die")
-        test.run(result)
+        self.assertIs(test.run(result), result)
         self.assertEqual(events,
                          ['startTest', 'addExpectedFailure', 'stopTest'])
         self.assertEqual(result.expectedFailures[0][0], test)
@@ -177,7 +184,7 @@ def test_1(self):
         events = []
         result = LoggingResult(events)
         test = Foo("test_1")
-        test.run(result)
+        self.assertIs(test.run(result), result)
         self.assertEqual(events,
                          ['startTest', 'addExpectedFailure', 'stopTest'])
         self.assertEqual(result.expectedFailures[0][0], test)
@@ -195,7 +202,7 @@ class Bar(Foo):
         events = []
         result = LoggingResult(events)
         test = Bar("test_1")
-        test.run(result)
+        self.assertIs(test.run(result), result)
         self.assertEqual(events,
                          ['startTest', 'addExpectedFailure', 'stopTest'])
         self.assertEqual(result.expectedFailures[0][0], test)
@@ -218,7 +225,7 @@ def test_die(self):
         events = []
         result = LoggingResult(events)
         test = Foo("test_die")
-        test.run(result)
+        self.assertIs(test.run(result), result)
         self.assertEqual(events,
                          ['startTest', 'addSubTestSuccess',
                           'addExpectedFailure', 'stopTest'])
@@ -234,7 +241,7 @@ def test_die(self):
         events = []
         result = LoggingResult(events)
         test = Foo("test_die")
-        test.run(result)
+        self.assertIs(test.run(result), result)
         self.assertEqual(events,
                          ['startTest', 'addUnexpectedSuccess', 'stopTest'])
         self.assertFalse(result.failures)
@@ -256,7 +263,7 @@ def test_die(self):
         events = []
         result = LoggingResult(events)
         test = Foo("test_die")
-        test.run(result)
+        self.assertIs(test.run(result), result)
         self.assertEqual(events,
                          ['startTest',
                           'addSubTestSuccess', 'addSubTestSuccess',
@@ -280,7 +287,7 @@ def test_1(self):
         result = unittest.TestResult()
         test = Foo("test_1")
         suite = unittest.TestSuite([test])
-        suite.run(result)
+        self.assertIs(suite.run(result), result)
         self.assertEqual(result.skipped, [(test, "testing")])
         self.assertFalse(Foo.wasSetUp)
         self.assertFalse(Foo.wasTornDown)
@@ -300,7 +307,7 @@ def test_1(self):
         result = unittest.TestResult()
         test = Foo("test_1")
         suite = unittest.TestSuite([test])
-        suite.run(result)
+        self.assertIs(suite.run(result), result)
         self.assertEqual(result.skipped, [(test, "testing")])
 
     def test_skip_without_reason(self):
@@ -312,7 +319,7 @@ def test_1(self):
         result = unittest.TestResult()
         test = Foo("test_1")
         suite = unittest.TestSuite([test])
-        suite.run(result)
+        self.assertIs(suite.run(result), result)
         self.assertEqual(result.skipped, [(test, "")])
 
 if __name__ == "__main__":
diff --git a/Misc/NEWS.d/next/Library/2021-08-29-14-49-22.bpo-41620.WJ6PFL.rst b/Misc/NEWS.d/next/Library/2021-08-29-14-49-22.bpo-41620.WJ6PFL.rst
new file mode 100644
index 00000000000000..7674d4c9532a27
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-29-14-49-22.bpo-41620.WJ6PFL.rst
@@ -0,0 +1,3 @@
+:meth:`~unittest.TestCase.run` now always return a
+:class:`~unittest.TestResult` instance. Previously it returned ``None`` if
+the test class or method was decorated with a skipping decorator.


From webhook-mailer at python.org  Mon Aug 30 09:43:43 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 30 Aug 2021 13:43:43 -0000
Subject: [Python-checkins] bpo-41620: TestCase.run() now always return a
 TestResult instance (GH-28030)
Message-ID: <mailman.1262.1630331024.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/243b8de0b15061704581974c0a27db1232a43b93
commit: 243b8de0b15061704581974c0a27db1232a43b93
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-30T06:43:38-07:00
summary:

bpo-41620: TestCase.run() now always return a TestResult instance (GH-28030)


Previously it returned None if the test class or method was
decorated with a skipping decorator.

Co-authored-by: Iman Tabrizian <iman.tabrizian at gmail.com>
(cherry picked from commit 7e246a3a7b43762480ee4fe0cfb859e8e997a8c8)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
A Misc/NEWS.d/next/Library/2021-08-29-14-49-22.bpo-41620.WJ6PFL.rst
M Lib/unittest/case.py
M Lib/unittest/test/test_skipping.py

diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index d8522c02996f5f..e8d9c05b023378 100644
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -573,7 +573,7 @@ def run(self, result=None):
                 skip_why = (getattr(self.__class__, '__unittest_skip_why__', '')
                             or getattr(testMethod, '__unittest_skip_why__', ''))
                 self._addSkip(result, self, skip_why)
-                return
+                return result
 
             expecting_failure = (
                 getattr(self, "__unittest_expecting_failure__", False) or
diff --git a/Lib/unittest/test/test_skipping.py b/Lib/unittest/test/test_skipping.py
index 3adde41b04e737..79b27e6daae255 100644
--- a/Lib/unittest/test/test_skipping.py
+++ b/Lib/unittest/test/test_skipping.py
@@ -14,14 +14,16 @@ def test_skip_me(self):
         events = []
         result = LoggingResult(events)
         test = Foo("test_skip_me")
-        test.run(result)
+        self.assertIs(test.run(result), result)
         self.assertEqual(events, ['startTest', 'addSkip', 'stopTest'])
         self.assertEqual(result.skipped, [(test, "skip")])
 
         events = []
-        test.run()
+        result = test.run()
         self.assertEqual(events, ['startTestRun', 'startTest', 'addSkip',
                                   'stopTest', 'stopTestRun'])
+        self.assertEqual(result.skipped, [(test, "skip")])
+        self.assertEqual(result.testsRun, 1)
 
         # Try letting setUp skip the test now.
         class Foo(unittest.TestCase):
@@ -33,15 +35,17 @@ def test_nothing(self): pass
         events = []
         result = LoggingResult(events)
         test = Foo("test_nothing")
-        test.run(result)
+        self.assertIs(test.run(result), result)
         self.assertEqual(events, ['startTest', 'addSkip', 'stopTest'])
         self.assertEqual(result.skipped, [(test, "testing")])
         self.assertEqual(result.testsRun, 1)
 
         events = []
-        test.run()
+        result = test.run()
         self.assertEqual(events, ['startTestRun', 'startTest', 'addSkip',
                                   'stopTest', 'stopTestRun'])
+        self.assertEqual(result.skipped, [(test, "testing")])
+        self.assertEqual(result.testsRun, 1)
 
     def test_skipping_subtests(self):
         class Foo(unittest.TestCase):
@@ -56,7 +60,7 @@ def test_skip_me(self):
         events = []
         result = LoggingResult(events)
         test = Foo("test_skip_me")
-        test.run(result)
+        self.assertIs(test.run(result), result)
         self.assertEqual(events, ['startTest', 'addSkip', 'addSkip',
                                   'addSkip', 'stopTest'])
         self.assertEqual(len(result.skipped), 3)
@@ -71,10 +75,12 @@ def test_skip_me(self):
         self.assertEqual(result.skipped[2], (test, "skip 3"))
 
         events = []
-        test.run()
+        result = test.run()
         self.assertEqual(events,
                          ['startTestRun', 'startTest', 'addSkip', 'addSkip',
                           'addSkip', 'stopTest', 'stopTestRun'])
+        self.assertEqual([msg for subtest, msg in result.skipped],
+                         ['skip 1', 'skip 2', 'skip 3'])
 
     def test_skipping_decorators(self):
         op_table = ((unittest.skipUnless, False, True),
@@ -95,7 +101,7 @@ def test_dont_skip(self): pass
             suite = unittest.TestSuite([test_do_skip, test_dont_skip])
             events = []
             result = LoggingResult(events)
-            suite.run(result)
+            self.assertIs(suite.run(result), result)
             self.assertEqual(len(result.skipped), 1)
             expected = ['startTest', 'addSkip', 'stopTest',
                         'startTest', 'addSuccess', 'stopTest']
@@ -105,16 +111,16 @@ def test_dont_skip(self): pass
             self.assertTrue(result.wasSuccessful())
 
             events = []
-            test_do_skip.run()
-            self.assertEqual(len(result.skipped), 1)
+            result = test_do_skip.run()
             self.assertEqual(events, ['startTestRun', 'startTest', 'addSkip',
                                       'stopTest', 'stopTestRun'])
+            self.assertEqual(result.skipped, [(test_do_skip, "testing")])
 
             events = []
-            test_dont_skip.run()
-            self.assertEqual(len(result.skipped), 1)
+            result = test_dont_skip.run()
             self.assertEqual(events, ['startTestRun', 'startTest', 'addSuccess',
                                       'stopTest', 'stopTestRun'])
+            self.assertEqual(result.skipped, [])
 
     def test_skip_class(self):
         @unittest.skip("testing")
@@ -128,15 +134,16 @@ def test_1(self):
         result = LoggingResult(events)
         test = Foo("test_1")
         suite = unittest.TestSuite([test])
-        suite.run(result)
+        self.assertIs(suite.run(result), result)
         self.assertEqual(events, ['startTest', 'addSkip', 'stopTest'])
         self.assertEqual(result.skipped, [(test, "testing")])
         self.assertEqual(record, [])
 
         events = []
-        test.run()
+        result = test.run()
         self.assertEqual(events, ['startTestRun', 'startTest', 'addSkip',
                                   'stopTest', 'stopTestRun'])
+        self.assertEqual(result.skipped, [(test, "testing")])
         self.assertEqual(record, [])
 
     def test_skip_non_unittest_class(self):
@@ -150,7 +157,7 @@ class Foo(Mixin, unittest.TestCase):
         result = unittest.TestResult()
         test = Foo("test_1")
         suite = unittest.TestSuite([test])
-        suite.run(result)
+        self.assertIs(suite.run(result), result)
         self.assertEqual(result.skipped, [(test, "testing")])
         self.assertEqual(record, [])
 
@@ -162,7 +169,7 @@ def test_die(self):
         events = []
         result = LoggingResult(events)
         test = Foo("test_die")
-        test.run(result)
+        self.assertIs(test.run(result), result)
         self.assertEqual(events,
                          ['startTest', 'addExpectedFailure', 'stopTest'])
         self.assertEqual(result.expectedFailures[0][0], test)
@@ -177,7 +184,7 @@ def test_1(self):
         events = []
         result = LoggingResult(events)
         test = Foo("test_1")
-        test.run(result)
+        self.assertIs(test.run(result), result)
         self.assertEqual(events,
                          ['startTest', 'addExpectedFailure', 'stopTest'])
         self.assertEqual(result.expectedFailures[0][0], test)
@@ -195,7 +202,7 @@ class Bar(Foo):
         events = []
         result = LoggingResult(events)
         test = Bar("test_1")
-        test.run(result)
+        self.assertIs(test.run(result), result)
         self.assertEqual(events,
                          ['startTest', 'addExpectedFailure', 'stopTest'])
         self.assertEqual(result.expectedFailures[0][0], test)
@@ -218,7 +225,7 @@ def test_die(self):
         events = []
         result = LoggingResult(events)
         test = Foo("test_die")
-        test.run(result)
+        self.assertIs(test.run(result), result)
         self.assertEqual(events,
                          ['startTest', 'addSubTestSuccess',
                           'addExpectedFailure', 'stopTest'])
@@ -234,7 +241,7 @@ def test_die(self):
         events = []
         result = LoggingResult(events)
         test = Foo("test_die")
-        test.run(result)
+        self.assertIs(test.run(result), result)
         self.assertEqual(events,
                          ['startTest', 'addUnexpectedSuccess', 'stopTest'])
         self.assertFalse(result.failures)
@@ -256,7 +263,7 @@ def test_die(self):
         events = []
         result = LoggingResult(events)
         test = Foo("test_die")
-        test.run(result)
+        self.assertIs(test.run(result), result)
         self.assertEqual(events,
                          ['startTest',
                           'addSubTestSuccess', 'addSubTestSuccess',
@@ -280,7 +287,7 @@ def test_1(self):
         result = unittest.TestResult()
         test = Foo("test_1")
         suite = unittest.TestSuite([test])
-        suite.run(result)
+        self.assertIs(suite.run(result), result)
         self.assertEqual(result.skipped, [(test, "testing")])
         self.assertFalse(Foo.wasSetUp)
         self.assertFalse(Foo.wasTornDown)
@@ -300,7 +307,7 @@ def test_1(self):
         result = unittest.TestResult()
         test = Foo("test_1")
         suite = unittest.TestSuite([test])
-        suite.run(result)
+        self.assertIs(suite.run(result), result)
         self.assertEqual(result.skipped, [(test, "testing")])
 
     def test_skip_without_reason(self):
@@ -312,7 +319,7 @@ def test_1(self):
         result = unittest.TestResult()
         test = Foo("test_1")
         suite = unittest.TestSuite([test])
-        suite.run(result)
+        self.assertIs(suite.run(result), result)
         self.assertEqual(result.skipped, [(test, "")])
 
 if __name__ == "__main__":
diff --git a/Misc/NEWS.d/next/Library/2021-08-29-14-49-22.bpo-41620.WJ6PFL.rst b/Misc/NEWS.d/next/Library/2021-08-29-14-49-22.bpo-41620.WJ6PFL.rst
new file mode 100644
index 00000000000000..7674d4c9532a27
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-29-14-49-22.bpo-41620.WJ6PFL.rst
@@ -0,0 +1,3 @@
+:meth:`~unittest.TestCase.run` now always return a
+:class:`~unittest.TestResult` instance. Previously it returned ``None`` if
+the test class or method was decorated with a skipping decorator.


From webhook-mailer at python.org  Mon Aug 30 09:56:11 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 30 Aug 2021 13:56:11 -0000
Subject: [Python-checkins] bpo-44449: faulthandler don't modify frame refcnt
 (GH-27850)
Message-ID: <mailman.1263.1630331771.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/720aef48b558e68c07937f0cc8d62a60f23dcb3d
commit: 720aef48b558e68c07937f0cc8d62a60f23dcb3d
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-30T06:56:03-07:00
summary:

bpo-44449: faulthandler don't modify frame refcnt (GH-27850)


Fix a crash in the signal handler of the faulthandler module: no
longer modify the reference count of frame objects.
(cherry picked from commit fe997e1a67835a929705c8c305d41c4d7dd326e3)

Co-authored-by: Victor Stinner <vstinner at python.org>

files:
A Misc/NEWS.d/next/Library/2021-08-20-11-30-52.bpo-44449.1r2-lS.rst
M Python/traceback.c

diff --git a/Misc/NEWS.d/next/Library/2021-08-20-11-30-52.bpo-44449.1r2-lS.rst b/Misc/NEWS.d/next/Library/2021-08-20-11-30-52.bpo-44449.1r2-lS.rst
new file mode 100644
index 00000000000000..52f01541fca6a7
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-20-11-30-52.bpo-44449.1r2-lS.rst
@@ -0,0 +1,2 @@
+Fix a crash in the signal handler of the :mod:`faulthandler` module: no
+longer modify the reference count of frame objects. Patch by Victor Stinner.
diff --git a/Python/traceback.c b/Python/traceback.c
index a9a9dd92e38ee9..83f3074f43d050 100644
--- a/Python/traceback.c
+++ b/Python/traceback.c
@@ -799,7 +799,10 @@ dump_traceback(int fd, PyThreadState *tstate, int write_header)
         PUTS(fd, "Stack (most recent call first):\n");
     }
 
-    frame = PyThreadState_GetFrame(tstate);
+    // Use a borrowed reference. Avoid Py_INCREF/Py_DECREF, since this function
+    // can be called in a signal handler by the faulthandler module which must
+    // not modify Python objects.
+    frame = tstate->frame;
     if (frame == NULL) {
         PUTS(fd, "<no Python frame>\n");
         return;
@@ -808,17 +811,14 @@ dump_traceback(int fd, PyThreadState *tstate, int write_header)
     depth = 0;
     while (1) {
         if (MAX_FRAME_DEPTH <= depth) {
-            Py_DECREF(frame);
             PUTS(fd, "  ...\n");
             break;
         }
         if (!PyFrame_Check(frame)) {
-            Py_DECREF(frame);
             break;
         }
         dump_frame(fd, frame);
-        PyFrameObject *back = PyFrame_GetBack(frame);
-        Py_DECREF(frame);
+        PyFrameObject *back = frame->f_back;
 
         if (back == NULL) {
             break;


From webhook-mailer at python.org  Mon Aug 30 12:26:08 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 30 Aug 2021 16:26:08 -0000
Subject: [Python-checkins] bpo-43913: Fix bugs in cleaning up classes and
 modules in unittest. (GH-28006)
Message-ID: <mailman.1264.1630340769.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/08d9e597c8ef5a2b26375ac954fdf224f5d82c3c
commit: 08d9e597c8ef5a2b26375ac954fdf224f5d82c3c
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-30T18:25:59+02:00
summary:

bpo-43913: Fix bugs in cleaning up classes and modules in unittest. (GH-28006)

* Functions registered with addModuleCleanup() were not called unless
  the user defines tearDownModule() in their test module.
* Functions registered with addClassCleanup() were not called if
  tearDownClass is set to None.
* Buffering in TestResult did not work with functions registered
  with addClassCleanup() and addModuleCleanup().
* Errors in functions registered with addClassCleanup() and
  addModuleCleanup() were not handled correctly in buffered and
  debug modes.
* Errors in setUpModule() and functions registered with
  addModuleCleanup() were reported in wrong order.
* And several lesser bugs.

files:
A Misc/NEWS.d/next/Library/2021-08-27-23-40-51.bpo-43913.Uo1Gt5.rst
M Lib/unittest/suite.py
M Lib/unittest/test/test_result.py
M Lib/unittest/test/test_runner.py

diff --git a/Lib/unittest/suite.py b/Lib/unittest/suite.py
index 41993f9cf69af..6f45b6fe5f603 100644
--- a/Lib/unittest/suite.py
+++ b/Lib/unittest/suite.py
@@ -149,6 +149,7 @@ def _handleClassSetUp(self, test, result):
         if getattr(currentClass, "__unittest_skip__", False):
             return
 
+        failed = False
         try:
             currentClass._classSetupFailed = False
         except TypeError:
@@ -157,27 +158,32 @@ def _handleClassSetUp(self, test, result):
             pass
 
         setUpClass = getattr(currentClass, 'setUpClass', None)
+        doClassCleanups = getattr(currentClass, 'doClassCleanups', None)
         if setUpClass is not None:
             _call_if_exists(result, '_setupStdout')
             try:
-                setUpClass()
-            except Exception as e:
-                if isinstance(result, _DebugResult):
-                    raise
-                currentClass._classSetupFailed = True
-                className = util.strclass(currentClass)
-                self._createClassOrModuleLevelException(result, e,
-                                                        'setUpClass',
-                                                        className)
+                try:
+                    setUpClass()
+                except Exception as e:
+                    if isinstance(result, _DebugResult):
+                        raise
+                    failed = True
+                    try:
+                        currentClass._classSetupFailed = True
+                    except TypeError:
+                        pass
+                    className = util.strclass(currentClass)
+                    self._createClassOrModuleLevelException(result, e,
+                                                            'setUpClass',
+                                                            className)
+                if failed and doClassCleanups is not None:
+                    doClassCleanups()
+                    for exc_info in currentClass.tearDown_exceptions:
+                        self._createClassOrModuleLevelException(
+                                result, exc_info[1], 'setUpClass', className,
+                                info=exc_info)
             finally:
                 _call_if_exists(result, '_restoreStdout')
-                if currentClass._classSetupFailed is True:
-                    currentClass.doClassCleanups()
-                    if len(currentClass.tearDown_exceptions) > 0:
-                        for exc in currentClass.tearDown_exceptions:
-                            self._createClassOrModuleLevelException(
-                                    result, exc[1], 'setUpClass', className,
-                                    info=exc)
 
     def _get_previous_module(self, result):
         previousModule = None
@@ -205,20 +211,22 @@ def _handleModuleFixture(self, test, result):
         if setUpModule is not None:
             _call_if_exists(result, '_setupStdout')
             try:
-                setUpModule()
-            except Exception as e:
                 try:
-                    case.doModuleCleanups()
-                except Exception as exc:
-                    self._createClassOrModuleLevelException(result, exc,
+                    setUpModule()
+                except Exception as e:
+                    if isinstance(result, _DebugResult):
+                        raise
+                    result._moduleSetUpFailed = True
+                    self._createClassOrModuleLevelException(result, e,
                                                             'setUpModule',
                                                             currentModule)
-                if isinstance(result, _DebugResult):
-                    raise
-                result._moduleSetUpFailed = True
-                self._createClassOrModuleLevelException(result, e,
-                                                        'setUpModule',
-                                                        currentModule)
+                if result._moduleSetUpFailed:
+                    try:
+                        case.doModuleCleanups()
+                    except Exception as e:
+                        self._createClassOrModuleLevelException(result, e,
+                                                                'setUpModule',
+                                                                currentModule)
             finally:
                 _call_if_exists(result, '_restoreStdout')
 
@@ -251,30 +259,33 @@ def _handleModuleTearDown(self, result):
         except KeyError:
             return
 
-        tearDownModule = getattr(module, 'tearDownModule', None)
-        if tearDownModule is not None:
-            _call_if_exists(result, '_setupStdout')
+        _call_if_exists(result, '_setupStdout')
+        try:
+            tearDownModule = getattr(module, 'tearDownModule', None)
+            if tearDownModule is not None:
+                try:
+                    tearDownModule()
+                except Exception as e:
+                    if isinstance(result, _DebugResult):
+                        raise
+                    self._createClassOrModuleLevelException(result, e,
+                                                            'tearDownModule',
+                                                            previousModule)
             try:
-                tearDownModule()
+                case.doModuleCleanups()
             except Exception as e:
                 if isinstance(result, _DebugResult):
                     raise
                 self._createClassOrModuleLevelException(result, e,
                                                         'tearDownModule',
                                                         previousModule)
-            finally:
-                _call_if_exists(result, '_restoreStdout')
-                try:
-                    case.doModuleCleanups()
-                except Exception as e:
-                    self._createClassOrModuleLevelException(result, e,
-                                                            'tearDownModule',
-                                                            previousModule)
+        finally:
+            _call_if_exists(result, '_restoreStdout')
 
     def _tearDownPreviousClass(self, test, result):
         previousClass = getattr(result, '_previousTestClass', None)
         currentClass = test.__class__
-        if currentClass == previousClass:
+        if currentClass == previousClass or previousClass is None:
             return
         if getattr(previousClass, '_classSetupFailed', False):
             return
@@ -284,27 +295,34 @@ def _tearDownPreviousClass(self, test, result):
             return
 
         tearDownClass = getattr(previousClass, 'tearDownClass', None)
-        if tearDownClass is not None:
-            _call_if_exists(result, '_setupStdout')
-            try:
-                tearDownClass()
-            except Exception as e:
-                if isinstance(result, _DebugResult):
-                    raise
-                className = util.strclass(previousClass)
-                self._createClassOrModuleLevelException(result, e,
-                                                        'tearDownClass',
-                                                        className)
-            finally:
-                _call_if_exists(result, '_restoreStdout')
-                previousClass.doClassCleanups()
-                if len(previousClass.tearDown_exceptions) > 0:
-                    for exc in previousClass.tearDown_exceptions:
-                        className = util.strclass(previousClass)
-                        self._createClassOrModuleLevelException(result, exc[1],
-                                                                'tearDownClass',
-                                                                className,
-                                                                info=exc)
+        doClassCleanups = getattr(previousClass, 'doClassCleanups', None)
+        if tearDownClass is None and doClassCleanups is None:
+            return
+
+        _call_if_exists(result, '_setupStdout')
+        try:
+            if tearDownClass is not None:
+                try:
+                    tearDownClass()
+                except Exception as e:
+                    if isinstance(result, _DebugResult):
+                        raise
+                    className = util.strclass(previousClass)
+                    self._createClassOrModuleLevelException(result, e,
+                                                            'tearDownClass',
+                                                            className)
+            if doClassCleanups is not None:
+                doClassCleanups()
+                for exc_info in previousClass.tearDown_exceptions:
+                    if isinstance(result, _DebugResult):
+                        raise exc_info[1]
+                    className = util.strclass(previousClass)
+                    self._createClassOrModuleLevelException(result, exc_info[1],
+                                                            'tearDownClass',
+                                                            className,
+                                                            info=exc_info)
+        finally:
+            _call_if_exists(result, '_restoreStdout')
 
 
 class _ErrorHolder(object):
diff --git a/Lib/unittest/test/test_result.py b/Lib/unittest/test/test_result.py
index a4af67bd8d56d..d6efc7ef0662a 100644
--- a/Lib/unittest/test/test_result.py
+++ b/Lib/unittest/test/test_result.py
@@ -2,10 +2,11 @@
 import sys
 import textwrap
 
-from test.support import warnings_helper
+from test.support import warnings_helper, captured_stdout, captured_stderr
 
 import traceback
 import unittest
+from unittest.util import strclass
 
 
 class MockTraceback(object):
@@ -22,6 +23,16 @@ def restore_traceback():
     unittest.result.traceback = traceback
 
 
+def bad_cleanup1():
+    print('do cleanup1')
+    raise TypeError('bad cleanup1')
+
+
+def bad_cleanup2():
+    print('do cleanup2')
+    raise ValueError('bad cleanup2')
+
+
 class Test_TestResult(unittest.TestCase):
     # Note: there are not separate tests for TestResult.wasSuccessful(),
     # TestResult.errors, TestResult.failures, TestResult.testsRun or
@@ -633,36 +644,320 @@ def testBufferOutputAddErrorOrFailure(self):
             self.assertEqual(result._original_stderr.getvalue(), expectedErrMessage)
             self.assertMultiLineEqual(message, expectedFullMessage)
 
+    def testBufferSetUp(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            def setUp(self):
+                print('set up')
+                1/0
+            def test_foo(self):
+                pass
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\nset up\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 1)
+        description = f'test_foo ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferTearDown(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            def tearDown(self):
+                print('tear down')
+                1/0
+            def test_foo(self):
+                pass
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\ntear down\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 1)
+        description = f'test_foo ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferDoCleanups(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            def setUp(self):
+                print('set up')
+                self.addCleanup(bad_cleanup1)
+                self.addCleanup(bad_cleanup2)
+            def test_foo(self):
+                pass
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\nset up\ndo cleanup2\ndo cleanup1\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 2)
+        description = f'test_foo ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('ValueError: bad cleanup2', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+        test_case, formatted_exc = result.errors[1]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('TypeError: bad cleanup1', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferSetUp_DoCleanups(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            def setUp(self):
+                print('set up')
+                self.addCleanup(bad_cleanup1)
+                self.addCleanup(bad_cleanup2)
+                1/0
+            def test_foo(self):
+                pass
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\nset up\ndo cleanup2\ndo cleanup1\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 3)
+        description = f'test_foo ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+        test_case, formatted_exc = result.errors[1]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('ValueError: bad cleanup2', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+        test_case, formatted_exc = result.errors[2]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('TypeError: bad cleanup1', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferTearDown_DoCleanups(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            def setUp(self):
+                print('set up')
+                self.addCleanup(bad_cleanup1)
+                self.addCleanup(bad_cleanup2)
+            def tearDown(self):
+                print('tear down')
+                1/0
+            def test_foo(self):
+                pass
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\nset up\ntear down\ndo cleanup2\ndo cleanup1\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 3)
+        description = f'test_foo ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+        test_case, formatted_exc = result.errors[1]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('ValueError: bad cleanup2', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+        test_case, formatted_exc = result.errors[2]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('TypeError: bad cleanup1', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
     def testBufferSetupClass(self):
-        result = unittest.TestResult()
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
         result.buffer = True
 
         class Foo(unittest.TestCase):
             @classmethod
             def setUpClass(cls):
+                print('set up class')
                 1/0
             def test_foo(self):
                 pass
         suite = unittest.TestSuite([Foo('test_foo')])
         suite(result)
+        expected_out = '\nStdout:\nset up class\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
         self.assertEqual(len(result.errors), 1)
+        description = f'setUpClass ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
 
     def testBufferTearDownClass(self):
-        result = unittest.TestResult()
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
         result.buffer = True
 
         class Foo(unittest.TestCase):
             @classmethod
             def tearDownClass(cls):
+                print('tear down class')
                 1/0
             def test_foo(self):
                 pass
         suite = unittest.TestSuite([Foo('test_foo')])
         suite(result)
+        expected_out = '\nStdout:\ntear down class\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
         self.assertEqual(len(result.errors), 1)
+        description = f'tearDownClass ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferDoClassCleanups(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            @classmethod
+            def setUpClass(cls):
+                print('set up class')
+                cls.addClassCleanup(bad_cleanup1)
+                cls.addClassCleanup(bad_cleanup2)
+            @classmethod
+            def tearDownClass(cls):
+                print('tear down class')
+            def test_foo(self):
+                pass
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\ntear down class\ndo cleanup2\ndo cleanup1\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 2)
+        description = f'tearDownClass ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ValueError: bad cleanup2', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+        test_case, formatted_exc = result.errors[1]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('TypeError: bad cleanup1', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferSetupClass_DoClassCleanups(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            @classmethod
+            def setUpClass(cls):
+                print('set up class')
+                cls.addClassCleanup(bad_cleanup1)
+                cls.addClassCleanup(bad_cleanup2)
+                1/0
+            def test_foo(self):
+                pass
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\nset up class\ndo cleanup2\ndo cleanup1\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 3)
+        description = f'setUpClass ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn('\nStdout:\nset up class\n', formatted_exc)
+        test_case, formatted_exc = result.errors[1]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ValueError: bad cleanup2', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+        test_case, formatted_exc = result.errors[2]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('TypeError: bad cleanup1', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferTearDownClass_DoClassCleanups(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            @classmethod
+            def setUpClass(cls):
+                print('set up class')
+                cls.addClassCleanup(bad_cleanup1)
+                cls.addClassCleanup(bad_cleanup2)
+            @classmethod
+            def tearDownClass(cls):
+                print('tear down class')
+                1/0
+            def test_foo(self):
+                pass
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\ntear down class\ndo cleanup2\ndo cleanup1\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 3)
+        description = f'tearDownClass ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn('\nStdout:\ntear down class\n', formatted_exc)
+        test_case, formatted_exc = result.errors[1]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ValueError: bad cleanup2', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+        test_case, formatted_exc = result.errors[2]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('TypeError: bad cleanup1', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
 
     def testBufferSetUpModule(self):
-        result = unittest.TestResult()
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
         result.buffer = True
 
         class Foo(unittest.TestCase):
@@ -671,6 +966,7 @@ def test_foo(self):
         class Module(object):
             @staticmethod
             def setUpModule():
+                print('set up module')
                 1/0
 
         Foo.__module__ = 'Module'
@@ -678,10 +974,18 @@ def setUpModule():
         self.addCleanup(sys.modules.pop, 'Module')
         suite = unittest.TestSuite([Foo('test_foo')])
         suite(result)
+        expected_out = '\nStdout:\nset up module\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
         self.assertEqual(len(result.errors), 1)
+        description = 'setUpModule (Module)'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
 
     def testBufferTearDownModule(self):
-        result = unittest.TestResult()
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
         result.buffer = True
 
         class Foo(unittest.TestCase):
@@ -690,6 +994,7 @@ def test_foo(self):
         class Module(object):
             @staticmethod
             def tearDownModule():
+                print('tear down module')
                 1/0
 
         Foo.__module__ = 'Module'
@@ -697,7 +1002,124 @@ def tearDownModule():
         self.addCleanup(sys.modules.pop, 'Module')
         suite = unittest.TestSuite([Foo('test_foo')])
         suite(result)
+        expected_out = '\nStdout:\ntear down module\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 1)
+        description = 'tearDownModule (Module)'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferDoModuleCleanups(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            def test_foo(self):
+                pass
+        class Module(object):
+            @staticmethod
+            def setUpModule():
+                print('set up module')
+                unittest.addModuleCleanup(bad_cleanup1)
+                unittest.addModuleCleanup(bad_cleanup2)
+
+        Foo.__module__ = 'Module'
+        sys.modules['Module'] = Module
+        self.addCleanup(sys.modules.pop, 'Module')
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\ndo cleanup2\ndo cleanup1\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
         self.assertEqual(len(result.errors), 1)
+        description = 'tearDownModule (Module)'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ValueError: bad cleanup2', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferSetUpModule_DoModuleCleanups(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            def test_foo(self):
+                pass
+        class Module(object):
+            @staticmethod
+            def setUpModule():
+                print('set up module')
+                unittest.addModuleCleanup(bad_cleanup1)
+                unittest.addModuleCleanup(bad_cleanup2)
+                1/0
+
+        Foo.__module__ = 'Module'
+        sys.modules['Module'] = Module
+        self.addCleanup(sys.modules.pop, 'Module')
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\nset up module\ndo cleanup2\ndo cleanup1\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 2)
+        description = 'setUpModule (Module)'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn('\nStdout:\nset up module\n', formatted_exc)
+        test_case, formatted_exc = result.errors[1]
+        self.assertIn(expected_out, formatted_exc)
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ValueError: bad cleanup2', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferTearDownModule_DoModuleCleanups(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            def test_foo(self):
+                pass
+        class Module(object):
+            @staticmethod
+            def setUpModule():
+                print('set up module')
+                unittest.addModuleCleanup(bad_cleanup1)
+                unittest.addModuleCleanup(bad_cleanup2)
+            @staticmethod
+            def tearDownModule():
+                print('tear down module')
+                1/0
+
+        Foo.__module__ = 'Module'
+        sys.modules['Module'] = Module
+        self.addCleanup(sys.modules.pop, 'Module')
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\ntear down module\ndo cleanup2\ndo cleanup1\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 2)
+        description = 'tearDownModule (Module)'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn('\nStdout:\ntear down module\n', formatted_exc)
+        test_case, formatted_exc = result.errors[1]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ValueError: bad cleanup2', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
 
 
 if __name__ == '__main__':
diff --git a/Lib/unittest/test/test_runner.py b/Lib/unittest/test/test_runner.py
index dd9a1b6d9aedd..453e6c3d11cfa 100644
--- a/Lib/unittest/test/test_runner.py
+++ b/Lib/unittest/test/test_runner.py
@@ -222,14 +222,42 @@ def tearDownClass(cls):
         self.assertEqual(ordering,
                          ['setUpClass', 'test', 'tearDownClass', 'cleanup_good'])
 
-    def test_debug_executes_classCleanUp(self):
+    def test_run_class_cleanUp_without_tearDownClass(self):
         ordering = []
+        blowUp = True
 
         class TestableTest(unittest.TestCase):
             @classmethod
             def setUpClass(cls):
                 ordering.append('setUpClass')
                 cls.addClassCleanup(cleanup, ordering)
+                if blowUp:
+                    raise Exception()
+            def testNothing(self):
+                ordering.append('test')
+            @classmethod
+            @property
+            def tearDownClass(cls):
+                raise AttributeError
+
+        runTests(TestableTest)
+        self.assertEqual(ordering, ['setUpClass', 'cleanup_good'])
+
+        ordering = []
+        blowUp = False
+        runTests(TestableTest)
+        self.assertEqual(ordering,
+                         ['setUpClass', 'test', 'cleanup_good'])
+
+    def test_debug_executes_classCleanUp(self):
+        ordering = []
+        blowUp = False
+
+        class TestableTest(unittest.TestCase):
+            @classmethod
+            def setUpClass(cls):
+                ordering.append('setUpClass')
+                cls.addClassCleanup(cleanup, ordering, blowUp=blowUp)
             def testNothing(self):
                 ordering.append('test')
             @classmethod
@@ -241,6 +269,48 @@ def tearDownClass(cls):
         self.assertEqual(ordering,
                          ['setUpClass', 'test', 'tearDownClass', 'cleanup_good'])
 
+        ordering = []
+        blowUp = True
+        suite = unittest.defaultTestLoader.loadTestsFromTestCase(TestableTest)
+        with self.assertRaises(Exception) as cm:
+            suite.debug()
+        self.assertEqual(str(cm.exception), 'CleanUpExc')
+        self.assertEqual(ordering,
+                         ['setUpClass', 'test', 'tearDownClass', 'cleanup_exc'])
+
+    def test_debug_executes_classCleanUp_when_teardown_exception(self):
+        ordering = []
+        blowUp = False
+
+        class TestableTest(unittest.TestCase):
+            @classmethod
+            def setUpClass(cls):
+                ordering.append('setUpClass')
+                cls.addClassCleanup(cleanup, ordering, blowUp=blowUp)
+            def testNothing(self):
+                ordering.append('test')
+            @classmethod
+            def tearDownClass(cls):
+                raise Exception('TearDownClassExc')
+
+        suite = unittest.defaultTestLoader.loadTestsFromTestCase(TestableTest)
+        with self.assertRaises(Exception) as cm:
+            suite.debug()
+        self.assertEqual(str(cm.exception), 'TearDownClassExc')
+        self.assertEqual(ordering, ['setUpClass', 'test'])
+        self.assertTrue(TestableTest._class_cleanups)
+        TestableTest._class_cleanups.clear()
+
+        ordering = []
+        blowUp = True
+        suite = unittest.defaultTestLoader.loadTestsFromTestCase(TestableTest)
+        with self.assertRaises(Exception) as cm:
+            suite.debug()
+        self.assertEqual(str(cm.exception), 'TearDownClassExc')
+        self.assertEqual(ordering, ['setUpClass', 'test'])
+        self.assertTrue(TestableTest._class_cleanups)
+        TestableTest._class_cleanups.clear()
+
     def test_doClassCleanups_with_errors_addClassCleanUp(self):
         class TestableTest(unittest.TestCase):
             def testNothing(self):
@@ -332,6 +402,7 @@ def tearDownClass(cls):
         self.assertEqual(ordering,
                          ['setUpClass', 'setUp', 'test',
                           'tearDownClass', 'cleanup_exc'])
+
         ordering = []
         class_blow_up = True
         method_blow_up = False
@@ -355,6 +426,26 @@ def tearDownClass(cls):
                          ['setUpClass', 'setUp', 'tearDownClass',
                           'cleanup_exc'])
 
+    def test_with_errors_in_tearDownClass(self):
+        ordering = []
+        class TestableTest(unittest.TestCase):
+            @classmethod
+            def setUpClass(cls):
+                ordering.append('setUpClass')
+                cls.addClassCleanup(cleanup, ordering)
+            def testNothing(self):
+                ordering.append('test')
+            @classmethod
+            def tearDownClass(cls):
+                ordering.append('tearDownClass')
+                raise Exception('TearDownExc')
+
+        result = runTests(TestableTest)
+        self.assertEqual(result.errors[0][1].splitlines()[-1],
+                         'Exception: TearDownExc')
+        self.assertEqual(ordering,
+                         ['setUpClass', 'test', 'tearDownClass', 'cleanup_good'])
+
 
 class TestModuleCleanUp(unittest.TestCase):
     def test_add_and_do_ModuleCleanup(self):
@@ -532,13 +623,69 @@ def tearDownClass(cls):
                           'tearDownModule2', 'cleanup_good'])
         self.assertEqual(unittest.case._module_cleanups, [])
 
-    def test_debug_module_executes_cleanUp(self):
+    def test_run_module_cleanUp_without_teardown(self):
         ordering = []
         class Module(object):
             @staticmethod
             def setUpModule():
                 ordering.append('setUpModule')
                 unittest.addModuleCleanup(cleanup, ordering)
+
+        class TestableTest(unittest.TestCase):
+            @classmethod
+            def setUpClass(cls):
+                ordering.append('setUpClass')
+            def testNothing(self):
+                ordering.append('test')
+            @classmethod
+            def tearDownClass(cls):
+                ordering.append('tearDownClass')
+
+        TestableTest.__module__ = 'Module'
+        sys.modules['Module'] = Module
+        runTests(TestableTest)
+        self.assertEqual(ordering, ['setUpModule', 'setUpClass', 'test',
+                                    'tearDownClass', 'cleanup_good'])
+        self.assertEqual(unittest.case._module_cleanups, [])
+
+    def test_run_module_cleanUp_when_teardown_exception(self):
+        ordering = []
+        class Module(object):
+            @staticmethod
+            def setUpModule():
+                ordering.append('setUpModule')
+                unittest.addModuleCleanup(cleanup, ordering)
+            @staticmethod
+            def tearDownModule():
+                raise Exception('CleanUpExc')
+
+        class TestableTest(unittest.TestCase):
+            @classmethod
+            def setUpClass(cls):
+                ordering.append('setUpClass')
+            def testNothing(self):
+                ordering.append('test')
+            @classmethod
+            def tearDownClass(cls):
+                ordering.append('tearDownClass')
+
+        TestableTest.__module__ = 'Module'
+        sys.modules['Module'] = Module
+        result = runTests(TestableTest)
+        self.assertEqual(result.errors[0][1].splitlines()[-1],
+                         'Exception: CleanUpExc')
+        self.assertEqual(ordering, ['setUpModule', 'setUpClass', 'test',
+                                    'tearDownClass', 'cleanup_good'])
+        self.assertEqual(unittest.case._module_cleanups, [])
+
+    def test_debug_module_executes_cleanUp(self):
+        ordering = []
+        blowUp = False
+        class Module(object):
+            @staticmethod
+            def setUpModule():
+                ordering.append('setUpModule')
+                unittest.addModuleCleanup(cleanup, ordering, blowUp=blowUp)
             @staticmethod
             def tearDownModule():
                 ordering.append('tearDownModule')
@@ -562,6 +709,60 @@ def tearDownClass(cls):
                           'tearDownModule', 'cleanup_good'])
         self.assertEqual(unittest.case._module_cleanups, [])
 
+        ordering = []
+        blowUp = True
+        suite = unittest.defaultTestLoader.loadTestsFromTestCase(TestableTest)
+        with self.assertRaises(Exception) as cm:
+            suite.debug()
+        self.assertEqual(str(cm.exception), 'CleanUpExc')
+        self.assertEqual(ordering, ['setUpModule', 'setUpClass', 'test',
+                                    'tearDownClass', 'tearDownModule', 'cleanup_exc'])
+        self.assertEqual(unittest.case._module_cleanups, [])
+
+    def test_debug_module_cleanUp_when_teardown_exception(self):
+        ordering = []
+        blowUp = False
+        class Module(object):
+            @staticmethod
+            def setUpModule():
+                ordering.append('setUpModule')
+                unittest.addModuleCleanup(cleanup, ordering, blowUp=blowUp)
+            @staticmethod
+            def tearDownModule():
+                raise Exception('TearDownModuleExc')
+
+        class TestableTest(unittest.TestCase):
+            @classmethod
+            def setUpClass(cls):
+                ordering.append('setUpClass')
+            def testNothing(self):
+                ordering.append('test')
+            @classmethod
+            def tearDownClass(cls):
+                ordering.append('tearDownClass')
+
+        TestableTest.__module__ = 'Module'
+        sys.modules['Module'] = Module
+        suite = unittest.defaultTestLoader.loadTestsFromTestCase(TestableTest)
+        with self.assertRaises(Exception) as cm:
+            suite.debug()
+        self.assertEqual(str(cm.exception), 'TearDownModuleExc')
+        self.assertEqual(ordering, ['setUpModule', 'setUpClass', 'test',
+                                    'tearDownClass'])
+        self.assertTrue(unittest.case._module_cleanups)
+        unittest.case._module_cleanups.clear()
+
+        ordering = []
+        blowUp = True
+        suite = unittest.defaultTestLoader.loadTestsFromTestCase(TestableTest)
+        with self.assertRaises(Exception) as cm:
+            suite.debug()
+        self.assertEqual(str(cm.exception), 'TearDownModuleExc')
+        self.assertEqual(ordering, ['setUpModule', 'setUpClass', 'test',
+                                    'tearDownClass'])
+        self.assertTrue(unittest.case._module_cleanups)
+        unittest.case._module_cleanups.clear()
+
     def test_addClassCleanup_arg_errors(self):
         cleanups = []
         def cleanup(*args, **kwargs):
@@ -717,9 +918,9 @@ def tearDownClass(cls):
         method_blow_up = False
         result = runTests(TestableTest)
         self.assertEqual(result.errors[0][1].splitlines()[-1],
-                         'Exception: CleanUpExc')
-        self.assertEqual(result.errors[1][1].splitlines()[-1],
                          'Exception: ModuleExc')
+        self.assertEqual(result.errors[1][1].splitlines()[-1],
+                         'Exception: CleanUpExc')
         self.assertEqual(ordering, ['setUpModule', 'cleanup_exc'])
 
         ordering = []
diff --git a/Misc/NEWS.d/next/Library/2021-08-27-23-40-51.bpo-43913.Uo1Gt5.rst b/Misc/NEWS.d/next/Library/2021-08-27-23-40-51.bpo-43913.Uo1Gt5.rst
new file mode 100644
index 0000000000000..cf3d5ee0e456f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-27-23-40-51.bpo-43913.Uo1Gt5.rst
@@ -0,0 +1,8 @@
+Fix bugs in cleaning up classes and modules in :mod:`unittest`:
+
+* Functions registered with :func:`~unittest.addModuleCleanup` were not called unless the user defines ``tearDownModule()`` in their test module.
+* Functions registered with :meth:`~unittest.TestCase.addClassCleanup` were not called if ``tearDownClass`` is set to ``None``.
+* Buffering in :class:`~unittest.TestResult` did not work with functions registered with ``addClassCleanup()`` and ``addModuleCleanup()``.
+* Errors in functions registered with ``addClassCleanup()`` and ``addModuleCleanup()`` were not handled correctly in buffered and debug modes.
+* Errors in ``setUpModule()`` and functions registered with ``addModuleCleanup()`` were reported in wrong order.
+* And several lesser bugs.


From webhook-mailer at python.org  Mon Aug 30 13:04:23 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 30 Aug 2021 17:04:23 -0000
Subject: [Python-checkins] Python 3.8.12
Message-ID: <mailman.1265.1630343064.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/07119dd38c9a6e5da84ca8a0a46acdf8a3e60ecf
commit: 07119dd38c9a6e5da84ca8a0a46acdf8a3e60ecf
branch: 3.8
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2021-08-30T16:26:41+02:00
summary:

Python 3.8.12

files:
A Misc/NEWS.d/3.8.12.rst
D Misc/NEWS.d/next/Core and Builtins/2021-08-07-01-26-12.bpo-44856.9rk3li.rst
D Misc/NEWS.d/next/Core and Builtins/2021-08-09-14-29-52.bpo-33930.--5LQ-.rst
D Misc/NEWS.d/next/Core and Builtins/2021-08-09-16-16-03.bpo-44872.OKRlhK.rst
D Misc/NEWS.d/next/Documentation/2021-07-20-21-03-18.bpo-30511.eMFkRi.rst
D Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst
D Misc/NEWS.d/next/Security/2021-03-30-16-29-51.bpo-36384.sCAmLs.rst
D Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst
D Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst
D Misc/NEWS.d/next/Security/2021-08-29-12-39-44.bpo-42278.jvmQz_.rst
D Misc/NEWS.d/next/Windows/2021-08-27-23-50-02.bpo-45007.NIBlVG.rst
D Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst
D Misc/NEWS.d/next/macOS/2021-08-30-00-04-10.bpo-45007.pixqUB.rst
M Include/patchlevel.h
M Lib/pydoc_data/topics.py
M README.rst

diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index cfdfa59b875d7b..de36b5af96719f 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -18,12 +18,12 @@
 /*--start constants--*/
 #define PY_MAJOR_VERSION        3
 #define PY_MINOR_VERSION        8
-#define PY_MICRO_VERSION        11
+#define PY_MICRO_VERSION        12
 #define PY_RELEASE_LEVEL        PY_RELEASE_LEVEL_FINAL
 #define PY_RELEASE_SERIAL       0
 
 /* Version as a string */
-#define PY_VERSION              "3.8.11+"
+#define PY_VERSION              "3.8.12"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
diff --git a/Lib/pydoc_data/topics.py b/Lib/pydoc_data/topics.py
index 119e5111bd68c2..7e8d5079077633 100644
--- a/Lib/pydoc_data/topics.py
+++ b/Lib/pydoc_data/topics.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Autogenerated by Sphinx on Mon Jun 28 12:07:21 2021
+# Autogenerated by Sphinx on Mon Aug 30 16:25:18 2021
 topics = {'assert': 'The "assert" statement\n'
            '**********************\n'
            '\n'
@@ -10071,7 +10071,7 @@
                    '*start* and\n'
                    '   *end* are interpreted as in slice notation.\n'
                    '\n'
-                   "str.encode(encoding='utf-8', errors='strict')\n"
+                   'str.encode(encoding="utf-8", errors="strict")\n'
                    '\n'
                    '   Return an encoded version of the string as a bytes '
                    'object. Default\n'
@@ -10518,7 +10518,7 @@
                    'followed by\n'
                    '   the string itself.\n'
                    '\n'
-                   'str.rsplit(sep=None, maxsplit=- 1)\n'
+                   'str.rsplit(sep=None, maxsplit=-1)\n'
                    '\n'
                    '   Return a list of the words in the string, using *sep* '
                    'as the\n'
@@ -10549,7 +10549,7 @@
                    "      >>> 'mississippi'.rstrip('ipz')\n"
                    "      'mississ'\n"
                    '\n'
-                   'str.split(sep=None, maxsplit=- 1)\n'
+                   'str.split(sep=None, maxsplit=-1)\n'
                    '\n'
                    '   Return a list of the words in the string, using *sep* '
                    'as the\n'
@@ -11507,7 +11507,7 @@
           '         points. All the code points in the range "U+0000 - '
           'U+10FFFF"\n'
           '         can be represented in a string.  Python doesn?t have a '
-          '*char*\n'
+          '"char"\n'
           '         type; instead, every code point in the string is '
           'represented\n'
           '         as a string object with length "1".  The built-in '
@@ -13291,7 +13291,7 @@
              '|                                | "s[i:i] = '
              '[x]")                  |                       |\n'
              '+--------------------------------+----------------------------------+-----------------------+\n'
-             '| "s.pop([i])"                   | retrieves the item at *i* '
+             '| "s.pop()" or "s.pop(i)"        | retrieves the item at *i* '
              'and    | (2)                   |\n'
              '|                                | also removes it from '
              '*s*         |                       |\n'
@@ -13754,7 +13754,7 @@
                      '|                                | "s[i:i] = '
                      '[x]")                  |                       |\n'
                      '+--------------------------------+----------------------------------+-----------------------+\n'
-                     '| "s.pop([i])"                   | retrieves the item at '
+                     '| "s.pop()" or "s.pop(i)"        | retrieves the item at '
                      '*i* and    | (2)                   |\n'
                      '|                                | also removes it from '
                      '*s*         |                       |\n'
diff --git a/Misc/NEWS.d/3.8.12.rst b/Misc/NEWS.d/3.8.12.rst
new file mode 100644
index 00000000000000..b64613ae2f5ab1
--- /dev/null
+++ b/Misc/NEWS.d/3.8.12.rst
@@ -0,0 +1,125 @@
+.. bpo: 42278
+.. date: 2021-08-29-12-39-44
+.. nonce: jvmQz_
+.. release date: 2021-08-30
+.. section: Security
+
+Replaced usage of :func:`tempfile.mktemp` with
+:class:`~tempfile.TemporaryDirectory` to avoid a potential race condition.
+
+..
+
+.. bpo: 44394
+.. date: 2021-06-29-02-45-53
+.. nonce: A220N1
+.. section: Security
+
+Update the vendored copy of libexpat to 2.4.1 (from 2.2.8) to get the fix
+for the CVE-2013-0340 "Billion Laughs" vulnerability. This copy is most used
+on Windows and macOS.
+
+..
+
+.. bpo: 43124
+.. date: 2021-05-08-11-50-46
+.. nonce: 2CTM6M
+.. section: Security
+
+Made the internal ``putcmd`` function in :mod:`smtplib` sanitize input for
+presence of ``\r`` and ``\n`` characters to avoid (unlikely) command
+injection.
+
+..
+
+.. bpo: 36384
+.. date: 2021-03-30-16-29-51
+.. nonce: sCAmLs
+.. section: Security
+
+:mod:`ipaddress` module no longer accepts any leading zeros in IPv4 address
+strings. Leading zeros are ambiguous and interpreted as octal notation by
+some libraries. For example the legacy function :func:`socket.inet_aton`
+treats leading zeros as octal notation. glibc implementation of modern
+:func:`~socket.inet_pton` does not accept any leading zeros. For a while the
+:mod:`ipaddress` module used to accept ambiguous leading zeros.
+
+..
+
+.. bpo: 44872
+.. date: 2021-08-09-16-16-03
+.. nonce: OKRlhK
+.. section: Core and Builtins
+
+Use new trashcan macros (Py_TRASHCAN_BEGIN/END) in frameobject.c instead of
+the old ones (Py_TRASHCAN_SAFE_BEGIN/END).
+
+..
+
+.. bpo: 33930
+.. date: 2021-08-09-14-29-52
+.. nonce: --5LQ-
+.. section: Core and Builtins
+
+Fix segmentation fault with deep recursion when cleaning method objects.
+Patch by Augusto Goulart and Pablo Galindo.
+
+..
+
+.. bpo: 44856
+.. date: 2021-08-07-01-26-12
+.. nonce: 9rk3li
+.. section: Core and Builtins
+
+Fix reference leaks in the error paths of ``update_bases()`` and
+``__build_class__``. Patch by Pablo Galindo.
+
+..
+
+.. bpo: 45001
+.. date: 2021-08-26-16-25-48
+.. nonce: tn_dKp
+.. section: Library
+
+Made email date parsing more robust against malformed input, namely a
+whitespace-only ``Date:`` header. Patch by Wouter Bolsterlee.
+
+..
+
+.. bpo: 30511
+.. date: 2021-07-20-21-03-18
+.. nonce: eMFkRi
+.. section: Documentation
+
+Clarify that :func:`shutil.make_archive` is not thread-safe due to reliance
+on changing the current working directory.
+
+..
+
+.. bpo: 45007
+.. date: 2021-08-27-23-50-02
+.. nonce: NIBlVG
+.. section: Windows
+
+Update to OpenSSL 1.1.1l in Windows build
+
+..
+
+.. bpo: 45007
+.. date: 2021-08-30-00-04-10
+.. nonce: pixqUB
+.. section: macOS
+
+Update macOS installer builds to use OpenSSL 1.1.1l.
+
+..
+
+.. bpo: 44689
+.. date: 2021-07-20-22-27-01
+.. nonce: mmT_xH
+.. section: macOS
+
+:meth:`ctypes.util.find_library` now works correctly on macOS 11 Big Sur
+even if Python is built on an older version of macOS.  Previously, when
+built on older macOS systems, ``find_library`` was not able to find  macOS
+system libraries when running on Big Sur due to changes in  how system
+libraries are stored.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-07-01-26-12.bpo-44856.9rk3li.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-07-01-26-12.bpo-44856.9rk3li.rst
deleted file mode 100644
index 1111d01b726fa2..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-08-07-01-26-12.bpo-44856.9rk3li.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Fix reference leaks in the error paths of ``update_bases()`` and ``__build_class__``. Patch by Pablo Galindo.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-09-14-29-52.bpo-33930.--5LQ-.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-09-14-29-52.bpo-33930.--5LQ-.rst
deleted file mode 100644
index 827dd3f8b65131..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-08-09-14-29-52.bpo-33930.--5LQ-.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix segmentation fault with deep recursion when cleaning method objects.
-Patch by Augusto Goulart and Pablo Galindo.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-09-16-16-03.bpo-44872.OKRlhK.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-09-16-16-03.bpo-44872.OKRlhK.rst
deleted file mode 100644
index 9a0d00018b2a7c..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-08-09-16-16-03.bpo-44872.OKRlhK.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Use new trashcan macros (Py_TRASHCAN_BEGIN/END) in frameobject.c instead of the old ones (Py_TRASHCAN_SAFE_BEGIN/END).
\ No newline at end of file
diff --git a/Misc/NEWS.d/next/Documentation/2021-07-20-21-03-18.bpo-30511.eMFkRi.rst b/Misc/NEWS.d/next/Documentation/2021-07-20-21-03-18.bpo-30511.eMFkRi.rst
deleted file mode 100644
index a358fb9cc2860b..00000000000000
--- a/Misc/NEWS.d/next/Documentation/2021-07-20-21-03-18.bpo-30511.eMFkRi.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Clarify that :func:`shutil.make_archive` is not thread-safe due to
-reliance on changing the current working directory.
diff --git a/Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst b/Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst
deleted file mode 100644
index 55cc409d0da30f..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Made email date parsing more robust against malformed input, namely a
-whitespace-only ``Date:`` header. Patch by Wouter Bolsterlee.
diff --git a/Misc/NEWS.d/next/Security/2021-03-30-16-29-51.bpo-36384.sCAmLs.rst b/Misc/NEWS.d/next/Security/2021-03-30-16-29-51.bpo-36384.sCAmLs.rst
deleted file mode 100644
index 6e2926ce1e1746..00000000000000
--- a/Misc/NEWS.d/next/Security/2021-03-30-16-29-51.bpo-36384.sCAmLs.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-:mod:`ipaddress` module no longer accepts any leading zeros in IPv4 address
-strings. Leading zeros are ambiguous and interpreted as octal notation by
-some libraries. For example the legacy function :func:`socket.inet_aton`
-treats leading zeros as octal notation. glibc implementation of modern
-:func:`~socket.inet_pton` does not accept any leading zeros. For a while
-the :mod:`ipaddress` module used to accept ambiguous leading zeros.
diff --git a/Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst b/Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst
deleted file mode 100644
index e897d6cd3641d7..00000000000000
--- a/Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Made the internal ``putcmd`` function in :mod:`smtplib` sanitize input for
-presence of ``\r`` and ``\n`` characters to avoid (unlikely) command injection.
diff --git a/Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst b/Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst
deleted file mode 100644
index e32563d2535c7e..00000000000000
--- a/Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Update the vendored copy of libexpat to 2.4.1 (from 2.2.8) to get the fix
-for the CVE-2013-0340 "Billion Laughs" vulnerability. This copy is most used
-on Windows and macOS.
diff --git a/Misc/NEWS.d/next/Security/2021-08-29-12-39-44.bpo-42278.jvmQz_.rst b/Misc/NEWS.d/next/Security/2021-08-29-12-39-44.bpo-42278.jvmQz_.rst
deleted file mode 100644
index db880cd9026da4..00000000000000
--- a/Misc/NEWS.d/next/Security/2021-08-29-12-39-44.bpo-42278.jvmQz_.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Replaced usage of :func:`tempfile.mktemp` with
-:class:`~tempfile.TemporaryDirectory` to avoid a potential race condition.
diff --git a/Misc/NEWS.d/next/Windows/2021-08-27-23-50-02.bpo-45007.NIBlVG.rst b/Misc/NEWS.d/next/Windows/2021-08-27-23-50-02.bpo-45007.NIBlVG.rst
deleted file mode 100644
index fa076ee4c8b8ad..00000000000000
--- a/Misc/NEWS.d/next/Windows/2021-08-27-23-50-02.bpo-45007.NIBlVG.rst
+++ /dev/null
@@ -1 +0,0 @@
-Update to OpenSSL 1.1.1l in Windows build
diff --git a/Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst b/Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst
deleted file mode 100644
index b1e878d1ee44af..00000000000000
--- a/Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst
+++ /dev/null
@@ -1,5 +0,0 @@
- :meth:`ctypes.util.find_library` now works correctly on macOS 11 Big Sur
- even if Python is built on an older version of macOS.  Previously, when
- built on older macOS systems, ``find_library`` was not able to find
- macOS system libraries when running on Big Sur due to changes in
- how system libraries are stored.
diff --git a/Misc/NEWS.d/next/macOS/2021-08-30-00-04-10.bpo-45007.pixqUB.rst b/Misc/NEWS.d/next/macOS/2021-08-30-00-04-10.bpo-45007.pixqUB.rst
deleted file mode 100644
index e4f1ac6de313d4..00000000000000
--- a/Misc/NEWS.d/next/macOS/2021-08-30-00-04-10.bpo-45007.pixqUB.rst
+++ /dev/null
@@ -1 +0,0 @@
-Update macOS installer builds to use OpenSSL 1.1.1l.
diff --git a/README.rst b/README.rst
index 7910dc74746c81..7ef8ea53d0f3c6 100644
--- a/README.rst
+++ b/README.rst
@@ -1,4 +1,4 @@
-This is Python version 3.8.11
+This is Python version 3.8.12
 =============================
 
 .. image:: https://travis-ci.org/python/cpython.svg?branch=3.8


From webhook-mailer at python.org  Mon Aug 30 13:22:30 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 30 Aug 2021 17:22:30 -0000
Subject: [Python-checkins] [3.9] bpo-43913: Fix bugs in cleaning up classes
 and modules in unittest. (GH-28006) (GH-28071)
Message-ID: <mailman.1266.1630344151.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/9827710a400848c9430ed364ed5d2d54f0926701
commit: 9827710a400848c9430ed364ed5d2d54f0926701
branch: 3.9
author: Serhiy Storchaka <storchaka at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-30T19:22:21+02:00
summary:

[3.9] bpo-43913: Fix bugs in cleaning up classes and modules in unittest. (GH-28006) (GH-28071)

* Functions registered with addModuleCleanup() were not called unless
  the user defines tearDownModule() in their test module.
* Functions registered with addClassCleanup() were not called if
  tearDownClass is set to None.
* Buffering in TestResult did not work with functions registered
  with addClassCleanup() and addModuleCleanup().
* Errors in functions registered with addClassCleanup() and
  addModuleCleanup() were not handled correctly in buffered and
  debug modes.
* Errors in setUpModule() and functions registered with
  addModuleCleanup() were reported in wrong order.
* And several lesser bugs..
(cherry picked from commit 08d9e597c8ef5a2b26375ac954fdf224f5d82c3c)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
A Misc/NEWS.d/next/Library/2021-08-27-23-40-51.bpo-43913.Uo1Gt5.rst
M Lib/unittest/suite.py
M Lib/unittest/test/test_result.py
M Lib/unittest/test/test_runner.py

diff --git a/Lib/unittest/suite.py b/Lib/unittest/suite.py
index 41993f9cf69afc..6f45b6fe5f6039 100644
--- a/Lib/unittest/suite.py
+++ b/Lib/unittest/suite.py
@@ -149,6 +149,7 @@ def _handleClassSetUp(self, test, result):
         if getattr(currentClass, "__unittest_skip__", False):
             return
 
+        failed = False
         try:
             currentClass._classSetupFailed = False
         except TypeError:
@@ -157,27 +158,32 @@ def _handleClassSetUp(self, test, result):
             pass
 
         setUpClass = getattr(currentClass, 'setUpClass', None)
+        doClassCleanups = getattr(currentClass, 'doClassCleanups', None)
         if setUpClass is not None:
             _call_if_exists(result, '_setupStdout')
             try:
-                setUpClass()
-            except Exception as e:
-                if isinstance(result, _DebugResult):
-                    raise
-                currentClass._classSetupFailed = True
-                className = util.strclass(currentClass)
-                self._createClassOrModuleLevelException(result, e,
-                                                        'setUpClass',
-                                                        className)
+                try:
+                    setUpClass()
+                except Exception as e:
+                    if isinstance(result, _DebugResult):
+                        raise
+                    failed = True
+                    try:
+                        currentClass._classSetupFailed = True
+                    except TypeError:
+                        pass
+                    className = util.strclass(currentClass)
+                    self._createClassOrModuleLevelException(result, e,
+                                                            'setUpClass',
+                                                            className)
+                if failed and doClassCleanups is not None:
+                    doClassCleanups()
+                    for exc_info in currentClass.tearDown_exceptions:
+                        self._createClassOrModuleLevelException(
+                                result, exc_info[1], 'setUpClass', className,
+                                info=exc_info)
             finally:
                 _call_if_exists(result, '_restoreStdout')
-                if currentClass._classSetupFailed is True:
-                    currentClass.doClassCleanups()
-                    if len(currentClass.tearDown_exceptions) > 0:
-                        for exc in currentClass.tearDown_exceptions:
-                            self._createClassOrModuleLevelException(
-                                    result, exc[1], 'setUpClass', className,
-                                    info=exc)
 
     def _get_previous_module(self, result):
         previousModule = None
@@ -205,20 +211,22 @@ def _handleModuleFixture(self, test, result):
         if setUpModule is not None:
             _call_if_exists(result, '_setupStdout')
             try:
-                setUpModule()
-            except Exception as e:
                 try:
-                    case.doModuleCleanups()
-                except Exception as exc:
-                    self._createClassOrModuleLevelException(result, exc,
+                    setUpModule()
+                except Exception as e:
+                    if isinstance(result, _DebugResult):
+                        raise
+                    result._moduleSetUpFailed = True
+                    self._createClassOrModuleLevelException(result, e,
                                                             'setUpModule',
                                                             currentModule)
-                if isinstance(result, _DebugResult):
-                    raise
-                result._moduleSetUpFailed = True
-                self._createClassOrModuleLevelException(result, e,
-                                                        'setUpModule',
-                                                        currentModule)
+                if result._moduleSetUpFailed:
+                    try:
+                        case.doModuleCleanups()
+                    except Exception as e:
+                        self._createClassOrModuleLevelException(result, e,
+                                                                'setUpModule',
+                                                                currentModule)
             finally:
                 _call_if_exists(result, '_restoreStdout')
 
@@ -251,30 +259,33 @@ def _handleModuleTearDown(self, result):
         except KeyError:
             return
 
-        tearDownModule = getattr(module, 'tearDownModule', None)
-        if tearDownModule is not None:
-            _call_if_exists(result, '_setupStdout')
+        _call_if_exists(result, '_setupStdout')
+        try:
+            tearDownModule = getattr(module, 'tearDownModule', None)
+            if tearDownModule is not None:
+                try:
+                    tearDownModule()
+                except Exception as e:
+                    if isinstance(result, _DebugResult):
+                        raise
+                    self._createClassOrModuleLevelException(result, e,
+                                                            'tearDownModule',
+                                                            previousModule)
             try:
-                tearDownModule()
+                case.doModuleCleanups()
             except Exception as e:
                 if isinstance(result, _DebugResult):
                     raise
                 self._createClassOrModuleLevelException(result, e,
                                                         'tearDownModule',
                                                         previousModule)
-            finally:
-                _call_if_exists(result, '_restoreStdout')
-                try:
-                    case.doModuleCleanups()
-                except Exception as e:
-                    self._createClassOrModuleLevelException(result, e,
-                                                            'tearDownModule',
-                                                            previousModule)
+        finally:
+            _call_if_exists(result, '_restoreStdout')
 
     def _tearDownPreviousClass(self, test, result):
         previousClass = getattr(result, '_previousTestClass', None)
         currentClass = test.__class__
-        if currentClass == previousClass:
+        if currentClass == previousClass or previousClass is None:
             return
         if getattr(previousClass, '_classSetupFailed', False):
             return
@@ -284,27 +295,34 @@ def _tearDownPreviousClass(self, test, result):
             return
 
         tearDownClass = getattr(previousClass, 'tearDownClass', None)
-        if tearDownClass is not None:
-            _call_if_exists(result, '_setupStdout')
-            try:
-                tearDownClass()
-            except Exception as e:
-                if isinstance(result, _DebugResult):
-                    raise
-                className = util.strclass(previousClass)
-                self._createClassOrModuleLevelException(result, e,
-                                                        'tearDownClass',
-                                                        className)
-            finally:
-                _call_if_exists(result, '_restoreStdout')
-                previousClass.doClassCleanups()
-                if len(previousClass.tearDown_exceptions) > 0:
-                    for exc in previousClass.tearDown_exceptions:
-                        className = util.strclass(previousClass)
-                        self._createClassOrModuleLevelException(result, exc[1],
-                                                                'tearDownClass',
-                                                                className,
-                                                                info=exc)
+        doClassCleanups = getattr(previousClass, 'doClassCleanups', None)
+        if tearDownClass is None and doClassCleanups is None:
+            return
+
+        _call_if_exists(result, '_setupStdout')
+        try:
+            if tearDownClass is not None:
+                try:
+                    tearDownClass()
+                except Exception as e:
+                    if isinstance(result, _DebugResult):
+                        raise
+                    className = util.strclass(previousClass)
+                    self._createClassOrModuleLevelException(result, e,
+                                                            'tearDownClass',
+                                                            className)
+            if doClassCleanups is not None:
+                doClassCleanups()
+                for exc_info in previousClass.tearDown_exceptions:
+                    if isinstance(result, _DebugResult):
+                        raise exc_info[1]
+                    className = util.strclass(previousClass)
+                    self._createClassOrModuleLevelException(result, exc_info[1],
+                                                            'tearDownClass',
+                                                            className,
+                                                            info=exc_info)
+        finally:
+            _call_if_exists(result, '_restoreStdout')
 
 
 class _ErrorHolder(object):
diff --git a/Lib/unittest/test/test_result.py b/Lib/unittest/test/test_result.py
index 0ffb87b40256cf..0f7f3b7e371935 100644
--- a/Lib/unittest/test/test_result.py
+++ b/Lib/unittest/test/test_result.py
@@ -3,9 +3,11 @@
 import textwrap
 
 from test import support
+from test.support import captured_stdout
 
 import traceback
 import unittest
+from unittest.util import strclass
 
 
 class MockTraceback(object):
@@ -22,6 +24,16 @@ def restore_traceback():
     unittest.result.traceback = traceback
 
 
+def bad_cleanup1():
+    print('do cleanup1')
+    raise TypeError('bad cleanup1')
+
+
+def bad_cleanup2():
+    print('do cleanup2')
+    raise ValueError('bad cleanup2')
+
+
 class Test_TestResult(unittest.TestCase):
     # Note: there are not separate tests for TestResult.wasSuccessful(),
     # TestResult.errors, TestResult.failures, TestResult.testsRun or
@@ -633,36 +645,320 @@ def testBufferOutputAddErrorOrFailure(self):
             self.assertEqual(result._original_stderr.getvalue(), expectedErrMessage)
             self.assertMultiLineEqual(message, expectedFullMessage)
 
+    def testBufferSetUp(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            def setUp(self):
+                print('set up')
+                1/0
+            def test_foo(self):
+                pass
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\nset up\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 1)
+        description = f'test_foo ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferTearDown(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            def tearDown(self):
+                print('tear down')
+                1/0
+            def test_foo(self):
+                pass
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\ntear down\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 1)
+        description = f'test_foo ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferDoCleanups(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            def setUp(self):
+                print('set up')
+                self.addCleanup(bad_cleanup1)
+                self.addCleanup(bad_cleanup2)
+            def test_foo(self):
+                pass
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\nset up\ndo cleanup2\ndo cleanup1\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 2)
+        description = f'test_foo ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('ValueError: bad cleanup2', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+        test_case, formatted_exc = result.errors[1]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('TypeError: bad cleanup1', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferSetUp_DoCleanups(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            def setUp(self):
+                print('set up')
+                self.addCleanup(bad_cleanup1)
+                self.addCleanup(bad_cleanup2)
+                1/0
+            def test_foo(self):
+                pass
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\nset up\ndo cleanup2\ndo cleanup1\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 3)
+        description = f'test_foo ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+        test_case, formatted_exc = result.errors[1]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('ValueError: bad cleanup2', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+        test_case, formatted_exc = result.errors[2]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('TypeError: bad cleanup1', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferTearDown_DoCleanups(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            def setUp(self):
+                print('set up')
+                self.addCleanup(bad_cleanup1)
+                self.addCleanup(bad_cleanup2)
+            def tearDown(self):
+                print('tear down')
+                1/0
+            def test_foo(self):
+                pass
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\nset up\ntear down\ndo cleanup2\ndo cleanup1\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 3)
+        description = f'test_foo ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+        test_case, formatted_exc = result.errors[1]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('ValueError: bad cleanup2', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+        test_case, formatted_exc = result.errors[2]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('TypeError: bad cleanup1', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
     def testBufferSetupClass(self):
-        result = unittest.TestResult()
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
         result.buffer = True
 
         class Foo(unittest.TestCase):
             @classmethod
             def setUpClass(cls):
+                print('set up class')
                 1/0
             def test_foo(self):
                 pass
         suite = unittest.TestSuite([Foo('test_foo')])
         suite(result)
+        expected_out = '\nStdout:\nset up class\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
         self.assertEqual(len(result.errors), 1)
+        description = f'setUpClass ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
 
     def testBufferTearDownClass(self):
-        result = unittest.TestResult()
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
         result.buffer = True
 
         class Foo(unittest.TestCase):
             @classmethod
             def tearDownClass(cls):
+                print('tear down class')
                 1/0
             def test_foo(self):
                 pass
         suite = unittest.TestSuite([Foo('test_foo')])
         suite(result)
+        expected_out = '\nStdout:\ntear down class\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
         self.assertEqual(len(result.errors), 1)
+        description = f'tearDownClass ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferDoClassCleanups(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            @classmethod
+            def setUpClass(cls):
+                print('set up class')
+                cls.addClassCleanup(bad_cleanup1)
+                cls.addClassCleanup(bad_cleanup2)
+            @classmethod
+            def tearDownClass(cls):
+                print('tear down class')
+            def test_foo(self):
+                pass
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\ntear down class\ndo cleanup2\ndo cleanup1\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 2)
+        description = f'tearDownClass ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ValueError: bad cleanup2', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+        test_case, formatted_exc = result.errors[1]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('TypeError: bad cleanup1', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferSetupClass_DoClassCleanups(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            @classmethod
+            def setUpClass(cls):
+                print('set up class')
+                cls.addClassCleanup(bad_cleanup1)
+                cls.addClassCleanup(bad_cleanup2)
+                1/0
+            def test_foo(self):
+                pass
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\nset up class\ndo cleanup2\ndo cleanup1\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 3)
+        description = f'setUpClass ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn('\nStdout:\nset up class\n', formatted_exc)
+        test_case, formatted_exc = result.errors[1]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ValueError: bad cleanup2', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+        test_case, formatted_exc = result.errors[2]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('TypeError: bad cleanup1', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferTearDownClass_DoClassCleanups(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            @classmethod
+            def setUpClass(cls):
+                print('set up class')
+                cls.addClassCleanup(bad_cleanup1)
+                cls.addClassCleanup(bad_cleanup2)
+            @classmethod
+            def tearDownClass(cls):
+                print('tear down class')
+                1/0
+            def test_foo(self):
+                pass
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\ntear down class\ndo cleanup2\ndo cleanup1\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 3)
+        description = f'tearDownClass ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn('\nStdout:\ntear down class\n', formatted_exc)
+        test_case, formatted_exc = result.errors[1]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ValueError: bad cleanup2', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+        test_case, formatted_exc = result.errors[2]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('TypeError: bad cleanup1', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
 
     def testBufferSetUpModule(self):
-        result = unittest.TestResult()
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
         result.buffer = True
 
         class Foo(unittest.TestCase):
@@ -671,6 +967,7 @@ def test_foo(self):
         class Module(object):
             @staticmethod
             def setUpModule():
+                print('set up module')
                 1/0
 
         Foo.__module__ = 'Module'
@@ -678,10 +975,18 @@ def setUpModule():
         self.addCleanup(sys.modules.pop, 'Module')
         suite = unittest.TestSuite([Foo('test_foo')])
         suite(result)
+        expected_out = '\nStdout:\nset up module\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
         self.assertEqual(len(result.errors), 1)
+        description = 'setUpModule (Module)'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
 
     def testBufferTearDownModule(self):
-        result = unittest.TestResult()
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
         result.buffer = True
 
         class Foo(unittest.TestCase):
@@ -690,6 +995,7 @@ def test_foo(self):
         class Module(object):
             @staticmethod
             def tearDownModule():
+                print('tear down module')
                 1/0
 
         Foo.__module__ = 'Module'
@@ -697,7 +1003,124 @@ def tearDownModule():
         self.addCleanup(sys.modules.pop, 'Module')
         suite = unittest.TestSuite([Foo('test_foo')])
         suite(result)
+        expected_out = '\nStdout:\ntear down module\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 1)
+        description = 'tearDownModule (Module)'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferDoModuleCleanups(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            def test_foo(self):
+                pass
+        class Module(object):
+            @staticmethod
+            def setUpModule():
+                print('set up module')
+                unittest.addModuleCleanup(bad_cleanup1)
+                unittest.addModuleCleanup(bad_cleanup2)
+
+        Foo.__module__ = 'Module'
+        sys.modules['Module'] = Module
+        self.addCleanup(sys.modules.pop, 'Module')
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\ndo cleanup2\ndo cleanup1\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
         self.assertEqual(len(result.errors), 1)
+        description = 'tearDownModule (Module)'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ValueError: bad cleanup2', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferSetUpModule_DoModuleCleanups(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            def test_foo(self):
+                pass
+        class Module(object):
+            @staticmethod
+            def setUpModule():
+                print('set up module')
+                unittest.addModuleCleanup(bad_cleanup1)
+                unittest.addModuleCleanup(bad_cleanup2)
+                1/0
+
+        Foo.__module__ = 'Module'
+        sys.modules['Module'] = Module
+        self.addCleanup(sys.modules.pop, 'Module')
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\nset up module\ndo cleanup2\ndo cleanup1\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 2)
+        description = 'setUpModule (Module)'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn('\nStdout:\nset up module\n', formatted_exc)
+        test_case, formatted_exc = result.errors[1]
+        self.assertIn(expected_out, formatted_exc)
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ValueError: bad cleanup2', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferTearDownModule_DoModuleCleanups(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            def test_foo(self):
+                pass
+        class Module(object):
+            @staticmethod
+            def setUpModule():
+                print('set up module')
+                unittest.addModuleCleanup(bad_cleanup1)
+                unittest.addModuleCleanup(bad_cleanup2)
+            @staticmethod
+            def tearDownModule():
+                print('tear down module')
+                1/0
+
+        Foo.__module__ = 'Module'
+        sys.modules['Module'] = Module
+        self.addCleanup(sys.modules.pop, 'Module')
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\ntear down module\ndo cleanup2\ndo cleanup1\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 2)
+        description = 'tearDownModule (Module)'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn('\nStdout:\ntear down module\n', formatted_exc)
+        test_case, formatted_exc = result.errors[1]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ValueError: bad cleanup2', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
 
 
 if __name__ == '__main__':
diff --git a/Lib/unittest/test/test_runner.py b/Lib/unittest/test/test_runner.py
index dd9a1b6d9aeddf..453e6c3d11cfaa 100644
--- a/Lib/unittest/test/test_runner.py
+++ b/Lib/unittest/test/test_runner.py
@@ -222,14 +222,42 @@ def tearDownClass(cls):
         self.assertEqual(ordering,
                          ['setUpClass', 'test', 'tearDownClass', 'cleanup_good'])
 
-    def test_debug_executes_classCleanUp(self):
+    def test_run_class_cleanUp_without_tearDownClass(self):
         ordering = []
+        blowUp = True
 
         class TestableTest(unittest.TestCase):
             @classmethod
             def setUpClass(cls):
                 ordering.append('setUpClass')
                 cls.addClassCleanup(cleanup, ordering)
+                if blowUp:
+                    raise Exception()
+            def testNothing(self):
+                ordering.append('test')
+            @classmethod
+            @property
+            def tearDownClass(cls):
+                raise AttributeError
+
+        runTests(TestableTest)
+        self.assertEqual(ordering, ['setUpClass', 'cleanup_good'])
+
+        ordering = []
+        blowUp = False
+        runTests(TestableTest)
+        self.assertEqual(ordering,
+                         ['setUpClass', 'test', 'cleanup_good'])
+
+    def test_debug_executes_classCleanUp(self):
+        ordering = []
+        blowUp = False
+
+        class TestableTest(unittest.TestCase):
+            @classmethod
+            def setUpClass(cls):
+                ordering.append('setUpClass')
+                cls.addClassCleanup(cleanup, ordering, blowUp=blowUp)
             def testNothing(self):
                 ordering.append('test')
             @classmethod
@@ -241,6 +269,48 @@ def tearDownClass(cls):
         self.assertEqual(ordering,
                          ['setUpClass', 'test', 'tearDownClass', 'cleanup_good'])
 
+        ordering = []
+        blowUp = True
+        suite = unittest.defaultTestLoader.loadTestsFromTestCase(TestableTest)
+        with self.assertRaises(Exception) as cm:
+            suite.debug()
+        self.assertEqual(str(cm.exception), 'CleanUpExc')
+        self.assertEqual(ordering,
+                         ['setUpClass', 'test', 'tearDownClass', 'cleanup_exc'])
+
+    def test_debug_executes_classCleanUp_when_teardown_exception(self):
+        ordering = []
+        blowUp = False
+
+        class TestableTest(unittest.TestCase):
+            @classmethod
+            def setUpClass(cls):
+                ordering.append('setUpClass')
+                cls.addClassCleanup(cleanup, ordering, blowUp=blowUp)
+            def testNothing(self):
+                ordering.append('test')
+            @classmethod
+            def tearDownClass(cls):
+                raise Exception('TearDownClassExc')
+
+        suite = unittest.defaultTestLoader.loadTestsFromTestCase(TestableTest)
+        with self.assertRaises(Exception) as cm:
+            suite.debug()
+        self.assertEqual(str(cm.exception), 'TearDownClassExc')
+        self.assertEqual(ordering, ['setUpClass', 'test'])
+        self.assertTrue(TestableTest._class_cleanups)
+        TestableTest._class_cleanups.clear()
+
+        ordering = []
+        blowUp = True
+        suite = unittest.defaultTestLoader.loadTestsFromTestCase(TestableTest)
+        with self.assertRaises(Exception) as cm:
+            suite.debug()
+        self.assertEqual(str(cm.exception), 'TearDownClassExc')
+        self.assertEqual(ordering, ['setUpClass', 'test'])
+        self.assertTrue(TestableTest._class_cleanups)
+        TestableTest._class_cleanups.clear()
+
     def test_doClassCleanups_with_errors_addClassCleanUp(self):
         class TestableTest(unittest.TestCase):
             def testNothing(self):
@@ -332,6 +402,7 @@ def tearDownClass(cls):
         self.assertEqual(ordering,
                          ['setUpClass', 'setUp', 'test',
                           'tearDownClass', 'cleanup_exc'])
+
         ordering = []
         class_blow_up = True
         method_blow_up = False
@@ -355,6 +426,26 @@ def tearDownClass(cls):
                          ['setUpClass', 'setUp', 'tearDownClass',
                           'cleanup_exc'])
 
+    def test_with_errors_in_tearDownClass(self):
+        ordering = []
+        class TestableTest(unittest.TestCase):
+            @classmethod
+            def setUpClass(cls):
+                ordering.append('setUpClass')
+                cls.addClassCleanup(cleanup, ordering)
+            def testNothing(self):
+                ordering.append('test')
+            @classmethod
+            def tearDownClass(cls):
+                ordering.append('tearDownClass')
+                raise Exception('TearDownExc')
+
+        result = runTests(TestableTest)
+        self.assertEqual(result.errors[0][1].splitlines()[-1],
+                         'Exception: TearDownExc')
+        self.assertEqual(ordering,
+                         ['setUpClass', 'test', 'tearDownClass', 'cleanup_good'])
+
 
 class TestModuleCleanUp(unittest.TestCase):
     def test_add_and_do_ModuleCleanup(self):
@@ -532,13 +623,69 @@ def tearDownClass(cls):
                           'tearDownModule2', 'cleanup_good'])
         self.assertEqual(unittest.case._module_cleanups, [])
 
-    def test_debug_module_executes_cleanUp(self):
+    def test_run_module_cleanUp_without_teardown(self):
         ordering = []
         class Module(object):
             @staticmethod
             def setUpModule():
                 ordering.append('setUpModule')
                 unittest.addModuleCleanup(cleanup, ordering)
+
+        class TestableTest(unittest.TestCase):
+            @classmethod
+            def setUpClass(cls):
+                ordering.append('setUpClass')
+            def testNothing(self):
+                ordering.append('test')
+            @classmethod
+            def tearDownClass(cls):
+                ordering.append('tearDownClass')
+
+        TestableTest.__module__ = 'Module'
+        sys.modules['Module'] = Module
+        runTests(TestableTest)
+        self.assertEqual(ordering, ['setUpModule', 'setUpClass', 'test',
+                                    'tearDownClass', 'cleanup_good'])
+        self.assertEqual(unittest.case._module_cleanups, [])
+
+    def test_run_module_cleanUp_when_teardown_exception(self):
+        ordering = []
+        class Module(object):
+            @staticmethod
+            def setUpModule():
+                ordering.append('setUpModule')
+                unittest.addModuleCleanup(cleanup, ordering)
+            @staticmethod
+            def tearDownModule():
+                raise Exception('CleanUpExc')
+
+        class TestableTest(unittest.TestCase):
+            @classmethod
+            def setUpClass(cls):
+                ordering.append('setUpClass')
+            def testNothing(self):
+                ordering.append('test')
+            @classmethod
+            def tearDownClass(cls):
+                ordering.append('tearDownClass')
+
+        TestableTest.__module__ = 'Module'
+        sys.modules['Module'] = Module
+        result = runTests(TestableTest)
+        self.assertEqual(result.errors[0][1].splitlines()[-1],
+                         'Exception: CleanUpExc')
+        self.assertEqual(ordering, ['setUpModule', 'setUpClass', 'test',
+                                    'tearDownClass', 'cleanup_good'])
+        self.assertEqual(unittest.case._module_cleanups, [])
+
+    def test_debug_module_executes_cleanUp(self):
+        ordering = []
+        blowUp = False
+        class Module(object):
+            @staticmethod
+            def setUpModule():
+                ordering.append('setUpModule')
+                unittest.addModuleCleanup(cleanup, ordering, blowUp=blowUp)
             @staticmethod
             def tearDownModule():
                 ordering.append('tearDownModule')
@@ -562,6 +709,60 @@ def tearDownClass(cls):
                           'tearDownModule', 'cleanup_good'])
         self.assertEqual(unittest.case._module_cleanups, [])
 
+        ordering = []
+        blowUp = True
+        suite = unittest.defaultTestLoader.loadTestsFromTestCase(TestableTest)
+        with self.assertRaises(Exception) as cm:
+            suite.debug()
+        self.assertEqual(str(cm.exception), 'CleanUpExc')
+        self.assertEqual(ordering, ['setUpModule', 'setUpClass', 'test',
+                                    'tearDownClass', 'tearDownModule', 'cleanup_exc'])
+        self.assertEqual(unittest.case._module_cleanups, [])
+
+    def test_debug_module_cleanUp_when_teardown_exception(self):
+        ordering = []
+        blowUp = False
+        class Module(object):
+            @staticmethod
+            def setUpModule():
+                ordering.append('setUpModule')
+                unittest.addModuleCleanup(cleanup, ordering, blowUp=blowUp)
+            @staticmethod
+            def tearDownModule():
+                raise Exception('TearDownModuleExc')
+
+        class TestableTest(unittest.TestCase):
+            @classmethod
+            def setUpClass(cls):
+                ordering.append('setUpClass')
+            def testNothing(self):
+                ordering.append('test')
+            @classmethod
+            def tearDownClass(cls):
+                ordering.append('tearDownClass')
+
+        TestableTest.__module__ = 'Module'
+        sys.modules['Module'] = Module
+        suite = unittest.defaultTestLoader.loadTestsFromTestCase(TestableTest)
+        with self.assertRaises(Exception) as cm:
+            suite.debug()
+        self.assertEqual(str(cm.exception), 'TearDownModuleExc')
+        self.assertEqual(ordering, ['setUpModule', 'setUpClass', 'test',
+                                    'tearDownClass'])
+        self.assertTrue(unittest.case._module_cleanups)
+        unittest.case._module_cleanups.clear()
+
+        ordering = []
+        blowUp = True
+        suite = unittest.defaultTestLoader.loadTestsFromTestCase(TestableTest)
+        with self.assertRaises(Exception) as cm:
+            suite.debug()
+        self.assertEqual(str(cm.exception), 'TearDownModuleExc')
+        self.assertEqual(ordering, ['setUpModule', 'setUpClass', 'test',
+                                    'tearDownClass'])
+        self.assertTrue(unittest.case._module_cleanups)
+        unittest.case._module_cleanups.clear()
+
     def test_addClassCleanup_arg_errors(self):
         cleanups = []
         def cleanup(*args, **kwargs):
@@ -717,9 +918,9 @@ def tearDownClass(cls):
         method_blow_up = False
         result = runTests(TestableTest)
         self.assertEqual(result.errors[0][1].splitlines()[-1],
-                         'Exception: CleanUpExc')
-        self.assertEqual(result.errors[1][1].splitlines()[-1],
                          'Exception: ModuleExc')
+        self.assertEqual(result.errors[1][1].splitlines()[-1],
+                         'Exception: CleanUpExc')
         self.assertEqual(ordering, ['setUpModule', 'cleanup_exc'])
 
         ordering = []
diff --git a/Misc/NEWS.d/next/Library/2021-08-27-23-40-51.bpo-43913.Uo1Gt5.rst b/Misc/NEWS.d/next/Library/2021-08-27-23-40-51.bpo-43913.Uo1Gt5.rst
new file mode 100644
index 00000000000000..cf3d5ee0e456f1
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-27-23-40-51.bpo-43913.Uo1Gt5.rst
@@ -0,0 +1,8 @@
+Fix bugs in cleaning up classes and modules in :mod:`unittest`:
+
+* Functions registered with :func:`~unittest.addModuleCleanup` were not called unless the user defines ``tearDownModule()`` in their test module.
+* Functions registered with :meth:`~unittest.TestCase.addClassCleanup` were not called if ``tearDownClass`` is set to ``None``.
+* Buffering in :class:`~unittest.TestResult` did not work with functions registered with ``addClassCleanup()`` and ``addModuleCleanup()``.
+* Errors in functions registered with ``addClassCleanup()`` and ``addModuleCleanup()`` were not handled correctly in buffered and debug modes.
+* Errors in ``setUpModule()`` and functions registered with ``addModuleCleanup()`` were reported in wrong order.
+* And several lesser bugs.


From webhook-mailer at python.org  Mon Aug 30 13:38:43 2021
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 30 Aug 2021 17:38:43 -0000
Subject: [Python-checkins] bpo-43913: Fix bugs in cleaning up classes and
 modules in unittest. (GH-28006)
Message-ID: <mailman.1267.1630345124.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/d65fad04fad1a73b6bb17bcb08ca6f0a24376952
commit: d65fad04fad1a73b6bb17bcb08ca6f0a24376952
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-30T10:38:34-07:00
summary:

bpo-43913: Fix bugs in cleaning up classes and modules in unittest. (GH-28006)


* Functions registered with addModuleCleanup() were not called unless
  the user defines tearDownModule() in their test module.
* Functions registered with addClassCleanup() were not called if
  tearDownClass is set to None.
* Buffering in TestResult did not work with functions registered
  with addClassCleanup() and addModuleCleanup().
* Errors in functions registered with addClassCleanup() and
  addModuleCleanup() were not handled correctly in buffered and
  debug modes.
* Errors in setUpModule() and functions registered with
  addModuleCleanup() were reported in wrong order.
* And several lesser bugs.
(cherry picked from commit 08d9e597c8ef5a2b26375ac954fdf224f5d82c3c)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
A Misc/NEWS.d/next/Library/2021-08-27-23-40-51.bpo-43913.Uo1Gt5.rst
M Lib/unittest/suite.py
M Lib/unittest/test/test_result.py
M Lib/unittest/test/test_runner.py

diff --git a/Lib/unittest/suite.py b/Lib/unittest/suite.py
index 41993f9cf69afc..6f45b6fe5f6039 100644
--- a/Lib/unittest/suite.py
+++ b/Lib/unittest/suite.py
@@ -149,6 +149,7 @@ def _handleClassSetUp(self, test, result):
         if getattr(currentClass, "__unittest_skip__", False):
             return
 
+        failed = False
         try:
             currentClass._classSetupFailed = False
         except TypeError:
@@ -157,27 +158,32 @@ def _handleClassSetUp(self, test, result):
             pass
 
         setUpClass = getattr(currentClass, 'setUpClass', None)
+        doClassCleanups = getattr(currentClass, 'doClassCleanups', None)
         if setUpClass is not None:
             _call_if_exists(result, '_setupStdout')
             try:
-                setUpClass()
-            except Exception as e:
-                if isinstance(result, _DebugResult):
-                    raise
-                currentClass._classSetupFailed = True
-                className = util.strclass(currentClass)
-                self._createClassOrModuleLevelException(result, e,
-                                                        'setUpClass',
-                                                        className)
+                try:
+                    setUpClass()
+                except Exception as e:
+                    if isinstance(result, _DebugResult):
+                        raise
+                    failed = True
+                    try:
+                        currentClass._classSetupFailed = True
+                    except TypeError:
+                        pass
+                    className = util.strclass(currentClass)
+                    self._createClassOrModuleLevelException(result, e,
+                                                            'setUpClass',
+                                                            className)
+                if failed and doClassCleanups is not None:
+                    doClassCleanups()
+                    for exc_info in currentClass.tearDown_exceptions:
+                        self._createClassOrModuleLevelException(
+                                result, exc_info[1], 'setUpClass', className,
+                                info=exc_info)
             finally:
                 _call_if_exists(result, '_restoreStdout')
-                if currentClass._classSetupFailed is True:
-                    currentClass.doClassCleanups()
-                    if len(currentClass.tearDown_exceptions) > 0:
-                        for exc in currentClass.tearDown_exceptions:
-                            self._createClassOrModuleLevelException(
-                                    result, exc[1], 'setUpClass', className,
-                                    info=exc)
 
     def _get_previous_module(self, result):
         previousModule = None
@@ -205,20 +211,22 @@ def _handleModuleFixture(self, test, result):
         if setUpModule is not None:
             _call_if_exists(result, '_setupStdout')
             try:
-                setUpModule()
-            except Exception as e:
                 try:
-                    case.doModuleCleanups()
-                except Exception as exc:
-                    self._createClassOrModuleLevelException(result, exc,
+                    setUpModule()
+                except Exception as e:
+                    if isinstance(result, _DebugResult):
+                        raise
+                    result._moduleSetUpFailed = True
+                    self._createClassOrModuleLevelException(result, e,
                                                             'setUpModule',
                                                             currentModule)
-                if isinstance(result, _DebugResult):
-                    raise
-                result._moduleSetUpFailed = True
-                self._createClassOrModuleLevelException(result, e,
-                                                        'setUpModule',
-                                                        currentModule)
+                if result._moduleSetUpFailed:
+                    try:
+                        case.doModuleCleanups()
+                    except Exception as e:
+                        self._createClassOrModuleLevelException(result, e,
+                                                                'setUpModule',
+                                                                currentModule)
             finally:
                 _call_if_exists(result, '_restoreStdout')
 
@@ -251,30 +259,33 @@ def _handleModuleTearDown(self, result):
         except KeyError:
             return
 
-        tearDownModule = getattr(module, 'tearDownModule', None)
-        if tearDownModule is not None:
-            _call_if_exists(result, '_setupStdout')
+        _call_if_exists(result, '_setupStdout')
+        try:
+            tearDownModule = getattr(module, 'tearDownModule', None)
+            if tearDownModule is not None:
+                try:
+                    tearDownModule()
+                except Exception as e:
+                    if isinstance(result, _DebugResult):
+                        raise
+                    self._createClassOrModuleLevelException(result, e,
+                                                            'tearDownModule',
+                                                            previousModule)
             try:
-                tearDownModule()
+                case.doModuleCleanups()
             except Exception as e:
                 if isinstance(result, _DebugResult):
                     raise
                 self._createClassOrModuleLevelException(result, e,
                                                         'tearDownModule',
                                                         previousModule)
-            finally:
-                _call_if_exists(result, '_restoreStdout')
-                try:
-                    case.doModuleCleanups()
-                except Exception as e:
-                    self._createClassOrModuleLevelException(result, e,
-                                                            'tearDownModule',
-                                                            previousModule)
+        finally:
+            _call_if_exists(result, '_restoreStdout')
 
     def _tearDownPreviousClass(self, test, result):
         previousClass = getattr(result, '_previousTestClass', None)
         currentClass = test.__class__
-        if currentClass == previousClass:
+        if currentClass == previousClass or previousClass is None:
             return
         if getattr(previousClass, '_classSetupFailed', False):
             return
@@ -284,27 +295,34 @@ def _tearDownPreviousClass(self, test, result):
             return
 
         tearDownClass = getattr(previousClass, 'tearDownClass', None)
-        if tearDownClass is not None:
-            _call_if_exists(result, '_setupStdout')
-            try:
-                tearDownClass()
-            except Exception as e:
-                if isinstance(result, _DebugResult):
-                    raise
-                className = util.strclass(previousClass)
-                self._createClassOrModuleLevelException(result, e,
-                                                        'tearDownClass',
-                                                        className)
-            finally:
-                _call_if_exists(result, '_restoreStdout')
-                previousClass.doClassCleanups()
-                if len(previousClass.tearDown_exceptions) > 0:
-                    for exc in previousClass.tearDown_exceptions:
-                        className = util.strclass(previousClass)
-                        self._createClassOrModuleLevelException(result, exc[1],
-                                                                'tearDownClass',
-                                                                className,
-                                                                info=exc)
+        doClassCleanups = getattr(previousClass, 'doClassCleanups', None)
+        if tearDownClass is None and doClassCleanups is None:
+            return
+
+        _call_if_exists(result, '_setupStdout')
+        try:
+            if tearDownClass is not None:
+                try:
+                    tearDownClass()
+                except Exception as e:
+                    if isinstance(result, _DebugResult):
+                        raise
+                    className = util.strclass(previousClass)
+                    self._createClassOrModuleLevelException(result, e,
+                                                            'tearDownClass',
+                                                            className)
+            if doClassCleanups is not None:
+                doClassCleanups()
+                for exc_info in previousClass.tearDown_exceptions:
+                    if isinstance(result, _DebugResult):
+                        raise exc_info[1]
+                    className = util.strclass(previousClass)
+                    self._createClassOrModuleLevelException(result, exc_info[1],
+                                                            'tearDownClass',
+                                                            className,
+                                                            info=exc_info)
+        finally:
+            _call_if_exists(result, '_restoreStdout')
 
 
 class _ErrorHolder(object):
diff --git a/Lib/unittest/test/test_result.py b/Lib/unittest/test/test_result.py
index a4af67bd8d56de..d6efc7ef0662a4 100644
--- a/Lib/unittest/test/test_result.py
+++ b/Lib/unittest/test/test_result.py
@@ -2,10 +2,11 @@
 import sys
 import textwrap
 
-from test.support import warnings_helper
+from test.support import warnings_helper, captured_stdout, captured_stderr
 
 import traceback
 import unittest
+from unittest.util import strclass
 
 
 class MockTraceback(object):
@@ -22,6 +23,16 @@ def restore_traceback():
     unittest.result.traceback = traceback
 
 
+def bad_cleanup1():
+    print('do cleanup1')
+    raise TypeError('bad cleanup1')
+
+
+def bad_cleanup2():
+    print('do cleanup2')
+    raise ValueError('bad cleanup2')
+
+
 class Test_TestResult(unittest.TestCase):
     # Note: there are not separate tests for TestResult.wasSuccessful(),
     # TestResult.errors, TestResult.failures, TestResult.testsRun or
@@ -633,36 +644,320 @@ def testBufferOutputAddErrorOrFailure(self):
             self.assertEqual(result._original_stderr.getvalue(), expectedErrMessage)
             self.assertMultiLineEqual(message, expectedFullMessage)
 
+    def testBufferSetUp(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            def setUp(self):
+                print('set up')
+                1/0
+            def test_foo(self):
+                pass
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\nset up\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 1)
+        description = f'test_foo ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferTearDown(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            def tearDown(self):
+                print('tear down')
+                1/0
+            def test_foo(self):
+                pass
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\ntear down\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 1)
+        description = f'test_foo ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferDoCleanups(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            def setUp(self):
+                print('set up')
+                self.addCleanup(bad_cleanup1)
+                self.addCleanup(bad_cleanup2)
+            def test_foo(self):
+                pass
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\nset up\ndo cleanup2\ndo cleanup1\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 2)
+        description = f'test_foo ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('ValueError: bad cleanup2', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+        test_case, formatted_exc = result.errors[1]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('TypeError: bad cleanup1', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferSetUp_DoCleanups(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            def setUp(self):
+                print('set up')
+                self.addCleanup(bad_cleanup1)
+                self.addCleanup(bad_cleanup2)
+                1/0
+            def test_foo(self):
+                pass
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\nset up\ndo cleanup2\ndo cleanup1\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 3)
+        description = f'test_foo ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+        test_case, formatted_exc = result.errors[1]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('ValueError: bad cleanup2', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+        test_case, formatted_exc = result.errors[2]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('TypeError: bad cleanup1', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferTearDown_DoCleanups(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            def setUp(self):
+                print('set up')
+                self.addCleanup(bad_cleanup1)
+                self.addCleanup(bad_cleanup2)
+            def tearDown(self):
+                print('tear down')
+                1/0
+            def test_foo(self):
+                pass
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\nset up\ntear down\ndo cleanup2\ndo cleanup1\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 3)
+        description = f'test_foo ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+        test_case, formatted_exc = result.errors[1]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('ValueError: bad cleanup2', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+        test_case, formatted_exc = result.errors[2]
+        self.assertEqual(str(test_case), description)
+        self.assertIn('TypeError: bad cleanup1', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
     def testBufferSetupClass(self):
-        result = unittest.TestResult()
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
         result.buffer = True
 
         class Foo(unittest.TestCase):
             @classmethod
             def setUpClass(cls):
+                print('set up class')
                 1/0
             def test_foo(self):
                 pass
         suite = unittest.TestSuite([Foo('test_foo')])
         suite(result)
+        expected_out = '\nStdout:\nset up class\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
         self.assertEqual(len(result.errors), 1)
+        description = f'setUpClass ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
 
     def testBufferTearDownClass(self):
-        result = unittest.TestResult()
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
         result.buffer = True
 
         class Foo(unittest.TestCase):
             @classmethod
             def tearDownClass(cls):
+                print('tear down class')
                 1/0
             def test_foo(self):
                 pass
         suite = unittest.TestSuite([Foo('test_foo')])
         suite(result)
+        expected_out = '\nStdout:\ntear down class\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
         self.assertEqual(len(result.errors), 1)
+        description = f'tearDownClass ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferDoClassCleanups(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            @classmethod
+            def setUpClass(cls):
+                print('set up class')
+                cls.addClassCleanup(bad_cleanup1)
+                cls.addClassCleanup(bad_cleanup2)
+            @classmethod
+            def tearDownClass(cls):
+                print('tear down class')
+            def test_foo(self):
+                pass
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\ntear down class\ndo cleanup2\ndo cleanup1\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 2)
+        description = f'tearDownClass ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ValueError: bad cleanup2', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+        test_case, formatted_exc = result.errors[1]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('TypeError: bad cleanup1', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferSetupClass_DoClassCleanups(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            @classmethod
+            def setUpClass(cls):
+                print('set up class')
+                cls.addClassCleanup(bad_cleanup1)
+                cls.addClassCleanup(bad_cleanup2)
+                1/0
+            def test_foo(self):
+                pass
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\nset up class\ndo cleanup2\ndo cleanup1\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 3)
+        description = f'setUpClass ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn('\nStdout:\nset up class\n', formatted_exc)
+        test_case, formatted_exc = result.errors[1]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ValueError: bad cleanup2', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+        test_case, formatted_exc = result.errors[2]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('TypeError: bad cleanup1', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferTearDownClass_DoClassCleanups(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            @classmethod
+            def setUpClass(cls):
+                print('set up class')
+                cls.addClassCleanup(bad_cleanup1)
+                cls.addClassCleanup(bad_cleanup2)
+            @classmethod
+            def tearDownClass(cls):
+                print('tear down class')
+                1/0
+            def test_foo(self):
+                pass
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\ntear down class\ndo cleanup2\ndo cleanup1\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 3)
+        description = f'tearDownClass ({strclass(Foo)})'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn('\nStdout:\ntear down class\n', formatted_exc)
+        test_case, formatted_exc = result.errors[1]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ValueError: bad cleanup2', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+        test_case, formatted_exc = result.errors[2]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('TypeError: bad cleanup1', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
 
     def testBufferSetUpModule(self):
-        result = unittest.TestResult()
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
         result.buffer = True
 
         class Foo(unittest.TestCase):
@@ -671,6 +966,7 @@ def test_foo(self):
         class Module(object):
             @staticmethod
             def setUpModule():
+                print('set up module')
                 1/0
 
         Foo.__module__ = 'Module'
@@ -678,10 +974,18 @@ def setUpModule():
         self.addCleanup(sys.modules.pop, 'Module')
         suite = unittest.TestSuite([Foo('test_foo')])
         suite(result)
+        expected_out = '\nStdout:\nset up module\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
         self.assertEqual(len(result.errors), 1)
+        description = 'setUpModule (Module)'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
 
     def testBufferTearDownModule(self):
-        result = unittest.TestResult()
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
         result.buffer = True
 
         class Foo(unittest.TestCase):
@@ -690,6 +994,7 @@ def test_foo(self):
         class Module(object):
             @staticmethod
             def tearDownModule():
+                print('tear down module')
                 1/0
 
         Foo.__module__ = 'Module'
@@ -697,7 +1002,124 @@ def tearDownModule():
         self.addCleanup(sys.modules.pop, 'Module')
         suite = unittest.TestSuite([Foo('test_foo')])
         suite(result)
+        expected_out = '\nStdout:\ntear down module\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 1)
+        description = 'tearDownModule (Module)'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferDoModuleCleanups(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            def test_foo(self):
+                pass
+        class Module(object):
+            @staticmethod
+            def setUpModule():
+                print('set up module')
+                unittest.addModuleCleanup(bad_cleanup1)
+                unittest.addModuleCleanup(bad_cleanup2)
+
+        Foo.__module__ = 'Module'
+        sys.modules['Module'] = Module
+        self.addCleanup(sys.modules.pop, 'Module')
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\ndo cleanup2\ndo cleanup1\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
         self.assertEqual(len(result.errors), 1)
+        description = 'tearDownModule (Module)'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ValueError: bad cleanup2', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferSetUpModule_DoModuleCleanups(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            def test_foo(self):
+                pass
+        class Module(object):
+            @staticmethod
+            def setUpModule():
+                print('set up module')
+                unittest.addModuleCleanup(bad_cleanup1)
+                unittest.addModuleCleanup(bad_cleanup2)
+                1/0
+
+        Foo.__module__ = 'Module'
+        sys.modules['Module'] = Module
+        self.addCleanup(sys.modules.pop, 'Module')
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\nset up module\ndo cleanup2\ndo cleanup1\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 2)
+        description = 'setUpModule (Module)'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn('\nStdout:\nset up module\n', formatted_exc)
+        test_case, formatted_exc = result.errors[1]
+        self.assertIn(expected_out, formatted_exc)
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ValueError: bad cleanup2', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
+
+    def testBufferTearDownModule_DoModuleCleanups(self):
+        with captured_stdout() as stdout:
+            result = unittest.TestResult()
+        result.buffer = True
+
+        class Foo(unittest.TestCase):
+            def test_foo(self):
+                pass
+        class Module(object):
+            @staticmethod
+            def setUpModule():
+                print('set up module')
+                unittest.addModuleCleanup(bad_cleanup1)
+                unittest.addModuleCleanup(bad_cleanup2)
+            @staticmethod
+            def tearDownModule():
+                print('tear down module')
+                1/0
+
+        Foo.__module__ = 'Module'
+        sys.modules['Module'] = Module
+        self.addCleanup(sys.modules.pop, 'Module')
+        suite = unittest.TestSuite([Foo('test_foo')])
+        suite(result)
+        expected_out = '\nStdout:\ntear down module\ndo cleanup2\ndo cleanup1\n'
+        self.assertEqual(stdout.getvalue(), expected_out)
+        self.assertEqual(len(result.errors), 2)
+        description = 'tearDownModule (Module)'
+        test_case, formatted_exc = result.errors[0]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ZeroDivisionError: division by zero', formatted_exc)
+        self.assertNotIn('ValueError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn('\nStdout:\ntear down module\n', formatted_exc)
+        test_case, formatted_exc = result.errors[1]
+        self.assertEqual(test_case.description, description)
+        self.assertIn('ValueError: bad cleanup2', formatted_exc)
+        self.assertNotIn('ZeroDivisionError', formatted_exc)
+        self.assertNotIn('TypeError', formatted_exc)
+        self.assertIn(expected_out, formatted_exc)
 
 
 if __name__ == '__main__':
diff --git a/Lib/unittest/test/test_runner.py b/Lib/unittest/test/test_runner.py
index dd9a1b6d9aeddf..453e6c3d11cfaa 100644
--- a/Lib/unittest/test/test_runner.py
+++ b/Lib/unittest/test/test_runner.py
@@ -222,14 +222,42 @@ def tearDownClass(cls):
         self.assertEqual(ordering,
                          ['setUpClass', 'test', 'tearDownClass', 'cleanup_good'])
 
-    def test_debug_executes_classCleanUp(self):
+    def test_run_class_cleanUp_without_tearDownClass(self):
         ordering = []
+        blowUp = True
 
         class TestableTest(unittest.TestCase):
             @classmethod
             def setUpClass(cls):
                 ordering.append('setUpClass')
                 cls.addClassCleanup(cleanup, ordering)
+                if blowUp:
+                    raise Exception()
+            def testNothing(self):
+                ordering.append('test')
+            @classmethod
+            @property
+            def tearDownClass(cls):
+                raise AttributeError
+
+        runTests(TestableTest)
+        self.assertEqual(ordering, ['setUpClass', 'cleanup_good'])
+
+        ordering = []
+        blowUp = False
+        runTests(TestableTest)
+        self.assertEqual(ordering,
+                         ['setUpClass', 'test', 'cleanup_good'])
+
+    def test_debug_executes_classCleanUp(self):
+        ordering = []
+        blowUp = False
+
+        class TestableTest(unittest.TestCase):
+            @classmethod
+            def setUpClass(cls):
+                ordering.append('setUpClass')
+                cls.addClassCleanup(cleanup, ordering, blowUp=blowUp)
             def testNothing(self):
                 ordering.append('test')
             @classmethod
@@ -241,6 +269,48 @@ def tearDownClass(cls):
         self.assertEqual(ordering,
                          ['setUpClass', 'test', 'tearDownClass', 'cleanup_good'])
 
+        ordering = []
+        blowUp = True
+        suite = unittest.defaultTestLoader.loadTestsFromTestCase(TestableTest)
+        with self.assertRaises(Exception) as cm:
+            suite.debug()
+        self.assertEqual(str(cm.exception), 'CleanUpExc')
+        self.assertEqual(ordering,
+                         ['setUpClass', 'test', 'tearDownClass', 'cleanup_exc'])
+
+    def test_debug_executes_classCleanUp_when_teardown_exception(self):
+        ordering = []
+        blowUp = False
+
+        class TestableTest(unittest.TestCase):
+            @classmethod
+            def setUpClass(cls):
+                ordering.append('setUpClass')
+                cls.addClassCleanup(cleanup, ordering, blowUp=blowUp)
+            def testNothing(self):
+                ordering.append('test')
+            @classmethod
+            def tearDownClass(cls):
+                raise Exception('TearDownClassExc')
+
+        suite = unittest.defaultTestLoader.loadTestsFromTestCase(TestableTest)
+        with self.assertRaises(Exception) as cm:
+            suite.debug()
+        self.assertEqual(str(cm.exception), 'TearDownClassExc')
+        self.assertEqual(ordering, ['setUpClass', 'test'])
+        self.assertTrue(TestableTest._class_cleanups)
+        TestableTest._class_cleanups.clear()
+
+        ordering = []
+        blowUp = True
+        suite = unittest.defaultTestLoader.loadTestsFromTestCase(TestableTest)
+        with self.assertRaises(Exception) as cm:
+            suite.debug()
+        self.assertEqual(str(cm.exception), 'TearDownClassExc')
+        self.assertEqual(ordering, ['setUpClass', 'test'])
+        self.assertTrue(TestableTest._class_cleanups)
+        TestableTest._class_cleanups.clear()
+
     def test_doClassCleanups_with_errors_addClassCleanUp(self):
         class TestableTest(unittest.TestCase):
             def testNothing(self):
@@ -332,6 +402,7 @@ def tearDownClass(cls):
         self.assertEqual(ordering,
                          ['setUpClass', 'setUp', 'test',
                           'tearDownClass', 'cleanup_exc'])
+
         ordering = []
         class_blow_up = True
         method_blow_up = False
@@ -355,6 +426,26 @@ def tearDownClass(cls):
                          ['setUpClass', 'setUp', 'tearDownClass',
                           'cleanup_exc'])
 
+    def test_with_errors_in_tearDownClass(self):
+        ordering = []
+        class TestableTest(unittest.TestCase):
+            @classmethod
+            def setUpClass(cls):
+                ordering.append('setUpClass')
+                cls.addClassCleanup(cleanup, ordering)
+            def testNothing(self):
+                ordering.append('test')
+            @classmethod
+            def tearDownClass(cls):
+                ordering.append('tearDownClass')
+                raise Exception('TearDownExc')
+
+        result = runTests(TestableTest)
+        self.assertEqual(result.errors[0][1].splitlines()[-1],
+                         'Exception: TearDownExc')
+        self.assertEqual(ordering,
+                         ['setUpClass', 'test', 'tearDownClass', 'cleanup_good'])
+
 
 class TestModuleCleanUp(unittest.TestCase):
     def test_add_and_do_ModuleCleanup(self):
@@ -532,13 +623,69 @@ def tearDownClass(cls):
                           'tearDownModule2', 'cleanup_good'])
         self.assertEqual(unittest.case._module_cleanups, [])
 
-    def test_debug_module_executes_cleanUp(self):
+    def test_run_module_cleanUp_without_teardown(self):
         ordering = []
         class Module(object):
             @staticmethod
             def setUpModule():
                 ordering.append('setUpModule')
                 unittest.addModuleCleanup(cleanup, ordering)
+
+        class TestableTest(unittest.TestCase):
+            @classmethod
+            def setUpClass(cls):
+                ordering.append('setUpClass')
+            def testNothing(self):
+                ordering.append('test')
+            @classmethod
+            def tearDownClass(cls):
+                ordering.append('tearDownClass')
+
+        TestableTest.__module__ = 'Module'
+        sys.modules['Module'] = Module
+        runTests(TestableTest)
+        self.assertEqual(ordering, ['setUpModule', 'setUpClass', 'test',
+                                    'tearDownClass', 'cleanup_good'])
+        self.assertEqual(unittest.case._module_cleanups, [])
+
+    def test_run_module_cleanUp_when_teardown_exception(self):
+        ordering = []
+        class Module(object):
+            @staticmethod
+            def setUpModule():
+                ordering.append('setUpModule')
+                unittest.addModuleCleanup(cleanup, ordering)
+            @staticmethod
+            def tearDownModule():
+                raise Exception('CleanUpExc')
+
+        class TestableTest(unittest.TestCase):
+            @classmethod
+            def setUpClass(cls):
+                ordering.append('setUpClass')
+            def testNothing(self):
+                ordering.append('test')
+            @classmethod
+            def tearDownClass(cls):
+                ordering.append('tearDownClass')
+
+        TestableTest.__module__ = 'Module'
+        sys.modules['Module'] = Module
+        result = runTests(TestableTest)
+        self.assertEqual(result.errors[0][1].splitlines()[-1],
+                         'Exception: CleanUpExc')
+        self.assertEqual(ordering, ['setUpModule', 'setUpClass', 'test',
+                                    'tearDownClass', 'cleanup_good'])
+        self.assertEqual(unittest.case._module_cleanups, [])
+
+    def test_debug_module_executes_cleanUp(self):
+        ordering = []
+        blowUp = False
+        class Module(object):
+            @staticmethod
+            def setUpModule():
+                ordering.append('setUpModule')
+                unittest.addModuleCleanup(cleanup, ordering, blowUp=blowUp)
             @staticmethod
             def tearDownModule():
                 ordering.append('tearDownModule')
@@ -562,6 +709,60 @@ def tearDownClass(cls):
                           'tearDownModule', 'cleanup_good'])
         self.assertEqual(unittest.case._module_cleanups, [])
 
+        ordering = []
+        blowUp = True
+        suite = unittest.defaultTestLoader.loadTestsFromTestCase(TestableTest)
+        with self.assertRaises(Exception) as cm:
+            suite.debug()
+        self.assertEqual(str(cm.exception), 'CleanUpExc')
+        self.assertEqual(ordering, ['setUpModule', 'setUpClass', 'test',
+                                    'tearDownClass', 'tearDownModule', 'cleanup_exc'])
+        self.assertEqual(unittest.case._module_cleanups, [])
+
+    def test_debug_module_cleanUp_when_teardown_exception(self):
+        ordering = []
+        blowUp = False
+        class Module(object):
+            @staticmethod
+            def setUpModule():
+                ordering.append('setUpModule')
+                unittest.addModuleCleanup(cleanup, ordering, blowUp=blowUp)
+            @staticmethod
+            def tearDownModule():
+                raise Exception('TearDownModuleExc')
+
+        class TestableTest(unittest.TestCase):
+            @classmethod
+            def setUpClass(cls):
+                ordering.append('setUpClass')
+            def testNothing(self):
+                ordering.append('test')
+            @classmethod
+            def tearDownClass(cls):
+                ordering.append('tearDownClass')
+
+        TestableTest.__module__ = 'Module'
+        sys.modules['Module'] = Module
+        suite = unittest.defaultTestLoader.loadTestsFromTestCase(TestableTest)
+        with self.assertRaises(Exception) as cm:
+            suite.debug()
+        self.assertEqual(str(cm.exception), 'TearDownModuleExc')
+        self.assertEqual(ordering, ['setUpModule', 'setUpClass', 'test',
+                                    'tearDownClass'])
+        self.assertTrue(unittest.case._module_cleanups)
+        unittest.case._module_cleanups.clear()
+
+        ordering = []
+        blowUp = True
+        suite = unittest.defaultTestLoader.loadTestsFromTestCase(TestableTest)
+        with self.assertRaises(Exception) as cm:
+            suite.debug()
+        self.assertEqual(str(cm.exception), 'TearDownModuleExc')
+        self.assertEqual(ordering, ['setUpModule', 'setUpClass', 'test',
+                                    'tearDownClass'])
+        self.assertTrue(unittest.case._module_cleanups)
+        unittest.case._module_cleanups.clear()
+
     def test_addClassCleanup_arg_errors(self):
         cleanups = []
         def cleanup(*args, **kwargs):
@@ -717,9 +918,9 @@ def tearDownClass(cls):
         method_blow_up = False
         result = runTests(TestableTest)
         self.assertEqual(result.errors[0][1].splitlines()[-1],
-                         'Exception: CleanUpExc')
-        self.assertEqual(result.errors[1][1].splitlines()[-1],
                          'Exception: ModuleExc')
+        self.assertEqual(result.errors[1][1].splitlines()[-1],
+                         'Exception: CleanUpExc')
         self.assertEqual(ordering, ['setUpModule', 'cleanup_exc'])
 
         ordering = []
diff --git a/Misc/NEWS.d/next/Library/2021-08-27-23-40-51.bpo-43913.Uo1Gt5.rst b/Misc/NEWS.d/next/Library/2021-08-27-23-40-51.bpo-43913.Uo1Gt5.rst
new file mode 100644
index 00000000000000..cf3d5ee0e456f1
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-27-23-40-51.bpo-43913.Uo1Gt5.rst
@@ -0,0 +1,8 @@
+Fix bugs in cleaning up classes and modules in :mod:`unittest`:
+
+* Functions registered with :func:`~unittest.addModuleCleanup` were not called unless the user defines ``tearDownModule()`` in their test module.
+* Functions registered with :meth:`~unittest.TestCase.addClassCleanup` were not called if ``tearDownClass`` is set to ``None``.
+* Buffering in :class:`~unittest.TestResult` did not work with functions registered with ``addClassCleanup()`` and ``addModuleCleanup()``.
+* Errors in functions registered with ``addClassCleanup()`` and ``addModuleCleanup()`` were not handled correctly in buffered and debug modes.
+* Errors in ``setUpModule()`` and functions registered with ``addModuleCleanup()`` were reported in wrong order.
+* And several lesser bugs.


From webhook-mailer at python.org  Mon Aug 30 13:49:42 2021
From: webhook-mailer at python.org (pablogsal)
Date: Mon, 30 Aug 2021 17:49:42 -0000
Subject: [Python-checkins] bpo-43398: Add test for defect connection
 factories (GH-27966)
Message-ID: <mailman.1268.1630345783.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/f62763d26755260c31c717fb396550e00eb6b2a0
commit: f62763d26755260c31c717fb396550e00eb6b2a0
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-08-30T18:49:34+01:00
summary:

bpo-43398: Add test for defect connection factories (GH-27966)

files:
M Lib/sqlite3/test/factory.py

diff --git a/Lib/sqlite3/test/factory.py b/Lib/sqlite3/test/factory.py
index 7faa9ac8c1fc2e..9e7a7e28c6ed3a 100644
--- a/Lib/sqlite3/test/factory.py
+++ b/Lib/sqlite3/test/factory.py
@@ -24,9 +24,6 @@
 import sqlite3 as sqlite
 from collections.abc import Sequence
 
-class MyConnection(sqlite.Connection):
-    def __init__(self, *args, **kwargs):
-        sqlite.Connection.__init__(self, *args, **kwargs)
 
 def dict_factory(cursor, row):
     d = {}
@@ -40,14 +37,19 @@ def __init__(self, *args, **kwargs):
         self.row_factory = dict_factory
 
 class ConnectionFactoryTests(unittest.TestCase):
-    def setUp(self):
-        self.con = sqlite.connect(":memory:", factory=MyConnection)
-
-    def tearDown(self):
-        self.con.close()
+    def test_connection_factories(self):
+        class DefectFactory(sqlite.Connection):
+            def __init__(self, *args, **kwargs):
+                return None
+        class OkFactory(sqlite.Connection):
+            def __init__(self, *args, **kwargs):
+                sqlite.Connection.__init__(self, *args, **kwargs)
+
+        for factory in DefectFactory, OkFactory:
+            with self.subTest(factory=factory):
+                con = sqlite.connect(":memory:", factory=factory)
+                self.assertIsInstance(con, factory)
 
-    def test_is_instance(self):
-        self.assertIsInstance(self.con, MyConnection)
 
 class CursorFactoryTests(unittest.TestCase):
     def setUp(self):


From webhook-mailer at python.org  Mon Aug 30 14:32:29 2021
From: webhook-mailer at python.org (pablogsal)
Date: Mon, 30 Aug 2021 18:32:29 -0000
Subject: [Python-checkins] bpo-16379: expose SQLite error codes and error
 names in `sqlite3` (GH-27786)
Message-ID: <mailman.1269.1630348351.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/86d8b465231473f850cc5e906013ba8581ddb503
commit: 86d8b465231473f850cc5e906013ba8581ddb503
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-08-30T19:32:21+01:00
summary:

bpo-16379: expose SQLite error codes and error names in `sqlite3` (GH-27786)

files:
A Misc/NEWS.d/next/Library/2019-05-08-15-14-32.bpo-16379.rN5JVe.rst
M Doc/includes/sqlite3/complete_statement.py
M Doc/library/sqlite3.rst
M Doc/whatsnew/3.11.rst
M Lib/sqlite3/test/dbapi.py
M Modules/_sqlite/module.c
M Modules/_sqlite/module.h
M Modules/_sqlite/util.c

diff --git a/Doc/includes/sqlite3/complete_statement.py b/Doc/includes/sqlite3/complete_statement.py
index cd38d7305bb69..a5c947969910d 100644
--- a/Doc/includes/sqlite3/complete_statement.py
+++ b/Doc/includes/sqlite3/complete_statement.py
@@ -24,7 +24,10 @@
             if buffer.lstrip().upper().startswith("SELECT"):
                 print(cur.fetchall())
         except sqlite3.Error as e:
-            print("An error occurred:", e.args[0])
+            err_msg = str(e)
+            err_code = e.sqlite_errorcode
+            err_name = e.sqlite_errorname
+            print(f"{err_name} ({err_code}): {err_msg}")
         buffer = ""
 
 con.close()
diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 6399bed7ed52c..7c60188bc70b5 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -836,6 +836,20 @@ Exceptions
    The base class of the other exceptions in this module.  It is a subclass
    of :exc:`Exception`.
 
+   .. attribute:: sqlite_errorcode
+
+      The numeric error code from the
+      `SQLite API <https://sqlite.org/rescode.html>`_
+
+      .. versionadded:: 3.11
+
+   .. attribute:: sqlite_errorname
+
+      The symbolic name of the numeric error code
+      from the `SQLite API <https://sqlite.org/rescode.html>`_
+
+      .. versionadded:: 3.11
+
 .. exception:: DatabaseError
 
    Exception raised for errors that are related to the database.
diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index 306385c2a90aa..1b736c71c24fb 100644
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -226,6 +226,12 @@ sqlite3
   now raise :exc:`UnicodeEncodeError` instead of :exc:`sqlite3.ProgrammingError`.
   (Contributed by Erlend E. Aasland in :issue:`44688`.)
 
+* :mod:`sqlite3` exceptions now include the SQLite error code as
+  :attr:`~sqlite3.Error.sqlite_errorcode` and the SQLite error name as
+  :attr:`~sqlite3.Error.sqlite_errorname`.
+  (Contributed by Aviv Palivoda, Daniel Shahaf, and Erlend E. Aasland in
+  :issue:`16379`.)
+
 
 Removed
 =======
diff --git a/Lib/sqlite3/test/dbapi.py b/Lib/sqlite3/test/dbapi.py
index aadecad32adb2..02e42e8c3751f 100644
--- a/Lib/sqlite3/test/dbapi.py
+++ b/Lib/sqlite3/test/dbapi.py
@@ -28,12 +28,12 @@
 import unittest
 
 from test.support import (
+    SHORT_TIMEOUT,
     bigmemtest,
     check_disallow_instantiation,
     threading_helper,
-    SHORT_TIMEOUT,
 )
-from test.support.os_helper import TESTFN, unlink
+from test.support.os_helper import TESTFN, unlink, temp_dir
 
 
 # Helper for tests using TESTFN
@@ -102,6 +102,89 @@ def test_not_supported_error(self):
                                    sqlite.DatabaseError),
                         "NotSupportedError is not a subclass of DatabaseError")
 
+    def test_module_constants(self):
+        consts = [
+            "SQLITE_ABORT",
+            "SQLITE_ALTER_TABLE",
+            "SQLITE_ANALYZE",
+            "SQLITE_ATTACH",
+            "SQLITE_AUTH",
+            "SQLITE_BUSY",
+            "SQLITE_CANTOPEN",
+            "SQLITE_CONSTRAINT",
+            "SQLITE_CORRUPT",
+            "SQLITE_CREATE_INDEX",
+            "SQLITE_CREATE_TABLE",
+            "SQLITE_CREATE_TEMP_INDEX",
+            "SQLITE_CREATE_TEMP_TABLE",
+            "SQLITE_CREATE_TEMP_TRIGGER",
+            "SQLITE_CREATE_TEMP_VIEW",
+            "SQLITE_CREATE_TRIGGER",
+            "SQLITE_CREATE_VIEW",
+            "SQLITE_CREATE_VTABLE",
+            "SQLITE_DELETE",
+            "SQLITE_DENY",
+            "SQLITE_DETACH",
+            "SQLITE_DONE",
+            "SQLITE_DROP_INDEX",
+            "SQLITE_DROP_TABLE",
+            "SQLITE_DROP_TEMP_INDEX",
+            "SQLITE_DROP_TEMP_TABLE",
+            "SQLITE_DROP_TEMP_TRIGGER",
+            "SQLITE_DROP_TEMP_VIEW",
+            "SQLITE_DROP_TRIGGER",
+            "SQLITE_DROP_VIEW",
+            "SQLITE_DROP_VTABLE",
+            "SQLITE_EMPTY",
+            "SQLITE_ERROR",
+            "SQLITE_FORMAT",
+            "SQLITE_FULL",
+            "SQLITE_FUNCTION",
+            "SQLITE_IGNORE",
+            "SQLITE_INSERT",
+            "SQLITE_INTERNAL",
+            "SQLITE_INTERRUPT",
+            "SQLITE_IOERR",
+            "SQLITE_LOCKED",
+            "SQLITE_MISMATCH",
+            "SQLITE_MISUSE",
+            "SQLITE_NOLFS",
+            "SQLITE_NOMEM",
+            "SQLITE_NOTADB",
+            "SQLITE_NOTFOUND",
+            "SQLITE_OK",
+            "SQLITE_PERM",
+            "SQLITE_PRAGMA",
+            "SQLITE_PROTOCOL",
+            "SQLITE_READ",
+            "SQLITE_READONLY",
+            "SQLITE_REINDEX",
+            "SQLITE_ROW",
+            "SQLITE_SAVEPOINT",
+            "SQLITE_SCHEMA",
+            "SQLITE_SELECT",
+            "SQLITE_TOOBIG",
+            "SQLITE_TRANSACTION",
+            "SQLITE_UPDATE",
+        ]
+        if sqlite.version_info >= (3, 7, 17):
+            consts += ["SQLITE_NOTICE", "SQLITE_WARNING"]
+        if sqlite.version_info >= (3, 8, 3):
+            consts.append("SQLITE_RECURSIVE")
+        consts += ["PARSE_DECLTYPES", "PARSE_COLNAMES"]
+        for const in consts:
+            with self.subTest(const=const):
+                self.assertTrue(hasattr(sqlite, const))
+
+    def test_error_code_on_exception(self):
+        err_msg = "unable to open database file"
+        with temp_dir() as db:
+            with self.assertRaisesRegex(sqlite.Error, err_msg) as cm:
+                sqlite.connect(db)
+            e = cm.exception
+            self.assertEqual(e.sqlite_errorcode, sqlite.SQLITE_CANTOPEN)
+            self.assertEqual(e.sqlite_errorname, "SQLITE_CANTOPEN")
+
     # sqlite3_enable_shared_cache() is deprecated on macOS and calling it may raise
     # OperationalError on some buildbots.
     @unittest.skipIf(sys.platform == "darwin", "shared cache is deprecated on macOS")
diff --git a/Misc/NEWS.d/next/Library/2019-05-08-15-14-32.bpo-16379.rN5JVe.rst b/Misc/NEWS.d/next/Library/2019-05-08-15-14-32.bpo-16379.rN5JVe.rst
new file mode 100644
index 0000000000000..874a9cf77d8c0
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-05-08-15-14-32.bpo-16379.rN5JVe.rst
@@ -0,0 +1,2 @@
+Add SQLite error code and name to :mod:`sqlite3` exceptions.
+Patch by Aviv Palivoda, Daniel Shahaf, and Erlend E. Aasland.
diff --git a/Modules/_sqlite/module.c b/Modules/_sqlite/module.c
index 993e572c5cdb3..47b1f7a9d0720 100644
--- a/Modules/_sqlite/module.c
+++ b/Modules/_sqlite/module.c
@@ -282,12 +282,79 @@ static PyMethodDef module_methods[] = {
     {NULL, NULL}
 };
 
+/* SQLite API error codes */
+static const struct {
+    const char *name;
+    long value;
+} error_codes[] = {
+#define DECLARE_ERROR_CODE(code) {#code, code}
+    // Primary result code list
+    DECLARE_ERROR_CODE(SQLITE_ABORT),
+    DECLARE_ERROR_CODE(SQLITE_AUTH),
+    DECLARE_ERROR_CODE(SQLITE_BUSY),
+    DECLARE_ERROR_CODE(SQLITE_CANTOPEN),
+    DECLARE_ERROR_CODE(SQLITE_CONSTRAINT),
+    DECLARE_ERROR_CODE(SQLITE_CORRUPT),
+    DECLARE_ERROR_CODE(SQLITE_DONE),
+    DECLARE_ERROR_CODE(SQLITE_EMPTY),
+    DECLARE_ERROR_CODE(SQLITE_ERROR),
+    DECLARE_ERROR_CODE(SQLITE_FORMAT),
+    DECLARE_ERROR_CODE(SQLITE_FULL),
+    DECLARE_ERROR_CODE(SQLITE_INTERNAL),
+    DECLARE_ERROR_CODE(SQLITE_INTERRUPT),
+    DECLARE_ERROR_CODE(SQLITE_IOERR),
+    DECLARE_ERROR_CODE(SQLITE_LOCKED),
+    DECLARE_ERROR_CODE(SQLITE_MISMATCH),
+    DECLARE_ERROR_CODE(SQLITE_MISUSE),
+    DECLARE_ERROR_CODE(SQLITE_NOLFS),
+    DECLARE_ERROR_CODE(SQLITE_NOMEM),
+    DECLARE_ERROR_CODE(SQLITE_NOTADB),
+    DECLARE_ERROR_CODE(SQLITE_NOTFOUND),
+    DECLARE_ERROR_CODE(SQLITE_OK),
+    DECLARE_ERROR_CODE(SQLITE_PERM),
+    DECLARE_ERROR_CODE(SQLITE_PROTOCOL),
+    DECLARE_ERROR_CODE(SQLITE_READONLY),
+    DECLARE_ERROR_CODE(SQLITE_ROW),
+    DECLARE_ERROR_CODE(SQLITE_SCHEMA),
+    DECLARE_ERROR_CODE(SQLITE_TOOBIG),
+#if SQLITE_VERSION_NUMBER >= 3007017
+    DECLARE_ERROR_CODE(SQLITE_NOTICE),
+    DECLARE_ERROR_CODE(SQLITE_WARNING),
+#endif
+#undef DECLARE_ERROR_CODE
+    {NULL, 0},
+};
+
+static int
+add_error_constants(PyObject *module)
+{
+    for (int i = 0; error_codes[i].name != NULL; i++) {
+        const char *name = error_codes[i].name;
+        const long value = error_codes[i].value;
+        if (PyModule_AddIntConstant(module, name, value) < 0) {
+            return -1;
+        }
+    }
+    return 0;
+}
+
+const char *
+pysqlite_error_name(int rc)
+{
+    for (int i = 0; error_codes[i].name != NULL; i++) {
+        if (error_codes[i].value == rc) {
+            return error_codes[i].name;
+        }
+    }
+    // No error code matched.
+    return NULL;
+}
+
 static int add_integer_constants(PyObject *module) {
     int ret = 0;
 
     ret += PyModule_AddIntMacro(module, PARSE_DECLTYPES);
     ret += PyModule_AddIntMacro(module, PARSE_COLNAMES);
-    ret += PyModule_AddIntMacro(module, SQLITE_OK);
     ret += PyModule_AddIntMacro(module, SQLITE_DENY);
     ret += PyModule_AddIntMacro(module, SQLITE_IGNORE);
     ret += PyModule_AddIntMacro(module, SQLITE_CREATE_INDEX);
@@ -325,7 +392,6 @@ static int add_integer_constants(PyObject *module) {
 #if SQLITE_VERSION_NUMBER >= 3008003
     ret += PyModule_AddIntMacro(module, SQLITE_RECURSIVE);
 #endif
-    ret += PyModule_AddIntMacro(module, SQLITE_DONE);
     return ret;
 }
 
@@ -406,6 +472,11 @@ PyMODINIT_FUNC PyInit__sqlite3(void)
     ADD_EXCEPTION(module, state, DataError, state->DatabaseError);
     ADD_EXCEPTION(module, state, NotSupportedError, state->DatabaseError);
 
+    /* Set error constants */
+    if (add_error_constants(module) < 0) {
+        goto error;
+    }
+
     /* Set integer constants */
     if (add_integer_constants(module) < 0) {
         goto error;
diff --git a/Modules/_sqlite/module.h b/Modules/_sqlite/module.h
index a286739579db6..c273c1f9ed9f2 100644
--- a/Modules/_sqlite/module.h
+++ b/Modules/_sqlite/module.h
@@ -81,6 +81,8 @@ pysqlite_get_state_by_type(PyTypeObject *Py_UNUSED(tp))
     return &pysqlite_global_state;
 }
 
+extern const char *pysqlite_error_name(int rc);
+
 #define PARSE_DECLTYPES 1
 #define PARSE_COLNAMES 2
 #endif
diff --git a/Modules/_sqlite/util.c b/Modules/_sqlite/util.c
index 24cefc626b66e..cfd189dfc3360 100644
--- a/Modules/_sqlite/util.c
+++ b/Modules/_sqlite/util.c
@@ -36,27 +36,19 @@ pysqlite_step(sqlite3_stmt *statement)
     return rc;
 }
 
-/**
- * Checks the SQLite error code and sets the appropriate DB-API exception.
- * Returns the error code (0 means no error occurred).
- */
-int
-_pysqlite_seterror(pysqlite_state *state, sqlite3 *db)
+// Returns non-NULL if a new exception should be raised
+static PyObject *
+get_exception_class(pysqlite_state *state, int errorcode)
 {
-    int errorcode = sqlite3_errcode(db);
-
-    switch (errorcode)
-    {
+    switch (errorcode) {
         case SQLITE_OK:
             PyErr_Clear();
-            break;
+            return NULL;
         case SQLITE_INTERNAL:
         case SQLITE_NOTFOUND:
-            PyErr_SetString(state->InternalError, sqlite3_errmsg(db));
-            break;
+            return state->InternalError;
         case SQLITE_NOMEM:
-            (void)PyErr_NoMemory();
-            break;
+            return PyErr_NoMemory();
         case SQLITE_ERROR:
         case SQLITE_PERM:
         case SQLITE_ABORT:
@@ -70,26 +62,85 @@ _pysqlite_seterror(pysqlite_state *state, sqlite3 *db)
         case SQLITE_PROTOCOL:
         case SQLITE_EMPTY:
         case SQLITE_SCHEMA:
-            PyErr_SetString(state->OperationalError, sqlite3_errmsg(db));
-            break;
+            return state->OperationalError;
         case SQLITE_CORRUPT:
-            PyErr_SetString(state->DatabaseError, sqlite3_errmsg(db));
-            break;
+            return state->DatabaseError;
         case SQLITE_TOOBIG:
-            PyErr_SetString(state->DataError, sqlite3_errmsg(db));
-            break;
+            return state->DataError;
         case SQLITE_CONSTRAINT:
         case SQLITE_MISMATCH:
-            PyErr_SetString(state->IntegrityError, sqlite3_errmsg(db));
-            break;
+            return state->IntegrityError;
         case SQLITE_MISUSE:
-            PyErr_SetString(state->ProgrammingError, sqlite3_errmsg(db));
-            break;
+            return state->ProgrammingError;
         default:
-            PyErr_SetString(state->DatabaseError, sqlite3_errmsg(db));
-            break;
+            return state->DatabaseError;
+    }
+}
+
+static void
+raise_exception(PyObject *type, int errcode, const char *errmsg)
+{
+    PyObject *exc = NULL;
+    PyObject *args[] = { PyUnicode_FromString(errmsg), };
+    if (args[0] == NULL) {
+        goto exit;
+    }
+    exc = PyObject_Vectorcall(type, args, 1, NULL);
+    Py_DECREF(args[0]);
+    if (exc == NULL) {
+        goto exit;
+    }
+
+    PyObject *code = PyLong_FromLong(errcode);
+    if (code == NULL) {
+        goto exit;
+    }
+    int rc = PyObject_SetAttrString(exc, "sqlite_errorcode", code);
+    Py_DECREF(code);
+    if (rc < 0) {
+        goto exit;
+    }
+
+    const char *error_name = pysqlite_error_name(errcode);
+    PyObject *name;
+    if (error_name) {
+        name = PyUnicode_FromString(error_name);
+    }
+    else {
+        name = PyUnicode_InternFromString("unknown");
+    }
+    if (name == NULL) {
+        goto exit;
+    }
+    rc = PyObject_SetAttrString(exc, "sqlite_errorname", name);
+    Py_DECREF(name);
+    if (rc < 0) {
+        goto exit;
+    }
+
+    PyErr_SetObject(type, exc);
+
+exit:
+    Py_XDECREF(exc);
+}
+
+/**
+ * Checks the SQLite error code and sets the appropriate DB-API exception.
+ * Returns the error code (0 means no error occurred).
+ */
+int
+_pysqlite_seterror(pysqlite_state *state, sqlite3 *db)
+{
+    int errorcode = sqlite3_errcode(db);
+    PyObject *exc_class = get_exception_class(state, errorcode);
+    if (exc_class == NULL) {
+        // No new exception need be raised; just pass the error code
+        return errorcode;
     }
 
+    /* Create and set the exception. */
+    const char *errmsg = sqlite3_errmsg(db);
+    raise_exception(exc_class, errorcode, errmsg);
     return errorcode;
 }
 


From webhook-mailer at python.org  Mon Aug 30 14:48:15 2021
From: webhook-mailer at python.org (ned-deily)
Date: Mon, 30 Aug 2021 18:48:15 -0000
Subject: [Python-checkins] bpo-45001: Make email date parsing more robust
 against malformed input (GH-27946) (GH-27975)
Message-ID: <mailman.1270.1630349297.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/e9b85afd7dc004460f6d914375ab67d617a8a7ff
commit: e9b85afd7dc004460f6d914375ab67d617a8a7ff
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ned-deily <nad at python.org>
date: 2021-08-30T14:48:04-04:00
summary:

bpo-45001: Make email date parsing more robust against malformed input (GH-27946) (GH-27975)

Various date parsing utilities in the email module, such as
email.utils.parsedate(), are supposed to gracefully handle invalid
input, typically by raising an appropriate exception or by returning
None.

The internal email._parseaddr._parsedate_tz() helper used by some of
these date parsing routines tries to be robust against malformed input,
but unfortunately it can still crash ungracefully when a non-empty but
whitespace-only input is passed. This manifests as an unexpected
IndexError.

In practice, this can happen when parsing an email with only a newline
inside a ?Date:? header, which unfortunately happens occasionally in the
real world.

Here's a minimal example:

    $ python
    Python 3.9.6 (default, Jun 30 2021, 10:22:16)
    [GCC 11.1.0] on linux
    Type "help", "copyright", "credits" or "license" for more information.
    >>> import email.utils
    >>> email.utils.parsedate('foo')
    >>> email.utils.parsedate(' ')
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
      File "/usr/lib/python3.9/email/_parseaddr.py", line 176, in parsedate
        t = parsedate_tz(data)
      File "/usr/lib/python3.9/email/_parseaddr.py", line 50, in parsedate_tz
        res = _parsedate_tz(data)
      File "/usr/lib/python3.9/email/_parseaddr.py", line 72, in _parsedate_tz
        if data[0].endswith(',') or data[0].lower() in _daynames:
    IndexError: list index out of range

The fix is rather straight-forward: guard against empty lists, after
splitting on whitespace, but before accessing the first element.
(cherry picked from commit 989f6a3800f06b2bd31cfef7c3269a443ad94fac)

Co-authored-by: wouter bolsterlee <wouter at bolsterl.ee>

files:
A Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst
M Lib/email/_parseaddr.py
M Lib/test/test_email/test_email.py

diff --git a/Lib/email/_parseaddr.py b/Lib/email/_parseaddr.py
index 41ff6f8c000d57..178329fbc6aacd 100644
--- a/Lib/email/_parseaddr.py
+++ b/Lib/email/_parseaddr.py
@@ -67,6 +67,8 @@ def _parsedate_tz(data):
     if not data:
         return
     data = data.split()
+    if not data:  # This happens for whitespace-only input.
+        return None
     # The FWS after the comma after the day-of-week is optional, so search and
     # adjust for this.
     if data[0].endswith(',') or data[0].lower() in _daynames:
diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py
index 9e5c6adca835d9..64bcdcc47ad0b5 100644
--- a/Lib/test/test_email/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@ -2967,6 +2967,8 @@ def test_formatdate_usegmt(self):
     def test_parsedate_returns_None_for_invalid_strings(self):
         self.assertIsNone(utils.parsedate(''))
         self.assertIsNone(utils.parsedate_tz(''))
+        self.assertIsNone(utils.parsedate(' '))
+        self.assertIsNone(utils.parsedate_tz(' '))
         self.assertIsNone(utils.parsedate('0'))
         self.assertIsNone(utils.parsedate_tz('0'))
         self.assertIsNone(utils.parsedate('A Complete Waste of Time'))
diff --git a/Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst b/Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst
new file mode 100644
index 00000000000000..55cc409d0da30f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst
@@ -0,0 +1,2 @@
+Made email date parsing more robust against malformed input, namely a
+whitespace-only ``Date:`` header. Patch by Wouter Bolsterlee.


From webhook-mailer at python.org  Mon Aug 30 14:57:28 2021
From: webhook-mailer at python.org (ned-deily)
Date: Mon, 30 Aug 2021 18:57:28 -0000
Subject: [Python-checkins] bpo-45001: Make email date parsing more robust
 against malformed input (GH-27946) (GH-27976)
Message-ID: <mailman.1271.1630349850.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/da9d6c554697414b1d275c8502e00a07c2ce06e6
commit: da9d6c554697414b1d275c8502e00a07c2ce06e6
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ned-deily <nad at python.org>
date: 2021-08-30T14:57:19-04:00
summary:

bpo-45001: Make email date parsing more robust against malformed input (GH-27946) (GH-27976)

Various date parsing utilities in the email module, such as
email.utils.parsedate(), are supposed to gracefully handle invalid
input, typically by raising an appropriate exception or by returning
None.

The internal email._parseaddr._parsedate_tz() helper used by some of
these date parsing routines tries to be robust against malformed input,
but unfortunately it can still crash ungracefully when a non-empty but
whitespace-only input is passed. This manifests as an unexpected
IndexError.

In practice, this can happen when parsing an email with only a newline
inside a ?Date:? header, which unfortunately happens occasionally in the
real world.

Here's a minimal example:

    $ python
    Python 3.9.6 (default, Jun 30 2021, 10:22:16)
    [GCC 11.1.0] on linux
    Type "help", "copyright", "credits" or "license" for more information.
    >>> import email.utils
    >>> email.utils.parsedate('foo')
    >>> email.utils.parsedate(' ')
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
      File "/usr/lib/python3.9/email/_parseaddr.py", line 176, in parsedate
        t = parsedate_tz(data)
      File "/usr/lib/python3.9/email/_parseaddr.py", line 50, in parsedate_tz
        res = _parsedate_tz(data)
      File "/usr/lib/python3.9/email/_parseaddr.py", line 72, in _parsedate_tz
        if data[0].endswith(',') or data[0].lower() in _daynames:
    IndexError: list index out of range

The fix is rather straight-forward: guard against empty lists, after
splitting on whitespace, but before accessing the first element.
(cherry picked from commit 989f6a3800f06b2bd31cfef7c3269a443ad94fac)

Co-authored-by: wouter bolsterlee <wouter at bolsterl.ee>

files:
A Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst
M Lib/email/_parseaddr.py
M Lib/test/test_email/test_email.py

diff --git a/Lib/email/_parseaddr.py b/Lib/email/_parseaddr.py
index 41ff6f8c000d5..178329fbc6aac 100644
--- a/Lib/email/_parseaddr.py
+++ b/Lib/email/_parseaddr.py
@@ -67,6 +67,8 @@ def _parsedate_tz(data):
     if not data:
         return
     data = data.split()
+    if not data:  # This happens for whitespace-only input.
+        return None
     # The FWS after the comma after the day-of-week is optional, so search and
     # adjust for this.
     if data[0].endswith(',') or data[0].lower() in _daynames:
diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py
index 68d0522799874..e4e40b612feda 100644
--- a/Lib/test/test_email/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@ -2961,6 +2961,8 @@ def test_formatdate_usegmt(self):
     def test_parsedate_returns_None_for_invalid_strings(self):
         self.assertIsNone(utils.parsedate(''))
         self.assertIsNone(utils.parsedate_tz(''))
+        self.assertIsNone(utils.parsedate(' '))
+        self.assertIsNone(utils.parsedate_tz(' '))
         self.assertIsNone(utils.parsedate('0'))
         self.assertIsNone(utils.parsedate_tz('0'))
         self.assertIsNone(utils.parsedate('A Complete Waste of Time'))
diff --git a/Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst b/Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst
new file mode 100644
index 0000000000000..55cc409d0da30
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst
@@ -0,0 +1,2 @@
+Made email date parsing more robust against malformed input, namely a
+whitespace-only ``Date:`` header. Patch by Wouter Bolsterlee.


From webhook-mailer at python.org  Mon Aug 30 15:16:32 2021
From: webhook-mailer at python.org (ned-deily)
Date: Mon, 30 Aug 2021 19:16:32 -0000
Subject: [Python-checkins] [3.7] bpo-43124: Fix smtplib multiple CRLF
 injection (GH-25987) (GH-28037)
Message-ID: <mailman.1272.1630350992.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/d2cc04cd3024869101e894f73307944d98d187c8
commit: d2cc04cd3024869101e894f73307944d98d187c8
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ned-deily <nad at python.org>
date: 2021-08-30T15:16:24-04:00
summary:

[3.7] bpo-43124: Fix smtplib multiple CRLF injection (GH-25987) (GH-28037)

Co-authored-by: Miguel Brito <5544985+miguendes at users.noreply.github.com>

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 0897253f426068ea6a6fbe0ada01689af9ef1019)

files:
A Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst
M Lib/smtplib.py
M Lib/test/test_smtplib.py

diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index 22d5097c697fc9..345f03d5387e39 100755
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -361,10 +361,15 @@ def send(self, s):
     def putcmd(self, cmd, args=""):
         """Send a command to the server."""
         if args == "":
-            str = '%s%s' % (cmd, CRLF)
+            s = cmd
         else:
-            str = '%s %s%s' % (cmd, args, CRLF)
-        self.send(str)
+            s = f'{cmd} {args}'
+        if '\r' in s or '\n' in s:
+            s = s.replace('\n', '\\n').replace('\r', '\\r')
+            raise ValueError(
+                f'command and arguments contain prohibited newline characters: {s}'
+            )
+        self.send(f'{s}{CRLF}')
 
     def getreply(self):
         """Get a reply from the server.
diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py
index b4149d3ef007e8..a8c7402e34e76c 100644
--- a/Lib/test/test_smtplib.py
+++ b/Lib/test/test_smtplib.py
@@ -282,6 +282,16 @@ def testEXPNNotImplemented(self):
         self.assertEqual(smtp.getreply(), expected)
         smtp.quit()
 
+    def test_issue43124_putcmd_escapes_newline(self):
+        # see: https://bugs.python.org/issue43124
+        smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost',
+                            timeout=10)  # support.LOOPBACK_TIMEOUT in newer Pythons
+        self.addCleanup(smtp.close)
+        with self.assertRaises(ValueError) as exc:
+            smtp.putcmd('helo\nX-INJECTED')
+        self.assertIn("prohibited newline characters", str(exc.exception))
+        smtp.quit()
+
     def testVRFY(self):
         smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=3)
         expected = (252, b'Cannot VRFY user, but will accept message ' + \
@@ -351,6 +361,51 @@ def testSendNeedingDotQuote(self):
         mexpect = '%s%s\n%s' % (MSG_BEGIN, m, MSG_END)
         self.assertEqual(self.output.getvalue(), mexpect)
 
+    def test_issue43124_escape_localhostname(self):
+        # see: https://bugs.python.org/issue43124
+        # connect and send mail
+        m = 'wazzuuup\nlinetwo'
+        smtp = smtplib.SMTP(HOST, self.port, local_hostname='hi\nX-INJECTED',
+                            timeout=10)  # support.LOOPBACK_TIMEOUT in newer Pythons
+        self.addCleanup(smtp.close)
+        with self.assertRaises(ValueError) as exc:
+            smtp.sendmail("hi at me.com", "you at me.com", m)
+        self.assertIn(
+            "prohibited newline characters: ehlo hi\\nX-INJECTED",
+            str(exc.exception),
+        )
+        # XXX (see comment in testSend)
+        time.sleep(0.01)
+        smtp.quit()
+
+        debugout = smtpd.DEBUGSTREAM.getvalue()
+        self.assertNotIn("X-INJECTED", debugout)
+
+    def test_issue43124_escape_options(self):
+        # see: https://bugs.python.org/issue43124
+        # connect and send mail
+        m = 'wazzuuup\nlinetwo'
+        smtp = smtplib.SMTP(
+            HOST, self.port, local_hostname='localhost',
+            timeout=10)  # support.LOOPBACK_TIMEOUT in newer Pythons
+
+        self.addCleanup(smtp.close)
+        smtp.sendmail("hi at me.com", "you at me.com", m)
+        with self.assertRaises(ValueError) as exc:
+            smtp.mail("hi at me.com", ["X-OPTION\nX-INJECTED-1", "X-OPTION2\nX-INJECTED-2"])
+        msg = str(exc.exception)
+        self.assertIn("prohibited newline characters", msg)
+        self.assertIn("X-OPTION\\nX-INJECTED-1 X-OPTION2\\nX-INJECTED-2", msg)
+        # XXX (see comment in testSend)
+        time.sleep(0.01)
+        smtp.quit()
+
+        debugout = smtpd.DEBUGSTREAM.getvalue()
+        self.assertNotIn("X-OPTION", debugout)
+        self.assertNotIn("X-OPTION2", debugout)
+        self.assertNotIn("X-INJECTED-1", debugout)
+        self.assertNotIn("X-INJECTED-2", debugout)
+
     def testSendNullSender(self):
         m = 'A test message'
         smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=3)
diff --git a/Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst b/Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst
new file mode 100644
index 00000000000000..e897d6cd3641d7
--- /dev/null
+++ b/Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst
@@ -0,0 +1,2 @@
+Made the internal ``putcmd`` function in :mod:`smtplib` sanitize input for
+presence of ``\r`` and ``\n`` characters to avoid (unlikely) command injection.


From webhook-mailer at python.org  Mon Aug 30 15:22:05 2021
From: webhook-mailer at python.org (ned-deily)
Date: Mon, 30 Aug 2021 19:22:05 -0000
Subject: [Python-checkins] [3.6] bpo-43124: Fix smtplib multiple CRLF
 injection (GH-25987) (GH-28038)
Message-ID: <mailman.1273.1630351326.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/29d97d17fb7adab3b0df9e178b73f70292d1cf64
commit: 29d97d17fb7adab3b0df9e178b73f70292d1cf64
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ned-deily <nad at python.org>
date: 2021-08-30T15:21:57-04:00
summary:

[3.6] bpo-43124: Fix smtplib multiple CRLF injection (GH-25987) (GH-28038)

Co-authored-by: Miguel Brito <5544985+miguendes at users.noreply.github.com>

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 0897253f426068ea6a6fbe0ada01689af9ef1019)

files:
A Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst
M Lib/smtplib.py
M Lib/test/test_smtplib.py

diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index 6091c7fb7acad..e3c5b118d9a6e 100755
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -361,10 +361,15 @@ def send(self, s):
     def putcmd(self, cmd, args=""):
         """Send a command to the server."""
         if args == "":
-            str = '%s%s' % (cmd, CRLF)
+            s = cmd
         else:
-            str = '%s %s%s' % (cmd, args, CRLF)
-        self.send(str)
+            s = f'{cmd} {args}'
+        if '\r' in s or '\n' in s:
+            s = s.replace('\n', '\\n').replace('\r', '\\r')
+            raise ValueError(
+                f'command and arguments contain prohibited newline characters: {s}'
+            )
+        self.send(f'{s}{CRLF}')
 
     def getreply(self):
         """Get a reply from the server.
diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py
index 87047514e7aad..121bbcc9dbd91 100644
--- a/Lib/test/test_smtplib.py
+++ b/Lib/test/test_smtplib.py
@@ -286,6 +286,16 @@ def testEXPNNotImplemented(self):
         self.assertEqual(smtp.getreply(), expected)
         smtp.quit()
 
+    def test_issue43124_putcmd_escapes_newline(self):
+        # see: https://bugs.python.org/issue43124
+        smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost',
+                            timeout=10)  # support.LOOPBACK_TIMEOUT in newer Pythons
+        self.addCleanup(smtp.close)
+        with self.assertRaises(ValueError) as exc:
+            smtp.putcmd('helo\nX-INJECTED')
+        self.assertIn("prohibited newline characters", str(exc.exception))
+        smtp.quit()
+
     def testVRFY(self):
         smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=3)
         expected = (252, b'Cannot VRFY user, but will accept message ' + \
@@ -355,6 +365,51 @@ def testSendNeedingDotQuote(self):
         mexpect = '%s%s\n%s' % (MSG_BEGIN, m, MSG_END)
         self.assertEqual(self.output.getvalue(), mexpect)
 
+    def test_issue43124_escape_localhostname(self):
+        # see: https://bugs.python.org/issue43124
+        # connect and send mail
+        m = 'wazzuuup\nlinetwo'
+        smtp = smtplib.SMTP(HOST, self.port, local_hostname='hi\nX-INJECTED',
+                            timeout=10)  # support.LOOPBACK_TIMEOUT in newer Pythons
+        self.addCleanup(smtp.close)
+        with self.assertRaises(ValueError) as exc:
+            smtp.sendmail("hi at me.com", "you at me.com", m)
+        self.assertIn(
+            "prohibited newline characters: ehlo hi\\nX-INJECTED",
+            str(exc.exception),
+        )
+        # XXX (see comment in testSend)
+        time.sleep(0.01)
+        smtp.quit()
+
+        debugout = smtpd.DEBUGSTREAM.getvalue()
+        self.assertNotIn("X-INJECTED", debugout)
+
+    def test_issue43124_escape_options(self):
+        # see: https://bugs.python.org/issue43124
+        # connect and send mail
+        m = 'wazzuuup\nlinetwo'
+        smtp = smtplib.SMTP(
+            HOST, self.port, local_hostname='localhost',
+            timeout=10)  # support.LOOPBACK_TIMEOUT in newer Pythons
+
+        self.addCleanup(smtp.close)
+        smtp.sendmail("hi at me.com", "you at me.com", m)
+        with self.assertRaises(ValueError) as exc:
+            smtp.mail("hi at me.com", ["X-OPTION\nX-INJECTED-1", "X-OPTION2\nX-INJECTED-2"])
+        msg = str(exc.exception)
+        self.assertIn("prohibited newline characters", msg)
+        self.assertIn("X-OPTION\\nX-INJECTED-1 X-OPTION2\\nX-INJECTED-2", msg)
+        # XXX (see comment in testSend)
+        time.sleep(0.01)
+        smtp.quit()
+
+        debugout = smtpd.DEBUGSTREAM.getvalue()
+        self.assertNotIn("X-OPTION", debugout)
+        self.assertNotIn("X-OPTION2", debugout)
+        self.assertNotIn("X-INJECTED-1", debugout)
+        self.assertNotIn("X-INJECTED-2", debugout)
+
     def testSendNullSender(self):
         m = 'A test message'
         smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=3)
diff --git a/Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst b/Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst
new file mode 100644
index 0000000000000..e897d6cd3641d
--- /dev/null
+++ b/Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst
@@ -0,0 +1,2 @@
+Made the internal ``putcmd`` function in :mod:`smtplib` sanitize input for
+presence of ``\r`` and ``\n`` characters to avoid (unlikely) command injection.


From webhook-mailer at python.org  Mon Aug 30 17:14:33 2021
From: webhook-mailer at python.org (pablogsal)
Date: Mon, 30 Aug 2021 21:14:33 -0000
Subject: [Python-checkins] bpo-45041: Increase coverage for
 sqlite3.Cursor.executescript() (GH-28074)
Message-ID: <mailman.1274.1630358074.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/e34bb409197d72711ae2c6197f9d8305533034d4
commit: e34bb409197d72711ae2c6197f9d8305533034d4
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-08-30T22:14:27+01:00
summary:

bpo-45041: Increase coverage for sqlite3.Cursor.executescript() (GH-28074)

files:
M Lib/sqlite3/test/dbapi.py

diff --git a/Lib/sqlite3/test/dbapi.py b/Lib/sqlite3/test/dbapi.py
index 02e42e8c3751f..89f773daf24a1 100644
--- a/Lib/sqlite3/test/dbapi.py
+++ b/Lib/sqlite3/test/dbapi.py
@@ -880,6 +880,13 @@ def test_cursor_executescript_too_large_script(self, maxsize):
             with self.assertRaises(sqlite.DataError):
                 cur.executescript("create table a(s);".ljust(size))
 
+    def test_cursor_executescript_tx_control(self):
+        con = sqlite.connect(":memory:")
+        con.execute("begin")
+        self.assertTrue(con.in_transaction)
+        con.executescript("select 1")
+        self.assertFalse(con.in_transaction)
+
     def test_connection_execute(self):
         con = sqlite.connect(":memory:")
         result = con.execute("select 5").fetchone()[0]


From webhook-mailer at python.org  Mon Aug 30 17:54:57 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 30 Aug 2021 21:54:57 -0000
Subject: [Python-checkins] bpo-44756: Remove misleading NEWS entries of a
 change that was reverted before release (GH-28075)
Message-ID: <mailman.1275.1630360498.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/5246dbc2a12bf8e64e18efee2fdce02a350bbf09
commit: 5246dbc2a12bf8e64e18efee2fdce02a350bbf09
branch: main
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2021-08-30T23:54:47+02:00
summary:

bpo-44756: Remove misleading NEWS entries of a change that was reverted before release (GH-28075)

files:
D Misc/NEWS.d/next/Documentation/2021-08-06-19-36-21.bpo-44756.1Ngzon.rst
D Misc/NEWS.d/next/Tools-Demos/2021-07-28-00-51-55.bpo-44756.pvAajB.rst

diff --git a/Misc/NEWS.d/next/Documentation/2021-08-06-19-36-21.bpo-44756.1Ngzon.rst b/Misc/NEWS.d/next/Documentation/2021-08-06-19-36-21.bpo-44756.1Ngzon.rst
deleted file mode 100644
index ca2e1b9b53b752..00000000000000
--- a/Misc/NEWS.d/next/Documentation/2021-08-06-19-36-21.bpo-44756.1Ngzon.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Reverted automated virtual environment creation on ``make html`` when
-building documentation. It turned out to be disruptive for downstream
-distributors.
diff --git a/Misc/NEWS.d/next/Tools-Demos/2021-07-28-00-51-55.bpo-44756.pvAajB.rst b/Misc/NEWS.d/next/Tools-Demos/2021-07-28-00-51-55.bpo-44756.pvAajB.rst
deleted file mode 100644
index 4734f1f5c41691..00000000000000
--- a/Misc/NEWS.d/next/Tools-Demos/2021-07-28-00-51-55.bpo-44756.pvAajB.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-In the Makefile for documentation (:file:`Doc/Makefile`), the ``build`` rule
-is dependent on the ``venv`` rule. Therefore, ``html``, ``latex``, and other
-build-dependent rules are also now dependent on ``venv``. The ``venv`` rule
-only performs an action if ``$(VENVDIR)`` does not exist.
-:file:`Doc/README.rst` was updated; most users now only need to type ``make
-html``.


From webhook-mailer at python.org  Mon Aug 30 17:56:41 2021
From: webhook-mailer at python.org (ambv)
Date: Mon, 30 Aug 2021 21:56:41 -0000
Subject: [Python-checkins] Python 3.9.7
Message-ID: <mailman.1276.1630360602.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/1016ef37904c7ddc16fb18d3369b2a78cf428fa4
commit: 1016ef37904c7ddc16fb18d3369b2a78cf428fa4
branch: 3.9
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2021-08-30T21:02:15+02:00
summary:

Python 3.9.7

files:
A Misc/NEWS.d/3.9.7.rst
D Misc/NEWS.d/next/Build/2021-06-19-11-50-03.bpo-43298.9ircMb.rst
D Misc/NEWS.d/next/Build/2021-06-30-02-32-46.bpo-44535.M9iN4-.rst
D Misc/NEWS.d/next/Core and Builtins/2019-12-21-14-18-32.bpo-39091.dOexgQ.rst
D Misc/NEWS.d/next/Core and Builtins/2021-05-21-01-42-45.bpo-44184.9qOptC.rst
D Misc/NEWS.d/next/Core and Builtins/2021-06-21-11-19-54.bpo-44472.Vvm1yn.rst
D Misc/NEWS.d/next/Core and Builtins/2021-06-29-11-49-29.bpo-44523.67-ZIP.rst
D Misc/NEWS.d/next/Core and Builtins/2021-07-04-23-38-51.bpo-44562.QdeRQo.rst
D Misc/NEWS.d/next/Core and Builtins/2021-07-21-15-26-56.bpo-44698.DA4_0o.rst
D Misc/NEWS.d/next/Core and Builtins/2021-08-07-01-26-12.bpo-44856.9rk3li.rst
D Misc/NEWS.d/next/Core and Builtins/2021-08-07-21-39-19.bpo-25782.B22lMx.rst
D Misc/NEWS.d/next/Core and Builtins/2021-08-09-14-29-52.bpo-33930.--5LQ-.rst
D Misc/NEWS.d/next/Core and Builtins/2021-08-09-16-16-03.bpo-44872.OKRlhK.rst
D Misc/NEWS.d/next/Core and Builtins/2021-08-11-15-39-57.bpo-44885.i4noUO.rst
D Misc/NEWS.d/next/Core and Builtins/2021-08-15-10-39-06.bpo-44698.lITKNc.rst
D Misc/NEWS.d/next/Core and Builtins/2021-08-18-19-09-28.bpo-44947.mcvGdS.rst
D Misc/NEWS.d/next/Core and Builtins/2021-08-19-14-43-24.bpo-44954.dLn3lg.rst
D Misc/NEWS.d/next/Core and Builtins/2021-08-23-19-55-08.bpo-44962.J00ftt.rst
D Misc/NEWS.d/next/Core and Builtins/2021-08-26-18-44-03.bpo-45018.pu8H9L.rst
D Misc/NEWS.d/next/Documentation/2018-05-19-15-59-29.bpo-33479.4cLlxo.rst
D Misc/NEWS.d/next/Documentation/2020-01-30-05-18-48.bpo-39498.Nu3sFL.rst
D Misc/NEWS.d/next/Documentation/2021-06-18-06-44-45.bpo-44453.3PIkj2.rst
D Misc/NEWS.d/next/Documentation/2021-06-18-18-04-53.bpo-27752.NEByNk.rst
D Misc/NEWS.d/next/Documentation/2021-06-24-14-37-16.bpo-43066.Ti7ahX.rst
D Misc/NEWS.d/next/Documentation/2021-06-28-12-13-48.bpo-38062.9Ehp9O.rst
D Misc/NEWS.d/next/Documentation/2021-07-02-14-02-29.bpo-44544._5_aCz.rst
D Misc/NEWS.d/next/Documentation/2021-07-03-18-25-17.bpo-44558.0pTknl.rst
D Misc/NEWS.d/next/Documentation/2021-07-15-11-19-03.bpo-42958.gC5IHM.rst
D Misc/NEWS.d/next/Documentation/2021-07-18-22-43-14.bpo-44561.T7HpWm.rst
D Misc/NEWS.d/next/Documentation/2021-07-20-21-03-18.bpo-30511.eMFkRi.rst
D Misc/NEWS.d/next/Documentation/2021-07-22-08-28-03.bpo-35183.p9BWTB.rst
D Misc/NEWS.d/next/Documentation/2021-07-25-23-04-15.bpo-44693.JuCbNq.rst
D Misc/NEWS.d/next/Documentation/2021-08-06-19-36-21.bpo-44756.1Ngzon.rst
D Misc/NEWS.d/next/Documentation/2021-08-13-19-08-03.bpo-44903.aJuvQF.rst
D Misc/NEWS.d/next/Library/2017-09-20-14-43-03.bpo-29298._78CSN.rst
D Misc/NEWS.d/next/Library/2018-04-24-14-25-07.bpo-33349.Y_0LIr.rst
D Misc/NEWS.d/next/Library/2019-06-03-23-53-25.bpo-27513.qITN7d.rst
D Misc/NEWS.d/next/Library/2019-09-25-13-54-41.bpo-30256.wBkzox.rst
D Misc/NEWS.d/next/Library/2020-01-16-23-41-16.bpo-38840.VzzYZz.rst
D Misc/NEWS.d/next/Library/2020-04-24-20-39-38.bpo-34990.3SmL9M.rst
D Misc/NEWS.d/next/Library/2020-07-13-23-46-59.bpo-32695.tTqqXe.rst
D Misc/NEWS.d/next/Library/2020-07-26-18-17-30.bpo-41402.YRkVkp.rst
D Misc/NEWS.d/next/Library/2021-02-06-05-34-01.bpo-43048.yCPUmo.rst
D Misc/NEWS.d/next/Library/2021-04-15-12-02-17.bpo-43853.XXCVAp.rst
D Misc/NEWS.d/next/Library/2021-05-18-00-17-21.bpo-27334.32EJZi.rst
D Misc/NEWS.d/next/Library/2021-06-10-21-53-46.bpo-34266.k3fxnm.rst
D Misc/NEWS.d/next/Library/2021-06-12-21-25-35.bpo-27827.TMWh1i.rst
D Misc/NEWS.d/next/Library/2021-06-24-19-16-20.bpo-42892.qvRNhI.rst
D Misc/NEWS.d/next/Library/2021-06-29-21-17-17.bpo-44461.acqRnV.rst
D Misc/NEWS.d/next/Library/2021-07-04-11-33-34.bpo-41249.sHdwBE.rst
D Misc/NEWS.d/next/Library/2021-07-04-21-16-53.bpo-44558.cm7Slv.rst
D Misc/NEWS.d/next/Library/2021-07-05-18-13-25.bpo-44566.o51Bd1.rst
D Misc/NEWS.d/next/Library/2021-07-09-07-14-37.bpo-41928.Q1jMrr.rst
D Misc/NEWS.d/next/Library/2021-07-13-09-01-33.bpo-44608.R3IcM1.rst
D Misc/NEWS.d/next/Library/2021-07-16-13-40-31.bpo-40897.aveAre.rst
D Misc/NEWS.d/next/Library/2021-07-21-10-43-22.bpo-44666.CEThkv.rst
D Misc/NEWS.d/next/Library/2021-07-21-23-16-30.bpo-44704.iqHLxQ.rst
D Misc/NEWS.d/next/Library/2021-07-24-02-17-59.bpo-44720.shU5Qm.rst
D Misc/NEWS.d/next/Library/2021-07-27-22-11-29.bpo-44752._bvbrZ.rst
D Misc/NEWS.d/next/Library/2021-07-28-15-50-59.bpo-42853.8SYiF_.rst
D Misc/NEWS.d/next/Library/2021-07-30-23-27-30.bpo-44667.tu0Xrv.rst
D Misc/NEWS.d/next/Library/2021-08-02-14-37-32.bpo-44806.wOW_Qn.rst
D Misc/NEWS.d/next/Library/2021-08-03-15-02-28.bpo-44815.9AmFfy.rst
D Misc/NEWS.d/next/Library/2021-08-04-12-29-00.bpo-44822.zePNXA.rst
D Misc/NEWS.d/next/Library/2021-08-06-09-43-50.bpo-44605.q4YSBZ.rst
D Misc/NEWS.d/next/Library/2021-08-06-13-00-28.bpo-44849.O78F_f.rst
D Misc/NEWS.d/next/Library/2021-08-06-19-15-52.bpo-44581.oFDBTB.rst
D Misc/NEWS.d/next/Library/2021-08-09-13-17-10.bpo-38956.owWLNv.rst
D Misc/NEWS.d/next/Library/2021-08-19-15-03-54.bpo-44955.1mxFQS.rst
D Misc/NEWS.d/next/Library/2021-08-20-11-30-52.bpo-44449.1r2-lS.rst
D Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst
D Misc/NEWS.d/next/Library/2021-08-27-23-40-51.bpo-43913.Uo1Gt5.rst
D Misc/NEWS.d/next/Library/2021-08-29-14-49-22.bpo-41620.WJ6PFL.rst
D Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst
D Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst
D Misc/NEWS.d/next/Security/2021-06-29-23-40-22.bpo-41180.uTWHv_.rst
D Misc/NEWS.d/next/Security/2021-08-29-12-39-44.bpo-42278.jvmQz_.rst
D Misc/NEWS.d/next/Tests/2019-09-25-18-10-10.bpo-30256.A5i76Q.rst
D Misc/NEWS.d/next/Tests/2021-07-22-16-38-39.bpo-44708.SYNaac.rst
D Misc/NEWS.d/next/Tests/2021-07-24-20-09-15.bpo-44734.KKsNOV.rst
D Misc/NEWS.d/next/Tests/2021-08-06-00-07-15.bpo-40928.aIwb6G.rst
D Misc/NEWS.d/next/Tests/2021-08-06-18-36-04.bpo-44852.sUL8YX.rst
D Misc/NEWS.d/next/Tests/2021-08-18-18-30-12.bpo-44949.VE5ENv.rst
D Misc/NEWS.d/next/Tests/2021-08-26-14-20-44.bpo-45011.mQZdXU.rst
D Misc/NEWS.d/next/Tests/2021-08-27-22-37-19.bpo-25130.ig4oJe.rst
D Misc/NEWS.d/next/Tools-Demos/2021-07-28-00-51-55.bpo-44756.pvAajB.rst
D Misc/NEWS.d/next/Windows/2020-04-13-15-20-28.bpo-40263.1KKEbu.rst
D Misc/NEWS.d/next/Windows/2021-07-13-15-32-49.bpo-44572.gXvhDc.rst
D Misc/NEWS.d/next/Windows/2021-08-27-23-50-02.bpo-45007.NIBlVG.rst
D Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst
D Misc/NEWS.d/next/macOS/2021-08-30-00-04-10.bpo-45007.pixqUB.rst
M Include/patchlevel.h
M Lib/pydoc_data/topics.py
M README.rst

diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 999b7fa057e475..af883f2339d812 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -18,12 +18,12 @@
 /*--start constants--*/
 #define PY_MAJOR_VERSION        3
 #define PY_MINOR_VERSION        9
-#define PY_MICRO_VERSION        6
+#define PY_MICRO_VERSION        7
 #define PY_RELEASE_LEVEL        PY_RELEASE_LEVEL_FINAL
 #define PY_RELEASE_SERIAL       0
 
 /* Version as a string */
-#define PY_VERSION              "3.9.6+"
+#define PY_VERSION              "3.9.7"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
diff --git a/Lib/pydoc_data/topics.py b/Lib/pydoc_data/topics.py
index 8b8544972e528c..bc69434998ad41 100644
--- a/Lib/pydoc_data/topics.py
+++ b/Lib/pydoc_data/topics.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Autogenerated by Sphinx on Mon Jun 28 10:13:28 2021
+# Autogenerated by Sphinx on Mon Aug 30 20:40:44 2021
 topics = {'assert': 'The "assert" statement\n'
            '**********************\n'
            '\n'
@@ -1259,6 +1259,10 @@
            'In the latter case, sequence repetition is performed; a negative\n'
            'repetition factor yields an empty sequence.\n'
            '\n'
+           'This operation can be customized using the special "__mul__()" '
+           'and\n'
+           '"__rmul__()" methods.\n'
+           '\n'
            'The "@" (at) operator is intended to be used for matrix\n'
            'multiplication.  No builtin Python types implement this operator.\n'
            '\n'
@@ -1274,6 +1278,10 @@
            'result.  Division by zero raises the "ZeroDivisionError" '
            'exception.\n'
            '\n'
+           'This operation can be customized using the special "__truediv__()" '
+           'and\n'
+           '"__floordiv__()" methods.\n'
+           '\n'
            'The "%" (modulo) operator yields the remainder from the division '
            'of\n'
            'the first argument by the second.  The numeric arguments are '
@@ -1305,6 +1313,10 @@
            'string formatting is described in the Python Library Reference,\n'
            'section printf-style String Formatting.\n'
            '\n'
+           'The *modulo* operation can be customized using the special '
+           '"__mod__()"\n'
+           'method.\n'
+           '\n'
            'The floor division operator, the modulo operator, and the '
            '"divmod()"\n'
            'function are not defined for complex numbers.  Instead, convert to '
@@ -1319,9 +1331,16 @@
            'and then added together. In the latter case, the sequences are\n'
            'concatenated.\n'
            '\n'
+           'This operation can be customized using the special "__add__()" '
+           'and\n'
+           '"__radd__()" methods.\n'
+           '\n'
            'The "-" (subtraction) operator yields the difference of its '
            'arguments.\n'
-           'The numeric arguments are first converted to a common type.\n',
+           'The numeric arguments are first converted to a common type.\n'
+           '\n'
+           'This operation can be customized using the special "__sub__()" '
+           'method.\n',
  'bitwise': 'Binary bitwise operations\n'
             '*************************\n'
             '\n'
@@ -1334,14 +1353,18 @@
             '\n'
             'The "&" operator yields the bitwise AND of its arguments, which '
             'must\n'
-            'be integers.\n'
+            'be integers or one of them must be a custom object overriding\n'
+            '"__and__()" or "__rand__()" special methods.\n'
             '\n'
             'The "^" operator yields the bitwise XOR (exclusive OR) of its\n'
-            'arguments, which must be integers.\n'
+            'arguments, which must be integers or one of them must be a '
+            'custom\n'
+            'object overriding "__xor__()" or "__rxor__()" special methods.\n'
             '\n'
             'The "|" operator yields the bitwise (inclusive) OR of its '
             'arguments,\n'
-            'which must be integers.\n',
+            'which must be integers or one of them must be a custom object\n'
+            'overriding "__or__()" or "__ror__()" special methods.\n',
  'bltin-code-objects': 'Code Objects\n'
                        '************\n'
                        '\n'
@@ -1787,7 +1810,11 @@
                 '   comp_operator ::= "<" | ">" | "==" | ">=" | "<=" | "!="\n'
                 '                     | "is" ["not"] | ["not"] "in"\n'
                 '\n'
-                'Comparisons yield boolean values: "True" or "False".\n'
+                'Comparisons yield boolean values: "True" or "False". Custom '
+                '*rich\n'
+                'comparison methods* may return non-boolean values. In this '
+                'case Python\n'
+                'will call "bool()" on such value in boolean contexts.\n'
                 '\n'
                 'Comparisons can be chained arbitrarily, e.g., "x < y <= z" '
                 'is\n'
@@ -7472,7 +7499,10 @@
           '"ZeroDivisionError".\n'
           'Raising a negative number to a fractional power results in a '
           '"complex"\n'
-          'number. (In earlier versions it raised a "ValueError".)\n',
+          'number. (In earlier versions it raised a "ValueError".)\n'
+          '\n'
+          'This operation can be customized using the special "__pow__()" '
+          'method.\n',
  'raise': 'The "raise" statement\n'
           '*********************\n'
           '\n'
@@ -7872,6 +7902,10 @@
              'the\n'
              'second argument.\n'
              '\n'
+             'This operation can be customized using the special '
+             '"__lshift__()" and\n'
+             '"__rshift__()" methods.\n'
+             '\n'
              'A right shift by *n* bits is defined as floor division by '
              '"pow(2,n)".\n'
              'A left shift by *n* bits is defined as multiplication with '
@@ -10092,7 +10126,7 @@
                    '*start* and\n'
                    '   *end* are interpreted as in slice notation.\n'
                    '\n'
-                   "str.encode(encoding='utf-8', errors='strict')\n"
+                   'str.encode(encoding="utf-8", errors="strict")\n'
                    '\n'
                    '   Return an encoded version of the string as a bytes '
                    'object. Default\n'
@@ -10598,7 +10632,7 @@
                    'followed by\n'
                    '   the string itself.\n'
                    '\n'
-                   'str.rsplit(sep=None, maxsplit=- 1)\n'
+                   'str.rsplit(sep=None, maxsplit=-1)\n'
                    '\n'
                    '   Return a list of the words in the string, using *sep* '
                    'as the\n'
@@ -10639,7 +10673,7 @@
                    "      >>> 'Monty Python'.removesuffix(' Python')\n"
                    "      'Monty'\n"
                    '\n'
-                   'str.split(sep=None, maxsplit=- 1)\n'
+                   'str.split(sep=None, maxsplit=-1)\n'
                    '\n'
                    '   Return a list of the words in the string, using *sep* '
                    'as the\n'
@@ -11611,7 +11645,7 @@
           '         points. All the code points in the range "U+0000 - '
           'U+10FFFF"\n'
           '         can be represented in a string.  Python doesn?t have a '
-          '*char*\n'
+          '"char"\n'
           '         type; instead, every code point in the string is '
           'represented\n'
           '         as a string object with length "1".  The built-in '
@@ -13419,7 +13453,7 @@
              '|                                | "s[i:i] = '
              '[x]")                  |                       |\n'
              '+--------------------------------+----------------------------------+-----------------------+\n'
-             '| "s.pop([i])"                   | retrieves the item at *i* '
+             '| "s.pop()" or "s.pop(i)"        | retrieves the item at *i* '
              'and    | (2)                   |\n'
              '|                                | also removes it from '
              '*s*         |                       |\n'
@@ -13882,7 +13916,7 @@
                      '|                                | "s[i:i] = '
                      '[x]")                  |                       |\n'
                      '+--------------------------------+----------------------------------+-----------------------+\n'
-                     '| "s.pop([i])"                   | retrieves the item at '
+                     '| "s.pop()" or "s.pop(i)"        | retrieves the item at '
                      '*i* and    | (2)                   |\n'
                      '|                                | also removes it from '
                      '*s*         |                       |\n'
@@ -13947,15 +13981,21 @@
           '   u_expr ::= power | "-" u_expr | "+" u_expr | "~" u_expr\n'
           '\n'
           'The unary "-" (minus) operator yields the negation of its numeric\n'
-          'argument.\n'
+          'argument; the operation can be overridden with the "__neg__()" '
+          'special\n'
+          'method.\n'
           '\n'
           'The unary "+" (plus) operator yields its numeric argument '
-          'unchanged.\n'
+          'unchanged;\n'
+          'the operation can be overridden with the "__pos__()" special '
+          'method.\n'
           '\n'
           'The unary "~" (invert) operator yields the bitwise inversion of '
           'its\n'
           'integer argument.  The bitwise inversion of "x" is defined as\n'
-          '"-(x+1)".  It only applies to integral numbers.\n'
+          '"-(x+1)".  It only applies to integral numbers or to custom '
+          'objects\n'
+          'that override the "__invert__()" special method.\n'
           '\n'
           'In all three cases, if the argument does not have the proper type, '
           'a\n'
diff --git a/Misc/NEWS.d/3.9.7.rst b/Misc/NEWS.d/3.9.7.rst
new file mode 100644
index 00000000000000..445d97ef3c5218
--- /dev/null
+++ b/Misc/NEWS.d/3.9.7.rst
@@ -0,0 +1,925 @@
+.. bpo: 42278
+.. date: 2021-08-29-12-39-44
+.. nonce: jvmQz_
+.. release date: 2021-08-30
+.. section: Security
+
+Replaced usage of :func:`tempfile.mktemp` with
+:class:`~tempfile.TemporaryDirectory` to avoid a potential race condition.
+
+..
+
+.. bpo: 41180
+.. date: 2021-06-29-23-40-22
+.. nonce: uTWHv_
+.. section: Security
+
+Add auditing events to the :mod:`marshal` module, and stop raising
+``code.__init__`` events for every unmarshalled code object. Directly
+instantiated code objects will continue to raise an event, and audit event
+handlers should inspect or collect the raw marshal data. This reduces a
+significant performance overhead when loading from ``.pyc`` files.
+
+..
+
+.. bpo: 44394
+.. date: 2021-06-29-02-45-53
+.. nonce: A220N1
+.. section: Security
+
+Update the vendored copy of libexpat to 2.4.1 (from 2.2.8) to get the fix
+for the CVE-2013-0340 "Billion Laughs" vulnerability. This copy is most used
+on Windows and macOS.
+
+..
+
+.. bpo: 43124
+.. date: 2021-05-08-11-50-46
+.. nonce: 2CTM6M
+.. section: Security
+
+Made the internal ``putcmd`` function in :mod:`smtplib` sanitize input for
+presence of ``\r`` and ``\n`` characters to avoid (unlikely) command
+injection.
+
+..
+
+.. bpo: 45018
+.. date: 2021-08-26-18-44-03
+.. nonce: pu8H9L
+.. section: Core and Builtins
+
+Fixed pickling of range iterators that iterated for over 2**32 times.
+
+..
+
+.. bpo: 44962
+.. date: 2021-08-23-19-55-08
+.. nonce: J00ftt
+.. section: Core and Builtins
+
+Fix a race in WeakKeyDictionary, WeakValueDictionary and WeakSet when two
+threads attempt to commit the last pending removal. This fixes
+asyncio.create_task and fixes a data loss in asyncio.run where
+shutdown_asyncgens is not run
+
+..
+
+.. bpo: 44954
+.. date: 2021-08-19-14-43-24
+.. nonce: dLn3lg
+.. section: Core and Builtins
+
+Fixed a corner case bug where the result of ``float.fromhex('0x.8p-1074')``
+was rounded the wrong way.
+
+..
+
+.. bpo: 44947
+.. date: 2021-08-18-19-09-28
+.. nonce: mcvGdS
+.. section: Core and Builtins
+
+Refine the syntax error for trailing commas in import statements. Patch by
+Pablo Galindo.
+
+..
+
+.. bpo: 44698
+.. date: 2021-08-15-10-39-06
+.. nonce: lITKNc
+.. section: Core and Builtins
+
+Restore behaviour of complex exponentiation with integer-valued exponent of
+type :class:`float` or :class:`complex`.
+
+..
+
+.. bpo: 44885
+.. date: 2021-08-11-15-39-57
+.. nonce: i4noUO
+.. section: Core and Builtins
+
+Correct the ast locations of f-strings with format specs and repeated
+expressions. Patch by Pablo Galindo
+
+..
+
+.. bpo: 44872
+.. date: 2021-08-09-16-16-03
+.. nonce: OKRlhK
+.. section: Core and Builtins
+
+Use new trashcan macros (Py_TRASHCAN_BEGIN/END) in frameobject.c instead of
+the old ones (Py_TRASHCAN_SAFE_BEGIN/END).
+
+..
+
+.. bpo: 33930
+.. date: 2021-08-09-14-29-52
+.. nonce: --5LQ-
+.. section: Core and Builtins
+
+Fix segmentation fault with deep recursion when cleaning method objects.
+Patch by Augusto Goulart and Pablo Galindo.
+
+..
+
+.. bpo: 25782
+.. date: 2021-08-07-21-39-19
+.. nonce: B22lMx
+.. section: Core and Builtins
+
+Fix bug where ``PyErr_SetObject`` hangs when the current exception has a
+cycle in its context chain.
+
+..
+
+.. bpo: 44856
+.. date: 2021-08-07-01-26-12
+.. nonce: 9rk3li
+.. section: Core and Builtins
+
+Fix reference leaks in the error paths of ``update_bases()`` and
+``__build_class__``. Patch by Pablo Galindo.
+
+..
+
+.. bpo: 44698
+.. date: 2021-07-21-15-26-56
+.. nonce: DA4_0o
+.. section: Core and Builtins
+
+Fix undefined behaviour in complex object exponentiation.
+
+..
+
+.. bpo: 44562
+.. date: 2021-07-04-23-38-51
+.. nonce: QdeRQo
+.. section: Core and Builtins
+
+Remove uses of :c:func:`PyObject_GC_Del` in error path when initializing
+:class:`types.GenericAlias`.
+
+..
+
+.. bpo: 44523
+.. date: 2021-06-29-11-49-29
+.. nonce: 67-ZIP
+.. section: Core and Builtins
+
+Remove the pass-through for :func:`hash` of :class:`weakref.proxy` objects
+to prevent unintended consequences when the original referred object dies
+while the proxy is part of a hashable object. Patch by Pablo Galindo.
+
+..
+
+.. bpo: 44472
+.. date: 2021-06-21-11-19-54
+.. nonce: Vvm1yn
+.. section: Core and Builtins
+
+Fix ltrace functionality when exceptions are raised. Patch by Pablo Galindo
+
+..
+
+.. bpo: 44184
+.. date: 2021-05-21-01-42-45
+.. nonce: 9qOptC
+.. section: Core and Builtins
+
+Fix a crash at Python exit when a deallocator function removes the last
+strong reference to a heap type. Patch by Victor Stinner.
+
+..
+
+.. bpo: 39091
+.. date: 2019-12-21-14-18-32
+.. nonce: dOexgQ
+.. section: Core and Builtins
+
+Fix crash when using passing a non-exception to a generator's ``throw()``
+method. Patch by Noah Oxer
+
+..
+
+.. bpo: 41620
+.. date: 2021-08-29-14-49-22
+.. nonce: WJ6PFL
+.. section: Library
+
+:meth:`~unittest.TestCase.run` now always return a
+:class:`~unittest.TestResult` instance. Previously it returned ``None`` if
+the test class or method was decorated with a skipping decorator.
+
+..
+
+.. bpo: 43913
+.. date: 2021-08-27-23-40-51
+.. nonce: Uo1Gt5
+.. section: Library
+
+Fix bugs in cleaning up classes and modules in :mod:`unittest`:
+
+* Functions registered with :func:`~unittest.addModuleCleanup` were not called unless the user defines ``tearDownModule()`` in their test module.
+* Functions registered with :meth:`~unittest.TestCase.addClassCleanup` were not called if ``tearDownClass`` is set to ``None``.
+* Buffering in :class:`~unittest.TestResult` did not work with functions registered with ``addClassCleanup()`` and ``addModuleCleanup()``.
+* Errors in functions registered with ``addClassCleanup()`` and ``addModuleCleanup()`` were not handled correctly in buffered and debug modes.
+* Errors in ``setUpModule()`` and functions registered with ``addModuleCleanup()`` were reported in wrong order.
+* And several lesser bugs.
+
+..
+
+.. bpo: 45001
+.. date: 2021-08-26-16-25-48
+.. nonce: tn_dKp
+.. section: Library
+
+Made email date parsing more robust against malformed input, namely a
+whitespace-only ``Date:`` header. Patch by Wouter Bolsterlee.
+
+..
+
+.. bpo: 44449
+.. date: 2021-08-20-11-30-52
+.. nonce: 1r2-lS
+.. section: Library
+
+Fix a crash in the signal handler of the :mod:`faulthandler` module: no
+longer modify the reference count of frame objects. Patch by Victor Stinner.
+
+..
+
+.. bpo: 44955
+.. date: 2021-08-19-15-03-54
+.. nonce: 1mxFQS
+.. section: Library
+
+Method :meth:`~unittest.TestResult.stopTestRun` is now always called in pair
+with method :meth:`~unittest.TestResult.startTestRun` for
+:class:`~unittest.TestResult` objects implicitly created in
+:meth:`~unittest.TestCase.run`. Previously it was not called for test
+methods and classes decorated with a skipping decorator.
+
+..
+
+.. bpo: 38956
+.. date: 2021-08-09-13-17-10
+.. nonce: owWLNv
+.. section: Library
+
+:class:`argparse.BooleanOptionalAction`'s default value is no longer printed
+twice when used with :class:`argparse.ArgumentDefaultsHelpFormatter`.
+
+..
+
+.. bpo: 44581
+.. date: 2021-08-06-19-15-52
+.. nonce: oFDBTB
+.. section: Library
+
+Upgrade bundled pip to 21.2.3 and setuptools to 57.4.0
+
+..
+
+.. bpo: 44849
+.. date: 2021-08-06-13-00-28
+.. nonce: O78F_f
+.. section: Library
+
+Fix the :func:`os.set_inheritable` function on FreeBSD 14 for file
+descriptor opened with the :data:`~os.O_PATH` flag: ignore the
+:data:`~errno.EBADF` error on ``ioctl()``, fallback on the ``fcntl()``
+implementation. Patch by Victor Stinner.
+
+..
+
+.. bpo: 44605
+.. date: 2021-08-06-09-43-50
+.. nonce: q4YSBZ
+.. section: Library
+
+The @functools.total_ordering() decorator now works with metaclasses.
+
+..
+
+.. bpo: 44822
+.. date: 2021-08-04-12-29-00
+.. nonce: zePNXA
+.. section: Library
+
+:mod:`sqlite3` user-defined functions and aggregators returning
+:class:`strings <str>` with embedded NUL characters are no longer truncated.
+Patch by Erlend E. Aasland.
+
+..
+
+.. bpo: 44815
+.. date: 2021-08-03-15-02-28
+.. nonce: 9AmFfy
+.. section: Library
+
+Always show ``loop=`` arg deprecations in :func:`asyncio.gather` and
+:func:`asyncio.sleep`
+
+..
+
+.. bpo: 44806
+.. date: 2021-08-02-14-37-32
+.. nonce: wOW_Qn
+.. section: Library
+
+Non-protocol subclasses of :class:`typing.Protocol` ignore now the
+``__init__`` method inherited from protocol base classes.
+
+..
+
+.. bpo: 44667
+.. date: 2021-07-30-23-27-30
+.. nonce: tu0Xrv
+.. section: Library
+
+The :func:`tokenize.tokenize` doesn't incorrectly generate a ``NEWLINE``
+token if the source doesn't end with a new line character but the last line
+is a comment, as the function is already generating a ``NL`` token. Patch by
+Pablo Galindo
+
+..
+
+.. bpo: 42853
+.. date: 2021-07-28-15-50-59
+.. nonce: 8SYiF_
+.. section: Library
+
+Fix ``http.client.HTTPSConnection`` fails to download >2GiB data.
+
+..
+
+.. bpo: 44752
+.. date: 2021-07-27-22-11-29
+.. nonce: _bvbrZ
+.. section: Library
+
+:mod:`rcompleter` does not call :func:`getattr` on :class:`property` objects
+to avoid the side-effect of  evaluating the corresponding method.
+
+..
+
+.. bpo: 44720
+.. date: 2021-07-24-02-17-59
+.. nonce: shU5Qm
+.. section: Library
+
+``weakref.proxy`` objects referencing non-iterators now raise ``TypeError``
+rather than dereferencing the null ``tp_iternext`` slot and crashing.
+
+..
+
+.. bpo: 44704
+.. date: 2021-07-21-23-16-30
+.. nonce: iqHLxQ
+.. section: Library
+
+The implementation of ``collections.abc.Set._hash()`` now matches that of
+``frozenset.__hash__()``.
+
+..
+
+.. bpo: 44666
+.. date: 2021-07-21-10-43-22
+.. nonce: CEThkv
+.. section: Library
+
+Fixed issue in :func:`compileall.compile_file` when ``sys.stdout`` is
+redirected. Patch by Stefan H?lzl.
+
+..
+
+.. bpo: 40897
+.. date: 2021-07-16-13-40-31
+.. nonce: aveAre
+.. section: Library
+
+Give priority to using the current class constructor in
+:func:`inspect.signature`. Patch by Weipeng Hong.
+
+..
+
+.. bpo: 44608
+.. date: 2021-07-13-09-01-33
+.. nonce: R3IcM1
+.. section: Library
+
+Fix memory leak in :func:`_tkinter._flatten` if it is called with a sequence
+or set, but not list or tuple.
+
+..
+
+.. bpo: 41928
+.. date: 2021-07-09-07-14-37
+.. nonce: Q1jMrr
+.. section: Library
+
+Update :func:`shutil.copyfile` to raise :exc:`FileNotFoundError` instead of
+confusing :exc:`IsADirectoryError` when a path ending with a
+:const:`os.path.sep` does not exist; :func:`shutil.copy` and
+:func:`shutil.copy2` are also affected.
+
+..
+
+.. bpo: 44566
+.. date: 2021-07-05-18-13-25
+.. nonce: o51Bd1
+.. section: Library
+
+handle StopIteration subclass raised from @contextlib.contextmanager
+generator
+
+..
+
+.. bpo: 44558
+.. date: 2021-07-04-21-16-53
+.. nonce: cm7Slv
+.. section: Library
+
+Make the implementation consistency of :func:`~operator.indexOf` between C
+and Python versions. Patch by Dong-hee Na.
+
+..
+
+.. bpo: 41249
+.. date: 2021-07-04-11-33-34
+.. nonce: sHdwBE
+.. section: Library
+
+Fixes ``TypedDict`` to work with ``typing.get_type_hints()`` and postponed
+evaluation of annotations across modules.
+
+..
+
+.. bpo: 44461
+.. date: 2021-06-29-21-17-17
+.. nonce: acqRnV
+.. section: Library
+
+Fix bug with :mod:`pdb`'s handling of import error due to a package which
+does not have a ``__main__`` module
+
+..
+
+.. bpo: 42892
+.. date: 2021-06-24-19-16-20
+.. nonce: qvRNhI
+.. section: Library
+
+Fixed an exception thrown while parsing a malformed multipart email by
+:class:`email.message.EmailMessage`.
+
+..
+
+.. bpo: 27827
+.. date: 2021-06-12-21-25-35
+.. nonce: TMWh1i
+.. section: Library
+
+:meth:`pathlib.PureWindowsPath.is_reserved` now identifies a greater range
+of reserved filenames, including those with trailing spaces or colons.
+
+..
+
+.. bpo: 34266
+.. date: 2021-06-10-21-53-46
+.. nonce: k3fxnm
+.. section: Library
+
+Handle exceptions from parsing the arg of :mod:`pdb`'s run/restart command.
+
+..
+
+.. bpo: 27334
+.. date: 2021-05-18-00-17-21
+.. nonce: 32EJZi
+.. section: Library
+
+The :mod:`sqlite3` context manager now performs a rollback (thus releasing
+the database lock) if commit failed.  Patch by Luca Citi and Erlend E.
+Aasland.
+
+..
+
+.. bpo: 43853
+.. date: 2021-04-15-12-02-17
+.. nonce: XXCVAp
+.. section: Library
+
+Improved string handling for :mod:`sqlite3` user-defined functions and
+aggregates:
+
+* It is now possible to pass strings with embedded null characters to UDFs
+* Conversion failures now correctly raise :exc:`MemoryError`
+
+Patch by Erlend E. Aasland.
+
+..
+
+.. bpo: 43048
+.. date: 2021-02-06-05-34-01
+.. nonce: yCPUmo
+.. section: Library
+
+Handle `RecursionError` in :class:`~traceback.TracebackException`'s
+constructor, so that long exceptions chains are truncated instead of causing
+traceback formatting to fail.
+
+..
+
+.. bpo: 41402
+.. date: 2020-07-26-18-17-30
+.. nonce: YRkVkp
+.. section: Library
+
+Fix :meth:`email.message.EmailMessage.set_content` when called with binary
+data and ``7bit`` content transfer encoding.
+
+..
+
+.. bpo: 32695
+.. date: 2020-07-13-23-46-59
+.. nonce: tTqqXe
+.. section: Library
+
+The *compresslevel* and *preset* keyword arguments of :func:`tarfile.open`
+are now both documented and tested.
+
+..
+
+.. bpo: 34990
+.. date: 2020-04-24-20-39-38
+.. nonce: 3SmL9M
+.. section: Library
+
+Fixed a Y2k38 bug in the compileall module where it would fail to compile
+files with a modification time after the year 2038.
+
+..
+
+.. bpo: 38840
+.. date: 2020-01-16-23-41-16
+.. nonce: VzzYZz
+.. section: Library
+
+Fix ``test___all__`` on platforms lacking a shared memory implementation.
+
+..
+
+.. bpo: 30256
+.. date: 2019-09-25-13-54-41
+.. nonce: wBkzox
+.. section: Library
+
+Pass multiprocessing BaseProxy argument ``manager_owned`` through AutoProxy.
+
+..
+
+.. bpo: 27513
+.. date: 2019-06-03-23-53-25
+.. nonce: qITN7d
+.. section: Library
+
+:func:`email.utils.getaddresses` now accepts :class:`email.header.Header`
+objects along with string values. Patch by Zackery Spytz.
+
+..
+
+.. bpo: 33349
+.. date: 2018-04-24-14-25-07
+.. nonce: Y_0LIr
+.. section: Library
+
+lib2to3 now recognizes async generators everywhere.
+
+..
+
+.. bpo: 29298
+.. date: 2017-09-20-14-43-03
+.. nonce: _78CSN
+.. section: Library
+
+Fix ``TypeError`` when required subparsers without ``dest`` do not receive
+arguments. Patch by Anthony Sottile.
+
+..
+
+.. bpo: 44903
+.. date: 2021-08-13-19-08-03
+.. nonce: aJuvQF
+.. section: Documentation
+
+Removed the othergui.rst file, any references to it, and the list of GUI
+frameworks in the FAQ. In their place I've added links to the Python Wiki
+`page on GUI frameworks <https://wiki.python.org/moin/GuiProgramming>`.
+
+..
+
+.. bpo: 44756
+.. date: 2021-08-06-19-36-21
+.. nonce: 1Ngzon
+.. section: Documentation
+
+Reverted automated virtual environment creation on ``make html`` when
+building documentation. It turned out to be disruptive for downstream
+distributors.
+
+..
+
+.. bpo: 44693
+.. date: 2021-07-25-23-04-15
+.. nonce: JuCbNq
+.. section: Documentation
+
+Update the definition of __future__ in the glossary by replacing the
+confusing word "pseudo-module" with a more accurate description.
+
+..
+
+.. bpo: 35183
+.. date: 2021-07-22-08-28-03
+.. nonce: p9BWTB
+.. section: Documentation
+
+Add typical examples to os.path.splitext docs
+
+..
+
+.. bpo: 30511
+.. date: 2021-07-20-21-03-18
+.. nonce: eMFkRi
+.. section: Documentation
+
+Clarify that :func:`shutil.make_archive` is not thread-safe due to reliance
+on changing the current working directory.
+
+..
+
+.. bpo: 44561
+.. date: 2021-07-18-22-43-14
+.. nonce: T7HpWm
+.. section: Documentation
+
+Update of three expired hyperlinks in Doc/distributing/index.rst: "Project
+structure", "Building and packaging the project", and "Uploading the project
+to the Python Packaging Index".
+
+..
+
+.. bpo: 42958
+.. date: 2021-07-15-11-19-03
+.. nonce: gC5IHM
+.. section: Documentation
+
+Updated the docstring and docs of :func:`filecmp.cmp` to be more accurate
+and less confusing especially in respect to *shallow* arg.
+
+..
+
+.. bpo: 44558
+.. date: 2021-07-03-18-25-17
+.. nonce: 0pTknl
+.. section: Documentation
+
+Match the docstring and python implementation of :func:`~operator.countOf`
+to the behavior of its c implementation.
+
+..
+
+.. bpo: 44544
+.. date: 2021-07-02-14-02-29
+.. nonce: _5_aCz
+.. section: Documentation
+
+List all kwargs for :func:`textwrap.wrap`, :func:`textwrap.fill`, and
+:func:`textwrap.shorten`. Now, there are nav links to attributes of
+:class:`TextWrap`, which makes navigation much easier while minimizing
+duplication in the documentation.
+
+..
+
+.. bpo: 38062
+.. date: 2021-06-28-12-13-48
+.. nonce: 9Ehp9O
+.. section: Documentation
+
+Clarify that atexit uses equality comparisons internally.
+
+..
+
+.. bpo: 43066
+.. date: 2021-06-24-14-37-16
+.. nonce: Ti7ahX
+.. section: Documentation
+
+Added a warning to :mod:`zipfile` docs: filename arg with a leading slash
+may cause archive to be un-openable on Windows systems.
+
+..
+
+.. bpo: 27752
+.. date: 2021-06-18-18-04-53
+.. nonce: NEByNk
+.. section: Documentation
+
+Documentation of csv.Dialect is more descriptive.
+
+..
+
+.. bpo: 44453
+.. date: 2021-06-18-06-44-45
+.. nonce: 3PIkj2
+.. section: Documentation
+
+Fix documentation for the return type of :func:`sysconfig.get_path`.
+
+..
+
+.. bpo: 39498
+.. date: 2020-01-30-05-18-48
+.. nonce: Nu3sFL
+.. section: Documentation
+
+Add a "Security Considerations" index which links to standard library
+modules that have explicitly documented security considerations.
+
+..
+
+.. bpo: 33479
+.. date: 2018-05-19-15-59-29
+.. nonce: 4cLlxo
+.. section: Documentation
+
+Remove the unqualified claim that tkinter is threadsafe. It has not been
+true for several years and likely never was. An explanation of what is true
+may be added later, after more discussion, and possibly after patching
+_tkinter.c,
+
+..
+
+.. bpo: 25130
+.. date: 2021-08-27-22-37-19
+.. nonce: ig4oJe
+.. section: Tests
+
+Add calls of :func:`gc.collect` in tests to support PyPy.
+
+..
+
+.. bpo: 45011
+.. date: 2021-08-26-14-20-44
+.. nonce: mQZdXU
+.. section: Tests
+
+Made tests relying on the :mod:`_asyncio` C extension module optional to
+allow running on alternative Python implementations. Patch by Serhiy
+Storchaka.
+
+..
+
+.. bpo: 44949
+.. date: 2021-08-18-18-30-12
+.. nonce: VE5ENv
+.. section: Tests
+
+Fix auto history tests of test_readline: sometimes, the newline character is
+not written at the end, so don't expect it in the output.
+
+..
+
+.. bpo: 44852
+.. date: 2021-08-06-18-36-04
+.. nonce: sUL8YX
+.. section: Tests
+
+Add ability to wholesale silence DeprecationWarnings while running the
+regression test suite.
+
+..
+
+.. bpo: 40928
+.. date: 2021-08-06-00-07-15
+.. nonce: aIwb6G
+.. section: Tests
+
+Notify users running test_decimal regression tests on macOS of potential
+harmless "malloc can't allocate region" messages spewed by test_decimal.
+
+..
+
+.. bpo: 44734
+.. date: 2021-07-24-20-09-15
+.. nonce: KKsNOV
+.. section: Tests
+
+Fixed floating point precision issue in turtle tests.
+
+..
+
+.. bpo: 44708
+.. date: 2021-07-22-16-38-39
+.. nonce: SYNaac
+.. section: Tests
+
+Regression tests, when run with -w, are now re-running only the affected
+test methods instead of re-running the entire test file.
+
+..
+
+.. bpo: 30256
+.. date: 2019-09-25-18-10-10
+.. nonce: A5i76Q
+.. section: Tests
+
+Add test for nested queues when using ``multiprocessing`` shared objects
+``AutoProxy[Queue]`` inside ``ListProxy`` and ``DictProxy``
+
+..
+
+.. bpo: 44535
+.. date: 2021-06-30-02-32-46
+.. nonce: M9iN4-
+.. section: Build
+
+Enable building using a Visual Studio 2022 install on Windows.
+
+..
+
+.. bpo: 43298
+.. date: 2021-06-19-11-50-03
+.. nonce: 9ircMb
+.. section: Build
+
+Improved error message when building without a Windows SDK installed.
+
+..
+
+.. bpo: 45007
+.. date: 2021-08-27-23-50-02
+.. nonce: NIBlVG
+.. section: Windows
+
+Update to OpenSSL 1.1.1l in Windows build
+
+..
+
+.. bpo: 44572
+.. date: 2021-07-13-15-32-49
+.. nonce: gXvhDc
+.. section: Windows
+
+Avoid consuming standard input in the :mod:`platform` module
+
+..
+
+.. bpo: 40263
+.. date: 2020-04-13-15-20-28
+.. nonce: 1KKEbu
+.. section: Windows
+
+This is a follow-on bug from https://bugs.python.org/issue26903. Once that
+is applied we run into an off-by-one assertion problem. The assert was not
+correct.
+
+..
+
+.. bpo: 45007
+.. date: 2021-08-30-00-04-10
+.. nonce: pixqUB
+.. section: macOS
+
+Update macOS installer builds to use OpenSSL 1.1.1l.
+
+..
+
+.. bpo: 44689
+.. date: 2021-07-20-22-27-01
+.. nonce: mmT_xH
+.. section: macOS
+
+:meth:`ctypes.util.find_library` now works correctly on macOS 11 Big Sur
+even if Python is built on an older version of macOS.  Previously, when
+built on older macOS systems, ``find_library`` was not able to find  macOS
+system libraries when running on Big Sur due to changes in  how system
+libraries are stored.
+
+..
+
+.. bpo: 44756
+.. date: 2021-07-28-00-51-55
+.. nonce: pvAajB
+.. section: Tools/Demos
+
+In the Makefile for documentation (:file:`Doc/Makefile`), the ``build`` rule
+is dependent on the ``venv`` rule. Therefore, ``html``, ``latex``, and other
+build-dependent rules are also now dependent on ``venv``. The ``venv`` rule
+only performs an action if ``$(VENVDIR)`` does not exist.
+:file:`Doc/README.rst` was updated; most users now only need to type ``make
+html``.
diff --git a/Misc/NEWS.d/next/Build/2021-06-19-11-50-03.bpo-43298.9ircMb.rst b/Misc/NEWS.d/next/Build/2021-06-19-11-50-03.bpo-43298.9ircMb.rst
deleted file mode 100644
index 3bdc24b147a3ef..00000000000000
--- a/Misc/NEWS.d/next/Build/2021-06-19-11-50-03.bpo-43298.9ircMb.rst
+++ /dev/null
@@ -1 +0,0 @@
-Improved error message when building without a Windows SDK installed.
diff --git a/Misc/NEWS.d/next/Build/2021-06-30-02-32-46.bpo-44535.M9iN4-.rst b/Misc/NEWS.d/next/Build/2021-06-30-02-32-46.bpo-44535.M9iN4-.rst
deleted file mode 100644
index e06d0d304852f3..00000000000000
--- a/Misc/NEWS.d/next/Build/2021-06-30-02-32-46.bpo-44535.M9iN4-.rst
+++ /dev/null
@@ -1 +0,0 @@
-Enable building using a Visual Studio 2022 install on Windows.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-12-21-14-18-32.bpo-39091.dOexgQ.rst b/Misc/NEWS.d/next/Core and Builtins/2019-12-21-14-18-32.bpo-39091.dOexgQ.rst
deleted file mode 100644
index c3b4e810d658b2..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2019-12-21-14-18-32.bpo-39091.dOexgQ.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Fix crash when using passing a non-exception to a generator's ``throw()`` method. Patch by Noah Oxer
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-05-21-01-42-45.bpo-44184.9qOptC.rst b/Misc/NEWS.d/next/Core and Builtins/2021-05-21-01-42-45.bpo-44184.9qOptC.rst
deleted file mode 100644
index 3aba9a58475c61..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-05-21-01-42-45.bpo-44184.9qOptC.rst	
+++ /dev/null
@@ -1,3 +0,0 @@
-Fix a crash at Python exit when a deallocator function removes the last strong
-reference to a heap type.
-Patch by Victor Stinner.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-06-21-11-19-54.bpo-44472.Vvm1yn.rst b/Misc/NEWS.d/next/Core and Builtins/2021-06-21-11-19-54.bpo-44472.Vvm1yn.rst
deleted file mode 100644
index 34fa2a9e8615fa..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-06-21-11-19-54.bpo-44472.Vvm1yn.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Fix ltrace functionality when exceptions are raised. Patch by Pablo Galindo
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-06-29-11-49-29.bpo-44523.67-ZIP.rst b/Misc/NEWS.d/next/Core and Builtins/2021-06-29-11-49-29.bpo-44523.67-ZIP.rst
deleted file mode 100644
index aa51a7478583b1..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-06-29-11-49-29.bpo-44523.67-ZIP.rst	
+++ /dev/null
@@ -1,3 +0,0 @@
-Remove the pass-through for :func:`hash` of :class:`weakref.proxy` objects
-to prevent unintended consequences when the original referred object
-dies while the proxy is part of a hashable object. Patch by Pablo Galindo.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-07-04-23-38-51.bpo-44562.QdeRQo.rst b/Misc/NEWS.d/next/Core and Builtins/2021-07-04-23-38-51.bpo-44562.QdeRQo.rst
deleted file mode 100644
index 2fc65bcfdeef43..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-07-04-23-38-51.bpo-44562.QdeRQo.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Remove uses of :c:func:`PyObject_GC_Del` in error path when initializing
-:class:`types.GenericAlias`.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-07-21-15-26-56.bpo-44698.DA4_0o.rst b/Misc/NEWS.d/next/Core and Builtins/2021-07-21-15-26-56.bpo-44698.DA4_0o.rst
deleted file mode 100644
index ed389630c8ba11..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-07-21-15-26-56.bpo-44698.DA4_0o.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Fix undefined behaviour in complex object exponentiation.
\ No newline at end of file
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-07-01-26-12.bpo-44856.9rk3li.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-07-01-26-12.bpo-44856.9rk3li.rst
deleted file mode 100644
index 1111d01b726fa2..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-08-07-01-26-12.bpo-44856.9rk3li.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Fix reference leaks in the error paths of ``update_bases()`` and ``__build_class__``. Patch by Pablo Galindo.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-07-21-39-19.bpo-25782.B22lMx.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-07-21-39-19.bpo-25782.B22lMx.rst
deleted file mode 100644
index 1c52059f76c8f3..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-08-07-21-39-19.bpo-25782.B22lMx.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug where ``PyErr_SetObject`` hangs when the current exception has a cycle in its context chain.
\ No newline at end of file
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-09-14-29-52.bpo-33930.--5LQ-.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-09-14-29-52.bpo-33930.--5LQ-.rst
deleted file mode 100644
index 827dd3f8b65131..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-08-09-14-29-52.bpo-33930.--5LQ-.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix segmentation fault with deep recursion when cleaning method objects.
-Patch by Augusto Goulart and Pablo Galindo.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-09-16-16-03.bpo-44872.OKRlhK.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-09-16-16-03.bpo-44872.OKRlhK.rst
deleted file mode 100644
index 9a0d00018b2a7c..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-08-09-16-16-03.bpo-44872.OKRlhK.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Use new trashcan macros (Py_TRASHCAN_BEGIN/END) in frameobject.c instead of the old ones (Py_TRASHCAN_SAFE_BEGIN/END).
\ No newline at end of file
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-11-15-39-57.bpo-44885.i4noUO.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-11-15-39-57.bpo-44885.i4noUO.rst
deleted file mode 100644
index c6abd7363af711..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-08-11-15-39-57.bpo-44885.i4noUO.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Correct the ast locations of f-strings with format specs and repeated
-expressions. Patch by Pablo Galindo
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-15-10-39-06.bpo-44698.lITKNc.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-15-10-39-06.bpo-44698.lITKNc.rst
deleted file mode 100644
index f197253e10ec69..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-08-15-10-39-06.bpo-44698.lITKNc.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Restore behaviour of complex exponentiation with integer-valued exponent of
-type :class:`float` or :class:`complex`.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-18-19-09-28.bpo-44947.mcvGdS.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-18-19-09-28.bpo-44947.mcvGdS.rst
deleted file mode 100644
index d531ba9faf3de5..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-08-18-19-09-28.bpo-44947.mcvGdS.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Refine the syntax error for trailing commas in import statements. Patch by
-Pablo Galindo.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-19-14-43-24.bpo-44954.dLn3lg.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-19-14-43-24.bpo-44954.dLn3lg.rst
deleted file mode 100644
index 4cdeb34b8b6116..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-08-19-14-43-24.bpo-44954.dLn3lg.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed a corner case bug where the result of ``float.fromhex('0x.8p-1074')``
-was rounded the wrong way.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-23-19-55-08.bpo-44962.J00ftt.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-23-19-55-08.bpo-44962.J00ftt.rst
deleted file mode 100644
index 6b4b9dfd8bc3c0..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-08-23-19-55-08.bpo-44962.J00ftt.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Fix a race in WeakKeyDictionary, WeakValueDictionary and WeakSet when two threads attempt to commit the last pending removal. This fixes asyncio.create_task and fixes a data loss in asyncio.run where shutdown_asyncgens is not run
\ No newline at end of file
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-26-18-44-03.bpo-45018.pu8H9L.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-26-18-44-03.bpo-45018.pu8H9L.rst
deleted file mode 100644
index 5bf13ef06f34c3..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-08-26-18-44-03.bpo-45018.pu8H9L.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Fixed pickling of range iterators that iterated for over 2**32 times.
diff --git a/Misc/NEWS.d/next/Documentation/2018-05-19-15-59-29.bpo-33479.4cLlxo.rst b/Misc/NEWS.d/next/Documentation/2018-05-19-15-59-29.bpo-33479.4cLlxo.rst
deleted file mode 100644
index db4973d3923957..00000000000000
--- a/Misc/NEWS.d/next/Documentation/2018-05-19-15-59-29.bpo-33479.4cLlxo.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Remove the unqualified claim that tkinter is threadsafe. It has not been
-true for several years and likely never was. An explanation of what is true
-may be added later, after more discussion, and possibly after patching
-_tkinter.c,
diff --git a/Misc/NEWS.d/next/Documentation/2020-01-30-05-18-48.bpo-39498.Nu3sFL.rst b/Misc/NEWS.d/next/Documentation/2020-01-30-05-18-48.bpo-39498.Nu3sFL.rst
deleted file mode 100644
index a3e899a80a0fc2..00000000000000
--- a/Misc/NEWS.d/next/Documentation/2020-01-30-05-18-48.bpo-39498.Nu3sFL.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add a "Security Considerations" index which links to standard library modules that have explicitly documented security considerations.
diff --git a/Misc/NEWS.d/next/Documentation/2021-06-18-06-44-45.bpo-44453.3PIkj2.rst b/Misc/NEWS.d/next/Documentation/2021-06-18-06-44-45.bpo-44453.3PIkj2.rst
deleted file mode 100644
index fd72cf525c32fb..00000000000000
--- a/Misc/NEWS.d/next/Documentation/2021-06-18-06-44-45.bpo-44453.3PIkj2.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix documentation for the return type of :func:`sysconfig.get_path`.
diff --git a/Misc/NEWS.d/next/Documentation/2021-06-18-18-04-53.bpo-27752.NEByNk.rst b/Misc/NEWS.d/next/Documentation/2021-06-18-18-04-53.bpo-27752.NEByNk.rst
deleted file mode 100644
index ccb7767a6b6936..00000000000000
--- a/Misc/NEWS.d/next/Documentation/2021-06-18-18-04-53.bpo-27752.NEByNk.rst
+++ /dev/null
@@ -1 +0,0 @@
-Documentation of csv.Dialect is more descriptive.
diff --git a/Misc/NEWS.d/next/Documentation/2021-06-24-14-37-16.bpo-43066.Ti7ahX.rst b/Misc/NEWS.d/next/Documentation/2021-06-24-14-37-16.bpo-43066.Ti7ahX.rst
deleted file mode 100644
index 3e38522839e8be..00000000000000
--- a/Misc/NEWS.d/next/Documentation/2021-06-24-14-37-16.bpo-43066.Ti7ahX.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Added a warning to :mod:`zipfile` docs: filename arg with a leading slash may cause archive to
-be un-openable on Windows systems.
diff --git a/Misc/NEWS.d/next/Documentation/2021-06-28-12-13-48.bpo-38062.9Ehp9O.rst b/Misc/NEWS.d/next/Documentation/2021-06-28-12-13-48.bpo-38062.9Ehp9O.rst
deleted file mode 100644
index 1d90096e20bfa4..00000000000000
--- a/Misc/NEWS.d/next/Documentation/2021-06-28-12-13-48.bpo-38062.9Ehp9O.rst
+++ /dev/null
@@ -1 +0,0 @@
-Clarify that atexit uses equality comparisons internally.
diff --git a/Misc/NEWS.d/next/Documentation/2021-07-02-14-02-29.bpo-44544._5_aCz.rst b/Misc/NEWS.d/next/Documentation/2021-07-02-14-02-29.bpo-44544._5_aCz.rst
deleted file mode 100644
index 4bb69977e0c1a4..00000000000000
--- a/Misc/NEWS.d/next/Documentation/2021-07-02-14-02-29.bpo-44544._5_aCz.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-List all kwargs for :func:`textwrap.wrap`, :func:`textwrap.fill`, and
-:func:`textwrap.shorten`. Now, there are nav links to attributes of
-:class:`TextWrap`, which makes navigation much easier while minimizing
-duplication in the documentation.
diff --git a/Misc/NEWS.d/next/Documentation/2021-07-03-18-25-17.bpo-44558.0pTknl.rst b/Misc/NEWS.d/next/Documentation/2021-07-03-18-25-17.bpo-44558.0pTknl.rst
deleted file mode 100644
index a12a49ccd80cc2..00000000000000
--- a/Misc/NEWS.d/next/Documentation/2021-07-03-18-25-17.bpo-44558.0pTknl.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Match the docstring and python implementation of :func:`~operator.countOf` to the behavior
-of its c implementation.
diff --git a/Misc/NEWS.d/next/Documentation/2021-07-15-11-19-03.bpo-42958.gC5IHM.rst b/Misc/NEWS.d/next/Documentation/2021-07-15-11-19-03.bpo-42958.gC5IHM.rst
deleted file mode 100644
index c93b84d095526e..00000000000000
--- a/Misc/NEWS.d/next/Documentation/2021-07-15-11-19-03.bpo-42958.gC5IHM.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Updated the docstring and docs of :func:`filecmp.cmp` to be more accurate
-and less confusing especially in respect to *shallow* arg.
diff --git a/Misc/NEWS.d/next/Documentation/2021-07-18-22-43-14.bpo-44561.T7HpWm.rst b/Misc/NEWS.d/next/Documentation/2021-07-18-22-43-14.bpo-44561.T7HpWm.rst
deleted file mode 100644
index 53238533edabbf..00000000000000
--- a/Misc/NEWS.d/next/Documentation/2021-07-18-22-43-14.bpo-44561.T7HpWm.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Update of three expired hyperlinks in Doc/distributing/index.rst:
-"Project structure", "Building and packaging the project", and "Uploading the
-project to the Python Packaging Index".
diff --git a/Misc/NEWS.d/next/Documentation/2021-07-20-21-03-18.bpo-30511.eMFkRi.rst b/Misc/NEWS.d/next/Documentation/2021-07-20-21-03-18.bpo-30511.eMFkRi.rst
deleted file mode 100644
index a358fb9cc2860b..00000000000000
--- a/Misc/NEWS.d/next/Documentation/2021-07-20-21-03-18.bpo-30511.eMFkRi.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Clarify that :func:`shutil.make_archive` is not thread-safe due to
-reliance on changing the current working directory.
diff --git a/Misc/NEWS.d/next/Documentation/2021-07-22-08-28-03.bpo-35183.p9BWTB.rst b/Misc/NEWS.d/next/Documentation/2021-07-22-08-28-03.bpo-35183.p9BWTB.rst
deleted file mode 100644
index 02c5fe82611fbf..00000000000000
--- a/Misc/NEWS.d/next/Documentation/2021-07-22-08-28-03.bpo-35183.p9BWTB.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add typical examples to os.path.splitext docs
\ No newline at end of file
diff --git a/Misc/NEWS.d/next/Documentation/2021-07-25-23-04-15.bpo-44693.JuCbNq.rst b/Misc/NEWS.d/next/Documentation/2021-07-25-23-04-15.bpo-44693.JuCbNq.rst
deleted file mode 100644
index 614abb412df8ea..00000000000000
--- a/Misc/NEWS.d/next/Documentation/2021-07-25-23-04-15.bpo-44693.JuCbNq.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Update the definition of __future__ in the glossary by replacing the confusing
-word "pseudo-module" with a more accurate description.
diff --git a/Misc/NEWS.d/next/Documentation/2021-08-06-19-36-21.bpo-44756.1Ngzon.rst b/Misc/NEWS.d/next/Documentation/2021-08-06-19-36-21.bpo-44756.1Ngzon.rst
deleted file mode 100644
index ca2e1b9b53b752..00000000000000
--- a/Misc/NEWS.d/next/Documentation/2021-08-06-19-36-21.bpo-44756.1Ngzon.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Reverted automated virtual environment creation on ``make html`` when
-building documentation. It turned out to be disruptive for downstream
-distributors.
diff --git a/Misc/NEWS.d/next/Documentation/2021-08-13-19-08-03.bpo-44903.aJuvQF.rst b/Misc/NEWS.d/next/Documentation/2021-08-13-19-08-03.bpo-44903.aJuvQF.rst
deleted file mode 100644
index e357405085ca06..00000000000000
--- a/Misc/NEWS.d/next/Documentation/2021-08-13-19-08-03.bpo-44903.aJuvQF.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Removed the othergui.rst file, any references to it, and the list of GUI
-frameworks in the FAQ. In their place I've added links to the Python Wiki
-`page on GUI frameworks <https://wiki.python.org/moin/GuiProgramming>`.
diff --git a/Misc/NEWS.d/next/Library/2017-09-20-14-43-03.bpo-29298._78CSN.rst b/Misc/NEWS.d/next/Library/2017-09-20-14-43-03.bpo-29298._78CSN.rst
deleted file mode 100644
index e84c6de02cd27e..00000000000000
--- a/Misc/NEWS.d/next/Library/2017-09-20-14-43-03.bpo-29298._78CSN.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix ``TypeError`` when required subparsers without ``dest`` do not receive
-arguments. Patch by Anthony Sottile.
diff --git a/Misc/NEWS.d/next/Library/2018-04-24-14-25-07.bpo-33349.Y_0LIr.rst b/Misc/NEWS.d/next/Library/2018-04-24-14-25-07.bpo-33349.Y_0LIr.rst
deleted file mode 100644
index be68b3ea7c4a2a..00000000000000
--- a/Misc/NEWS.d/next/Library/2018-04-24-14-25-07.bpo-33349.Y_0LIr.rst
+++ /dev/null
@@ -1 +0,0 @@
-lib2to3 now recognizes async generators everywhere.
diff --git a/Misc/NEWS.d/next/Library/2019-06-03-23-53-25.bpo-27513.qITN7d.rst b/Misc/NEWS.d/next/Library/2019-06-03-23-53-25.bpo-27513.qITN7d.rst
deleted file mode 100644
index 90d49bb2a993f1..00000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-03-23-53-25.bpo-27513.qITN7d.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-:func:`email.utils.getaddresses` now accepts
-:class:`email.header.Header` objects along with string values.
-Patch by Zackery Spytz.
diff --git a/Misc/NEWS.d/next/Library/2019-09-25-13-54-41.bpo-30256.wBkzox.rst b/Misc/NEWS.d/next/Library/2019-09-25-13-54-41.bpo-30256.wBkzox.rst
deleted file mode 100644
index 698b0e8a61c0d8..00000000000000
--- a/Misc/NEWS.d/next/Library/2019-09-25-13-54-41.bpo-30256.wBkzox.rst
+++ /dev/null
@@ -1 +0,0 @@
-Pass multiprocessing BaseProxy argument ``manager_owned`` through AutoProxy.
diff --git a/Misc/NEWS.d/next/Library/2020-01-16-23-41-16.bpo-38840.VzzYZz.rst b/Misc/NEWS.d/next/Library/2020-01-16-23-41-16.bpo-38840.VzzYZz.rst
deleted file mode 100644
index 727f62b52a710b..00000000000000
--- a/Misc/NEWS.d/next/Library/2020-01-16-23-41-16.bpo-38840.VzzYZz.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix ``test___all__`` on platforms lacking a shared memory implementation.
diff --git a/Misc/NEWS.d/next/Library/2020-04-24-20-39-38.bpo-34990.3SmL9M.rst b/Misc/NEWS.d/next/Library/2020-04-24-20-39-38.bpo-34990.3SmL9M.rst
deleted file mode 100644
index d420b5dce1e3b5..00000000000000
--- a/Misc/NEWS.d/next/Library/2020-04-24-20-39-38.bpo-34990.3SmL9M.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed a Y2k38 bug in the compileall module where it would fail to compile
-files with a modification time after the year 2038.
diff --git a/Misc/NEWS.d/next/Library/2020-07-13-23-46-59.bpo-32695.tTqqXe.rst b/Misc/NEWS.d/next/Library/2020-07-13-23-46-59.bpo-32695.tTqqXe.rst
deleted file mode 100644
index c71316ed656a2b..00000000000000
--- a/Misc/NEWS.d/next/Library/2020-07-13-23-46-59.bpo-32695.tTqqXe.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-The *compresslevel* and *preset* keyword arguments of :func:`tarfile.open`
-are now both documented and tested.
diff --git a/Misc/NEWS.d/next/Library/2020-07-26-18-17-30.bpo-41402.YRkVkp.rst b/Misc/NEWS.d/next/Library/2020-07-26-18-17-30.bpo-41402.YRkVkp.rst
deleted file mode 100644
index 45585a469e7247..00000000000000
--- a/Misc/NEWS.d/next/Library/2020-07-26-18-17-30.bpo-41402.YRkVkp.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix :meth:`email.message.EmailMessage.set_content` when called with binary data and ``7bit`` content transfer encoding.
diff --git a/Misc/NEWS.d/next/Library/2021-02-06-05-34-01.bpo-43048.yCPUmo.rst b/Misc/NEWS.d/next/Library/2021-02-06-05-34-01.bpo-43048.yCPUmo.rst
deleted file mode 100644
index 99f6b2bbe9e30b..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-02-06-05-34-01.bpo-43048.yCPUmo.rst
+++ /dev/null
@@ -1 +0,0 @@
-Handle `RecursionError` in :class:`~traceback.TracebackException`'s constructor, so that long exceptions chains are truncated instead of causing traceback formatting to fail.
diff --git a/Misc/NEWS.d/next/Library/2021-04-15-12-02-17.bpo-43853.XXCVAp.rst b/Misc/NEWS.d/next/Library/2021-04-15-12-02-17.bpo-43853.XXCVAp.rst
deleted file mode 100644
index a0164c4665a056..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-04-15-12-02-17.bpo-43853.XXCVAp.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-Improved string handling for :mod:`sqlite3` user-defined functions and
-aggregates:
-
-* It is now possible to pass strings with embedded null characters to UDFs
-* Conversion failures now correctly raise :exc:`MemoryError`
-
-Patch by Erlend E. Aasland.
diff --git a/Misc/NEWS.d/next/Library/2021-05-18-00-17-21.bpo-27334.32EJZi.rst b/Misc/NEWS.d/next/Library/2021-05-18-00-17-21.bpo-27334.32EJZi.rst
deleted file mode 100644
index dc0cdf33ec5acf..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-05-18-00-17-21.bpo-27334.32EJZi.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-The :mod:`sqlite3` context manager now performs a rollback (thus releasing the
-database lock) if commit failed.  Patch by Luca Citi and Erlend E. Aasland.
diff --git a/Misc/NEWS.d/next/Library/2021-06-10-21-53-46.bpo-34266.k3fxnm.rst b/Misc/NEWS.d/next/Library/2021-06-10-21-53-46.bpo-34266.k3fxnm.rst
deleted file mode 100644
index 22ef84e9626ad6..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-06-10-21-53-46.bpo-34266.k3fxnm.rst
+++ /dev/null
@@ -1 +0,0 @@
-Handle exceptions from parsing the arg of :mod:`pdb`'s run/restart command.
diff --git a/Misc/NEWS.d/next/Library/2021-06-12-21-25-35.bpo-27827.TMWh1i.rst b/Misc/NEWS.d/next/Library/2021-06-12-21-25-35.bpo-27827.TMWh1i.rst
deleted file mode 100644
index 1b8cc04533ed85..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-06-12-21-25-35.bpo-27827.TMWh1i.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-:meth:`pathlib.PureWindowsPath.is_reserved` now identifies a greater range of
-reserved filenames, including those with trailing spaces or colons.
diff --git a/Misc/NEWS.d/next/Library/2021-06-24-19-16-20.bpo-42892.qvRNhI.rst b/Misc/NEWS.d/next/Library/2021-06-24-19-16-20.bpo-42892.qvRNhI.rst
deleted file mode 100644
index 3c70b0534ecabf..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-06-24-19-16-20.bpo-42892.qvRNhI.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed an exception thrown while parsing a malformed multipart email by :class:`email.message.EmailMessage`.
diff --git a/Misc/NEWS.d/next/Library/2021-06-29-21-17-17.bpo-44461.acqRnV.rst b/Misc/NEWS.d/next/Library/2021-06-29-21-17-17.bpo-44461.acqRnV.rst
deleted file mode 100644
index 02e25e928b9cff..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-06-29-21-17-17.bpo-44461.acqRnV.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug with :mod:`pdb`'s handling of import error due to a package which does not have a ``__main__`` module
\ No newline at end of file
diff --git a/Misc/NEWS.d/next/Library/2021-07-04-11-33-34.bpo-41249.sHdwBE.rst b/Misc/NEWS.d/next/Library/2021-07-04-11-33-34.bpo-41249.sHdwBE.rst
deleted file mode 100644
index 06dae4a6e93565..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-07-04-11-33-34.bpo-41249.sHdwBE.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixes ``TypedDict`` to work with ``typing.get_type_hints()`` and postponed evaluation of
-annotations across modules.
diff --git a/Misc/NEWS.d/next/Library/2021-07-04-21-16-53.bpo-44558.cm7Slv.rst b/Misc/NEWS.d/next/Library/2021-07-04-21-16-53.bpo-44558.cm7Slv.rst
deleted file mode 100644
index 647a70490d1bac..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-07-04-21-16-53.bpo-44558.cm7Slv.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Make the implementation consistency of :func:`~operator.indexOf` between
-C and Python versions. Patch by Dong-hee Na.
diff --git a/Misc/NEWS.d/next/Library/2021-07-05-18-13-25.bpo-44566.o51Bd1.rst b/Misc/NEWS.d/next/Library/2021-07-05-18-13-25.bpo-44566.o51Bd1.rst
deleted file mode 100644
index 3b00a1b715feef..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-07-05-18-13-25.bpo-44566.o51Bd1.rst
+++ /dev/null
@@ -1 +0,0 @@
-handle StopIteration subclass raised from @contextlib.contextmanager generator
\ No newline at end of file
diff --git a/Misc/NEWS.d/next/Library/2021-07-09-07-14-37.bpo-41928.Q1jMrr.rst b/Misc/NEWS.d/next/Library/2021-07-09-07-14-37.bpo-41928.Q1jMrr.rst
deleted file mode 100644
index e6bd758980b003..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-07-09-07-14-37.bpo-41928.Q1jMrr.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Update :func:`shutil.copyfile` to raise :exc:`FileNotFoundError` instead of
-confusing :exc:`IsADirectoryError` when a path ending with a
-:const:`os.path.sep` does not exist; :func:`shutil.copy` and
-:func:`shutil.copy2` are also affected.
diff --git a/Misc/NEWS.d/next/Library/2021-07-13-09-01-33.bpo-44608.R3IcM1.rst b/Misc/NEWS.d/next/Library/2021-07-13-09-01-33.bpo-44608.R3IcM1.rst
deleted file mode 100644
index e0cf948f3cba68..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-07-13-09-01-33.bpo-44608.R3IcM1.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix memory leak in :func:`_tkinter._flatten` if it is called with a sequence
-or set, but not list or tuple.
diff --git a/Misc/NEWS.d/next/Library/2021-07-16-13-40-31.bpo-40897.aveAre.rst b/Misc/NEWS.d/next/Library/2021-07-16-13-40-31.bpo-40897.aveAre.rst
deleted file mode 100644
index 04f1465f0ac67f..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-07-16-13-40-31.bpo-40897.aveAre.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Give priority to using the current class constructor in
-:func:`inspect.signature`. Patch by Weipeng Hong.
diff --git a/Misc/NEWS.d/next/Library/2021-07-21-10-43-22.bpo-44666.CEThkv.rst b/Misc/NEWS.d/next/Library/2021-07-21-10-43-22.bpo-44666.CEThkv.rst
deleted file mode 100644
index ab2ef22d0c4558..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-07-21-10-43-22.bpo-44666.CEThkv.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed issue in :func:`compileall.compile_file` when ``sys.stdout`` is redirected.
-Patch by Stefan H?lzl.
diff --git a/Misc/NEWS.d/next/Library/2021-07-21-23-16-30.bpo-44704.iqHLxQ.rst b/Misc/NEWS.d/next/Library/2021-07-21-23-16-30.bpo-44704.iqHLxQ.rst
deleted file mode 100644
index 586661876dedba..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-07-21-23-16-30.bpo-44704.iqHLxQ.rst
+++ /dev/null
@@ -1 +0,0 @@
-The implementation of ``collections.abc.Set._hash()`` now matches that of ``frozenset.__hash__()``.
\ No newline at end of file
diff --git a/Misc/NEWS.d/next/Library/2021-07-24-02-17-59.bpo-44720.shU5Qm.rst b/Misc/NEWS.d/next/Library/2021-07-24-02-17-59.bpo-44720.shU5Qm.rst
deleted file mode 100644
index 83694f3988ae9a..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-07-24-02-17-59.bpo-44720.shU5Qm.rst
+++ /dev/null
@@ -1 +0,0 @@
-``weakref.proxy`` objects referencing non-iterators now raise ``TypeError`` rather than dereferencing the null ``tp_iternext`` slot and crashing.
\ No newline at end of file
diff --git a/Misc/NEWS.d/next/Library/2021-07-27-22-11-29.bpo-44752._bvbrZ.rst b/Misc/NEWS.d/next/Library/2021-07-27-22-11-29.bpo-44752._bvbrZ.rst
deleted file mode 100644
index 0d8a2cd6a5e0db..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-07-27-22-11-29.bpo-44752._bvbrZ.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-:mod:`rcompleter` does not call :func:`getattr` on :class:`property` objects
-to avoid the side-effect of  evaluating the corresponding method.
diff --git a/Misc/NEWS.d/next/Library/2021-07-28-15-50-59.bpo-42853.8SYiF_.rst b/Misc/NEWS.d/next/Library/2021-07-28-15-50-59.bpo-42853.8SYiF_.rst
deleted file mode 100644
index aaf8af0fdfa993..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-07-28-15-50-59.bpo-42853.8SYiF_.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix ``http.client.HTTPSConnection`` fails to download >2GiB data.
diff --git a/Misc/NEWS.d/next/Library/2021-07-30-23-27-30.bpo-44667.tu0Xrv.rst b/Misc/NEWS.d/next/Library/2021-07-30-23-27-30.bpo-44667.tu0Xrv.rst
deleted file mode 100644
index 5b7e20e0afdf5e..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-07-30-23-27-30.bpo-44667.tu0Xrv.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-The :func:`tokenize.tokenize` doesn't incorrectly generate a ``NEWLINE``
-token if the source doesn't end with a new line character but the last line
-is a comment, as the function is already generating a ``NL`` token. Patch by
-Pablo Galindo
diff --git a/Misc/NEWS.d/next/Library/2021-08-02-14-37-32.bpo-44806.wOW_Qn.rst b/Misc/NEWS.d/next/Library/2021-08-02-14-37-32.bpo-44806.wOW_Qn.rst
deleted file mode 100644
index 6d818c3fc57982..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-08-02-14-37-32.bpo-44806.wOW_Qn.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Non-protocol subclasses of :class:`typing.Protocol` ignore now the
-``__init__`` method inherited from protocol base classes.
diff --git a/Misc/NEWS.d/next/Library/2021-08-03-15-02-28.bpo-44815.9AmFfy.rst b/Misc/NEWS.d/next/Library/2021-08-03-15-02-28.bpo-44815.9AmFfy.rst
deleted file mode 100644
index 63dfbf3cd37946..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-08-03-15-02-28.bpo-44815.9AmFfy.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Always show ``loop=`` arg deprecations in :func:`asyncio.gather` and
-:func:`asyncio.sleep`
diff --git a/Misc/NEWS.d/next/Library/2021-08-04-12-29-00.bpo-44822.zePNXA.rst b/Misc/NEWS.d/next/Library/2021-08-04-12-29-00.bpo-44822.zePNXA.rst
deleted file mode 100644
index d078142886d2e0..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-08-04-12-29-00.bpo-44822.zePNXA.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-:mod:`sqlite3` user-defined functions and aggregators returning
-:class:`strings <str>` with embedded NUL characters are no longer
-truncated. Patch by Erlend E. Aasland.
diff --git a/Misc/NEWS.d/next/Library/2021-08-06-09-43-50.bpo-44605.q4YSBZ.rst b/Misc/NEWS.d/next/Library/2021-08-06-09-43-50.bpo-44605.q4YSBZ.rst
deleted file mode 100644
index 93783923e15b3d..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-08-06-09-43-50.bpo-44605.q4YSBZ.rst
+++ /dev/null
@@ -1 +0,0 @@
-The @functools.total_ordering() decorator now works with metaclasses.
diff --git a/Misc/NEWS.d/next/Library/2021-08-06-13-00-28.bpo-44849.O78F_f.rst b/Misc/NEWS.d/next/Library/2021-08-06-13-00-28.bpo-44849.O78F_f.rst
deleted file mode 100644
index b1f225485ddef5..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-08-06-13-00-28.bpo-44849.O78F_f.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Fix the :func:`os.set_inheritable` function on FreeBSD 14 for file descriptor
-opened with the :data:`~os.O_PATH` flag: ignore the :data:`~errno.EBADF`
-error on ``ioctl()``, fallback on the ``fcntl()`` implementation. Patch by
-Victor Stinner.
diff --git a/Misc/NEWS.d/next/Library/2021-08-06-19-15-52.bpo-44581.oFDBTB.rst b/Misc/NEWS.d/next/Library/2021-08-06-19-15-52.bpo-44581.oFDBTB.rst
deleted file mode 100644
index 99f08065b9d2f0..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-08-06-19-15-52.bpo-44581.oFDBTB.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade bundled pip to 21.2.3 and setuptools to 57.4.0
diff --git a/Misc/NEWS.d/next/Library/2021-08-09-13-17-10.bpo-38956.owWLNv.rst b/Misc/NEWS.d/next/Library/2021-08-09-13-17-10.bpo-38956.owWLNv.rst
deleted file mode 100644
index 3f57c0ea5d5a38..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-08-09-13-17-10.bpo-38956.owWLNv.rst
+++ /dev/null
@@ -1 +0,0 @@
-:class:`argparse.BooleanOptionalAction`'s default value is no longer printed twice when used with :class:`argparse.ArgumentDefaultsHelpFormatter`.
diff --git a/Misc/NEWS.d/next/Library/2021-08-19-15-03-54.bpo-44955.1mxFQS.rst b/Misc/NEWS.d/next/Library/2021-08-19-15-03-54.bpo-44955.1mxFQS.rst
deleted file mode 100644
index 57d1da533cde0d..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-08-19-15-03-54.bpo-44955.1mxFQS.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Method :meth:`~unittest.TestResult.stopTestRun` is now always called in pair
-with method :meth:`~unittest.TestResult.startTestRun` for
-:class:`~unittest.TestResult` objects implicitly created in
-:meth:`~unittest.TestCase.run`. Previously it was not called for test
-methods and classes decorated with a skipping decorator.
diff --git a/Misc/NEWS.d/next/Library/2021-08-20-11-30-52.bpo-44449.1r2-lS.rst b/Misc/NEWS.d/next/Library/2021-08-20-11-30-52.bpo-44449.1r2-lS.rst
deleted file mode 100644
index 52f01541fca6a7..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-08-20-11-30-52.bpo-44449.1r2-lS.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix a crash in the signal handler of the :mod:`faulthandler` module: no
-longer modify the reference count of frame objects. Patch by Victor Stinner.
diff --git a/Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst b/Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst
deleted file mode 100644
index 55cc409d0da30f..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-08-26-16-25-48.bpo-45001.tn_dKp.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Made email date parsing more robust against malformed input, namely a
-whitespace-only ``Date:`` header. Patch by Wouter Bolsterlee.
diff --git a/Misc/NEWS.d/next/Library/2021-08-27-23-40-51.bpo-43913.Uo1Gt5.rst b/Misc/NEWS.d/next/Library/2021-08-27-23-40-51.bpo-43913.Uo1Gt5.rst
deleted file mode 100644
index cf3d5ee0e456f1..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-08-27-23-40-51.bpo-43913.Uo1Gt5.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-Fix bugs in cleaning up classes and modules in :mod:`unittest`:
-
-* Functions registered with :func:`~unittest.addModuleCleanup` were not called unless the user defines ``tearDownModule()`` in their test module.
-* Functions registered with :meth:`~unittest.TestCase.addClassCleanup` were not called if ``tearDownClass`` is set to ``None``.
-* Buffering in :class:`~unittest.TestResult` did not work with functions registered with ``addClassCleanup()`` and ``addModuleCleanup()``.
-* Errors in functions registered with ``addClassCleanup()`` and ``addModuleCleanup()`` were not handled correctly in buffered and debug modes.
-* Errors in ``setUpModule()`` and functions registered with ``addModuleCleanup()`` were reported in wrong order.
-* And several lesser bugs.
diff --git a/Misc/NEWS.d/next/Library/2021-08-29-14-49-22.bpo-41620.WJ6PFL.rst b/Misc/NEWS.d/next/Library/2021-08-29-14-49-22.bpo-41620.WJ6PFL.rst
deleted file mode 100644
index 7674d4c9532a27..00000000000000
--- a/Misc/NEWS.d/next/Library/2021-08-29-14-49-22.bpo-41620.WJ6PFL.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-:meth:`~unittest.TestCase.run` now always return a
-:class:`~unittest.TestResult` instance. Previously it returned ``None`` if
-the test class or method was decorated with a skipping decorator.
diff --git a/Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst b/Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst
deleted file mode 100644
index e897d6cd3641d7..00000000000000
--- a/Misc/NEWS.d/next/Security/2021-05-08-11-50-46.bpo-43124.2CTM6M.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Made the internal ``putcmd`` function in :mod:`smtplib` sanitize input for
-presence of ``\r`` and ``\n`` characters to avoid (unlikely) command injection.
diff --git a/Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst b/Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst
deleted file mode 100644
index e32563d2535c7e..00000000000000
--- a/Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Update the vendored copy of libexpat to 2.4.1 (from 2.2.8) to get the fix
-for the CVE-2013-0340 "Billion Laughs" vulnerability. This copy is most used
-on Windows and macOS.
diff --git a/Misc/NEWS.d/next/Security/2021-06-29-23-40-22.bpo-41180.uTWHv_.rst b/Misc/NEWS.d/next/Security/2021-06-29-23-40-22.bpo-41180.uTWHv_.rst
deleted file mode 100644
index 88b70c7cea2610..00000000000000
--- a/Misc/NEWS.d/next/Security/2021-06-29-23-40-22.bpo-41180.uTWHv_.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Add auditing events to the :mod:`marshal` module, and stop raising
-``code.__init__`` events for every unmarshalled code object. Directly
-instantiated code objects will continue to raise an event, and audit event
-handlers should inspect or collect the raw marshal data. This reduces a
-significant performance overhead when loading from ``.pyc`` files.
diff --git a/Misc/NEWS.d/next/Security/2021-08-29-12-39-44.bpo-42278.jvmQz_.rst b/Misc/NEWS.d/next/Security/2021-08-29-12-39-44.bpo-42278.jvmQz_.rst
deleted file mode 100644
index db880cd9026da4..00000000000000
--- a/Misc/NEWS.d/next/Security/2021-08-29-12-39-44.bpo-42278.jvmQz_.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Replaced usage of :func:`tempfile.mktemp` with
-:class:`~tempfile.TemporaryDirectory` to avoid a potential race condition.
diff --git a/Misc/NEWS.d/next/Tests/2019-09-25-18-10-10.bpo-30256.A5i76Q.rst b/Misc/NEWS.d/next/Tests/2019-09-25-18-10-10.bpo-30256.A5i76Q.rst
deleted file mode 100644
index 4a7cfd52fcea22..00000000000000
--- a/Misc/NEWS.d/next/Tests/2019-09-25-18-10-10.bpo-30256.A5i76Q.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Add test for nested queues when using ``multiprocessing`` shared objects
-``AutoProxy[Queue]`` inside ``ListProxy`` and ``DictProxy``
diff --git a/Misc/NEWS.d/next/Tests/2021-07-22-16-38-39.bpo-44708.SYNaac.rst b/Misc/NEWS.d/next/Tests/2021-07-22-16-38-39.bpo-44708.SYNaac.rst
deleted file mode 100644
index 8b26c4de64b983..00000000000000
--- a/Misc/NEWS.d/next/Tests/2021-07-22-16-38-39.bpo-44708.SYNaac.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Regression tests, when run with -w, are now re-running only the affected
-test methods instead of re-running the entire test file.
diff --git a/Misc/NEWS.d/next/Tests/2021-07-24-20-09-15.bpo-44734.KKsNOV.rst b/Misc/NEWS.d/next/Tests/2021-07-24-20-09-15.bpo-44734.KKsNOV.rst
deleted file mode 100644
index 94e9ce08f4bf6b..00000000000000
--- a/Misc/NEWS.d/next/Tests/2021-07-24-20-09-15.bpo-44734.KKsNOV.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed floating point precision issue in turtle tests.
diff --git a/Misc/NEWS.d/next/Tests/2021-08-06-00-07-15.bpo-40928.aIwb6G.rst b/Misc/NEWS.d/next/Tests/2021-08-06-00-07-15.bpo-40928.aIwb6G.rst
deleted file mode 100644
index c9a5e1b01e58aa..00000000000000
--- a/Misc/NEWS.d/next/Tests/2021-08-06-00-07-15.bpo-40928.aIwb6G.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Notify users running test_decimal regression tests on macOS of potential
-harmless "malloc can't allocate region" messages spewed by test_decimal.
diff --git a/Misc/NEWS.d/next/Tests/2021-08-06-18-36-04.bpo-44852.sUL8YX.rst b/Misc/NEWS.d/next/Tests/2021-08-06-18-36-04.bpo-44852.sUL8YX.rst
deleted file mode 100644
index 41b5c2fb51c5c7..00000000000000
--- a/Misc/NEWS.d/next/Tests/2021-08-06-18-36-04.bpo-44852.sUL8YX.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Add ability to wholesale silence DeprecationWarnings while running the
-regression test suite.
diff --git a/Misc/NEWS.d/next/Tests/2021-08-18-18-30-12.bpo-44949.VE5ENv.rst b/Misc/NEWS.d/next/Tests/2021-08-18-18-30-12.bpo-44949.VE5ENv.rst
deleted file mode 100644
index 7fdf1810b165e5..00000000000000
--- a/Misc/NEWS.d/next/Tests/2021-08-18-18-30-12.bpo-44949.VE5ENv.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix auto history tests of test_readline: sometimes, the newline character is
-not written at the end, so don't expect it in the output.
diff --git a/Misc/NEWS.d/next/Tests/2021-08-26-14-20-44.bpo-45011.mQZdXU.rst b/Misc/NEWS.d/next/Tests/2021-08-26-14-20-44.bpo-45011.mQZdXU.rst
deleted file mode 100644
index 64e701e2f29f49..00000000000000
--- a/Misc/NEWS.d/next/Tests/2021-08-26-14-20-44.bpo-45011.mQZdXU.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Made tests relying on the :mod:`_asyncio` C extension module optional to
-allow running on alternative Python implementations. Patch by Serhiy
-Storchaka.
diff --git a/Misc/NEWS.d/next/Tests/2021-08-27-22-37-19.bpo-25130.ig4oJe.rst b/Misc/NEWS.d/next/Tests/2021-08-27-22-37-19.bpo-25130.ig4oJe.rst
deleted file mode 100644
index 43ce68bef46099..00000000000000
--- a/Misc/NEWS.d/next/Tests/2021-08-27-22-37-19.bpo-25130.ig4oJe.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add calls of :func:`gc.collect` in tests to support PyPy.
diff --git a/Misc/NEWS.d/next/Tools-Demos/2021-07-28-00-51-55.bpo-44756.pvAajB.rst b/Misc/NEWS.d/next/Tools-Demos/2021-07-28-00-51-55.bpo-44756.pvAajB.rst
deleted file mode 100644
index 4734f1f5c41691..00000000000000
--- a/Misc/NEWS.d/next/Tools-Demos/2021-07-28-00-51-55.bpo-44756.pvAajB.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-In the Makefile for documentation (:file:`Doc/Makefile`), the ``build`` rule
-is dependent on the ``venv`` rule. Therefore, ``html``, ``latex``, and other
-build-dependent rules are also now dependent on ``venv``. The ``venv`` rule
-only performs an action if ``$(VENVDIR)`` does not exist.
-:file:`Doc/README.rst` was updated; most users now only need to type ``make
-html``.
diff --git a/Misc/NEWS.d/next/Windows/2020-04-13-15-20-28.bpo-40263.1KKEbu.rst b/Misc/NEWS.d/next/Windows/2020-04-13-15-20-28.bpo-40263.1KKEbu.rst
deleted file mode 100644
index 0c31606d4928c8..00000000000000
--- a/Misc/NEWS.d/next/Windows/2020-04-13-15-20-28.bpo-40263.1KKEbu.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-This is a follow-on bug from https://bugs.python.org/issue26903. Once that
-is applied we run into an off-by-one assertion problem. The assert was not
-correct.
diff --git a/Misc/NEWS.d/next/Windows/2021-07-13-15-32-49.bpo-44572.gXvhDc.rst b/Misc/NEWS.d/next/Windows/2021-07-13-15-32-49.bpo-44572.gXvhDc.rst
deleted file mode 100644
index 6e074c59b8445b..00000000000000
--- a/Misc/NEWS.d/next/Windows/2021-07-13-15-32-49.bpo-44572.gXvhDc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Avoid consuming standard input in the :mod:`platform` module
\ No newline at end of file
diff --git a/Misc/NEWS.d/next/Windows/2021-08-27-23-50-02.bpo-45007.NIBlVG.rst b/Misc/NEWS.d/next/Windows/2021-08-27-23-50-02.bpo-45007.NIBlVG.rst
deleted file mode 100644
index fa076ee4c8b8ad..00000000000000
--- a/Misc/NEWS.d/next/Windows/2021-08-27-23-50-02.bpo-45007.NIBlVG.rst
+++ /dev/null
@@ -1 +0,0 @@
-Update to OpenSSL 1.1.1l in Windows build
diff --git a/Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst b/Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst
deleted file mode 100644
index b1e878d1ee44af..00000000000000
--- a/Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst
+++ /dev/null
@@ -1,5 +0,0 @@
- :meth:`ctypes.util.find_library` now works correctly on macOS 11 Big Sur
- even if Python is built on an older version of macOS.  Previously, when
- built on older macOS systems, ``find_library`` was not able to find
- macOS system libraries when running on Big Sur due to changes in
- how system libraries are stored.
diff --git a/Misc/NEWS.d/next/macOS/2021-08-30-00-04-10.bpo-45007.pixqUB.rst b/Misc/NEWS.d/next/macOS/2021-08-30-00-04-10.bpo-45007.pixqUB.rst
deleted file mode 100644
index e4f1ac6de313d4..00000000000000
--- a/Misc/NEWS.d/next/macOS/2021-08-30-00-04-10.bpo-45007.pixqUB.rst
+++ /dev/null
@@ -1 +0,0 @@
-Update macOS installer builds to use OpenSSL 1.1.1l.
diff --git a/README.rst b/README.rst
index 87dc1937176e4b..a419856dfb4e39 100644
--- a/README.rst
+++ b/README.rst
@@ -1,4 +1,4 @@
-This is Python version 3.9.6
+This is Python version 3.9.7
 ============================
 
 .. image:: https://travis-ci.org/python/cpython.svg?branch=3.9


From webhook-mailer at python.org  Mon Aug 30 19:25:21 2021
From: webhook-mailer at python.org (ericsnowcurrently)
Date: Mon, 30 Aug 2021 23:25:21 -0000
Subject: [Python-checkins] bpo-45019: Add a tool to generate list of modules
 to include for frozen modules (gh-27980)
Message-ID: <mailman.1277.1630365923.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/044e8d866fdde3804bdb2282c7d23a8074de8f6f
commit: 044e8d866fdde3804bdb2282c7d23a8074de8f6f
branch: main
author: Eric Snow <ericsnowcurrently at gmail.com>
committer: ericsnowcurrently <ericsnowcurrently at gmail.com>
date: 2021-08-30T17:25:11-06:00
summary:

bpo-45019: Add a tool to generate list of modules to include for frozen modules (gh-27980)

Frozen modules must be added to several files in order to work properly. Before this change this had to be done manually. Here we add a tool to generate the relevant lines in those files instead. This helps us avoid mistakes and omissions.

https://bugs.python.org/issue45019

files:
A Misc/NEWS.d/next/Build/2021-08-26-13-10-46.bpo-45019.e0mo49.rst
A PCbuild/_freeze_module.vcxproj
A PCbuild/_freeze_module.vcxproj.filters
A Programs/_freeze_module.c
A Python/frozen_modules/hello.h
A Python/frozen_modules/importlib__bootstrap.h
A Python/frozen_modules/importlib__bootstrap_external.h
A Python/frozen_modules/zipimport.h
A Tools/scripts/freeze_modules.py
D PCbuild/_freeze_importlib.vcxproj
D PCbuild/_freeze_importlib.vcxproj.filters
D Programs/_freeze_importlib.c
D Python/frozen_hello.h
D Python/importlib.h
D Python/importlib_external.h
D Python/importlib_zipimport.h
M .gitattributes
M .github/workflows/build.yml
M .gitignore
M Doc/c-api/init.rst
M Makefile.pre.in
M PCbuild/pcbuild.proj
M PCbuild/pcbuild.sln
M PCbuild/readme.txt
M Python/frozen.c
M Tools/scripts/update_file.py

diff --git a/.gitattributes b/.gitattributes
index 68566e899249f6..b9c08cdd7d65a7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -46,8 +46,7 @@ Modules/clinic/*.h          linguist-generated=true
 Objects/clinic/*.h          linguist-generated=true
 PC/clinic/*.h               linguist-generated=true
 Python/clinic/*.h           linguist-generated=true
-Python/importlib.h          linguist-generated=true
-Python/importlib_external.h linguist-generated=true
+Python/frozen_modules/*.h   linguist-generated=true
 Include/internal/pycore_ast.h   linguist-generated=true
 Python/Python-ast.c         linguist-generated=true
 Include/opcode.h            linguist-generated=true
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c5d967dec7e4b7..05bdf2445a2341 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -71,6 +71,7 @@ jobs:
           make regen-stdlib-module-names
       - name: Check for changes
         run: |
+          git add -u
           changes=$(git status --porcelain)
           # Check for changes in regenerated files
           if ! test -z "$changes"
diff --git a/.gitignore b/.gitignore
index a96be67962217e..0ed4c8bdd0ccff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,7 +68,7 @@ Modules/Setup.config
 Modules/Setup.local
 Modules/config.c
 Modules/ld_so_aix
-Programs/_freeze_importlib
+Programs/_freeze_module
 Programs/_testembed
 PC/python_nt*.h
 PC/pythonnt_rc*.h
diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst
index 60564241bfd61e..2fcbcc8d77be45 100644
--- a/Doc/c-api/init.rst
+++ b/Doc/c-api/init.rst
@@ -110,7 +110,7 @@ to 1 and ``-bb`` sets :c:data:`Py_BytesWarningFlag` to 2.
    Suppress error messages when calculating the module search path in
    :c:func:`Py_GetPath`.
 
-   Private flag used by ``_freeze_importlib`` and ``frozenmain`` programs.
+   Private flag used by ``_freeze_module`` and ``frozenmain`` programs.
 
 .. c:var:: int Py_HashRandomizationFlag
 
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 1007f440759b1a..804d0192bc5fdb 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -574,8 +574,8 @@ coverage-lcov:
 	@echo "lcov report at $(COVERAGE_REPORT)/index.html"
 	@echo
 
-# Force regeneration of parser and importlib
-coverage-report: regen-token regen-importlib
+# Force regeneration of parser and frozen modules
+coverage-report: regen-token regen-frozen
 	@ # build with coverage info
 	$(MAKE) coverage
 	@ # run tests, ignore failures
@@ -734,45 +734,60 @@ Programs/_testembed: Programs/_testembed.o $(LIBRARY_DEPS)
 	$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
 
 ############################################################################
-# Importlib
+# frozen modules (including importlib)
 
-Programs/_freeze_importlib.o: Programs/_freeze_importlib.c Makefile
+Programs/_freeze_module.o: Programs/_freeze_module.c Makefile
 
-Programs/_freeze_importlib: Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN)
-	$(LINKCC) $(PY_CORE_LDFLAGS) -o $@ Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS)
+Programs/_freeze_module: Programs/_freeze_module.o $(LIBRARY_OBJS_OMIT_FROZEN)
+	$(LINKCC) $(PY_CORE_LDFLAGS) -o $@ Programs/_freeze_module.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS)
 
+Tools/scripts/freeze_modules.py: Programs/_freeze_module
+
+.PHONY: regen-frozen
+regen-frozen: Tools/scripts/freeze_modules.py $(FROZEN_FILES)
+	$(PYTHON_FOR_REGEN) $(srcdir)/Tools/scripts/freeze_modules.py
+	@echo "The Makefile was updated, you may need to re-run make."
+
+# BEGIN: freezing modules
+
+Python/frozen_modules/importlib__bootstrap.h: $(srcdir)/Programs/_freeze_module $(srcdir)/Lib/importlib/_bootstrap.py
+	$(srcdir)/Programs/_freeze_module importlib._bootstrap \
+		$(srcdir)/Lib/importlib/_bootstrap.py \
+		$(srcdir)/Python/frozen_modules/importlib__bootstrap.h
+
+Python/frozen_modules/importlib__bootstrap_external.h: $(srcdir)/Programs/_freeze_module $(srcdir)/Lib/importlib/_bootstrap_external.py
+	$(srcdir)/Programs/_freeze_module importlib._bootstrap_external \
+		$(srcdir)/Lib/importlib/_bootstrap_external.py \
+		$(srcdir)/Python/frozen_modules/importlib__bootstrap_external.h
+
+Python/frozen_modules/zipimport.h: $(srcdir)/Programs/_freeze_module $(srcdir)/Lib/zipimport.py
+	$(srcdir)/Programs/_freeze_module zipimport \
+		$(srcdir)/Lib/zipimport.py \
+		$(srcdir)/Python/frozen_modules/zipimport.h
+
+Python/frozen_modules/hello.h: $(srcdir)/Programs/_freeze_module $(srcdir)/Tools/freeze/flag.py
+	$(srcdir)/Programs/_freeze_module hello \
+		$(srcdir)/Tools/freeze/flag.py \
+		$(srcdir)/Python/frozen_modules/hello.h
+
+# END: freezing modules
+
+# We keep this renamed target around for folks with muscle memory.
 .PHONY: regen-importlib
-regen-importlib: Programs/_freeze_importlib
-	# Regenerate Python/importlib_external.h
-	# from Lib/importlib/_bootstrap_external.py using _freeze_importlib
-	./Programs/_freeze_importlib importlib._bootstrap_external \
-	    $(srcdir)/Lib/importlib/_bootstrap_external.py \
-	    $(srcdir)/Python/importlib_external.h.new
-	$(UPDATE_FILE) $(srcdir)/Python/importlib_external.h $(srcdir)/Python/importlib_external.h.new
-	# Regenerate Python/importlib.h from Lib/importlib/_bootstrap.py
-	# using _freeze_importlib
-	./Programs/_freeze_importlib importlib._bootstrap \
-	    $(srcdir)/Lib/importlib/_bootstrap.py \
-	    $(srcdir)/Python/importlib.h.new
-	$(UPDATE_FILE) $(srcdir)/Python/importlib.h $(srcdir)/Python/importlib.h.new
-	# Regenerate Python/importlib_zipimport.h from Lib/zipimport.py
-	# using _freeze_importlib
-	./Programs/_freeze_importlib zipimport \
-	    $(srcdir)/Lib/zipimport.py \
-	    $(srcdir)/Python/importlib_zipimport.h.new
-	$(UPDATE_FILE) $(srcdir)/Python/importlib_zipimport.h $(srcdir)/Python/importlib_zipimport.h.new
+regen-importlib: regen-frozen
 
+############################################################################
+# ABI
 
 regen-limited-abi: all
 	$(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/stable_abi.py --generate-all $(srcdir)/Misc/stable_abi.txt
 
-
 ############################################################################
 # Regenerate all generated files
 
 regen-all: regen-opcode regen-opcode-targets regen-typeslots \
-	regen-token regen-ast regen-keyword regen-importlib clinic \
-	regen-pegen-metaparser regen-pegen regen-frozen regen-test-frozenmain
+	regen-token regen-ast regen-keyword regen-frozen clinic \
+	regen-pegen-metaparser regen-pegen regen-test-frozenmain
 	@echo
 	@echo "Note: make regen-stdlib-module-names and autoconf should be run manually"
 
@@ -884,15 +899,6 @@ regen-opcode:
 		$(srcdir)/Include/opcode.h.new
 	$(UPDATE_FILE) $(srcdir)/Include/opcode.h $(srcdir)/Include/opcode.h.new
 
-.PHONY: regen-frozen
-regen-frozen: Programs/_freeze_importlib
-	# Regenerate code for frozen module "__hello__".
-	./Programs/_freeze_importlib hello \
-		$(srcdir)/Tools/freeze/flag.py \
-		$(srcdir)/Python/frozen_hello.h.new
-	$(UPDATE_FILE) $(srcdir)/Python/frozen_hello.h \
-		$(srcdir)/Python/frozen_hello.h.new
-
 .PHONY: regen-token
 regen-token:
 	# Regenerate Doc/library/token-list.inc from Grammar/Tokens
@@ -995,8 +1001,15 @@ regen-opcode-targets:
 Python/ceval.o: $(srcdir)/Python/opcode_targets.h $(srcdir)/Python/ceval_gil.h \
 		$(srcdir)/Python/condvar.h
 
-Python/frozen.o: $(srcdir)/Python/importlib.h $(srcdir)/Python/importlib_external.h \
-		$(srcdir)/Python/importlib_zipimport.h $(srcdir)/Python/frozen_hello.h
+# FROZEN_FILES is auto-generated by Tools/scripts/freeze_modules.py.
+FROZEN_FILES = \
+		$(srcdir)/Python/frozen_modules/importlib__bootstrap.h \
+		$(srcdir)/Python/frozen_modules/importlib__bootstrap_external.h \
+		$(srcdir)/Python/frozen_modules/zipimport.h \
+		$(srcdir)/Python/frozen_modules/hello.h
+# End FROZEN_FILES
+
+Python/frozen.o: $(FROZEN_FILES)
 
 # Generate DTrace probe macros, then rename them (PYTHON_ -> PyDTrace_) to
 # follow our naming conventions. dtrace(1) uses the output filename to generate
@@ -1918,7 +1931,7 @@ clean-retain-profile: pycremoval
 	find build -name '*.py[co]' -exec rm -f {} ';' || true
 	-rm -f pybuilddir.txt
 	-rm -f Lib/lib2to3/*Grammar*.pickle
-	-rm -f Programs/_testembed Programs/_freeze_importlib
+	-rm -f Programs/_testembed Programs/_freeze_module
 	-find build -type f -a ! -name '*.gc??' -exec rm -f {} ';'
 	-rm -f Include/pydtrace_probes.h
 	-rm -f profile-gen-stamp
diff --git a/Misc/NEWS.d/next/Build/2021-08-26-13-10-46.bpo-45019.e0mo49.rst b/Misc/NEWS.d/next/Build/2021-08-26-13-10-46.bpo-45019.e0mo49.rst
new file mode 100644
index 00000000000000..d11c6451462bd5
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2021-08-26-13-10-46.bpo-45019.e0mo49.rst
@@ -0,0 +1,3 @@
+Generate lines in relevant files for frozen modules.  Up until now each of
+the files had to be edited manually.  This change makes it easier to add to
+and modify the frozen modules.
diff --git a/PCbuild/_freeze_importlib.vcxproj b/PCbuild/_freeze_module.vcxproj
similarity index 79%
rename from PCbuild/_freeze_importlib.vcxproj
rename to PCbuild/_freeze_module.vcxproj
index e437412a161ce5..a0bedf49e69906 100644
--- a/PCbuild/_freeze_importlib.vcxproj
+++ b/PCbuild/_freeze_module.vcxproj
@@ -69,7 +69,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{19C0C13F-47CA-4432-AFF3-799A296A4DDC}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <RootNamespace>_freeze_importlib</RootNamespace>
+    <RootNamespace>_freeze_module</RootNamespace>
     <SupportPGO>false</SupportPGO>
   </PropertyGroup>
   <Import Project="python.props" />
@@ -95,7 +95,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\Programs\_freeze_importlib.c" />
+    <ClCompile Include="..\Programs\_freeze_module.c" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="pythoncore.vcxproj">
@@ -108,31 +108,33 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <!-- BEGIN frozen modules -->
     <None Include="..\Lib\importlib\_bootstrap.py">
       <ModName>importlib._bootstrap</ModName>
-      <IntFile>$(IntDir)importlib.g.h</IntFile>
-      <OutFile>$(PySourcePath)Python\importlib.h</OutFile>
+      <IntFile>$(IntDir)importlib__bootstrap.g.h</IntFile>
+      <OutFile>$(PySourcePath)Python\frozen_modules\importlib__bootstrap.h</OutFile>
     </None>
     <None Include="..\Lib\importlib\_bootstrap_external.py">
       <ModName>importlib._bootstrap_external</ModName>
-      <IntFile>$(IntDir)importlib_external.g.h</IntFile>
-      <OutFile>$(PySourcePath)Python\importlib_external.h</OutFile>
+      <IntFile>$(IntDir)importlib__bootstrap_external.g.h</IntFile>
+      <OutFile>$(PySourcePath)Python\frozen_modules\importlib__bootstrap_external.h</OutFile>
     </None>
     <None Include="..\Lib\zipimport.py">
       <ModName>zipimport</ModName>
-      <IntFile>$(IntDir)importlib_zipimport.g.h</IntFile>
-      <OutFile>$(PySourcePath)Python\importlib_zipimport.h</OutFile>
+      <IntFile>$(IntDir)zipimport.g.h</IntFile>
+      <OutFile>$(PySourcePath)Python\frozen_modules\zipimport.h</OutFile>
     </None>
     <None Include="..\Tools\freeze\flag.py">
       <ModName>hello</ModName>
-      <IntFile>$(IntDir)frozen_hello.g.h</IntFile>
-      <OutFile>$(PySourcePath)Python\frozen_hello.h</OutFile>
+      <IntFile>$(IntDir)ello.g.h</IntFile>
+      <OutFile>$(PySourcePath)Python\frozen_modules\hello.h</OutFile>
     </None>
+    <!-- END frozen modules -->
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-  <Target Name="_RebuildImportLib">
+  <Target Name="_RebuildFrozen">
     <Exec Command='"$(TargetPath)" "%(None.ModName)" "%(None.FullPath)" "%(None.IntFile)"' />
     
     <Copy SourceFiles="%(None.IntFile)"
@@ -143,15 +145,18 @@
 
     <Message Text="Updated files: @(_Updated->'%(Filename)%(Extension)',', ')"
              Condition="'@(_Updated)' != ''" Importance="high" />
-    <Warning Text="Frozen importlib files were updated. Please rebuild to pick up the changes.%0D%0A%0D%0AIf you are not developing on Windows but you see this error on a continuous integration build, please run 'make regen-all' and commit anything that changes."
+    <Warning Text="Frozen modules (e.g. importlib) were updated. Please rebuild to pick up the changes.%0D%0A%0D%0AIf you are not developing on Windows but you see this error on a continuous integration build, please run 'make regen-all' and commit anything that changes."
              Condition="'@(_Updated)' != '' and $(Configuration) == 'Debug'" />
-    <Error Text="Frozen importlib files were updated. Please rebuild to pick up the changes.%0D%0A%0D%0AIf you are not developing on Windows but you see this error on a continuous integration build, please run 'make regen-all' and commit anything that changes."
+    <Error Text="Frozen (e.g. importlib) files were updated. Please rebuild to pick up the changes.%0D%0A%0D%0AIf you are not developing on Windows but you see this error on a continuous integration build, please run 'make regen-all' and commit anything that changes."
            Condition="'@(_Updated)' != '' and $(Configuration) == 'Release'" />
   </Target>
+  <Target Name="RebuildFrozen" AfterTargets="AfterBuild" Condition="$(Configuration) == 'Debug' or $(Configuration) == 'Release'"
+          DependsOnTargets="_RebuildFrozen">
+  </Target>
   <Target Name="RebuildImportLib" AfterTargets="AfterBuild" Condition="$(Configuration) == 'Debug' or $(Configuration) == 'Release'"
-          DependsOnTargets="_RebuildImportLib">
+          DependsOnTargets="_RebuildFrozen">
   </Target>
-  <Target Name="_CleanImportLib" BeforeTargets="CoreClean">
+  <Target Name="_CleanFrozen" BeforeTargets="CoreClean">
     <ItemGroup>
       <Clean Include="%(None.IntFile)" />
     </ItemGroup>
diff --git a/PCbuild/_freeze_importlib.vcxproj.filters b/PCbuild/_freeze_module.vcxproj.filters
similarity index 76%
rename from PCbuild/_freeze_importlib.vcxproj.filters
rename to PCbuild/_freeze_module.vcxproj.filters
index 3ee9eb750d67e8..bed7920fdba638 100644
--- a/PCbuild/_freeze_importlib.vcxproj.filters
+++ b/PCbuild/_freeze_module.vcxproj.filters
@@ -10,19 +10,24 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\Programs\_freeze_importlib.c">
+    <ClCompile Include="..\Programs\_freeze_module.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <!-- BEGIN frozen modules -->
     <None Include="..\Lib\importlib\_bootstrap.py">
-      <Filter>Source Files</Filter>
+      <Filter>Python Files</Filter>
+    </None>
+    <None Include="..\Lib\importlib\_bootstrap_external.py">
+      <Filter>Python Files</Filter>
     </None>
     <None Include="..\Lib\zipimport.py">
       <Filter>Python Files</Filter>
     </None>
-    <None Include="..\Lib\importlib\_bootstrap_external.py">
+    <None Include="..\Tools\freeze\flag.py">
       <Filter>Python Files</Filter>
     </None>
+    <!-- END frozen modules -->
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/PCbuild/pcbuild.proj b/PCbuild/pcbuild.proj
index 8e7088d47d2aed..f464ad3b18e44c 100644
--- a/PCbuild/pcbuild.proj
+++ b/PCbuild/pcbuild.proj
@@ -72,8 +72,8 @@
       <BuildInParallel>false</BuildInParallel>
     </Projects>
 
-    <!-- _freeze_importlib -->
-    <Projects2 Condition="$(Platform) != 'ARM' and $(Platform) != 'ARM64'" Include="_freeze_importlib.vcxproj" />
+    <!-- _freeze_module -->
+    <Projects2 Condition="$(Platform) != 'ARM' and $(Platform) != 'ARM64'" Include="_freeze_module.vcxproj" />
     <!-- python[w].exe -->
     <Projects2 Include="python.vcxproj;pythonw.vcxproj" />
     <Projects2 Include="python_uwp.vcxproj;pythonw_uwp.vcxproj" Condition="$(IncludeUwp)" />
diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln
index 3507b972797c96..c774e049717352 100644
--- a/PCbuild/pcbuild.sln
+++ b/PCbuild/pcbuild.sln
@@ -75,7 +75,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pywlauncher", "pywlauncher.
 		{7B2727B5-5A3F-40EE-A866-43A13CD31446} = {7B2727B5-5A3F-40EE-A866-43A13CD31446}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_freeze_importlib", "_freeze_importlib.vcxproj", "{19C0C13F-47CA-4432-AFF3-799A296A4DDC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_freeze_module", "_freeze_module.vcxproj", "{19C0C13F-47CA-4432-AFF3-799A296A4DDC}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_overlapped", "_overlapped.vcxproj", "{EB6E69DD-04BF-4543-9B92-49FAABCEAC2E}"
 EndProject
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 6c25522ea48c00..5ecded06e58893 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -115,9 +115,10 @@ _testembed
 
 These are miscellaneous sub-projects that don't really fit the other
 categories:
-_freeze_importlib
-    _freeze_importlib.exe, used to regenerate Python\importlib.h after
-    changes have been made to Lib\importlib\_bootstrap.py
+_freeze_module
+    _freeze_module.exe, used to regenerate frozen modules in Python
+    after changes have been made to the corresponding source files
+    (e.g. Lib\importlib\_bootstrap.py).
 pyshellext
     pyshellext.dll, the shell extension deployed with the launcher
 python3dll
diff --git a/Programs/_freeze_importlib.c b/Programs/_freeze_module.c
similarity index 53%
rename from Programs/_freeze_importlib.c
rename to Programs/_freeze_module.c
index 2e4ccbb154a414..7e9f02aec8a0fa 100644
--- a/Programs/_freeze_importlib.c
+++ b/Programs/_freeze_module.c
@@ -1,5 +1,10 @@
 /* This is built as a stand-alone executable by the Makefile, and helps turn
-   Lib/importlib/_bootstrap.py into a frozen module in Python/importlib.h
+   modules into frozen modules (like Lib/importlib/_bootstrap.py
+   into Python/importlib.h).
+
+   This is used directly by Tools/scripts/freeze_modules.py, and indirectly by "make regen-frozen".
+
+   See Python/frozen.c for more info.
 */
 
 #include <Python.h>
@@ -28,54 +33,11 @@ const struct _frozen *PyImport_FrozenModules;
 #endif
 
 static const char header[] =
-    "/* Auto-generated by Programs/_freeze_importlib.c */";
+    "/* Auto-generated by Programs/_freeze_module.c */";
 
-int
-main(int argc, char *argv[])
+static void
+runtime_init(void)
 {
-    const char *name, *inpath, *outpath;
-    char buf[100];
-    FILE *infile = NULL, *outfile = NULL;
-    struct _Py_stat_struct stat;
-    size_t text_size, data_size, i, n;
-    char *text = NULL;
-    unsigned char *data;
-    PyObject *code = NULL, *marshalled = NULL;
-
-    PyImport_FrozenModules = _PyImport_FrozenModules;
-
-    if (argc != 4) {
-        fprintf(stderr, "need to specify the name, input and output paths\n");
-        return 2;
-    }
-    name = argv[1];
-    inpath = argv[2];
-    outpath = argv[3];
-    infile = fopen(inpath, "rb");
-    if (infile == NULL) {
-        fprintf(stderr, "cannot open '%s' for reading\n", inpath);
-        goto error;
-    }
-    if (_Py_fstat_noraise(fileno(infile), &stat)) {
-        fprintf(stderr, "cannot fstat '%s'\n", inpath);
-        goto error;
-    }
-    text_size = (size_t)stat.st_size;
-    text = (char *) malloc(text_size + 1);
-    if (text == NULL) {
-        fprintf(stderr, "could not allocate %ld bytes\n", (long) text_size);
-        goto error;
-    }
-    n = fread(text, 1, text_size, infile);
-    fclose(infile);
-    infile = NULL;
-    if (n < text_size) {
-        fprintf(stderr, "read too short: got %ld instead of %ld bytes\n",
-                (long) n, (long) text_size);
-        goto error;
-    }
-    text[text_size] = '\0';
-
     PyConfig config;
     PyConfig_InitIsolatedConfig(&config);
 
@@ -83,7 +45,7 @@ main(int argc, char *argv[])
 
     PyStatus status;
     status = PyConfig_SetString(&config, &config.program_name,
-                                L"./_freeze_importlib");
+                                L"./_freeze_module");
     if (PyStatus_Exception(status)) {
         PyConfig_Clear(&config);
         Py_ExitStatusException(status);
@@ -98,39 +60,93 @@ main(int argc, char *argv[])
     if (PyStatus_Exception(status)) {
         Py_ExitStatusException(status);
     }
+}
 
-    sprintf(buf, "<frozen %s>", name);
-    code = Py_CompileStringExFlags(text, buf, Py_file_input, NULL, 0);
-    if (code == NULL)
-        goto error;
-    free(text);
-    text = NULL;
+static const char *
+read_text(const char *inpath)
+{
+    FILE *infile = fopen(inpath, "rb");
+    if (infile == NULL) {
+        fprintf(stderr, "cannot open '%s' for reading\n", inpath);
+        return NULL;
+    }
 
-    marshalled = PyMarshal_WriteObjectToString(code, Py_MARSHAL_VERSION);
-    Py_CLEAR(code);
-    if (marshalled == NULL)
-        goto error;
+    struct _Py_stat_struct stat;
+    if (_Py_fstat_noraise(fileno(infile), &stat)) {
+        fprintf(stderr, "cannot fstat '%s'\n", inpath);
+        fclose(infile);
+        return NULL;
+    }
+    size_t text_size = (size_t)stat.st_size;
 
-    assert(PyBytes_CheckExact(marshalled));
-    data = (unsigned char *) PyBytes_AS_STRING(marshalled);
-    data_size = PyBytes_GET_SIZE(marshalled);
+    char *text = (char *) malloc(text_size + 1);
+    if (text == NULL) {
+        fprintf(stderr, "could not allocate %ld bytes\n", (long) text_size);
+        fclose(infile);
+        return NULL;
+    }
+    size_t n = fread(text, 1, text_size, infile);
+    fclose(infile);
 
-    /* Open the file in text mode. The hg checkout should be using the eol extension,
-       which in turn should cause the EOL style match the C library's text mode */
-    outfile = fopen(outpath, "w");
-    if (outfile == NULL) {
-        fprintf(stderr, "cannot open '%s' for writing\n", outpath);
-        goto error;
+    if (n < text_size) {
+        fprintf(stderr, "read too short: got %ld instead of %ld bytes\n",
+                (long) n, (long) text_size);
+        free(text);
+        return NULL;
     }
-    fprintf(outfile, "%s\n", header);
-    for (i = n = 0; name[i] != '\0'; i++) {
-        if (name[i] != '.') {
-            buf[n++] = name[i];
+
+    text[text_size] = '\0';
+    return (const char *)text;
+}
+
+static PyObject *
+compile_and_marshal(const char *name, const char *text)
+{
+    char *filename = (char *) malloc(strlen(name) + 10);
+    sprintf(filename, "<frozen %s>", name);
+    PyObject *code = Py_CompileStringExFlags(text, filename,
+                                             Py_file_input, NULL, 0);
+    free(filename);
+    if (code == NULL) {
+        return NULL;
+    }
+
+    PyObject *marshalled = PyMarshal_WriteObjectToString(code, Py_MARSHAL_VERSION);
+    Py_CLEAR(code);
+    if (marshalled == NULL) {
+        return NULL;
+    }
+    assert(PyBytes_CheckExact(marshalled));
+
+    return marshalled;
+}
+
+static char *
+get_varname(const char *name, const char *prefix)
+{
+    size_t n = strlen(prefix);
+    char *varname = (char *) malloc(strlen(name) + n + 1);
+    (void)strcpy(varname, prefix);
+    for (size_t i = 0; name[i] != '\0'; i++) {
+        if (name[i] == '.') {
+            varname[n++] = '_';
+        }
+        else {
+            varname[n++] = name[i];
         }
     }
-    buf[n] = '\0';
-    fprintf(outfile, "const unsigned char _Py_M__%s[] = {\n", buf);
-    for (n = 0; n < data_size; n += 16) {
+    varname[n] = '\0';
+    return varname;
+}
+
+static void
+write_code(FILE *outfile, PyObject *marshalled, const char *varname)
+{
+    unsigned char *data = (unsigned char *) PyBytes_AS_STRING(marshalled);
+    size_t data_size = PyBytes_GET_SIZE(marshalled);
+
+    fprintf(outfile, "const unsigned char %s[] = {\n", varname);
+    for (size_t n = 0; n < data_size; n += 16) {
         size_t i, end = Py_MIN(n + 16, data_size);
         fprintf(outfile, "    ");
         for (i = n; i < end; i++) {
@@ -139,29 +155,72 @@ main(int argc, char *argv[])
         fprintf(outfile, "\n");
     }
     fprintf(outfile, "};\n");
+}
+
+static int
+write_frozen(const char *outpath, const char *inpath, const char *name,
+             PyObject *marshalled)
+{
+    /* Open the file in text mode. The hg checkout should be using the eol extension,
+       which in turn should cause the EOL style match the C library's text mode */
+    FILE *outfile = fopen(outpath, "w");
+    if (outfile == NULL) {
+        fprintf(stderr, "cannot open '%s' for writing\n", outpath);
+        return -1;
+    }
 
-    Py_CLEAR(marshalled);
+    fprintf(outfile, "%s\n", header);
+    char *arrayname = get_varname(name, "_Py_M__");
+    write_code(outfile, marshalled, arrayname);
+    free(arrayname);
 
-    Py_Finalize();
-    if (outfile) {
-        if (ferror(outfile)) {
-            fprintf(stderr, "error when writing to '%s'\n", outpath);
-            goto error;
-        }
-        fclose(outfile);
+    if (ferror(outfile)) {
+        fprintf(stderr, "error when writing to '%s'\n", outpath);
+        return -1;
     }
+    fclose(outfile);
+    return 0;
+}
+
+int
+main(int argc, char *argv[])
+{
+    const char *name, *inpath, *outpath;
+
+    PyImport_FrozenModules = _PyImport_FrozenModules;
+
+    if (argc != 4) {
+        fprintf(stderr, "need to specify the name, input and output paths\n");
+        return 2;
+    }
+    name = argv[1];
+    inpath = argv[2];
+    outpath = argv[3];
+
+    runtime_init();
+
+    const char *text = read_text(inpath);
+    if (text == NULL) {
+        goto error;
+    }
+
+    PyObject *marshalled = compile_and_marshal(name, text);
+    free((char *)text);
+    if (marshalled == NULL) {
+        goto error;
+    }
+
+    int res = write_frozen(outpath, inpath, name, marshalled);
+    Py_DECREF(marshalled);
+    if (res != 0) {
+        goto error;
+    }
+
+    Py_Finalize();
     return 0;
 
 error:
     PyErr_Print();
     Py_Finalize();
-    if (infile)
-        fclose(infile);
-    if (outfile)
-        fclose(outfile);
-    if (text)
-        free(text);
-    if (marshalled)
-        Py_DECREF(marshalled);
     return 1;
 }
diff --git a/Python/frozen.c b/Python/frozen.c
index 7f433ff80ca129..67aff2ed2eba14 100644
--- a/Python/frozen.c
+++ b/Python/frozen.c
@@ -1,35 +1,63 @@
 
-/* Frozen modules initializer */
-
-#include "Python.h"
-#include "importlib.h"
-#include "importlib_external.h"
-#include "importlib_zipimport.h"
+/* Frozen modules initializer
+ *
+ * Frozen modules are written to header files by Programs/_freeze_module.
+ * These files are typically put in Python/frozen_modules/.  Each holds
+ * an array of bytes named "_Py_M__<module>", which is used below.
+ *
+ * These files must be regenerated any time the corresponding .pyc
+ * file would change (including with changes to the compiler, bytecode
+ * format, marshal format).  This can be done with "make regen-frozen".
+ * That make target just runs Tools/scripts/freeze_modules.py.
+ *
+ * The freeze_modules.py script also determines which modules get
+ * frozen.  Update the list at the top of the script to add, remove,
+ * or modify the target modules.  Then run the script
+ * (or run "make regen-frozen").
+ *
+ * The script does the following:
+ *
+ * 1. run Programs/_freeze_module on the target modules
+ * 2. update the includes and _PyImport_FrozenModules[] in this file
+ * 3. update the FROZEN_FILES variable in Makefile.pre.in
+ * 4. update the per-module targets in Makefile.pre.in
+ * 5. update the lists of modules in PCbuild/_freeze_module.vcxproj and
+ *    PCbuild/_freeze_module.vcxproj.filters
+ *
+ * (Note that most of the data in this file is auto-generated by the script.)
+ *
+ * Those steps can also be done manually, though this is not recommended.
+ * Expect such manual changes to be removed the next time
+ * freeze_modules.py runs.
+ * */
 
 /* In order to test the support for frozen modules, by default we
-   define a single frozen module, __hello__.  Loading it will print
-   some famous words... */
+   define some simple frozen modules: __hello__, __phello__ (a package),
+   and __phello__.spam.  Loading any will print some famous words... */
 
-/* Run "make regen-frozen" to regen the file below (e.g. after a bytecode
- * format change).  The include file defines _Py_M__hello as an array of bytes.
- */
-#include "frozen_hello.h"
+#include "Python.h"
 
-#define SIZE (int)sizeof(_Py_M__hello)
+/* Includes for frozen modules: */
+#include "frozen_modules/importlib__bootstrap.h"
+#include "frozen_modules/importlib__bootstrap_external.h"
+#include "frozen_modules/zipimport.h"
+#include "frozen_modules/hello.h"
+/* End includes */
+
+/* Note that a negative size indicates a package. */
 
 static const struct _frozen _PyImport_FrozenModules[] = {
     /* importlib */
-    {"_frozen_importlib", _Py_M__importlib_bootstrap,
-        (int)sizeof(_Py_M__importlib_bootstrap)},
-    {"_frozen_importlib_external", _Py_M__importlib_bootstrap_external,
-        (int)sizeof(_Py_M__importlib_bootstrap_external)},
-    {"zipimport", _Py_M__zipimport,
-        (int)sizeof(_Py_M__zipimport)},
+    {"_frozen_importlib", _Py_M__importlib__bootstrap,
+        (int)sizeof(_Py_M__importlib__bootstrap)},
+    {"_frozen_importlib_external", _Py_M__importlib__bootstrap_external,
+        (int)sizeof(_Py_M__importlib__bootstrap_external)},
+    {"zipimport", _Py_M__zipimport, (int)sizeof(_Py_M__zipimport)},
+
     /* Test module */
-    {"__hello__", _Py_M__hello, SIZE},
-    /* Test package (negative size indicates package-ness) */
-    {"__phello__", _Py_M__hello, -SIZE},
-    {"__phello__.spam", _Py_M__hello, SIZE},
+    {"__hello__", _Py_M__hello, (int)sizeof(_Py_M__hello)},
+    {"__phello__", _Py_M__hello, -(int)sizeof(_Py_M__hello)},
+    {"__phello__.spam", _Py_M__hello, (int)sizeof(_Py_M__hello)},
     {0, 0, 0} /* sentinel */
 };
 
diff --git a/Python/frozen_hello.h b/Python/frozen_modules/hello.h
similarity index 91%
rename from Python/frozen_hello.h
rename to Python/frozen_modules/hello.h
index c65c661e9bfb67..2658c05886a6db 100644
--- a/Python/frozen_hello.h
+++ b/Python/frozen_modules/hello.h
@@ -1,4 +1,4 @@
-/* Auto-generated by Programs/_freeze_importlib.c */
+/* Auto-generated by Programs/_freeze_module.c */
 const unsigned char _Py_M__hello[] = {
     99,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,
     0,0,0,0,0,115,16,0,0,0,100,0,90,0,101,1,
diff --git a/Python/importlib.h b/Python/frozen_modules/importlib__bootstrap.h
similarity index 99%
rename from Python/importlib.h
rename to Python/frozen_modules/importlib__bootstrap.h
index 69bd9727237f17..2716896c21f4a5 100644
--- a/Python/importlib.h
+++ b/Python/frozen_modules/importlib__bootstrap.h
@@ -1,5 +1,5 @@
-/* Auto-generated by Programs/_freeze_importlib.c */
-const unsigned char _Py_M__importlib_bootstrap[] = {
+/* Auto-generated by Programs/_freeze_module.c */
+const unsigned char _Py_M__importlib__bootstrap[] = {
     99,0,0,0,0,0,0,0,0,0,0,0,0,4,0,0,
     0,0,0,0,0,115,130,1,0,0,100,0,90,0,100,1,
     132,0,90,1,100,2,90,2,100,2,90,3,100,2,90,4,
diff --git a/Python/importlib_external.h b/Python/frozen_modules/importlib__bootstrap_external.h
similarity index 99%
rename from Python/importlib_external.h
rename to Python/frozen_modules/importlib__bootstrap_external.h
index c49fa5516eb26c..7a3410067d4a80 100644
--- a/Python/importlib_external.h
+++ b/Python/frozen_modules/importlib__bootstrap_external.h
@@ -1,5 +1,5 @@
-/* Auto-generated by Programs/_freeze_importlib.c */
-const unsigned char _Py_M__importlib_bootstrap_external[] = {
+/* Auto-generated by Programs/_freeze_module.c */
+const unsigned char _Py_M__importlib__bootstrap_external[] = {
     99,0,0,0,0,0,0,0,0,0,0,0,0,5,0,0,
     0,0,0,0,0,115,158,2,0,0,100,0,90,0,100,1,
     97,1,100,2,100,1,108,2,90,2,100,2,100,1,108,3,
diff --git a/Python/importlib_zipimport.h b/Python/frozen_modules/zipimport.h
similarity index 99%
rename from Python/importlib_zipimport.h
rename to Python/frozen_modules/zipimport.h
index c12ed5215b3f88..b4e2e85283cf49 100644
--- a/Python/importlib_zipimport.h
+++ b/Python/frozen_modules/zipimport.h
@@ -1,4 +1,4 @@
-/* Auto-generated by Programs/_freeze_importlib.c */
+/* Auto-generated by Programs/_freeze_module.c */
 const unsigned char _Py_M__zipimport[] = {
     99,0,0,0,0,0,0,0,0,0,0,0,0,4,0,0,
     0,0,0,0,0,115,48,1,0,0,100,0,90,0,100,1,
diff --git a/Tools/scripts/freeze_modules.py b/Tools/scripts/freeze_modules.py
new file mode 100644
index 00000000000000..4f60e1b9a3a8ba
--- /dev/null
+++ b/Tools/scripts/freeze_modules.py
@@ -0,0 +1,496 @@
+"""Freeze modules and regen related files (e.g. Python/frozen.c).
+
+See the notes at the top of Python/frozen.c for more info.
+"""
+
+import os
+import os.path
+import subprocess
+import sys
+import textwrap
+
+from update_file import updating_file_with_tmpfile
+
+
+SCRIPTS_DIR = os.path.abspath(os.path.dirname(__file__))
+TOOLS_DIR = os.path.dirname(SCRIPTS_DIR)
+ROOT_DIR = os.path.dirname(TOOLS_DIR)
+
+STDLIB_DIR = os.path.join(ROOT_DIR, 'Lib')
+# If MODULES_DIR is changed then the .gitattributes file needs to be updated.
+MODULES_DIR = os.path.join(ROOT_DIR, 'Python/frozen_modules')
+TOOL = os.path.join(ROOT_DIR, 'Programs', '_freeze_module')
+
+FROZEN_FILE = os.path.join(ROOT_DIR, 'Python', 'frozen.c')
+MAKEFILE = os.path.join(ROOT_DIR, 'Makefile.pre.in')
+PCBUILD_PROJECT = os.path.join(ROOT_DIR, 'PCbuild', '_freeze_module.vcxproj')
+PCBUILD_FILTERS = os.path.join(ROOT_DIR, 'PCbuild', '_freeze_module.vcxproj.filters')
+
+# These are modules that get frozen.
+FROZEN = [
+    # See parse_frozen_spec() for the format.
+    # In cases where the frozenid is duplicated, the first one is re-used.
+    ('importlib', [
+        'importlib._bootstrap : _frozen_importlib',
+        'importlib._bootstrap_external : _frozen_importlib_external',
+        'zipimport',
+        ]),
+    ('Test module', [
+        'hello : __hello__ = ' + os.path.join(TOOLS_DIR, 'freeze', 'flag.py'),
+        'hello : <__phello__>',
+        'hello : __phello__.spam',
+        ]),
+]
+
+
+#######################################
+# specs
+
+def parse_frozen_spec(rawspec, knownids=None, section=None):
+    """Yield (frozenid, pyfile, modname, ispkg) for the corresponding modules.
+
+    Supported formats:
+
+      frozenid
+      frozenid : modname
+      frozenid : modname = pyfile
+
+    "frozenid" and "modname" must be valid module names (dot-separated
+    identifiers).  If "modname" is not provided then "frozenid" is used.
+    If "pyfile" is not provided then the filename of the module
+    corresponding to "frozenid" is used.
+
+    Angle brackets around a frozenid (e.g. '<encodings>") indicate
+    it is a package.  This also means it must be an actual module
+    (i.e. "pyfile" cannot have been provided).  Such values can have
+    patterns to expand submodules:
+
+      <encodings.*>    - also freeze all direct submodules
+      <encodings.**.*> - also freeze the full submodule tree
+
+    As with "frozenid", angle brackets around "modname" indicate
+    it is a package.  However, in this case "pyfile" should not
+    have been provided and patterns in "modname" are not supported.
+    Also, if "modname" has brackets then "frozenid" should not,
+    and "pyfile" should have been provided..
+    """
+    frozenid, _, remainder = rawspec.partition(':')
+    modname, _, pyfile = remainder.partition('=')
+    frozenid = frozenid.strip()
+    modname = modname.strip()
+    pyfile = pyfile.strip()
+
+    submodules = None
+    if modname.startswith('<') and modname.endswith('>'):
+        assert check_modname(frozenid), rawspec
+        modname = modname[1:-1]
+        assert check_modname(modname), rawspec
+        if frozenid in knownids:
+            pass
+        elif pyfile:
+            assert not os.path.isdir(pyfile), rawspec
+        else:
+            pyfile = _resolve_module(frozenid, ispkg=False)
+        ispkg = True
+    elif pyfile:
+        assert check_modname(frozenid), rawspec
+        assert not knownids or frozenid not in knownids, rawspec
+        assert check_modname(modname), rawspec
+        assert not os.path.isdir(pyfile), rawspec
+        ispkg = False
+    elif knownids and frozenid in knownids:
+        assert check_modname(frozenid), rawspec
+        assert check_modname(modname), rawspec
+        ispkg = False
+    else:
+        assert not modname or check_modname(modname), rawspec
+        resolved = iter(resolve_modules(frozenid))
+        frozenid, pyfile, ispkg = next(resolved)
+        if not modname:
+            modname = frozenid
+        if ispkg:
+            pkgid = frozenid
+            pkgname = modname
+            def iter_subs():
+                for frozenid, pyfile, ispkg in resolved:
+                    assert not knownids or frozenid not in knownids, (frozenid, rawspec)
+                    if pkgname:
+                        modname = frozenid.replace(pkgid, pkgname, 1)
+                    else:
+                        modname = frozenid
+                    yield frozenid, pyfile, modname, ispkg, section
+            submodules = iter_subs()
+
+    spec = (frozenid, pyfile or None, modname, ispkg, section)
+    return spec, submodules
+
+
+def parse_frozen_specs(rawspecs=FROZEN):
+    seen = set()
+    for section, _specs in rawspecs:
+        for spec in _parse_frozen_specs(_specs, section, seen):
+            frozenid = spec[0]
+            yield spec
+            seen.add(frozenid)
+
+
+def _parse_frozen_specs(rawspecs, section, seen):
+    for rawspec in rawspecs:
+        spec, subs = parse_frozen_spec(rawspec, seen, section)
+        yield spec
+        for spec in subs or ():
+            yield spec
+
+
+def resolve_frozen_file(spec, destdir=MODULES_DIR):
+    if isinstance(spec, str):
+        modname = spec
+    else:
+        _, frozenid, _, _, _= spec
+        modname = frozenid
+    # We use a consistent naming convention for all frozen modules.
+    return os.path.join(destdir, modname.replace('.', '_')) + '.h'
+
+
+def resolve_frozen_files(specs, destdir=MODULES_DIR):
+    frozen = {}
+    frozenids = []
+    lastsection = None
+    for spec in specs:
+        frozenid, pyfile, *_, section = spec
+        if frozenid in frozen:
+            if section is None:
+                lastsection = None
+            else:
+                assert section == lastsection
+            continue
+        lastsection = section
+        frozenfile = resolve_frozen_file(frozenid, destdir)
+        frozen[frozenid] = (pyfile, frozenfile)
+        frozenids.append(frozenid)
+    return frozen, frozenids
+
+
+#######################################
+# generic helpers
+
+def resolve_modules(modname, pyfile=None):
+    if modname.startswith('<') and modname.endswith('>'):
+        if pyfile:
+            assert os.path.isdir(pyfile) or os.path.basename(pyfile) == '__init__.py', pyfile
+        ispkg = True
+        modname = modname[1:-1]
+        rawname = modname
+        # For now, we only expect match patterns at the end of the name.
+        _modname, sep, match = modname.rpartition('.')
+        if sep:
+            if _modname.endswith('.**'):
+                modname = _modname[:-3]
+                match = f'**.{match}'
+            elif match and not match.isidentifier():
+                modname = _modname
+            # Otherwise it's a plain name so we leave it alone.
+        else:
+            match = None
+    else:
+        ispkg = False
+        rawname = modname
+        match = None
+
+    if not check_modname(modname):
+        raise ValueError(f'not a valid module name ({rawname})')
+
+    if not pyfile:
+        pyfile = _resolve_module(modname, ispkg=ispkg)
+    elif os.path.isdir(pyfile):
+        pyfile = _resolve_module(modname, pyfile, ispkg)
+    yield modname, pyfile, ispkg
+
+    if match:
+        pkgdir = os.path.dirname(pyfile)
+        yield from iter_submodules(modname, pkgdir, match)
+
+
+def check_modname(modname):
+    return all(n.isidentifier() for n in modname.split('.'))
+
+
+def iter_submodules(pkgname, pkgdir=None, match='*'):
+    if not pkgdir:
+        pkgdir = os.path.join(STDLIB_DIR, *pkgname.split('.'))
+    if not match:
+        match = '**.*'
+    match_modname = _resolve_modname_matcher(match, pkgdir)
+
+    def _iter_submodules(pkgname, pkgdir):
+        for entry in sorted(os.scandir(pkgdir), key=lambda e: e.name):
+            matched, recursive = match_modname(entry.name)
+            if not matched:
+                continue
+            modname = f'{pkgname}.{entry.name}'
+            if modname.endswith('.py'):
+                yield modname[:-3], entry.path, False
+            elif entry.is_dir():
+                pyfile = os.path.join(entry.path, '__init__.py')
+                # We ignore namespace packages.
+                if os.path.exists(pyfile):
+                    yield modname, pyfile, True
+                    if recursive:
+                        yield from _iter_submodules(modname, entry.path)
+
+    return _iter_submodules(pkgname, pkgdir)
+
+
+def _resolve_modname_matcher(match, rootdir=None):
+    if isinstance(match, str):
+        if match.startswith('**.'):
+            recursive = True
+            pat = match[3:]
+            assert match
+        else:
+            recursive = False
+            pat = match
+
+        if pat == '*':
+            def match_modname(modname):
+                return True, recursive
+        else:
+            raise NotImplementedError(match)
+    elif callable(match):
+        match_modname = match(rootdir)
+    else:
+        raise ValueError(f'unsupported matcher {match!r}')
+    return match_modname
+
+
+def _resolve_module(modname, pathentry=STDLIB_DIR, ispkg=False):
+    assert pathentry, pathentry
+    pathentry = os.path.normpath(pathentry)
+    assert os.path.isabs(pathentry)
+    if ispkg:
+        return os.path.join(pathentry, *modname.split('.'), '__init__.py')
+    return os.path.join(pathentry, *modname.split('.')) + '.py'
+
+
+#######################################
+# regenerating dependent files
+
+def find_marker(lines, marker, file):
+    for pos, line in enumerate(lines):
+        if marker in line:
+            return pos
+    raise Exception(f"Can't find {marker!r} in file {file}")
+
+
+def replace_block(lines, start_marker, end_marker, replacements, file):
+    start_pos = find_marker(lines, start_marker, file)
+    end_pos = find_marker(lines, end_marker, file)
+    if end_pos <= start_pos:
+        raise Exception(f"End marker {end_marker!r} "
+                        f"occurs before start marker {start_marker!r} "
+                        f"in file {file}")
+    replacements = [line.rstrip() + os.linesep for line in replacements]
+    return lines[:start_pos + 1] + replacements + lines[end_pos:]
+
+
+def regen_frozen(specs, dest=MODULES_DIR):
+    if isinstance(dest, str):
+        frozen, frozenids = resolve_frozen_files(specs, destdir)
+    else:
+        frozenids, frozen = dest
+
+    headerlines = []
+    parentdir = os.path.dirname(FROZEN_FILE)
+    for frozenid in frozenids:
+        # Adding a comment to separate sections here doesn't add much,
+        # so we don't.
+        _, frozenfile = frozen[frozenid]
+        header = os.path.relpath(frozenfile, parentdir)
+        headerlines.append(f'#include "{header}"')
+
+    deflines = []
+    indent = '    '
+    lastsection = None
+    for spec in specs:
+        frozenid, _, modname, ispkg, section = spec
+        if section != lastsection:
+            if lastsection is not None:
+                deflines.append('')
+            deflines.append(f'/* {section} */')
+        lastsection = section
+
+        # This matches what we do in Programs/_freeze_module.c:
+        name = frozenid.replace('.', '_')
+        symbol = '_Py_M__' + name
+        pkg = '-' if ispkg else ''
+        line = ('{"%s", %s, %s(int)sizeof(%s)},'
+                % (modname, symbol, pkg, symbol))
+        # TODO: Consider not folding lines
+        if len(line) < 80:
+            deflines.append(line)
+        else:
+            line1, _, line2 = line.rpartition(' ')
+            deflines.append(line1)
+            deflines.append(indent + line2)
+
+    if not deflines[0]:
+        del deflines[0]
+    for i, line in enumerate(deflines):
+        if line:
+            deflines[i] = indent + line
+
+    print(f'# Updating {os.path.relpath(FROZEN_FILE)}')
+    with updating_file_with_tmpfile(FROZEN_FILE) as (infile, outfile):
+        lines = infile.readlines()
+        # TODO: Use more obvious markers, e.g.
+        # $START GENERATED FOOBAR$ / $END GENERATED FOOBAR$
+        lines = replace_block(
+            lines,
+            "/* Includes for frozen modules: */",
+            "/* End includes */",
+            headerlines,
+            FROZEN_FILE,
+        )
+        lines = replace_block(
+            lines,
+            "static const struct _frozen _PyImport_FrozenModules[] =",
+            "/* sentinel */",
+            deflines,
+            FROZEN_FILE,
+        )
+        outfile.writelines(lines)
+
+
+def regen_makefile(frozenids, frozen):
+    frozenfiles = []
+    rules = ['']
+    for frozenid in frozenids:
+        pyfile, frozenfile = frozen[frozenid]
+        header = os.path.relpath(frozenfile, ROOT_DIR)
+        relfile = header.replace('\\', '/')
+        frozenfiles.append(f'\t\t$(srcdir)/{relfile} \\')
+
+        _pyfile = os.path.relpath(pyfile, ROOT_DIR)
+        tmpfile = f'{header}.new'
+        # Note that we freeze the module to the target .h file
+        # instead of going through an intermediate file like we used to.
+        rules.append(f'{header}: $(srcdir)/Programs/_freeze_module $(srcdir)/{_pyfile}')
+        rules.append(f'\t$(srcdir)/Programs/_freeze_module {frozenid} \\')
+        rules.append(f'\t\t$(srcdir)/{_pyfile} \\')
+        rules.append(f'\t\t$(srcdir)/{header}')
+        rules.append('')
+
+    frozenfiles[-1] = frozenfiles[-1].rstrip(" \\")
+
+    print(f'# Updating {os.path.relpath(MAKEFILE)}')
+    with updating_file_with_tmpfile(MAKEFILE) as (infile, outfile):
+        lines = infile.readlines()
+        lines = replace_block(
+            lines,
+            "FROZEN_FILES =",
+            "# End FROZEN_FILES",
+            frozenfiles,
+            MAKEFILE,
+        )
+        lines = replace_block(
+            lines,
+            "# BEGIN: freezing modules",
+            "# END: freezing modules",
+            rules,
+            MAKEFILE,
+        )
+        outfile.writelines(lines)
+
+
+def regen_pcbuild(frozenids, frozen):
+    projlines = []
+    filterlines = []
+    for frozenid in frozenids:
+        pyfile, frozenfile = frozen[frozenid]
+
+        _pyfile = os.path.relpath(pyfile, ROOT_DIR).replace('/', '\\')
+        header = os.path.relpath(frozenfile, ROOT_DIR).replace('/', '\\')
+        intfile = header.split('\\')[-1].strip('.h') + '.g.h'
+        projlines.append(f'    <None Include="..\\{_pyfile}">')
+        projlines.append(f'      <ModName>{frozenid}</ModName>')
+        projlines.append(f'      <IntFile>$(IntDir){intfile}</IntFile>')
+        projlines.append(f'      <OutFile>$(PySourcePath){header}</OutFile>')
+        projlines.append(f'    </None>')
+
+        filterlines.append(f'    <None Include="..\\{_pyfile}">')
+        filterlines.append('      <Filter>Python Files</Filter>')
+        filterlines.append('    </None>')
+
+    print(f'# Updating {os.path.relpath(PCBUILD_PROJECT)}')
+    with updating_file_with_tmpfile(PCBUILD_PROJECT) as (infile, outfile):
+        lines = infile.readlines()
+        lines = replace_block(
+            lines,
+            '<!-- BEGIN frozen modules -->',
+            '<!-- END frozen modules -->',
+            projlines,
+            PCBUILD_PROJECT,
+        )
+        outfile.writelines(lines)
+    print(f'# Updating {os.path.relpath(PCBUILD_FILTERS)}')
+    with updating_file_with_tmpfile(PCBUILD_FILTERS) as (infile, outfile):
+        lines = infile.readlines()
+        lines = replace_block(
+            lines,
+            '<!-- BEGIN frozen modules -->',
+            '<!-- END frozen modules -->',
+            filterlines,
+            PCBUILD_FILTERS,
+        )
+        outfile.writelines(lines)
+
+
+#######################################
+# freezing modules
+
+def freeze_module(modname, pyfile=None, destdir=MODULES_DIR):
+    """Generate the frozen module .h file for the given module."""
+    for modname, pyfile, ispkg in resolve_modules(modname, pyfile):
+        frozenfile = _resolve_frozen(modname, destdir)
+        _freeze_module(modname, pyfile, frozenfile)
+
+
+def _freeze_module(frozenid, pyfile, frozenfile):
+    tmpfile = frozenfile + '.new'
+
+    argv = [TOOL, frozenid, pyfile, tmpfile]
+    print('#', '  '.join(os.path.relpath(a) for a in argv))
+    try:
+        subprocess.run(argv, check=True)
+    except subprocess.CalledProcessError:
+        if not os.path.exists(TOOL):
+            sys.exit(f'ERROR: missing {TOOL}; you need to run "make regen-frozen"')
+        raise  # re-raise
+
+    os.replace(tmpfile, frozenfile)
+
+
+#######################################
+# the script
+
+def main():
+    # Expand the raw specs, preserving order.
+    specs = list(parse_frozen_specs())
+    frozen, frozenids = resolve_frozen_files(specs, MODULES_DIR)
+
+    # Regen build-related files.
+    regen_frozen(specs, (frozenids, frozen))
+    regen_makefile(frozenids, frozen)
+    regen_pcbuild(frozenids, frozen)
+
+    # Freeze the target modules.
+    for frozenid in frozenids:
+        pyfile, frozenfile = frozen[frozenid]
+        _freeze_module(frozenid, pyfile, frozenfile)
+
+
+if __name__ == '__main__':
+    argv = sys.argv[1:]
+    if argv:
+        sys.exit('ERROR: got unexpected args {argv}')
+    main()
diff --git a/Tools/scripts/update_file.py b/Tools/scripts/update_file.py
index 224585c69bbaeb..cfc4e2b1ab12a3 100644
--- a/Tools/scripts/update_file.py
+++ b/Tools/scripts/update_file.py
@@ -6,23 +6,47 @@
 actually change the in-tree generated code.
 """
 
+import contextlib
 import os
+import os.path
 import sys
 
 
-def main(old_path, new_path):
-    with open(old_path, 'rb') as f:
+ at contextlib.contextmanager
+def updating_file_with_tmpfile(filename, tmpfile=None):
+    """A context manager for updating a file via a temp file.
+
+    The context manager provides two open files: the source file open
+    for reading, and the temp file, open for writing.
+
+    Upon exiting: both files are closed, and the source file is replaced
+    with the temp file.
+    """
+    # XXX Optionally use tempfile.TemporaryFile?
+    if not tmpfile:
+        tmpfile = filename + '.tmp'
+    elif os.path.isdir(tmpfile):
+        tmpfile = os.path.join(tmpfile, filename + '.tmp')
+
+    with open(tmpfile, 'w') as outfile:
+        with open(filename) as infile:
+            yield infile, outfile
+    update_file_with_tmpfile(filename, tmpfile)
+
+
+def update_file_with_tmpfile(filename, tmpfile):
+    with open(filename, 'rb') as f:
         old_contents = f.read()
-    with open(new_path, 'rb') as f:
+    with open(tmpfile, 'rb') as f:
         new_contents = f.read()
     if old_contents != new_contents:
-        os.replace(new_path, old_path)
+        os.replace(tmpfile, filename)
     else:
-        os.unlink(new_path)
+        os.unlink(tmpfile)
 
 
 if __name__ == '__main__':
     if len(sys.argv) != 3:
         print("Usage: %s <path to be updated> <path with new contents>" % (sys.argv[0],))
         sys.exit(1)
-    main(sys.argv[1], sys.argv[2])
+    update_file_with_tmpfile(sys.argv[1], sys.argv[2])


From webhook-mailer at python.org  Mon Aug 30 21:57:49 2021
From: webhook-mailer at python.org (rhettinger)
Date: Tue, 31 Aug 2021 01:57:49 -0000
Subject: [Python-checkins] bpo-39218: Improve accuracy of variance
 calculation (GH-27960)
Message-ID: <mailman.1278.1630375070.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/793f55bde9b0299100c12ddb0e6949c6eb4d85e5
commit: 793f55bde9b0299100c12ddb0e6949c6eb4d85e5
branch: main
author: Raymond Hettinger <rhettinger at users.noreply.github.com>
committer: rhettinger <rhettinger at users.noreply.github.com>
date: 2021-08-30T20:57:30-05:00
summary:

bpo-39218: Improve accuracy of variance calculation (GH-27960)

files:
A Misc/NEWS.d/next/Library/2021-08-25-20-18-31.bpo-39218.BlO6jW.rst
M Lib/statistics.py
M Lib/test/test_statistics.py

diff --git a/Lib/statistics.py b/Lib/statistics.py
index 1314095332a159..a14c48e89814bd 100644
--- a/Lib/statistics.py
+++ b/Lib/statistics.py
@@ -728,15 +728,19 @@ def _ss(data, c=None):
     lead to garbage results.
     """
     if c is not None:
-        T, total, count = _sum((x-c)**2 for x in data)
+        T, total, count = _sum((d := x - c) * d for x in data)
         return (T, total)
+    # Compute the mean accurate to within 1/2 ulp
     c = mean(data)
-    T, total, count = _sum((x-c)**2 for x in data)
-    # The following sum should mathematically equal zero, but due to rounding
-    # error may not.
-    U, total2, count2 = _sum((x - c) for x in data)
-    assert T == U and count == count2
-    total -= total2 ** 2 / len(data)
+    # Initial computation for the sum of square deviations
+    T, total, count = _sum((d := x - c) * d for x in data)
+    # Correct any remaining inaccuracy in the mean c.
+    # The following sum should mathematically equal zero,
+    # but due to the final rounding of the mean, it may not.
+    U, error, count2 = _sum((x - c) for x in data)
+    assert count == count2
+    correction = error * error / len(data)
+    total -= correction
     assert not total < 0, 'negative sum of square deviations: %f' % total
     return (T, total)
 
@@ -924,8 +928,8 @@ def correlation(x, y, /):
     xbar = fsum(x) / n
     ybar = fsum(y) / n
     sxy = fsum((xi - xbar) * (yi - ybar) for xi, yi in zip(x, y))
-    sxx = fsum((xi - xbar) ** 2.0 for xi in x)
-    syy = fsum((yi - ybar) ** 2.0 for yi in y)
+    sxx = fsum((d := xi - xbar) * d for xi in x)
+    syy = fsum((d := yi - ybar) * d for yi in y)
     try:
         return sxy / sqrt(sxx * syy)
     except ZeroDivisionError:
@@ -968,7 +972,7 @@ def linear_regression(x, y, /):
     xbar = fsum(x) / n
     ybar = fsum(y) / n
     sxy = fsum((xi - xbar) * (yi - ybar) for xi, yi in zip(x, y))
-    sxx = fsum((xi - xbar) ** 2.0 for xi in x)
+    sxx = fsum((d := xi - xbar) * d for xi in x)
     try:
         slope = sxy / sxx   # equivalent to:  covariance(x, y) / variance(x)
     except ZeroDivisionError:
@@ -1094,10 +1098,11 @@ def samples(self, n, *, seed=None):
 
     def pdf(self, x):
         "Probability density function.  P(x <= X < x+dx) / dx"
-        variance = self._sigma ** 2.0
+        variance = self._sigma * self._sigma
         if not variance:
             raise StatisticsError('pdf() not defined when sigma is zero')
-        return exp((x - self._mu)**2.0 / (-2.0*variance)) / sqrt(tau*variance)
+        diff = x - self._mu
+        return exp(diff * diff / (-2.0 * variance)) / sqrt(tau * variance)
 
     def cdf(self, x):
         "Cumulative distribution function.  P(X <= x)"
@@ -1161,7 +1166,7 @@ def overlap(self, other):
         if not dv:
             return 1.0 - erf(dm / (2.0 * X._sigma * sqrt(2.0)))
         a = X._mu * Y_var - Y._mu * X_var
-        b = X._sigma * Y._sigma * sqrt(dm**2.0 + dv * log(Y_var / X_var))
+        b = X._sigma * Y._sigma * sqrt(dm * dm + dv * log(Y_var / X_var))
         x1 = (a + b) / dv
         x2 = (a - b) / dv
         return 1.0 - (fabs(Y.cdf(x1) - X.cdf(x1)) + fabs(Y.cdf(x2) - X.cdf(x2)))
@@ -1204,7 +1209,7 @@ def stdev(self):
     @property
     def variance(self):
         "Square of the standard deviation."
-        return self._sigma ** 2.0
+        return self._sigma * self._sigma
 
     def __add__(x1, x2):
         """Add a constant or another NormalDist instance.
diff --git a/Lib/test/test_statistics.py b/Lib/test/test_statistics.py
index dc066fa921d797..64ebd0e8cb9f84 100644
--- a/Lib/test/test_statistics.py
+++ b/Lib/test/test_statistics.py
@@ -1210,6 +1210,9 @@ def __pow__(self, other):
             def __add__(self, other):
                 return type(self)(super().__add__(other))
             __radd__ = __add__
+            def __mul__(self, other):
+                return type(self)(super().__mul__(other))
+            __rmul__ = __mul__
         return (float, Decimal, Fraction, MyFloat)
 
     def test_types_conserved(self):
diff --git a/Misc/NEWS.d/next/Library/2021-08-25-20-18-31.bpo-39218.BlO6jW.rst b/Misc/NEWS.d/next/Library/2021-08-25-20-18-31.bpo-39218.BlO6jW.rst
new file mode 100644
index 00000000000000..7bcf9a222e33c3
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-25-20-18-31.bpo-39218.BlO6jW.rst
@@ -0,0 +1 @@
+Improve accuracy of variance calculations by using x*x instead of x**2.


From webhook-mailer at python.org  Tue Aug 31 01:12:01 2021
From: webhook-mailer at python.org (ned-deily)
Date: Tue, 31 Aug 2021 05:12:01 -0000
Subject: [Python-checkins] [3.7] bpo-44394: Update libexpat copy to 2.4.1
 (GH-26945) (GH-28042)
Message-ID: <mailman.1279.1630386723.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/79101b890ee021a901a8b6837a3a320d57adb725
commit: 79101b890ee021a901a8b6837a3a320d57adb725
branch: 3.7
author: ?ukasz Langa <lukasz at langa.pl>
committer: ned-deily <nad at python.org>
date: 2021-08-31T01:11:53-04:00
summary:

[3.7] bpo-44394: Update libexpat copy to 2.4.1 (GH-26945) (GH-28042)

Update the vendored copy of libexpat to 2.4.1 (from 2.2.8) to get the
fix for the CVE-2013-0340 "Billion Laughs" vulnerability. This copy
is most used on Windows and macOS.

Co-authored-by: Victor Stinner <vstinner at python.org>

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>.
(cherry picked from commit 3fc5d84046ddbd66abac5b598956ea34605a4e5d)

files:
A Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst
M Doc/library/xml.rst
M Modules/expat/COPYING
M Modules/expat/ascii.h
M Modules/expat/asciitab.h
M Modules/expat/expat.h
M Modules/expat/expat_external.h
M Modules/expat/iasciitab.h
M Modules/expat/internal.h
M Modules/expat/latin1tab.h
M Modules/expat/nametab.h
M Modules/expat/siphash.h
M Modules/expat/utf8tab.h
M Modules/expat/winconfig.h
M Modules/expat/xmlparse.c
M Modules/expat/xmlrole.c
M Modules/expat/xmlrole.h
M Modules/expat/xmltok.c
M Modules/expat/xmltok.h
M Modules/expat/xmltok_impl.c
M Modules/expat/xmltok_impl.h
M Modules/expat/xmltok_ns.c

diff --git a/Doc/library/xml.rst b/Doc/library/xml.rst
index fb86b6f5564d76..01205cbaf45bf8 100644
--- a/Doc/library/xml.rst
+++ b/Doc/library/xml.rst
@@ -60,22 +60,26 @@ circumvent firewalls.
 The following table gives an overview of the known attacks and whether
 the various modules are vulnerable to them.
 
-=========================  ==============   ===============   ==============   ==============   ==============
-kind                       sax              etree             minidom          pulldom          xmlrpc
-=========================  ==============   ===============   ==============   ==============   ==============
-billion laughs             **Vulnerable**   **Vulnerable**    **Vulnerable**   **Vulnerable**   **Vulnerable**
-quadratic blowup           **Vulnerable**   **Vulnerable**    **Vulnerable**   **Vulnerable**   **Vulnerable**
-external entity expansion  Safe (4)         Safe    (1)       Safe    (2)      Safe (4)         Safe    (3)
-`DTD`_ retrieval           Safe (4)         Safe              Safe             Safe (4)         Safe
-decompression bomb         Safe             Safe              Safe             Safe             **Vulnerable**
-=========================  ==============   ===============   ==============   ==============   ==============
-
-1. :mod:`xml.etree.ElementTree` doesn't expand external entities and raises a
+=========================  ==================  ==================  ==================  ==================  ==================
+kind                       sax                 etree               minidom             pulldom             xmlrpc
+=========================  ==================  ==================  ==================  ==================  ==================
+billion laughs             **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)
+quadratic blowup           **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)
+external entity expansion  Safe (5)            Safe (2)            Safe (3)            Safe (5)            Safe (4)
+`DTD`_ retrieval           Safe (5)            Safe                Safe                Safe (5)            Safe
+decompression bomb         Safe                Safe                Safe                Safe                **Vulnerable**
+=========================  ==================  ==================  ==================  ==================  ==================
+
+1. Expat 2.4.1 and newer is not vulnerable to the "billion laughs" and
+   "quadratic blowup" vulnerabilities. Items still listed as vulnerable due to
+   potential reliance on system-provided libraries. Check
+   :data:`pyexpat.EXPAT_VERSION`.
+2. :mod:`xml.etree.ElementTree` doesn't expand external entities and raises a
    :exc:`ParserError` when an entity occurs.
-2. :mod:`xml.dom.minidom` doesn't expand external entities and simply returns
+3. :mod:`xml.dom.minidom` doesn't expand external entities and simply returns
    the unexpanded entity verbatim.
-3. :mod:`xmlrpclib` doesn't expand external entities and omits them.
-4. Since Python 3.7.1, external general entities are no longer processed by
+4. :mod:`xmlrpclib` doesn't expand external entities and omits them.
+5. Since Python 3.7.1, external general entities are no longer processed by
    default.
 
 
diff --git a/Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst b/Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst
new file mode 100644
index 00000000000000..e32563d2535c7e
--- /dev/null
+++ b/Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst
@@ -0,0 +1,3 @@
+Update the vendored copy of libexpat to 2.4.1 (from 2.2.8) to get the fix
+for the CVE-2013-0340 "Billion Laughs" vulnerability. This copy is most used
+on Windows and macOS.
diff --git a/Modules/expat/COPYING b/Modules/expat/COPYING
index 8d288f0f28fddd..3c0142e71c8d4f 100644
--- a/Modules/expat/COPYING
+++ b/Modules/expat/COPYING
@@ -1,5 +1,5 @@
 Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
-Copyright (c) 2001-2017 Expat maintainers
+Copyright (c) 2001-2019 Expat maintainers
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/Modules/expat/ascii.h b/Modules/expat/ascii.h
index c3587e57332bff..1f594d2e54b4d2 100644
--- a/Modules/expat/ascii.h
+++ b/Modules/expat/ascii.h
@@ -6,8 +6,11 @@
                         \___/_/\_\ .__/ \__,_|\__|
                                  |_| XML parser
 
-   Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 1999-2000 Thai Open Source Software Center Ltd
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2007      Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/asciitab.h b/Modules/expat/asciitab.h
index 63b1d1b4482efa..af766fb24785ea 100644
--- a/Modules/expat/asciitab.h
+++ b/Modules/expat/asciitab.h
@@ -7,7 +7,9 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/expat.h b/Modules/expat/expat.h
index 6c8eb1fda4a30c..b7d6d354801b3d 100644
--- a/Modules/expat/expat.h
+++ b/Modules/expat/expat.h
@@ -7,7 +7,14 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2000-2005 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2001-2002 Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2016 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2016      Cristian Rodr?guez <crrodriguez at opensuse.org>
+   Copyright (c) 2016      Thomas Beutlich <tc at tbeu.de>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -115,7 +122,11 @@ enum XML_Error {
   XML_ERROR_RESERVED_PREFIX_XMLNS,
   XML_ERROR_RESERVED_NAMESPACE_URI,
   /* Added in 2.2.1. */
-  XML_ERROR_INVALID_ARGUMENT
+  XML_ERROR_INVALID_ARGUMENT,
+  /* Added in 2.3.0. */
+  XML_ERROR_NO_BUFFER,
+  /* Added in 2.4.0. */
+  XML_ERROR_AMPLIFICATION_LIMIT_BREACH
 };
 
 enum XML_Content_Type {
@@ -318,7 +329,7 @@ typedef void(XMLCALL *XML_EndDoctypeDeclHandler)(void *userData);
 
    For internal entities (<!ENTITY foo "bar">), value will
    be non-NULL and systemId, publicID, and notationName will be NULL.
-   The value string is NOT nul-terminated; the length is provided in
+   The value string is NOT null-terminated; the length is provided in
    the value_length argument. Since it is legal to have zero-length
    values, do not use this argument to test for internal entities.
 
@@ -513,7 +524,7 @@ typedef struct {
    Otherwise it must return XML_STATUS_ERROR.
 
    If info does not describe a suitable encoding, then the parser will
-   return an XML_UNKNOWN_ENCODING error.
+   return an XML_ERROR_UNKNOWN_ENCODING error.
 */
 typedef int(XMLCALL *XML_UnknownEncodingHandler)(void *encodingHandlerData,
                                                  const XML_Char *name,
@@ -707,7 +718,7 @@ XML_GetBase(XML_Parser parser);
 /* Returns the number of the attribute/value pairs passed in last call
    to the XML_StartElementHandler that were specified in the start-tag
    rather than defaulted. Each attribute/value pair counts as 2; thus
-   this correspondds to an index into the atts array passed to the
+   this corresponds to an index into the atts array passed to the
    XML_StartElementHandler.  Returns -1 if parser == NULL.
 */
 XMLPARSEAPI(int)
@@ -716,7 +727,7 @@ XML_GetSpecifiedAttributeCount(XML_Parser parser);
 /* Returns the index of the ID attribute passed in the last call to
    XML_StartElementHandler, or -1 if there is no ID attribute or
    parser == NULL.  Each attribute/value pair counts as 2; thus this
-   correspondds to an index into the atts array passed to the
+   corresponds to an index into the atts array passed to the
    XML_StartElementHandler.
 */
 XMLPARSEAPI(int)
@@ -997,7 +1008,10 @@ enum XML_FeatureEnum {
   XML_FEATURE_SIZEOF_XML_LCHAR,
   XML_FEATURE_NS,
   XML_FEATURE_LARGE_SIZE,
-  XML_FEATURE_ATTR_INFO
+  XML_FEATURE_ATTR_INFO,
+  /* Added in Expat 2.4.0. */
+  XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT,
+  XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT
   /* Additional features must be added to the end of this enum. */
 };
 
@@ -1010,12 +1024,24 @@ typedef struct {
 XMLPARSEAPI(const XML_Feature *)
 XML_GetFeatureList(void);
 
+#ifdef XML_DTD
+/* Added in Expat 2.4.0. */
+XMLPARSEAPI(XML_Bool)
+XML_SetBillionLaughsAttackProtectionMaximumAmplification(
+    XML_Parser parser, float maximumAmplificationFactor);
+
+/* Added in Expat 2.4.0. */
+XMLPARSEAPI(XML_Bool)
+XML_SetBillionLaughsAttackProtectionActivationThreshold(
+    XML_Parser parser, unsigned long long activationThresholdBytes);
+#endif
+
 /* Expat follows the semantic versioning convention.
    See http://semver.org.
 */
 #define XML_MAJOR_VERSION 2
-#define XML_MINOR_VERSION 2
-#define XML_MICRO_VERSION 8
+#define XML_MINOR_VERSION 4
+#define XML_MICRO_VERSION 1
 
 #ifdef __cplusplus
 }
diff --git a/Modules/expat/expat_external.h b/Modules/expat/expat_external.h
index f2b75dda8e2798..12c560e14716ff 100644
--- a/Modules/expat/expat_external.h
+++ b/Modules/expat/expat_external.h
@@ -7,7 +7,14 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2000-2004 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2001-2002 Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2006 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2016      Cristian Rodr?guez <crrodriguez at opensuse.org>
+   Copyright (c) 2016-2019 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2018      Yury Gribov <tetra2005 at gmail.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/iasciitab.h b/Modules/expat/iasciitab.h
index ea97cfcf678e06..5d8646f2a318b8 100644
--- a/Modules/expat/iasciitab.h
+++ b/Modules/expat/iasciitab.h
@@ -7,7 +7,9 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/internal.h b/Modules/expat/internal.h
index 60913dab762f8f..444eba0fb03170 100644
--- a/Modules/expat/internal.h
+++ b/Modules/expat/internal.h
@@ -25,8 +25,12 @@
                         \___/_/\_\ .__/ \__,_|\__|
                                  |_| XML parser
 
-   Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2002-2003 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002-2006 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2003      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2018      Yury Gribov <tetra2005 at gmail.com>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -101,22 +105,58 @@
 #  endif
 #endif
 
+#include <limits.h> // ULONG_MAX
+
+#if defined(_WIN32) && ! defined(__USE_MINGW_ANSI_STDIO)
+#  define EXPAT_FMT_ULL(midpart) "%" midpart "I64u"
+#  if defined(_WIN64) // Note: modifiers "td" and "zu" do not work for MinGW
+#    define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "I64d"
+#    define EXPAT_FMT_SIZE_T(midpart) "%" midpart "I64u"
+#  else
+#    define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "d"
+#    define EXPAT_FMT_SIZE_T(midpart) "%" midpart "u"
+#  endif
+#else
+#  define EXPAT_FMT_ULL(midpart) "%" midpart "llu"
+#  if ! defined(ULONG_MAX)
+#    error Compiler did not define ULONG_MAX for us
+#  elif ULONG_MAX == 18446744073709551615u // 2^64-1
+#    define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "ld"
+#    define EXPAT_FMT_SIZE_T(midpart) "%" midpart "lu"
+#  else
+#    define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "d"
+#    define EXPAT_FMT_SIZE_T(midpart) "%" midpart "u"
+#  endif
+#endif
+
 #ifndef UNUSED_P
 #  define UNUSED_P(p) (void)p
 #endif
 
+/* NOTE BEGIN If you ever patch these defaults to greater values
+              for non-attack XML payload in your environment,
+              please file a bug report with libexpat.  Thank you!
+*/
+#define EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT   \
+  100.0f
+#define EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT    \
+  8388608 // 8 MiB, 2^23
+/* NOTE END */
+
+#include "expat.h" // so we can use type XML_Parser below
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifdef XML_ENABLE_VISIBILITY
-#  if XML_ENABLE_VISIBILITY
-__attribute__((visibility("default")))
-#  endif
+void _INTERNAL_trim_to_complete_utf8_characters(const char *from,
+                                                const char **fromLimRef);
+
+#if defined(XML_DTD)
+unsigned long long testingAccountingGetCountBytesDirect(XML_Parser parser);
+unsigned long long testingAccountingGetCountBytesIndirect(XML_Parser parser);
+const char *unsignedCharToPrintable(unsigned char c);
 #endif
-void
-_INTERNAL_trim_to_complete_utf8_characters(const char *from,
-                                           const char **fromLimRef);
 
 #ifdef __cplusplus
 }
diff --git a/Modules/expat/latin1tab.h b/Modules/expat/latin1tab.h
index 6f916041355a86..b681d278af6569 100644
--- a/Modules/expat/latin1tab.h
+++ b/Modules/expat/latin1tab.h
@@ -7,7 +7,9 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/nametab.h b/Modules/expat/nametab.h
index 3681df348eebd6..63485446b96727 100644
--- a/Modules/expat/nametab.h
+++ b/Modules/expat/nametab.h
@@ -6,8 +6,8 @@
                         \___/_/\_\ .__/ \__,_|\__|
                                  |_| XML parser
 
-   Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000 Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2017 Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/siphash.h b/Modules/expat/siphash.h
index bfee65a332f1bf..e5406d7ee9eb54 100644
--- a/Modules/expat/siphash.h
+++ b/Modules/expat/siphash.h
@@ -11,6 +11,9 @@
  * --------------------------------------------------------------------------
  * HISTORY:
  *
+ * 2020-10-03  (Sebastian Pipping)
+ *   - Drop support for Visual Studio 9.0/2008 and earlier
+ *
  * 2019-08-03  (Sebastian Pipping)
  *   - Mark part of sip24_valid as to be excluded from clang-format
  *   - Re-format code using clang-format 9
@@ -96,15 +99,7 @@
 #define SIPHASH_H
 
 #include <stddef.h> /* size_t */
-
-#if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER < 1600)
-/* For vs2003/7.1 up to vs2008/9.0; _MSC_VER 1600 is vs2010/10.0 */
-typedef unsigned __int8 uint8_t;
-typedef unsigned __int32 uint32_t;
-typedef unsigned __int64 uint64_t;
-#else
-#  include <stdint.h> /* uint64_t uint32_t uint8_t */
-#endif
+#include <stdint.h> /* uint64_t uint32_t uint8_t */
 
 /*
  * Workaround to not require a C++11 compiler for using ULL suffix
diff --git a/Modules/expat/utf8tab.h b/Modules/expat/utf8tab.h
index a22986acbb9526..88efcf91cc16a6 100644
--- a/Modules/expat/utf8tab.h
+++ b/Modules/expat/utf8tab.h
@@ -7,7 +7,9 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/winconfig.h b/Modules/expat/winconfig.h
index 562a4a82dc1d63..2ecd61b5b94820 100644
--- a/Modules/expat/winconfig.h
+++ b/Modules/expat/winconfig.h
@@ -6,8 +6,10 @@
                         \___/_/\_\ .__/ \__,_|\__|
                                  |_| XML parser
 
-   Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2005      Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2017-2021 Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -40,17 +42,4 @@
 #include <memory.h>
 #include <string.h>
 
-#if defined(HAVE_EXPAT_CONFIG_H) /* e.g. MinGW */
-#  include <expat_config.h>
-#else /* !defined(HAVE_EXPAT_CONFIG_H) */
-
-#  define XML_NS 1
-#  define XML_DTD 1
-#  define XML_CONTEXT_BYTES 1024
-
-/* we will assume all Windows platforms are little endian */
-#  define BYTEORDER 1234
-
-#endif /* !defined(HAVE_EXPAT_CONFIG_H) */
-
 #endif /* ndef WINCONFIG_H */
diff --git a/Modules/expat/xmlparse.c b/Modules/expat/xmlparse.c
index e740f0e19c7d4a..5ba56eaea6357a 100644
--- a/Modules/expat/xmlparse.c
+++ b/Modules/expat/xmlparse.c
@@ -1,4 +1,4 @@
-/* f2d0ab6d1d4422a08cf1cf3bbdfba96b49dea42fb5ff4615e03a2a25c306e769 (2.2.8+)
+/* 8539b9040d9d901366a62560a064af7cb99811335784b363abc039c5b0ebc416 (2.4.1+)
                             __  __            _
                          ___\ \/ /_ __   __ _| |_
                         / _ \\  /| '_ \ / _` | __|
@@ -7,7 +7,31 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2000-2006 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2001-2002 Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2016 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2005-2009 Steven Solie <ssolie at users.sourceforge.net>
+   Copyright (c) 2016      Eric Rahm <erahm at mozilla.com>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2016      Gaurav <g.gupta at samsung.com>
+   Copyright (c) 2016      Thomas Beutlich <tc at tbeu.de>
+   Copyright (c) 2016      Gustavo Grieco <gustavo.grieco at imag.fr>
+   Copyright (c) 2016      Pascal Cuoq <cuoq at trust-in-soft.com>
+   Copyright (c) 2016      Ed Schouten <ed at nuxi.nl>
+   Copyright (c) 2017-2018 Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2017      V?clav Slav?k <vaclav at slavik.io>
+   Copyright (c) 2017      Viktor Szakats <commit at vsz.me>
+   Copyright (c) 2017      Chanho Park <chanho61.park at samsung.com>
+   Copyright (c) 2017      Rolf Eike Beer <eike at sf-mail.de>
+   Copyright (c) 2017      Hans Wennborg <hans at chromium.org>
+   Copyright (c) 2018      Anton Maklakov <antmak.pub at gmail.com>
+   Copyright (c) 2018      Benjamin Peterson <benjamin at python.org>
+   Copyright (c) 2018      Marco Maggi <marco.maggi-ipsu at poste.it>
+   Copyright (c) 2018      Mariusz Zaborski <oshogbo at vexillium.org>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
+   Copyright (c) 2019-2020 Ben Wagner <bungeman at chromium.org>
+   Copyright (c) 2019      Vadim Zeitlin <vadim at zeitlins.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -36,7 +60,9 @@
 
 #ifdef _WIN32
 /* force stdlib to define rand_s() */
-#  define _CRT_RAND_S
+#  if ! defined(_CRT_RAND_S)
+#    define _CRT_RAND_S
+#  endif
 #endif
 
 #include <stddef.h>
@@ -45,6 +71,8 @@
 #include <limits.h> /* UINT_MAX */
 #include <stdio.h>  /* fprintf */
 #include <stdlib.h> /* getenv, rand_s */
+#include <stdint.h> /* uintptr_t */
+#include <math.h>   /* isnan */
 
 #ifdef _WIN32
 #  define getpid GetCurrentProcessId
@@ -60,9 +88,9 @@
 
 #ifdef _WIN32
 #  include "winconfig.h"
-#elif defined(HAVE_EXPAT_CONFIG_H)
-#  include <expat_config.h>
-#endif /* ndef _WIN32 */
+#endif
+
+#include <expat_config.h>
 
 #include "ascii.h"
 #include "expat.h"
@@ -97,14 +125,14 @@
     enabled.  For end user security, that is probably not what you want. \
     \
     Your options include: \
-      * Linux + glibc >=2.25 (getrandom): HAVE_GETRANDOM, \
-      * Linux + glibc <2.25 (syscall SYS_getrandom): HAVE_SYSCALL_GETRANDOM, \
+      * Linux >=3.17 + glibc >=2.25 (getrandom): HAVE_GETRANDOM, \
+      * Linux >=3.17 + glibc (including <2.25) (syscall SYS_getrandom): HAVE_SYSCALL_GETRANDOM, \
       * BSD / macOS >=10.7 (arc4random_buf): HAVE_ARC4RANDOM_BUF, \
-      * BSD / macOS <10.7 (arc4random): HAVE_ARC4RANDOM, \
+      * BSD / macOS (including <10.7) (arc4random): HAVE_ARC4RANDOM, \
       * libbsd (arc4random_buf): HAVE_ARC4RANDOM_BUF + HAVE_LIBBSD, \
       * libbsd (arc4random): HAVE_ARC4RANDOM + HAVE_LIBBSD, \
-      * Linux / BSD / macOS (/dev/urandom): XML_DEV_URANDOM \
-      * Windows (rand_s): _WIN32. \
+      * Linux (including <3.17) / BSD / macOS (including <10.7) (/dev/urandom): XML_DEV_URANDOM, \
+      * Windows >=Vista (rand_s): _WIN32. \
     \
     If insist on not using any of these, bypass this error by defining \
     XML_POOR_ENTROPY; you have been warned. \
@@ -119,9 +147,7 @@
 #  define XmlGetInternalEncoding XmlGetUtf16InternalEncoding
 #  define XmlGetInternalEncodingNS XmlGetUtf16InternalEncodingNS
 #  define XmlEncode XmlUtf16Encode
-/* Using pointer subtraction to convert to integer type. */
-#  define MUST_CONVERT(enc, s)                                                 \
-    (! (enc)->isUtf16 || (((char *)(s) - (char *)NULL) & 1))
+#  define MUST_CONVERT(enc, s) (! (enc)->isUtf16 || (((uintptr_t)(s)) & 1))
 typedef unsigned short ICHAR;
 #else
 #  define XML_ENCODE_MAX XML_UTF8_ENCODE_MAX
@@ -371,6 +397,31 @@ typedef struct open_internal_entity {
   XML_Bool betweenDecl; /* WFC: PE Between Declarations */
 } OPEN_INTERNAL_ENTITY;
 
+enum XML_Account {
+  XML_ACCOUNT_DIRECT,           /* bytes directly passed to the Expat parser */
+  XML_ACCOUNT_ENTITY_EXPANSION, /* intermediate bytes produced during entity
+                                   expansion */
+  XML_ACCOUNT_NONE              /* i.e. do not account, was accounted already */
+};
+
+#ifdef XML_DTD
+typedef unsigned long long XmlBigCount;
+typedef struct accounting {
+  XmlBigCount countBytesDirect;
+  XmlBigCount countBytesIndirect;
+  int debugLevel;
+  float maximumAmplificationFactor; // >=1.0
+  unsigned long long activationThresholdBytes;
+} ACCOUNTING;
+
+typedef struct entity_stats {
+  unsigned int countEverOpened;
+  unsigned int currentDepth;
+  unsigned int maximumDepthSeen;
+  int debugLevel;
+} ENTITY_STATS;
+#endif /* XML_DTD */
+
 typedef enum XML_Error PTRCALL Processor(XML_Parser parser, const char *start,
                                          const char *end, const char **endPtr);
 
@@ -401,16 +452,18 @@ static enum XML_Error initializeEncoding(XML_Parser parser);
 static enum XML_Error doProlog(XML_Parser parser, const ENCODING *enc,
                                const char *s, const char *end, int tok,
                                const char *next, const char **nextPtr,
-                               XML_Bool haveMore, XML_Bool allowClosingDoctype);
+                               XML_Bool haveMore, XML_Bool allowClosingDoctype,
+                               enum XML_Account account);
 static enum XML_Error processInternalEntity(XML_Parser parser, ENTITY *entity,
                                             XML_Bool betweenDecl);
 static enum XML_Error doContent(XML_Parser parser, int startTagLevel,
                                 const ENCODING *enc, const char *start,
                                 const char *end, const char **endPtr,
-                                XML_Bool haveMore);
+                                XML_Bool haveMore, enum XML_Account account);
 static enum XML_Error doCdataSection(XML_Parser parser, const ENCODING *,
                                      const char **startPtr, const char *end,
-                                     const char **nextPtr, XML_Bool haveMore);
+                                     const char **nextPtr, XML_Bool haveMore,
+                                     enum XML_Account account);
 #ifdef XML_DTD
 static enum XML_Error doIgnoreSection(XML_Parser parser, const ENCODING *,
                                       const char **startPtr, const char *end,
@@ -420,7 +473,8 @@ static enum XML_Error doIgnoreSection(XML_Parser parser, const ENCODING *,
 static void freeBindings(XML_Parser parser, BINDING *bindings);
 static enum XML_Error storeAtts(XML_Parser parser, const ENCODING *,
                                 const char *s, TAG_NAME *tagNamePtr,
-                                BINDING **bindingsPtr);
+                                BINDING **bindingsPtr,
+                                enum XML_Account account);
 static enum XML_Error addBinding(XML_Parser parser, PREFIX *prefix,
                                  const ATTRIBUTE_ID *attId, const XML_Char *uri,
                                  BINDING **bindingsPtr);
@@ -429,15 +483,18 @@ static int defineAttribute(ELEMENT_TYPE *type, ATTRIBUTE_ID *, XML_Bool isCdata,
                            XML_Parser parser);
 static enum XML_Error storeAttributeValue(XML_Parser parser, const ENCODING *,
                                           XML_Bool isCdata, const char *,
-                                          const char *, STRING_POOL *);
+                                          const char *, STRING_POOL *,
+                                          enum XML_Account account);
 static enum XML_Error appendAttributeValue(XML_Parser parser, const ENCODING *,
                                            XML_Bool isCdata, const char *,
-                                           const char *, STRING_POOL *);
+                                           const char *, STRING_POOL *,
+                                           enum XML_Account account);
 static ATTRIBUTE_ID *getAttributeId(XML_Parser parser, const ENCODING *enc,
                                     const char *start, const char *end);
 static int setElementTypePrefix(XML_Parser parser, ELEMENT_TYPE *);
 static enum XML_Error storeEntityValue(XML_Parser parser, const ENCODING *enc,
-                                       const char *start, const char *end);
+                                       const char *start, const char *end,
+                                       enum XML_Account account);
 static int reportProcessingInstruction(XML_Parser parser, const ENCODING *enc,
                                        const char *start, const char *end);
 static int reportComment(XML_Parser parser, const ENCODING *enc,
@@ -501,6 +558,34 @@ static XML_Parser parserCreate(const XML_Char *encodingName,
 
 static void parserInit(XML_Parser parser, const XML_Char *encodingName);
 
+#ifdef XML_DTD
+static float accountingGetCurrentAmplification(XML_Parser rootParser);
+static void accountingReportStats(XML_Parser originParser, const char *epilog);
+static void accountingOnAbort(XML_Parser originParser);
+static void accountingReportDiff(XML_Parser rootParser,
+                                 unsigned int levelsAwayFromRootParser,
+                                 const char *before, const char *after,
+                                 ptrdiff_t bytesMore, int source_line,
+                                 enum XML_Account account);
+static XML_Bool accountingDiffTolerated(XML_Parser originParser, int tok,
+                                        const char *before, const char *after,
+                                        int source_line,
+                                        enum XML_Account account);
+
+static void entityTrackingReportStats(XML_Parser parser, ENTITY *entity,
+                                      const char *action, int sourceLine);
+static void entityTrackingOnOpen(XML_Parser parser, ENTITY *entity,
+                                 int sourceLine);
+static void entityTrackingOnClose(XML_Parser parser, ENTITY *entity,
+                                  int sourceLine);
+
+static XML_Parser getRootParserOf(XML_Parser parser,
+                                  unsigned int *outLevelDiff);
+#endif /* XML_DTD */
+
+static unsigned long getDebugLevel(const char *variableName,
+                                   unsigned long defaultDebugLevel);
+
 #define poolStart(pool) ((pool)->start)
 #define poolEnd(pool) ((pool)->ptr)
 #define poolLength(pool) ((pool)->ptr - (pool)->start)
@@ -614,6 +699,10 @@ struct XML_ParserStruct {
   enum XML_ParamEntityParsing m_paramEntityParsing;
 #endif
   unsigned long m_hash_secret_salt;
+#ifdef XML_DTD
+  ACCOUNTING m_accounting;
+  ENTITY_STATS m_entity_stats;
+#endif
 };
 
 #define MALLOC(parser, s) (parser->m_mem.malloc_fcn((s)))
@@ -734,6 +823,15 @@ writeRandomBytes_arc4random(void *target, size_t count) {
 
 #ifdef _WIN32
 
+/* Provide declaration of rand_s() for MinGW-32 (not 64, which has it),
+   as it didn't declare it in its header prior to version 5.3.0 of its
+   runtime package (mingwrt, containing stdlib.h).  The upstream fix
+   was introduced at https://osdn.net/projects/mingw/ticket/39658 . */
+#  if defined(__MINGW32__) && defined(__MINGW32_VERSION)                       \
+      && __MINGW32_VERSION < 5003000L && ! defined(__MINGW64_VERSION_MAJOR)
+__declspec(dllimport) int rand_s(unsigned int *);
+#  endif
+
 /* Obtain entropy on Windows using the rand_s() function which
  * generates cryptographically secure random numbers.  Internally it
  * uses RtlGenRandom API which is present in Windows XP and later.
@@ -789,9 +887,8 @@ gather_time_entropy(void) {
 
 static unsigned long
 ENTROPY_DEBUG(const char *label, unsigned long entropy) {
-  const char *const EXPAT_ENTROPY_DEBUG = getenv("EXPAT_ENTROPY_DEBUG");
-  if (EXPAT_ENTROPY_DEBUG && ! strcmp(EXPAT_ENTROPY_DEBUG, "1")) {
-    fprintf(stderr, "Entropy: %s --> 0x%0*lx (%lu bytes)\n", label,
+  if (getDebugLevel("EXPAT_ENTROPY_DEBUG", 0) >= 1u) {
+    fprintf(stderr, "expat: Entropy: %s --> 0x%0*lx (%lu bytes)\n", label,
             (int)sizeof(entropy) * 2, entropy, (unsigned long)sizeof(entropy));
   }
   return entropy;
@@ -1053,6 +1150,18 @@ parserInit(XML_Parser parser, const XML_Char *encodingName) {
   parser->m_paramEntityParsing = XML_PARAM_ENTITY_PARSING_NEVER;
 #endif
   parser->m_hash_secret_salt = 0;
+
+#ifdef XML_DTD
+  memset(&parser->m_accounting, 0, sizeof(ACCOUNTING));
+  parser->m_accounting.debugLevel = getDebugLevel("EXPAT_ACCOUNTING_DEBUG", 0u);
+  parser->m_accounting.maximumAmplificationFactor
+      = EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT;
+  parser->m_accounting.activationThresholdBytes
+      = EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT;
+
+  memset(&parser->m_entity_stats, 0, sizeof(ENTITY_STATS));
+  parser->m_entity_stats.debugLevel = getDebugLevel("EXPAT_ENTITY_DEBUG", 0u);
+#endif
 }
 
 /* moves list of bindings to m_freeBindingList */
@@ -1399,6 +1508,7 @@ XML_UseForeignDTD(XML_Parser parser, XML_Bool useDTD) {
   parser->m_useForeignDTD = useDTD;
   return XML_ERROR_NONE;
 #else
+  UNUSED_P(useDTD);
   return XML_ERROR_FEATURE_REQUIRES_XML_DTD;
 #endif
 }
@@ -1780,7 +1890,7 @@ XML_Parse(XML_Parser parser, const char *s, int len, int isFinal) {
     int nLeftOver;
     enum XML_Status result;
     /* Detect overflow (a+b > MAX <==> b > MAX-a) */
-    if (len > ((XML_Size)-1) / 2 - parser->m_parseEndByteIndex) {
+    if ((XML_Size)len > ((XML_Size)-1) / 2 - parser->m_parseEndByteIndex) {
       parser->m_errorCode = XML_ERROR_NO_MEMORY;
       parser->m_eventPtr = parser->m_eventEndPtr = NULL;
       parser->m_processor = errorProcessor;
@@ -1872,6 +1982,12 @@ XML_ParseBuffer(XML_Parser parser, int len, int isFinal) {
     parser->m_errorCode = XML_ERROR_FINISHED;
     return XML_STATUS_ERROR;
   case XML_INITIALIZED:
+    /* Has someone called XML_GetBuffer successfully before? */
+    if (! parser->m_bufferPtr) {
+      parser->m_errorCode = XML_ERROR_NO_BUFFER;
+      return XML_STATUS_ERROR;
+    }
+
     if (parser->m_parentParser == NULL && ! startParsing(parser)) {
       parser->m_errorCode = XML_ERROR_NO_MEMORY;
       return XML_STATUS_ERROR;
@@ -2155,7 +2271,7 @@ XML_GetInputContext(XML_Parser parser, int *offset, int *size) {
   (void)offset;
   (void)size;
 #endif /* defined XML_CONTEXT_BYTES */
-  return (char *)0;
+  return (const char *)0;
 }
 
 XML_Size XMLCALL
@@ -2316,6 +2432,14 @@ XML_ErrorString(enum XML_Error code) {
   /* Added in 2.2.5. */
   case XML_ERROR_INVALID_ARGUMENT: /* Constant added in 2.2.1, already */
     return XML_L("invalid argument");
+    /* Added in 2.3.0. */
+  case XML_ERROR_NO_BUFFER:
+    return XML_L(
+        "a successful prior call to function XML_GetBuffer is required");
+  /* Added in 2.4.0. */
+  case XML_ERROR_AMPLIFICATION_LIMIT_BREACH:
+    return XML_L(
+        "limit on input amplification factor (from DTD and entities) breached");
   }
   return NULL;
 }
@@ -2352,41 +2476,75 @@ XML_ExpatVersionInfo(void) {
 
 const XML_Feature *XMLCALL
 XML_GetFeatureList(void) {
-  static const XML_Feature features[]
-      = {{XML_FEATURE_SIZEOF_XML_CHAR, XML_L("sizeof(XML_Char)"),
-          sizeof(XML_Char)},
-         {XML_FEATURE_SIZEOF_XML_LCHAR, XML_L("sizeof(XML_LChar)"),
-          sizeof(XML_LChar)},
+  static const XML_Feature features[] = {
+      {XML_FEATURE_SIZEOF_XML_CHAR, XML_L("sizeof(XML_Char)"),
+       sizeof(XML_Char)},
+      {XML_FEATURE_SIZEOF_XML_LCHAR, XML_L("sizeof(XML_LChar)"),
+       sizeof(XML_LChar)},
 #ifdef XML_UNICODE
-         {XML_FEATURE_UNICODE, XML_L("XML_UNICODE"), 0},
+      {XML_FEATURE_UNICODE, XML_L("XML_UNICODE"), 0},
 #endif
 #ifdef XML_UNICODE_WCHAR_T
-         {XML_FEATURE_UNICODE_WCHAR_T, XML_L("XML_UNICODE_WCHAR_T"), 0},
+      {XML_FEATURE_UNICODE_WCHAR_T, XML_L("XML_UNICODE_WCHAR_T"), 0},
 #endif
 #ifdef XML_DTD
-         {XML_FEATURE_DTD, XML_L("XML_DTD"), 0},
+      {XML_FEATURE_DTD, XML_L("XML_DTD"), 0},
 #endif
 #ifdef XML_CONTEXT_BYTES
-         {XML_FEATURE_CONTEXT_BYTES, XML_L("XML_CONTEXT_BYTES"),
-          XML_CONTEXT_BYTES},
+      {XML_FEATURE_CONTEXT_BYTES, XML_L("XML_CONTEXT_BYTES"),
+       XML_CONTEXT_BYTES},
 #endif
 #ifdef XML_MIN_SIZE
-         {XML_FEATURE_MIN_SIZE, XML_L("XML_MIN_SIZE"), 0},
+      {XML_FEATURE_MIN_SIZE, XML_L("XML_MIN_SIZE"), 0},
 #endif
 #ifdef XML_NS
-         {XML_FEATURE_NS, XML_L("XML_NS"), 0},
+      {XML_FEATURE_NS, XML_L("XML_NS"), 0},
 #endif
 #ifdef XML_LARGE_SIZE
-         {XML_FEATURE_LARGE_SIZE, XML_L("XML_LARGE_SIZE"), 0},
+      {XML_FEATURE_LARGE_SIZE, XML_L("XML_LARGE_SIZE"), 0},
 #endif
 #ifdef XML_ATTR_INFO
-         {XML_FEATURE_ATTR_INFO, XML_L("XML_ATTR_INFO"), 0},
+      {XML_FEATURE_ATTR_INFO, XML_L("XML_ATTR_INFO"), 0},
+#endif
+#ifdef XML_DTD
+      /* Added in Expat 2.4.0. */
+      {XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT,
+       XML_L("XML_BLAP_MAX_AMP"),
+       (long int)
+           EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT},
+      {XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT,
+       XML_L("XML_BLAP_ACT_THRES"),
+       EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT},
 #endif
-         {XML_FEATURE_END, NULL, 0}};
+      {XML_FEATURE_END, NULL, 0}};
 
   return features;
 }
 
+#ifdef XML_DTD
+XML_Bool XMLCALL
+XML_SetBillionLaughsAttackProtectionMaximumAmplification(
+    XML_Parser parser, float maximumAmplificationFactor) {
+  if ((parser == NULL) || (parser->m_parentParser != NULL)
+      || isnan(maximumAmplificationFactor)
+      || (maximumAmplificationFactor < 1.0f)) {
+    return XML_FALSE;
+  }
+  parser->m_accounting.maximumAmplificationFactor = maximumAmplificationFactor;
+  return XML_TRUE;
+}
+
+XML_Bool XMLCALL
+XML_SetBillionLaughsAttackProtectionActivationThreshold(
+    XML_Parser parser, unsigned long long activationThresholdBytes) {
+  if ((parser == NULL) || (parser->m_parentParser != NULL)) {
+    return XML_FALSE;
+  }
+  parser->m_accounting.activationThresholdBytes = activationThresholdBytes;
+  return XML_TRUE;
+}
+#endif /* XML_DTD */
+
 /* Initially tag->rawName always points into the parse buffer;
    for those TAG instances opened while the current parse buffer was
    processed, and not yet closed, we need to store tag->rawName in a more
@@ -2439,9 +2597,9 @@ storeRawNames(XML_Parser parser) {
 static enum XML_Error PTRCALL
 contentProcessor(XML_Parser parser, const char *start, const char *end,
                  const char **endPtr) {
-  enum XML_Error result
-      = doContent(parser, 0, parser->m_encoding, start, end, endPtr,
-                  (XML_Bool)! parser->m_parsingStatus.finalBuffer);
+  enum XML_Error result = doContent(
+      parser, 0, parser->m_encoding, start, end, endPtr,
+      (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_ACCOUNT_DIRECT);
   if (result == XML_ERROR_NONE) {
     if (! storeRawNames(parser))
       return XML_ERROR_NO_MEMORY;
@@ -2466,6 +2624,14 @@ externalEntityInitProcessor2(XML_Parser parser, const char *start,
   int tok = XmlContentTok(parser->m_encoding, start, end, &next);
   switch (tok) {
   case XML_TOK_BOM:
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, start, next, __LINE__,
+                                  XML_ACCOUNT_DIRECT)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#endif /* XML_DTD */
+
     /* If we are at the end of the buffer, this would cause the next stage,
        i.e. externalEntityInitProcessor3, to pass control directly to
        doContent (by detecting XML_TOK_NONE) without processing any xml text
@@ -2503,6 +2669,10 @@ externalEntityInitProcessor3(XML_Parser parser, const char *start,
   const char *next = start; /* XmlContentTok doesn't always set the last arg */
   parser->m_eventPtr = start;
   tok = XmlContentTok(parser->m_encoding, start, end, &next);
+  /* Note: These bytes are accounted later in:
+           - processXmlDecl
+           - externalEntityContentProcessor
+  */
   parser->m_eventEndPtr = next;
 
   switch (tok) {
@@ -2544,7 +2714,8 @@ externalEntityContentProcessor(XML_Parser parser, const char *start,
                                const char *end, const char **endPtr) {
   enum XML_Error result
       = doContent(parser, 1, parser->m_encoding, start, end, endPtr,
-                  (XML_Bool)! parser->m_parsingStatus.finalBuffer);
+                  (XML_Bool)! parser->m_parsingStatus.finalBuffer,
+                  XML_ACCOUNT_ENTITY_EXPANSION);
   if (result == XML_ERROR_NONE) {
     if (! storeRawNames(parser))
       return XML_ERROR_NO_MEMORY;
@@ -2555,7 +2726,7 @@ externalEntityContentProcessor(XML_Parser parser, const char *start,
 static enum XML_Error
 doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
           const char *s, const char *end, const char **nextPtr,
-          XML_Bool haveMore) {
+          XML_Bool haveMore, enum XML_Account account) {
   /* save one level of indirection */
   DTD *const dtd = parser->m_dtd;
 
@@ -2573,6 +2744,17 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
   for (;;) {
     const char *next = s; /* XmlContentTok doesn't always set the last arg */
     int tok = XmlContentTok(enc, s, end, &next);
+#ifdef XML_DTD
+    const char *accountAfter
+        = ((tok == XML_TOK_TRAILING_RSQB) || (tok == XML_TOK_TRAILING_CR))
+              ? (haveMore ? s /* i.e. 0 bytes */ : end)
+              : next;
+    if (! accountingDiffTolerated(parser, tok, s, accountAfter, __LINE__,
+                                  account)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#endif
     *eventEndPP = next;
     switch (tok) {
     case XML_TOK_TRAILING_CR:
@@ -2628,6 +2810,14 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
       XML_Char ch = (XML_Char)XmlPredefinedEntityName(
           enc, s + enc->minBytesPerChar, next - enc->minBytesPerChar);
       if (ch) {
+#ifdef XML_DTD
+        /* NOTE: We are replacing 4-6 characters original input for 1 character
+         *       so there is no amplification and hence recording without
+         *       protection. */
+        accountingDiffTolerated(parser, tok, (char *)&ch,
+                                ((char *)&ch) + sizeof(XML_Char), __LINE__,
+                                XML_ACCOUNT_ENTITY_EXPANSION);
+#endif /* XML_DTD */
         if (parser->m_characterDataHandler)
           parser->m_characterDataHandler(parser->m_handlerArg, &ch, 1);
         else if (parser->m_defaultHandler)
@@ -2746,7 +2936,8 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
       }
       tag->name.str = (XML_Char *)tag->buf;
       *toPtr = XML_T('\0');
-      result = storeAtts(parser, enc, s, &(tag->name), &(tag->bindings));
+      result
+          = storeAtts(parser, enc, s, &(tag->name), &(tag->bindings), account);
       if (result)
         return result;
       if (parser->m_startElementHandler)
@@ -2770,7 +2961,8 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
       if (! name.str)
         return XML_ERROR_NO_MEMORY;
       poolFinish(&parser->m_tempPool);
-      result = storeAtts(parser, enc, s, &name, &bindings);
+      result = storeAtts(parser, enc, s, &name, &bindings,
+                         XML_ACCOUNT_NONE /* token spans whole start tag */);
       if (result != XML_ERROR_NONE) {
         freeBindings(parser, bindings);
         return result;
@@ -2905,7 +3097,8 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
       /* END disabled code */
       else if (parser->m_defaultHandler)
         reportDefault(parser, enc, s, next);
-      result = doCdataSection(parser, enc, &next, end, nextPtr, haveMore);
+      result
+          = doCdataSection(parser, enc, &next, end, nextPtr, haveMore, account);
       if (result != XML_ERROR_NONE)
         return result;
       else if (! next) {
@@ -3034,7 +3227,8 @@ freeBindings(XML_Parser parser, BINDING *bindings) {
 */
 static enum XML_Error
 storeAtts(XML_Parser parser, const ENCODING *enc, const char *attStr,
-          TAG_NAME *tagNamePtr, BINDING **bindingsPtr) {
+          TAG_NAME *tagNamePtr, BINDING **bindingsPtr,
+          enum XML_Account account) {
   DTD *const dtd = parser->m_dtd; /* save one level of indirection */
   ELEMENT_TYPE *elementType;
   int nDefaultAtts;
@@ -3144,7 +3338,7 @@ storeAtts(XML_Parser parser, const ENCODING *enc, const char *attStr,
       /* normalize the attribute value */
       result = storeAttributeValue(
           parser, enc, isCdata, parser->m_atts[i].valuePtr,
-          parser->m_atts[i].valueEnd, &parser->m_tempPool);
+          parser->m_atts[i].valueEnd, &parser->m_tempPool, account);
       if (result)
         return result;
       appAtts[attIndex] = poolStart(&parser->m_tempPool);
@@ -3533,9 +3727,9 @@ addBinding(XML_Parser parser, PREFIX *prefix, const ATTRIBUTE_ID *attId,
 static enum XML_Error PTRCALL
 cdataSectionProcessor(XML_Parser parser, const char *start, const char *end,
                       const char **endPtr) {
-  enum XML_Error result
-      = doCdataSection(parser, parser->m_encoding, &start, end, endPtr,
-                       (XML_Bool)! parser->m_parsingStatus.finalBuffer);
+  enum XML_Error result = doCdataSection(
+      parser, parser->m_encoding, &start, end, endPtr,
+      (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_ACCOUNT_DIRECT);
   if (result != XML_ERROR_NONE)
     return result;
   if (start) {
@@ -3555,7 +3749,8 @@ cdataSectionProcessor(XML_Parser parser, const char *start, const char *end,
 */
 static enum XML_Error
 doCdataSection(XML_Parser parser, const ENCODING *enc, const char **startPtr,
-               const char *end, const char **nextPtr, XML_Bool haveMore) {
+               const char *end, const char **nextPtr, XML_Bool haveMore,
+               enum XML_Account account) {
   const char *s = *startPtr;
   const char **eventPP;
   const char **eventEndPP;
@@ -3571,8 +3766,16 @@ doCdataSection(XML_Parser parser, const ENCODING *enc, const char **startPtr,
   *startPtr = NULL;
 
   for (;;) {
-    const char *next;
+    const char *next = s; /* in case of XML_TOK_NONE or XML_TOK_PARTIAL */
     int tok = XmlCdataSectionTok(enc, s, end, &next);
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, s, next, __LINE__, account)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#else
+    UNUSED_P(account);
+#endif
     *eventEndPP = next;
     switch (tok) {
     case XML_TOK_CDATA_SECT_CLOSE:
@@ -3689,7 +3892,7 @@ ignoreSectionProcessor(XML_Parser parser, const char *start, const char *end,
 static enum XML_Error
 doIgnoreSection(XML_Parser parser, const ENCODING *enc, const char **startPtr,
                 const char *end, const char **nextPtr, XML_Bool haveMore) {
-  const char *next;
+  const char *next = *startPtr; /* in case of XML_TOK_NONE or XML_TOK_PARTIAL */
   int tok;
   const char *s = *startPtr;
   const char **eventPP;
@@ -3717,6 +3920,13 @@ doIgnoreSection(XML_Parser parser, const ENCODING *enc, const char **startPtr,
   *eventPP = s;
   *startPtr = NULL;
   tok = XmlIgnoreSectionTok(enc, s, end, &next);
+#  ifdef XML_DTD
+  if (! accountingDiffTolerated(parser, tok, s, next, __LINE__,
+                                XML_ACCOUNT_DIRECT)) {
+    accountingOnAbort(parser);
+    return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+  }
+#  endif
   *eventEndPP = next;
   switch (tok) {
   case XML_TOK_IGNORE_SECT:
@@ -3801,6 +4011,15 @@ processXmlDecl(XML_Parser parser, int isGeneralTextEntity, const char *s,
   const char *versionend;
   const XML_Char *storedversion = NULL;
   int standalone = -1;
+
+#ifdef XML_DTD
+  if (! accountingDiffTolerated(parser, XML_TOK_XML_DECL, s, next, __LINE__,
+                                XML_ACCOUNT_DIRECT)) {
+    accountingOnAbort(parser);
+    return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+  }
+#endif
+
   if (! (parser->m_ns ? XmlParseXmlDeclNS : XmlParseXmlDecl)(
           isGeneralTextEntity, parser->m_encoding, s, next, &parser->m_eventPtr,
           &version, &versionend, &encodingName, &newEncoding, &standalone)) {
@@ -3950,6 +4169,10 @@ entityValueInitProcessor(XML_Parser parser, const char *s, const char *end,
 
   for (;;) {
     tok = XmlPrologTok(parser->m_encoding, start, end, &next);
+    /* Note: Except for XML_TOK_BOM below, these bytes are accounted later in:
+             - storeEntityValue
+             - processXmlDecl
+    */
     parser->m_eventEndPtr = next;
     if (tok <= 0) {
       if (! parser->m_parsingStatus.finalBuffer && tok != XML_TOK_INVALID) {
@@ -3968,7 +4191,8 @@ entityValueInitProcessor(XML_Parser parser, const char *s, const char *end,
         break;
       }
       /* found end of entity value - can store it now */
-      return storeEntityValue(parser, parser->m_encoding, s, end);
+      return storeEntityValue(parser, parser->m_encoding, s, end,
+                              XML_ACCOUNT_DIRECT);
     } else if (tok == XML_TOK_XML_DECL) {
       enum XML_Error result;
       result = processXmlDecl(parser, 0, start, next);
@@ -3995,6 +4219,14 @@ entityValueInitProcessor(XML_Parser parser, const char *s, const char *end,
     */
     else if (tok == XML_TOK_BOM && next == end
              && ! parser->m_parsingStatus.finalBuffer) {
+#  ifdef XML_DTD
+      if (! accountingDiffTolerated(parser, tok, s, next, __LINE__,
+                                    XML_ACCOUNT_DIRECT)) {
+        accountingOnAbort(parser);
+        return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+      }
+#  endif
+
       *nextPtr = next;
       return XML_ERROR_NONE;
     }
@@ -4037,16 +4269,24 @@ externalParEntProcessor(XML_Parser parser, const char *s, const char *end,
   }
   /* This would cause the next stage, i.e. doProlog to be passed XML_TOK_BOM.
      However, when parsing an external subset, doProlog will not accept a BOM
-     as valid, and report a syntax error, so we have to skip the BOM
+     as valid, and report a syntax error, so we have to skip the BOM, and
+     account for the BOM bytes.
   */
   else if (tok == XML_TOK_BOM) {
+    if (! accountingDiffTolerated(parser, tok, s, next, __LINE__,
+                                  XML_ACCOUNT_DIRECT)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+
     s = next;
     tok = XmlPrologTok(parser->m_encoding, s, end, &next);
   }
 
   parser->m_processor = prologProcessor;
   return doProlog(parser, parser->m_encoding, s, end, tok, next, nextPtr,
-                  (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE);
+                  (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE,
+                  XML_ACCOUNT_DIRECT);
 }
 
 static enum XML_Error PTRCALL
@@ -4059,6 +4299,9 @@ entityValueProcessor(XML_Parser parser, const char *s, const char *end,
 
   for (;;) {
     tok = XmlPrologTok(enc, start, end, &next);
+    /* Note: These bytes are accounted later in:
+             - storeEntityValue
+    */
     if (tok <= 0) {
       if (! parser->m_parsingStatus.finalBuffer && tok != XML_TOK_INVALID) {
         *nextPtr = s;
@@ -4076,7 +4319,7 @@ entityValueProcessor(XML_Parser parser, const char *s, const char *end,
         break;
       }
       /* found end of entity value - can store it now */
-      return storeEntityValue(parser, enc, s, end);
+      return storeEntityValue(parser, enc, s, end, XML_ACCOUNT_DIRECT);
     }
     start = next;
   }
@@ -4090,13 +4333,14 @@ prologProcessor(XML_Parser parser, const char *s, const char *end,
   const char *next = s;
   int tok = XmlPrologTok(parser->m_encoding, s, end, &next);
   return doProlog(parser, parser->m_encoding, s, end, tok, next, nextPtr,
-                  (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE);
+                  (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE,
+                  XML_ACCOUNT_DIRECT);
 }
 
 static enum XML_Error
 doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
          int tok, const char *next, const char **nextPtr, XML_Bool haveMore,
-         XML_Bool allowClosingDoctype) {
+         XML_Bool allowClosingDoctype, enum XML_Account account) {
 #ifdef XML_DTD
   static const XML_Char externalSubsetName[] = {ASCII_HASH, '\0'};
 #endif /* XML_DTD */
@@ -4123,6 +4367,10 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
   static const XML_Char enumValueSep[] = {ASCII_PIPE, '\0'};
   static const XML_Char enumValueStart[] = {ASCII_LPAREN, '\0'};
 
+#ifndef XML_DTD
+  UNUSED_P(account);
+#endif
+
   /* save one level of indirection */
   DTD *const dtd = parser->m_dtd;
 
@@ -4187,6 +4435,19 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
       }
     }
     role = XmlTokenRole(&parser->m_prologState, tok, s, next, enc);
+#ifdef XML_DTD
+    switch (role) {
+    case XML_ROLE_INSTANCE_START: // bytes accounted in contentProcessor
+    case XML_ROLE_XML_DECL:       // bytes accounted in processXmlDecl
+    case XML_ROLE_TEXT_DECL:      // bytes accounted in processXmlDecl
+      break;
+    default:
+      if (! accountingDiffTolerated(parser, tok, s, next, __LINE__, account)) {
+        accountingOnAbort(parser);
+        return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+      }
+    }
+#endif
     switch (role) {
     case XML_ROLE_XML_DECL: {
       enum XML_Error result = processXmlDecl(parser, 0, s, next);
@@ -4462,7 +4723,8 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
         const XML_Char *attVal;
         enum XML_Error result = storeAttributeValue(
             parser, enc, parser->m_declAttributeIsCdata,
-            s + enc->minBytesPerChar, next - enc->minBytesPerChar, &dtd->pool);
+            s + enc->minBytesPerChar, next - enc->minBytesPerChar, &dtd->pool,
+            XML_ACCOUNT_NONE);
         if (result)
           return result;
         attVal = poolStart(&dtd->pool);
@@ -4495,8 +4757,9 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
       break;
     case XML_ROLE_ENTITY_VALUE:
       if (dtd->keepProcessing) {
-        enum XML_Error result = storeEntityValue(
-            parser, enc, s + enc->minBytesPerChar, next - enc->minBytesPerChar);
+        enum XML_Error result
+            = storeEntityValue(parser, enc, s + enc->minBytesPerChar,
+                               next - enc->minBytesPerChar, XML_ACCOUNT_NONE);
         if (parser->m_declEntity) {
           parser->m_declEntity->textPtr = poolStart(&dtd->entityValuePool);
           parser->m_declEntity->textLen
@@ -4886,12 +5149,15 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
         if (parser->m_externalEntityRefHandler) {
           dtd->paramEntityRead = XML_FALSE;
           entity->open = XML_TRUE;
+          entityTrackingOnOpen(parser, entity, __LINE__);
           if (! parser->m_externalEntityRefHandler(
                   parser->m_externalEntityRefHandlerArg, 0, entity->base,
                   entity->systemId, entity->publicId)) {
+            entityTrackingOnClose(parser, entity, __LINE__);
             entity->open = XML_FALSE;
             return XML_ERROR_EXTERNAL_ENTITY_HANDLING;
           }
+          entityTrackingOnClose(parser, entity, __LINE__);
           entity->open = XML_FALSE;
           handleDefault = XML_FALSE;
           if (! dtd->paramEntityRead) {
@@ -5089,6 +5355,13 @@ epilogProcessor(XML_Parser parser, const char *s, const char *end,
   for (;;) {
     const char *next = NULL;
     int tok = XmlPrologTok(parser->m_encoding, s, end, &next);
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, s, next, __LINE__,
+                                  XML_ACCOUNT_DIRECT)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#endif
     parser->m_eventEndPtr = next;
     switch (tok) {
     /* report partial linebreak - it might be the last token */
@@ -5162,6 +5435,9 @@ processInternalEntity(XML_Parser parser, ENTITY *entity, XML_Bool betweenDecl) {
       return XML_ERROR_NO_MEMORY;
   }
   entity->open = XML_TRUE;
+#ifdef XML_DTD
+  entityTrackingOnOpen(parser, entity, __LINE__);
+#endif
   entity->processed = 0;
   openEntity->next = parser->m_openInternalEntities;
   parser->m_openInternalEntities = openEntity;
@@ -5170,8 +5446,8 @@ processInternalEntity(XML_Parser parser, ENTITY *entity, XML_Bool betweenDecl) {
   openEntity->betweenDecl = betweenDecl;
   openEntity->internalEventPtr = NULL;
   openEntity->internalEventEndPtr = NULL;
-  textStart = (char *)entity->textPtr;
-  textEnd = (char *)(entity->textPtr + entity->textLen);
+  textStart = (const char *)entity->textPtr;
+  textEnd = (const char *)(entity->textPtr + entity->textLen);
   /* Set a safe default value in case 'next' does not get set */
   next = textStart;
 
@@ -5180,17 +5456,22 @@ processInternalEntity(XML_Parser parser, ENTITY *entity, XML_Bool betweenDecl) {
     int tok
         = XmlPrologTok(parser->m_internalEncoding, textStart, textEnd, &next);
     result = doProlog(parser, parser->m_internalEncoding, textStart, textEnd,
-                      tok, next, &next, XML_FALSE, XML_FALSE);
+                      tok, next, &next, XML_FALSE, XML_FALSE,
+                      XML_ACCOUNT_ENTITY_EXPANSION);
   } else
 #endif /* XML_DTD */
     result = doContent(parser, parser->m_tagLevel, parser->m_internalEncoding,
-                       textStart, textEnd, &next, XML_FALSE);
+                       textStart, textEnd, &next, XML_FALSE,
+                       XML_ACCOUNT_ENTITY_EXPANSION);
 
   if (result == XML_ERROR_NONE) {
     if (textEnd != next && parser->m_parsingStatus.parsing == XML_SUSPENDED) {
       entity->processed = (int)(next - textStart);
       parser->m_processor = internalEntityProcessor;
     } else {
+#ifdef XML_DTD
+      entityTrackingOnClose(parser, entity, __LINE__);
+#endif /* XML_DTD */
       entity->open = XML_FALSE;
       parser->m_openInternalEntities = openEntity->next;
       /* put openEntity back in list of free instances */
@@ -5213,8 +5494,8 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,
     return XML_ERROR_UNEXPECTED_STATE;
 
   entity = openEntity->entity;
-  textStart = ((char *)entity->textPtr) + entity->processed;
-  textEnd = (char *)(entity->textPtr + entity->textLen);
+  textStart = ((const char *)entity->textPtr) + entity->processed;
+  textEnd = (const char *)(entity->textPtr + entity->textLen);
   /* Set a safe default value in case 'next' does not get set */
   next = textStart;
 
@@ -5223,20 +5504,24 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,
     int tok
         = XmlPrologTok(parser->m_internalEncoding, textStart, textEnd, &next);
     result = doProlog(parser, parser->m_internalEncoding, textStart, textEnd,
-                      tok, next, &next, XML_FALSE, XML_TRUE);
+                      tok, next, &next, XML_FALSE, XML_TRUE,
+                      XML_ACCOUNT_ENTITY_EXPANSION);
   } else
 #endif /* XML_DTD */
     result = doContent(parser, openEntity->startTagLevel,
                        parser->m_internalEncoding, textStart, textEnd, &next,
-                       XML_FALSE);
+                       XML_FALSE, XML_ACCOUNT_ENTITY_EXPANSION);
 
   if (result != XML_ERROR_NONE)
     return result;
   else if (textEnd != next
            && parser->m_parsingStatus.parsing == XML_SUSPENDED) {
-    entity->processed = (int)(next - (char *)entity->textPtr);
+    entity->processed = (int)(next - (const char *)entity->textPtr);
     return result;
   } else {
+#ifdef XML_DTD
+    entityTrackingOnClose(parser, entity, __LINE__);
+#endif
     entity->open = XML_FALSE;
     parser->m_openInternalEntities = openEntity->next;
     /* put openEntity back in list of free instances */
@@ -5250,7 +5535,8 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,
     parser->m_processor = prologProcessor;
     tok = XmlPrologTok(parser->m_encoding, s, end, &next);
     return doProlog(parser, parser->m_encoding, s, end, tok, next, nextPtr,
-                    (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE);
+                    (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE,
+                    XML_ACCOUNT_DIRECT);
   } else
 #endif /* XML_DTD */
   {
@@ -5258,7 +5544,8 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,
     /* see externalEntityContentProcessor vs contentProcessor */
     return doContent(parser, parser->m_parentParser ? 1 : 0, parser->m_encoding,
                      s, end, nextPtr,
-                     (XML_Bool)! parser->m_parsingStatus.finalBuffer);
+                     (XML_Bool)! parser->m_parsingStatus.finalBuffer,
+                     XML_ACCOUNT_DIRECT);
   }
 }
 
@@ -5273,9 +5560,10 @@ errorProcessor(XML_Parser parser, const char *s, const char *end,
 
 static enum XML_Error
 storeAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
-                    const char *ptr, const char *end, STRING_POOL *pool) {
+                    const char *ptr, const char *end, STRING_POOL *pool,
+                    enum XML_Account account) {
   enum XML_Error result
-      = appendAttributeValue(parser, enc, isCdata, ptr, end, pool);
+      = appendAttributeValue(parser, enc, isCdata, ptr, end, pool, account);
   if (result)
     return result;
   if (! isCdata && poolLength(pool) && poolLastChar(pool) == 0x20)
@@ -5287,11 +5575,23 @@ storeAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
 
 static enum XML_Error
 appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
-                     const char *ptr, const char *end, STRING_POOL *pool) {
+                     const char *ptr, const char *end, STRING_POOL *pool,
+                     enum XML_Account account) {
   DTD *const dtd = parser->m_dtd; /* save one level of indirection */
+#ifndef XML_DTD
+  UNUSED_P(account);
+#endif
+
   for (;;) {
-    const char *next;
+    const char *next
+        = ptr; /* XmlAttributeValueTok doesn't always set the last arg */
     int tok = XmlAttributeValueTok(enc, ptr, end, &next);
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, ptr, next, __LINE__, account)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#endif
     switch (tok) {
     case XML_TOK_NONE:
       return XML_ERROR_NONE;
@@ -5351,6 +5651,14 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
       XML_Char ch = (XML_Char)XmlPredefinedEntityName(
           enc, ptr + enc->minBytesPerChar, next - enc->minBytesPerChar);
       if (ch) {
+#ifdef XML_DTD
+        /* NOTE: We are replacing 4-6 characters original input for 1 character
+         *       so there is no amplification and hence recording without
+         *       protection. */
+        accountingDiffTolerated(parser, tok, (char *)&ch,
+                                ((char *)&ch) + sizeof(XML_Char), __LINE__,
+                                XML_ACCOUNT_ENTITY_EXPANSION);
+#endif /* XML_DTD */
         if (! poolAppendChar(pool, ch))
           return XML_ERROR_NO_MEMORY;
         break;
@@ -5428,9 +5736,16 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
         enum XML_Error result;
         const XML_Char *textEnd = entity->textPtr + entity->textLen;
         entity->open = XML_TRUE;
+#ifdef XML_DTD
+        entityTrackingOnOpen(parser, entity, __LINE__);
+#endif
         result = appendAttributeValue(parser, parser->m_internalEncoding,
-                                      isCdata, (char *)entity->textPtr,
-                                      (char *)textEnd, pool);
+                                      isCdata, (const char *)entity->textPtr,
+                                      (const char *)textEnd, pool,
+                                      XML_ACCOUNT_ENTITY_EXPANSION);
+#ifdef XML_DTD
+        entityTrackingOnClose(parser, entity, __LINE__);
+#endif
         entity->open = XML_FALSE;
         if (result)
           return result;
@@ -5460,13 +5775,16 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
 
 static enum XML_Error
 storeEntityValue(XML_Parser parser, const ENCODING *enc,
-                 const char *entityTextPtr, const char *entityTextEnd) {
+                 const char *entityTextPtr, const char *entityTextEnd,
+                 enum XML_Account account) {
   DTD *const dtd = parser->m_dtd; /* save one level of indirection */
   STRING_POOL *pool = &(dtd->entityValuePool);
   enum XML_Error result = XML_ERROR_NONE;
 #ifdef XML_DTD
   int oldInEntityValue = parser->m_prologState.inEntityValue;
   parser->m_prologState.inEntityValue = 1;
+#else
+  UNUSED_P(account);
 #endif /* XML_DTD */
   /* never return Null for the value argument in EntityDeclHandler,
      since this would indicate an external entity; therefore we
@@ -5477,8 +5795,19 @@ storeEntityValue(XML_Parser parser, const ENCODING *enc,
   }
 
   for (;;) {
-    const char *next;
+    const char *next
+        = entityTextPtr; /* XmlEntityValueTok doesn't always set the last arg */
     int tok = XmlEntityValueTok(enc, entityTextPtr, entityTextEnd, &next);
+
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, entityTextPtr, next, __LINE__,
+                                  account)) {
+      accountingOnAbort(parser);
+      result = XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+      goto endEntityValue;
+    }
+#endif
+
     switch (tok) {
     case XML_TOK_PARAM_ENTITY_REF:
 #ifdef XML_DTD
@@ -5514,13 +5843,16 @@ storeEntityValue(XML_Parser parser, const ENCODING *enc,
           if (parser->m_externalEntityRefHandler) {
             dtd->paramEntityRead = XML_FALSE;
             entity->open = XML_TRUE;
+            entityTrackingOnOpen(parser, entity, __LINE__);
             if (! parser->m_externalEntityRefHandler(
                     parser->m_externalEntityRefHandlerArg, 0, entity->base,
                     entity->systemId, entity->publicId)) {
+              entityTrackingOnClose(parser, entity, __LINE__);
               entity->open = XML_FALSE;
               result = XML_ERROR_EXTERNAL_ENTITY_HANDLING;
               goto endEntityValue;
             }
+            entityTrackingOnClose(parser, entity, __LINE__);
             entity->open = XML_FALSE;
             if (! dtd->paramEntityRead)
               dtd->keepProcessing = dtd->standalone;
@@ -5528,9 +5860,12 @@ storeEntityValue(XML_Parser parser, const ENCODING *enc,
             dtd->keepProcessing = dtd->standalone;
         } else {
           entity->open = XML_TRUE;
+          entityTrackingOnOpen(parser, entity, __LINE__);
           result = storeEntityValue(
-              parser, parser->m_internalEncoding, (char *)entity->textPtr,
-              (char *)(entity->textPtr + entity->textLen));
+              parser, parser->m_internalEncoding, (const char *)entity->textPtr,
+              (const char *)(entity->textPtr + entity->textLen),
+              XML_ACCOUNT_ENTITY_EXPANSION);
+          entityTrackingOnClose(parser, entity, __LINE__);
           entity->open = XML_FALSE;
           if (result)
             goto endEntityValue;
@@ -6485,7 +6820,7 @@ hashTableInit(HASH_TABLE *p, const XML_Memory_Handling_Suite *ms) {
 static void FASTCALL
 hashTableIterInit(HASH_TABLE_ITER *iter, const HASH_TABLE *table) {
   iter->p = table->v;
-  iter->end = iter->p + table->size;
+  iter->end = iter->p ? iter->p + table->size : NULL;
 }
 
 static NAMED *FASTCALL
@@ -6891,3 +7226,755 @@ copyString(const XML_Char *s, const XML_Memory_Handling_Suite *memsuite) {
   memcpy(result, s, charsRequired * sizeof(XML_Char));
   return result;
 }
+
+#ifdef XML_DTD
+
+static float
+accountingGetCurrentAmplification(XML_Parser rootParser) {
+  const XmlBigCount countBytesOutput
+      = rootParser->m_accounting.countBytesDirect
+        + rootParser->m_accounting.countBytesIndirect;
+  const float amplificationFactor
+      = rootParser->m_accounting.countBytesDirect
+            ? (countBytesOutput
+               / (float)(rootParser->m_accounting.countBytesDirect))
+            : 1.0f;
+  assert(! rootParser->m_parentParser);
+  return amplificationFactor;
+}
+
+static void
+accountingReportStats(XML_Parser originParser, const char *epilog) {
+  const XML_Parser rootParser = getRootParserOf(originParser, NULL);
+  assert(! rootParser->m_parentParser);
+
+  if (rootParser->m_accounting.debugLevel < 1) {
+    return;
+  }
+
+  const float amplificationFactor
+      = accountingGetCurrentAmplification(rootParser);
+  fprintf(stderr,
+          "expat: Accounting(%p): Direct " EXPAT_FMT_ULL(
+              "10") ", indirect " EXPAT_FMT_ULL("10") ", amplification %8.2f%s",
+          (void *)rootParser, rootParser->m_accounting.countBytesDirect,
+          rootParser->m_accounting.countBytesIndirect,
+          (double)amplificationFactor, epilog);
+}
+
+static void
+accountingOnAbort(XML_Parser originParser) {
+  accountingReportStats(originParser, " ABORTING\n");
+}
+
+static void
+accountingReportDiff(XML_Parser rootParser,
+                     unsigned int levelsAwayFromRootParser, const char *before,
+                     const char *after, ptrdiff_t bytesMore, int source_line,
+                     enum XML_Account account) {
+  assert(! rootParser->m_parentParser);
+
+  fprintf(stderr,
+          " (+" EXPAT_FMT_PTRDIFF_T("6") " bytes %s|%d, xmlparse.c:%d) %*s\"",
+          bytesMore, (account == XML_ACCOUNT_DIRECT) ? "DIR" : "EXP",
+          levelsAwayFromRootParser, source_line, 10, "");
+
+  const char ellipis[] = "[..]";
+  const size_t ellipsisLength = sizeof(ellipis) /* because compile-time */ - 1;
+  const unsigned int contextLength = 10;
+
+  /* Note: Performance is of no concern here */
+  const char *walker = before;
+  if ((rootParser->m_accounting.debugLevel >= 3)
+      || (after - before)
+             <= (ptrdiff_t)(contextLength + ellipsisLength + contextLength)) {
+    for (; walker < after; walker++) {
+      fprintf(stderr, "%s", unsignedCharToPrintable(walker[0]));
+    }
+  } else {
+    for (; walker < before + contextLength; walker++) {
+      fprintf(stderr, "%s", unsignedCharToPrintable(walker[0]));
+    }
+    fprintf(stderr, ellipis);
+    walker = after - contextLength;
+    for (; walker < after; walker++) {
+      fprintf(stderr, "%s", unsignedCharToPrintable(walker[0]));
+    }
+  }
+  fprintf(stderr, "\"\n");
+}
+
+static XML_Bool
+accountingDiffTolerated(XML_Parser originParser, int tok, const char *before,
+                        const char *after, int source_line,
+                        enum XML_Account account) {
+  /* Note: We need to check the token type *first* to be sure that
+   *       we can even access variable <after>, safely.
+   *       E.g. for XML_TOK_NONE <after> may hold an invalid pointer. */
+  switch (tok) {
+  case XML_TOK_INVALID:
+  case XML_TOK_PARTIAL:
+  case XML_TOK_PARTIAL_CHAR:
+  case XML_TOK_NONE:
+    return XML_TRUE;
+  }
+
+  if (account == XML_ACCOUNT_NONE)
+    return XML_TRUE; /* because these bytes have been accounted for, already */
+
+  unsigned int levelsAwayFromRootParser;
+  const XML_Parser rootParser
+      = getRootParserOf(originParser, &levelsAwayFromRootParser);
+  assert(! rootParser->m_parentParser);
+
+  const int isDirect
+      = (account == XML_ACCOUNT_DIRECT) && (originParser == rootParser);
+  const ptrdiff_t bytesMore = after - before;
+
+  XmlBigCount *const additionTarget
+      = isDirect ? &rootParser->m_accounting.countBytesDirect
+                 : &rootParser->m_accounting.countBytesIndirect;
+
+  /* Detect and avoid integer overflow */
+  if (*additionTarget > (XmlBigCount)(-1) - (XmlBigCount)bytesMore)
+    return XML_FALSE;
+  *additionTarget += bytesMore;
+
+  const XmlBigCount countBytesOutput
+      = rootParser->m_accounting.countBytesDirect
+        + rootParser->m_accounting.countBytesIndirect;
+  const float amplificationFactor
+      = accountingGetCurrentAmplification(rootParser);
+  const XML_Bool tolerated
+      = (countBytesOutput < rootParser->m_accounting.activationThresholdBytes)
+        || (amplificationFactor
+            <= rootParser->m_accounting.maximumAmplificationFactor);
+
+  if (rootParser->m_accounting.debugLevel >= 2) {
+    accountingReportStats(rootParser, "");
+    accountingReportDiff(rootParser, levelsAwayFromRootParser, before, after,
+                         bytesMore, source_line, account);
+  }
+
+  return tolerated;
+}
+
+unsigned long long
+testingAccountingGetCountBytesDirect(XML_Parser parser) {
+  if (! parser)
+    return 0;
+  return parser->m_accounting.countBytesDirect;
+}
+
+unsigned long long
+testingAccountingGetCountBytesIndirect(XML_Parser parser) {
+  if (! parser)
+    return 0;
+  return parser->m_accounting.countBytesIndirect;
+}
+
+static void
+entityTrackingReportStats(XML_Parser rootParser, ENTITY *entity,
+                          const char *action, int sourceLine) {
+  assert(! rootParser->m_parentParser);
+  if (rootParser->m_entity_stats.debugLevel < 1)
+    return;
+
+#  if defined(XML_UNICODE)
+  const char *const entityName = "[..]";
+#  else
+  const char *const entityName = entity->name;
+#  endif
+
+  fprintf(
+      stderr,
+      "expat: Entities(%p): Count %9d, depth %2d/%2d %*s%s%s; %s length %d (xmlparse.c:%d)\n",
+      (void *)rootParser, rootParser->m_entity_stats.countEverOpened,
+      rootParser->m_entity_stats.currentDepth,
+      rootParser->m_entity_stats.maximumDepthSeen,
+      (rootParser->m_entity_stats.currentDepth - 1) * 2, "",
+      entity->is_param ? "%" : "&", entityName, action, entity->textLen,
+      sourceLine);
+}
+
+static void
+entityTrackingOnOpen(XML_Parser originParser, ENTITY *entity, int sourceLine) {
+  const XML_Parser rootParser = getRootParserOf(originParser, NULL);
+  assert(! rootParser->m_parentParser);
+
+  rootParser->m_entity_stats.countEverOpened++;
+  rootParser->m_entity_stats.currentDepth++;
+  if (rootParser->m_entity_stats.currentDepth
+      > rootParser->m_entity_stats.maximumDepthSeen) {
+    rootParser->m_entity_stats.maximumDepthSeen++;
+  }
+
+  entityTrackingReportStats(rootParser, entity, "OPEN ", sourceLine);
+}
+
+static void
+entityTrackingOnClose(XML_Parser originParser, ENTITY *entity, int sourceLine) {
+  const XML_Parser rootParser = getRootParserOf(originParser, NULL);
+  assert(! rootParser->m_parentParser);
+
+  entityTrackingReportStats(rootParser, entity, "CLOSE", sourceLine);
+  rootParser->m_entity_stats.currentDepth--;
+}
+
+static XML_Parser
+getRootParserOf(XML_Parser parser, unsigned int *outLevelDiff) {
+  XML_Parser rootParser = parser;
+  unsigned int stepsTakenUpwards = 0;
+  while (rootParser->m_parentParser) {
+    rootParser = rootParser->m_parentParser;
+    stepsTakenUpwards++;
+  }
+  assert(! rootParser->m_parentParser);
+  if (outLevelDiff != NULL) {
+    *outLevelDiff = stepsTakenUpwards;
+  }
+  return rootParser;
+}
+
+const char *
+unsignedCharToPrintable(unsigned char c) {
+  switch (c) {
+  case 0:
+    return "\\0";
+  case 1:
+    return "\\x1";
+  case 2:
+    return "\\x2";
+  case 3:
+    return "\\x3";
+  case 4:
+    return "\\x4";
+  case 5:
+    return "\\x5";
+  case 6:
+    return "\\x6";
+  case 7:
+    return "\\x7";
+  case 8:
+    return "\\x8";
+  case 9:
+    return "\\t";
+  case 10:
+    return "\\n";
+  case 11:
+    return "\\xB";
+  case 12:
+    return "\\xC";
+  case 13:
+    return "\\r";
+  case 14:
+    return "\\xE";
+  case 15:
+    return "\\xF";
+  case 16:
+    return "\\x10";
+  case 17:
+    return "\\x11";
+  case 18:
+    return "\\x12";
+  case 19:
+    return "\\x13";
+  case 20:
+    return "\\x14";
+  case 21:
+    return "\\x15";
+  case 22:
+    return "\\x16";
+  case 23:
+    return "\\x17";
+  case 24:
+    return "\\x18";
+  case 25:
+    return "\\x19";
+  case 26:
+    return "\\x1A";
+  case 27:
+    return "\\x1B";
+  case 28:
+    return "\\x1C";
+  case 29:
+    return "\\x1D";
+  case 30:
+    return "\\x1E";
+  case 31:
+    return "\\x1F";
+  case 32:
+    return " ";
+  case 33:
+    return "!";
+  case 34:
+    return "\\\"";
+  case 35:
+    return "#";
+  case 36:
+    return "$";
+  case 37:
+    return "%";
+  case 38:
+    return "&";
+  case 39:
+    return "'";
+  case 40:
+    return "(";
+  case 41:
+    return ")";
+  case 42:
+    return "*";
+  case 43:
+    return "+";
+  case 44:
+    return ",";
+  case 45:
+    return "-";
+  case 46:
+    return ".";
+  case 47:
+    return "/";
+  case 48:
+    return "0";
+  case 49:
+    return "1";
+  case 50:
+    return "2";
+  case 51:
+    return "3";
+  case 52:
+    return "4";
+  case 53:
+    return "5";
+  case 54:
+    return "6";
+  case 55:
+    return "7";
+  case 56:
+    return "8";
+  case 57:
+    return "9";
+  case 58:
+    return ":";
+  case 59:
+    return ";";
+  case 60:
+    return "<";
+  case 61:
+    return "=";
+  case 62:
+    return ">";
+  case 63:
+    return "?";
+  case 64:
+    return "@";
+  case 65:
+    return "A";
+  case 66:
+    return "B";
+  case 67:
+    return "C";
+  case 68:
+    return "D";
+  case 69:
+    return "E";
+  case 70:
+    return "F";
+  case 71:
+    return "G";
+  case 72:
+    return "H";
+  case 73:
+    return "I";
+  case 74:
+    return "J";
+  case 75:
+    return "K";
+  case 76:
+    return "L";
+  case 77:
+    return "M";
+  case 78:
+    return "N";
+  case 79:
+    return "O";
+  case 80:
+    return "P";
+  case 81:
+    return "Q";
+  case 82:
+    return "R";
+  case 83:
+    return "S";
+  case 84:
+    return "T";
+  case 85:
+    return "U";
+  case 86:
+    return "V";
+  case 87:
+    return "W";
+  case 88:
+    return "X";
+  case 89:
+    return "Y";
+  case 90:
+    return "Z";
+  case 91:
+    return "[";
+  case 92:
+    return "\\\\";
+  case 93:
+    return "]";
+  case 94:
+    return "^";
+  case 95:
+    return "_";
+  case 96:
+    return "`";
+  case 97:
+    return "a";
+  case 98:
+    return "b";
+  case 99:
+    return "c";
+  case 100:
+    return "d";
+  case 101:
+    return "e";
+  case 102:
+    return "f";
+  case 103:
+    return "g";
+  case 104:
+    return "h";
+  case 105:
+    return "i";
+  case 106:
+    return "j";
+  case 107:
+    return "k";
+  case 108:
+    return "l";
+  case 109:
+    return "m";
+  case 110:
+    return "n";
+  case 111:
+    return "o";
+  case 112:
+    return "p";
+  case 113:
+    return "q";
+  case 114:
+    return "r";
+  case 115:
+    return "s";
+  case 116:
+    return "t";
+  case 117:
+    return "u";
+  case 118:
+    return "v";
+  case 119:
+    return "w";
+  case 120:
+    return "x";
+  case 121:
+    return "y";
+  case 122:
+    return "z";
+  case 123:
+    return "{";
+  case 124:
+    return "|";
+  case 125:
+    return "}";
+  case 126:
+    return "~";
+  case 127:
+    return "\\x7F";
+  case 128:
+    return "\\x80";
+  case 129:
+    return "\\x81";
+  case 130:
+    return "\\x82";
+  case 131:
+    return "\\x83";
+  case 132:
+    return "\\x84";
+  case 133:
+    return "\\x85";
+  case 134:
+    return "\\x86";
+  case 135:
+    return "\\x87";
+  case 136:
+    return "\\x88";
+  case 137:
+    return "\\x89";
+  case 138:
+    return "\\x8A";
+  case 139:
+    return "\\x8B";
+  case 140:
+    return "\\x8C";
+  case 141:
+    return "\\x8D";
+  case 142:
+    return "\\x8E";
+  case 143:
+    return "\\x8F";
+  case 144:
+    return "\\x90";
+  case 145:
+    return "\\x91";
+  case 146:
+    return "\\x92";
+  case 147:
+    return "\\x93";
+  case 148:
+    return "\\x94";
+  case 149:
+    return "\\x95";
+  case 150:
+    return "\\x96";
+  case 151:
+    return "\\x97";
+  case 152:
+    return "\\x98";
+  case 153:
+    return "\\x99";
+  case 154:
+    return "\\x9A";
+  case 155:
+    return "\\x9B";
+  case 156:
+    return "\\x9C";
+  case 157:
+    return "\\x9D";
+  case 158:
+    return "\\x9E";
+  case 159:
+    return "\\x9F";
+  case 160:
+    return "\\xA0";
+  case 161:
+    return "\\xA1";
+  case 162:
+    return "\\xA2";
+  case 163:
+    return "\\xA3";
+  case 164:
+    return "\\xA4";
+  case 165:
+    return "\\xA5";
+  case 166:
+    return "\\xA6";
+  case 167:
+    return "\\xA7";
+  case 168:
+    return "\\xA8";
+  case 169:
+    return "\\xA9";
+  case 170:
+    return "\\xAA";
+  case 171:
+    return "\\xAB";
+  case 172:
+    return "\\xAC";
+  case 173:
+    return "\\xAD";
+  case 174:
+    return "\\xAE";
+  case 175:
+    return "\\xAF";
+  case 176:
+    return "\\xB0";
+  case 177:
+    return "\\xB1";
+  case 178:
+    return "\\xB2";
+  case 179:
+    return "\\xB3";
+  case 180:
+    return "\\xB4";
+  case 181:
+    return "\\xB5";
+  case 182:
+    return "\\xB6";
+  case 183:
+    return "\\xB7";
+  case 184:
+    return "\\xB8";
+  case 185:
+    return "\\xB9";
+  case 186:
+    return "\\xBA";
+  case 187:
+    return "\\xBB";
+  case 188:
+    return "\\xBC";
+  case 189:
+    return "\\xBD";
+  case 190:
+    return "\\xBE";
+  case 191:
+    return "\\xBF";
+  case 192:
+    return "\\xC0";
+  case 193:
+    return "\\xC1";
+  case 194:
+    return "\\xC2";
+  case 195:
+    return "\\xC3";
+  case 196:
+    return "\\xC4";
+  case 197:
+    return "\\xC5";
+  case 198:
+    return "\\xC6";
+  case 199:
+    return "\\xC7";
+  case 200:
+    return "\\xC8";
+  case 201:
+    return "\\xC9";
+  case 202:
+    return "\\xCA";
+  case 203:
+    return "\\xCB";
+  case 204:
+    return "\\xCC";
+  case 205:
+    return "\\xCD";
+  case 206:
+    return "\\xCE";
+  case 207:
+    return "\\xCF";
+  case 208:
+    return "\\xD0";
+  case 209:
+    return "\\xD1";
+  case 210:
+    return "\\xD2";
+  case 211:
+    return "\\xD3";
+  case 212:
+    return "\\xD4";
+  case 213:
+    return "\\xD5";
+  case 214:
+    return "\\xD6";
+  case 215:
+    return "\\xD7";
+  case 216:
+    return "\\xD8";
+  case 217:
+    return "\\xD9";
+  case 218:
+    return "\\xDA";
+  case 219:
+    return "\\xDB";
+  case 220:
+    return "\\xDC";
+  case 221:
+    return "\\xDD";
+  case 222:
+    return "\\xDE";
+  case 223:
+    return "\\xDF";
+  case 224:
+    return "\\xE0";
+  case 225:
+    return "\\xE1";
+  case 226:
+    return "\\xE2";
+  case 227:
+    return "\\xE3";
+  case 228:
+    return "\\xE4";
+  case 229:
+    return "\\xE5";
+  case 230:
+    return "\\xE6";
+  case 231:
+    return "\\xE7";
+  case 232:
+    return "\\xE8";
+  case 233:
+    return "\\xE9";
+  case 234:
+    return "\\xEA";
+  case 235:
+    return "\\xEB";
+  case 236:
+    return "\\xEC";
+  case 237:
+    return "\\xED";
+  case 238:
+    return "\\xEE";
+  case 239:
+    return "\\xEF";
+  case 240:
+    return "\\xF0";
+  case 241:
+    return "\\xF1";
+  case 242:
+    return "\\xF2";
+  case 243:
+    return "\\xF3";
+  case 244:
+    return "\\xF4";
+  case 245:
+    return "\\xF5";
+  case 246:
+    return "\\xF6";
+  case 247:
+    return "\\xF7";
+  case 248:
+    return "\\xF8";
+  case 249:
+    return "\\xF9";
+  case 250:
+    return "\\xFA";
+  case 251:
+    return "\\xFB";
+  case 252:
+    return "\\xFC";
+  case 253:
+    return "\\xFD";
+  case 254:
+    return "\\xFE";
+  case 255:
+    return "\\xFF";
+  default:
+    assert(0); /* never gets here */
+    return "dead code";
+  }
+  assert(0); /* never gets here */
+}
+
+#endif /* XML_DTD */
+
+static unsigned long
+getDebugLevel(const char *variableName, unsigned long defaultDebugLevel) {
+  const char *const valueOrNull = getenv(variableName);
+  if (valueOrNull == NULL) {
+    return defaultDebugLevel;
+  }
+  const char *const value = valueOrNull;
+
+  errno = 0;
+  char *afterValue = (char *)value;
+  unsigned long debugLevel = strtoul(value, &afterValue, 10);
+  if ((errno != 0) || (afterValue[0] != '\0')) {
+    errno = 0;
+    return defaultDebugLevel;
+  }
+
+  return debugLevel;
+}
diff --git a/Modules/expat/xmlrole.c b/Modules/expat/xmlrole.c
index 4d3e3e86e9e864..08173b0fd541d2 100644
--- a/Modules/expat/xmlrole.c
+++ b/Modules/expat/xmlrole.c
@@ -7,7 +7,14 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2006 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2002-2003 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2005-2009 Steven Solie <ssolie at users.sourceforge.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -34,11 +41,9 @@
 
 #ifdef _WIN32
 #  include "winconfig.h"
-#else
-#  ifdef HAVE_EXPAT_CONFIG_H
-#    include <expat_config.h>
-#  endif
-#endif /* ndef _WIN32 */
+#endif
+
+#include <expat_config.h>
 
 #include "expat_external.h"
 #include "internal.h"
@@ -1220,6 +1225,8 @@ common(PROLOG_STATE *state, int tok) {
 #ifdef XML_DTD
   if (! state->documentEntity && tok == XML_TOK_PARAM_ENTITY_REF)
     return XML_ROLE_INNER_PARAM_ENTITY_REF;
+#else
+  UNUSED_P(tok);
 #endif
   state->handler = error;
   return XML_ROLE_ERROR;
diff --git a/Modules/expat/xmlrole.h b/Modules/expat/xmlrole.h
index 036aba64fd29c6..d6e1fa150a108a 100644
--- a/Modules/expat/xmlrole.h
+++ b/Modules/expat/xmlrole.h
@@ -7,7 +7,10 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/xmltok.c b/Modules/expat/xmltok.c
index 11e9d1ccdad423..f2b6b406067ea9 100644
--- a/Modules/expat/xmltok.c
+++ b/Modules/expat/xmltok.c
@@ -7,7 +7,19 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2001-2003 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2016 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2005-2009 Steven Solie <ssolie at users.sourceforge.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2016      Pascal Cuoq <cuoq at trust-in-soft.com>
+   Copyright (c) 2016      Don Lewis <truckman at apache.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2017      Alexander Bluhm <alexander.bluhm at gmx.net>
+   Copyright (c) 2017      Benbuck Nason <bnason at netflix.com>
+   Copyright (c) 2017      Jos? Guti?rrez de la Concha <jose at zeroc.com>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -32,23 +44,13 @@
 
 #include <stddef.h>
 #include <string.h> /* memcpy */
-
-#if defined(_MSC_VER) && (_MSC_VER <= 1700)
-/* for vs2012/11.0/1700 and earlier Visual Studio compilers */
-#  define bool int
-#  define false 0
-#  define true 1
-#else
-#  include <stdbool.h>
-#endif
+#include <stdbool.h>
 
 #ifdef _WIN32
 #  include "winconfig.h"
-#else
-#  ifdef HAVE_EXPAT_CONFIG_H
-#    include <expat_config.h>
-#  endif
-#endif /* ndef _WIN32 */
+#endif
+
+#include <expat_config.h>
 
 #include "expat_external.h"
 #include "internal.h"
@@ -269,8 +271,14 @@ sb_byteToAscii(const ENCODING *enc, const char *p) {
 
 #define IS_NAME_CHAR(enc, p, n) (AS_NORMAL_ENCODING(enc)->isName##n(enc, p))
 #define IS_NMSTRT_CHAR(enc, p, n) (AS_NORMAL_ENCODING(enc)->isNmstrt##n(enc, p))
-#define IS_INVALID_CHAR(enc, p, n)                                             \
-  (AS_NORMAL_ENCODING(enc)->isInvalid##n(enc, p))
+#ifdef XML_MIN_SIZE
+#  define IS_INVALID_CHAR(enc, p, n)                                           \
+    (AS_NORMAL_ENCODING(enc)->isInvalid##n                                     \
+     && AS_NORMAL_ENCODING(enc)->isInvalid##n(enc, p))
+#else
+#  define IS_INVALID_CHAR(enc, p, n)                                           \
+    (AS_NORMAL_ENCODING(enc)->isInvalid##n(enc, p))
+#endif
 
 #ifdef XML_MIN_SIZE
 #  define IS_NAME_CHAR_MINBPC(enc, p)                                          \
@@ -589,13 +597,13 @@ static const struct normal_encoding ascii_encoding
 static int PTRFASTCALL
 unicode_byte_type(char hi, char lo) {
   switch ((unsigned char)hi) {
-  /* 0xD800?0xDBFF first 16-bit code unit or high surrogate (W1) */
+  /* 0xD800-0xDBFF first 16-bit code unit or high surrogate (W1) */
   case 0xD8:
   case 0xD9:
   case 0xDA:
   case 0xDB:
     return BT_LEAD4;
-  /* 0xDC00?0xDFFF second 16-bit code unit or low surrogate (W2) */
+  /* 0xDC00-0xDFFF second 16-bit code unit or low surrogate (W2) */
   case 0xDC:
   case 0xDD:
   case 0xDE:
diff --git a/Modules/expat/xmltok.h b/Modules/expat/xmltok.h
index 2adbf5307befae..6f630c2f9ba96d 100644
--- a/Modules/expat/xmltok.h
+++ b/Modules/expat/xmltok.h
@@ -7,7 +7,11 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002-2005 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2016-2017 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/xmltok_impl.c b/Modules/expat/xmltok_impl.c
index c209221cd79d13..0430591b42636e 100644
--- a/Modules/expat/xmltok_impl.c
+++ b/Modules/expat/xmltok_impl.c
@@ -1,4 +1,4 @@
-/* This file is included!
+/* This file is included (from xmltok.c, 1-3 times depending on XML_MIN_SIZE)!
                             __  __            _
                          ___\ \/ /_ __   __ _| |_
                         / _ \\  /| '_ \ / _` | __|
@@ -7,7 +7,15 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002-2016 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2018      Benjamin Peterson <benjamin at python.org>
+   Copyright (c) 2018      Anton Maklakov <antmak.pub at gmail.com>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
+   Copyright (c) 2020      Boris Kolpackov <boris at codesynthesis.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -32,7 +40,7 @@
 
 #ifdef XML_TOK_IMPL_C
 
-#  ifndef IS_INVALID_CHAR
+#  ifndef IS_INVALID_CHAR // i.e. for UTF-16 and XML_MIN_SIZE not defined
 #    define IS_INVALID_CHAR(enc, ptr, n) (0)
 #  endif
 
@@ -1768,13 +1776,14 @@ PREFIX(updatePosition)(const ENCODING *enc, const char *ptr, const char *end,
 #  define LEAD_CASE(n)                                                         \
   case BT_LEAD##n:                                                             \
     ptr += n;                                                                  \
+    pos->columnNumber++;                                                       \
     break;
       LEAD_CASE(2)
       LEAD_CASE(3)
       LEAD_CASE(4)
 #  undef LEAD_CASE
     case BT_LF:
-      pos->columnNumber = (XML_Size)-1;
+      pos->columnNumber = 0;
       pos->lineNumber++;
       ptr += MINBPC(enc);
       break;
@@ -1783,13 +1792,13 @@ PREFIX(updatePosition)(const ENCODING *enc, const char *ptr, const char *end,
       ptr += MINBPC(enc);
       if (HAS_CHAR(enc, ptr, end) && BYTE_TYPE(enc, ptr) == BT_LF)
         ptr += MINBPC(enc);
-      pos->columnNumber = (XML_Size)-1;
+      pos->columnNumber = 0;
       break;
     default:
       ptr += MINBPC(enc);
+      pos->columnNumber++;
       break;
     }
-    pos->columnNumber++;
   }
 }
 
diff --git a/Modules/expat/xmltok_impl.h b/Modules/expat/xmltok_impl.h
index e925dbc7e2c833..c518aada013df2 100644
--- a/Modules/expat/xmltok_impl.h
+++ b/Modules/expat/xmltok_impl.h
@@ -7,7 +7,8 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2017-2019 Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/xmltok_ns.c b/Modules/expat/xmltok_ns.c
index 919c74e9f97fe8..5fd83922359400 100644
--- a/Modules/expat/xmltok_ns.c
+++ b/Modules/expat/xmltok_ns.c
@@ -7,7 +7,11 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002-2006 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining


From webhook-mailer at python.org  Tue Aug 31 02:24:59 2021
From: webhook-mailer at python.org (ned-deily)
Date: Tue, 31 Aug 2021 06:24:59 -0000
Subject: [Python-checkins] bpo-38965: Fix faulthandler._stack_overflow() on
 GCC 10 (GH-17467) (GH-28079)
Message-ID: <mailman.1280.1630391101.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/8934bb0c3179e4c020cd6f08dea64bccbf56ffa2
commit: 8934bb0c3179e4c020cd6f08dea64bccbf56ffa2
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ned-deily <nad at python.org>
date: 2021-08-31T02:24:50-04:00
summary:

bpo-38965: Fix faulthandler._stack_overflow() on GCC 10 (GH-17467) (GH-28079)

Use the "volatile" keyword to prevent tail call optimization
on any compiler, rather than relying on compiler specific pragma.
(cherry picked from commit 8b787964e0a647caa0558b7c29ae501470d727d9)

Co-authored-by: Victor Stinner <vstinner at python.org>
(cherry picked from commit 5044c889dfced2f43e2cccb673d889a4882f6b3b)

Co-authored-by: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Tests/2019-12-04-17-08-55.bpo-38965.yqax3m.rst
M Modules/faulthandler.c

diff --git a/Misc/NEWS.d/next/Tests/2019-12-04-17-08-55.bpo-38965.yqax3m.rst b/Misc/NEWS.d/next/Tests/2019-12-04-17-08-55.bpo-38965.yqax3m.rst
new file mode 100644
index 0000000000000..517a1371eacd9
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-12-04-17-08-55.bpo-38965.yqax3m.rst
@@ -0,0 +1,3 @@
+Fix test_faulthandler on GCC 10. Use the "volatile" keyword in
+``faulthandler._stack_overflow()`` to prevent tail call optimization on any
+compiler, rather than relying on compiler specific pragma.
diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c
index 890c64577cec1..3e0a7b127d4c7 100644
--- a/Modules/faulthandler.c
+++ b/Modules/faulthandler.c
@@ -1091,18 +1091,14 @@ faulthandler_fatal_error_py(PyObject *self, PyObject *args)
 #if defined(HAVE_SIGALTSTACK) && defined(HAVE_SIGACTION)
 #define FAULTHANDLER_STACK_OVERFLOW
 
-#ifdef __INTEL_COMPILER
-   /* Issue #23654: Turn off ICC's tail call optimization for the
-    * stack_overflow generator. ICC turns the recursive tail call into
-    * a loop. */
-#  pragma intel optimization_level 0
-#endif
-static
-uintptr_t
+static uintptr_t
 stack_overflow(uintptr_t min_sp, uintptr_t max_sp, size_t *depth)
 {
-    /* allocate 4096 bytes on the stack at each call */
-    unsigned char buffer[4096];
+    /* Allocate (at least) 4096 bytes on the stack at each call.
+
+       bpo-23654, bpo-38965: use volatile keyword to prevent tail call
+       optimization. */
+    volatile unsigned char buffer[4096];
     uintptr_t sp = (uintptr_t)&buffer;
     *depth += 1;
     if (sp < min_sp || max_sp < sp)


From webhook-mailer at python.org  Tue Aug 31 02:35:41 2021
From: webhook-mailer at python.org (ned-deily)
Date: Tue, 31 Aug 2021 06:35:41 -0000
Subject: [Python-checkins] [3.6] bpo-44394: Update libexpat copy to 2.4.1
 (GH-26945) (GH-28042) (GH-28080)
Message-ID: <mailman.1281.1630391742.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/910886a6448e4bf1edf49eeace4aa240b6403772
commit: 910886a6448e4bf1edf49eeace4aa240b6403772
branch: 3.6
author: Ned Deily <nad at python.org>
committer: ned-deily <nad at python.org>
date: 2021-08-31T02:35:31-04:00
summary:

[3.6] bpo-44394: Update libexpat copy to 2.4.1 (GH-26945) (GH-28042) (GH-28080)

Update the vendored copy of libexpat to 2.4.1 (from 2.2.8) to get the
fix for the CVE-2013-0340 "Billion Laughs" vulnerability. This copy
is most used on Windows and macOS.

Co-authored-by: Victor Stinner <vstinner at python.org>

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>.
(cherry picked from commit 3fc5d84046ddbd66abac5b598956ea34605a4e5d)

files:
A Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst
M Doc/library/xml.rst
M Doc/whatsnew/3.6.rst
M Modules/expat/COPYING
M Modules/expat/ascii.h
M Modules/expat/asciitab.h
M Modules/expat/expat.h
M Modules/expat/expat_external.h
M Modules/expat/iasciitab.h
M Modules/expat/internal.h
M Modules/expat/latin1tab.h
M Modules/expat/nametab.h
M Modules/expat/siphash.h
M Modules/expat/utf8tab.h
M Modules/expat/winconfig.h
M Modules/expat/xmlparse.c
M Modules/expat/xmlrole.c
M Modules/expat/xmlrole.h
M Modules/expat/xmltok.c
M Modules/expat/xmltok.h
M Modules/expat/xmltok_impl.c
M Modules/expat/xmltok_impl.h
M Modules/expat/xmltok_ns.c

diff --git a/Doc/library/xml.rst b/Doc/library/xml.rst
index 9b8ba6b17c8531..ac92a0d3a013ba 100644
--- a/Doc/library/xml.rst
+++ b/Doc/library/xml.rst
@@ -60,23 +60,27 @@ circumvent firewalls.
 The following table gives an overview of the known attacks and whether
 the various modules are vulnerable to them.
 
-=========================  ==============   ===============   ==============   ==============   ==============
-kind                       sax              etree             minidom          pulldom          xmlrpc
-=========================  ==============   ===============   ==============   ==============   ==============
-billion laughs             **Vulnerable**   **Vulnerable**    **Vulnerable**   **Vulnerable**   **Vulnerable**
-quadratic blowup           **Vulnerable**   **Vulnerable**    **Vulnerable**   **Vulnerable**   **Vulnerable**
-external entity expansion  Safe (4)         Safe    (1)       Safe    (2)      Safe (4)         Safe    (3)
-`DTD`_ retrieval           Safe (4)         Safe              Safe             Safe (4)         Safe
-decompression bomb         Safe             Safe              Safe             Safe             **Vulnerable**
-=========================  ==============   ===============   ==============   ==============   ==============
-
-1. :mod:`xml.etree.ElementTree` doesn't expand external entities and raises a
+=========================  ==================  ==================  ==================  ==================  ==================
+kind                       sax                 etree               minidom             pulldom             xmlrpc
+=========================  ==================  ==================  ==================  ==================  ==================
+billion laughs             **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)
+quadratic blowup           **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)  **Vulnerable** (1)
+external entity expansion  Safe (5)            Safe (2)            Safe (3)            Safe (5)            Safe (4)
+`DTD`_ retrieval           Safe (5)            Safe                Safe                Safe (5)            Safe
+decompression bomb         Safe                Safe                Safe                Safe                **Vulnerable**
+=========================  ==================  ==================  ==================  ==================  ==================
+
+1. Expat 2.4.1 and newer is not vulnerable to the "billion laughs" and
+   "quadratic blowup" vulnerabilities. Items still listed as vulnerable due to
+   potential reliance on system-provided libraries. Check
+   :data:`pyexpat.EXPAT_VERSION`.
+2. :mod:`xml.etree.ElementTree` doesn't expand external entities and raises a
    :exc:`ParserError` when an entity occurs.
-2. :mod:`xml.dom.minidom` doesn't expand external entities and simply returns
+3. :mod:`xml.dom.minidom` doesn't expand external entities and simply returns
    the unexpanded entity verbatim.
-3. :mod:`xmlrpclib` doesn't expand external entities and omits them.
-4. Since Python 3.8.0, external general entities are no longer processed by
-   default since Python.
+4. :mod:`xmlrpclib` doesn't expand external entities and omits them.
+5. Since Python 3.6.7, external general entities are no longer processed by
+   default.
 
 
 billion laughs / exponential entity expansion
diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst
index c14e790935a208..5f8f478eb37945 100644
--- a/Doc/whatsnew/3.6.rst
+++ b/Doc/whatsnew/3.6.rst
@@ -2181,7 +2181,7 @@ Changes in the Python API
 
 * The functions in the :mod:`compileall` module now return booleans instead
   of ``1`` or ``0`` to represent success or failure, respectively. Thanks to
-  booleans being a subclass of integers, this should only be an issue if you7
+  booleans being a subclass of integers, this should only be an issue if you
   were doing identity checks for ``1`` or ``0``. See :issue:`25768`.
 
 * Reading the :attr:`~urllib.parse.SplitResult.port` attribute of
diff --git a/Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst b/Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst
new file mode 100644
index 00000000000000..e32563d2535c7e
--- /dev/null
+++ b/Misc/NEWS.d/next/Security/2021-06-29-02-45-53.bpo-44394.A220N1.rst
@@ -0,0 +1,3 @@
+Update the vendored copy of libexpat to 2.4.1 (from 2.2.8) to get the fix
+for the CVE-2013-0340 "Billion Laughs" vulnerability. This copy is most used
+on Windows and macOS.
diff --git a/Modules/expat/COPYING b/Modules/expat/COPYING
index 8d288f0f28fddd..3c0142e71c8d4f 100644
--- a/Modules/expat/COPYING
+++ b/Modules/expat/COPYING
@@ -1,5 +1,5 @@
 Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
-Copyright (c) 2001-2017 Expat maintainers
+Copyright (c) 2001-2019 Expat maintainers
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/Modules/expat/ascii.h b/Modules/expat/ascii.h
index c3587e57332bff..1f594d2e54b4d2 100644
--- a/Modules/expat/ascii.h
+++ b/Modules/expat/ascii.h
@@ -6,8 +6,11 @@
                         \___/_/\_\ .__/ \__,_|\__|
                                  |_| XML parser
 
-   Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 1999-2000 Thai Open Source Software Center Ltd
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2007      Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/asciitab.h b/Modules/expat/asciitab.h
index 63b1d1b4482efa..af766fb24785ea 100644
--- a/Modules/expat/asciitab.h
+++ b/Modules/expat/asciitab.h
@@ -7,7 +7,9 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/expat.h b/Modules/expat/expat.h
index 6c8eb1fda4a30c..b7d6d354801b3d 100644
--- a/Modules/expat/expat.h
+++ b/Modules/expat/expat.h
@@ -7,7 +7,14 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2000-2005 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2001-2002 Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2016 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2016      Cristian Rodr?guez <crrodriguez at opensuse.org>
+   Copyright (c) 2016      Thomas Beutlich <tc at tbeu.de>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -115,7 +122,11 @@ enum XML_Error {
   XML_ERROR_RESERVED_PREFIX_XMLNS,
   XML_ERROR_RESERVED_NAMESPACE_URI,
   /* Added in 2.2.1. */
-  XML_ERROR_INVALID_ARGUMENT
+  XML_ERROR_INVALID_ARGUMENT,
+  /* Added in 2.3.0. */
+  XML_ERROR_NO_BUFFER,
+  /* Added in 2.4.0. */
+  XML_ERROR_AMPLIFICATION_LIMIT_BREACH
 };
 
 enum XML_Content_Type {
@@ -318,7 +329,7 @@ typedef void(XMLCALL *XML_EndDoctypeDeclHandler)(void *userData);
 
    For internal entities (<!ENTITY foo "bar">), value will
    be non-NULL and systemId, publicID, and notationName will be NULL.
-   The value string is NOT nul-terminated; the length is provided in
+   The value string is NOT null-terminated; the length is provided in
    the value_length argument. Since it is legal to have zero-length
    values, do not use this argument to test for internal entities.
 
@@ -513,7 +524,7 @@ typedef struct {
    Otherwise it must return XML_STATUS_ERROR.
 
    If info does not describe a suitable encoding, then the parser will
-   return an XML_UNKNOWN_ENCODING error.
+   return an XML_ERROR_UNKNOWN_ENCODING error.
 */
 typedef int(XMLCALL *XML_UnknownEncodingHandler)(void *encodingHandlerData,
                                                  const XML_Char *name,
@@ -707,7 +718,7 @@ XML_GetBase(XML_Parser parser);
 /* Returns the number of the attribute/value pairs passed in last call
    to the XML_StartElementHandler that were specified in the start-tag
    rather than defaulted. Each attribute/value pair counts as 2; thus
-   this correspondds to an index into the atts array passed to the
+   this corresponds to an index into the atts array passed to the
    XML_StartElementHandler.  Returns -1 if parser == NULL.
 */
 XMLPARSEAPI(int)
@@ -716,7 +727,7 @@ XML_GetSpecifiedAttributeCount(XML_Parser parser);
 /* Returns the index of the ID attribute passed in the last call to
    XML_StartElementHandler, or -1 if there is no ID attribute or
    parser == NULL.  Each attribute/value pair counts as 2; thus this
-   correspondds to an index into the atts array passed to the
+   corresponds to an index into the atts array passed to the
    XML_StartElementHandler.
 */
 XMLPARSEAPI(int)
@@ -997,7 +1008,10 @@ enum XML_FeatureEnum {
   XML_FEATURE_SIZEOF_XML_LCHAR,
   XML_FEATURE_NS,
   XML_FEATURE_LARGE_SIZE,
-  XML_FEATURE_ATTR_INFO
+  XML_FEATURE_ATTR_INFO,
+  /* Added in Expat 2.4.0. */
+  XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT,
+  XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT
   /* Additional features must be added to the end of this enum. */
 };
 
@@ -1010,12 +1024,24 @@ typedef struct {
 XMLPARSEAPI(const XML_Feature *)
 XML_GetFeatureList(void);
 
+#ifdef XML_DTD
+/* Added in Expat 2.4.0. */
+XMLPARSEAPI(XML_Bool)
+XML_SetBillionLaughsAttackProtectionMaximumAmplification(
+    XML_Parser parser, float maximumAmplificationFactor);
+
+/* Added in Expat 2.4.0. */
+XMLPARSEAPI(XML_Bool)
+XML_SetBillionLaughsAttackProtectionActivationThreshold(
+    XML_Parser parser, unsigned long long activationThresholdBytes);
+#endif
+
 /* Expat follows the semantic versioning convention.
    See http://semver.org.
 */
 #define XML_MAJOR_VERSION 2
-#define XML_MINOR_VERSION 2
-#define XML_MICRO_VERSION 8
+#define XML_MINOR_VERSION 4
+#define XML_MICRO_VERSION 1
 
 #ifdef __cplusplus
 }
diff --git a/Modules/expat/expat_external.h b/Modules/expat/expat_external.h
index f2b75dda8e2798..12c560e14716ff 100644
--- a/Modules/expat/expat_external.h
+++ b/Modules/expat/expat_external.h
@@ -7,7 +7,14 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2000-2004 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2001-2002 Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2006 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2016      Cristian Rodr?guez <crrodriguez at opensuse.org>
+   Copyright (c) 2016-2019 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2018      Yury Gribov <tetra2005 at gmail.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/iasciitab.h b/Modules/expat/iasciitab.h
index ea97cfcf678e06..5d8646f2a318b8 100644
--- a/Modules/expat/iasciitab.h
+++ b/Modules/expat/iasciitab.h
@@ -7,7 +7,9 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/internal.h b/Modules/expat/internal.h
index 60913dab762f8f..444eba0fb03170 100644
--- a/Modules/expat/internal.h
+++ b/Modules/expat/internal.h
@@ -25,8 +25,12 @@
                         \___/_/\_\ .__/ \__,_|\__|
                                  |_| XML parser
 
-   Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2002-2003 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002-2006 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2003      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2018      Yury Gribov <tetra2005 at gmail.com>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -101,22 +105,58 @@
 #  endif
 #endif
 
+#include <limits.h> // ULONG_MAX
+
+#if defined(_WIN32) && ! defined(__USE_MINGW_ANSI_STDIO)
+#  define EXPAT_FMT_ULL(midpart) "%" midpart "I64u"
+#  if defined(_WIN64) // Note: modifiers "td" and "zu" do not work for MinGW
+#    define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "I64d"
+#    define EXPAT_FMT_SIZE_T(midpart) "%" midpart "I64u"
+#  else
+#    define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "d"
+#    define EXPAT_FMT_SIZE_T(midpart) "%" midpart "u"
+#  endif
+#else
+#  define EXPAT_FMT_ULL(midpart) "%" midpart "llu"
+#  if ! defined(ULONG_MAX)
+#    error Compiler did not define ULONG_MAX for us
+#  elif ULONG_MAX == 18446744073709551615u // 2^64-1
+#    define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "ld"
+#    define EXPAT_FMT_SIZE_T(midpart) "%" midpart "lu"
+#  else
+#    define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "d"
+#    define EXPAT_FMT_SIZE_T(midpart) "%" midpart "u"
+#  endif
+#endif
+
 #ifndef UNUSED_P
 #  define UNUSED_P(p) (void)p
 #endif
 
+/* NOTE BEGIN If you ever patch these defaults to greater values
+              for non-attack XML payload in your environment,
+              please file a bug report with libexpat.  Thank you!
+*/
+#define EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT   \
+  100.0f
+#define EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT    \
+  8388608 // 8 MiB, 2^23
+/* NOTE END */
+
+#include "expat.h" // so we can use type XML_Parser below
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifdef XML_ENABLE_VISIBILITY
-#  if XML_ENABLE_VISIBILITY
-__attribute__((visibility("default")))
-#  endif
+void _INTERNAL_trim_to_complete_utf8_characters(const char *from,
+                                                const char **fromLimRef);
+
+#if defined(XML_DTD)
+unsigned long long testingAccountingGetCountBytesDirect(XML_Parser parser);
+unsigned long long testingAccountingGetCountBytesIndirect(XML_Parser parser);
+const char *unsignedCharToPrintable(unsigned char c);
 #endif
-void
-_INTERNAL_trim_to_complete_utf8_characters(const char *from,
-                                           const char **fromLimRef);
 
 #ifdef __cplusplus
 }
diff --git a/Modules/expat/latin1tab.h b/Modules/expat/latin1tab.h
index 6f916041355a86..b681d278af6569 100644
--- a/Modules/expat/latin1tab.h
+++ b/Modules/expat/latin1tab.h
@@ -7,7 +7,9 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/nametab.h b/Modules/expat/nametab.h
index 3681df348eebd6..63485446b96727 100644
--- a/Modules/expat/nametab.h
+++ b/Modules/expat/nametab.h
@@ -6,8 +6,8 @@
                         \___/_/\_\ .__/ \__,_|\__|
                                  |_| XML parser
 
-   Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000 Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2017 Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/siphash.h b/Modules/expat/siphash.h
index bfee65a332f1bf..e5406d7ee9eb54 100644
--- a/Modules/expat/siphash.h
+++ b/Modules/expat/siphash.h
@@ -11,6 +11,9 @@
  * --------------------------------------------------------------------------
  * HISTORY:
  *
+ * 2020-10-03  (Sebastian Pipping)
+ *   - Drop support for Visual Studio 9.0/2008 and earlier
+ *
  * 2019-08-03  (Sebastian Pipping)
  *   - Mark part of sip24_valid as to be excluded from clang-format
  *   - Re-format code using clang-format 9
@@ -96,15 +99,7 @@
 #define SIPHASH_H
 
 #include <stddef.h> /* size_t */
-
-#if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER < 1600)
-/* For vs2003/7.1 up to vs2008/9.0; _MSC_VER 1600 is vs2010/10.0 */
-typedef unsigned __int8 uint8_t;
-typedef unsigned __int32 uint32_t;
-typedef unsigned __int64 uint64_t;
-#else
-#  include <stdint.h> /* uint64_t uint32_t uint8_t */
-#endif
+#include <stdint.h> /* uint64_t uint32_t uint8_t */
 
 /*
  * Workaround to not require a C++11 compiler for using ULL suffix
diff --git a/Modules/expat/utf8tab.h b/Modules/expat/utf8tab.h
index a22986acbb9526..88efcf91cc16a6 100644
--- a/Modules/expat/utf8tab.h
+++ b/Modules/expat/utf8tab.h
@@ -7,7 +7,9 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/winconfig.h b/Modules/expat/winconfig.h
index 562a4a82dc1d63..2ecd61b5b94820 100644
--- a/Modules/expat/winconfig.h
+++ b/Modules/expat/winconfig.h
@@ -6,8 +6,10 @@
                         \___/_/\_\ .__/ \__,_|\__|
                                  |_| XML parser
 
-   Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2005      Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2017-2021 Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -40,17 +42,4 @@
 #include <memory.h>
 #include <string.h>
 
-#if defined(HAVE_EXPAT_CONFIG_H) /* e.g. MinGW */
-#  include <expat_config.h>
-#else /* !defined(HAVE_EXPAT_CONFIG_H) */
-
-#  define XML_NS 1
-#  define XML_DTD 1
-#  define XML_CONTEXT_BYTES 1024
-
-/* we will assume all Windows platforms are little endian */
-#  define BYTEORDER 1234
-
-#endif /* !defined(HAVE_EXPAT_CONFIG_H) */
-
 #endif /* ndef WINCONFIG_H */
diff --git a/Modules/expat/xmlparse.c b/Modules/expat/xmlparse.c
index e740f0e19c7d4a..5ba56eaea6357a 100644
--- a/Modules/expat/xmlparse.c
+++ b/Modules/expat/xmlparse.c
@@ -1,4 +1,4 @@
-/* f2d0ab6d1d4422a08cf1cf3bbdfba96b49dea42fb5ff4615e03a2a25c306e769 (2.2.8+)
+/* 8539b9040d9d901366a62560a064af7cb99811335784b363abc039c5b0ebc416 (2.4.1+)
                             __  __            _
                          ___\ \/ /_ __   __ _| |_
                         / _ \\  /| '_ \ / _` | __|
@@ -7,7 +7,31 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2000-2006 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2001-2002 Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2016 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2005-2009 Steven Solie <ssolie at users.sourceforge.net>
+   Copyright (c) 2016      Eric Rahm <erahm at mozilla.com>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2016      Gaurav <g.gupta at samsung.com>
+   Copyright (c) 2016      Thomas Beutlich <tc at tbeu.de>
+   Copyright (c) 2016      Gustavo Grieco <gustavo.grieco at imag.fr>
+   Copyright (c) 2016      Pascal Cuoq <cuoq at trust-in-soft.com>
+   Copyright (c) 2016      Ed Schouten <ed at nuxi.nl>
+   Copyright (c) 2017-2018 Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2017      V?clav Slav?k <vaclav at slavik.io>
+   Copyright (c) 2017      Viktor Szakats <commit at vsz.me>
+   Copyright (c) 2017      Chanho Park <chanho61.park at samsung.com>
+   Copyright (c) 2017      Rolf Eike Beer <eike at sf-mail.de>
+   Copyright (c) 2017      Hans Wennborg <hans at chromium.org>
+   Copyright (c) 2018      Anton Maklakov <antmak.pub at gmail.com>
+   Copyright (c) 2018      Benjamin Peterson <benjamin at python.org>
+   Copyright (c) 2018      Marco Maggi <marco.maggi-ipsu at poste.it>
+   Copyright (c) 2018      Mariusz Zaborski <oshogbo at vexillium.org>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
+   Copyright (c) 2019-2020 Ben Wagner <bungeman at chromium.org>
+   Copyright (c) 2019      Vadim Zeitlin <vadim at zeitlins.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -36,7 +60,9 @@
 
 #ifdef _WIN32
 /* force stdlib to define rand_s() */
-#  define _CRT_RAND_S
+#  if ! defined(_CRT_RAND_S)
+#    define _CRT_RAND_S
+#  endif
 #endif
 
 #include <stddef.h>
@@ -45,6 +71,8 @@
 #include <limits.h> /* UINT_MAX */
 #include <stdio.h>  /* fprintf */
 #include <stdlib.h> /* getenv, rand_s */
+#include <stdint.h> /* uintptr_t */
+#include <math.h>   /* isnan */
 
 #ifdef _WIN32
 #  define getpid GetCurrentProcessId
@@ -60,9 +88,9 @@
 
 #ifdef _WIN32
 #  include "winconfig.h"
-#elif defined(HAVE_EXPAT_CONFIG_H)
-#  include <expat_config.h>
-#endif /* ndef _WIN32 */
+#endif
+
+#include <expat_config.h>
 
 #include "ascii.h"
 #include "expat.h"
@@ -97,14 +125,14 @@
     enabled.  For end user security, that is probably not what you want. \
     \
     Your options include: \
-      * Linux + glibc >=2.25 (getrandom): HAVE_GETRANDOM, \
-      * Linux + glibc <2.25 (syscall SYS_getrandom): HAVE_SYSCALL_GETRANDOM, \
+      * Linux >=3.17 + glibc >=2.25 (getrandom): HAVE_GETRANDOM, \
+      * Linux >=3.17 + glibc (including <2.25) (syscall SYS_getrandom): HAVE_SYSCALL_GETRANDOM, \
       * BSD / macOS >=10.7 (arc4random_buf): HAVE_ARC4RANDOM_BUF, \
-      * BSD / macOS <10.7 (arc4random): HAVE_ARC4RANDOM, \
+      * BSD / macOS (including <10.7) (arc4random): HAVE_ARC4RANDOM, \
       * libbsd (arc4random_buf): HAVE_ARC4RANDOM_BUF + HAVE_LIBBSD, \
       * libbsd (arc4random): HAVE_ARC4RANDOM + HAVE_LIBBSD, \
-      * Linux / BSD / macOS (/dev/urandom): XML_DEV_URANDOM \
-      * Windows (rand_s): _WIN32. \
+      * Linux (including <3.17) / BSD / macOS (including <10.7) (/dev/urandom): XML_DEV_URANDOM, \
+      * Windows >=Vista (rand_s): _WIN32. \
     \
     If insist on not using any of these, bypass this error by defining \
     XML_POOR_ENTROPY; you have been warned. \
@@ -119,9 +147,7 @@
 #  define XmlGetInternalEncoding XmlGetUtf16InternalEncoding
 #  define XmlGetInternalEncodingNS XmlGetUtf16InternalEncodingNS
 #  define XmlEncode XmlUtf16Encode
-/* Using pointer subtraction to convert to integer type. */
-#  define MUST_CONVERT(enc, s)                                                 \
-    (! (enc)->isUtf16 || (((char *)(s) - (char *)NULL) & 1))
+#  define MUST_CONVERT(enc, s) (! (enc)->isUtf16 || (((uintptr_t)(s)) & 1))
 typedef unsigned short ICHAR;
 #else
 #  define XML_ENCODE_MAX XML_UTF8_ENCODE_MAX
@@ -371,6 +397,31 @@ typedef struct open_internal_entity {
   XML_Bool betweenDecl; /* WFC: PE Between Declarations */
 } OPEN_INTERNAL_ENTITY;
 
+enum XML_Account {
+  XML_ACCOUNT_DIRECT,           /* bytes directly passed to the Expat parser */
+  XML_ACCOUNT_ENTITY_EXPANSION, /* intermediate bytes produced during entity
+                                   expansion */
+  XML_ACCOUNT_NONE              /* i.e. do not account, was accounted already */
+};
+
+#ifdef XML_DTD
+typedef unsigned long long XmlBigCount;
+typedef struct accounting {
+  XmlBigCount countBytesDirect;
+  XmlBigCount countBytesIndirect;
+  int debugLevel;
+  float maximumAmplificationFactor; // >=1.0
+  unsigned long long activationThresholdBytes;
+} ACCOUNTING;
+
+typedef struct entity_stats {
+  unsigned int countEverOpened;
+  unsigned int currentDepth;
+  unsigned int maximumDepthSeen;
+  int debugLevel;
+} ENTITY_STATS;
+#endif /* XML_DTD */
+
 typedef enum XML_Error PTRCALL Processor(XML_Parser parser, const char *start,
                                          const char *end, const char **endPtr);
 
@@ -401,16 +452,18 @@ static enum XML_Error initializeEncoding(XML_Parser parser);
 static enum XML_Error doProlog(XML_Parser parser, const ENCODING *enc,
                                const char *s, const char *end, int tok,
                                const char *next, const char **nextPtr,
-                               XML_Bool haveMore, XML_Bool allowClosingDoctype);
+                               XML_Bool haveMore, XML_Bool allowClosingDoctype,
+                               enum XML_Account account);
 static enum XML_Error processInternalEntity(XML_Parser parser, ENTITY *entity,
                                             XML_Bool betweenDecl);
 static enum XML_Error doContent(XML_Parser parser, int startTagLevel,
                                 const ENCODING *enc, const char *start,
                                 const char *end, const char **endPtr,
-                                XML_Bool haveMore);
+                                XML_Bool haveMore, enum XML_Account account);
 static enum XML_Error doCdataSection(XML_Parser parser, const ENCODING *,
                                      const char **startPtr, const char *end,
-                                     const char **nextPtr, XML_Bool haveMore);
+                                     const char **nextPtr, XML_Bool haveMore,
+                                     enum XML_Account account);
 #ifdef XML_DTD
 static enum XML_Error doIgnoreSection(XML_Parser parser, const ENCODING *,
                                       const char **startPtr, const char *end,
@@ -420,7 +473,8 @@ static enum XML_Error doIgnoreSection(XML_Parser parser, const ENCODING *,
 static void freeBindings(XML_Parser parser, BINDING *bindings);
 static enum XML_Error storeAtts(XML_Parser parser, const ENCODING *,
                                 const char *s, TAG_NAME *tagNamePtr,
-                                BINDING **bindingsPtr);
+                                BINDING **bindingsPtr,
+                                enum XML_Account account);
 static enum XML_Error addBinding(XML_Parser parser, PREFIX *prefix,
                                  const ATTRIBUTE_ID *attId, const XML_Char *uri,
                                  BINDING **bindingsPtr);
@@ -429,15 +483,18 @@ static int defineAttribute(ELEMENT_TYPE *type, ATTRIBUTE_ID *, XML_Bool isCdata,
                            XML_Parser parser);
 static enum XML_Error storeAttributeValue(XML_Parser parser, const ENCODING *,
                                           XML_Bool isCdata, const char *,
-                                          const char *, STRING_POOL *);
+                                          const char *, STRING_POOL *,
+                                          enum XML_Account account);
 static enum XML_Error appendAttributeValue(XML_Parser parser, const ENCODING *,
                                            XML_Bool isCdata, const char *,
-                                           const char *, STRING_POOL *);
+                                           const char *, STRING_POOL *,
+                                           enum XML_Account account);
 static ATTRIBUTE_ID *getAttributeId(XML_Parser parser, const ENCODING *enc,
                                     const char *start, const char *end);
 static int setElementTypePrefix(XML_Parser parser, ELEMENT_TYPE *);
 static enum XML_Error storeEntityValue(XML_Parser parser, const ENCODING *enc,
-                                       const char *start, const char *end);
+                                       const char *start, const char *end,
+                                       enum XML_Account account);
 static int reportProcessingInstruction(XML_Parser parser, const ENCODING *enc,
                                        const char *start, const char *end);
 static int reportComment(XML_Parser parser, const ENCODING *enc,
@@ -501,6 +558,34 @@ static XML_Parser parserCreate(const XML_Char *encodingName,
 
 static void parserInit(XML_Parser parser, const XML_Char *encodingName);
 
+#ifdef XML_DTD
+static float accountingGetCurrentAmplification(XML_Parser rootParser);
+static void accountingReportStats(XML_Parser originParser, const char *epilog);
+static void accountingOnAbort(XML_Parser originParser);
+static void accountingReportDiff(XML_Parser rootParser,
+                                 unsigned int levelsAwayFromRootParser,
+                                 const char *before, const char *after,
+                                 ptrdiff_t bytesMore, int source_line,
+                                 enum XML_Account account);
+static XML_Bool accountingDiffTolerated(XML_Parser originParser, int tok,
+                                        const char *before, const char *after,
+                                        int source_line,
+                                        enum XML_Account account);
+
+static void entityTrackingReportStats(XML_Parser parser, ENTITY *entity,
+                                      const char *action, int sourceLine);
+static void entityTrackingOnOpen(XML_Parser parser, ENTITY *entity,
+                                 int sourceLine);
+static void entityTrackingOnClose(XML_Parser parser, ENTITY *entity,
+                                  int sourceLine);
+
+static XML_Parser getRootParserOf(XML_Parser parser,
+                                  unsigned int *outLevelDiff);
+#endif /* XML_DTD */
+
+static unsigned long getDebugLevel(const char *variableName,
+                                   unsigned long defaultDebugLevel);
+
 #define poolStart(pool) ((pool)->start)
 #define poolEnd(pool) ((pool)->ptr)
 #define poolLength(pool) ((pool)->ptr - (pool)->start)
@@ -614,6 +699,10 @@ struct XML_ParserStruct {
   enum XML_ParamEntityParsing m_paramEntityParsing;
 #endif
   unsigned long m_hash_secret_salt;
+#ifdef XML_DTD
+  ACCOUNTING m_accounting;
+  ENTITY_STATS m_entity_stats;
+#endif
 };
 
 #define MALLOC(parser, s) (parser->m_mem.malloc_fcn((s)))
@@ -734,6 +823,15 @@ writeRandomBytes_arc4random(void *target, size_t count) {
 
 #ifdef _WIN32
 
+/* Provide declaration of rand_s() for MinGW-32 (not 64, which has it),
+   as it didn't declare it in its header prior to version 5.3.0 of its
+   runtime package (mingwrt, containing stdlib.h).  The upstream fix
+   was introduced at https://osdn.net/projects/mingw/ticket/39658 . */
+#  if defined(__MINGW32__) && defined(__MINGW32_VERSION)                       \
+      && __MINGW32_VERSION < 5003000L && ! defined(__MINGW64_VERSION_MAJOR)
+__declspec(dllimport) int rand_s(unsigned int *);
+#  endif
+
 /* Obtain entropy on Windows using the rand_s() function which
  * generates cryptographically secure random numbers.  Internally it
  * uses RtlGenRandom API which is present in Windows XP and later.
@@ -789,9 +887,8 @@ gather_time_entropy(void) {
 
 static unsigned long
 ENTROPY_DEBUG(const char *label, unsigned long entropy) {
-  const char *const EXPAT_ENTROPY_DEBUG = getenv("EXPAT_ENTROPY_DEBUG");
-  if (EXPAT_ENTROPY_DEBUG && ! strcmp(EXPAT_ENTROPY_DEBUG, "1")) {
-    fprintf(stderr, "Entropy: %s --> 0x%0*lx (%lu bytes)\n", label,
+  if (getDebugLevel("EXPAT_ENTROPY_DEBUG", 0) >= 1u) {
+    fprintf(stderr, "expat: Entropy: %s --> 0x%0*lx (%lu bytes)\n", label,
             (int)sizeof(entropy) * 2, entropy, (unsigned long)sizeof(entropy));
   }
   return entropy;
@@ -1053,6 +1150,18 @@ parserInit(XML_Parser parser, const XML_Char *encodingName) {
   parser->m_paramEntityParsing = XML_PARAM_ENTITY_PARSING_NEVER;
 #endif
   parser->m_hash_secret_salt = 0;
+
+#ifdef XML_DTD
+  memset(&parser->m_accounting, 0, sizeof(ACCOUNTING));
+  parser->m_accounting.debugLevel = getDebugLevel("EXPAT_ACCOUNTING_DEBUG", 0u);
+  parser->m_accounting.maximumAmplificationFactor
+      = EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT;
+  parser->m_accounting.activationThresholdBytes
+      = EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT;
+
+  memset(&parser->m_entity_stats, 0, sizeof(ENTITY_STATS));
+  parser->m_entity_stats.debugLevel = getDebugLevel("EXPAT_ENTITY_DEBUG", 0u);
+#endif
 }
 
 /* moves list of bindings to m_freeBindingList */
@@ -1399,6 +1508,7 @@ XML_UseForeignDTD(XML_Parser parser, XML_Bool useDTD) {
   parser->m_useForeignDTD = useDTD;
   return XML_ERROR_NONE;
 #else
+  UNUSED_P(useDTD);
   return XML_ERROR_FEATURE_REQUIRES_XML_DTD;
 #endif
 }
@@ -1780,7 +1890,7 @@ XML_Parse(XML_Parser parser, const char *s, int len, int isFinal) {
     int nLeftOver;
     enum XML_Status result;
     /* Detect overflow (a+b > MAX <==> b > MAX-a) */
-    if (len > ((XML_Size)-1) / 2 - parser->m_parseEndByteIndex) {
+    if ((XML_Size)len > ((XML_Size)-1) / 2 - parser->m_parseEndByteIndex) {
       parser->m_errorCode = XML_ERROR_NO_MEMORY;
       parser->m_eventPtr = parser->m_eventEndPtr = NULL;
       parser->m_processor = errorProcessor;
@@ -1872,6 +1982,12 @@ XML_ParseBuffer(XML_Parser parser, int len, int isFinal) {
     parser->m_errorCode = XML_ERROR_FINISHED;
     return XML_STATUS_ERROR;
   case XML_INITIALIZED:
+    /* Has someone called XML_GetBuffer successfully before? */
+    if (! parser->m_bufferPtr) {
+      parser->m_errorCode = XML_ERROR_NO_BUFFER;
+      return XML_STATUS_ERROR;
+    }
+
     if (parser->m_parentParser == NULL && ! startParsing(parser)) {
       parser->m_errorCode = XML_ERROR_NO_MEMORY;
       return XML_STATUS_ERROR;
@@ -2155,7 +2271,7 @@ XML_GetInputContext(XML_Parser parser, int *offset, int *size) {
   (void)offset;
   (void)size;
 #endif /* defined XML_CONTEXT_BYTES */
-  return (char *)0;
+  return (const char *)0;
 }
 
 XML_Size XMLCALL
@@ -2316,6 +2432,14 @@ XML_ErrorString(enum XML_Error code) {
   /* Added in 2.2.5. */
   case XML_ERROR_INVALID_ARGUMENT: /* Constant added in 2.2.1, already */
     return XML_L("invalid argument");
+    /* Added in 2.3.0. */
+  case XML_ERROR_NO_BUFFER:
+    return XML_L(
+        "a successful prior call to function XML_GetBuffer is required");
+  /* Added in 2.4.0. */
+  case XML_ERROR_AMPLIFICATION_LIMIT_BREACH:
+    return XML_L(
+        "limit on input amplification factor (from DTD and entities) breached");
   }
   return NULL;
 }
@@ -2352,41 +2476,75 @@ XML_ExpatVersionInfo(void) {
 
 const XML_Feature *XMLCALL
 XML_GetFeatureList(void) {
-  static const XML_Feature features[]
-      = {{XML_FEATURE_SIZEOF_XML_CHAR, XML_L("sizeof(XML_Char)"),
-          sizeof(XML_Char)},
-         {XML_FEATURE_SIZEOF_XML_LCHAR, XML_L("sizeof(XML_LChar)"),
-          sizeof(XML_LChar)},
+  static const XML_Feature features[] = {
+      {XML_FEATURE_SIZEOF_XML_CHAR, XML_L("sizeof(XML_Char)"),
+       sizeof(XML_Char)},
+      {XML_FEATURE_SIZEOF_XML_LCHAR, XML_L("sizeof(XML_LChar)"),
+       sizeof(XML_LChar)},
 #ifdef XML_UNICODE
-         {XML_FEATURE_UNICODE, XML_L("XML_UNICODE"), 0},
+      {XML_FEATURE_UNICODE, XML_L("XML_UNICODE"), 0},
 #endif
 #ifdef XML_UNICODE_WCHAR_T
-         {XML_FEATURE_UNICODE_WCHAR_T, XML_L("XML_UNICODE_WCHAR_T"), 0},
+      {XML_FEATURE_UNICODE_WCHAR_T, XML_L("XML_UNICODE_WCHAR_T"), 0},
 #endif
 #ifdef XML_DTD
-         {XML_FEATURE_DTD, XML_L("XML_DTD"), 0},
+      {XML_FEATURE_DTD, XML_L("XML_DTD"), 0},
 #endif
 #ifdef XML_CONTEXT_BYTES
-         {XML_FEATURE_CONTEXT_BYTES, XML_L("XML_CONTEXT_BYTES"),
-          XML_CONTEXT_BYTES},
+      {XML_FEATURE_CONTEXT_BYTES, XML_L("XML_CONTEXT_BYTES"),
+       XML_CONTEXT_BYTES},
 #endif
 #ifdef XML_MIN_SIZE
-         {XML_FEATURE_MIN_SIZE, XML_L("XML_MIN_SIZE"), 0},
+      {XML_FEATURE_MIN_SIZE, XML_L("XML_MIN_SIZE"), 0},
 #endif
 #ifdef XML_NS
-         {XML_FEATURE_NS, XML_L("XML_NS"), 0},
+      {XML_FEATURE_NS, XML_L("XML_NS"), 0},
 #endif
 #ifdef XML_LARGE_SIZE
-         {XML_FEATURE_LARGE_SIZE, XML_L("XML_LARGE_SIZE"), 0},
+      {XML_FEATURE_LARGE_SIZE, XML_L("XML_LARGE_SIZE"), 0},
 #endif
 #ifdef XML_ATTR_INFO
-         {XML_FEATURE_ATTR_INFO, XML_L("XML_ATTR_INFO"), 0},
+      {XML_FEATURE_ATTR_INFO, XML_L("XML_ATTR_INFO"), 0},
+#endif
+#ifdef XML_DTD
+      /* Added in Expat 2.4.0. */
+      {XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT,
+       XML_L("XML_BLAP_MAX_AMP"),
+       (long int)
+           EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT},
+      {XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT,
+       XML_L("XML_BLAP_ACT_THRES"),
+       EXPAT_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT},
 #endif
-         {XML_FEATURE_END, NULL, 0}};
+      {XML_FEATURE_END, NULL, 0}};
 
   return features;
 }
 
+#ifdef XML_DTD
+XML_Bool XMLCALL
+XML_SetBillionLaughsAttackProtectionMaximumAmplification(
+    XML_Parser parser, float maximumAmplificationFactor) {
+  if ((parser == NULL) || (parser->m_parentParser != NULL)
+      || isnan(maximumAmplificationFactor)
+      || (maximumAmplificationFactor < 1.0f)) {
+    return XML_FALSE;
+  }
+  parser->m_accounting.maximumAmplificationFactor = maximumAmplificationFactor;
+  return XML_TRUE;
+}
+
+XML_Bool XMLCALL
+XML_SetBillionLaughsAttackProtectionActivationThreshold(
+    XML_Parser parser, unsigned long long activationThresholdBytes) {
+  if ((parser == NULL) || (parser->m_parentParser != NULL)) {
+    return XML_FALSE;
+  }
+  parser->m_accounting.activationThresholdBytes = activationThresholdBytes;
+  return XML_TRUE;
+}
+#endif /* XML_DTD */
+
 /* Initially tag->rawName always points into the parse buffer;
    for those TAG instances opened while the current parse buffer was
    processed, and not yet closed, we need to store tag->rawName in a more
@@ -2439,9 +2597,9 @@ storeRawNames(XML_Parser parser) {
 static enum XML_Error PTRCALL
 contentProcessor(XML_Parser parser, const char *start, const char *end,
                  const char **endPtr) {
-  enum XML_Error result
-      = doContent(parser, 0, parser->m_encoding, start, end, endPtr,
-                  (XML_Bool)! parser->m_parsingStatus.finalBuffer);
+  enum XML_Error result = doContent(
+      parser, 0, parser->m_encoding, start, end, endPtr,
+      (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_ACCOUNT_DIRECT);
   if (result == XML_ERROR_NONE) {
     if (! storeRawNames(parser))
       return XML_ERROR_NO_MEMORY;
@@ -2466,6 +2624,14 @@ externalEntityInitProcessor2(XML_Parser parser, const char *start,
   int tok = XmlContentTok(parser->m_encoding, start, end, &next);
   switch (tok) {
   case XML_TOK_BOM:
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, start, next, __LINE__,
+                                  XML_ACCOUNT_DIRECT)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#endif /* XML_DTD */
+
     /* If we are at the end of the buffer, this would cause the next stage,
        i.e. externalEntityInitProcessor3, to pass control directly to
        doContent (by detecting XML_TOK_NONE) without processing any xml text
@@ -2503,6 +2669,10 @@ externalEntityInitProcessor3(XML_Parser parser, const char *start,
   const char *next = start; /* XmlContentTok doesn't always set the last arg */
   parser->m_eventPtr = start;
   tok = XmlContentTok(parser->m_encoding, start, end, &next);
+  /* Note: These bytes are accounted later in:
+           - processXmlDecl
+           - externalEntityContentProcessor
+  */
   parser->m_eventEndPtr = next;
 
   switch (tok) {
@@ -2544,7 +2714,8 @@ externalEntityContentProcessor(XML_Parser parser, const char *start,
                                const char *end, const char **endPtr) {
   enum XML_Error result
       = doContent(parser, 1, parser->m_encoding, start, end, endPtr,
-                  (XML_Bool)! parser->m_parsingStatus.finalBuffer);
+                  (XML_Bool)! parser->m_parsingStatus.finalBuffer,
+                  XML_ACCOUNT_ENTITY_EXPANSION);
   if (result == XML_ERROR_NONE) {
     if (! storeRawNames(parser))
       return XML_ERROR_NO_MEMORY;
@@ -2555,7 +2726,7 @@ externalEntityContentProcessor(XML_Parser parser, const char *start,
 static enum XML_Error
 doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
           const char *s, const char *end, const char **nextPtr,
-          XML_Bool haveMore) {
+          XML_Bool haveMore, enum XML_Account account) {
   /* save one level of indirection */
   DTD *const dtd = parser->m_dtd;
 
@@ -2573,6 +2744,17 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
   for (;;) {
     const char *next = s; /* XmlContentTok doesn't always set the last arg */
     int tok = XmlContentTok(enc, s, end, &next);
+#ifdef XML_DTD
+    const char *accountAfter
+        = ((tok == XML_TOK_TRAILING_RSQB) || (tok == XML_TOK_TRAILING_CR))
+              ? (haveMore ? s /* i.e. 0 bytes */ : end)
+              : next;
+    if (! accountingDiffTolerated(parser, tok, s, accountAfter, __LINE__,
+                                  account)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#endif
     *eventEndPP = next;
     switch (tok) {
     case XML_TOK_TRAILING_CR:
@@ -2628,6 +2810,14 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
       XML_Char ch = (XML_Char)XmlPredefinedEntityName(
           enc, s + enc->minBytesPerChar, next - enc->minBytesPerChar);
       if (ch) {
+#ifdef XML_DTD
+        /* NOTE: We are replacing 4-6 characters original input for 1 character
+         *       so there is no amplification and hence recording without
+         *       protection. */
+        accountingDiffTolerated(parser, tok, (char *)&ch,
+                                ((char *)&ch) + sizeof(XML_Char), __LINE__,
+                                XML_ACCOUNT_ENTITY_EXPANSION);
+#endif /* XML_DTD */
         if (parser->m_characterDataHandler)
           parser->m_characterDataHandler(parser->m_handlerArg, &ch, 1);
         else if (parser->m_defaultHandler)
@@ -2746,7 +2936,8 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
       }
       tag->name.str = (XML_Char *)tag->buf;
       *toPtr = XML_T('\0');
-      result = storeAtts(parser, enc, s, &(tag->name), &(tag->bindings));
+      result
+          = storeAtts(parser, enc, s, &(tag->name), &(tag->bindings), account);
       if (result)
         return result;
       if (parser->m_startElementHandler)
@@ -2770,7 +2961,8 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
       if (! name.str)
         return XML_ERROR_NO_MEMORY;
       poolFinish(&parser->m_tempPool);
-      result = storeAtts(parser, enc, s, &name, &bindings);
+      result = storeAtts(parser, enc, s, &name, &bindings,
+                         XML_ACCOUNT_NONE /* token spans whole start tag */);
       if (result != XML_ERROR_NONE) {
         freeBindings(parser, bindings);
         return result;
@@ -2905,7 +3097,8 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
       /* END disabled code */
       else if (parser->m_defaultHandler)
         reportDefault(parser, enc, s, next);
-      result = doCdataSection(parser, enc, &next, end, nextPtr, haveMore);
+      result
+          = doCdataSection(parser, enc, &next, end, nextPtr, haveMore, account);
       if (result != XML_ERROR_NONE)
         return result;
       else if (! next) {
@@ -3034,7 +3227,8 @@ freeBindings(XML_Parser parser, BINDING *bindings) {
 */
 static enum XML_Error
 storeAtts(XML_Parser parser, const ENCODING *enc, const char *attStr,
-          TAG_NAME *tagNamePtr, BINDING **bindingsPtr) {
+          TAG_NAME *tagNamePtr, BINDING **bindingsPtr,
+          enum XML_Account account) {
   DTD *const dtd = parser->m_dtd; /* save one level of indirection */
   ELEMENT_TYPE *elementType;
   int nDefaultAtts;
@@ -3144,7 +3338,7 @@ storeAtts(XML_Parser parser, const ENCODING *enc, const char *attStr,
       /* normalize the attribute value */
       result = storeAttributeValue(
           parser, enc, isCdata, parser->m_atts[i].valuePtr,
-          parser->m_atts[i].valueEnd, &parser->m_tempPool);
+          parser->m_atts[i].valueEnd, &parser->m_tempPool, account);
       if (result)
         return result;
       appAtts[attIndex] = poolStart(&parser->m_tempPool);
@@ -3533,9 +3727,9 @@ addBinding(XML_Parser parser, PREFIX *prefix, const ATTRIBUTE_ID *attId,
 static enum XML_Error PTRCALL
 cdataSectionProcessor(XML_Parser parser, const char *start, const char *end,
                       const char **endPtr) {
-  enum XML_Error result
-      = doCdataSection(parser, parser->m_encoding, &start, end, endPtr,
-                       (XML_Bool)! parser->m_parsingStatus.finalBuffer);
+  enum XML_Error result = doCdataSection(
+      parser, parser->m_encoding, &start, end, endPtr,
+      (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_ACCOUNT_DIRECT);
   if (result != XML_ERROR_NONE)
     return result;
   if (start) {
@@ -3555,7 +3749,8 @@ cdataSectionProcessor(XML_Parser parser, const char *start, const char *end,
 */
 static enum XML_Error
 doCdataSection(XML_Parser parser, const ENCODING *enc, const char **startPtr,
-               const char *end, const char **nextPtr, XML_Bool haveMore) {
+               const char *end, const char **nextPtr, XML_Bool haveMore,
+               enum XML_Account account) {
   const char *s = *startPtr;
   const char **eventPP;
   const char **eventEndPP;
@@ -3571,8 +3766,16 @@ doCdataSection(XML_Parser parser, const ENCODING *enc, const char **startPtr,
   *startPtr = NULL;
 
   for (;;) {
-    const char *next;
+    const char *next = s; /* in case of XML_TOK_NONE or XML_TOK_PARTIAL */
     int tok = XmlCdataSectionTok(enc, s, end, &next);
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, s, next, __LINE__, account)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#else
+    UNUSED_P(account);
+#endif
     *eventEndPP = next;
     switch (tok) {
     case XML_TOK_CDATA_SECT_CLOSE:
@@ -3689,7 +3892,7 @@ ignoreSectionProcessor(XML_Parser parser, const char *start, const char *end,
 static enum XML_Error
 doIgnoreSection(XML_Parser parser, const ENCODING *enc, const char **startPtr,
                 const char *end, const char **nextPtr, XML_Bool haveMore) {
-  const char *next;
+  const char *next = *startPtr; /* in case of XML_TOK_NONE or XML_TOK_PARTIAL */
   int tok;
   const char *s = *startPtr;
   const char **eventPP;
@@ -3717,6 +3920,13 @@ doIgnoreSection(XML_Parser parser, const ENCODING *enc, const char **startPtr,
   *eventPP = s;
   *startPtr = NULL;
   tok = XmlIgnoreSectionTok(enc, s, end, &next);
+#  ifdef XML_DTD
+  if (! accountingDiffTolerated(parser, tok, s, next, __LINE__,
+                                XML_ACCOUNT_DIRECT)) {
+    accountingOnAbort(parser);
+    return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+  }
+#  endif
   *eventEndPP = next;
   switch (tok) {
   case XML_TOK_IGNORE_SECT:
@@ -3801,6 +4011,15 @@ processXmlDecl(XML_Parser parser, int isGeneralTextEntity, const char *s,
   const char *versionend;
   const XML_Char *storedversion = NULL;
   int standalone = -1;
+
+#ifdef XML_DTD
+  if (! accountingDiffTolerated(parser, XML_TOK_XML_DECL, s, next, __LINE__,
+                                XML_ACCOUNT_DIRECT)) {
+    accountingOnAbort(parser);
+    return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+  }
+#endif
+
   if (! (parser->m_ns ? XmlParseXmlDeclNS : XmlParseXmlDecl)(
           isGeneralTextEntity, parser->m_encoding, s, next, &parser->m_eventPtr,
           &version, &versionend, &encodingName, &newEncoding, &standalone)) {
@@ -3950,6 +4169,10 @@ entityValueInitProcessor(XML_Parser parser, const char *s, const char *end,
 
   for (;;) {
     tok = XmlPrologTok(parser->m_encoding, start, end, &next);
+    /* Note: Except for XML_TOK_BOM below, these bytes are accounted later in:
+             - storeEntityValue
+             - processXmlDecl
+    */
     parser->m_eventEndPtr = next;
     if (tok <= 0) {
       if (! parser->m_parsingStatus.finalBuffer && tok != XML_TOK_INVALID) {
@@ -3968,7 +4191,8 @@ entityValueInitProcessor(XML_Parser parser, const char *s, const char *end,
         break;
       }
       /* found end of entity value - can store it now */
-      return storeEntityValue(parser, parser->m_encoding, s, end);
+      return storeEntityValue(parser, parser->m_encoding, s, end,
+                              XML_ACCOUNT_DIRECT);
     } else if (tok == XML_TOK_XML_DECL) {
       enum XML_Error result;
       result = processXmlDecl(parser, 0, start, next);
@@ -3995,6 +4219,14 @@ entityValueInitProcessor(XML_Parser parser, const char *s, const char *end,
     */
     else if (tok == XML_TOK_BOM && next == end
              && ! parser->m_parsingStatus.finalBuffer) {
+#  ifdef XML_DTD
+      if (! accountingDiffTolerated(parser, tok, s, next, __LINE__,
+                                    XML_ACCOUNT_DIRECT)) {
+        accountingOnAbort(parser);
+        return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+      }
+#  endif
+
       *nextPtr = next;
       return XML_ERROR_NONE;
     }
@@ -4037,16 +4269,24 @@ externalParEntProcessor(XML_Parser parser, const char *s, const char *end,
   }
   /* This would cause the next stage, i.e. doProlog to be passed XML_TOK_BOM.
      However, when parsing an external subset, doProlog will not accept a BOM
-     as valid, and report a syntax error, so we have to skip the BOM
+     as valid, and report a syntax error, so we have to skip the BOM, and
+     account for the BOM bytes.
   */
   else if (tok == XML_TOK_BOM) {
+    if (! accountingDiffTolerated(parser, tok, s, next, __LINE__,
+                                  XML_ACCOUNT_DIRECT)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+
     s = next;
     tok = XmlPrologTok(parser->m_encoding, s, end, &next);
   }
 
   parser->m_processor = prologProcessor;
   return doProlog(parser, parser->m_encoding, s, end, tok, next, nextPtr,
-                  (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE);
+                  (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE,
+                  XML_ACCOUNT_DIRECT);
 }
 
 static enum XML_Error PTRCALL
@@ -4059,6 +4299,9 @@ entityValueProcessor(XML_Parser parser, const char *s, const char *end,
 
   for (;;) {
     tok = XmlPrologTok(enc, start, end, &next);
+    /* Note: These bytes are accounted later in:
+             - storeEntityValue
+    */
     if (tok <= 0) {
       if (! parser->m_parsingStatus.finalBuffer && tok != XML_TOK_INVALID) {
         *nextPtr = s;
@@ -4076,7 +4319,7 @@ entityValueProcessor(XML_Parser parser, const char *s, const char *end,
         break;
       }
       /* found end of entity value - can store it now */
-      return storeEntityValue(parser, enc, s, end);
+      return storeEntityValue(parser, enc, s, end, XML_ACCOUNT_DIRECT);
     }
     start = next;
   }
@@ -4090,13 +4333,14 @@ prologProcessor(XML_Parser parser, const char *s, const char *end,
   const char *next = s;
   int tok = XmlPrologTok(parser->m_encoding, s, end, &next);
   return doProlog(parser, parser->m_encoding, s, end, tok, next, nextPtr,
-                  (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE);
+                  (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE,
+                  XML_ACCOUNT_DIRECT);
 }
 
 static enum XML_Error
 doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
          int tok, const char *next, const char **nextPtr, XML_Bool haveMore,
-         XML_Bool allowClosingDoctype) {
+         XML_Bool allowClosingDoctype, enum XML_Account account) {
 #ifdef XML_DTD
   static const XML_Char externalSubsetName[] = {ASCII_HASH, '\0'};
 #endif /* XML_DTD */
@@ -4123,6 +4367,10 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
   static const XML_Char enumValueSep[] = {ASCII_PIPE, '\0'};
   static const XML_Char enumValueStart[] = {ASCII_LPAREN, '\0'};
 
+#ifndef XML_DTD
+  UNUSED_P(account);
+#endif
+
   /* save one level of indirection */
   DTD *const dtd = parser->m_dtd;
 
@@ -4187,6 +4435,19 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
       }
     }
     role = XmlTokenRole(&parser->m_prologState, tok, s, next, enc);
+#ifdef XML_DTD
+    switch (role) {
+    case XML_ROLE_INSTANCE_START: // bytes accounted in contentProcessor
+    case XML_ROLE_XML_DECL:       // bytes accounted in processXmlDecl
+    case XML_ROLE_TEXT_DECL:      // bytes accounted in processXmlDecl
+      break;
+    default:
+      if (! accountingDiffTolerated(parser, tok, s, next, __LINE__, account)) {
+        accountingOnAbort(parser);
+        return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+      }
+    }
+#endif
     switch (role) {
     case XML_ROLE_XML_DECL: {
       enum XML_Error result = processXmlDecl(parser, 0, s, next);
@@ -4462,7 +4723,8 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
         const XML_Char *attVal;
         enum XML_Error result = storeAttributeValue(
             parser, enc, parser->m_declAttributeIsCdata,
-            s + enc->minBytesPerChar, next - enc->minBytesPerChar, &dtd->pool);
+            s + enc->minBytesPerChar, next - enc->minBytesPerChar, &dtd->pool,
+            XML_ACCOUNT_NONE);
         if (result)
           return result;
         attVal = poolStart(&dtd->pool);
@@ -4495,8 +4757,9 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
       break;
     case XML_ROLE_ENTITY_VALUE:
       if (dtd->keepProcessing) {
-        enum XML_Error result = storeEntityValue(
-            parser, enc, s + enc->minBytesPerChar, next - enc->minBytesPerChar);
+        enum XML_Error result
+            = storeEntityValue(parser, enc, s + enc->minBytesPerChar,
+                               next - enc->minBytesPerChar, XML_ACCOUNT_NONE);
         if (parser->m_declEntity) {
           parser->m_declEntity->textPtr = poolStart(&dtd->entityValuePool);
           parser->m_declEntity->textLen
@@ -4886,12 +5149,15 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end,
         if (parser->m_externalEntityRefHandler) {
           dtd->paramEntityRead = XML_FALSE;
           entity->open = XML_TRUE;
+          entityTrackingOnOpen(parser, entity, __LINE__);
           if (! parser->m_externalEntityRefHandler(
                   parser->m_externalEntityRefHandlerArg, 0, entity->base,
                   entity->systemId, entity->publicId)) {
+            entityTrackingOnClose(parser, entity, __LINE__);
             entity->open = XML_FALSE;
             return XML_ERROR_EXTERNAL_ENTITY_HANDLING;
           }
+          entityTrackingOnClose(parser, entity, __LINE__);
           entity->open = XML_FALSE;
           handleDefault = XML_FALSE;
           if (! dtd->paramEntityRead) {
@@ -5089,6 +5355,13 @@ epilogProcessor(XML_Parser parser, const char *s, const char *end,
   for (;;) {
     const char *next = NULL;
     int tok = XmlPrologTok(parser->m_encoding, s, end, &next);
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, s, next, __LINE__,
+                                  XML_ACCOUNT_DIRECT)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#endif
     parser->m_eventEndPtr = next;
     switch (tok) {
     /* report partial linebreak - it might be the last token */
@@ -5162,6 +5435,9 @@ processInternalEntity(XML_Parser parser, ENTITY *entity, XML_Bool betweenDecl) {
       return XML_ERROR_NO_MEMORY;
   }
   entity->open = XML_TRUE;
+#ifdef XML_DTD
+  entityTrackingOnOpen(parser, entity, __LINE__);
+#endif
   entity->processed = 0;
   openEntity->next = parser->m_openInternalEntities;
   parser->m_openInternalEntities = openEntity;
@@ -5170,8 +5446,8 @@ processInternalEntity(XML_Parser parser, ENTITY *entity, XML_Bool betweenDecl) {
   openEntity->betweenDecl = betweenDecl;
   openEntity->internalEventPtr = NULL;
   openEntity->internalEventEndPtr = NULL;
-  textStart = (char *)entity->textPtr;
-  textEnd = (char *)(entity->textPtr + entity->textLen);
+  textStart = (const char *)entity->textPtr;
+  textEnd = (const char *)(entity->textPtr + entity->textLen);
   /* Set a safe default value in case 'next' does not get set */
   next = textStart;
 
@@ -5180,17 +5456,22 @@ processInternalEntity(XML_Parser parser, ENTITY *entity, XML_Bool betweenDecl) {
     int tok
         = XmlPrologTok(parser->m_internalEncoding, textStart, textEnd, &next);
     result = doProlog(parser, parser->m_internalEncoding, textStart, textEnd,
-                      tok, next, &next, XML_FALSE, XML_FALSE);
+                      tok, next, &next, XML_FALSE, XML_FALSE,
+                      XML_ACCOUNT_ENTITY_EXPANSION);
   } else
 #endif /* XML_DTD */
     result = doContent(parser, parser->m_tagLevel, parser->m_internalEncoding,
-                       textStart, textEnd, &next, XML_FALSE);
+                       textStart, textEnd, &next, XML_FALSE,
+                       XML_ACCOUNT_ENTITY_EXPANSION);
 
   if (result == XML_ERROR_NONE) {
     if (textEnd != next && parser->m_parsingStatus.parsing == XML_SUSPENDED) {
       entity->processed = (int)(next - textStart);
       parser->m_processor = internalEntityProcessor;
     } else {
+#ifdef XML_DTD
+      entityTrackingOnClose(parser, entity, __LINE__);
+#endif /* XML_DTD */
       entity->open = XML_FALSE;
       parser->m_openInternalEntities = openEntity->next;
       /* put openEntity back in list of free instances */
@@ -5213,8 +5494,8 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,
     return XML_ERROR_UNEXPECTED_STATE;
 
   entity = openEntity->entity;
-  textStart = ((char *)entity->textPtr) + entity->processed;
-  textEnd = (char *)(entity->textPtr + entity->textLen);
+  textStart = ((const char *)entity->textPtr) + entity->processed;
+  textEnd = (const char *)(entity->textPtr + entity->textLen);
   /* Set a safe default value in case 'next' does not get set */
   next = textStart;
 
@@ -5223,20 +5504,24 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,
     int tok
         = XmlPrologTok(parser->m_internalEncoding, textStart, textEnd, &next);
     result = doProlog(parser, parser->m_internalEncoding, textStart, textEnd,
-                      tok, next, &next, XML_FALSE, XML_TRUE);
+                      tok, next, &next, XML_FALSE, XML_TRUE,
+                      XML_ACCOUNT_ENTITY_EXPANSION);
   } else
 #endif /* XML_DTD */
     result = doContent(parser, openEntity->startTagLevel,
                        parser->m_internalEncoding, textStart, textEnd, &next,
-                       XML_FALSE);
+                       XML_FALSE, XML_ACCOUNT_ENTITY_EXPANSION);
 
   if (result != XML_ERROR_NONE)
     return result;
   else if (textEnd != next
            && parser->m_parsingStatus.parsing == XML_SUSPENDED) {
-    entity->processed = (int)(next - (char *)entity->textPtr);
+    entity->processed = (int)(next - (const char *)entity->textPtr);
     return result;
   } else {
+#ifdef XML_DTD
+    entityTrackingOnClose(parser, entity, __LINE__);
+#endif
     entity->open = XML_FALSE;
     parser->m_openInternalEntities = openEntity->next;
     /* put openEntity back in list of free instances */
@@ -5250,7 +5535,8 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,
     parser->m_processor = prologProcessor;
     tok = XmlPrologTok(parser->m_encoding, s, end, &next);
     return doProlog(parser, parser->m_encoding, s, end, tok, next, nextPtr,
-                    (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE);
+                    (XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE,
+                    XML_ACCOUNT_DIRECT);
   } else
 #endif /* XML_DTD */
   {
@@ -5258,7 +5544,8 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,
     /* see externalEntityContentProcessor vs contentProcessor */
     return doContent(parser, parser->m_parentParser ? 1 : 0, parser->m_encoding,
                      s, end, nextPtr,
-                     (XML_Bool)! parser->m_parsingStatus.finalBuffer);
+                     (XML_Bool)! parser->m_parsingStatus.finalBuffer,
+                     XML_ACCOUNT_DIRECT);
   }
 }
 
@@ -5273,9 +5560,10 @@ errorProcessor(XML_Parser parser, const char *s, const char *end,
 
 static enum XML_Error
 storeAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
-                    const char *ptr, const char *end, STRING_POOL *pool) {
+                    const char *ptr, const char *end, STRING_POOL *pool,
+                    enum XML_Account account) {
   enum XML_Error result
-      = appendAttributeValue(parser, enc, isCdata, ptr, end, pool);
+      = appendAttributeValue(parser, enc, isCdata, ptr, end, pool, account);
   if (result)
     return result;
   if (! isCdata && poolLength(pool) && poolLastChar(pool) == 0x20)
@@ -5287,11 +5575,23 @@ storeAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
 
 static enum XML_Error
 appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
-                     const char *ptr, const char *end, STRING_POOL *pool) {
+                     const char *ptr, const char *end, STRING_POOL *pool,
+                     enum XML_Account account) {
   DTD *const dtd = parser->m_dtd; /* save one level of indirection */
+#ifndef XML_DTD
+  UNUSED_P(account);
+#endif
+
   for (;;) {
-    const char *next;
+    const char *next
+        = ptr; /* XmlAttributeValueTok doesn't always set the last arg */
     int tok = XmlAttributeValueTok(enc, ptr, end, &next);
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, ptr, next, __LINE__, account)) {
+      accountingOnAbort(parser);
+      return XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+    }
+#endif
     switch (tok) {
     case XML_TOK_NONE:
       return XML_ERROR_NONE;
@@ -5351,6 +5651,14 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
       XML_Char ch = (XML_Char)XmlPredefinedEntityName(
           enc, ptr + enc->minBytesPerChar, next - enc->minBytesPerChar);
       if (ch) {
+#ifdef XML_DTD
+        /* NOTE: We are replacing 4-6 characters original input for 1 character
+         *       so there is no amplification and hence recording without
+         *       protection. */
+        accountingDiffTolerated(parser, tok, (char *)&ch,
+                                ((char *)&ch) + sizeof(XML_Char), __LINE__,
+                                XML_ACCOUNT_ENTITY_EXPANSION);
+#endif /* XML_DTD */
         if (! poolAppendChar(pool, ch))
           return XML_ERROR_NO_MEMORY;
         break;
@@ -5428,9 +5736,16 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
         enum XML_Error result;
         const XML_Char *textEnd = entity->textPtr + entity->textLen;
         entity->open = XML_TRUE;
+#ifdef XML_DTD
+        entityTrackingOnOpen(parser, entity, __LINE__);
+#endif
         result = appendAttributeValue(parser, parser->m_internalEncoding,
-                                      isCdata, (char *)entity->textPtr,
-                                      (char *)textEnd, pool);
+                                      isCdata, (const char *)entity->textPtr,
+                                      (const char *)textEnd, pool,
+                                      XML_ACCOUNT_ENTITY_EXPANSION);
+#ifdef XML_DTD
+        entityTrackingOnClose(parser, entity, __LINE__);
+#endif
         entity->open = XML_FALSE;
         if (result)
           return result;
@@ -5460,13 +5775,16 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
 
 static enum XML_Error
 storeEntityValue(XML_Parser parser, const ENCODING *enc,
-                 const char *entityTextPtr, const char *entityTextEnd) {
+                 const char *entityTextPtr, const char *entityTextEnd,
+                 enum XML_Account account) {
   DTD *const dtd = parser->m_dtd; /* save one level of indirection */
   STRING_POOL *pool = &(dtd->entityValuePool);
   enum XML_Error result = XML_ERROR_NONE;
 #ifdef XML_DTD
   int oldInEntityValue = parser->m_prologState.inEntityValue;
   parser->m_prologState.inEntityValue = 1;
+#else
+  UNUSED_P(account);
 #endif /* XML_DTD */
   /* never return Null for the value argument in EntityDeclHandler,
      since this would indicate an external entity; therefore we
@@ -5477,8 +5795,19 @@ storeEntityValue(XML_Parser parser, const ENCODING *enc,
   }
 
   for (;;) {
-    const char *next;
+    const char *next
+        = entityTextPtr; /* XmlEntityValueTok doesn't always set the last arg */
     int tok = XmlEntityValueTok(enc, entityTextPtr, entityTextEnd, &next);
+
+#ifdef XML_DTD
+    if (! accountingDiffTolerated(parser, tok, entityTextPtr, next, __LINE__,
+                                  account)) {
+      accountingOnAbort(parser);
+      result = XML_ERROR_AMPLIFICATION_LIMIT_BREACH;
+      goto endEntityValue;
+    }
+#endif
+
     switch (tok) {
     case XML_TOK_PARAM_ENTITY_REF:
 #ifdef XML_DTD
@@ -5514,13 +5843,16 @@ storeEntityValue(XML_Parser parser, const ENCODING *enc,
           if (parser->m_externalEntityRefHandler) {
             dtd->paramEntityRead = XML_FALSE;
             entity->open = XML_TRUE;
+            entityTrackingOnOpen(parser, entity, __LINE__);
             if (! parser->m_externalEntityRefHandler(
                     parser->m_externalEntityRefHandlerArg, 0, entity->base,
                     entity->systemId, entity->publicId)) {
+              entityTrackingOnClose(parser, entity, __LINE__);
               entity->open = XML_FALSE;
               result = XML_ERROR_EXTERNAL_ENTITY_HANDLING;
               goto endEntityValue;
             }
+            entityTrackingOnClose(parser, entity, __LINE__);
             entity->open = XML_FALSE;
             if (! dtd->paramEntityRead)
               dtd->keepProcessing = dtd->standalone;
@@ -5528,9 +5860,12 @@ storeEntityValue(XML_Parser parser, const ENCODING *enc,
             dtd->keepProcessing = dtd->standalone;
         } else {
           entity->open = XML_TRUE;
+          entityTrackingOnOpen(parser, entity, __LINE__);
           result = storeEntityValue(
-              parser, parser->m_internalEncoding, (char *)entity->textPtr,
-              (char *)(entity->textPtr + entity->textLen));
+              parser, parser->m_internalEncoding, (const char *)entity->textPtr,
+              (const char *)(entity->textPtr + entity->textLen),
+              XML_ACCOUNT_ENTITY_EXPANSION);
+          entityTrackingOnClose(parser, entity, __LINE__);
           entity->open = XML_FALSE;
           if (result)
             goto endEntityValue;
@@ -6485,7 +6820,7 @@ hashTableInit(HASH_TABLE *p, const XML_Memory_Handling_Suite *ms) {
 static void FASTCALL
 hashTableIterInit(HASH_TABLE_ITER *iter, const HASH_TABLE *table) {
   iter->p = table->v;
-  iter->end = iter->p + table->size;
+  iter->end = iter->p ? iter->p + table->size : NULL;
 }
 
 static NAMED *FASTCALL
@@ -6891,3 +7226,755 @@ copyString(const XML_Char *s, const XML_Memory_Handling_Suite *memsuite) {
   memcpy(result, s, charsRequired * sizeof(XML_Char));
   return result;
 }
+
+#ifdef XML_DTD
+
+static float
+accountingGetCurrentAmplification(XML_Parser rootParser) {
+  const XmlBigCount countBytesOutput
+      = rootParser->m_accounting.countBytesDirect
+        + rootParser->m_accounting.countBytesIndirect;
+  const float amplificationFactor
+      = rootParser->m_accounting.countBytesDirect
+            ? (countBytesOutput
+               / (float)(rootParser->m_accounting.countBytesDirect))
+            : 1.0f;
+  assert(! rootParser->m_parentParser);
+  return amplificationFactor;
+}
+
+static void
+accountingReportStats(XML_Parser originParser, const char *epilog) {
+  const XML_Parser rootParser = getRootParserOf(originParser, NULL);
+  assert(! rootParser->m_parentParser);
+
+  if (rootParser->m_accounting.debugLevel < 1) {
+    return;
+  }
+
+  const float amplificationFactor
+      = accountingGetCurrentAmplification(rootParser);
+  fprintf(stderr,
+          "expat: Accounting(%p): Direct " EXPAT_FMT_ULL(
+              "10") ", indirect " EXPAT_FMT_ULL("10") ", amplification %8.2f%s",
+          (void *)rootParser, rootParser->m_accounting.countBytesDirect,
+          rootParser->m_accounting.countBytesIndirect,
+          (double)amplificationFactor, epilog);
+}
+
+static void
+accountingOnAbort(XML_Parser originParser) {
+  accountingReportStats(originParser, " ABORTING\n");
+}
+
+static void
+accountingReportDiff(XML_Parser rootParser,
+                     unsigned int levelsAwayFromRootParser, const char *before,
+                     const char *after, ptrdiff_t bytesMore, int source_line,
+                     enum XML_Account account) {
+  assert(! rootParser->m_parentParser);
+
+  fprintf(stderr,
+          " (+" EXPAT_FMT_PTRDIFF_T("6") " bytes %s|%d, xmlparse.c:%d) %*s\"",
+          bytesMore, (account == XML_ACCOUNT_DIRECT) ? "DIR" : "EXP",
+          levelsAwayFromRootParser, source_line, 10, "");
+
+  const char ellipis[] = "[..]";
+  const size_t ellipsisLength = sizeof(ellipis) /* because compile-time */ - 1;
+  const unsigned int contextLength = 10;
+
+  /* Note: Performance is of no concern here */
+  const char *walker = before;
+  if ((rootParser->m_accounting.debugLevel >= 3)
+      || (after - before)
+             <= (ptrdiff_t)(contextLength + ellipsisLength + contextLength)) {
+    for (; walker < after; walker++) {
+      fprintf(stderr, "%s", unsignedCharToPrintable(walker[0]));
+    }
+  } else {
+    for (; walker < before + contextLength; walker++) {
+      fprintf(stderr, "%s", unsignedCharToPrintable(walker[0]));
+    }
+    fprintf(stderr, ellipis);
+    walker = after - contextLength;
+    for (; walker < after; walker++) {
+      fprintf(stderr, "%s", unsignedCharToPrintable(walker[0]));
+    }
+  }
+  fprintf(stderr, "\"\n");
+}
+
+static XML_Bool
+accountingDiffTolerated(XML_Parser originParser, int tok, const char *before,
+                        const char *after, int source_line,
+                        enum XML_Account account) {
+  /* Note: We need to check the token type *first* to be sure that
+   *       we can even access variable <after>, safely.
+   *       E.g. for XML_TOK_NONE <after> may hold an invalid pointer. */
+  switch (tok) {
+  case XML_TOK_INVALID:
+  case XML_TOK_PARTIAL:
+  case XML_TOK_PARTIAL_CHAR:
+  case XML_TOK_NONE:
+    return XML_TRUE;
+  }
+
+  if (account == XML_ACCOUNT_NONE)
+    return XML_TRUE; /* because these bytes have been accounted for, already */
+
+  unsigned int levelsAwayFromRootParser;
+  const XML_Parser rootParser
+      = getRootParserOf(originParser, &levelsAwayFromRootParser);
+  assert(! rootParser->m_parentParser);
+
+  const int isDirect
+      = (account == XML_ACCOUNT_DIRECT) && (originParser == rootParser);
+  const ptrdiff_t bytesMore = after - before;
+
+  XmlBigCount *const additionTarget
+      = isDirect ? &rootParser->m_accounting.countBytesDirect
+                 : &rootParser->m_accounting.countBytesIndirect;
+
+  /* Detect and avoid integer overflow */
+  if (*additionTarget > (XmlBigCount)(-1) - (XmlBigCount)bytesMore)
+    return XML_FALSE;
+  *additionTarget += bytesMore;
+
+  const XmlBigCount countBytesOutput
+      = rootParser->m_accounting.countBytesDirect
+        + rootParser->m_accounting.countBytesIndirect;
+  const float amplificationFactor
+      = accountingGetCurrentAmplification(rootParser);
+  const XML_Bool tolerated
+      = (countBytesOutput < rootParser->m_accounting.activationThresholdBytes)
+        || (amplificationFactor
+            <= rootParser->m_accounting.maximumAmplificationFactor);
+
+  if (rootParser->m_accounting.debugLevel >= 2) {
+    accountingReportStats(rootParser, "");
+    accountingReportDiff(rootParser, levelsAwayFromRootParser, before, after,
+                         bytesMore, source_line, account);
+  }
+
+  return tolerated;
+}
+
+unsigned long long
+testingAccountingGetCountBytesDirect(XML_Parser parser) {
+  if (! parser)
+    return 0;
+  return parser->m_accounting.countBytesDirect;
+}
+
+unsigned long long
+testingAccountingGetCountBytesIndirect(XML_Parser parser) {
+  if (! parser)
+    return 0;
+  return parser->m_accounting.countBytesIndirect;
+}
+
+static void
+entityTrackingReportStats(XML_Parser rootParser, ENTITY *entity,
+                          const char *action, int sourceLine) {
+  assert(! rootParser->m_parentParser);
+  if (rootParser->m_entity_stats.debugLevel < 1)
+    return;
+
+#  if defined(XML_UNICODE)
+  const char *const entityName = "[..]";
+#  else
+  const char *const entityName = entity->name;
+#  endif
+
+  fprintf(
+      stderr,
+      "expat: Entities(%p): Count %9d, depth %2d/%2d %*s%s%s; %s length %d (xmlparse.c:%d)\n",
+      (void *)rootParser, rootParser->m_entity_stats.countEverOpened,
+      rootParser->m_entity_stats.currentDepth,
+      rootParser->m_entity_stats.maximumDepthSeen,
+      (rootParser->m_entity_stats.currentDepth - 1) * 2, "",
+      entity->is_param ? "%" : "&", entityName, action, entity->textLen,
+      sourceLine);
+}
+
+static void
+entityTrackingOnOpen(XML_Parser originParser, ENTITY *entity, int sourceLine) {
+  const XML_Parser rootParser = getRootParserOf(originParser, NULL);
+  assert(! rootParser->m_parentParser);
+
+  rootParser->m_entity_stats.countEverOpened++;
+  rootParser->m_entity_stats.currentDepth++;
+  if (rootParser->m_entity_stats.currentDepth
+      > rootParser->m_entity_stats.maximumDepthSeen) {
+    rootParser->m_entity_stats.maximumDepthSeen++;
+  }
+
+  entityTrackingReportStats(rootParser, entity, "OPEN ", sourceLine);
+}
+
+static void
+entityTrackingOnClose(XML_Parser originParser, ENTITY *entity, int sourceLine) {
+  const XML_Parser rootParser = getRootParserOf(originParser, NULL);
+  assert(! rootParser->m_parentParser);
+
+  entityTrackingReportStats(rootParser, entity, "CLOSE", sourceLine);
+  rootParser->m_entity_stats.currentDepth--;
+}
+
+static XML_Parser
+getRootParserOf(XML_Parser parser, unsigned int *outLevelDiff) {
+  XML_Parser rootParser = parser;
+  unsigned int stepsTakenUpwards = 0;
+  while (rootParser->m_parentParser) {
+    rootParser = rootParser->m_parentParser;
+    stepsTakenUpwards++;
+  }
+  assert(! rootParser->m_parentParser);
+  if (outLevelDiff != NULL) {
+    *outLevelDiff = stepsTakenUpwards;
+  }
+  return rootParser;
+}
+
+const char *
+unsignedCharToPrintable(unsigned char c) {
+  switch (c) {
+  case 0:
+    return "\\0";
+  case 1:
+    return "\\x1";
+  case 2:
+    return "\\x2";
+  case 3:
+    return "\\x3";
+  case 4:
+    return "\\x4";
+  case 5:
+    return "\\x5";
+  case 6:
+    return "\\x6";
+  case 7:
+    return "\\x7";
+  case 8:
+    return "\\x8";
+  case 9:
+    return "\\t";
+  case 10:
+    return "\\n";
+  case 11:
+    return "\\xB";
+  case 12:
+    return "\\xC";
+  case 13:
+    return "\\r";
+  case 14:
+    return "\\xE";
+  case 15:
+    return "\\xF";
+  case 16:
+    return "\\x10";
+  case 17:
+    return "\\x11";
+  case 18:
+    return "\\x12";
+  case 19:
+    return "\\x13";
+  case 20:
+    return "\\x14";
+  case 21:
+    return "\\x15";
+  case 22:
+    return "\\x16";
+  case 23:
+    return "\\x17";
+  case 24:
+    return "\\x18";
+  case 25:
+    return "\\x19";
+  case 26:
+    return "\\x1A";
+  case 27:
+    return "\\x1B";
+  case 28:
+    return "\\x1C";
+  case 29:
+    return "\\x1D";
+  case 30:
+    return "\\x1E";
+  case 31:
+    return "\\x1F";
+  case 32:
+    return " ";
+  case 33:
+    return "!";
+  case 34:
+    return "\\\"";
+  case 35:
+    return "#";
+  case 36:
+    return "$";
+  case 37:
+    return "%";
+  case 38:
+    return "&";
+  case 39:
+    return "'";
+  case 40:
+    return "(";
+  case 41:
+    return ")";
+  case 42:
+    return "*";
+  case 43:
+    return "+";
+  case 44:
+    return ",";
+  case 45:
+    return "-";
+  case 46:
+    return ".";
+  case 47:
+    return "/";
+  case 48:
+    return "0";
+  case 49:
+    return "1";
+  case 50:
+    return "2";
+  case 51:
+    return "3";
+  case 52:
+    return "4";
+  case 53:
+    return "5";
+  case 54:
+    return "6";
+  case 55:
+    return "7";
+  case 56:
+    return "8";
+  case 57:
+    return "9";
+  case 58:
+    return ":";
+  case 59:
+    return ";";
+  case 60:
+    return "<";
+  case 61:
+    return "=";
+  case 62:
+    return ">";
+  case 63:
+    return "?";
+  case 64:
+    return "@";
+  case 65:
+    return "A";
+  case 66:
+    return "B";
+  case 67:
+    return "C";
+  case 68:
+    return "D";
+  case 69:
+    return "E";
+  case 70:
+    return "F";
+  case 71:
+    return "G";
+  case 72:
+    return "H";
+  case 73:
+    return "I";
+  case 74:
+    return "J";
+  case 75:
+    return "K";
+  case 76:
+    return "L";
+  case 77:
+    return "M";
+  case 78:
+    return "N";
+  case 79:
+    return "O";
+  case 80:
+    return "P";
+  case 81:
+    return "Q";
+  case 82:
+    return "R";
+  case 83:
+    return "S";
+  case 84:
+    return "T";
+  case 85:
+    return "U";
+  case 86:
+    return "V";
+  case 87:
+    return "W";
+  case 88:
+    return "X";
+  case 89:
+    return "Y";
+  case 90:
+    return "Z";
+  case 91:
+    return "[";
+  case 92:
+    return "\\\\";
+  case 93:
+    return "]";
+  case 94:
+    return "^";
+  case 95:
+    return "_";
+  case 96:
+    return "`";
+  case 97:
+    return "a";
+  case 98:
+    return "b";
+  case 99:
+    return "c";
+  case 100:
+    return "d";
+  case 101:
+    return "e";
+  case 102:
+    return "f";
+  case 103:
+    return "g";
+  case 104:
+    return "h";
+  case 105:
+    return "i";
+  case 106:
+    return "j";
+  case 107:
+    return "k";
+  case 108:
+    return "l";
+  case 109:
+    return "m";
+  case 110:
+    return "n";
+  case 111:
+    return "o";
+  case 112:
+    return "p";
+  case 113:
+    return "q";
+  case 114:
+    return "r";
+  case 115:
+    return "s";
+  case 116:
+    return "t";
+  case 117:
+    return "u";
+  case 118:
+    return "v";
+  case 119:
+    return "w";
+  case 120:
+    return "x";
+  case 121:
+    return "y";
+  case 122:
+    return "z";
+  case 123:
+    return "{";
+  case 124:
+    return "|";
+  case 125:
+    return "}";
+  case 126:
+    return "~";
+  case 127:
+    return "\\x7F";
+  case 128:
+    return "\\x80";
+  case 129:
+    return "\\x81";
+  case 130:
+    return "\\x82";
+  case 131:
+    return "\\x83";
+  case 132:
+    return "\\x84";
+  case 133:
+    return "\\x85";
+  case 134:
+    return "\\x86";
+  case 135:
+    return "\\x87";
+  case 136:
+    return "\\x88";
+  case 137:
+    return "\\x89";
+  case 138:
+    return "\\x8A";
+  case 139:
+    return "\\x8B";
+  case 140:
+    return "\\x8C";
+  case 141:
+    return "\\x8D";
+  case 142:
+    return "\\x8E";
+  case 143:
+    return "\\x8F";
+  case 144:
+    return "\\x90";
+  case 145:
+    return "\\x91";
+  case 146:
+    return "\\x92";
+  case 147:
+    return "\\x93";
+  case 148:
+    return "\\x94";
+  case 149:
+    return "\\x95";
+  case 150:
+    return "\\x96";
+  case 151:
+    return "\\x97";
+  case 152:
+    return "\\x98";
+  case 153:
+    return "\\x99";
+  case 154:
+    return "\\x9A";
+  case 155:
+    return "\\x9B";
+  case 156:
+    return "\\x9C";
+  case 157:
+    return "\\x9D";
+  case 158:
+    return "\\x9E";
+  case 159:
+    return "\\x9F";
+  case 160:
+    return "\\xA0";
+  case 161:
+    return "\\xA1";
+  case 162:
+    return "\\xA2";
+  case 163:
+    return "\\xA3";
+  case 164:
+    return "\\xA4";
+  case 165:
+    return "\\xA5";
+  case 166:
+    return "\\xA6";
+  case 167:
+    return "\\xA7";
+  case 168:
+    return "\\xA8";
+  case 169:
+    return "\\xA9";
+  case 170:
+    return "\\xAA";
+  case 171:
+    return "\\xAB";
+  case 172:
+    return "\\xAC";
+  case 173:
+    return "\\xAD";
+  case 174:
+    return "\\xAE";
+  case 175:
+    return "\\xAF";
+  case 176:
+    return "\\xB0";
+  case 177:
+    return "\\xB1";
+  case 178:
+    return "\\xB2";
+  case 179:
+    return "\\xB3";
+  case 180:
+    return "\\xB4";
+  case 181:
+    return "\\xB5";
+  case 182:
+    return "\\xB6";
+  case 183:
+    return "\\xB7";
+  case 184:
+    return "\\xB8";
+  case 185:
+    return "\\xB9";
+  case 186:
+    return "\\xBA";
+  case 187:
+    return "\\xBB";
+  case 188:
+    return "\\xBC";
+  case 189:
+    return "\\xBD";
+  case 190:
+    return "\\xBE";
+  case 191:
+    return "\\xBF";
+  case 192:
+    return "\\xC0";
+  case 193:
+    return "\\xC1";
+  case 194:
+    return "\\xC2";
+  case 195:
+    return "\\xC3";
+  case 196:
+    return "\\xC4";
+  case 197:
+    return "\\xC5";
+  case 198:
+    return "\\xC6";
+  case 199:
+    return "\\xC7";
+  case 200:
+    return "\\xC8";
+  case 201:
+    return "\\xC9";
+  case 202:
+    return "\\xCA";
+  case 203:
+    return "\\xCB";
+  case 204:
+    return "\\xCC";
+  case 205:
+    return "\\xCD";
+  case 206:
+    return "\\xCE";
+  case 207:
+    return "\\xCF";
+  case 208:
+    return "\\xD0";
+  case 209:
+    return "\\xD1";
+  case 210:
+    return "\\xD2";
+  case 211:
+    return "\\xD3";
+  case 212:
+    return "\\xD4";
+  case 213:
+    return "\\xD5";
+  case 214:
+    return "\\xD6";
+  case 215:
+    return "\\xD7";
+  case 216:
+    return "\\xD8";
+  case 217:
+    return "\\xD9";
+  case 218:
+    return "\\xDA";
+  case 219:
+    return "\\xDB";
+  case 220:
+    return "\\xDC";
+  case 221:
+    return "\\xDD";
+  case 222:
+    return "\\xDE";
+  case 223:
+    return "\\xDF";
+  case 224:
+    return "\\xE0";
+  case 225:
+    return "\\xE1";
+  case 226:
+    return "\\xE2";
+  case 227:
+    return "\\xE3";
+  case 228:
+    return "\\xE4";
+  case 229:
+    return "\\xE5";
+  case 230:
+    return "\\xE6";
+  case 231:
+    return "\\xE7";
+  case 232:
+    return "\\xE8";
+  case 233:
+    return "\\xE9";
+  case 234:
+    return "\\xEA";
+  case 235:
+    return "\\xEB";
+  case 236:
+    return "\\xEC";
+  case 237:
+    return "\\xED";
+  case 238:
+    return "\\xEE";
+  case 239:
+    return "\\xEF";
+  case 240:
+    return "\\xF0";
+  case 241:
+    return "\\xF1";
+  case 242:
+    return "\\xF2";
+  case 243:
+    return "\\xF3";
+  case 244:
+    return "\\xF4";
+  case 245:
+    return "\\xF5";
+  case 246:
+    return "\\xF6";
+  case 247:
+    return "\\xF7";
+  case 248:
+    return "\\xF8";
+  case 249:
+    return "\\xF9";
+  case 250:
+    return "\\xFA";
+  case 251:
+    return "\\xFB";
+  case 252:
+    return "\\xFC";
+  case 253:
+    return "\\xFD";
+  case 254:
+    return "\\xFE";
+  case 255:
+    return "\\xFF";
+  default:
+    assert(0); /* never gets here */
+    return "dead code";
+  }
+  assert(0); /* never gets here */
+}
+
+#endif /* XML_DTD */
+
+static unsigned long
+getDebugLevel(const char *variableName, unsigned long defaultDebugLevel) {
+  const char *const valueOrNull = getenv(variableName);
+  if (valueOrNull == NULL) {
+    return defaultDebugLevel;
+  }
+  const char *const value = valueOrNull;
+
+  errno = 0;
+  char *afterValue = (char *)value;
+  unsigned long debugLevel = strtoul(value, &afterValue, 10);
+  if ((errno != 0) || (afterValue[0] != '\0')) {
+    errno = 0;
+    return defaultDebugLevel;
+  }
+
+  return debugLevel;
+}
diff --git a/Modules/expat/xmlrole.c b/Modules/expat/xmlrole.c
index 4d3e3e86e9e864..08173b0fd541d2 100644
--- a/Modules/expat/xmlrole.c
+++ b/Modules/expat/xmlrole.c
@@ -7,7 +7,14 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2006 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2002-2003 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2005-2009 Steven Solie <ssolie at users.sourceforge.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -34,11 +41,9 @@
 
 #ifdef _WIN32
 #  include "winconfig.h"
-#else
-#  ifdef HAVE_EXPAT_CONFIG_H
-#    include <expat_config.h>
-#  endif
-#endif /* ndef _WIN32 */
+#endif
+
+#include <expat_config.h>
 
 #include "expat_external.h"
 #include "internal.h"
@@ -1220,6 +1225,8 @@ common(PROLOG_STATE *state, int tok) {
 #ifdef XML_DTD
   if (! state->documentEntity && tok == XML_TOK_PARAM_ENTITY_REF)
     return XML_ROLE_INNER_PARAM_ENTITY_REF;
+#else
+  UNUSED_P(tok);
 #endif
   state->handler = error;
   return XML_ROLE_ERROR;
diff --git a/Modules/expat/xmlrole.h b/Modules/expat/xmlrole.h
index 036aba64fd29c6..d6e1fa150a108a 100644
--- a/Modules/expat/xmlrole.h
+++ b/Modules/expat/xmlrole.h
@@ -7,7 +7,10 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/xmltok.c b/Modules/expat/xmltok.c
index 11e9d1ccdad423..f2b6b406067ea9 100644
--- a/Modules/expat/xmltok.c
+++ b/Modules/expat/xmltok.c
@@ -7,7 +7,19 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2001-2003 Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002-2016 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2005-2009 Steven Solie <ssolie at users.sourceforge.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2016      Pascal Cuoq <cuoq at trust-in-soft.com>
+   Copyright (c) 2016      Don Lewis <truckman at apache.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2017      Alexander Bluhm <alexander.bluhm at gmx.net>
+   Copyright (c) 2017      Benbuck Nason <bnason at netflix.com>
+   Copyright (c) 2017      Jos? Guti?rrez de la Concha <jose at zeroc.com>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -32,23 +44,13 @@
 
 #include <stddef.h>
 #include <string.h> /* memcpy */
-
-#if defined(_MSC_VER) && (_MSC_VER <= 1700)
-/* for vs2012/11.0/1700 and earlier Visual Studio compilers */
-#  define bool int
-#  define false 0
-#  define true 1
-#else
-#  include <stdbool.h>
-#endif
+#include <stdbool.h>
 
 #ifdef _WIN32
 #  include "winconfig.h"
-#else
-#  ifdef HAVE_EXPAT_CONFIG_H
-#    include <expat_config.h>
-#  endif
-#endif /* ndef _WIN32 */
+#endif
+
+#include <expat_config.h>
 
 #include "expat_external.h"
 #include "internal.h"
@@ -269,8 +271,14 @@ sb_byteToAscii(const ENCODING *enc, const char *p) {
 
 #define IS_NAME_CHAR(enc, p, n) (AS_NORMAL_ENCODING(enc)->isName##n(enc, p))
 #define IS_NMSTRT_CHAR(enc, p, n) (AS_NORMAL_ENCODING(enc)->isNmstrt##n(enc, p))
-#define IS_INVALID_CHAR(enc, p, n)                                             \
-  (AS_NORMAL_ENCODING(enc)->isInvalid##n(enc, p))
+#ifdef XML_MIN_SIZE
+#  define IS_INVALID_CHAR(enc, p, n)                                           \
+    (AS_NORMAL_ENCODING(enc)->isInvalid##n                                     \
+     && AS_NORMAL_ENCODING(enc)->isInvalid##n(enc, p))
+#else
+#  define IS_INVALID_CHAR(enc, p, n)                                           \
+    (AS_NORMAL_ENCODING(enc)->isInvalid##n(enc, p))
+#endif
 
 #ifdef XML_MIN_SIZE
 #  define IS_NAME_CHAR_MINBPC(enc, p)                                          \
@@ -589,13 +597,13 @@ static const struct normal_encoding ascii_encoding
 static int PTRFASTCALL
 unicode_byte_type(char hi, char lo) {
   switch ((unsigned char)hi) {
-  /* 0xD800?0xDBFF first 16-bit code unit or high surrogate (W1) */
+  /* 0xD800-0xDBFF first 16-bit code unit or high surrogate (W1) */
   case 0xD8:
   case 0xD9:
   case 0xDA:
   case 0xDB:
     return BT_LEAD4;
-  /* 0xDC00?0xDFFF second 16-bit code unit or low surrogate (W2) */
+  /* 0xDC00-0xDFFF second 16-bit code unit or low surrogate (W2) */
   case 0xDC:
   case 0xDD:
   case 0xDE:
diff --git a/Modules/expat/xmltok.h b/Modules/expat/xmltok.h
index 2adbf5307befae..6f630c2f9ba96d 100644
--- a/Modules/expat/xmltok.h
+++ b/Modules/expat/xmltok.h
@@ -7,7 +7,11 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002-2005 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2016-2017 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/xmltok_impl.c b/Modules/expat/xmltok_impl.c
index c209221cd79d13..0430591b42636e 100644
--- a/Modules/expat/xmltok_impl.c
+++ b/Modules/expat/xmltok_impl.c
@@ -1,4 +1,4 @@
-/* This file is included!
+/* This file is included (from xmltok.c, 1-3 times depending on XML_MIN_SIZE)!
                             __  __            _
                          ___\ \/ /_ __   __ _| |_
                         / _ \\  /| '_ \ / _` | __|
@@ -7,7 +7,15 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002-2016 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2016-2021 Sebastian Pipping <sebastian at pipping.org>
+   Copyright (c) 2017      Rhodri James <rhodri at wildebeest.org.uk>
+   Copyright (c) 2018      Benjamin Peterson <benjamin at python.org>
+   Copyright (c) 2018      Anton Maklakov <antmak.pub at gmail.com>
+   Copyright (c) 2019      David Loffredo <loffredo at steptools.com>
+   Copyright (c) 2020      Boris Kolpackov <boris at codesynthesis.com>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -32,7 +40,7 @@
 
 #ifdef XML_TOK_IMPL_C
 
-#  ifndef IS_INVALID_CHAR
+#  ifndef IS_INVALID_CHAR // i.e. for UTF-16 and XML_MIN_SIZE not defined
 #    define IS_INVALID_CHAR(enc, ptr, n) (0)
 #  endif
 
@@ -1768,13 +1776,14 @@ PREFIX(updatePosition)(const ENCODING *enc, const char *ptr, const char *end,
 #  define LEAD_CASE(n)                                                         \
   case BT_LEAD##n:                                                             \
     ptr += n;                                                                  \
+    pos->columnNumber++;                                                       \
     break;
       LEAD_CASE(2)
       LEAD_CASE(3)
       LEAD_CASE(4)
 #  undef LEAD_CASE
     case BT_LF:
-      pos->columnNumber = (XML_Size)-1;
+      pos->columnNumber = 0;
       pos->lineNumber++;
       ptr += MINBPC(enc);
       break;
@@ -1783,13 +1792,13 @@ PREFIX(updatePosition)(const ENCODING *enc, const char *ptr, const char *end,
       ptr += MINBPC(enc);
       if (HAS_CHAR(enc, ptr, end) && BYTE_TYPE(enc, ptr) == BT_LF)
         ptr += MINBPC(enc);
-      pos->columnNumber = (XML_Size)-1;
+      pos->columnNumber = 0;
       break;
     default:
       ptr += MINBPC(enc);
+      pos->columnNumber++;
       break;
     }
-    pos->columnNumber++;
   }
 }
 
diff --git a/Modules/expat/xmltok_impl.h b/Modules/expat/xmltok_impl.h
index e925dbc7e2c833..c518aada013df2 100644
--- a/Modules/expat/xmltok_impl.h
+++ b/Modules/expat/xmltok_impl.h
@@ -7,7 +7,8 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2017-2019 Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
diff --git a/Modules/expat/xmltok_ns.c b/Modules/expat/xmltok_ns.c
index 919c74e9f97fe8..5fd83922359400 100644
--- a/Modules/expat/xmltok_ns.c
+++ b/Modules/expat/xmltok_ns.c
@@ -7,7 +7,11 @@
                                  |_| XML parser
 
    Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-   Copyright (c) 2000-2017 Expat development team
+   Copyright (c) 2000      Clark Cooper <coopercc at users.sourceforge.net>
+   Copyright (c) 2002      Greg Stein <gstein at users.sourceforge.net>
+   Copyright (c) 2002      Fred L. Drake, Jr. <fdrake at users.sourceforge.net>
+   Copyright (c) 2002-2006 Karl Waclawek <karl at waclawek.net>
+   Copyright (c) 2017      Sebastian Pipping <sebastian at pipping.org>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining


From webhook-mailer at python.org  Tue Aug 31 05:44:40 2021
From: webhook-mailer at python.org (Fidget-Spinner)
Date: Tue, 31 Aug 2021 09:44:40 -0000
Subject: [Python-checkins] bpo-44925: [docs] Fix confusing deprecation
 notice for typing.IO (GH-28004)
Message-ID: <mailman.1282.1630403081.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/edae42f99f8153b92ccf365dbd1c2fa954f913b4
commit: edae42f99f8153b92ccf365dbd1c2fa954f913b4
branch: main
author: DonnaDia <37962843+DonnaDia at users.noreply.github.com>
committer: Fidget-Spinner <28750310+Fidget-Spinner at users.noreply.github.com>
date: 2021-08-31T17:44:27+08:00
summary:

bpo-44925: [docs] Fix confusing deprecation notice for typing.IO (GH-28004)

files:
M Doc/library/typing.rst

diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst
index 53cf5429b54c97..13760c19214ee7 100644
--- a/Doc/library/typing.rst
+++ b/Doc/library/typing.rst
@@ -1507,8 +1507,8 @@ Other concrete types
    :func:`open`.
 
    .. deprecated-removed:: 3.8 3.12
-      These types are also in the ``typing.io`` namespace, which was
-      never supported by type checkers and will be removed.
+      The ``typing.io`` namespace is deprecated and will be removed.
+      These types should be directly imported from ``typing`` instead.
 
 .. class:: Pattern
            Match
@@ -1521,8 +1521,8 @@ Other concrete types
    ``Match[bytes]``.
 
    .. deprecated-removed:: 3.8 3.12
-      These types are also in the ``typing.re`` namespace, which was
-      never supported by type checkers and will be removed.
+      The ``typing.re`` namespace is deprecated and will be removed.
+      These types should be directly imported from ``typing`` instead.
 
    .. deprecated:: 3.9
       Classes ``Pattern`` and ``Match`` from :mod:`re` now support ``[]``.


From webhook-mailer at python.org  Tue Aug 31 08:18:53 2021
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 31 Aug 2021 12:18:53 -0000
Subject: [Python-checkins] bpo-44991: Make GIL handling more explicit in
 `sqlite3` callbacks (GH-27934)
Message-ID: <mailman.1283.1630412333.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/001ef4600f5ab2e1d7825ddbc0f253377c234d7e
commit: 001ef4600f5ab2e1d7825ddbc0f253377c234d7e
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-31T05:18:43-07:00
summary:

bpo-44991: Make GIL handling more explicit in `sqlite3` callbacks (GH-27934)



- acquire the GIL at the very start[1]
- release the GIL at the very end

[1] The trace callback performs a sanity check before acquiring the GIL

Automerge-Triggered-By: GH:encukou

files:
M Modules/_sqlite/connection.c

diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index 19d30d24d7f2e7..9ff5fbaae78529 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -626,14 +626,12 @@ set_sqlite_error(sqlite3_context *context, const char *msg)
 static void
 _pysqlite_func_callback(sqlite3_context *context, int argc, sqlite3_value **argv)
 {
+    PyGILState_STATE threadstate = PyGILState_Ensure();
+
     PyObject* args;
     PyObject* py_retval = NULL;
     int ok;
 
-    PyGILState_STATE threadstate;
-
-    threadstate = PyGILState_Ensure();
-
     args = _pysqlite_build_py_params(context, argc, argv);
     if (args) {
         callback_context *ctx = (callback_context *)sqlite3_user_data(context);
@@ -656,15 +654,13 @@ _pysqlite_func_callback(sqlite3_context *context, int argc, sqlite3_value **argv
 
 static void _pysqlite_step_callback(sqlite3_context *context, int argc, sqlite3_value** params)
 {
+    PyGILState_STATE threadstate = PyGILState_Ensure();
+
     PyObject* args;
     PyObject* function_result = NULL;
     PyObject** aggregate_instance;
     PyObject* stepmethod = NULL;
 
-    PyGILState_STATE threadstate;
-
-    threadstate = PyGILState_Ensure();
-
     aggregate_instance = (PyObject**)sqlite3_aggregate_context(context, sizeof(PyObject*));
 
     if (*aggregate_instance == NULL) {
@@ -706,16 +702,14 @@ static void _pysqlite_step_callback(sqlite3_context *context, int argc, sqlite3_
 static void
 _pysqlite_final_callback(sqlite3_context *context)
 {
+    PyGILState_STATE threadstate = PyGILState_Ensure();
+
     PyObject* function_result;
     PyObject** aggregate_instance;
     _Py_IDENTIFIER(finalize);
     int ok;
     PyObject *exception, *value, *tb;
 
-    PyGILState_STATE threadstate;
-
-    threadstate = PyGILState_Ensure();
-
     aggregate_instance = (PyObject**)sqlite3_aggregate_context(context, 0);
     if (aggregate_instance == NULL) {
         /* No rows matched the query; the step handler was never called. */
@@ -787,34 +781,34 @@ static void _pysqlite_drop_unused_cursor_references(pysqlite_Connection* self)
 static callback_context *
 create_callback_context(pysqlite_state *state, PyObject *callable)
 {
-    PyGILState_STATE gstate = PyGILState_Ensure();
     callback_context *ctx = PyMem_Malloc(sizeof(callback_context));
     if (ctx != NULL) {
         ctx->callable = Py_NewRef(callable);
         ctx->state = state;
     }
-    PyGILState_Release(gstate);
     return ctx;
 }
 
 static void
 free_callback_context(callback_context *ctx)
+{
+    assert(ctx != NULL);
+    Py_DECREF(ctx->callable);
+    PyMem_Free(ctx);
+}
+
+static void
+_destructor(void *ctx)
 {
     if (ctx != NULL) {
         // This function may be called without the GIL held, so we need to
         // ensure that we destroy 'ctx' with the GIL held.
         PyGILState_STATE gstate = PyGILState_Ensure();
-        Py_DECREF(ctx->callable);
-        PyMem_Free(ctx);
+        free_callback_context((callback_context *)ctx);
         PyGILState_Release(gstate);
     }
 }
 
-static void _destructor(void* args)
-{
-    free_callback_context((callback_context *)args);
-}
-
 /*[clinic input]
 _sqlite3.Connection.create_function as pysqlite_connection_create_function
 
@@ -914,11 +908,10 @@ pysqlite_connection_create_aggregate_impl(pysqlite_Connection *self,
 
 static int _authorizer_callback(void* user_arg, int action, const char* arg1, const char* arg2 , const char* dbname, const char* access_attempt_source)
 {
+    PyGILState_STATE gilstate = PyGILState_Ensure();
+
     PyObject *ret;
     int rc;
-    PyGILState_STATE gilstate;
-
-    gilstate = PyGILState_Ensure();
 
     ret = PyObject_CallFunction((PyObject*)user_arg, "issss", action, arg1, arg2, dbname, access_attempt_source);
 
@@ -959,11 +952,10 @@ static int _authorizer_callback(void* user_arg, int action, const char* arg1, co
 
 static int _progress_handler(void* user_arg)
 {
+    PyGILState_STATE gilstate = PyGILState_Ensure();
+
     int rc;
     PyObject *ret;
-    PyGILState_STATE gilstate;
-
-    gilstate = PyGILState_Ensure();
     ret = _PyObject_CallNoArg((PyObject*)user_arg);
 
     if (!ret) {
@@ -1000,18 +992,16 @@ static int _trace_callback(unsigned int type, void* user_arg, void* prepared_sta
 static void _trace_callback(void* user_arg, const char* statement_string)
 #endif
 {
-    PyObject *py_statement = NULL;
-    PyObject *ret = NULL;
-
-    PyGILState_STATE gilstate;
-
 #ifdef HAVE_TRACE_V2
     if (type != SQLITE_TRACE_STMT) {
         return 0;
     }
 #endif
 
-    gilstate = PyGILState_Ensure();
+    PyGILState_STATE gilstate = PyGILState_Ensure();
+
+    PyObject *py_statement = NULL;
+    PyObject *ret = NULL;
     py_statement = PyUnicode_DecodeUTF8(statement_string,
             strlen(statement_string), "replace");
     if (py_statement) {
@@ -1461,14 +1451,16 @@ pysqlite_collation_callback(
         int text1_length, const void* text1_data,
         int text2_length, const void* text2_data)
 {
+    PyGILState_STATE gilstate = PyGILState_Ensure();
+
     PyObject* string1 = 0;
     PyObject* string2 = 0;
-    PyGILState_STATE gilstate;
     PyObject* retval = NULL;
     long longval;
     int result = 0;
-    gilstate = PyGILState_Ensure();
 
+    /* This callback may be executed multiple times per sqlite3_step(). Bail if
+     * the previous call failed */
     if (PyErr_Occurred()) {
         goto finally;
     }


From webhook-mailer at python.org  Tue Aug 31 08:34:49 2021
From: webhook-mailer at python.org (encukou)
Date: Tue, 31 Aug 2021 12:34:49 -0000
Subject: [Python-checkins] bpo-42064: Offset arguments for
 PyObject_Vectorcall in the _sqlite module (GH-27931)
Message-ID: <mailman.1284.1630413289.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/01dea5f12b31862999217c091399a318f23b460a
commit: 01dea5f12b31862999217c091399a318f23b460a
branch: main
author: Petr Viktorin <encukou at gmail.com>
committer: encukou <encukou at gmail.com>
date: 2021-08-31T14:34:44+02:00
summary:

bpo-42064: Offset arguments for PyObject_Vectorcall in the _sqlite module (GH-27931)

This allows e.g. methods to be called efficiently by providing
space for a "self" argument; see PY_VECTORCALL_ARGUMENTS_OFFSET docs.

files:
M Modules/_sqlite/connection.c
M Modules/_sqlite/cursor.c

diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index 9ff5fbaae7852..864877c0c3426 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -59,19 +59,21 @@ static void _pysqlite_drop_unused_cursor_references(pysqlite_Connection* self);
 static PyObject *
 new_statement_cache(pysqlite_Connection *self, int maxsize)
 {
-    PyObject *args[] = { PyLong_FromLong(maxsize), };
-    if (args[0] == NULL) {
+    PyObject *args[] = { NULL, PyLong_FromLong(maxsize), };
+    if (args[1] == NULL) {
         return NULL;
     }
     PyObject *lru_cache = self->state->lru_cache;
-    PyObject *inner = PyObject_Vectorcall(lru_cache, args, 1, NULL);
-    Py_DECREF(args[0]);
+    size_t nargsf = 1 | PY_VECTORCALL_ARGUMENTS_OFFSET;
+    PyObject *inner = PyObject_Vectorcall(lru_cache, args + 1, nargsf, NULL);
+    Py_DECREF(args[1]);
     if (inner == NULL) {
         return NULL;
     }
 
-    args[0] = (PyObject *)self;  // Borrowed ref.
-    PyObject *res = PyObject_Vectorcall(inner, args, 1, NULL);
+    args[1] = (PyObject *)self;  // Borrowed ref.
+    nargsf = 1 | PY_VECTORCALL_ARGUMENTS_OFFSET;
+    PyObject *res = PyObject_Vectorcall(inner, args + 1, nargsf, NULL);
     Py_DECREF(inner);
     return res;
 }
@@ -1474,8 +1476,9 @@ pysqlite_collation_callback(
 
     callback_context *ctx = (callback_context *)context;
     assert(ctx != NULL);
-    PyObject *args[] = { string1, string2 };  // Borrowed refs.
-    retval = PyObject_Vectorcall(ctx->callable, args, 2, NULL);
+    PyObject *args[] = { NULL, string1, string2 };  // Borrowed refs.
+    size_t nargsf = 2 | PY_VECTORCALL_ARGUMENTS_OFFSET;
+    retval = PyObject_Vectorcall(ctx->callable, args + 1, nargsf, NULL);
     if (retval == NULL) {
         /* execution failed */
         goto finally;
diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
index 8b830ec767b5d..06ce385cca3a4 100644
--- a/Modules/_sqlite/cursor.c
+++ b/Modules/_sqlite/cursor.c
@@ -462,9 +462,10 @@ begin_transaction(pysqlite_Connection *self)
 static PyObject *
 get_statement_from_cache(pysqlite_Cursor *self, PyObject *operation)
 {
-    PyObject *args[] = { operation, };
+    PyObject *args[] = { NULL, operation, };  // Borrowed ref.
     PyObject *cache = self->connection->statement_cache;
-    return PyObject_Vectorcall(cache, args, 1, NULL);
+    size_t nargsf = 1 | PY_VECTORCALL_ARGUMENTS_OFFSET;
+    return PyObject_Vectorcall(cache, args + 1, nargsf, NULL);
 }
 
 static PyObject *


From webhook-mailer at python.org  Tue Aug 31 09:39:23 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 31 Aug 2021 13:39:23 -0000
Subject: [Python-checkins] bpo-44135: Refine explanation of how passing
 tuples to issubclass() behaves (GH-26193)
Message-ID: <mailman.1285.1630417164.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/08767c73b5bf1f28792d5fef7f41d52822a4989f
commit: 08767c73b5bf1f28792d5fef7f41d52822a4989f
branch: main
author: Zack Kneupper <zachary.kneupper at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-31T15:39:19+02:00
summary:

bpo-44135: Refine explanation of how passing tuples to issubclass() behaves (GH-26193)

Co-authored-by: Zachary Kneupper <zachary.kneupper at gmail.com>

files:
M Doc/library/functions.rst

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 652e30c6088ad..fef6c6292f95c 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -916,9 +916,9 @@ are always available.  They are listed here in alphabetical order.
    Return ``True`` if *class* is a subclass (direct, indirect, or :term:`virtual
    <abstract base class>`) of *classinfo*.  A
    class is considered a subclass of itself. *classinfo* may be a tuple of class
-   objects or a :ref:`types-union`, in which case every entry in *classinfo*
-   will be checked. In any other
-   case, a :exc:`TypeError` exception is raised.
+   objects or a :ref:`types-union`, in which case return True if *class* is a
+   subclass of any entry in *classinfo*.  In any other case, a :exc:`TypeError`
+   exception is raised.
 
    .. versionchanged:: 3.10
       *classinfo* can be a :ref:`types-union`.


From webhook-mailer at python.org  Tue Aug 31 10:00:09 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Tue, 31 Aug 2021 14:00:09 -0000
Subject: [Python-checkins] bpo-45060: Get rid of few uses of the equality
 operators with None (GH-28087)
Message-ID: <mailman.1286.1630418409.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/3c65457156d87e55010507d616b4eecb7a02883d
commit: 3c65457156d87e55010507d616b4eecb7a02883d
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-31T16:59:52+03:00
summary:

bpo-45060: Get rid of few uses of the equality operators with None (GH-28087)

files:
M Doc/library/dbm.rst
M Lib/ctypes/_aix.py
M Lib/email/contentmanager.py
M Lib/test/datetimetester.py
M Lib/test/test_pty.py
M Lib/test/test_type_annotations.py
M Modules/_gdbmmodule.c
M Modules/clinic/_gdbmmodule.c.h
M Tools/clinic/clinic.py

diff --git a/Doc/library/dbm.rst b/Doc/library/dbm.rst
index 57ae547b833cc0..ff01ae90f64257 100644
--- a/Doc/library/dbm.rst
+++ b/Doc/library/dbm.rst
@@ -216,7 +216,7 @@ supported.
       contains them all::
 
          k = db.firstkey()
-         while k != None:
+         while k is not None:
              print(k)
              k = db.nextkey(k)
 
diff --git a/Lib/ctypes/_aix.py b/Lib/ctypes/_aix.py
index 190cac6507edef..26959d90a4dd6a 100644
--- a/Lib/ctypes/_aix.py
+++ b/Lib/ctypes/_aix.py
@@ -282,7 +282,7 @@ def find_shared(paths, name):
         if path.exists(archive):
             members = get_shared(get_ld_headers(archive))
             member = get_member(re.escape(name), members)
-            if member != None:
+            if member is not None:
                 return (base, member)
             else:
                 return (None, None)
@@ -307,7 +307,7 @@ def find_library(name):
 
     libpaths = get_libpaths()
     (base, member) = find_shared(libpaths, name)
-    if base != None:
+    if base is not None:
         return f"{base}({member})"
 
     # To get here, a member in an archive has not been found
diff --git a/Lib/email/contentmanager.py b/Lib/email/contentmanager.py
index 3cf62dc8621cd9..fcf278dbccbac9 100644
--- a/Lib/email/contentmanager.py
+++ b/Lib/email/contentmanager.py
@@ -144,7 +144,7 @@ def _encode_text(string, charset, cte, policy):
     linesep = policy.linesep.encode('ascii')
     def embedded_body(lines): return linesep.join(lines) + linesep
     def normal_body(lines): return b'\n'.join(lines) + b'\n'
-    if cte==None:
+    if cte is None:
         # Use heuristics to decide on the "best" encoding.
         if max((len(x) for x in lines), default=0) <= policy.max_line_length:
             try:
diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
index 316cf0b8da7b48..6414f1ace3fed3 100644
--- a/Lib/test/datetimetester.py
+++ b/Lib/test/datetimetester.py
@@ -344,7 +344,7 @@ def test_comparison(self):
         with self.assertRaises(TypeError): timezone(ZERO) < timezone(ZERO)
         self.assertIn(timezone(ZERO), {timezone(ZERO)})
         self.assertTrue(timezone(ZERO) != None)
-        self.assertFalse(timezone(ZERO) ==  None)
+        self.assertFalse(timezone(ZERO) == None)
 
         tz = timezone(ZERO)
         self.assertTrue(tz == ALWAYS_EQ)
diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py
index e2e9475b5d337d..0c178127571b07 100644
--- a/Lib/test/test_pty.py
+++ b/Lib/test/test_pty.py
@@ -136,7 +136,7 @@ def test_openpty(self):
             mode = None
 
         new_stdin_winsz = None
-        if self.stdin_rows != None and self.stdin_cols != None:
+        if self.stdin_rows is not None and self.stdin_cols is not None:
             try:
                 # Modify pty.STDIN_FILENO window size; we need to
                 # check if pty.openpty() is able to set pty slave
diff --git a/Lib/test/test_type_annotations.py b/Lib/test/test_type_annotations.py
index f6c99bda3aa6f6..87f46c2ce8ce61 100644
--- a/Lib/test/test_type_annotations.py
+++ b/Lib/test/test_type_annotations.py
@@ -71,7 +71,7 @@ def __annotations__(self, value):
 
             @__annotations__.deleter
             def __annotations__(self):
-                if hasattr(self, 'my_annotations') and self.my_annotations == None:
+                if getattr(self, 'my_annotations', False) is None:
                     raise AttributeError('__annotations__')
                 self.my_annotations = None
 
diff --git a/Modules/_gdbmmodule.c b/Modules/_gdbmmodule.c
index 8a8c6e78259ccd..3c9a0e98e47427 100644
--- a/Modules/_gdbmmodule.c
+++ b/Modules/_gdbmmodule.c
@@ -450,7 +450,7 @@ The following code prints every key in the database db, without having
 to create a list in memory that contains them all:
 
       k = db.firstkey()
-      while k != None:
+      while k is not None:
           print(k)
           k = db.nextkey(k)
 [clinic start generated code]*/
@@ -458,7 +458,7 @@ to create a list in memory that contains them all:
 static PyObject *
 _gdbm_gdbm_nextkey_impl(gdbmobject *self, PyTypeObject *cls, const char *key,
                         Py_ssize_t key_length)
-/*[clinic end generated code: output=c81a69300ef41766 input=fcf6a51a96ce0172]*/
+/*[clinic end generated code: output=c81a69300ef41766 input=365e297bc0b3db48]*/
 {
     PyObject *v;
     datum dbm_key, nextkey;
diff --git a/Modules/clinic/_gdbmmodule.c.h b/Modules/clinic/_gdbmmodule.c.h
index 060445177702bb..15baf52f60d35a 100644
--- a/Modules/clinic/_gdbmmodule.c.h
+++ b/Modules/clinic/_gdbmmodule.c.h
@@ -161,7 +161,7 @@ PyDoc_STRVAR(_gdbm_gdbm_nextkey__doc__,
 "to create a list in memory that contains them all:\n"
 "\n"
 "      k = db.firstkey()\n"
-"      while k != None:\n"
+"      while k is not None:\n"
 "          print(k)\n"
 "          k = db.nextkey(k)");
 
@@ -340,4 +340,4 @@ dbmopen(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=c3ee3ad64a2f331f input=a9049054013a1b77]*/
+/*[clinic end generated code: output=1fed9ed50ad23551 input=a9049054013a1b77]*/
diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py
index b5a884536a9ebe..d6a820d828178f 100755
--- a/Tools/clinic/clinic.py
+++ b/Tools/clinic/clinic.py
@@ -1691,7 +1691,7 @@ def print_block(self, block):
         dsl_name = block.dsl_name
         write = self.f.write
 
-        assert not ((dsl_name == None) ^ (output == None)), "you must specify dsl_name and output together, dsl_name " + repr(dsl_name)
+        assert not ((dsl_name is None) ^ (output is None)), "you must specify dsl_name and output together, dsl_name " + repr(dsl_name)
 
         if not dsl_name:
             write(input)
@@ -3003,7 +3003,7 @@ def converter_init(self, *, accept={int}, type=None):
             self.format_unit = 'C'
         elif accept != {int}:
             fail("int_converter: illegal 'accept' argument " + repr(accept))
-        if type != None:
+        if type is not None:
             self.type = type
 
     def parse_arg(self, argname, displayname):


From webhook-mailer at python.org  Tue Aug 31 10:23:39 2021
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 31 Aug 2021 14:23:39 -0000
Subject: [Python-checkins] bpo-44135: Refine explanation of how passing
 tuples to issubclass() behaves (GH-26193)
Message-ID: <mailman.1287.1630419819.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/ab8fed88fc602282167f6459b43f2cf0c771f60a
commit: ab8fed88fc602282167f6459b43f2cf0c771f60a
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-31T07:23:22-07:00
summary:

bpo-44135: Refine explanation of how passing tuples to issubclass() behaves (GH-26193)


Co-authored-by: Zachary Kneupper <zachary.kneupper at gmail.com>
(cherry picked from commit 08767c73b5bf1f28792d5fef7f41d52822a4989f)

Co-authored-by: Zack Kneupper <zachary.kneupper at gmail.com>

files:
M Doc/library/functions.rst

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 652e30c6088ad..fef6c6292f95c 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -916,9 +916,9 @@ are always available.  They are listed here in alphabetical order.
    Return ``True`` if *class* is a subclass (direct, indirect, or :term:`virtual
    <abstract base class>`) of *classinfo*.  A
    class is considered a subclass of itself. *classinfo* may be a tuple of class
-   objects or a :ref:`types-union`, in which case every entry in *classinfo*
-   will be checked. In any other
-   case, a :exc:`TypeError` exception is raised.
+   objects or a :ref:`types-union`, in which case return True if *class* is a
+   subclass of any entry in *classinfo*.  In any other case, a :exc:`TypeError`
+   exception is raised.
 
    .. versionchanged:: 3.10
       *classinfo* can be a :ref:`types-union`.


From webhook-mailer at python.org  Tue Aug 31 11:34:40 2021
From: webhook-mailer at python.org (vstinner)
Date: Tue, 31 Aug 2021 15:34:40 -0000
Subject: [Python-checkins] bpo-45061: Enhance faulthandler traceback wit no
 Python frame (GH-28090)
Message-ID: <mailman.1288.1630424080.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/888d4cc06b887e77f281ba4d640e281cb4c61b7b
commit: 888d4cc06b887e77f281ba4d640e281cb4c61b7b
branch: main
author: Victor Stinner <vstinner at python.org>
committer: vstinner <vstinner at python.org>
date: 2021-08-31T17:34:29+02:00
summary:

bpo-45061: Enhance faulthandler traceback wit no Python frame (GH-28090)

Fix indentation of <no Python frame> message in a faulthandler
traceback or a Fatal Python error traceback. Example:

Current thread 0x00007f03896fb740 (most recent call first):
  Garbage-collecting
  <no Python frame>

files:
M Python/traceback.c

diff --git a/Python/traceback.c b/Python/traceback.c
index 204121ba66d96e..cdabd2900acf49 100644
--- a/Python/traceback.c
+++ b/Python/traceback.c
@@ -1071,7 +1071,7 @@ dump_traceback(int fd, PyThreadState *tstate, int write_header)
 
     frame = tstate->frame;
     if (frame == NULL) {
-        PUTS(fd, "<no Python frame>\n");
+        PUTS(fd, "  <no Python frame>\n");
         return;
     }
 


From webhook-mailer at python.org  Tue Aug 31 11:53:29 2021
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 31 Aug 2021 15:53:29 -0000
Subject: [Python-checkins] bpo-45061: Enhance faulthandler traceback wit no
 Python frame (GH-28090)
Message-ID: <mailman.1289.1630425210.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/c4c57e5c0eb79795d4fd1d9d8292455567c60070
commit: c4c57e5c0eb79795d4fd1d9d8292455567c60070
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-31T08:53:17-07:00
summary:

bpo-45061: Enhance faulthandler traceback wit no Python frame (GH-28090)


Fix indentation of <no Python frame> message in a faulthandler
traceback or a Fatal Python error traceback. Example:

Current thread 0x00007f03896fb740 (most recent call first):
  Garbage-collecting
  <no Python frame>
(cherry picked from commit 888d4cc06b887e77f281ba4d640e281cb4c61b7b)

Co-authored-by: Victor Stinner <vstinner at python.org>

files:
M Python/traceback.c

diff --git a/Python/traceback.c b/Python/traceback.c
index 88ffc01c6eca3..9b23f45ba5bb8 100644
--- a/Python/traceback.c
+++ b/Python/traceback.c
@@ -801,7 +801,7 @@ dump_traceback(int fd, PyThreadState *tstate, int write_header)
     // not modify Python objects.
     frame = tstate->frame;
     if (frame == NULL) {
-        PUTS(fd, "<no Python frame>\n");
+        PUTS(fd, "  <no Python frame>\n");
         return;
     }
 


From webhook-mailer at python.org  Tue Aug 31 12:00:25 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 31 Aug 2021 16:00:25 -0000
Subject: [Python-checkins] bpo-44135: Refine explanation of how passing
 tuples to issubclass() behaves (GH-26193) (GH-28094)
Message-ID: <mailman.1290.1630425626.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/5f66ad09ff2c51521e1512888cac84e0cc0907d4
commit: 5f66ad09ff2c51521e1512888cac84e0cc0907d4
branch: 3.9
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2021-08-31T18:00:16+02:00
summary:

bpo-44135: Refine explanation of how passing tuples to issubclass() behaves (GH-26193) (GH-28094)

This is a quasi-backport to 3.9 since the wording in this branch is different.

Co-authored-by: Zachary Kneupper zachary.kneupper at gmail.com

files:
M Doc/library/functions.rst

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index c5c1c161293f6..39ce338d38871 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -862,8 +862,8 @@ are always available.  They are listed here in alphabetical order.
    Return ``True`` if *class* is a subclass (direct, indirect or :term:`virtual
    <abstract base class>`) of *classinfo*.  A
    class is considered a subclass of itself. *classinfo* may be a tuple of class
-   objects, in which case every entry in *classinfo* will be checked. In any other
-   case, a :exc:`TypeError` exception is raised.
+   objects, in which case return ``True`` if *class* is a subclass of any entry
+   in *classinfo*.  In any other case, a :exc:`TypeError` exception is raised.
 
 
 .. function:: iter(object[, sentinel])


From webhook-mailer at python.org  Tue Aug 31 12:01:22 2021
From: webhook-mailer at python.org (ambv)
Date: Tue, 31 Aug 2021 16:01:22 -0000
Subject: [Python-checkins] bpo-44135: [docs] Fix inline markup (GH-28095)
Message-ID: <mailman.1291.1630425683.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/9a7ec2fcdee2da9e080ca459d4c240776df72567
commit: 9a7ec2fcdee2da9e080ca459d4c240776df72567
branch: main
author: Ken Jin <28750310+Fidget-Spinner at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-08-31T18:01:17+02:00
summary:

bpo-44135: [docs] Fix inline markup (GH-28095)

files:
M Doc/library/functions.rst

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index fef6c6292f95c..9629acec2bc72 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -916,7 +916,7 @@ are always available.  They are listed here in alphabetical order.
    Return ``True`` if *class* is a subclass (direct, indirect, or :term:`virtual
    <abstract base class>`) of *classinfo*.  A
    class is considered a subclass of itself. *classinfo* may be a tuple of class
-   objects or a :ref:`types-union`, in which case return True if *class* is a
+   objects or a :ref:`types-union`, in which case return ``True`` if *class* is a
    subclass of any entry in *classinfo*.  In any other case, a :exc:`TypeError`
    exception is raised.
 


From webhook-mailer at python.org  Tue Aug 31 12:05:23 2021
From: webhook-mailer at python.org (vstinner)
Date: Tue, 31 Aug 2021 16:05:23 -0000
Subject: [Python-checkins] bpo-45061: Detect Py_DECREF(Py_True) bug
 (GH-28089)
Message-ID: <mailman.1292.1630425925.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/4300352000beed22fb525ec45fd331918d206528
commit: 4300352000beed22fb525ec45fd331918d206528
branch: main
author: Victor Stinner <vstinner at python.org>
committer: vstinner <vstinner at python.org>
date: 2021-08-31T18:05:15+02:00
summary:

bpo-45061: Detect Py_DECREF(Py_True) bug (GH-28089)

Add a deallocator to the bool type to detect refcount bugs in C
extensions which call Py_DECREF(Py_True) or Py_DECREF(Py_False) by
mistake.

files:
A Misc/NEWS.d/next/C API/2021-08-31-15-21-36.bpo-45061.ZH0HVe.rst
M Objects/boolobject.c
M Objects/object.c

diff --git a/Misc/NEWS.d/next/C API/2021-08-31-15-21-36.bpo-45061.ZH0HVe.rst b/Misc/NEWS.d/next/C API/2021-08-31-15-21-36.bpo-45061.ZH0HVe.rst
new file mode 100644
index 00000000000000..58bd534601fb9d
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2021-08-31-15-21-36.bpo-45061.ZH0HVe.rst	
@@ -0,0 +1,3 @@
+Add a deallocator to the :class:`bool` type to detect refcount bugs in C
+extensions which call ``Py_DECREF(Py_True);`` or ``Py_DECREF(Py_False);`` by
+mistake. Patch by Victor Stinner.
diff --git a/Objects/boolobject.c b/Objects/boolobject.c
index b786966533e1d6..bc1666f55717c1 100644
--- a/Objects/boolobject.c
+++ b/Objects/boolobject.c
@@ -153,6 +153,13 @@ static PyNumberMethods bool_as_number = {
     0,                          /* nb_index */
 };
 
+static void _Py_NO_RETURN
+bool_dealloc(PyObject* Py_UNUSED(ignore))
+{
+    Py_FatalError("deallocating True or False likely caused by "
+                  "a refcount bug in a C extension");
+}
+
 /* The type object for bool.  Note that this cannot be subclassed! */
 
 PyTypeObject PyBool_Type = {
@@ -160,7 +167,7 @@ PyTypeObject PyBool_Type = {
     "bool",
     sizeof(struct _longobject),
     0,
-    0,                                          /* tp_dealloc */
+    bool_dealloc,                               /* tp_dealloc */
     0,                                          /* tp_vectorcall_offset */
     0,                                          /* tp_getattr */
     0,                                          /* tp_setattr */
diff --git a/Objects/object.c b/Objects/object.c
index 446c974f8e614b..026262b5448495 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -1560,14 +1560,11 @@ none_repr(PyObject *op)
     return PyUnicode_FromString("None");
 }
 
-/* ARGUSED */
 static void _Py_NO_RETURN
-none_dealloc(PyObject* ignore)
+none_dealloc(PyObject* Py_UNUSED(ignore))
 {
-    /* This should never get called, but we also don't want to SEGV if
-     * we accidentally decref None out of existence.
-     */
-    Py_FatalError("deallocating None");
+    Py_FatalError("deallocating None likely caused by a refcount bug "
+                  "in a C extension");
 }
 
 static PyObject *


From webhook-mailer at python.org  Tue Aug 31 12:18:44 2021
From: webhook-mailer at python.org (brandtbucher)
Date: Tue, 31 Aug 2021 16:18:44 -0000
Subject: [Python-checkins] bpo-37596: Clean up the set/frozenset marshalling
 code (GH-28068)
Message-ID: <mailman.1293.1630426724.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/51999c960e7fc45feebd629421dec6524a5fc803
commit: 51999c960e7fc45feebd629421dec6524a5fc803
branch: main
author: Brandt Bucher <brandt at python.org>
committer: brandtbucher <brandtbucher at gmail.com>
date: 2021-08-31T09:18:33-07:00
summary:

bpo-37596: Clean up the set/frozenset marshalling code (GH-28068)

files:
M Python/marshal.c

diff --git a/Python/marshal.c b/Python/marshal.c
index b69c4d09641da..60b818f0dda4a 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -507,36 +507,39 @@ w_complex_object(PyObject *v, char flag, WFILE *p)
         // to have their elements serialized in a consistent order (even when
         // they have been scrambled by hash randomization). To ensure this, we
         // use an order equivalent to sorted(v, key=marshal.dumps):
-        PyObject *pairs = PyList_New(0);
+        PyObject *pairs = PyList_New(n);
         if (pairs == NULL) {
             p->error = WFERR_NOMEMORY;
             return;
         }
+        Py_ssize_t i = 0;
         while (_PySet_NextEntry(v, &pos, &value, &hash)) {
             PyObject *dump = PyMarshal_WriteObjectToString(value, p->version);
             if (dump == NULL) {
                 p->error = WFERR_UNMARSHALLABLE;
-                goto anyset_done;
+                Py_DECREF(pairs);
+                return;
             }
             PyObject *pair = PyTuple_Pack(2, dump, value);
             Py_DECREF(dump);
-            if (pair == NULL || PyList_Append(pairs, pair)) {
+            if (pair == NULL) {
                 p->error = WFERR_NOMEMORY;
-                Py_XDECREF(pair);
-                goto anyset_done;
+                Py_DECREF(pairs);
+                return;
             }
-            Py_DECREF(pair);
+            PyList_SET_ITEM(pairs, i++, pair);
         }
+        assert(i == n);
         if (PyList_Sort(pairs)) {
             p->error = WFERR_NOMEMORY;
-            goto anyset_done;
+            Py_DECREF(pairs);
+            return;
         }
         for (Py_ssize_t i = 0; i < n; i++) {
             PyObject *pair = PyList_GET_ITEM(pairs, i);
             value = PyTuple_GET_ITEM(pair, 1);
             w_object(value, p);
         }
-    anyset_done:
         Py_DECREF(pairs);
     }
     else if (PyCode_Check(v)) {


From webhook-mailer at python.org  Tue Aug 31 12:25:17 2021
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 31 Aug 2021 16:25:17 -0000
Subject: [Python-checkins] bpo-44135: [docs] Fix inline markup (GH-28095)
Message-ID: <mailman.1294.1630427118.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/8711b3d0ac89599fcd16edcb107169bb19a00737
commit: 8711b3d0ac89599fcd16edcb107169bb19a00737
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-31T09:25:08-07:00
summary:

bpo-44135: [docs] Fix inline markup (GH-28095)

(cherry picked from commit 9a7ec2fcdee2da9e080ca459d4c240776df72567)

Co-authored-by: Ken Jin <28750310+Fidget-Spinner at users.noreply.github.com>

files:
M Doc/library/functions.rst

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index fef6c6292f95c..9629acec2bc72 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -916,7 +916,7 @@ are always available.  They are listed here in alphabetical order.
    Return ``True`` if *class* is a subclass (direct, indirect, or :term:`virtual
    <abstract base class>`) of *classinfo*.  A
    class is considered a subclass of itself. *classinfo* may be a tuple of class
-   objects or a :ref:`types-union`, in which case return True if *class* is a
+   objects or a :ref:`types-union`, in which case return ``True`` if *class* is a
    subclass of any entry in *classinfo*.  In any other case, a :exc:`TypeError`
    exception is raised.
 


From webhook-mailer at python.org  Tue Aug 31 13:32:10 2021
From: webhook-mailer at python.org (terryjreedy)
Date: Tue, 31 Aug 2021 17:32:10 -0000
Subject: [Python-checkins] bpo-45059: Fix IDLE test typo: using "==" instead
 of "=" (GH-28086)
Message-ID: <mailman.1295.1630431131.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/54f100514b02f6628450043e21ccfe39350d7ac7
commit: 54f100514b02f6628450043e21ccfe39350d7ac7
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: terryjreedy <tjreedy at udel.edu>
date: 2021-08-31T13:32:01-04:00
summary:

bpo-45059: Fix IDLE test typo: using "==" instead of "=" (GH-28086)

files:
M Lib/idlelib/idle_test/test_macosx.py

diff --git a/Lib/idlelib/idle_test/test_macosx.py b/Lib/idlelib/idle_test/test_macosx.py
index b6bd922e4b99dd..19324773586896 100644
--- a/Lib/idlelib/idle_test/test_macosx.py
+++ b/Lib/idlelib/idle_test/test_macosx.py
@@ -34,7 +34,7 @@ def test_init_sets_tktype(self):
         for platform, types in ('darwin', alltypes), ('other', nontypes):
             with self.subTest(platform=platform):
                 macosx.platform = platform
-                macosx._tk_type == None
+                macosx._tk_type = None
                 macosx._init_tk_type()
                 self.assertIn(macosx._tk_type, types)
 


From webhook-mailer at python.org  Tue Aug 31 13:41:29 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Tue, 31 Aug 2021 17:41:29 -0000
Subject: [Python-checkins] bpo-45039: Consistently use ADDOP_LOAD_CONST in
 compiler rather than ADDOP_O(c, LOAD_CONST, ...) (GH-28015)
Message-ID: <mailman.1296.1630431690.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/70ccee418d1f9d34ed15cfe7104221f9cfd27d03
commit: 70ccee418d1f9d34ed15cfe7104221f9cfd27d03
branch: main
author: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-31T20:41:20+03:00
summary:

bpo-45039: Consistently use ADDOP_LOAD_CONST in compiler rather than ADDOP_O(c, LOAD_CONST,...) (GH-28015)

files:
M Python/compile.c

diff --git a/Python/compile.c b/Python/compile.c
index 053915e55df9a..4a4e068e2b71d 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -1638,12 +1638,14 @@ compiler_addop_j_noline(struct compiler *c, int opcode, basicblock *b)
 }
 
 #define ADDOP_O(C, OP, O, TYPE) { \
+    assert((OP) != LOAD_CONST); /* use ADDOP_LOAD_CONST */ \
     if (!compiler_addop_o((C), (OP), (C)->u->u_ ## TYPE, (O))) \
         return 0; \
 }
 
 /* Same as ADDOP_O, but steals a reference. */
 #define ADDOP_N(C, OP, O, TYPE) { \
+    assert((OP) != LOAD_CONST); /* use ADDOP_LOAD_CONST_NEW */ \
     if (!compiler_addop_o((C), (OP), (C)->u->u_ ## TYPE, (O))) { \
         Py_DECREF((O)); \
         return 0; \
@@ -1821,7 +1823,7 @@ compiler_pop_fblock(struct compiler *c, enum fblocktype t, basicblock *b)
 
 static int
 compiler_call_exit_with_nones(struct compiler *c) {
-    ADDOP_O(c, LOAD_CONST, Py_None, consts);
+    ADDOP_LOAD_CONST(c, Py_None);
     ADDOP(c, DUP_TOP);
     ADDOP(c, DUP_TOP);
     ADDOP_I(c, CALL_FUNCTION, 3);
@@ -5226,7 +5228,7 @@ compiler_async_with(struct compiler *c, stmt_ty s, int pos)
     if(!compiler_call_exit_with_nones(c))
         return 0;
     ADDOP(c, GET_AWAITABLE);
-    ADDOP_O(c, LOAD_CONST, Py_None, consts);
+    ADDOP_LOAD_CONST(c, Py_None);
     ADDOP(c, YIELD_FROM);
 
     ADDOP(c, POP_TOP);


From webhook-mailer at python.org  Tue Aug 31 13:45:18 2021
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Tue, 31 Aug 2021 17:45:18 -0000
Subject: [Python-checkins] bpo-45057: Simplify RegressionTestResult
 (GH-28081)
Message-ID: <mailman.1297.1630431919.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/2b76a5322fdf71d62b531fd765085f96f981c244
commit: 2b76a5322fdf71d62b531fd765085f96f981c244
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-08-31T20:45:09+03:00
summary:

bpo-45057: Simplify RegressionTestResult (GH-28081)

Remove code which duplicates the functionality of TextTestResult.

files:
M Lib/test/support/testresult.py

diff --git a/Lib/test/support/testresult.py b/Lib/test/support/testresult.py
index 670afbea2659d..6f2edda0f580a 100644
--- a/Lib/test/support/testresult.py
+++ b/Lib/test/support/testresult.py
@@ -10,12 +10,11 @@
 import unittest
 
 class RegressionTestResult(unittest.TextTestResult):
-    separator1 = '=' * 70 + '\n'
-    separator2 = '-' * 70 + '\n'
     USE_XML = False
 
     def __init__(self, stream, descriptions, verbosity):
-        super().__init__(stream=stream, descriptions=descriptions, verbosity=0)
+        super().__init__(stream=stream, descriptions=descriptions,
+                         verbosity=2 if verbosity else 0)
         self.buffer = True
         if self.USE_XML:
             from xml.etree import ElementTree as ET
@@ -25,8 +24,6 @@ def __init__(self, stream, descriptions, verbosity):
             self.__suite.set('start', datetime.utcnow().isoformat(' '))
             self.__e = None
         self.__start_time = None
-        self.__results = []
-        self.__verbose = bool(verbosity)
 
     @classmethod
     def __getId(cls, test):
@@ -45,9 +42,6 @@ def startTest(self, test):
         if self.USE_XML:
             self.__e = e = self.__ET.SubElement(self.__suite, 'testcase')
         self.__start_time = time.perf_counter()
-        if self.__verbose:
-            self.stream.write(f'{self.getDescription(test)} ... ')
-            self.stream.flush()
 
     def _add_result(self, test, capture=False, **args):
         if not self.USE_XML:
@@ -85,10 +79,6 @@ def _add_result(self, test, capture=False, **args):
             else:
                 e2.text = str(v)
 
-    def __write(self, c, word):
-        if self.__verbose:
-            self.stream.write(f'{word}\n')
-
     @classmethod
     def __makeErrorDict(cls, err_type, err_value, err_tb):
         if isinstance(err_type, type):
@@ -111,45 +101,26 @@ def __makeErrorDict(cls, err_type, err_value, err_tb):
     def addError(self, test, err):
         self._add_result(test, True, error=self.__makeErrorDict(*err))
         super().addError(test, err)
-        self.__write('E', 'ERROR')
 
     def addExpectedFailure(self, test, err):
         self._add_result(test, True, output=self.__makeErrorDict(*err))
         super().addExpectedFailure(test, err)
-        self.__write('x', 'expected failure')
 
     def addFailure(self, test, err):
         self._add_result(test, True, failure=self.__makeErrorDict(*err))
         super().addFailure(test, err)
-        self.__write('F', 'FAIL')
 
     def addSkip(self, test, reason):
         self._add_result(test, skipped=reason)
         super().addSkip(test, reason)
-        self.__write('S', f'skipped {reason!r}')
 
     def addSuccess(self, test):
         self._add_result(test)
         super().addSuccess(test)
-        self.__write('.', 'ok')
 
     def addUnexpectedSuccess(self, test):
         self._add_result(test, outcome='UNEXPECTED_SUCCESS')
         super().addUnexpectedSuccess(test)
-        self.__write('u', 'unexpected success')
-
-    def printErrors(self):
-        if self.__verbose:
-            self.stream.write('\n')
-        self.printErrorList('ERROR', self.errors)
-        self.printErrorList('FAIL', self.failures)
-
-    def printErrorList(self, flavor, errors):
-        for test, err in errors:
-            self.stream.write(self.separator1)
-            self.stream.write(f'{flavor}: {self.getDescription(test)}\n')
-            self.stream.write(self.separator2)
-            self.stream.write('%s\n' % err)
 
     def get_xml_element(self):
         if not self.USE_XML:


From webhook-mailer at python.org  Tue Aug 31 13:50:53 2021
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 31 Aug 2021 17:50:53 -0000
Subject: [Python-checkins] bpo-45059: Fix IDLE test typo: using "==" instead
 of "=" (GH-28086)
Message-ID: <mailman.1298.1630432254.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/337c8adf31c46b688a5f82bcb64dc6f1ad56703d
commit: 337c8adf31c46b688a5f82bcb64dc6f1ad56703d
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-31T10:50:42-07:00
summary:

bpo-45059: Fix IDLE test typo: using "==" instead of "=" (GH-28086)

(cherry picked from commit 54f100514b02f6628450043e21ccfe39350d7ac7)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
M Lib/idlelib/idle_test/test_macosx.py

diff --git a/Lib/idlelib/idle_test/test_macosx.py b/Lib/idlelib/idle_test/test_macosx.py
index b6bd922e4b99dd..19324773586896 100644
--- a/Lib/idlelib/idle_test/test_macosx.py
+++ b/Lib/idlelib/idle_test/test_macosx.py
@@ -34,7 +34,7 @@ def test_init_sets_tktype(self):
         for platform, types in ('darwin', alltypes), ('other', nontypes):
             with self.subTest(platform=platform):
                 macosx.platform = platform
-                macosx._tk_type == None
+                macosx._tk_type = None
                 macosx._init_tk_type()
                 self.assertIn(macosx._tk_type, types)
 


From webhook-mailer at python.org  Tue Aug 31 13:53:52 2021
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 31 Aug 2021 17:53:52 -0000
Subject: [Python-checkins] bpo-45059: Fix IDLE test typo: using "==" instead
 of "=" (GH-28086)
Message-ID: <mailman.1299.1630432433.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/c1db7598790d037e58cd99c06d5c166433d63322
commit: c1db7598790d037e58cd99c06d5c166433d63322
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-31T10:53:42-07:00
summary:

bpo-45059: Fix IDLE test typo: using "==" instead of "=" (GH-28086)

(cherry picked from commit 54f100514b02f6628450043e21ccfe39350d7ac7)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
M Lib/idlelib/idle_test/test_macosx.py

diff --git a/Lib/idlelib/idle_test/test_macosx.py b/Lib/idlelib/idle_test/test_macosx.py
index b6bd922e4b99d..1932477358689 100644
--- a/Lib/idlelib/idle_test/test_macosx.py
+++ b/Lib/idlelib/idle_test/test_macosx.py
@@ -34,7 +34,7 @@ def test_init_sets_tktype(self):
         for platform, types in ('darwin', alltypes), ('other', nontypes):
             with self.subTest(platform=platform):
                 macosx.platform = platform
-                macosx._tk_type == None
+                macosx._tk_type = None
                 macosx._init_tk_type()
                 self.assertIn(macosx._tk_type, types)
 


From webhook-mailer at python.org  Tue Aug 31 14:08:42 2021
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 31 Aug 2021 18:08:42 -0000
Subject: [Python-checkins] bpo-45039: Consistently use ADDOP_LOAD_CONST in
 compiler rather than ADDOP_O(c, LOAD_CONST, ...) (GH-28015)
Message-ID: <mailman.1300.1630433322.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/ebbd0ac5d8850a1630090c210b2454b4b26c7daa
commit: ebbd0ac5d8850a1630090c210b2454b4b26c7daa
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-31T11:08:32-07:00
summary:

bpo-45039: Consistently use ADDOP_LOAD_CONST in compiler rather than ADDOP_O(c, LOAD_CONST,...) (GH-28015)

(cherry picked from commit 70ccee418d1f9d34ed15cfe7104221f9cfd27d03)

Co-authored-by: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>

files:
M Python/compile.c

diff --git a/Python/compile.c b/Python/compile.c
index d55b0beaec77c..baea4940d3724 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -1568,12 +1568,14 @@ compiler_addop_j_noline(struct compiler *c, int opcode, basicblock *b)
 }
 
 #define ADDOP_O(C, OP, O, TYPE) { \
+    assert((OP) != LOAD_CONST); /* use ADDOP_LOAD_CONST */ \
     if (!compiler_addop_o((C), (OP), (C)->u->u_ ## TYPE, (O))) \
         return 0; \
 }
 
 /* Same as ADDOP_O, but steals a reference. */
 #define ADDOP_N(C, OP, O, TYPE) { \
+    assert((OP) != LOAD_CONST); /* use ADDOP_LOAD_CONST_NEW */ \
     if (!compiler_addop_o((C), (OP), (C)->u->u_ ## TYPE, (O))) { \
         Py_DECREF((O)); \
         return 0; \
@@ -1751,7 +1753,7 @@ compiler_pop_fblock(struct compiler *c, enum fblocktype t, basicblock *b)
 
 static int
 compiler_call_exit_with_nones(struct compiler *c) {
-    ADDOP_O(c, LOAD_CONST, Py_None, consts);
+    ADDOP_LOAD_CONST(c, Py_None);
     ADDOP(c, DUP_TOP);
     ADDOP(c, DUP_TOP);
     ADDOP_I(c, CALL_FUNCTION, 3);
@@ -5062,7 +5064,7 @@ compiler_async_with(struct compiler *c, stmt_ty s, int pos)
     if(!compiler_call_exit_with_nones(c))
         return 0;
     ADDOP(c, GET_AWAITABLE);
-    ADDOP_O(c, LOAD_CONST, Py_None, consts);
+    ADDOP_LOAD_CONST(c, Py_None);
     ADDOP(c, YIELD_FROM);
 
     ADDOP(c, POP_TOP);


From webhook-mailer at python.org  Tue Aug 31 14:59:42 2021
From: webhook-mailer at python.org (terryjreedy)
Date: Tue, 31 Aug 2021 18:59:42 -0000
Subject: [Python-checkins] bpo-45059: Add module cleanup to IDLE test_macosx
 (GH-28102)
Message-ID: <mailman.1301.1630436383.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/22fe0eb13c3441b71b60aaea0e7fe289a29783da
commit: 22fe0eb13c3441b71b60aaea0e7fe289a29783da
branch: main
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: terryjreedy <tjreedy at udel.edu>
date: 2021-08-31T14:59:35-04:00
summary:

bpo-45059: Add module cleanup to IDLE test_macosx (GH-28102)

files:
M Lib/idlelib/idle_test/test_macosx.py

diff --git a/Lib/idlelib/idle_test/test_macosx.py b/Lib/idlelib/idle_test/test_macosx.py
index 1932477358689..86da8849e5ca0 100644
--- a/Lib/idlelib/idle_test/test_macosx.py
+++ b/Lib/idlelib/idle_test/test_macosx.py
@@ -12,6 +12,15 @@
 alltypes = mactypes | nontypes
 
 
+def setUpModule():
+    global orig_tktype
+    orig_tktype = macosx._tk_type
+
+
+def tearDownModule():
+    macosx._tk_type = orig_tktype
+
+
 class InitTktypeTest(unittest.TestCase):
     "Test _init_tk_type."
 


From webhook-mailer at python.org  Tue Aug 31 15:21:37 2021
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 31 Aug 2021 19:21:37 -0000
Subject: [Python-checkins] bpo-45059: Add module cleanup to IDLE test_macosx
 (GH-28102)
Message-ID: <mailman.1302.1630437698.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/0f274cb2d78f71073e9d7295df3b9006e7bf1097
commit: 0f274cb2d78f71073e9d7295df3b9006e7bf1097
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-31T12:21:28-07:00
summary:

bpo-45059: Add module cleanup to IDLE test_macosx (GH-28102)

(cherry picked from commit 22fe0eb13c3441b71b60aaea0e7fe289a29783da)

Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>

files:
M Lib/idlelib/idle_test/test_macosx.py

diff --git a/Lib/idlelib/idle_test/test_macosx.py b/Lib/idlelib/idle_test/test_macosx.py
index 1932477358689..86da8849e5ca0 100644
--- a/Lib/idlelib/idle_test/test_macosx.py
+++ b/Lib/idlelib/idle_test/test_macosx.py
@@ -12,6 +12,15 @@
 alltypes = mactypes | nontypes
 
 
+def setUpModule():
+    global orig_tktype
+    orig_tktype = macosx._tk_type
+
+
+def tearDownModule():
+    macosx._tk_type = orig_tktype
+
+
 class InitTktypeTest(unittest.TestCase):
     "Test _init_tk_type."
 


From webhook-mailer at python.org  Tue Aug 31 15:24:54 2021
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 31 Aug 2021 19:24:54 -0000
Subject: [Python-checkins] bpo-45059: Add module cleanup to IDLE test_macosx
 (GH-28102)
Message-ID: <mailman.1303.1630437896.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/2280bc116301d45efc4d69cea452d272fdcd05b1
commit: 2280bc116301d45efc4d69cea452d272fdcd05b1
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-08-31T12:24:48-07:00
summary:

bpo-45059: Add module cleanup to IDLE test_macosx (GH-28102)

(cherry picked from commit 22fe0eb13c3441b71b60aaea0e7fe289a29783da)

Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>

files:
M Lib/idlelib/idle_test/test_macosx.py

diff --git a/Lib/idlelib/idle_test/test_macosx.py b/Lib/idlelib/idle_test/test_macosx.py
index 1932477358689..86da8849e5ca0 100644
--- a/Lib/idlelib/idle_test/test_macosx.py
+++ b/Lib/idlelib/idle_test/test_macosx.py
@@ -12,6 +12,15 @@
 alltypes = mactypes | nontypes
 
 
+def setUpModule():
+    global orig_tktype
+    orig_tktype = macosx._tk_type
+
+
+def tearDownModule():
+    macosx._tk_type = orig_tktype
+
+
 class InitTktypeTest(unittest.TestCase):
     "Test _init_tk_type."
 


From webhook-mailer at python.org  Tue Aug 31 16:42:19 2021
From: webhook-mailer at python.org (iritkatriel)
Date: Tue, 31 Aug 2021 20:42:19 -0000
Subject: [Python-checkins] bpo-31299: make it possible to filter out frames
 from tracebacks (GH-28067)
Message-ID: <mailman.1304.1630442540.4165.python-checkins@python.org>

https://github.com/python/cpython/commit/863154c9292e70c5a8a1a3f22ef4ee42e2304281
commit: 863154c9292e70c5a8a1a3f22ef4ee42e2304281
branch: main
author: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
committer: iritkatriel <1055913+iritkatriel at users.noreply.github.com>
date: 2021-08-31T21:42:08+01:00
summary:

bpo-31299: make it possible to filter out frames from tracebacks (GH-28067)

files:
A Misc/NEWS.d/next/Library/2021-08-30-13-55-09.bpo-31299.9QzjZs.rst
M Doc/library/traceback.rst
M Lib/test/test_traceback.py
M Lib/traceback.py

diff --git a/Doc/library/traceback.rst b/Doc/library/traceback.rst
index 83d5c8c6fcbd3..7b230495b7b56 100644
--- a/Doc/library/traceback.rst
+++ b/Doc/library/traceback.rst
@@ -357,7 +357,8 @@ capture data for later printing in a lightweight fashion.
 
       Returns a string for printing one of the frames involved in the stack.
       This method gets called for each frame object to be printed in the
-      :class:`StackSummary`.
+      :class:`StackSummary`. If it returns ``None``, the frame is omitted
+      from the output.
 
       .. versionadded:: 3.11
 
diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
index 5d48e9d7ff039..d1967aabb29a1 100644
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -1514,6 +1514,34 @@ def some_inner():
             s.format(),
             [f'{__file__}:{some_inner.__code__.co_firstlineno + 1}'])
 
+    def test_dropping_frames(self):
+         def f():
+             1/0
+
+         def g():
+             try:
+                 f()
+             except:
+                 return sys.exc_info()
+
+         exc_info = g()
+
+         class Skip_G(traceback.StackSummary):
+             def format_frame(self, frame):
+                 if frame.name == 'g':
+                     return None
+                 return super().format_frame(frame)
+
+         stack = Skip_G.extract(
+             traceback.walk_tb(exc_info[2])).format()
+
+         self.assertEqual(len(stack), 1)
+         lno = f.__code__.co_firstlineno + 1
+         self.assertEqual(
+             stack[0],
+             f'  File "{__file__}", line {lno}, in f\n    1/0\n'
+         )
+
 
 class TestTracebackException(unittest.TestCase):
 
diff --git a/Lib/traceback.py b/Lib/traceback.py
index 4ad8c9a17b349..8d83fd9b517e6 100644
--- a/Lib/traceback.py
+++ b/Lib/traceback.py
@@ -515,6 +515,9 @@ def format(self):
         last_name = None
         count = 0
         for frame in self:
+            formatted_frame = self.format_frame(frame)
+            if formatted_frame is None:
+                continue
             if (last_file is None or last_file != frame.filename or
                 last_line is None or last_line != frame.lineno or
                 last_name is None or last_name != frame.name):
diff --git a/Misc/NEWS.d/next/Library/2021-08-30-13-55-09.bpo-31299.9QzjZs.rst b/Misc/NEWS.d/next/Library/2021-08-30-13-55-09.bpo-31299.9QzjZs.rst
new file mode 100644
index 0000000000000..1ffa0b15172ee
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-08-30-13-55-09.bpo-31299.9QzjZs.rst
@@ -0,0 +1 @@
+Add option to completely drop frames from a traceback by returning ``None`` from a :meth:`~traceback.StackSummary.format_frame` override.
\ No newline at end of file