Issue #25364: zipfile now works in threads disabled builds.

diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index 85bdaa99ae8789ef2bb175cf54419c2dc9521e6c..2bd1007e2a2ba2b7b2c57119fd5aabb270ed272a 100644 (file)
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -13,8 +13,11 @@ import stat
 import shutil
 import struct
 import binascii
-import threading
 
+try:
+    import threading
+except ImportError:
+    import dummy_threading as threading
 
 try:
     import zlib # We may need its compression method

diff --git a/Misc/NEWS b/Misc/NEWS
index 260287618cb146e7bb92eeba278294fa8accbfb3..9c89f121ca5d99e5084c38c366769db581de89da 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -40,6 +40,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #25364: zipfile now works in threads disabled builds.
+
 - Issue #25328: smtpd's SMTPChannel now correctly raises a ValueError if both
   decode_data and enable_SMTPUTF8 are set to true.