@@ -1,2 +1,3 @@

+__all__ = ['__version__']

 from ._version import __version__

-del _version

+del _version  # remove to avoid confusion with __version__

@@ -73,9 +73,10 @@ def get_version_from_git():

     # that were merged-in.

     for opts in [['--first-parent'], []]:

         try:

-            p = subprocess.Popen(['git', 'describe', '--long'] + opts,

-                                 cwd=distr_root,

-                                 stdout=subprocess.PIPE, stderr=subprocess.PIPE)

+            p = subprocess.Popen(

+                ['git', 'describe', '--long'] + opts,

+                cwd=distr_root,

+                stdout=subprocess.PIPE, stderr=subprocess.PIPE)

         except OSError:

             return

         if p.wait() == 0:

@@ -94,7 +95,7 @@ def get_version_from_git():

     try:

         p = subprocess.Popen(['git', 'diff', '--quiet'], cwd=distr_root)

     except OSError:

-        labels.append('confused') # This should never happen.

+        labels.append('confused')  # This should never happen.

     else:

         if p.wait() == 1:

             labels.append('dirty')

@@ -132,6 +133,7 @@ def get_version_from_git_archive(version_info):

 __version__ = get_version()

+

 # The following section defines a module global 'cmdclass',

 # which can be used from setup.py. The 'package_name' and

 # '__version__' module globals are used (but not modified).

@@ -7,6 +7,7 @@ if sys.version_info < (3, 5):

     print('Miniver needs at least Python 3.5.')

     sys.exit(1)

+

 # Loads version.py module without importing the whole package.

 def get_version_and_cmdclass(package_name):

     import os