changeset: 98649:15740b3ad148 branch: 3.5 parent: 98647:836ac579e179 user: Serhiy Storchaka date: Sat Oct 10 19:43:32 2015 +0300 files: Lib/zipfile.py Misc/NEWS description: Issue #25364: zipfile now works in threads disabled builds. diff -r 836ac579e179 -r 15740b3ad148 Lib/zipfile.py --- a/Lib/zipfile.py Sat Oct 10 11:05:47 2015 +0000 +++ b/Lib/zipfile.py Sat Oct 10 19:43:32 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 836ac579e179 -r 15740b3ad148 Misc/NEWS --- a/Misc/NEWS Sat Oct 10 11:05:47 2015 +0000 +++ b/Misc/NEWS Sat Oct 10 19:43:32 2015 +0300 @@ -40,6 +40,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.