Add documentation, write tests

python · dignissimus · Apr 2, 2022 · Apr 2, 2022 · Apr 2, 2022 · Nov 29, 2022
commit 232ab1f1a03f1b05a82b0cf175767dba4a552ed5
diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst
@@ -839,6 +839,9 @@ Instances have the following methods and attributes:
 
    Size of the uncompressed file.
 
+.. attribute:: ZipInfo.mode
+
+  The mode of the file (permissions)
 
 .. _zipfile-commandline:
 .. program:: zipfile

diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py
@@ -1959,6 +1959,21 @@ def test_create_empty_zipinfo_default_attributes(self):
         self.assertEqual(zi.file_size, 0)
         self.assertEqual(zi.compress_size, 0)
 
+    def test_zipinfo_mode(self):
+        zinfo = zipfile.ZipInfo()
+        self.assertEqual(zinfo.mode, 0)
+
+        zinfo.mode = 0o777
+        self.assertEqual(zinfo.mode, 0o777)
+
+        zinfo.mode = 0o700
+        self.assertEqual(zinfo.mode, 0o700)
+
+        # Setting the file mode should not overwrite the file type
+        zinfo.mode = 0xFFFF
+        self.assertLessEqual(zinfo.mode, 0o777)
+        self.assertEqual(zinfo.external_attr >> 16 >> 9, 0)
+
     def test_zipfile_with_short_extra_field(self):
         """If an extra field in the header is less than 4 bytes, skip it."""
         zipdata = (

diff --git a/Lib/zipfile.py b/Lib/zipfile.py
@@ -553,11 +553,11 @@ def from_file(cls, filename, arcname=None, *, strict_timestamps=True):
 
     @property
     def mode(self):
-        return (self.external_attr >> 16) & (0o777)
+        return (self.external_attr >> 16) & 0o777
 
     @mode.setter
     def mode(self, value):
-        self.external_attr = (self.external_attr & ~(0o777 << 16)) | (value << 16 )
+        self.external_attr = self.external_attr & ~(0o777 << 16) | ((value & 0o777) << 16)
 
     def is_dir(self):
         """Return True if this archive member is a directory."""