[Checkins]
SVN: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/
rename IncludeFinder to DependencyFinder,
since it finds dependencies
Ethan Jucovy
ejucovy at openplans.org
Fri Mar 28 20:18:24 EDT 2008
Log message for revision 85008:
rename IncludeFinder to DependencyFinder, since it finds dependencies
Changed:
U z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/README.txt
U z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/dependency.py
U z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/plugin.py
U z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/zcml.py
-=-
Modified: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/README.txt
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/README.txt 2008-03-28 23:52:25 UTC (rev 85007)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/README.txt 2008-03-29 00:18:23 UTC (rev 85008)
@@ -88,13 +88,13 @@
>>> from pkg_resources import get_provider
>>> b_dist = get_provider(reqs[0])
-We can adapt a distribution to an IncludeFinder::
+We can adapt a distribution to a DependencyFinder::
- >>> from z3c.autoinclude.dependency import IncludeFinder
- >>> a_include_finder = IncludeFinder(a_dist)
- >>> b_include_finder = IncludeFinder(b_dist)
- >>> xyz_include_finder = IncludeFinder(xyz_dist)
- >>> sibling_include_finder = IncludeFinder(sibling_dist)
+ >>> from z3c.autoinclude.dependency import DependencyFinder
+ >>> a_include_finder = DependencyFinder(a_dist)
+ >>> b_include_finder = DependencyFinder(b_dist)
+ >>> xyz_include_finder = DependencyFinder(xyz_dist)
+ >>> sibling_include_finder = DependencyFinder(sibling_dist)
The include finder provides functionality to determine what namespace
packages exist in the distribution. In the case of ``APackage``, there
@@ -261,9 +261,10 @@
[]
Finally, we know how to get a list of all module dottednames within
-a distribution, through the IncludeFinder adapter::
+a distribution, through the DistributionManager adapter::
- >>> IncludeFinder(foo_dist).dottedNames()
+ >>> from z3c.autoinclude.utils import DistributionManager
+ >>> DistributionManager(foo_dist).dottedNames()
['foo']
So between these functions we can now get a dictionary of all
Modified: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/dependency.py
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/dependency.py 2008-03-28 23:52:25 UTC (rev 85007)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/dependency.py 2008-03-29 00:18:23 UTC (rev 85008)
@@ -8,7 +8,7 @@
log = logging.getLogger("z3c.autoinclude")
-class IncludeFinder(DistributionManager):
+class DependencyFinder(DistributionManager):
def includableInfo(self, include_candidates):
"""Return the packages in the dependencies which are includable.
@@ -39,5 +39,5 @@
if zcml_filenames is None:
zcml_filenames = ['meta.zcml', 'configure.zcml', 'overrides.zcml']
dist = get_distribution(project_name)
- include_finder = IncludeFinder(dist)
+ include_finder = DependencyFinder(dist)
return include_finder.includableInfo(zcml_filenames)
Modified: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/plugin.py
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/plugin.py 2008-03-28 23:52:25 UTC (rev 85007)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/plugin.py 2008-03-29 00:18:23 UTC (rev 85008)
@@ -1,7 +1,6 @@
import os
from pkg_resources import iter_entry_points
from pkg_resources import resource_filename
-from z3c.autoinclude.dependency import IncludeFinder
from z3c.autoinclude.utils import DistributionManager
from z3c.autoinclude.utils import distributionForDottedName
Modified: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/zcml.py
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/zcml.py 2008-03-28 23:52:25 UTC (rev 85007)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/zcml.py 2008-03-29 00:18:23 UTC (rev 85008)
@@ -3,7 +3,7 @@
from zope.configuration.fields import GlobalObject
from zope.dottedname.resolve import resolve
-from z3c.autoinclude.dependency import IncludeFinder
+from z3c.autoinclude.dependency import DependencyFinder
from z3c.autoinclude.utils import debug_includes
from z3c.autoinclude.utils import distributionForPackage
from z3c.autoinclude.plugin import PluginFinder
@@ -31,12 +31,12 @@
def autoIncludeOverridesDirective(_context, package):
dist = distributionForPackage(package)
- info = IncludeFinder(dist).includableInfo(['overrides.zcml'])
+ info = DependencyFinder(dist).includableInfo(['overrides.zcml'])
includeZCMLGroup(_context, dist, info, 'overrides.zcml', override=True)
def autoIncludeDirective(_context, package):
dist = distributionForPackage(package)
- info = IncludeFinder(dist).includableInfo(['configure.zcml', 'meta.zcml'])
+ info = DependencyFinder(dist).includableInfo(['configure.zcml', 'meta.zcml'])
includeZCMLGroup(_context, dist, info, 'meta.zcml')
includeZCMLGroup(_context, dist, info, 'configure.zcml')
More information about the Checkins
mailing list