Since r64688, zipfile.py contains duplicated definitions. The attached patch removes them. Also, Twisted uses a zipfile item that have been renamed by this change: zipfile.stringFileHeader (now magicFileHeader). This makes some tests fail on the community buildbots. See the rightmost column on http://www.python.org/dev/buildbot/community/trunk/ I suggest to rename all magicXXX variables back to stringXXX.
I don't see a patch attached, but the duplicated code does need removing. If you can attach a patch I'll try it out. As much as I dislike the "string" names (magicXXX seemed much more descriptive), I suppose they're publicly available and shouldn't be renamed without a good reason. (Unless not being in __all__ counts as being something one shouldn't depend on as part of the API ;)
The patch seems to work just fine for me, all tests pass (including test_zipfile64) on an Intel Mac. I'd vote to go ahead and revert the magicXXX variables back to their original names--I'm sure Twisted isn't the only project out there that made use of them. If the magicXXX name change gets checked in along with the current patch I'll run the zip64 tests on Mac and Linux afterward, since they don't get run in the standard test run on the buildbots. I don't currently have a Windows machine to test with.
