Changeset 107147 in webkit

Timestamp:

Feb 8, 2012 4:10:04 PM (12 years ago)

Author:

abarth@webkit.org

Message:

Don't re-implement ZipFile.extractall
​https://bugs.webkit.org/show_bug.cgi?id=78173

Reviewed by Eric Seidel.

We can use ZipFile.extractall now that we don't support Python 2.5.

• Scripts/webkitpy/common/system/autoinstall.py:

(AutoInstaller._extract_targz):
(AutoInstaller._unzip):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/autoinstall.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-02-08  Adam Barth  <abarth@webkit.org>
+
+        Don't re-implement ZipFile.extractall
+        https://bugs.webkit.org/show_bug.cgi?id=78173
+
+        Reviewed by Eric Seidel.
+
+        We can use ZipFile.extractall now that we don't support Python 2.5.
+
+        * Scripts/webkitpy/common/system/autoinstall.py:
+        (AutoInstaller._extract_targz):
+        (AutoInstaller._unzip):
+
 2012-02-08  Adam Barth  <abarth@webkit.org>
 

trunk/Tools/Scripts/webkitpy/common/system/autoinstall.py

@@ -260 +260 @@
         return target_path
 
-    # This is a replacement for ZipFile.extractall(), which is
-    # available in Python 2.6 but not in earlier versions.
-    def _extract_all(self, zip_file, target_dir):
-        self._log_transfer("Extracting zip file...", zip_file, target_dir)
-
-        # This is helpful for debugging purposes.
-        _log.debug("Listing zip file contents...")
-        for name in zip_file.namelist():
-            _log.debug('    * "%s"' % name)
-
-        for name in zip_file.namelist():
-            path = os.path.join(target_dir, name)
-            self._log_transfer("Extracting...", name, path)
-
-            if not os.path.basename(path):
-                # Then the path ends in a slash, so it is a directory.
-                self._create_directory(path)
-                continue
-            # Otherwise, it is a file.
-
-            try:
-                # We open this file w/o encoding, as we're reading/writing
-                # the raw byte-stream from the zip file.
-                outfile = open(path, 'wb')
-            except IOError, err:
-                # Not all zip files seem to list the directories explicitly,
-                # so try again after creating the containing directory.
-                _log.debug("Got IOError: retrying after creating directory...")
-                dir = os.path.dirname(path)
-                self._create_directory(dir)
-                outfile = open(path, 'wb')
-
-            try:
-                outfile.write(zip_file.read(name))
-            finally:
-                outfile.close()
-
     def _unzip(self, path, scratch_dir):
         # zipfile.extractall() extracts to a path without the
@@ -314 +277 @@
 
         try:
-            self._extract_all(zip_file, scratch_dir)
+            zip_file.extractall(scratch_dir)
         finally:
             zip_file.close()