Support marshal.dump(x, f) where f is not a real file.

Support ord(b) where b is a 1-byte string.
In zipfile.py, work around bytes being ints instead of chars, sometimes.

1 files changed, 7 insertions, 1 deletions

diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index dc51168..d0a1f65 100644
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -348,7 +348,13 @@ class _ZipDecrypter:
 
     def __call__(self, c):
         """Decrypt a single character."""
-        c = ord(c)
+        # XXX When this is called with a byte instead of a char, ord()
+        # isn't needed.  Don't die in that case.  In the future we should
+        # just leave this out, once we're always using bytes.
+        try:
+            c = ord(c)
+        except TypeError:
+            pass
         k = self.key2 | 2
         c = c ^ (((k * (k^1)) >> 8) & 255)
         c = chr(c)