isort-apply

src/z3c/autoinclude/__init__.py

@@ -1,3 +1,3 @@
 #
-from __future__ import absolute_import
 from .dependency import package_includes
+from __future__ import absolute_import

src/z3c/autoinclude/api.py

@@ -1,5 +1,6 @@
 import os
 
+
 DEP_KEY = 'Z3C_AUTOINCLUDE_DEPENDENCIES_DISABLED'
 PLUGIN_KEY = 'Z3C_AUTOINCLUDE_PLUGINS_DISABLED'
 

src/z3c/autoinclude/dependency.py

@@ -1,11 +1,13 @@
-import os
-import logging
-from zope.dottedname.resolve import resolve
-from pkg_resources import resource_exists
-from pkg_resources import get_provider
 from pkg_resources import get_distribution
+from pkg_resources import get_provider
+from pkg_resources import resource_exists
 from z3c.autoinclude.utils import DistributionManager
 from z3c.autoinclude.utils import ZCMLInfo
+from zope.dottedname.resolve import resolve
+
+import logging
+import os
+
 
 class DependencyFinder(DistributionManager):
 

src/z3c/autoinclude/dependency.txt

@@ -126,15 +126,10 @@ order::
     >>> dummy = xmlconfig.file(resource_filename('a', 'configure.zcml'),
     ...                        package=a)
     >>> from testdirective.zcml import test_log
-<<<<<<< HEAD
     >>> pprint(test_log, width=30)
     [u'f.g meta has been loaded',
      u'f.h has been loaded',
      u'BCPackage has been loaded']
-=======
-    >>> pprint(test_log)
-    [u'f.g meta has been loaded', u'f.h has been loaded', u'b.c has been loaded']
->>>>>>> Adding support for pip.
 
 There is also a directive for including overrides, which calls
 ``autoIncludeOverridesDirective``; however, I have no idea how to test

src/z3c/autoinclude/plugin.py

@@ -1,9 +1,10 @@
-import os
 from pkg_resources import iter_entry_points
 from pkg_resources import resource_filename
 from z3c.autoinclude.utils import DistributionManager
 from z3c.autoinclude.utils import ZCMLInfo
 
+import os
+
 
 class PluginFinder(object):
     def __init__(self, platform_dottedname):

src/z3c/autoinclude/tests/A/setup.py

@@ -1,5 +1,9 @@
-from setuptools import setup, find_packages
-import sys, os
+from setuptools import find_packages
+from setuptools import setup
+
+import os
+import sys
+
 
 version = '0.0'
 

src/z3c/autoinclude/tests/BasePackage/setup.py

@@ -1,5 +1,9 @@
-from setuptools import setup, find_packages
-import sys, os
+from setuptools import find_packages
+from setuptools import setup
+
+import os
+import sys
+
 
 version = '0.0'
 

src/z3c/autoinclude/tests/SRCPackage/setup.py

@@ -1,5 +1,9 @@
-from setuptools import setup, find_packages
-import sys, os
+from setuptools import find_packages
+from setuptools import setup
+
+import os
+import sys
+
 
 version = '0.0'
 

src/z3c/autoinclude/tests/TestDirective/setup.py

@@ -1,5 +1,9 @@
-from setuptools import setup, find_packages
-import sys, os
+from setuptools import find_packages
+from setuptools import setup
+
+import os
+import sys
+
 
 version = '0.0'
 

src/z3c/autoinclude/tests/TestDirective/testdirective/zcml.py

@@ -1,6 +1,7 @@
 from zope.interface import Interface
 from zope.schema import TextLine
 
+
 test_log = []
 
 def clear_test_log():

src/z3c/autoinclude/tests/b.c/setup.py

@@ -1,4 +1,6 @@
-from setuptools import setup, find_packages
+from setuptools import find_packages
+from setuptools import setup
+
 
 version = '0.1'
 

src/z3c/autoinclude/tests/base2.plug/setup.py

@@ -1,5 +1,9 @@
-from setuptools import setup, find_packages
-import sys, os
+from setuptools import find_packages
+from setuptools import setup
+
+import os
+import sys
+
 
 version = '0.0'
 

src/z3c/autoinclude/tests/base2/setup.py

@@ -1,5 +1,9 @@
-from setuptools import setup, find_packages
-import sys, os
+from setuptools import find_packages
+from setuptools import setup
+
+import os
+import sys
+
 
 version = '0.0'
 

src/z3c/autoinclude/tests/enolp.ppa.bar/setup.py

@@ -1,4 +1,6 @@
-from setuptools import setup, find_packages
+from setuptools import find_packages
+from setuptools import setup
+
 
 version = '0.1'
 

src/z3c/autoinclude/tests/enolp.ppa.foo/setup.py

@@ -1,4 +1,6 @@
-from setuptools import setup, find_packages
+from setuptools import find_packages
+from setuptools import setup
+
 
 version = '0.1'
 

src/z3c/autoinclude/tests/f.g/setup.py

@@ -1,4 +1,6 @@
-from setuptools import setup, find_packages
+from setuptools import find_packages
+from setuptools import setup
+
 
 version = '0.0'
 

src/z3c/autoinclude/tests/foo/setup.py

@@ -1,5 +1,9 @@
-from setuptools import setup, find_packages
-import sys, os
+from setuptools import find_packages
+from setuptools import setup
+
+import os
+import sys
+
 
 version = '0.0'
 

src/z3c/autoinclude/tests/tests.py

@@ -1,11 +1,13 @@
-import re
-import os
-import doctest
-import unittest
-
+from pkg_resources import working_set
 from zc.buildout import testing
+from zc.buildout.easy_install import install
 from zope.testing import renormalizing
 
+import doctest
+import os
+import re
+import unittest
+
 
 projects_dir = os.path.dirname(__file__)
 
@@ -18,8 +20,6 @@
                  'enolp.ppa.foo', 'enolp.ppa.bar']
 
 
-from zc.buildout.easy_install import install
-from pkg_resources import working_set
 def install_projects(projects, target_dir):
     links = []
     for project in projects:

src/z3c/autoinclude/tests/x.y.z/setup.py

@@ -1,4 +1,6 @@
-from setuptools import setup, find_packages
+from setuptools import find_packages
+from setuptools import setup
+
 
 version = '0.1'
 

src/z3c/autoinclude/utils.py

@@ -1,10 +1,18 @@
-from __future__ import absolute_import, print_function
-
-import os
+from __future__ import absolute_import
+from __future__ import print_function
+### cargo-culted from setuptools 0.6c9's __init__.py;
+#   importing setuptools is unsafe, but i can't find any
+#   way to get the information that find_packages provides
+#   using pkg_resources and i can't figure out a way to
+#   avoid needing it.
+from distutils.util import convert_path
 from pkg_resources import find_distributions
 from pprint import pformat
+
+import os
 import sys
 
+
 class DistributionManager(object):
     def __init__(self, dist):
         self.context = dist
@@ -168,12 +176,6 @@ def isUnzippedEgg(path):
     return os.path.isdir(path)
 
 CACHE = {}
-### cargo-culted from setuptools 0.6c9's __init__.py;
-#   importing setuptools is unsafe, but i can't find any
-#   way to get the information that find_packages provides
-#   using pkg_resources and i can't figure out a way to
-#   avoid needing it.
-from distutils.util import convert_path
 def find_packages(where='.', exclude=()):
     """Return a list all Python packages found within directory 'where'
 

src/z3c/autoinclude/zcml.py

@@ -1,15 +1,17 @@
-from zope.interface import Interface
-from zope.configuration.xmlconfig import include, includeOverrides
-from zope.configuration.fields import GlobalObject
-from zope.dottedname.resolve import resolve
-from zope.schema import BytesLine
-
 from z3c.autoinclude import api
 from z3c.autoinclude.dependency import DependencyFinder
-from z3c.autoinclude.utils import distributionForPackage
 from z3c.autoinclude.plugin import PluginFinder
+from z3c.autoinclude.utils import distributionForPackage
+from zope.configuration.fields import GlobalObject
+from zope.configuration.xmlconfig import include
+from zope.configuration.xmlconfig import includeOverrides
+from zope.dottedname.resolve import resolve
+from zope.interface import Interface
+from zope.schema import BytesLine
 
 import logging
+
+
 log = logging.getLogger("z3c.autoinclude")
 
 def includeZCMLGroup(_context, info, filename, override=False):