[Checkins] SVN: grok/trunk/src/grok/ fixes to adapt to the components in grokcore.site
Jan Wijbrand Kolman
cvs-admin at zope.org
Sun Apr 29 16:12:41 UTC 2012
Log message for revision 125407:
fixes to adapt to the components in grokcore.site
Changed:
U grok/trunk/src/grok/__init__.py
U grok/trunk/src/grok/tests/application/application.py
U grok/trunk/src/grok/tests/catalog/indexes_no_app.py
-=-
Modified: grok/trunk/src/grok/__init__.py
===================================================================
--- grok/trunk/src/grok/__init__.py 2012-04-29 16:12:04 UTC (rev 125406)
+++ grok/trunk/src/grok/__init__.py 2012-04-29 16:12:37 UTC (rev 125407)
@@ -66,15 +66,15 @@
from grokcore.annotation import Annotation
-from grokcore.site import Application
-from grokcore.site import ApplicationInitializedEvent
+from grokcore.site.interfaces import IApplication
from grokcore.site.interfaces import IApplicationInitializedEvent
-from grokcore.site import LocalUtility
-from grokcore.site import Site
+from grokcore.site.interfaces import ApplicationInitializedEvent
+from grokcore.site import Application
from grokcore.site import getApplication
from grokcore.site import local_utility
-from grokcore.site.interfaces import IApplication
-from grokcore.site.interfaces import IApplicationInitializedEvent
+from grokcore.site import LocalUtility
+from grokcore.site import site
+from grokcore.site import Site
from zope.event import notify
from zope.site.hooks import getSite
@@ -110,7 +110,6 @@
from grok.interfaces import IRESTSkinType, IRESTLayer
-from grokcore.site import site
from grokcore.rest import restskin
from grokcore.traverser import traversable
Modified: grok/trunk/src/grok/tests/application/application.py
===================================================================
--- grok/trunk/src/grok/tests/application/application.py 2012-04-29 16:12:04 UTC (rev 125406)
+++ grok/trunk/src/grok/tests/application/application.py 2012-04-29 16:12:37 UTC (rev 125407)
@@ -1,13 +1,13 @@
"""
-
After grokking a module that defines an application, the application factory is
available as a utility::
>>> grok.testing.grok(__name__)
>>> import zope.component
>>> import grokcore.site.interfaces
- >>> calendar_app = zope.component.getUtility(grokcore.site.interfaces.IApplication,
- ... name='grok.tests.application.application.Calendar')
+ >>> calendar_app = zope.component.getUtility(
+ ... grokcore.site.interfaces.IApplication,
+ ... name='grok.tests.application.application.Calendar')
>>> calendar_app
<class 'grok.tests.application.application.Calendar'>
@@ -26,7 +26,6 @@
import grok
-
class Calendar(grok.Application):
"""A calendar application that knows about ancient
calendar systems from the stone age.
Modified: grok/trunk/src/grok/tests/catalog/indexes_no_app.py
===================================================================
--- grok/trunk/src/grok/tests/catalog/indexes_no_app.py 2012-04-29 16:12:04 UTC (rev 125406)
+++ grok/trunk/src/grok/tests/catalog/indexes_no_app.py 2012-04-29 16:12:37 UTC (rev 125407)
@@ -6,10 +6,10 @@
>>> grok.testing.grok(__name__)
Traceback (most recent call last):
...
- GrokError: No site specified for grok.Indexes subclass in module
+ GrokError: No site specified for grokcore.catalog.Indexes subclass in module
<module 'grok.tests.catalog.indexes_no_app' from ...>.
Use grokcore.site.site() to specify.
-
+
"""
import grok
from grok import index
@@ -23,7 +23,7 @@
class MammothIndexes(grok.Indexes):
grok.context(Mammoth)
grok.name('foo_catalog')
-
+
name = index.Field()
age = index.Field()
message = index.Text()
More information about the checkins
mailing list