The any key/p310 int bitcount

Lib/_weakrefset.py

@@ -194,3 +194,6 @@ def union(self, other):
 
     def isdisjoint(self, other):
         return len(self.intersection(other)) == 0
+
+    def __repr__(self):
+        return repr(self.data)

Lib/importlib/_bootstrap.py

@@ -1149,12 +1149,21 @@ def _setup(sys_module, _imp_module):
 
     # Directly load built-in modules needed during bootstrap.
     self_module = sys.modules[__name__]
-    for builtin_name in ('_thread', '_warnings', '_weakref'):
+    for builtin_name in ('_warnings', '_weakref'):
         if builtin_name not in sys.modules:
             builtin_module = _builtin_from_name(builtin_name)
         else:
             builtin_module = sys.modules[builtin_name]
         setattr(self_module, builtin_name, builtin_module)
+    # _thread was part of the above loop, but other parts of the code allow for it
+    # to be None, so we handle it separately here
+    builtin_name = '_thread'
+    if builtin_name in sys.modules:
+        builtin_module = sys.modules[builtin_name]
+    else:
+        builtin_spec = BuiltinImporter.find_spec(builtin_name)
+        builtin_module = builtin_spec and _load_unlocked(builtin_spec)
+    setattr(self_module, builtin_name, builtin_module)
 
 
 def _install(sys_module, _imp_module):

Lib/logging/__init__.py

@@ -37,8 +37,7 @@
            'warn', 'warning', 'getLogRecordFactory', 'setLogRecordFactory',
            'lastResort', 'raiseExceptions']
 
-#  TODO: import threading
-import _thread
+import threading
 
 __author__  = "Vinay Sajip <[email protected]>"
 __status__  = "production"
@@ -208,7 +207,7 @@ def _checkLevel(level):
 #the lock would already have been acquired - so we need an RLock.
 #The same argument applies to Loggers and Manager.loggerDict.
 #
-_lock = _thread.RLock()
+_lock = threading.RLock()
 
 def _acquireLock():
     """
@@ -844,7 +843,7 @@ def createLock(self):
         """
         Acquire a thread lock for serializing access to the underlying I/O.
         """
-        self.lock = _thread.RLock()
+        self.lock = threading.RLock()
         _register_at_fork_acquire_release(self)
 
     def acquire(self):