[Checkins] SVN: grok/trunk/s no need to pass the default value function anymore
Jan-Wijbrand Kolman
janwijbrand at gmail.com
Wed Nov 3 10:13:39 EDT 2010
Log message for revision 118165:
no need to pass the default value function anymore
Changed:
U grok/trunk/setup.py
U grok/trunk/src/grok/meta.py
-=-
Modified: grok/trunk/setup.py
===================================================================
--- grok/trunk/setup.py 2010-11-03 14:13:21 UTC (rev 118164)
+++ grok/trunk/setup.py 2010-11-03 14:13:39 UTC (rev 118165)
@@ -43,7 +43,7 @@
install_requires=[
'ZODB3',
'grokcore.annotation >= 1.1',
- 'grokcore.component',
+ 'grokcore.component >= 2.1',
'grokcore.content',
'grokcore.formlib >= 1.4',
'grokcore.json',
@@ -53,7 +53,7 @@
'grokcore.view',
'grokcore.view [security_publication]',
'grokcore.viewlet >= 1.3',
- 'martian',
+ 'martian >= 0.14',
'pytz',
'setuptools',
'simplejson',
Modified: grok/trunk/src/grok/meta.py
===================================================================
--- grok/trunk/src/grok/meta.py 2010-11-03 14:13:21 UTC (rev 118164)
+++ grok/trunk/src/grok/meta.py 2010-11-03 14:13:39 UTC (rev 118165)
@@ -48,7 +48,6 @@
from grok.interfaces import IRESTSkinType
import grokcore.site.interfaces
-from grokcore.component.meta import default_context
from grokcore.security.meta import PermissionGrokker
from grokcore.view import make_checker
@@ -81,7 +80,7 @@
"""
martian.component(grok.XMLRPC)
- martian.directive(grok.context, get_default=default_context)
+ martian.directive(grok.context)
martian.directive(grok.require, name='permission')
def execute(self, factory, method, config, context, permission, **kw):
@@ -126,7 +125,7 @@
"""
martian.component(grok.REST)
- martian.directive(grok.context, get_default=default_context)
+ martian.directive(grok.context)
martian.directive(grok.layer, default=grok.IRESTLayer)
martian.directive(grok.require, name='permission')
@@ -200,7 +199,7 @@
class TraverserGrokker(martian.ClassGrokker):
"""Grokker for subclasses of `grok.Traverser`."""
martian.component(grok.Traverser)
- martian.directive(grok.context, get_default=default_context)
+ martian.directive(grok.context)
def execute(self, factory, config, context, **kw):
adapts = (context, IHTTPRequest)
More information about the checkins
mailing list