[Checkins] SVN: z3c.reload/trunk/src/z3c/reload/ Modernize ZCML directive fiel names.

[Stephan Richter]

Log message for revision 89638:
  Modernize ZCML directive fiel names.
  

Changed:
  U   z3c.reload/trunk/src/z3c/reload/meta.zcml
  D   z3c.reload/trunk/src/z3c/reload/metaconfigure.py
  D   z3c.reload/trunk/src/z3c/reload/metadirectives.py
  U   z3c.reload/trunk/src/z3c/reload/subscriber.py
  A   z3c.reload/trunk/src/z3c/reload/zcml.py

-=-
Modified: z3c.reload/trunk/src/z3c/reload/meta.zcml
===================================================================
--- z3c.reload/trunk/src/z3c/reload/meta.zcml	2008-08-11 06:46:46 UTC (rev 89637)
+++ z3c.reload/trunk/src/z3c/reload/meta.zcml	2008-08-11 06:56:28 UTC (rev 89638)
@@ -3,8 +3,8 @@
   <directives namespace="http://namespaces.zope.org/z3c">
     <directive
       name="reload"
-      schema=".metadirectives.IReloadDirective"
-      handler=".metaconfigure.reload"
+      schema=".zcml.IReloadDirective"
+      handler=".zcml.reload"
       />
   </directives>
 

Deleted: z3c.reload/trunk/src/z3c/reload/metaconfigure.py
===================================================================
--- z3c.reload/trunk/src/z3c/reload/metaconfigure.py	2008-08-11 06:46:46 UTC (rev 89637)
+++ z3c.reload/trunk/src/z3c/reload/metaconfigure.py	2008-08-11 06:56:28 UTC (rev 89638)
@@ -1,23 +0,0 @@
-import sys
-from zope.configuration.exceptions import ConfigurationError
-
-
-enabled_classes = [] # list of class objects
-enabled_modules = [] # list of module names
-enabled_packages = [] # list of package names
-
-
-def handle_reload(classes, modules, packages):
-    """Add provided objects to global registry of reloadable objects."""
-    enabled_classes.extend(classes)
-    enabled_modules.extend([mod.__name__ for mod in modules])
-    enabled_packages.extend([pkg.__name__ for pkg in packages])
-
-
-def reload(_context, classes=[], modules=[], packages=[]):
-    """Process the `reload` ZCML directive."""
-    if not (classes or modules or packages):
-        raise ConfigurationError("You must specify at least one of"
-                                 " `classes`, `modules` or `packages`.")
-    _context.action(discriminator=None, callable=handle_reload,
-                    args=(classes, modules, packages))

Deleted: z3c.reload/trunk/src/z3c/reload/metadirectives.py
===================================================================
--- z3c.reload/trunk/src/z3c/reload/metadirectives.py	2008-08-11 06:46:46 UTC (rev 89637)
+++ z3c.reload/trunk/src/z3c/reload/metadirectives.py	2008-08-11 06:56:28 UTC (rev 89638)
@@ -1,37 +0,0 @@
-from zope.interface import Interface
-from zope.configuration.fields import Tokens, GlobalObject
-
-
-class IReloadDirective(Interface):
-
-    classes = Tokens(
-        title=u"View classes",
-        required=False,
-        value_type=GlobalObject(
-                title=u"View class",
-                description=u"""
-                A view class for which automatic reload should be enabled.
-                """))
-
-    modules = Tokens(
-        title=u"Modules",
-        required=False,
-        value_type=GlobalObject(
-                title=u"Module",
-                description=u"""
-                A module containing views for which automatic reload should be
-                enabled.
-                """))
-
-    packages = Tokens(
-        title=u"Packages",
-        required=False,
-        value_type=GlobalObject(
-            title=u"Package",
-            description=u"""
-            A package containing views for which automatic reload should be
-            enabled.
-
-            `module` only works for a single module, whereas `package` also
-            applies for contained modules and packages.
-            """))

Modified: z3c.reload/trunk/src/z3c/reload/subscriber.py
===================================================================
--- z3c.reload/trunk/src/z3c/reload/subscriber.py	2008-08-11 06:46:46 UTC (rev 89637)
+++ z3c.reload/trunk/src/z3c/reload/subscriber.py	2008-08-11 06:56:28 UTC (rev 89638)
@@ -5,8 +5,7 @@
 from zope.component.registry import AdapterRegistration
 
 from z3c.reload.reload import install_reloader, simple_view_classes
-from z3c.reload.metaconfigure import enabled_classes, enabled_modules
-from z3c.reload.metaconfigure import enabled_packages
+from z3c.reload.zcml import enabled_classes, enabled_modules, enabled_packages
 
 request_type = IRequest
 

Copied: z3c.reload/trunk/src/z3c/reload/zcml.py (from rev 89636, z3c.reload/trunk/src/z3c/reload/metaconfigure.py)
===================================================================
--- z3c.reload/trunk/src/z3c/reload/zcml.py	                        (rev 0)
+++ z3c.reload/trunk/src/z3c/reload/zcml.py	2008-08-11 06:56:28 UTC (rev 89638)
@@ -0,0 +1,58 @@
+import sys
+from zope.configuration.exceptions import ConfigurationError
+from zope.configuration.fields import Tokens, GlobalObject
+from zope.interface import Interface
+
+enabled_classes = [] # list of class objects
+enabled_modules = [] # list of module names
+enabled_packages = [] # list of package names
+
+class IReloadDirective(Interface):
+
+    classes = Tokens(
+        title=u"View classes",
+        required=False,
+        value_type=GlobalObject(
+                title=u"View class",
+                description=u"""
+                A view class for which automatic reload should be enabled.
+                """))
+
+    modules = Tokens(
+        title=u"Modules",
+        required=False,
+        value_type=GlobalObject(
+                title=u"Module",
+                description=u"""
+                A module containing views for which automatic reload should be
+                enabled.
+                """))
+
+    packages = Tokens(
+        title=u"Packages",
+        required=False,
+        value_type=GlobalObject(
+            title=u"Package",
+            description=u"""
+            A package containing views for which automatic reload should be
+            enabled.
+
+            `module` only works for a single module, whereas `package` also
+            applies for contained modules and packages.
+            """))
+
+
+def handle_reload(classes, modules, packages):
+    """Add provided objects to global registry of reloadable objects."""
+    enabled_classes.extend(classes)
+    enabled_modules.extend([mod.__name__ for mod in modules])
+    enabled_packages.extend([pkg.__name__ for pkg in packages])
+
+
+def reload(_context, classes=[], modules=[], packages=[]):
+    """Process the `reload` ZCML directive."""
+    if not (classes or modules or packages):
+        raise ConfigurationError("You must specify at least one of"
+                                 " `classes`, `modules` or `packages`.")
+    _context.action(discriminator=None, callable=handle_reload,
+                    args=(classes, modules, packages))