[Checkins] SVN: grok/branches/gotcha-configuration-actions/src/grok/ move aux function to grok.util

[Philipp von Weitershausen]

Log message for revision 80854:
  move aux function to grok.util
  

Changed:
  U   grok/branches/gotcha-configuration-actions/src/grok/meta.py
  U   grok/branches/gotcha-configuration-actions/src/grok/util.py

-=-
Modified: grok/branches/gotcha-configuration-actions/src/grok/meta.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/meta.py	2007-10-11 17:49:19 UTC (rev 80853)
+++ grok/branches/gotcha-configuration-actions/src/grok/meta.py	2007-10-12 10:01:15 UTC (rev 80854)
@@ -47,6 +47,7 @@
 import grok
 from grok import components, formlib, templatereg
 from grok.util import check_adapts, get_default_permission, make_checker
+from grok.util import determine_class_directive
 
 
 class ContextGrokker(martian.GlobalGrokker):
@@ -779,17 +780,9 @@
     component_class = grok.Skin
 
     def grok(self, name, factory, module_info, config, **kw):
-        layer = determine_class_directive('grok.layer', factory, module_info, default=IBrowserRequest)
-        name = grok.util.class_annotation(factory, 'grok.name', factory.__name__.lower())
+        layer = determine_class_directive('grok.layer', factory, module_info,
+                                          default=IBrowserRequest)
+        name = grok.util.class_annotation(factory, 'grok.name',
+                                          factory.__name__.lower())
         zope.component.interface.provideInterface(name, layer, IBrowserSkinType)
         return True
-
-
-def determine_class_directive(directive_name, factory, module_info, default=None):
-    directive = util.class_annotation(factory, directive_name, None)
-    if directive is None:
-        directive = module_info.getAnnotation(directive_name, None)
-    if directive is not None:
-        return directive
-    else:
-        return default

Modified: grok/branches/gotcha-configuration-actions/src/grok/util.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/util.py	2007-10-11 17:49:19 UTC (rev 80853)
+++ grok/branches/gotcha-configuration-actions/src/grok/util.py	2007-10-12 10:01:15 UTC (rev 80854)
@@ -96,3 +96,12 @@
         return obj
     # This either sets __parent__ or wraps 'obj' in a LocationProxy
     return zope.location.location.located(obj, parent, name)
+
+def determine_class_directive(directive_name, factory, module_info,
+                              default=None):
+    directive = class_annotation(factory, directive_name, None)
+    if directive is None:
+        directive = module_info.getAnnotation(directive_name, None)
+    if directive is not None:
+        return directive
+    return default