[Checkins] SVN: grok/trunk/ Start refactoring commonalities out of meta.py.

[Martijn Faassen]

Log message for revision 83156:
  Start refactoring commonalities out of meta.py.
  

Changed:
  U   grok/trunk/CHANGES.txt
  U   grok/trunk/src/grok/meta.py

-=-
Modified: grok/trunk/CHANGES.txt
===================================================================
--- grok/trunk/CHANGES.txt	2008-01-24 11:10:51 UTC (rev 83155)
+++ grok/trunk/CHANGES.txt	2008-01-24 12:17:17 UTC (rev 83156)
@@ -47,6 +47,11 @@
 * Fix https://bugs.launchpad.net/grok/+bug/185414: grok introsepector
   was broken for zipped eggs.
 
+Restructuring
+-------------
+
+* Refactor commonalities out of meta.py.
+
 0.11 (2007-11-08)
 =================
 

Modified: grok/trunk/src/grok/meta.py
===================================================================
--- grok/trunk/src/grok/meta.py	2008-01-24 11:10:51 UTC (rev 83155)
+++ grok/trunk/src/grok/meta.py	2008-01-24 12:17:17 UTC (rev 83156)
@@ -51,6 +51,10 @@
 from grok.rest import RestPublisher
 from grok.interfaces import IRESTSkinType
 
+def get_context(module_info, factory):
+    context = module_info.getAnnotation('grok.context', None)
+    return util.determine_class_context(factory, context)
+    
 class ContextGrokker(martian.GlobalGrokker):
 
     priority = 1001
@@ -67,8 +71,7 @@
     component_class = grok.Adapter
 
     def grok(self, name, factory, module_info, config, **kw):
-        context = module_info.getAnnotation('grok.context', None)
-        adapter_context = util.determine_class_context(factory, context)
+        adapter_context = get_context(module_info, factory)
         provides = util.class_annotation(factory, 'grok.provides', None)
         if provides is None:
             util.check_implements_one(factory)
@@ -128,9 +131,8 @@
     component_class = grok.XMLRPC
 
     def grok(self, name, factory, module_info, config, **kw):
-        context = module_info.getAnnotation('grok.context', None)
-        view_context = util.determine_class_context(factory, context)
-
+        view_context = get_context(module_info, factory)
+        
         methods = public_methods_from_class(factory)
 
         default_permission = get_default_permission(factory)
@@ -169,8 +171,7 @@
     component_class = grok.REST
 
     def grok(self, name, factory, module_info, config, **kw):
-        context = module_info.getAnnotation('grok.context', None)
-        view_context = util.determine_class_context(factory, context)
+        view_context = get_context(module_info, factory)
 
         methods = public_methods_from_class(factory)
 
@@ -215,8 +216,7 @@
     component_class = grok.View
 
     def grok(self, name, factory, module_info, config, **kw):
-        context = module_info.getAnnotation('grok.context', None)
-        view_context = util.determine_class_context(factory, context)
+        view_context = get_context(module_info, factory)
 
         factory.module_info = module_info
         factory_name = factory.__name__.lower()
@@ -286,8 +286,7 @@
     component_class = grok.JSON
 
     def grok(self, name, factory, module_info, config, **kw):
-        context = module_info.getAnnotation('grok.context', None)
-        view_context = util.determine_class_context(factory, context)
+        view_context = get_context(module_info, factory)
 
         methods = public_methods_from_class(factory)
 
@@ -335,8 +334,7 @@
     component_class = grok.Traverser
 
     def grok(self, name, factory, module_info, config, **kw):
-        context = module_info.getAnnotation('grok.context', None)
-        factory_context = util.determine_class_context(factory, context)
+        factory_context = get_context(module_info, factory)
         adapts = (factory_context, IBrowserRequest)
 
         config.action(
@@ -706,8 +704,7 @@
     component_class = grok.Annotation
 
     def grok(self, name, factory, module_info, config, **kw):
-        context = module_info.getAnnotation('grok.context', None)
-        adapter_context = util.determine_class_context(factory, context)
+        adapter_context = get_context(module_info, factory)
         provides = util.class_annotation(factory, 'grok.provides', None)
         if provides is None:
             base_interfaces = interface.implementedBy(grok.Annotation)
@@ -774,8 +771,7 @@
         indexes = util.class_annotation(factory, 'grok.indexes', None)
         if indexes is None:
             return False
-        context = module_info.getAnnotation('grok.context', None)
-        context = util.determine_class_context(factory, context)
+        context = get_context(module_info, factory)
         catalog_name = util.class_annotation(factory, 'grok.name', u'')
 
         subscriber = IndexesSetupSubscriber(catalog_name, indexes,