Merge pull request #522 from python/main

Sync Fork from Upstream Repo

Author: sthagen

Doc/library/fnmatch.rst

@@ -46,6 +46,9 @@ module.  See module :mod:`glob` for pathname expansion (:mod:`glob` uses
 a period are not special for this module, and are matched by the ``*`` and ``?``
 patterns.
 
+Also note that :func:`functools.lru_cache` with the *maxsize* of 32768 is used to
+cache the compiled regex patterns in the following functions: :func:`fnmatch`,
+:func:`fnmatchcase`, :func:`filter`.
 
 .. function:: fnmatch(filename, pattern)
 

Lib/_pydecimal.py

@@ -2230,7 +2230,7 @@ def _power_exact(self, other, p):
             if xe != 0 and len(str(abs(yc*xe))) <= -ye:
                 return None
             xc_bits = _nbits(xc)
-            if xc != 1 and len(str(abs(yc)*xc_bits)) <= -ye:
+            if len(str(abs(yc)*xc_bits)) <= -ye:
                 return None
             m, n = yc, 10**(-ye)
             while m % 2 == n % 2 == 0:
@@ -2243,7 +2243,7 @@ def _power_exact(self, other, p):
         # compute nth root of xc*10**xe
         if n > 1:
             # if 1 < xc < 2**n then xc isn't an nth power
-            if xc != 1 and xc_bits <= n:
+            if xc_bits <= n:
                 return None
 
             xe, rem = divmod(xe, n)

Lib/distutils/msvccompiler.py

@@ -44,7 +44,6 @@
                  "necessary compiler setting\n"
                  "Make sure that Python modules winreg, "
                  "win32api or win32con are installed.")
-        pass
 
 if _can_read_reg:
     HKEYS = (hkey_mod.HKEY_USERS,

Lib/fnmatch.py

@@ -41,7 +41,7 @@ def fnmatch(name, pat):
     pat = os.path.normcase(pat)
     return fnmatchcase(name, pat)
 
-@functools.lru_cache(maxsize=256, typed=True)
+@functools.lru_cache(maxsize=32768, typed=True)
 def _compile_pattern(pat):
     if isinstance(pat, bytes):
         pat_str = str(pat, 'ISO-8859-1')

Lib/sysconfig.py

@@ -111,7 +111,7 @@ def joinuser(*args):
             'platstdlib': '{userbase}/lib/python',
             'purelib': '{userbase}/lib/python/site-packages',
             'platlib': '{userbase}/lib/python/site-packages',
-            'include': '{userbase}/include',
+            'include': '{userbase}/include/python{py_version_short}',
             'scripts': '{userbase}/bin',
             'data': '{userbase}',
             },

Misc/NEWS.d/next/Library/2021-07-10-19-55-13.bpo-42799.ad4tq8.rst

@@ -0,0 +1,4 @@
+In :mod:`fnmatch`, the cache size for compiled regex patterns
+(:func:`functools.lru_cache`) was bumped up from 256 to 32768, affecting
+functions: :func:`fnmatch.fnmatch`, :func:`fnmatch.fnmatchcase`,
+:func:`fnmatch.filter`.

Misc/NEWS.d/next/macOS/2021-07-12-15-42-02.bpo-41972.yUjE8j.rst

@@ -0,0 +1,2 @@
+The framework build's user header path in sysconfig is changed to add a
+'pythonX.Y' component to match distutils's behavior.