Patch by Serhiy Storchaka. This also moves the TypeError that results from trying to use a unicode comment from the 'close' step to the point at which the comment is added to the zipfile.
concurrent.futures.wait(return_when=ALL_COMPLETED)