Log message for revision 71734:
renamed grok.Utility to grok.GlobalUtility
Changed:
U grok/trunk/src/grok/__init__.py
U grok/trunk/src/grok/components.py
U grok/trunk/src/grok/interfaces.py
U grok/trunk/src/grok/meta.py
U grok/trunk/src/grok/tests/utility/implementsnone.py
U grok/trunk/src/grok/tests/utility/utility.py
-=-
Modified: grok/trunk/src/grok/__init__.py
===================================================================
--- grok/trunk/src/grok/__init__.py 2007-01-06 13:56:55 UTC (rev 71733)
+++ grok/trunk/src/grok/__init__.py 2007-01-06 14:04:23 UTC (rev 71734)
@@ -31,7 +31,7 @@
from grok.components import ClassGrokker, InstanceGrokker, ModuleGrokker
from grok.components import Model, Adapter, MultiAdapter, View, XMLRPC
-from grok.components import PageTemplate, Utility, Container, Traverser, Site
+from grok.components import PageTemplate, GlobalUtility, Container, Traverser, Site
from grok.components import EditForm, DisplayForm, AddForm
from grok.directive import context, name, template, templatedir
from grok._grok import do_grok as grok # Avoid name clash within _grok
Modified: grok/trunk/src/grok/components.py
===================================================================
--- grok/trunk/src/grok/components.py 2007-01-06 13:56:55 UTC (rev 71733)
+++ grok/trunk/src/grok/components.py 2007-01-06 14:04:23 UTC (rev 71734)
@@ -112,7 +112,7 @@
self.context = context
-class Utility(object):
+class GlobalUtility(object):
pass
Modified: grok/trunk/src/grok/interfaces.py
===================================================================
--- grok/trunk/src/grok/interfaces.py 2007-01-06 13:56:55 UTC (rev 71733)
+++ grok/trunk/src/grok/interfaces.py 2007-01-06 14:04:23 UTC (rev 71734)
@@ -28,7 +28,7 @@
Site = interface.Attribute("Mixin class for sites.")
Adapter = interface.Attribute("Base class for adapters.")
MultiAdapter = interface.Attribute("Base class for multi-adapters.")
- Utility = interface.Attribute("Base class for utilities.")
+ GlobalUtility = interface.Attribute("Base class for global utilities.")
View = interface.Attribute("Base class for browser views.")
XMLRPC = interface.Attribute("Base class for XML-RPC methods.")
Traverser = interface.Attribute("Base class for custom traversers.")
Modified: grok/trunk/src/grok/meta.py
===================================================================
--- grok/trunk/src/grok/meta.py 2007-01-06 13:56:55 UTC (rev 71733)
+++ grok/trunk/src/grok/meta.py 2007-01-06 14:04:23 UTC (rev 71734)
@@ -50,8 +50,8 @@
name = util.class_annotation(factory, 'grok.name', '')
component.provideAdapter(factory, name=name)
-class UtilityGrokker(grok.ClassGrokker):
- component_class = grok.Utility
+class GlobalUtilityGrokker(grok.ClassGrokker):
+ component_class = grok.GlobalUtility
def register(self, context, name, factory, module_info, templates):
util.check_implements_one(factory)
Modified: grok/trunk/src/grok/tests/utility/implementsnone.py
===================================================================
--- grok/trunk/src/grok/tests/utility/implementsnone.py 2007-01-06 13:56:55 UTC (rev 71733)
+++ grok/trunk/src/grok/tests/utility/implementsnone.py 2007-01-06 14:04:23 UTC (rev 71734)
@@ -1,5 +1,5 @@
"""
-Subclasses of grok.Utility must implement exactly one interface:
+Subclasses of grok.GlobalUtility must implement exactly one interface:
>>> grok.grok(__name__)
Traceback (most recent call last):
@@ -9,5 +9,5 @@
"""
import grok
-class Club(grok.Utility):
+class Club(grok.GlobalUtility):
pass
Modified: grok/trunk/src/grok/tests/utility/utility.py
===================================================================
--- grok/trunk/src/grok/tests/utility/utility.py 2007-01-06 13:56:55 UTC (rev 71733)
+++ grok/trunk/src/grok/tests/utility/utility.py 2007-01-06 14:04:23 UTC (rev 71734)
@@ -1,5 +1,5 @@
"""
-Global utilities can be created by subclassing grok.Utility:
+Global utilities can be created by subclassing grok.GlobalUtility:
>>> grok.grok(__name__)
>>> from zope import component
@@ -25,9 +25,9 @@
class IClub(interface.Interface):
pass
-class NormalClub(grok.Utility):
+class NormalClub(grok.GlobalUtility):
grok.implements(IClub)
-class HugeClub(grok.Utility):
+class HugeClub(grok.GlobalUtility):
grok.implements(IClub)
grok.name('huge')