changeset: 98650:44b37c3ee76c parent: 98648:c601496c2829 parent: 98649:15740b3ad148 user: Serhiy Storchaka date: Sat Oct 10 19:44:23 2015 +0300 files: Misc/NEWS description: Issue #25364: zipfile now works in threads disabled builds. diff -r c601496c2829 -r 44b37c3ee76c Lib/zipfile.py --- a/Lib/zipfile.py Sat Oct 10 11:06:05 2015 +0000 +++ b/Lib/zipfile.py Sat Oct 10 19:44:23 2015 +0300 @@ -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 -r c601496c2829 -r 44b37c3ee76c Misc/NEWS --- a/Misc/NEWS Sat Oct 10 11:06:05 2015 +0000 +++ b/Misc/NEWS Sat Oct 10 19:44:23 2015 +0300 @@ -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.