[Checkins] SVN: grok/trunk/src/grok/ More get_name() refactoring.

[Martijn Faassen]

Log message for revision 83158:
  More get_name() refactoring.
  

Changed:
  U   grok/trunk/src/grok/ftests/catalog/indexes_multiple_conflict.py
  U   grok/trunk/src/grok/meta.py

-=-
Modified: grok/trunk/src/grok/ftests/catalog/indexes_multiple_conflict.py
===================================================================
--- grok/trunk/src/grok/ftests/catalog/indexes_multiple_conflict.py	2008-01-24 12:24:38 UTC (rev 83157)
+++ grok/trunk/src/grok/ftests/catalog/indexes_multiple_conflict.py	2008-01-24 12:30:38 UTC (rev 83158)
@@ -12,7 +12,7 @@
     ...
   GrokError: grok.Indexes in module <module
   'grok.ftests.catalog.indexes_multiple_conflict' from ...>
-  causes creation of catalog index 'name' in catalog u'', but an index
+  causes creation of catalog index 'name' in catalog '', but an index
   with that name is already present.
 
   >>> from zope.app.component.hooks import setSite

Modified: grok/trunk/src/grok/meta.py
===================================================================
--- grok/trunk/src/grok/meta.py	2008-01-24 12:24:38 UTC (rev 83157)
+++ grok/trunk/src/grok/meta.py	2008-01-24 12:30:38 UTC (rev 83158)
@@ -55,10 +55,13 @@
     context = module_info.getAnnotation('grok.context', None)
     return util.determine_class_context(factory, context)
 
-def get_name(factory):
-    return grok.util.class_annotation(factory, 'grok.name',
-                                      factory.__name__.lower())
+def get_name_classname(factory):
+    return get_name(factory, factory.__name__.lower())
 
+def get_name(factory, default=''):
+    return grok.util.class_annotation(factory, 'grok.name', default)
+
+
 class ContextGrokker(martian.GlobalGrokker):
 
     priority = 1001
@@ -79,8 +82,8 @@
         provides = util.class_annotation(factory, 'grok.provides', None)
         if provides is None:
             util.check_implements_one(factory)
-        name = util.class_annotation(factory, 'grok.name', '')
-
+        name = get_name(factory)
+        
         config.action(
             discriminator=('adapter', adapter_context, provides, name),
             callable=component.provideAdapter,
@@ -96,7 +99,7 @@
         if provides is None:
             util.check_implements_one(factory)
         check_adapts(factory)
-        name = util.class_annotation(factory, 'grok.name', '')
+        name = get_name(factory)
         for_ = component.adaptedBy(factory)
 
         config.action(
@@ -118,7 +121,7 @@
         provides = util.class_annotation(factory, 'grok.provides', None)
         if provides is None:
             util.check_implements_one(factory)
-        name = util.class_annotation(factory, 'grok.name', '')
+        name = get_name(factory)
         direct = util.class_annotation(factory, 'grok.direct', False)
         if not direct:
             factory = factory()
@@ -260,7 +263,7 @@
                                                factory, module_info,
                                                default=IDefaultBrowserLayer)
 
-        view_name = get_name(factory)
+        view_name = get_name_classname(factory)
         # __view_name__ is needed to support IAbsoluteURL on views
         factory.__view_name__ = view_name
         adapts = (view_context, view_layer)
@@ -648,7 +651,7 @@
     priority = 1500
 
     def grok(self, name, factory, module_info, config, **kw):
-        id = util.class_annotation(factory, 'grok.name', None)
+        id = get_name(factory, None)
         if id is None:
             raise GrokError(
                 "A permission needs to have a dotted name for its id. Use "
@@ -674,7 +677,7 @@
     priority = PermissionGrokker.priority - 1
 
     def grok(self, name, factory, module_info, config, **kw):
-        id = util.class_annotation(factory, 'grok.name', None)
+        id = get_name(factory, None)
         if id is None:
             raise GrokError(
                 "A role needs to have a dotted name for its id. Use "
@@ -715,7 +718,7 @@
             util.check_implements_one_from_list(real_interfaces, factory)
             provides = real_interfaces[0]
 
-        key = util.class_annotation(factory, 'grok.name', None)
+        key = get_name(factory, None)
         if key is None:
             key = factory.__module__ + '.' + factory.__name__
 
@@ -774,7 +777,7 @@
         if indexes is None:
             return False
         context = get_context(module_info, factory)
-        catalog_name = util.class_annotation(factory, 'grok.name', u'')
+        catalog_name = get_name(factory)
 
         subscriber = IndexesSetupSubscriber(catalog_name, indexes,
                                             context, module_info)
@@ -844,7 +847,7 @@
     def grok(self, name, factory, module_info, config, **kw):
         layer = determine_class_directive('grok.layer', factory, module_info,
                                           default=IBrowserRequest)
-        name = get_name(factory)
+        name = get_name_classname(factory)
         config.action(
             discriminator=None,
             callable=zope.component.interface.provideInterface,
@@ -858,7 +861,7 @@
     def grok(self, name, factory, module_info, config, **kw):
         layer = determine_class_directive('grok.layer', factory, module_info,
                                           default=IBrowserRequest)
-        name = get_name(factory)
+        name = get_name_classname(factory)
         config.action(
             discriminator=None,
             callable=zope.component.interface.provideInterface,