From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sat, 10 Oct 2015 16:43:32 +0000 (+0300)
Subject: Issue #25364: zipfile now works in threads disabled builds.
X-Git-Tag: v3.5.1rc1~184
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e777730eb399ada4c2f6271883e73455eacd5c8;p=python

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

diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index 85bdaa99ae..2bd1007e2a 100644
--- 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 260287618c..9c89f121ca 100644
--- 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.