Simplify!!!

Author: serhiy-storchaka

Lib/zipfile/__init__.py

@@ -515,7 +515,7 @@ def __repr__(self):
         result.append('>')
         return ''.join(result)
 
-    def FileHeader(self, zip64=None, metadata_encoding=None):
+    def FileHeader(self, zip64=None):
         """Return the per-file header as a bytes object.
 
         When the optional zip64 arg is None rather than a bool, we will
@@ -557,17 +557,19 @@ def FileHeader(self, zip64=None, metadata_encoding=None):
 
         self.extract_version = max(min_version, self.extract_version)
         self.create_version = max(min_version, self.create_version)
-        filename, flag_bits = self._encodeFilenameFlags(metadata_encoding)
+        filename, flag_bits = self._encodeFilenameFlags()
         header = struct.pack(structFileHeader, stringFileHeader,
                              self.extract_version, self.reserved, flag_bits,
                              self.compress_type, dostime, dosdate, CRC,
                              compress_size, file_size,
                              len(filename), len(extra))
         return header + filename + extra
 
-    def _encodeFilenameFlags(self, encoding):
-        if not encoding or self.flag_bits & _MASK_UTF_FILENAME:
+    def _encodeFilenameFlags(self):
+        if self.flag_bits & _MASK_UTF_FILENAME:
             encoding = 'ascii'
+        else:
+            encoding = 'cp437'
         try:
             return self.filename.encode(encoding), self.flag_bits & ~_MASK_UTF_FILENAME
         except UnicodeEncodeError:
@@ -1372,7 +1374,7 @@ def close(self):
                 # Preserve current position in file
                 self._zipfile.start_dir = self._fileobj.tell()
                 self._fileobj.seek(self._zinfo.header_offset)
-                self._fileobj.write(self._zinfo.FileHeader(self._zip64, self._zipfile.metadata_encoding))
+                self._fileobj.write(self._zinfo.FileHeader(self._zip64))
                 self._fileobj.seek(self._zipfile.start_dir)
 
             # Successfully written: Add file to our caches
@@ -1573,8 +1575,6 @@ def _RealGetContents(self):
             else:
                 # Historical ZIP filename encoding
                 filename = filename.decode(self.metadata_encoding or 'cp437')
-                if not self.metadata_encoding and not filename.isascii():
-                    self.metadata_encoding = "cp437"
             # Create ZipInfo instance to store file information
             x = ZipInfo(filename)
             x.extra = fp.read(centdir[_CD_EXTRA_FIELD_LENGTH])
@@ -1834,7 +1834,7 @@ def _open_to_write(self, zinfo, force_zip64=False):
         self._writecheck(zinfo)
         self._didModify = True
 
-        self.fp.write(zinfo.FileHeader(zip64, self.metadata_encoding))
+        self.fp.write(zinfo.FileHeader(zip64))
 
         self._writing = True
         return _ZipWriteFile(self, zinfo, zip64)
@@ -2066,7 +2066,7 @@ def mkdir(self, zinfo_or_directory_name, mode=511):
 
             self.filelist.append(zinfo)
             self.NameToInfo[zinfo.filename] = zinfo
-            self.fp.write(zinfo.FileHeader(False, self.metadata_encoding))
+            self.fp.write(zinfo.FileHeader(False))
             self.start_dir = self.fp.tell()
 
     def __del__(self):
@@ -2137,7 +2137,7 @@ def _write_end_record(self):
 
             extract_version = max(min_version, zinfo.extract_version)
             create_version = max(min_version, zinfo.create_version)
-            filename, flag_bits = zinfo._encodeFilenameFlags(self.metadata_encoding)
+            filename, flag_bits = zinfo._encodeFilenameFlags()
             centdir = struct.pack(structCentralDir,
                                   stringCentralDir, create_version,
                                   zinfo.create_system, extract_version, zinfo.reserved,