[Checkins] SVN: grokcore.viewlet/trunk/src/grokcore/viewlet/ Cleaned unused imports and normalized to pep8 syntax.
Souheil CHELFOUH
souheil at chelfouh.com
Sun Feb 28 14:35:47 EST 2010
Log message for revision 109512:
Cleaned unused imports and normalized to pep8 syntax.
Changed:
U grokcore.viewlet/trunk/src/grokcore/viewlet/components.py
U grokcore.viewlet/trunk/src/grokcore/viewlet/directive.py
U grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewlet_context.py
U grokcore.viewlet/trunk/src/grokcore/viewlet/interfaces.py
U grokcore.viewlet/trunk/src/grokcore/viewlet/meta.py
U grokcore.viewlet/trunk/src/grokcore/viewlet/tests/viewlet/viewlet_references.py
U grokcore.viewlet/trunk/src/grokcore/viewlet/util.py
-=-
Modified: grokcore.viewlet/trunk/src/grokcore/viewlet/components.py
===================================================================
--- grokcore.viewlet/trunk/src/grokcore/viewlet/components.py 2010-02-28 19:23:14 UTC (rev 109511)
+++ grokcore.viewlet/trunk/src/grokcore/viewlet/components.py 2010-02-28 19:35:47 UTC (rev 109512)
@@ -34,7 +34,7 @@
self.static = component.queryAdapter(
self.request,
interface.Interface,
- name=self.module_info.package_dotted_name
+ name=self.module_info.package_dotted_name,
)
def sort(self, viewlets):
@@ -52,12 +52,12 @@
# viewlet) tuples, now in the correct order.
s_viewlets = []
for name, viewlet in viewlets:
- # Stuff away viewlet name so we can later retrieve it.
- # XXX We loose name information in case the same viewlet
- # is in the viewlets list twice, but with a different
- # name. Most probably this situation doesn't occur.
- viewlet.__viewlet_name__ = name
- s_viewlets.append(viewlet)
+ # Stuff away viewlet name so we can later retrieve it.
+ # XXX We loose name information in case the same viewlet
+ # is in the viewlets list twice, but with a different
+ # name. Most probably this situation doesn't occur.
+ viewlet.__viewlet_name__ = name
+ s_viewlets.append(viewlet)
s_viewlets = util.sort_components(s_viewlets)
return [(viewlet.__viewlet_name__, viewlet) for viewlet in s_viewlets]
@@ -96,7 +96,7 @@
self.static = component.queryAdapter(
self.request,
interface.Interface,
- name=self.module_info.package_dotted_name
+ name=self.module_info.package_dotted_name,
)
def default_namespace(self):
Modified: grokcore.viewlet/trunk/src/grokcore/viewlet/directive.py
===================================================================
--- grokcore.viewlet/trunk/src/grokcore/viewlet/directive.py 2010-02-28 19:23:14 UTC (rev 109511)
+++ grokcore.viewlet/trunk/src/grokcore/viewlet/directive.py 2010-02-28 19:35:47 UTC (rev 109512)
@@ -14,24 +14,26 @@
"""Grok directives.
"""
-from zope.publisher.interfaces.browser import IBrowserView
-
import martian
-from martian import util
from grokcore.component.scan import UnambiguousComponentScope
+from zope.publisher.interfaces.browser import IBrowserView
+
class OneInterfaceOrClassOnClassOrModule(martian.Directive):
"""Convenience base class. Not for public use."""
scope = martian.CLASS_OR_MODULE
store = martian.ONCE
validate = martian.validateInterfaceOrClass
+
class viewletmanager(OneInterfaceOrClassOnClassOrModule):
scope = UnambiguousComponentScope('viewletmanager')
+
class view(OneInterfaceOrClassOnClassOrModule):
default = IBrowserView
+
class order(martian.Directive):
scope = martian.CLASS
store = martian.ONCE
Modified: grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewlet_context.py
===================================================================
--- grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewlet_context.py 2010-02-28 19:23:14 UTC (rev 109511)
+++ grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewlet_context.py 2010-02-28 19:35:47 UTC (rev 109512)
@@ -53,20 +53,23 @@
"""
import grokcore.viewlet as grok
-from zope.interface import Interface
+
class CavemenViewletManager(grok.ViewletManager):
grok.name('manage.cavemen')
+
class FredViewlet(grok.Viewlet):
grok.viewletmanager(CavemenViewletManager)
def render(self):
return 'Me Fred'
+
class Cave(grok.Context):
pass
+
class Index(grok.View):
def render(self):
return "hoi"
Modified: grokcore.viewlet/trunk/src/grokcore/viewlet/interfaces.py
===================================================================
--- grokcore.viewlet/trunk/src/grokcore/viewlet/interfaces.py 2010-02-28 19:23:14 UTC (rev 109511)
+++ grokcore.viewlet/trunk/src/grokcore/viewlet/interfaces.py 2010-02-28 19:35:47 UTC (rev 109512)
@@ -20,6 +20,7 @@
import grokcore.security.interfaces
import grokcore.view.interfaces
+
class IBaseClasses(grokcore.component.interfaces.IBaseClasses,
grokcore.security.interfaces.IBaseClasses,
grokcore.view.interfaces.IBaseClasses):
Modified: grokcore.viewlet/trunk/src/grokcore/viewlet/meta.py
===================================================================
--- grokcore.viewlet/trunk/src/grokcore/viewlet/meta.py 2010-02-28 19:23:14 UTC (rev 109511)
+++ grokcore.viewlet/trunk/src/grokcore/viewlet/meta.py 2010-02-28 19:35:47 UTC (rev 109512)
@@ -34,9 +34,10 @@
martian.priority(1001)
def grok(self, name, module, module_info, config, **kw):
- viewletmanager = determine_module_component(module_info,
- grokcore.viewlet.viewletmanager,
- IGrokViewletManager)
+ viewletmanager = determine_module_component(
+ module_info,
+ grokcore.viewlet.viewletmanager,
+ IGrokViewletManager)
grokcore.viewlet.viewletmanager.set(module, viewletmanager)
return True
@@ -65,22 +66,23 @@
config.action(
discriminator=None,
callable=self.checkTemplates,
- args=(templates, factory.module_info, factory)
- )
+ args=(templates, factory.module_info, factory))
config.action(
- discriminator = ('viewletManager', context, layer, view, name),
- callable = component.provideAdapter,
- args = (factory, (context, layer, view), IViewletManager, name)
- )
+ discriminator=('viewletManager', context, layer, view, name),
+ callable=component.provideAdapter,
+ args=(factory, (context, layer, view), IViewletManager, name))
return True
def checkTemplates(self, templates, module_info, factory):
+
def has_render(factory):
return factory.render != components.ViewletManager.render
+
def has_no_render(factory):
# always has a render method
return False
+
templates.checkTemplates(module_info, factory, 'viewlet manager',
has_render, has_no_render)
@@ -112,29 +114,29 @@
config.action(
discriminator=None,
callable=self.checkTemplates,
- args=(templates, factory.module_info, factory)
- )
+ args=(templates, factory.module_info, factory))
config.action(
- discriminator = ('viewlet', context, layer,
- view, viewletmanager, name),
- callable = component.provideAdapter,
- args = (factory, (context, layer, view, viewletmanager),
- IViewlet, name)
- )
+ discriminator=(
+ 'viewlet', context, layer, view, viewletmanager, name),
+ callable=component.provideAdapter,
+ args=(factory, (context, layer, view, viewletmanager),
+ IViewlet, name))
config.action(
discriminator=('protectName', factory, '__call__'),
callable=make_checker,
- args=(factory, factory, permission, ['update', 'render']),
- )
+ args=(factory, factory, permission, ['update', 'render']))
return True
def checkTemplates(self, templates, module_info, factory):
+
def has_render(factory):
return factory.render != components.Viewlet.render
+
def has_no_render(factory):
return not has_render(factory)
+
templates.checkTemplates(module_info, factory, 'viewlet',
has_render, has_no_render)
Modified: grokcore.viewlet/trunk/src/grokcore/viewlet/tests/viewlet/viewlet_references.py
===================================================================
--- grokcore.viewlet/trunk/src/grokcore/viewlet/tests/viewlet/viewlet_references.py 2010-02-28 19:23:14 UTC (rev 109511)
+++ grokcore.viewlet/trunk/src/grokcore/viewlet/tests/viewlet/viewlet_references.py 2010-02-28 19:35:47 UTC (rev 109512)
@@ -38,7 +38,6 @@
"""
import grokcore.viewlet as grok
-from zope import interface
class AContext(grok.Context):
Modified: grokcore.viewlet/trunk/src/grokcore/viewlet/util.py
===================================================================
--- grokcore.viewlet/trunk/src/grokcore/viewlet/util.py 2010-02-28 19:23:14 UTC (rev 109511)
+++ grokcore.viewlet/trunk/src/grokcore/viewlet/util.py 2010-02-28 19:35:47 UTC (rev 109512)
@@ -13,7 +13,7 @@
##############################################################################
"""Grok utility functions.
"""
-import grokcore.viewlet
+from grokcore.viewlet import directive
from zope.security.checker import NamesChecker, defineChecker
from grokcore.security.util import check_permission
@@ -38,7 +38,7 @@
def _sort_key(component):
# If components have a grok.order directive, sort by that.
- explicit_order, implicit_order = grokcore.viewlet.order.bind().get(component)
+ explicit_order, implicit_order = directive.order.bind().get(component)
return (explicit_order,
component.__module__,
implicit_order,
More information about the checkins
mailing list