Merge with mastersetuptools-scm

1 files changed, 12 insertions, 8 deletions

diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index b3c9fa56..b6411cc5 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -1,24 +1,27 @@
 """Utilities for extracting common archive formats"""
 
-
-__all__ = [
-    "unpack_archive", "unpack_zipfile", "unpack_tarfile", "default_filter",
-    "UnrecognizedFormat", "extraction_drivers", "unpack_directory",
-]
-
 import zipfile
 import tarfile
 import os
 import shutil
 import posixpath
 import contextlib
-from pkg_resources import ensure_directory, ContextualZipFile
 from distutils.errors import DistutilsError
 
+from pkg_resources import ensure_directory, ContextualZipFile
+
+
+__all__ = [
+    "unpack_archive", "unpack_zipfile", "unpack_tarfile", "default_filter",
+    "UnrecognizedFormat", "extraction_drivers", "unpack_directory",
+]
+
+
 class UnrecognizedFormat(DistutilsError):
     """Couldn't recognize the archive type"""
 
-def default_filter(src,dst):
+
+def default_filter(src, dst):
     """The default progress/filter callback; returns True for all files"""
     return dst
 
@@ -167,4 +170,5 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
                             pass
         return True
 
+
 extraction_drivers = unpack_directory, unpack_zipfile, unpack_tarfile