summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-10-10 16:44:23 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-10-10 16:44:23 (GMT)
commitf98a24eeccc4a7982ddd3ea608638a0d1c91cc20 (patch)
tree5abed55fed97deca7d498b350162b48e1f32dd8f
parent4df3b1a19544c52f93dacfd577559d4bd3a0c82d (diff)
parent9e777730eb399ada4c2f6271883e73455eacd5c8 (diff)
downloadcpython-f98a24eeccc4a7982ddd3ea608638a0d1c91cc20.zip
cpython-f98a24eeccc4a7982ddd3ea608638a0d1c91cc20.tar.gz
cpython-f98a24eeccc4a7982ddd3ea608638a0d1c91cc20.tar.bz2
Issue #25364: zipfile now works in threads disabled builds.
-rw-r--r--Lib/zipfile.py5
-rw-r--r--Misc/NEWS2
2 files changed, 6 insertions, 1 deletions
diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index 85bdaa9..2bd1007 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 41bcd06..cb02aae 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -51,6 +51,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.