[Checkins] SVN: grok/trunk/src/grok/ fold two small files into one (meta*.py into zcml.py) and thus follow a common

[Philipp von Weitershausen]

Log message for revision 70756:
  fold two small files into one (meta*.py into zcml.py) and thus follow a common
  pattern in Zope 3.3+
  

Changed:
  U   grok/trunk/src/grok/meta.zcml
  D   grok/trunk/src/grok/metaconfigure.py
  D   grok/trunk/src/grok/metadirectives.py
  A   grok/trunk/src/grok/zcml.py

-=-
Modified: grok/trunk/src/grok/meta.zcml
===================================================================
--- grok/trunk/src/grok/meta.zcml	2006-10-17 16:33:35 UTC (rev 70755)
+++ grok/trunk/src/grok/meta.zcml	2006-10-17 16:36:38 UTC (rev 70756)
@@ -5,8 +5,8 @@
   <meta:directives namespace="http://namespaces.zope.org/grok">
     <meta:directive
         name="grok"
-        schema=".metadirectives.IGrokDirective"
-        handler=".metaconfigure.grokDirective"
+        schema=".zcml.IGrokDirective"
+        handler=".zcml.grokDirective"
         />
   </meta:directives>
 </configure>

Deleted: grok/trunk/src/grok/metaconfigure.py
===================================================================
--- grok/trunk/src/grok/metaconfigure.py	2006-10-17 16:33:35 UTC (rev 70755)
+++ grok/trunk/src/grok/metaconfigure.py	2006-10-17 16:36:38 UTC (rev 70756)
@@ -1,19 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2006 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Grok ZCML-Directives
-"""
-import grok
-
-def grokDirective(_context, package):
-    grok.grok(package.__name__)

Deleted: grok/trunk/src/grok/metadirectives.py
===================================================================
--- grok/trunk/src/grok/metadirectives.py	2006-10-17 16:33:35 UTC (rev 70755)
+++ grok/trunk/src/grok/metadirectives.py	2006-10-17 16:36:38 UTC (rev 70756)
@@ -1,29 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2006 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Grok ZCML-Directives
-"""
-from zope import interface
-import zope.configuration.fields
-
-class IGrokDirective(interface.Interface):
-    """
-    
-    """
-
-    package = zope.configuration.fields.GlobalObject(
-        title=u"Package",
-        description=u"The package or module to be analyzed by grok.",
-        required=False,
-        )
-    

Copied: grok/trunk/src/grok/zcml.py (from rev 70754, grok/trunk/src/grok/metadirectives.py)
===================================================================
--- grok/trunk/src/grok/metadirectives.py	2006-10-17 15:21:04 UTC (rev 70754)
+++ grok/trunk/src/grok/zcml.py	2006-10-17 16:36:38 UTC (rev 70756)
@@ -0,0 +1,31 @@
+##############################################################################
+#
+# Copyright (c) 2006 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Grok ZCML-Directives
+"""
+from zope import interface
+import zope.configuration.fields
+import grok
+
+class IGrokDirective(interface.Interface):
+    """Grok a package or module.
+    """
+
+    package = zope.configuration.fields.GlobalObject(
+        title=u"Package",
+        description=u"The package or module to be analyzed by grok.",
+        required=False,
+        )
+
+def grokDirective(_context, package):
+    grok.grok(package.__name__)