Remove is_reg() and add checks for filemode and follow_symlinks

zaphodef · zaphodef · commit ca5e302203f7 · 2019-08-26T09:26:32.000+02:00
diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst
@@ -655,15 +655,11 @@ Instances have the following methods and attributes:
       This uses the entry's name: directories should always end with ``/``.
 
    .. versionchanged:: 3.9
-      Use the filemode contained in external file attributes.
-
-.. method:: ZipInfo.is_reg()
-
-   Return :const:`True` if this archive member is a regular file.
+      This uses the filemode contained in external file attributes.
 
 .. method:: ZipInfo.is_file()
 
-   Same as :meth:`is_reg`.
+   Return :const:`True` if this archive member is a regular file.
 
 .. method:: ZipInfo.is_sym()
 
diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py
@@ -2284,23 +2284,23 @@ def test_from_file(self):
         self.assertEqual(posixpath.basename(zi.filename), 'test_zipfile.py')
         self.assertFalse(zi.is_dir())
         self.assertFalse(zi.is_sym())
-        self.assertTrue(zi.is_reg())
+        self.assertTrue(zi.is_file())
         self.assertEqual(zi.file_size, os.path.getsize(__file__))
 
     def test_from_file_pathlike(self):
         zi = zipfile.ZipInfo.from_file(pathlib.Path(__file__))
         self.assertEqual(posixpath.basename(zi.filename), 'test_zipfile.py')
         self.assertFalse(zi.is_dir())
         self.assertFalse(zi.is_sym())
-        self.assertTrue(zi.is_reg())
+        self.assertTrue(zi.is_file())
         self.assertEqual(zi.file_size, os.path.getsize(__file__))
 
     def test_from_file_bytes(self):
         zi = zipfile.ZipInfo.from_file(os.fsencode(__file__), 'test')
         self.assertEqual(posixpath.basename(zi.filename), 'test')
         self.assertFalse(zi.is_dir())
         self.assertFalse(zi.is_sym())
-        self.assertTrue(zi.is_reg())
+        self.assertTrue(zi.is_file())
         self.assertEqual(zi.file_size, os.path.getsize(__file__))
 
     def test_from_file_fileno(self):
@@ -2309,7 +2309,7 @@ def test_from_file_fileno(self):
             self.assertEqual(posixpath.basename(zi.filename), 'test')
             self.assertFalse(zi.is_dir())
             self.assertFalse(zi.is_sym())
-            self.assertTrue(zi.is_reg())
+            self.assertTrue(zi.is_file())
             self.assertEqual(zi.file_size, os.path.getsize(__file__))
 
     def test_from_dir(self):
@@ -2318,19 +2318,37 @@ def test_from_dir(self):
         self.assertEqual(zi.filename, 'stdlib_tests/')
         self.assertTrue(zi.is_dir())
         self.assertFalse(zi.is_sym())
-        self.assertFalse(zi.is_reg())
+        self.assertFalse(zi.is_file())
         self.assertEqual(zi.compress_type, zipfile.ZIP_STORED)
         self.assertEqual(zi.file_size, 0)
 
     def test_from_symlink(self):
         self.addCleanup(unlink, TESTFN)
         os.symlink(os.path.abspath(__file__), TESTFN)
-        zi = zipfile.ZipInfo.from_file(TESTFN, 'symlink', follow_symlinks=False)
-        self.assertEqual(posixpath.basename(zi.filename), 'symlink')
+
+        zi = zipfile.ZipInfo.from_file(TESTFN, follow_symlinks=False)
+        self.assertEqual(posixpath.basename(zi.filename), TESTFN)
         self.assertFalse(zi.is_dir())
-        self.assertFalse(zi.is_reg())
+        self.assertFalse(zi.is_file())
         self.assertTrue(zi.is_sym())
 
+        zi = zipfile.ZipInfo.from_file(TESTFN, follow_symlinks=True)
+        self.assertEqual(posixpath.basename(zi.filename), TESTFN)
+        self.assertFalse(zi.is_dir())
+        self.assertTrue(zi.is_file())
+        self.assertFalse(zi.is_sym())
+        self.assertEqual(zi.file_size, os.path.getsize(__file__))
+
+    def test_filemode(self):
+        self.addCleanup(unlink, TESTFN)
+        with open(TESTFN, "w") as f:
+            f.write("the cake is a lie")
+        modes_to_test = (0o400, 0o777, 0o755, 0o600)
+        for mode in modes_to_test:
+            os.chmod(TESTFN, mode)
+            zi = zipfile.ZipInfo.from_file(TESTFN)
+            self.assertEqual(zi.filemode, os.stat(TESTFN).st_mode)
+
 
 class CommandLineTest(unittest.TestCase):
 
diff --git a/Lib/zipfile.py b/Lib/zipfile.py
@@ -535,12 +535,9 @@ def from_file(cls, filename, arcname=None, *, strict_timestamps=True, follow_sym
     def filemode(self):
         return self.external_attr >> 16
 
-    def is_reg(self):
+    def is_file(self):
         """Return True if this archive member is a regular file."""
         return stat.S_ISREG(self.filemode)
-    def is_file(self):
-        """Same as is_reg()."""
-        return self.is_reg()
     def is_sym(self):
         """Return True if this archive member is a symbolic link."""
         return stat.S_ISLNK(self.filemode)
