[Checkins] SVN: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/ courtesy of slinkp: a failing test for the broken situation where the plugin package is a namespace package in the same namespace as the base package (that is, foo.bar plugs into foo)

Ethan Jucovy ejucovy at openplans.org
Thu Apr 17 14:34:41 EDT 2008


Log message for revision 85461:
  courtesy of slinkp: a failing test for the broken situation where the plugin package is a namespace package in the same namespace as the base package (that is, foo.bar plugs into foo)

Changed:
  U   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/README.txt
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2/
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2/__init__.py
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2/configure.zcml
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2.egg-info/
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2.egg-info/PKG-INFO
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2.egg-info/SOURCES.txt
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2.egg-info/dependency_links.txt
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2.egg-info/entry_points.txt
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2.egg-info/not-zip-safe
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2.egg-info/requires.txt
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2.egg-info/top_level.txt
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/build/
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/build/lib/
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/build/lib/base2/
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/build/lib/base2/__init__.py
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/build/lib/base2/configure.zcml
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/setup.py
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2/
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2/__init__.py
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2/plug/
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2/plug/__init__.py
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2/plug/configure.zcml
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/PKG-INFO
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/SOURCES.txt
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/dependency_links.txt
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/entry_points.txt
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/namespace_packages.txt
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/not-zip-safe
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/requires.txt
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/top_level.txt
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/build/
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/build/lib/
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/build/lib/base2/
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/build/lib/base2/__init__.py
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/build/lib/base2/plug/
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/build/lib/base2/plug/__init__.py
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/build/lib/base2/plug/configure.zcml
  A   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/setup.py
  U   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/utils.py

-=-
Modified: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/README.txt
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/README.txt	2008-04-17 18:16:43 UTC (rev 85460)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/README.txt	2008-04-17 18:34:40 UTC (rev 85461)
@@ -230,7 +230,8 @@
 
 So, once again, we must first set up our testing infrastructure::
 
-    >>> ws = install_projects(['BasePackage', 'FooPackage', 'TestDirective'],
+    >>> ws = install_projects(['BasePackage', 'FooPackage', 'TestDirective',
+    ...                        'base2', 'base2_plug'],
     ...                       target_dir)
     >>> for dist in ws:
     ...   dist.activate()
@@ -297,3 +298,13 @@
     ...                        package=basepackage)
     >>> pprint(test_log)
     [u'foo has been loaded']
+
+
+``base2`` is a namespace package. ``base2.plug`` is a package that
+defines a plugin for base2.
+
+    >>> import base2
+    >>> dummy = xmlconfig.file(resource_filename('base2', 'configure.zcml'),
+    ...                        package=base2)
+    >>> pprint(test_log)
+    [u'base2.plug has been loaded']

Added: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2/__init__.py
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2/__init__.py	                        (rev 0)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2/__init__.py	2008-04-17 18:34:40 UTC (rev 85461)
@@ -0,0 +1 @@
+# a package

Added: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2/configure.zcml
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2/configure.zcml	                        (rev 0)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2/configure.zcml	2008-04-17 18:34:40 UTC (rev 85461)
@@ -0,0 +1,4 @@
+<configure xmlns="http://namespaces.zope.org/zope">
+  <include package="z3c.autoinclude" file="meta.zcml" />
+  <includePlugins package="." />
+</configure>

Added: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2.egg-info/PKG-INFO
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2.egg-info/PKG-INFO	                        (rev 0)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2.egg-info/PKG-INFO	2008-04-17 18:34:40 UTC (rev 85461)
@@ -0,0 +1,10 @@
+Metadata-Version: 1.0
+Name: base2
+Version: 0.0
+Summary: UNKNOWN
+Home-page: UNKNOWN
+Author: UNKNOWN
+Author-email: UNKNOWN
+License: UNKNOWN
+Description: UNKNOWN
+Platform: UNKNOWN

Added: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2.egg-info/SOURCES.txt
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2.egg-info/SOURCES.txt	                        (rev 0)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2.egg-info/SOURCES.txt	2008-04-17 18:34:40 UTC (rev 85461)
@@ -0,0 +1,10 @@
+setup.py
+base2/__init__.py
+base2/configure.zcml
+base2.egg-info/PKG-INFO
+base2.egg-info/SOURCES.txt
+base2.egg-info/dependency_links.txt
+base2.egg-info/entry_points.txt
+base2.egg-info/not-zip-safe
+base2.egg-info/requires.txt
+base2.egg-info/top_level.txt
\ No newline at end of file

Added: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2.egg-info/dependency_links.txt
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2.egg-info/dependency_links.txt	                        (rev 0)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2.egg-info/dependency_links.txt	2008-04-17 18:34:40 UTC (rev 85461)
@@ -0,0 +1 @@
+

Added: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2.egg-info/entry_points.txt
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2.egg-info/entry_points.txt	                        (rev 0)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2.egg-info/entry_points.txt	2008-04-17 18:34:40 UTC (rev 85461)
@@ -0,0 +1,3 @@
+
+      # -*- Entry points: -*-
+      
\ No newline at end of file

Added: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2.egg-info/not-zip-safe
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2.egg-info/not-zip-safe	                        (rev 0)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2.egg-info/not-zip-safe	2008-04-17 18:34:40 UTC (rev 85461)
@@ -0,0 +1 @@
+

Added: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2.egg-info/requires.txt
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2.egg-info/requires.txt	                        (rev 0)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2.egg-info/requires.txt	2008-04-17 18:34:40 UTC (rev 85461)
@@ -0,0 +1 @@
+z3c.autoinclude
\ No newline at end of file

Added: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2.egg-info/top_level.txt
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2.egg-info/top_level.txt	                        (rev 0)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/base2.egg-info/top_level.txt	2008-04-17 18:34:40 UTC (rev 85461)
@@ -0,0 +1 @@
+base2

Added: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/build/lib/base2/__init__.py
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/build/lib/base2/__init__.py	                        (rev 0)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/build/lib/base2/__init__.py	2008-04-17 18:34:40 UTC (rev 85461)
@@ -0,0 +1 @@
+# a package

Added: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/build/lib/base2/configure.zcml
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/build/lib/base2/configure.zcml	                        (rev 0)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/build/lib/base2/configure.zcml	2008-04-17 18:34:40 UTC (rev 85461)
@@ -0,0 +1,4 @@
+<configure xmlns="http://namespaces.zope.org/zope">
+  <include package="z3c.autoinclude" file="meta.zcml" />
+  <includePlugins package="." />
+</configure>

Added: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/setup.py
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/setup.py	                        (rev 0)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2/setup.py	2008-04-17 18:34:40 UTC (rev 85461)
@@ -0,0 +1,27 @@
+from setuptools import setup, find_packages
+import sys, os
+
+version = '0.0'
+
+setup(name='base2',
+      version=version,
+      description="",
+      long_description="""\
+""",
+      classifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
+      keywords='',
+      author='',
+      author_email='',
+      url='',
+      license='',
+      package_data = {'': ['*.zcml',]},
+      packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
+      include_package_data=True,
+      zip_safe=False,
+      install_requires=[
+	'z3c.autoinclude',
+      ],
+      entry_points="""
+      # -*- Entry points: -*-
+      """,
+      )

Added: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2/__init__.py
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2/__init__.py	                        (rev 0)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2/__init__.py	2008-04-17 18:34:40 UTC (rev 85461)
@@ -0,0 +1,6 @@
+# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
+try:
+    __import__('pkg_resources').declare_namespace(__name__)
+except ImportError:
+    from pkgutil import extend_path
+    __path__ = extend_path(__path__, __name__)

Added: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2/plug/__init__.py
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2/plug/__init__.py	                        (rev 0)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2/plug/__init__.py	2008-04-17 18:34:40 UTC (rev 85461)
@@ -0,0 +1 @@
+# a package

Added: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2/plug/configure.zcml
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2/plug/configure.zcml	                        (rev 0)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2/plug/configure.zcml	2008-04-17 18:34:40 UTC (rev 85461)
@@ -0,0 +1,3 @@
+<configure xmlns="http://namespaces.zope.org/zope">
+  <test test_string="base2.plug has been loaded" />
+</configure>

Added: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/PKG-INFO
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/PKG-INFO	                        (rev 0)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/PKG-INFO	2008-04-17 18:34:40 UTC (rev 85461)
@@ -0,0 +1,10 @@
+Metadata-Version: 1.0
+Name: base2-plug
+Version: 0.0
+Summary: UNKNOWN
+Home-page: UNKNOWN
+Author: UNKNOWN
+Author-email: UNKNOWN
+License: UNKNOWN
+Description: UNKNOWN
+Platform: UNKNOWN

Added: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/SOURCES.txt
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/SOURCES.txt	                        (rev 0)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/SOURCES.txt	2008-04-17 18:34:40 UTC (rev 85461)
@@ -0,0 +1,12 @@
+setup.py
+base2/__init__.py
+base2/plug/__init__.py
+base2/plug/configure.zcml
+base2_plug.egg-info/PKG-INFO
+base2_plug.egg-info/SOURCES.txt
+base2_plug.egg-info/dependency_links.txt
+base2_plug.egg-info/entry_points.txt
+base2_plug.egg-info/namespace_packages.txt
+base2_plug.egg-info/not-zip-safe
+base2_plug.egg-info/requires.txt
+base2_plug.egg-info/top_level.txt
\ No newline at end of file

Added: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/dependency_links.txt
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/dependency_links.txt	                        (rev 0)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/dependency_links.txt	2008-04-17 18:34:40 UTC (rev 85461)
@@ -0,0 +1 @@
+

Added: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/entry_points.txt
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/entry_points.txt	                        (rev 0)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/entry_points.txt	2008-04-17 18:34:40 UTC (rev 85461)
@@ -0,0 +1,3 @@
+
+      # -*- Entry points: -*-
+      
\ No newline at end of file

Added: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/namespace_packages.txt
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/namespace_packages.txt	                        (rev 0)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/namespace_packages.txt	2008-04-17 18:34:40 UTC (rev 85461)
@@ -0,0 +1 @@
+base2

Added: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/not-zip-safe
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/not-zip-safe	                        (rev 0)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/not-zip-safe	2008-04-17 18:34:40 UTC (rev 85461)
@@ -0,0 +1 @@
+

Added: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/requires.txt
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/requires.txt	                        (rev 0)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/requires.txt	2008-04-17 18:34:40 UTC (rev 85461)
@@ -0,0 +1,2 @@
+setuptools
+TestDirective
\ No newline at end of file

Added: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/top_level.txt
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/top_level.txt	                        (rev 0)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/base2_plug.egg-info/top_level.txt	2008-04-17 18:34:40 UTC (rev 85461)
@@ -0,0 +1 @@
+base2

Added: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/build/lib/base2/__init__.py
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/build/lib/base2/__init__.py	                        (rev 0)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/build/lib/base2/__init__.py	2008-04-17 18:34:40 UTC (rev 85461)
@@ -0,0 +1,6 @@
+# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
+try:
+    __import__('pkg_resources').declare_namespace(__name__)
+except ImportError:
+    from pkgutil import extend_path
+    __path__ = extend_path(__path__, __name__)

Added: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/build/lib/base2/plug/__init__.py
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/build/lib/base2/plug/__init__.py	                        (rev 0)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/build/lib/base2/plug/__init__.py	2008-04-17 18:34:40 UTC (rev 85461)
@@ -0,0 +1 @@
+# a package

Added: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/build/lib/base2/plug/configure.zcml
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/build/lib/base2/plug/configure.zcml	                        (rev 0)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/build/lib/base2/plug/configure.zcml	2008-04-17 18:34:40 UTC (rev 85461)
@@ -0,0 +1,3 @@
+<configure xmlns="http://namespaces.zope.org/zope">
+  <test test_string="base2.plug has been loaded" />
+</configure>

Added: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/setup.py
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/setup.py	                        (rev 0)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/tests/base2_plug/setup.py	2008-04-17 18:34:40 UTC (rev 85461)
@@ -0,0 +1,29 @@
+from setuptools import setup, find_packages
+import sys, os
+
+version = '0.0'
+
+setup(name='base2_plug',
+      version=version,
+      description="",
+      long_description="""\
+""",
+      classifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
+      keywords='',
+      author='',
+      author_email='',
+      url='',
+      license='',
+      package_data = {'': ['*.zcml',]},
+      packages=find_packages(),
+      namespace_packages=['base2'],
+      include_package_data=True,
+      zip_safe=False,
+      install_requires=[
+          'setuptools',
+          'TestDirective',
+      ],
+      entry_points="""
+      # -*- Entry points: -*-
+      """,
+      )

Modified: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/utils.py
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/utils.py	2008-04-17 18:16:43 UTC (rev 85460)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/utils.py	2008-04-17 18:34:40 UTC (rev 85461)
@@ -60,11 +60,14 @@
     return False
 
 def distributionForPackage(package):
+
     package_filename = package.__file__
     for path in sys.path:
         if package_filename.startswith(path):
             break
-    return list(find_distributions(path, True))[0]
+    dists = list(find_distributions(path, True))
+    assert dists, "No distributions found for package %s/%s" % (path, package_filename)
+    return dists[0]
 
 def distributionForDottedName(dotted_name):
     return distributionForPackage(resolve(dotted_name))



More information about the Checkins mailing list