[Checkins] SVN: z3c.autoinclude/trunk/src/z3c/autoinclude/zcml.py whoops, forgot to finish renaming

Ethan Jucovy ejucovy at openplans.org
Sat Jan 17 13:47:38 EST 2009


Log message for revision 94806:
  whoops, forgot to finish renaming

Changed:
  U   z3c.autoinclude/trunk/src/z3c/autoinclude/zcml.py

-=-
Modified: z3c.autoinclude/trunk/src/z3c/autoinclude/zcml.py
===================================================================
--- z3c.autoinclude/trunk/src/z3c/autoinclude/zcml.py	2009-01-17 18:36:50 UTC (rev 94805)
+++ z3c.autoinclude/trunk/src/z3c/autoinclude/zcml.py	2009-01-17 18:47:38 UTC (rev 94806)
@@ -9,16 +9,6 @@
 from z3c.autoinclude.utils import distributionForPackage
 from z3c.autoinclude.plugin import PluginFinder
 
-class IAutoIncludeDirective(Interface):
-    """Auto-include any ZCML in the dependencies of this package."""
-    
-    package = GlobalObject(
-        title=u"Package to auto-include for",
-        description=u"""
-        Auto-include all dependencies of this package.
-        """,
-        required=True,
-        )
 
 def includeZCMLGroup(_context, dist, info, zcmlgroup, override=False):
     includable_zcml = list(info.get(zcmlgroup, []))
@@ -30,19 +20,31 @@
         else:
             include(_context, zcmlgroup, includable_package)
 
-def autoIncludeOverridesDirective(_context, package):
-    dist = distributionForPackage(package)
-    info = DependencyFinder(dist).includableInfo(['overrides.zcml'])
-    includeZCMLGroup(_context, dist, info, 'overrides.zcml', override=True)
 
-def autoIncludeDirective(_context, package):
+class IIncludeDependenciesDirective(Interface):
+    """Auto-include any ZCML in the dependencies of this package."""
+    
+    package = GlobalObject(
+        title=u"Package to auto-include for",
+        description=u"""
+        Auto-include all dependencies of this package.
+        """,
+        required=True,
+        )
+
+def includeDependenciesDirective(_context, package):
     dist = distributionForPackage(package)
     info = DependencyFinder(dist).includableInfo(['configure.zcml', 'meta.zcml'])
 
     includeZCMLGroup(_context, dist, info, 'meta.zcml')
     includeZCMLGroup(_context, dist, info, 'configure.zcml')
 
+def includeDependenciesOverridesDirective(_context, package):
+    dist = distributionForPackage(package)
+    info = DependencyFinder(dist).includableInfo(['overrides.zcml'])
+    includeZCMLGroup(_context, dist, info, 'overrides.zcml', override=True)
 
+
 class IIncludePluginsDirective(Interface):
     """Auto-include any ZCML in the dependencies of this package."""
     



More information about the Checkins mailing list