summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-10-10 16:43:32 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-10-10 16:43:32 (GMT)
commit9e777730eb399ada4c2f6271883e73455eacd5c8 (patch)
treed54a573bb8954ff86521dec9657ca12ea2ac8be0
parent05da525e55a5db2e2e3c81e413e69c4a6f0a1db9 (diff)
downloadcpython-9e777730eb399ada4c2f6271883e73455eacd5c8.zip
cpython-9e777730eb399ada4c2f6271883e73455eacd5c8.tar.gz
cpython-9e777730eb399ada4c2f6271883e73455eacd5c8.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 2602876..9c89f12 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.