Merge branch 'py3.10' into dev

Author: netromdk

.github/workflows/analyze.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.9]
+        python-version: ['3.10']
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/test.yml

@@ -10,10 +10,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        # Start Linux jobs last since they are fastest to start and complete, and start 3.9 first,
+        # Start Linux jobs last since they are fastest to start and complete, and start 3.10 first,
         # since it pairs wiht macOS+Windows jobs, and 2.7+3.5 last since they only run tests and
         # don't use venv. (3.4 is not supported on GitHub anymore)
-        python-version: [3.9, 3.6, 3.7, 3.8, 2.7, 3.5]
+        python-version: ['3.10', 3.6, 3.7, 3.8, 3.9, 2.7, 3.5]
         os: [windows-latest, macos-latest, ubuntu-latest]
 
         # Choose test script depending on OS.
@@ -25,7 +25,7 @@ jobs:
           - os: windows-latest
             test_script_name: ./misc/actions/test.ps1
 
-        # Only test on macOS and Windows with Python 3.9.
+        # Only test on macOS and Windows with Python 3.10.
         exclude:
           - os: macos-latest
             python-version: 2.7
@@ -39,6 +39,8 @@ jobs:
             python-version: 3.7
           - os: macos-latest
             python-version: 3.8
+          - os: macos-latest
+            python-version: 3.9
           - os: windows-latest
             python-version: 2.7
           - os: windows-latest
@@ -51,6 +53,8 @@ jobs:
             python-version: 3.7
           - os: windows-latest
             python-version: 3.8
+          - os: windows-latest
+            python-version: 3.9
 
     steps:
     - uses: actions/checkout@v2

README.rst

@@ -24,7 +24,7 @@ Concurrently detect the minimum Python versions needed to run code. Additionally
 vanilla Python, and it doesn't have any external dependencies, it works with v2.7+ and v3+.
 
 It functions by parsing Python code into an abstract syntax tree (AST), which it traverses and
-matches against internal dictionaries with **3223** rules, covering v2.0-2.7 and v3.0-3.9, divided
+matches against internal dictionaries with **3223** rules, covering v2.0-2.7 and v3.0-3.10, divided
 into **139** modules, **2247** classes/functions/constants members of modules, **713** kwargs of
 functions, **4** strftime directives, **3** bytes format directives, **2** array typecodes, **3**
 codecs error handler names, **20** codecs encodings, **75** builtin generic annotation types, **8**
@@ -87,8 +87,9 @@ error handler names, encodings, ``%`` formatting and directives for bytes and by
 statement, multiple context expressions in a ``with`` statement, unpacking assignment, generalized
 unpacking, ellipsis literal (`...`) out of slices, dictionary union (``{..} | {..}``), dictionary
 union merge (``a = {..}; a |= {..}``), builtin generic type annotations (``list[str]``), function
-decorators, class decorators and relaxed decorators. It tries to detect and ignore user-defined
-functions, classes, arguments, and variables with names that clash with library-defined symbols.
+decorators, class decorators, relaxed decorators, pattern matching with ``match``, and union types
+written as ``X | Y``. It tries to detect and ignore user-defined functions, classes, arguments, and
+variables with names that clash with library-defined symbols.
 
 Caveats
 =======
@@ -265,8 +266,8 @@ Will yield "f-strings require 3.6+" even though the branch will not be evaluated
 
 The lax mode, via argument ``--lax``, was created to circumvent cases like this. *But it's not a
 perfect solution* since it will skip all ``if``, ternarys, ``for``, ``async for``, ``while``,
-``with``, ``try``, and boolean operations. Therefore it is recommended to run with and without lax
-mode to get a better understanding of individual cases.
+``with``, ``try``, boolean operations, and ``match``. Therefore it is recommended to run with and
+without lax mode to get a better understanding of individual cases.
 
 Analysis Exclusions
 ===================

tests/builtin_constants.py

@@ -15,3 +15,41 @@ def test_c_contiguous_of_memoryview(self):
 
   def test_f_contiguous_of_memoryview(self):
     self.assertOnlyIn((3, 3), self.detect("memoryview(b'1').f_contiguous"))
+
+  def test_mapping_of_dict_view(self):
+    self.assertOnlyIn((3, 10), self.detect("{}.items().mapping"))
+    self.assertOnlyIn((3, 10), self.detect("{}.keys().mapping"))
+    self.assertOnlyIn((3, 10), self.detect("{}.values().mapping"))
+
+    self.assertOnlyIn((3, 10), self.detect("dict().items().mapping"))
+    self.assertOnlyIn((3, 10), self.detect("dict().keys().mapping"))
+    self.assertOnlyIn((3, 10), self.detect("dict().values().mapping"))
+
+    self.assertOnlyIn((3, 10), self.detect("""
+d = {}
+d.items().mapping
+"""))
+    self.assertOnlyIn((3, 10), self.detect("""
+d = {}
+d.keys().mapping
+"""))
+    self.assertOnlyIn((3, 10), self.detect("""
+d = {}
+d.values().mapping
+"""))
+
+    self.assertOnlyIn((3, 10), self.detect("""
+d = {}
+i = d.items()
+i.mapping
+"""))
+    self.assertOnlyIn((3, 10), self.detect("""
+d = {}
+i = d.keys()
+i.mapping
+"""))
+    self.assertOnlyIn((3, 10), self.detect("""
+d = {}
+i = d.values()
+i.mapping
+"""))

tests/builtin_functions.py

@@ -354,6 +354,10 @@ def test_bit_length_of_int(self):
     self.assertOnlyIn(((2, 7), (3, 1)), self.detect("(42).bit_length()"))
     self.assertOnlyIn(((2, 7), (3, 1)), self.detect("n=42\nn.bit_length()"))
 
+  def test_bit_count_of_int(self):
+    self.assertOnlyIn((3, 10), self.detect("(42).bit_count()"))
+    self.assertOnlyIn((3, 10), self.detect("n=42\nn.bit_count()"))
+
   def test_to_bytes_of_int(self):
     self.assertOnlyIn((3, 2), self.detect("(42).to_bytes()"))
     self.assertOnlyIn((3, 2), self.detect("n=42\nn.to_bytes()"))
@@ -447,3 +451,9 @@ def test_setter_of_property(self):
 
   def test_indices_of_slice(self):
     self.assertOnlyIn(((2, 3), (3, 0)), self.detect("slice.indices()"))
+
+  def test_aiter(self):
+    self.assertOnlyIn((3, 10), self.detect("aiter()"))
+
+  def test_anext(self):
+    self.assertOnlyIn((3, 10), self.detect("anext()"))

tests/class.py

@@ -267,6 +267,9 @@ def test_ExitStack_of_contextlib(self):
   def test_AsyncExitStack_of_contextlib(self):
     self.assertOnlyIn((3, 7), self.detect("from contextlib import AsyncExitStack"))
 
+  def test_AsyncContextDecorator_of_contextlib(self):
+    self.assertOnlyIn((3, 10), self.detect("from contextlib import AsyncContextDecorator"))
+
   def test_unix_dialect_of_csv(self):
     self.assertOnlyIn((3, 2), self.detect("from csv import unix_dialect"))
 
@@ -543,6 +546,9 @@ def test_TypedDict_of_typing(self):
     self.assertTrue(self.config.add_backport("typing"))
     self.assertOnlyIn(((2, 7), (3, 8)), self.detect("from typing import TypedDict"))
 
+  def test_ParamSpec_of_typing(self):
+    self.assertOnlyIn((3, 10), self.detect("from typing import ParamSpec"))
+
   def test_SMTP_SSL_of_smtplib(self):
     self.assertOnlyIn(((2, 6), (3, 0)), self.detect("from smtplib import SMTP_SSL"))
 

tests/constants.py

@@ -74,6 +74,18 @@ def test_O_PATH_of_os(self):
   def test_O_TMPFILE_of_os(self):
     self.assertOnlyIn((3, 4), self.detect("from os import O_TMPFILE"))
 
+  def test_O_EVTONLY_of_os(self):
+    self.assertOnlyIn((3, 10), self.detect("from os import O_EVTONLY"))
+
+  def test_O_FSYNC_of_os(self):
+    self.assertOnlyIn((3, 10), self.detect("from os import O_FSYNC"))
+
+  def test_O_SYMLINK_of_os(self):
+    self.assertOnlyIn((3, 10), self.detect("from os import O_SYMLINK"))
+
+  def test_O_NOFOLLOW_ANY_of_os(self):
+    self.assertOnlyIn((3, 10), self.detect("from os import O_NOFOLLOW_ANY"))
+
   def test_POSIX_FADV_NORMAL_of_os(self):
     self.assertOnlyIn((3, 3), self.detect("from os import POSIX_FADV_NORMAL"))
 
@@ -276,6 +288,12 @@ def test_VERIFY_X509_STRICT_of_ssl(self):
   def test_VERIFY_X509_TRUSTED_FIRST_of_ssl(self):
     self.assertOnlyIn(((2, 7), (3, 4)), self.detect("from ssl import VERIFY_X509_TRUSTED_FIRST"))
 
+  def test_VERIFY_X509_PARTIAL_CHAIN_of_ssl(self):
+    self.assertOnlyIn((3, 10), self.detect("from ssl import VERIFY_X509_PARTIAL_CHAIN"))
+
+  def test_VERIFY_ALLOW_PROXY_CERTS_of_ssl(self):
+    self.assertOnlyIn((3, 10), self.detect("from ssl import VERIFY_ALLOW_PROXY_CERTS"))
+
   def test_PROTOCOL_TLS_of_ssl(self):
     self.assertOnlyIn(((2, 7), (3, 6)), self.detect("from ssl import PROTOCOL_TLS"))
 
@@ -321,6 +339,9 @@ def test_OP_NO_COMPRESSION_of_ssl(self):
   def test_OP_NO_TICKET_of_ssl(self):
     self.assertOnlyIn((3, 6), self.detect("from ssl import OP_NO_TICKET"))
 
+  def test_OP_IGNORE_UNEXPECTED_EOF_of_ssl(self):
+    self.assertOnlyIn((3, 10), self.detect("from ssl import OP_IGNORE_UNEXPECTED_EOF"))
+
   def test_HAS_ALPN_of_ssl(self):
     self.assertOnlyIn(((2, 7), (3, 5)), self.detect("from ssl import HAS_ALPN"))
 
@@ -378,6 +399,9 @@ def test_session_reused_of_ssl_SSLSocket(self):
   def test_check_hostname_of_ssl_SSLContext(self):
     self.assertOnlyIn((3, 4), self.detect("from ssl import SSLContext\nSSLContext.check_hostname"))
 
+  def test_security_level_of_ssl_SSLContext(self):
+    self.assertOnlyIn((3, 10), self.detect("from ssl import SSLContext\nSSLContext.security_level"))
+
   def test_verify_flags_of_ssl_SSLContext(self):
     self.assertOnlyIn((3, 4), self.detect("from ssl import SSLContext\nSSLContext.verify_flags"))
 
@@ -621,6 +645,9 @@ def test_MADV_CORE_of_mmap(self):
   def test_MADV_PROTECT_of_mmap(self):
     self.assertOnlyIn((3, 8), self.detect("import mmap\nmmap.MADV_PROTECT"))
 
+  def test_MAP_POPULATE_of_mmap(self):
+    self.assertOnlyIn((3, 10), self.detect("import mmap\nmmap.MAP_POPULATE"))
+
   def test_MFD_CLOEXEC_of_os(self):
     self.assertOnlyIn((3, 8), self.detect("from os import MFD_CLOEXEC"))
 
@@ -1213,6 +1240,9 @@ def test_RWF_NOWAIT_of_os(self):
   def test_RWF_SYNC_of_os(self):
     self.assertOnlyIn((3, 7), self.detect("from os import RWF_SYNC"))
 
+  def test_RWF_APPEND_of_os(self):
+    self.assertOnlyIn((3, 10), self.detect("from os import RWF_APPEND"))
+
   def test_SCHED_BATCH_of_os(self):
     self.assertOnlyIn((3, 3), self.detect("from os import SCHED_BATCH"))
 
@@ -1312,6 +1342,24 @@ def test_killpg_of_os(self):
   def test_P_PIDFD_of_os(self):
     self.assertOnlyIn((3, 9), self.detect("from os import P_PIDFD"))
 
+  def test_SPLICE_F_MOVE_of_os(self):
+    self.assertOnlyIn((3, 10), self.detect("from os import SPLICE_F_MOVE"))
+
+  def test_SPLICE_F_NONBLOCK_of_os(self):
+    self.assertOnlyIn((3, 10), self.detect("from os import SPLICE_F_NONBLOCK"))
+
+  def test_SPLICE_F_MORE_of_os(self):
+    self.assertOnlyIn((3, 10), self.detect("from os import SPLICE_F_MORE"))
+
+  def test_EFD_CLOEXEC_of_os(self):
+    self.assertOnlyIn((3, 10), self.detect("from os import EFD_CLOEXEC"))
+
+  def test_EFD_NONBLOCK_of_os(self):
+    self.assertOnlyIn((3, 10), self.detect("from os import EFD_NONBLOCK"))
+
+  def test_EFD_SEMAPHORE_of_os(self):
+    self.assertOnlyIn((3, 10), self.detect("from os import EFD_SEMAPHORE"))
+
   def test_st_atime_from_os_stat(self):
     self.assertOnlyIn(((2, 2), (3, 0)),
                       self.detect("from os import stat\n"
@@ -1530,6 +1578,11 @@ def test_parent_from_pyclbr_Function(self):
                       self.detect("from pyclbr import Function\n"
                                   "Function().parent"))
 
+  def test_is_async_from_pyclbr_Function(self):
+    self.assertOnlyIn((3, 10),
+                      self.detect("from pyclbr import Function\n"
+                                  "Function().is_async"))
+
   def test_colno_from_re_error(self):
     self.assertOnlyIn((3, 5),
                       self.detect("from re import error\n"
@@ -1574,6 +1627,9 @@ def test_RLIMIT_NICE_of_resource(self):
   def test_RLIMIT_NPTS_of_resource(self):
     self.assertOnlyIn((3, 4), self.detect("from resource import RLIMIT_NPTS"))
 
+  def test_RLIMIT_KQUEUES_of_resource(self):
+    self.assertOnlyIn((3, 10), self.detect("from resource import RLIMIT_KQUEUES"))
+
   def test_RLIMIT_RTPRIO_of_resource(self):
     self.assertOnlyIn((3, 4), self.detect("from resource import RLIMIT_RTPRIO"))
 
@@ -2054,6 +2110,9 @@ def test_TCP_NOTSENT_LOWAT_of_socket(self):
   def test_TCP_USER_TIMEOUT_of_socket(self):
     self.assertOnlyIn((3, 6), self.detect("from socket import TCP_USER_TIMEOUT"))
 
+  def test_TCP_KEEPALIVE_of_socket(self):
+    self.assertOnlyIn((3, 10), self.detect("from socket import TCP_KEEPALIVE"))
+
   def test_TIPC_ADDR_ID_of_socket(self):
     self.assertOnlyIn(((2, 6), (3, 0)), self.detect("from socket import TIPC_ADDR_ID"))
 
@@ -2135,6 +2194,12 @@ def test_VMADDR_PORT_ANY_of_socket(self):
   def test_IPPROTO_UDPLITE_of_socket(self):
     self.assertOnlyIn((3, 9), self.detect("from socket import IPPROTO_UDPLITE"))
 
+  def test_IPPROTO_MPTCP_of_socket(self):
+    self.assertOnlyIn((3, 10), self.detect("from socket import IPPROTO_MPTCP"))
+
+  def test_IP_RECVTOS_of_socket(self):
+    self.assertOnlyIn((3, 10), self.detect("from socket import IP_RECVTOS"))
+
   def test_has_ipv6_of_socket(self):
     self.assertOnlyIn(((2, 3), (3, 0)), self.detect("from socket import has_ipv6"))
 
@@ -2483,6 +2548,12 @@ def test_int_info_of_sys(self):
   def test_thread_info_of_sys(self):
     self.assertOnlyIn((3, 3), self.detect("from sys import thread_info"))
 
+  def test_orig_argv_of_sys(self):
+    self.assertOnlyIn((3, 10), self.detect("from sys import orig_argv"))
+
+  def test_stdlib_module_names_of_sys(self):
+    self.assertOnlyIn((3, 10), self.detect("from sys import stdlib_module_names"))
+
   def test_major_from_sys_version_info(self):
     self.assertOnlyIn(((2, 7), (3, 0)),
                       self.detect("from sys import version_info\n"
@@ -2560,6 +2631,9 @@ def test_native_id_from_threading_Thread(self):
                       self.detect("from threading import Thread\n"
                                   "Thread().native_id"))
 
+  def test___excepthook___from_threading(self):
+    self.assertOnlyIn((3, 10), self.detect("from threading import __excepthook__"))
+
   def test_tm_gmtoff_from_time_struct_time(self):
     self.assertOnlyIn((3, 3),
                       self.detect("from time import struct_time\n"
@@ -2618,6 +2692,18 @@ def test_ClassMethodDescriptorType_of_types(self):
   def test_CoroutineType_of_types(self):
     self.assertOnlyIn((3, 5), self.detect("from types import CoroutineType"))
 
+  def test_NoneType_of_types(self):
+    self.assertOnlyIn((3, 10), self.detect("from types import NoneType"))
+
+  def test_NotImplementedType_of_types(self):
+    self.assertOnlyIn((3, 10), self.detect("from types import NotImplementedType"))
+
+  def test_EllipsisType_of_types(self):
+    self.assertOnlyIn((3, 10), self.detect("from types import EllipsisType"))
+
+  def test_UnionType_of_types(self):
+    self.assertOnlyIn((3, 10), self.detect("from types import UnionType"))
+
   def test_GeneratorType_of_types(self):
     self.assertOnlyIn(((2, 2), (3, 0)), self.detect("from types import GeneratorType"))
 
@@ -2660,6 +2746,21 @@ def test_Literal_of_typing(self):
   def test_Annotated_of_typing(self):
     self.assertOnlyIn((3, 9), self.detect("from typing import Annotated"))
 
+  def test_Concatenate_of_typing(self):
+    self.assertOnlyIn((3, 10), self.detect("from typing import Concatenate"))
+
+  def test_ParamSpecArgs_of_typing(self):
+    self.assertOnlyIn((3, 10), self.detect("from typing import ParamSpecArgs"))
+
+  def test_ParamSpecKwargs_of_typing(self):
+    self.assertOnlyIn((3, 10), self.detect("from typing import ParamSpecKwargs"))
+
+  def test_TypeAlias_of_typing(self):
+    self.assertOnlyIn((3, 10), self.detect("from typing import TypeAlias"))
+
+  def test_TypeGuard_of_typing(self):
+    self.assertOnlyIn((3, 10), self.detect("from typing import TypeGuard"))
+
   def test_ucd_3_2_0_of_unicodedata(self):
     self.assertOnlyIn(((2, 3), (3, 0)), self.detect("from unicodedata import ucd_3_2_0"))
 
@@ -2981,3 +3082,18 @@ def test_kwargs_of_unittest_mock_Mock_call_args(self):
 
   def test_status_of_urllib_response_addinfourl(self):
     self.assertOnlyIn((3, 9), self.detect("from urllib.response.addinfourl import status"))
+
+  def test_COPY_DICT_WITHOUT_KEYS_of_dis(self):
+    self.assertOnlyIn((3, 10), self.detect("from dis import COPY_DICT_WITHOUT_KEYS"))
+
+  def test_GET_LEN_of_dis(self):
+    self.assertOnlyIn((3, 10), self.detect("from dis import GET_LEN"))
+
+  def test_MATCH_KEYS_of_dis(self):
+    self.assertOnlyIn((3, 10), self.detect("from dis import MATCH_KEYS"))
+
+  def test_MATCH_MAPPING_of_dis(self):
+    self.assertOnlyIn((3, 10), self.detect("from dis import MATCH_MAPPING"))
+
+  def test_MATCH_SEQUENCE_of_dis(self):
+    self.assertOnlyIn((3, 10), self.detect("from dis import MATCH_SEQUENCE"))