From 4d4820eadf6c973e9fece3ec3e9259dc278d498b Mon Sep 17 00:00:00 2001
From: Patrick Gerken <patrick.gerken@zumtobelgroup.com>
Date: Fri, 25 Mar 2016 19:05:33 +0100
Subject: [PATCH 1/3] Adding support for pip.

This unfortunately removes support for having package names totally different
from the modules they provide.
This is not an issue with current Plone packages.
There are packages providing modules with different names, ZODB3 comes to mind,
but these packages did not trigger any problems with auto include.

Also, unfortunately, there is no way around it if one wants to support
pip, because pip installs everything in such a way, that all eggs
can share the same sys.path entry. When I see the physical location
of a python module, I cannot see, from which egg this was coming.
This is a breaking change, but it does not affect the consumer Plone
in a negative way. I can't speak for other frameworks using this.
---
 CHANGES.rst                                   |  4 ++-
 src/z3c/autoinclude/dependency.txt            | 24 +++++++--------
 src/z3c/autoinclude/plugin.txt                |  2 +-
 .../tests/{APackage => A}/a/__init__.py       |  0
 .../tests/{APackage => A}/a/configure.zcml    |  0
 .../tests/{APackage => A}/setup.py            |  4 +--
 .../tests/{BCPackage => b.c}/b/__init__.py    |  0
 .../tests/{BCPackage => b.c}/b/c/__init__.py  |  0
 .../{BCPackage => b.c}/b/c/configure.zcml     |  2 +-
 .../tests/{BCPackage => b.c}/setup.py         |  4 +--
 .../F => base2.plug/base2}/__init__.py        |  0
 .../base2/plug/__init__.py                    |  0
 .../base2/plug/configure.zcml                 |  0
 .../tests/{base2_plug => base2.plug}/setup.py |  2 +-
 .../{SiblingPackage => f.g}/F/G/__init__.py   |  0
 .../{SiblingPackage => f.g}/F/G/meta.zcml     |  0
 .../{SiblingPackage => f.g}/F/H/__init__.py   |  0
 .../F/H/configure.zcml                        |  0
 .../{SiblingPackage => f.g}/F/H/meta.zcml     |  0
 .../tests/{XYZPackage/x => f.g/F}/__init__.py |  0
 .../tests/{SiblingPackage => f.g}/setup.py    |  2 +-
 .../tests/{FooPackage => foo}/foo/__init__.py |  0
 .../{FooPackage => foo}/foo/configure.zcml    |  0
 .../tests/{FooPackage => foo}/setup.py        |  2 +-
 src/z3c/autoinclude/tests/tests.py            | 10 +++----
 .../tests/{XYZPackage => x.y.z}/setup.py      |  2 +-
 .../{XYZPackage/x/y => x.y.z/x}/__init__.py   |  0
 .../base2 => x.y.z/x/y}/__init__.py           |  0
 .../{XYZPackage => x.y.z}/x/y/z/__init__.py   |  0
 src/z3c/autoinclude/utils.py                  | 29 ++++++++++++++-----
 src/z3c/autoinclude/utils.txt                 | 13 ++-------
 31 files changed, 52 insertions(+), 48 deletions(-)
 rename src/z3c/autoinclude/tests/{APackage => A}/a/__init__.py (100%)
 rename src/z3c/autoinclude/tests/{APackage => A}/a/configure.zcml (100%)
 rename src/z3c/autoinclude/tests/{APackage => A}/setup.py (93%)
 rename src/z3c/autoinclude/tests/{BCPackage => b.c}/b/__init__.py (100%)
 rename src/z3c/autoinclude/tests/{BCPackage => b.c}/b/c/__init__.py (100%)
 rename src/z3c/autoinclude/tests/{BCPackage => b.c}/b/c/configure.zcml (87%)
 rename src/z3c/autoinclude/tests/{BCPackage => b.c}/setup.py (93%)
 rename src/z3c/autoinclude/tests/{SiblingPackage/F => base2.plug/base2}/__init__.py (100%)
 rename src/z3c/autoinclude/tests/{base2_plug => base2.plug}/base2/plug/__init__.py (100%)
 rename src/z3c/autoinclude/tests/{base2_plug => base2.plug}/base2/plug/configure.zcml (100%)
 rename src/z3c/autoinclude/tests/{base2_plug => base2.plug}/setup.py (96%)
 rename src/z3c/autoinclude/tests/{SiblingPackage => f.g}/F/G/__init__.py (100%)
 rename src/z3c/autoinclude/tests/{SiblingPackage => f.g}/F/G/meta.zcml (100%)
 rename src/z3c/autoinclude/tests/{SiblingPackage => f.g}/F/H/__init__.py (100%)
 rename src/z3c/autoinclude/tests/{SiblingPackage => f.g}/F/H/configure.zcml (100%)
 rename src/z3c/autoinclude/tests/{SiblingPackage => f.g}/F/H/meta.zcml (100%)
 rename src/z3c/autoinclude/tests/{XYZPackage/x => f.g/F}/__init__.py (100%)
 rename src/z3c/autoinclude/tests/{SiblingPackage => f.g}/setup.py (96%)
 rename src/z3c/autoinclude/tests/{FooPackage => foo}/foo/__init__.py (100%)
 rename src/z3c/autoinclude/tests/{FooPackage => foo}/foo/configure.zcml (100%)
 rename src/z3c/autoinclude/tests/{FooPackage => foo}/setup.py (96%)
 rename src/z3c/autoinclude/tests/{XYZPackage => x.y.z}/setup.py (96%)
 rename src/z3c/autoinclude/tests/{XYZPackage/x/y => x.y.z/x}/__init__.py (100%)
 rename src/z3c/autoinclude/tests/{base2_plug/base2 => x.y.z/x/y}/__init__.py (100%)
 rename src/z3c/autoinclude/tests/{XYZPackage => x.y.z}/x/y/z/__init__.py (100%)

diff --git a/CHANGES.rst b/CHANGES.rst
index 0aa1cc8..ad64a3e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,7 +4,9 @@ Changes
 0.3.7 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Add support for pip installed packages. This removes support
+  for packages those names are different to the package paths
+  they provide.
 
 
 0.3.6 (2016-01-29)
diff --git a/src/z3c/autoinclude/dependency.txt b/src/z3c/autoinclude/dependency.txt
index 114c305..9232db5 100644
--- a/src/z3c/autoinclude/dependency.txt
+++ b/src/z3c/autoinclude/dependency.txt
@@ -8,8 +8,8 @@ zcml from all dependencies of a project.
 We have created a test environment to simulate setuptools
 dependencies.
 
-``APackage`` depends on ``BCPackage``
-``BCPackage`` depends on ``SiblingPackage``
+``APackage`` depends on ``b.c``
+``b.c`` depends on ``SiblingPackage``
 
 Given the distribution for the project named ``APackage``, we can ask
 for the requirements of that distribution::
@@ -20,8 +20,8 @@ for the requirements of that distribution::
 
     >>> reqs = a_dist.requires()
     >>> pprint(sorted(reqs, key=lambda r:r.project_name))
-    [Requirement.parse('BCPackage'),
-     Requirement.parse('TestDirective'),
+    [Requirement.parse('TestDirective'),
+     Requirement.parse('b.c'),
      Requirement.parse('z3c.autoinclude')]
 
 We can turn this requirement into a distribution::
@@ -109,15 +109,15 @@ both dotted names::
     ...                                         'meta.zcml']))
     {'configure.zcml': ['F.H'], 'meta.zcml': ['testdirective', 'F.G', 'F.H']}
 
-``APackage`` depends on ``BCPackage``, which depends on
-``SiblingPackage``. ``APackage`` and ``BCPackage`` both contain the
+``APackage`` depends on ``b.c``, which depends on
+``SiblingPackage``. ``APackage`` and ``b.c`` both contain the
 autoinclude directive, which will automatically include any meta.zcml
 and configure.zcml files (in that order) that their dependencies
 contain. These dependencies' zcml actually contain a test directive
 that will append a logging message to a global variable in
 testdirective.zcml. So let's trigger the loading of the configure.zcml
-in ``APackage`` and see whether its ``BCPackage`` dependency, and
-``BCPackage``'s dependencies, were indeed loaded and in the correct
+in ``APackage`` and see whether its ``b.c`` dependency, and
+``b.c``'s dependencies, were indeed loaded and in the correct
 order::
 
     >>> from pkg_resources import resource_filename
@@ -127,9 +127,7 @@ order::
     ...                        package=a)
     >>> from testdirective.zcml import test_log
     >>> pprint(test_log)
-    [u'f.g meta has been loaded',
-     u'f.h has been loaded',
-     u'BCPackage has been loaded']
+    [u'f.g meta has been loaded', u'f.h has been loaded', u'b.c has been loaded']
 
 There is also a directive for including overrides, which calls
 ``autoIncludeOverridesDirective``; however, I have no idea how to test
@@ -139,14 +137,14 @@ Finally, there is a convenience API for finding the files we need to
 include from the requirements of a given package::
 
     >>> from z3c.autoinclude import package_includes
-    >>> pprint(package_includes('BCPackage'))
+    >>> pprint(package_includes('b.c'))
     {'configure.zcml': ['F.H'],
      'meta.zcml': ['testdirective', 'F.G', 'F.H'],
      'overrides.zcml': []}
 
 As with ``includableInfo``, we can also supply a list of ZCML filenames to search for::
 
-    >>> pprint(package_includes('BCPackage', ['configure.zcml', 'silly.zcml']))
+    >>> pprint(package_includes('b.c', ['configure.zcml', 'silly.zcml']))
     {'configure.zcml': ['F.H'], 'silly.zcml': []}
 
 Note that it will not catch DistributionNotFound errors::
diff --git a/src/z3c/autoinclude/plugin.txt b/src/z3c/autoinclude/plugin.txt
index 104cd94..916b431 100644
--- a/src/z3c/autoinclude/plugin.txt
+++ b/src/z3c/autoinclude/plugin.txt
@@ -16,7 +16,7 @@ themselves as plugging into that module via entry points::
 
     >>> from z3c.autoinclude.plugin import find_plugins
     >>> sorted(find_plugins('basepackage')) # doctest: +IGNORECASE
-    [FooPackage 0.0 (...), TestDirective 0.0 (...)]
+    [foo 0.0 (...), TestDirective 0.0 (...)]
 
 Armed with a valid module name we can find the ZCML files within it
 which must be loaded::
diff --git a/src/z3c/autoinclude/tests/APackage/a/__init__.py b/src/z3c/autoinclude/tests/A/a/__init__.py
similarity index 100%
rename from src/z3c/autoinclude/tests/APackage/a/__init__.py
rename to src/z3c/autoinclude/tests/A/a/__init__.py
diff --git a/src/z3c/autoinclude/tests/APackage/a/configure.zcml b/src/z3c/autoinclude/tests/A/a/configure.zcml
similarity index 100%
rename from src/z3c/autoinclude/tests/APackage/a/configure.zcml
rename to src/z3c/autoinclude/tests/A/a/configure.zcml
diff --git a/src/z3c/autoinclude/tests/APackage/setup.py b/src/z3c/autoinclude/tests/A/setup.py
similarity index 93%
rename from src/z3c/autoinclude/tests/APackage/setup.py
rename to src/z3c/autoinclude/tests/A/setup.py
index 8e71c6e..7efeac0 100644
--- a/src/z3c/autoinclude/tests/APackage/setup.py
+++ b/src/z3c/autoinclude/tests/A/setup.py
@@ -3,7 +3,7 @@
 
 version = '0.0'
 
-setup(name='APackage',
+setup(name='A',
       version=version,
       description="",
       long_description="""\
@@ -19,7 +19,7 @@
       include_package_data=True,
       zip_safe=False,
       install_requires=[
-        'BCPackage',
+        'b.c',
 	'z3c.autoinclude',
 	'TestDirective',
       ],
diff --git a/src/z3c/autoinclude/tests/BCPackage/b/__init__.py b/src/z3c/autoinclude/tests/b.c/b/__init__.py
similarity index 100%
rename from src/z3c/autoinclude/tests/BCPackage/b/__init__.py
rename to src/z3c/autoinclude/tests/b.c/b/__init__.py
diff --git a/src/z3c/autoinclude/tests/BCPackage/b/c/__init__.py b/src/z3c/autoinclude/tests/b.c/b/c/__init__.py
similarity index 100%
rename from src/z3c/autoinclude/tests/BCPackage/b/c/__init__.py
rename to src/z3c/autoinclude/tests/b.c/b/c/__init__.py
diff --git a/src/z3c/autoinclude/tests/BCPackage/b/c/configure.zcml b/src/z3c/autoinclude/tests/b.c/b/c/configure.zcml
similarity index 87%
rename from src/z3c/autoinclude/tests/BCPackage/b/c/configure.zcml
rename to src/z3c/autoinclude/tests/b.c/b/c/configure.zcml
index 5b0c0d5..0d6af4e 100644
--- a/src/z3c/autoinclude/tests/BCPackage/b/c/configure.zcml
+++ b/src/z3c/autoinclude/tests/b.c/b/c/configure.zcml
@@ -1,7 +1,7 @@
 <configure xmlns="http://namespaces.zope.org/zope">
   <include package="z3c.autoinclude" file="meta.zcml" />
   <includeDependencies package="." />
-  <test test_string="BCPackage has been loaded" />
+  <test test_string="b.c has been loaded" />
   <!-- BCPackage is autoincluded.
   This means that SiblingPackage and TestDirective will be included, in no particular order.
   TestDirective has a meta.zcml.
diff --git a/src/z3c/autoinclude/tests/BCPackage/setup.py b/src/z3c/autoinclude/tests/b.c/setup.py
similarity index 93%
rename from src/z3c/autoinclude/tests/BCPackage/setup.py
rename to src/z3c/autoinclude/tests/b.c/setup.py
index c22bcd5..4f2aecc 100644
--- a/src/z3c/autoinclude/tests/BCPackage/setup.py
+++ b/src/z3c/autoinclude/tests/b.c/setup.py
@@ -2,7 +2,7 @@
 
 version = '0.1'
 
-setup(name='BCPackage',
+setup(name='b.c',
       version=version,
       description="",
       long_description="""\
@@ -23,7 +23,7 @@
       install_requires=[
           'setuptools',
 	  'TestDirective',
-	  'SiblingPackage',
+	  'f.g',
           # -*- Extra requirements: -*-
       ],
       entry_points="""
diff --git a/src/z3c/autoinclude/tests/SiblingPackage/F/__init__.py b/src/z3c/autoinclude/tests/base2.plug/base2/__init__.py
similarity index 100%
rename from src/z3c/autoinclude/tests/SiblingPackage/F/__init__.py
rename to src/z3c/autoinclude/tests/base2.plug/base2/__init__.py
diff --git a/src/z3c/autoinclude/tests/base2_plug/base2/plug/__init__.py b/src/z3c/autoinclude/tests/base2.plug/base2/plug/__init__.py
similarity index 100%
rename from src/z3c/autoinclude/tests/base2_plug/base2/plug/__init__.py
rename to src/z3c/autoinclude/tests/base2.plug/base2/plug/__init__.py
diff --git a/src/z3c/autoinclude/tests/base2_plug/base2/plug/configure.zcml b/src/z3c/autoinclude/tests/base2.plug/base2/plug/configure.zcml
similarity index 100%
rename from src/z3c/autoinclude/tests/base2_plug/base2/plug/configure.zcml
rename to src/z3c/autoinclude/tests/base2.plug/base2/plug/configure.zcml
diff --git a/src/z3c/autoinclude/tests/base2_plug/setup.py b/src/z3c/autoinclude/tests/base2.plug/setup.py
similarity index 96%
rename from src/z3c/autoinclude/tests/base2_plug/setup.py
rename to src/z3c/autoinclude/tests/base2.plug/setup.py
index a673052..f476fdc 100644
--- a/src/z3c/autoinclude/tests/base2_plug/setup.py
+++ b/src/z3c/autoinclude/tests/base2.plug/setup.py
@@ -3,7 +3,7 @@
 
 version = '0.0'
 
-setup(name='base2_plug',
+setup(name='base2.plug',
       version=version,
       description="",
       long_description="""\
diff --git a/src/z3c/autoinclude/tests/SiblingPackage/F/G/__init__.py b/src/z3c/autoinclude/tests/f.g/F/G/__init__.py
similarity index 100%
rename from src/z3c/autoinclude/tests/SiblingPackage/F/G/__init__.py
rename to src/z3c/autoinclude/tests/f.g/F/G/__init__.py
diff --git a/src/z3c/autoinclude/tests/SiblingPackage/F/G/meta.zcml b/src/z3c/autoinclude/tests/f.g/F/G/meta.zcml
similarity index 100%
rename from src/z3c/autoinclude/tests/SiblingPackage/F/G/meta.zcml
rename to src/z3c/autoinclude/tests/f.g/F/G/meta.zcml
diff --git a/src/z3c/autoinclude/tests/SiblingPackage/F/H/__init__.py b/src/z3c/autoinclude/tests/f.g/F/H/__init__.py
similarity index 100%
rename from src/z3c/autoinclude/tests/SiblingPackage/F/H/__init__.py
rename to src/z3c/autoinclude/tests/f.g/F/H/__init__.py
diff --git a/src/z3c/autoinclude/tests/SiblingPackage/F/H/configure.zcml b/src/z3c/autoinclude/tests/f.g/F/H/configure.zcml
similarity index 100%
rename from src/z3c/autoinclude/tests/SiblingPackage/F/H/configure.zcml
rename to src/z3c/autoinclude/tests/f.g/F/H/configure.zcml
diff --git a/src/z3c/autoinclude/tests/SiblingPackage/F/H/meta.zcml b/src/z3c/autoinclude/tests/f.g/F/H/meta.zcml
similarity index 100%
rename from src/z3c/autoinclude/tests/SiblingPackage/F/H/meta.zcml
rename to src/z3c/autoinclude/tests/f.g/F/H/meta.zcml
diff --git a/src/z3c/autoinclude/tests/XYZPackage/x/__init__.py b/src/z3c/autoinclude/tests/f.g/F/__init__.py
similarity index 100%
rename from src/z3c/autoinclude/tests/XYZPackage/x/__init__.py
rename to src/z3c/autoinclude/tests/f.g/F/__init__.py
diff --git a/src/z3c/autoinclude/tests/SiblingPackage/setup.py b/src/z3c/autoinclude/tests/f.g/setup.py
similarity index 96%
rename from src/z3c/autoinclude/tests/SiblingPackage/setup.py
rename to src/z3c/autoinclude/tests/f.g/setup.py
index e6f5be6..afacec7 100644
--- a/src/z3c/autoinclude/tests/SiblingPackage/setup.py
+++ b/src/z3c/autoinclude/tests/f.g/setup.py
@@ -2,7 +2,7 @@
 
 version = '0.0'
 
-setup(name='SiblingPackage',
+setup(name='f.g',
       version=version,
       description="",
       long_description="""\
diff --git a/src/z3c/autoinclude/tests/FooPackage/foo/__init__.py b/src/z3c/autoinclude/tests/foo/foo/__init__.py
similarity index 100%
rename from src/z3c/autoinclude/tests/FooPackage/foo/__init__.py
rename to src/z3c/autoinclude/tests/foo/foo/__init__.py
diff --git a/src/z3c/autoinclude/tests/FooPackage/foo/configure.zcml b/src/z3c/autoinclude/tests/foo/foo/configure.zcml
similarity index 100%
rename from src/z3c/autoinclude/tests/FooPackage/foo/configure.zcml
rename to src/z3c/autoinclude/tests/foo/foo/configure.zcml
diff --git a/src/z3c/autoinclude/tests/FooPackage/setup.py b/src/z3c/autoinclude/tests/foo/setup.py
similarity index 96%
rename from src/z3c/autoinclude/tests/FooPackage/setup.py
rename to src/z3c/autoinclude/tests/foo/setup.py
index 0dbfd8a..043e9cf 100644
--- a/src/z3c/autoinclude/tests/FooPackage/setup.py
+++ b/src/z3c/autoinclude/tests/foo/setup.py
@@ -3,7 +3,7 @@
 
 version = '0.0'
 
-setup(name='FooPackage',
+setup(name='foo',
       version=version,
       description="",
       long_description="""\
diff --git a/src/z3c/autoinclude/tests/tests.py b/src/z3c/autoinclude/tests/tests.py
index 97f2465..a65b90c 100644
--- a/src/z3c/autoinclude/tests/tests.py
+++ b/src/z3c/autoinclude/tests/tests.py
@@ -5,13 +5,13 @@
 from zc.buildout import testing
 
 projects_dir = os.path.dirname(__file__)
-    
+
 # this is the list of test packages that we'll temporarily install
 # for the duration of the tests; you MUST add your test package name
 # to this list if you want it to be available for import in doctests!
-test_packages = ['APackage', 'BCPackage', 'XYZPackage',
-                 'SiblingPackage', 'BasePackage', 'FooPackage',
-                 'base2', 'base2_plug', 'TestDirective',
+test_packages = ['A', 'b.c', 'x.y.z',
+                 'f.g', 'BasePackage', 'foo',
+                 'base2', 'base2.plug', 'TestDirective',
                  'enolp.ppa.foo', 'enolp.ppa.bar']
 
 
@@ -52,7 +52,7 @@ def testSetUp(test):
     install test packages so that they can be imported
     and their egg info examined in test runs
     """
-    
+
     testing.buildoutSetUp(test)
     import tempfile
     target_dir = tempfile.mkdtemp('.z3c.autoinclude.test-installs')
diff --git a/src/z3c/autoinclude/tests/XYZPackage/setup.py b/src/z3c/autoinclude/tests/x.y.z/setup.py
similarity index 96%
rename from src/z3c/autoinclude/tests/XYZPackage/setup.py
rename to src/z3c/autoinclude/tests/x.y.z/setup.py
index 5d62dc2..30b7e6b 100644
--- a/src/z3c/autoinclude/tests/XYZPackage/setup.py
+++ b/src/z3c/autoinclude/tests/x.y.z/setup.py
@@ -2,7 +2,7 @@
 
 version = '0.1'
 
-setup(name='XYZPackage',
+setup(name='x.y.z',
       version=version,
       description="",
       long_description="""\
diff --git a/src/z3c/autoinclude/tests/XYZPackage/x/y/__init__.py b/src/z3c/autoinclude/tests/x.y.z/x/__init__.py
similarity index 100%
rename from src/z3c/autoinclude/tests/XYZPackage/x/y/__init__.py
rename to src/z3c/autoinclude/tests/x.y.z/x/__init__.py
diff --git a/src/z3c/autoinclude/tests/base2_plug/base2/__init__.py b/src/z3c/autoinclude/tests/x.y.z/x/y/__init__.py
similarity index 100%
rename from src/z3c/autoinclude/tests/base2_plug/base2/__init__.py
rename to src/z3c/autoinclude/tests/x.y.z/x/y/__init__.py
diff --git a/src/z3c/autoinclude/tests/XYZPackage/x/y/z/__init__.py b/src/z3c/autoinclude/tests/x.y.z/x/y/z/__init__.py
similarity index 100%
rename from src/z3c/autoinclude/tests/XYZPackage/x/y/z/__init__.py
rename to src/z3c/autoinclude/tests/x.y.z/x/y/z/__init__.py
diff --git a/src/z3c/autoinclude/utils.py b/src/z3c/autoinclude/utils.py
index e6869dd..a5dc56a 100644
--- a/src/z3c/autoinclude/utils.py
+++ b/src/z3c/autoinclude/utils.py
@@ -39,7 +39,7 @@ def __init__(self, zcml_to_look_for):
         for zcml_group in zcml_to_look_for:
             self[zcml_group] = []
 
-    
+
 def subpackageDottedNames(package_path, ns_dottedname=None):
     # we do not look for subpackages in zipped eggs
     if not isUnzippedEgg(package_path):
@@ -79,17 +79,24 @@ def distributionForDottedName(package_dottedname):
         for dist in dists:
             if not isUnzippedEgg(dist.location):
                 continue
-            packages = find_packages(dist.location)
             ns_packages = namespaceDottedNames(dist)
+            packages = find_packages(dist.location)
             #if package_dottedname in ns_packages:
                 #continue
             if package_dottedname not in packages:
                 continue
+            if dist.key.lower() != package_dottedname.lower():
+                if not dist.key.lower().startswith(package_dottedname.lower()):
+                    continue
+                # make sure that the dottedname bla.blubb
+                # matches bla.blubb.xx but not bla.blubber
+                if dist.key[len(package_dottedname)] != '.':
+                    continue
             valid_dists_for_package.append((dist, ns_packages))
 
     if len(valid_dists_for_package) == 0:
         raise LookupError("No distributions found for package `%s`; are you sure it is importable?" % package_dottedname)
-    
+
     if len(valid_dists_for_package) > 1:
         non_namespaced_dists = filter(lambda x: len(x[1]) is 0, valid_dists_for_package)
         if len(non_namespaced_dists) == 0:
@@ -126,7 +133,7 @@ def namespaceDottedNames(dist):
     except KeyError:
         ns_dottednames = []
     return ns_dottednames
-    
+
 def isUnzippedEgg(path):
     """
     Check whether a filesystem path points to an unzipped egg; z3c.autoinclude
@@ -136,6 +143,7 @@ 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
@@ -151,17 +159,22 @@ def find_packages(where='.', exclude=()):
     names, such that 'foo.*' will exclude all subpackages of 'foo' (but not
     'foo' itself).
     """
+    original_where = where
+    if where in CACHE:
+        return CACHE[where]
     out = []
     stack=[(convert_path(where), '')]
     while stack:
         where,prefix = stack.pop(0)
+        os.listdir(where)
         for name in os.listdir(where):
             fn = os.path.join(where,name)
-            if ('.' not in name and os.path.isdir(fn) and
-                os.path.isfile(os.path.join(fn,'__init__.py'))
-            ):
-                out.append(prefix+name); stack.append((fn,prefix+name+'.'))
+            if ('.' not in name and os.path.isdir(fn)):
+                stack.append((fn, prefix+name+'.'))
+                if os.path.isfile(os.path.join(fn, '__init__.py')):
+                    out.append(prefix+name)
     for pat in list(exclude)+['ez_setup']:
         from fnmatch import fnmatchcase
         out = [item for item in out if not fnmatchcase(item,pat)]
+    CACHE[original_where] = out
     return out
diff --git a/src/z3c/autoinclude/utils.txt b/src/z3c/autoinclude/utils.txt
index c1b24f2..8777669 100644
--- a/src/z3c/autoinclude/utils.txt
+++ b/src/z3c/autoinclude/utils.txt
@@ -20,7 +20,7 @@ package in the environment::
 
     >>> import base2.plug
     >>> distributionForPackage(base2.plug)
-    base2-plug 0.0 (...base2_plug-0.0...egg)
+    base2.plug 0.0 (...base2.plug-0.0...egg)
 
 If you have a virtual package (a namespace package that exists only
 by having been extended by nested packages) it should find a package::
@@ -30,18 +30,9 @@ by having been extended by nested packages) it should find a package::
     enolp.ppa.foo 0.1 (...enolp.ppa.foo-0.1...egg)
 
 While we're at it, it should also find the correct distribution for
-packages whose distribution name has no bearing on the name of the
-package contained within it::
+packages that have mixed cases::
 
     >>> import basepackage
     >>> # Ignoring whitespace in order to make tests pass on Windows.
     >>> distributionForPackage(basepackage) # doctest: +IGNORECASE
     BasePackage 0.0 (...BasePackage-0.0...egg)
-
-    >>> import foo
-    >>> distributionForPackage(foo) # doctest: +IGNORECASE
-    FooPackage 0.0 (...FooPackage-0.0...egg)
-
-    >>> import F.G
-    >>> distributionForPackage(F.G) # doctest: +IGNORECASE
-    SiblingPackage 0.0 (...SiblingPackage-0.0...egg)

From 1a7e5d84b6048abe50a20d9e2bb0f7a3d2229c8e Mon Sep 17 00:00:00 2001
From: Patrick Gerken <patrick.gerken@zumtobelgroup.com>
Date: Fri, 25 Mar 2016 19:15:59 +0100
Subject: [PATCH 2/3] Always prefer full matches

---
 src/z3c/autoinclude/utils.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/z3c/autoinclude/utils.py b/src/z3c/autoinclude/utils.py
index a5dc56a..2e9627c 100644
--- a/src/z3c/autoinclude/utils.py
+++ b/src/z3c/autoinclude/utils.py
@@ -74,6 +74,8 @@ def distributionForDottedName(package_dottedname):
     Then it needs to be profiled.
     """
     valid_dists_for_package = []
+    partial_matches = []
+    full_matches = []
     for path in sys.path:
         dists = find_distributions(path, True)
         for dist in dists:
@@ -85,14 +87,18 @@ def distributionForDottedName(package_dottedname):
                 #continue
             if package_dottedname not in packages:
                 continue
-            if dist.key.lower() != package_dottedname.lower():
+            if dist.key.lower() == package_dottedname.lower():
+                full_matches.append((dist, ns_packages))
+            else:
                 if not dist.key.lower().startswith(package_dottedname.lower()):
                     continue
                 # make sure that the dottedname bla.blubb
                 # matches bla.blubb.xx but not bla.blubber
                 if dist.key[len(package_dottedname)] != '.':
                     continue
-            valid_dists_for_package.append((dist, ns_packages))
+                partial_matches.append((dist, ns_packages))
+
+    valid_dists_for_package = full_matches + partial_matches
 
     if len(valid_dists_for_package) == 0:
         raise LookupError("No distributions found for package `%s`; are you sure it is importable?" % package_dottedname)

From 2018b6eae6c3ec3a5968b56167753f388710b8ac Mon Sep 17 00:00:00 2001
From: Patrick Gerken <patrick.gerken@zumtobelgroup.com>
Date: Fri, 25 Mar 2016 19:19:18 +0100
Subject: [PATCH 3/3] Stable results for matches

---
 src/z3c/autoinclude/utils.py  | 2 +-
 src/z3c/autoinclude/utils.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/z3c/autoinclude/utils.py b/src/z3c/autoinclude/utils.py
index 2e9627c..7a260b1 100644
--- a/src/z3c/autoinclude/utils.py
+++ b/src/z3c/autoinclude/utils.py
@@ -98,7 +98,7 @@ def distributionForDottedName(package_dottedname):
                     continue
                 partial_matches.append((dist, ns_packages))
 
-    valid_dists_for_package = full_matches + partial_matches
+    valid_dists_for_package = full_matches + sorted(partial_matches)
 
     if len(valid_dists_for_package) == 0:
         raise LookupError("No distributions found for package `%s`; are you sure it is importable?" % package_dottedname)
diff --git a/src/z3c/autoinclude/utils.txt b/src/z3c/autoinclude/utils.txt
index 8777669..c3de5a4 100644
--- a/src/z3c/autoinclude/utils.txt
+++ b/src/z3c/autoinclude/utils.txt
@@ -27,7 +27,7 @@ by having been extended by nested packages) it should find a package::
 
     >>> import enolp
     >>> distributionForPackage(enolp)
-    enolp.ppa.foo 0.1 (...enolp.ppa.foo-0.1...egg)
+    enolp.ppa.bar 0.1 (...enolp.ppa.bar-0.1...egg)
 
 While we're at it, it should also find the correct distribution for
 packages that have mixed cases::