[Checkins] SVN: z3c.autoinclude/trunk/src/z3c/autoinclude/ hopefully more useful logging, less arcane names for things, and fewer pointless variables being passed around

[Ethan Jucovy]

Log message for revision 94807:
  hopefully more useful logging, less arcane names for things, and fewer pointless variables being passed around

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

-=-
Modified: z3c.autoinclude/trunk/src/z3c/autoinclude/utils.py
===================================================================
--- z3c.autoinclude/trunk/src/z3c/autoinclude/utils.py	2009-01-17 18:47:38 UTC (rev 94806)
+++ z3c.autoinclude/trunk/src/z3c/autoinclude/utils.py	2009-01-17 19:32:26 UTC (rev 94807)
@@ -1,12 +1,9 @@
-import logging
 import os
 from pkg_resources import find_distributions
 from setuptools import find_packages
 import sys
 from zope.dottedname.resolve import resolve
 
-log = logging.getLogger("z3c.autoinclude")
-
 class DistributionManager(object):
     def __init__(self, dist):
         self.context = dist
@@ -118,9 +115,3 @@
     location of a distribution object.
     """
     return os.path.isdir(path)
-
-def debug_includes(dist, include_type, dotted_names):
-    if not dotted_names:
-        return
-    log.debug('%s - autoinclude %s: %r', dist.project_name,
-              include_type, list(dotted_names))

Modified: z3c.autoinclude/trunk/src/z3c/autoinclude/zcml.py
===================================================================
--- z3c.autoinclude/trunk/src/z3c/autoinclude/zcml.py	2009-01-17 18:47:38 UTC (rev 94806)
+++ z3c.autoinclude/trunk/src/z3c/autoinclude/zcml.py	2009-01-17 19:32:26 UTC (rev 94807)
@@ -5,20 +5,26 @@
 from zope.schema import TextLine
 
 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
 
+import logging
+log = logging.getLogger("z3c.autoinclude")
 
-def includeZCMLGroup(_context, dist, info, zcmlgroup, override=False):
-    includable_zcml = list(info.get(zcmlgroup, []))
-    debug_includes(dist, zcmlgroup, includable_zcml)
+def includeZCMLGroup(_context, info, filename, override=False):
+    includable_zcml = list(info.get(filename, []))
+
+    zcml_context = repr(_context.info)
+
     for dotted_name in includable_zcml:
+        log.debug('including file %s from package %s at %s', filename, dotted_name, zcml_context)
+
+    for dotted_name in includable_zcml:
         includable_package = resolve(dotted_name)
         if override:
-            includeOverrides(_context, zcmlgroup, includable_package)
+            includeOverrides(_context, filename, includable_package)
         else:
-            include(_context, zcmlgroup, includable_package)
+            include(_context, filename, includable_package)
 
 
 class IIncludeDependenciesDirective(Interface):
@@ -36,13 +42,13 @@
     dist = distributionForPackage(package)
     info = DependencyFinder(dist).includableInfo(['configure.zcml', 'meta.zcml'])
 
-    includeZCMLGroup(_context, dist, info, 'meta.zcml')
-    includeZCMLGroup(_context, dist, info, 'configure.zcml')
+    includeZCMLGroup(_context, info, 'meta.zcml')
+    includeZCMLGroup(_context, info, 'configure.zcml')
 
 def includeDependenciesOverridesDirective(_context, package):
     dist = distributionForPackage(package)
     info = DependencyFinder(dist).includableInfo(['overrides.zcml'])
-    includeZCMLGroup(_context, dist, info, 'overrides.zcml', override=True)
+    includeZCMLGroup(_context, info, 'overrides.zcml', override=True)
 
 
 class IIncludePluginsDirective(Interface):
@@ -63,7 +69,6 @@
         )
 
 def includePluginsDirective(_context, package, file=None):
-    dist = distributionForPackage(package)
     dotted_name = package.__name__
     if file is None:
         zcml_candidates = ['meta.zcml', 'configure.zcml']
@@ -71,11 +76,10 @@
         zcml_candidates = [file]
     info = PluginFinder(dotted_name).includableInfo(zcml_candidates)
 
-    for file in zcml_candidates:
-        includeZCMLGroup(_context, dist, info, file)
+    for filename in zcml_candidates:
+        includeZCMLGroup(_context, info, filename)
 
 def includePluginsOverridesDirective(_context, package, file=None):
-    dist = distributionForPackage(package)
     dotted_name = package.__name__
     if file is None:
         zcml_candidates = ['overrides.zcml']
@@ -83,6 +87,6 @@
         zcml_candidates = [file]
     info = PluginFinder(dotted_name).includableInfo(zcml_candidates)
 
-    for file in zcml_candidates:
-        includeZCMLGroup(_context, dist, info, file, override=True)
+    for filename in zcml_candidates:
+        includeZCMLGroup(_context, info, filename, override=True)