[Python-checkins] cpython (merge 3.5 -> default): Issue #25364: zipfile now works in threads disabled builds.

[serhiy.storchaka]

https://hg.python.org/cpython/rev/44b37c3ee76c
changeset:   98650:44b37c3ee76c
parent:      98648:c601496c2829
parent:      98649:15740b3ad148
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Sat Oct 10 19:44:23 2015 +0300
summary:
  Issue #25364: zipfile now works in threads disabled builds.

files:
  Lib/zipfile.py |  5 ++++-
  Misc/NEWS      |  2 ++
  2 files changed, 6 insertions(+), 1 deletions(-)


diff --git a/Lib/zipfile.py b/Lib/zipfile.py
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -13,8 +13,11 @@
 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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -51,6 +51,8 @@
 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.
 

-- 
Repository URL: https://hg.python.org/cpython