[Checkins] SVN: grokcore.component/trunk/ Updated to work with
Martian 0.10. This now uses the new martian
Martijn Faassen
faassen at infrae.com
Fri Jun 6 12:19:29 EDT 2008
Log message for revision 87208:
Updated to work with Martian 0.10. This now uses the new martian
directives (martian.component, martian.priority and martian.directive)
instead of class-level variables.
Changed:
U grokcore.component/trunk/CHANGES.txt
U grokcore.component/trunk/setup.py
U grokcore.component/trunk/src/grokcore/component/meta.py
U grokcore.component/trunk/src/grokcore/component/tests/grokker/continue_scanning.py
U grokcore.component/trunk/src/grokcore/component/tests/grokker/onlyonce_fixture/_meta.py
U grokcore.component/trunk/src/grokcore/component/tests/grokker/priority.py
U grokcore.component/trunk/versions.cfg
-=-
Modified: grokcore.component/trunk/CHANGES.txt
===================================================================
--- grokcore.component/trunk/CHANGES.txt 2008-06-06 16:09:59 UTC (rev 87207)
+++ grokcore.component/trunk/CHANGES.txt 2008-06-06 16:19:28 UTC (rev 87208)
@@ -4,7 +4,8 @@
1.4 (unreleased)
----------------
-* ...
+* Ported class grokkers to make use of further improvements in Martian.
+ This requires Martian 0.10.
1.3 (2008-05-14)
----------------
Modified: grokcore.component/trunk/setup.py
===================================================================
--- grokcore.component/trunk/setup.py 2008-06-06 16:09:59 UTC (rev 87207)
+++ grokcore.component/trunk/setup.py 2008-06-06 16:19:28 UTC (rev 87208)
@@ -32,7 +32,7 @@
include_package_data=True,
zip_safe=False,
install_requires=['setuptools',
- 'martian >= 0.9.6',
+ 'martian >= 0.10',
'zope.component',
'zope.configuration',
'zope.interface',
Modified: grokcore.component/trunk/src/grokcore/component/meta.py
===================================================================
--- grokcore.component/trunk/src/grokcore/component/meta.py 2008-06-06 16:09:59 UTC (rev 87207)
+++ grokcore.component/trunk/src/grokcore/component/meta.py 2008-06-06 16:19:28 UTC (rev 87208)
@@ -13,6 +13,7 @@
##############################################################################
"""Grokkers for the various components."""
+import martian
import martian.util
import grokcore.component
import zope.component.interface
@@ -38,7 +39,7 @@
class ContextGrokker(martian.GlobalGrokker):
- priority = 1001
+ martian.priority(1001)
def grok(self, name, module, module_info, config, **kw):
context = determine_module_component(module_info,
@@ -49,14 +50,13 @@
class AdapterGrokker(martian.ClassGrokker):
- component_class = grokcore.component.Adapter
+ martian.component(grokcore.component.Adapter)
- directives = [
- grokcore.component.context.bind(),
- grokcore.component.provides.bind(get_default=default_provides),
- grokcore.component.name.bind(),
- ]
-
+ martian.directive(grokcore.component.context)
+ martian.directive(grokcore.component.provides,
+ get_default=default_provides)
+ martian.directive(grokcore.component.name)
+
def execute(self, factory, config, context, provides, name, **kw):
config.action(
discriminator=('adapter', context, provides, name),
@@ -67,12 +67,11 @@
class MultiAdapterGrokker(martian.ClassGrokker):
- component_class = grokcore.component.MultiAdapter
+ martian.component(grokcore.component.MultiAdapter)
- directives = [
- grokcore.component.provides.bind(get_default=default_provides),
- grokcore.component.name.bind(),
- ]
+ martian.directive(grokcore.component.provides,
+ get_default=default_provides)
+ martian.directive(grokcore.component.name)
def execute(self, factory, config, provides, name, **kw):
if component.adaptedBy(factory) is None:
@@ -90,18 +89,16 @@
class GlobalUtilityGrokker(martian.ClassGrokker):
- component_class = grokcore.component.GlobalUtility
+ martian.component(grokcore.component.GlobalUtility)
# This needs to happen before the FilesystemPageTemplateGrokker grokker
# happens, since it relies on the ITemplateFileFactories being grokked.
- priority = 1100
+ martian.priority(1100)
- directives = [
- grokcore.component.direct.bind(),
- grokcore.component.provides.bind(
- get_default=default_global_utility_provides),
- grokcore.component.name.bind(),
- ]
+ martian.directive(grokcore.component.direct)
+ martian.directive(grokcore.component.provides,
+ get_default=default_global_utility_provides)
+ martian.directive(grokcore.component.name)
def execute(self, factory, config, direct, provides, name, **kw):
if not direct:
Modified: grokcore.component/trunk/src/grokcore/component/tests/grokker/continue_scanning.py
===================================================================
--- grokcore.component/trunk/src/grokcore/component/tests/grokker/continue_scanning.py 2008-06-06 16:09:59 UTC (rev 87207)
+++ grokcore.component/trunk/src/grokcore/component/tests/grokker/continue_scanning.py 2008-06-06 16:19:28 UTC (rev 87208)
@@ -5,6 +5,7 @@
Here we define AlphaGrokker which has higher priority than BetaGrokker but does
not block BetaGrokker from picking up the same component::
+ >>> import grokcore.component as grok
>>> grok.testing.grok(__name__)
In the fixture there is AlphaBetaSub that inherits from both Alpha and Beta.
@@ -15,7 +16,7 @@
beta
"""
-import grokcore.component as grok
+import martian
class Alpha(object):
@@ -24,16 +25,16 @@
class Beta(object):
pass
-class AlphaGrokker(grok.ClassGrokker):
- component_class = Alpha
- priority = 1 # we need to go before BetaGrokker
+class AlphaGrokker(martian.ClassGrokker):
+ martian.component(Alpha)
+ martian.priority(1) # we need to go before BetaGrokker
def grok(self, name, factory, module_info, config, **kw):
print "alpha"
return True
-class BetaGrokker(grok.ClassGrokker):
- component_class = Beta
+class BetaGrokker(martian.ClassGrokker):
+ martian.component(Beta)
def grok(self, name, factory, module_info, config, **kw):
print "beta"
Modified: grokcore.component/trunk/src/grokcore/component/tests/grokker/onlyonce_fixture/_meta.py
===================================================================
--- grokcore.component/trunk/src/grokcore/component/tests/grokker/onlyonce_fixture/_meta.py 2008-06-06 16:09:59 UTC (rev 87207)
+++ grokcore.component/trunk/src/grokcore/component/tests/grokker/onlyonce_fixture/_meta.py 2008-06-06 16:19:28 UTC (rev 87208)
@@ -2,7 +2,7 @@
from component import Alpha
class AlphaGrokker(martian.ClassGrokker):
- component_class = Alpha
+ martian.component(Alpha)
def grok(self, name, factory, module_info, **kw):
print "alpha"
Modified: grokcore.component/trunk/src/grokcore/component/tests/grokker/priority.py
===================================================================
--- grokcore.component/trunk/src/grokcore/component/tests/grokker/priority.py 2008-06-06 16:09:59 UTC (rev 87207)
+++ grokcore.component/trunk/src/grokcore/component/tests/grokker/priority.py 2008-06-06 16:19:28 UTC (rev 87208)
@@ -6,6 +6,7 @@
- BetaGrokker with priority 1
- GammaGrokker with priority -1
+ >>> import grokcore.component as grok
>>> grok.testing.grok(__name__)
We grok a module that implements subclasses for Alpha, Beta, and Gamma and our
@@ -17,7 +18,7 @@
gamma
"""
-import grokcore.component as grok
+import martian
class Alpha(object):
@@ -30,24 +31,24 @@
class Gamma(object):
pass
-class AlphaGrokker(grok.ClassGrokker):
- component_class = Alpha
+class AlphaGrokker(martian.ClassGrokker):
+ martian.component(Alpha)
def grok(self, name, factory, module_info, **kw):
print "alpha"
return True
-class BetaGrokker(grok.ClassGrokker):
- component_class = Beta
- priority = 1
-
+class BetaGrokker(martian.ClassGrokker):
+ martian.component(Beta)
+ martian.priority(1)
+
def grok(self, name, factory, module_info, **kw):
print "beta"
return True
-class GammaGrokker(grok.ClassGrokker):
- component_class = Gamma
- priority = -1
+class GammaGrokker(martian.ClassGrokker):
+ martian.component(Gamma)
+ martian.priority(-1)
def grok(self, name, factory, module_info, **kw):
print "gamma"
Modified: grokcore.component/trunk/versions.cfg
===================================================================
--- grokcore.component/trunk/versions.cfg 2008-06-06 16:09:59 UTC (rev 87207)
+++ grokcore.component/trunk/versions.cfg 2008-06-06 16:19:28 UTC (rev 87208)
@@ -1,5 +1,5 @@
[versions]
-martian = 0.9.6
+martian = 0.10
zope.configuration = 3.4.0
zope.deferredimport = 3.4.0
zope.deprecation = 3.4.0
More information about the Checkins
mailing list