[Checkins] SVN: megrok.z3ctable/trunk/ Updated for the latest martian
Souheil CHELFOUH
souheil at chelfouh.com
Mon Jan 31 10:40:34 EST 2011
Log message for revision 120024:
Updated for the latest martian
Changed:
U megrok.z3ctable/trunk/buildout.cfg
U megrok.z3ctable/trunk/setup.py
U megrok.z3ctable/trunk/src/megrok/z3ctable/meta.py
-=-
Modified: megrok.z3ctable/trunk/buildout.cfg
===================================================================
--- megrok.z3ctable/trunk/buildout.cfg 2011-01-31 15:29:44 UTC (rev 120023)
+++ megrok.z3ctable/trunk/buildout.cfg 2011-01-31 15:40:34 UTC (rev 120024)
@@ -1,7 +1,7 @@
[buildout]
develop = .
parts = test
-extends = http://svn.zope.org/*checkout*/groktoolkit/trunk/grok.cfg
+extends = http://grok.zope.org/releaseinfo/1.3/versions.cfg
versions = versions
newest = false
Modified: megrok.z3ctable/trunk/setup.py
===================================================================
--- megrok.z3ctable/trunk/setup.py 2011-01-31 15:29:44 UTC (rev 120023)
+++ megrok.z3ctable/trunk/setup.py 2011-01-31 15:40:34 UTC (rev 120024)
@@ -1,7 +1,7 @@
from setuptools import setup, find_packages
import os
-version = '1.4.2'
+version = '1.5.0'
readme = open(os.path.join("src", "megrok", "z3ctable", "README.txt")).read()
history = open(os.path.join("docs", "HISTORY.txt")).read()
Modified: megrok.z3ctable/trunk/src/megrok/z3ctable/meta.py
===================================================================
--- megrok.z3ctable/trunk/src/megrok/z3ctable/meta.py 2011-01-31 15:29:44 UTC (rev 120023)
+++ megrok.z3ctable/trunk/src/megrok/z3ctable/meta.py 2011-01-31 15:40:34 UTC (rev 120024)
@@ -7,8 +7,7 @@
from zope import component
from z3c.table.interfaces import ITable
-from grokcore.component.scan import determine_module_component
-from grokcore.component.meta import default_provides as default
+from martian.util import scan_for_classes
from zope.publisher.interfaces.browser import IDefaultBrowserLayer
@@ -18,11 +17,20 @@
"""
martian.priority(991)
+ def get_default(cls, component, module=None, **data):
+ components = list(scan_for_classes(module, megrok.z3ctable.ITable))
+ if len(components) == 0:
+ return None
+ elif len(components) == 1:
+ component = components[0]
+ else:
+ return None
+ return component
+
def grok(self, name, module, module_info, config, **kw):
- table = determine_module_component(module_info,
- megrok.z3ctable.table,
- megrok.z3ctable.ITable)
- megrok.z3ctable.table.set(module, table)
+ factory = self.get_default(module, module)
+ if factory is not None:
+ megrok.z3ctable.table.set(module, factory)
return True
@@ -33,7 +41,7 @@
martian.directive(grokcore.component.name)
martian.directive(grokcore.component.context)
martian.directive(megrok.z3ctable.table, default=ITable)
- martian.directive(grokcore.component.provides, get_default=default)
+ martian.directive(grokcore.component.provides)
martian.directive(grokcore.view.layer, default=IDefaultBrowserLayer)
def execute(self, factory, config, layer, context, table, provides, name):
More information about the checkins
mailing list