pythongh-95463: Remove backwards incompatible change regarding the _M…

…ASK_UTF_FILENAME flags in bpo-28080 (pythonGH-96072) Automerge-Triggered-By: GH:pablogsal
miss-islington · Aug 18, 2022 · 9d066e2 · 9d066e2
1 parent ba4bb7e
commit 9d066e2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Lib/zipfile.py b/Lib/zipfile.py
@@ -480,7 +480,7 @@ def FileHeader(self, zip64=None):
 
     def _encodeFilenameFlags(self):
         try:
-            return self.filename.encode('ascii'), self.flag_bits & ~_MASK_UTF_FILENAME
+            return self.filename.encode('ascii'), self.flag_bits
         except UnicodeEncodeError:
             return self.filename.encode('utf-8'), self.flag_bits | _MASK_UTF_FILENAME
 

diff --git a/Misc/NEWS.d/next/Library/2022-08-18-14-53-53.gh-issue-95463.GpP05c.rst b/Misc/NEWS.d/next/Library/2022-08-18-14-53-53.gh-issue-95463.GpP05c.rst
@@ -0,0 +1,2 @@
+Remove an incompatible change from :issue:`28080` that caused a regression
+that ignored the utf8 in ``ZipInfo.flag_bits``. Patch by Pablo Galindo.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Remove an incompatible change from :issue:`28080` that caused a regression
		that ignored the utf8 in ``ZipInfo.flag_bits``. Patch by Pablo Galindo.