[Checkins] SVN: grokcore.component/trunk/ Renamed the module inside
of "grokcore.component" so that instead of
Brandon Rhodes
brandon at rhodesmill.org
Tue Mar 18 12:30:11 EDT 2008
Log message for revision 84754:
Renamed the module inside of "grokcore.component" so that instead of
being "grok", as it was when we copied it, it is now actually named
"grokcore.component". All tests now run. Thanks much to the eyes of
Robert Marianski.
Changed:
U grokcore.component/trunk/buildout.cfg
U grokcore.component/trunk/setup.py
D grokcore.component/trunk/src/grok/
A grokcore.component/trunk/src/grokcore/
A grokcore.component/trunk/src/grokcore/component/
U grokcore.component/trunk/src/grokcore/component/__init__.py
U grokcore.component/trunk/src/grokcore/component/configure.zcml
U grokcore.component/trunk/src/grokcore/component/directive.py
U grokcore.component/trunk/src/grokcore/component/meta.py
U grokcore.component/trunk/src/grokcore/component/testing.py
U grokcore.component/trunk/src/grokcore/component/tests/adapter/adapter.py
U grokcore.component/trunk/src/grokcore/component/tests/adapter/adapterdecorator.py
U grokcore.component/trunk/src/grokcore/component/tests/adapter/alphabetical.py
U grokcore.component/trunk/src/grokcore/component/tests/adapter/classcontext.py
U grokcore.component/trunk/src/grokcore/component/tests/adapter/classcontextimported.py
U grokcore.component/trunk/src/grokcore/component/tests/adapter/classcontextmultiple.py
U grokcore.component/trunk/src/grokcore/component/tests/adapter/classcontextmultiple_fixture.py
U grokcore.component/trunk/src/grokcore/component/tests/adapter/classorinterface.py
U grokcore.component/trunk/src/grokcore/component/tests/adapter/functionasargument_fixture.py
U grokcore.component/trunk/src/grokcore/component/tests/adapter/functioncontext.py
U grokcore.component/trunk/src/grokcore/component/tests/adapter/implementsmany.py
U grokcore.component/trunk/src/grokcore/component/tests/adapter/implementsnone.py
U grokcore.component/trunk/src/grokcore/component/tests/adapter/implementsnonemulti.py
U grokcore.component/trunk/src/grokcore/component/tests/adapter/importedmodel.py
U grokcore.component/trunk/src/grokcore/component/tests/adapter/importedmodel2.py
U grokcore.component/trunk/src/grokcore/component/tests/adapter/interface.py
U grokcore.component/trunk/src/grokcore/component/tests/adapter/interfacemodule.py
U grokcore.component/trunk/src/grokcore/component/tests/adapter/modulecontext.py
U grokcore.component/trunk/src/grokcore/component/tests/adapter/modulecontextimported.py
U grokcore.component/trunk/src/grokcore/component/tests/adapter/modulecontextmultiple.py
U grokcore.component/trunk/src/grokcore/component/tests/adapter/modulecontextmultiple_fixture.py
U grokcore.component/trunk/src/grokcore/component/tests/adapter/multiadapter.py
U grokcore.component/trunk/src/grokcore/component/tests/adapter/multiadaptsnone.py
U grokcore.component/trunk/src/grokcore/component/tests/adapter/multiple.py
U grokcore.component/trunk/src/grokcore/component/tests/adapter/namedadapter.py
U grokcore.component/trunk/src/grokcore/component/tests/adapter/noarguments_fixture.py
U grokcore.component/trunk/src/grokcore/component/tests/adapter/nomodel.py
U grokcore.component/trunk/src/grokcore/component/tests/adapter/oldstyleclass.py
U grokcore.component/trunk/src/grokcore/component/tests/adapter/order.py
U grokcore.component/trunk/src/grokcore/component/tests/directive/argumenterror.py
U grokcore.component/trunk/src/grokcore/component/tests/directive/argumenterror_fixture.py
U grokcore.component/trunk/src/grokcore/component/tests/directive/multipletimes.py
U grokcore.component/trunk/src/grokcore/component/tests/grokker/continue_scanning.py
U grokcore.component/trunk/src/grokcore/component/tests/grokker/continue_scanning_fixture.py
U grokcore.component/trunk/src/grokcore/component/tests/grokker/grokcomponent.py
U grokcore.component/trunk/src/grokcore/component/tests/grokker/onlyonce.py
U grokcore.component/trunk/src/grokcore/component/tests/grokker/onlyonce_fixture/component.py
U grokcore.component/trunk/src/grokcore/component/tests/grokker/priority.py
U grokcore.component/trunk/src/grokcore/component/tests/grokker/priority_fixture.py
U grokcore.component/trunk/src/grokcore/component/tests/order/arg_orderdirective.py
U grokcore.component/trunk/src/grokcore/component/tests/order/combined_orderdirective.py
U grokcore.component/trunk/src/grokcore/component/tests/order/combinednoorder_orderdirective.py
U grokcore.component/trunk/src/grokcore/component/tests/order/inter1.py
U grokcore.component/trunk/src/grokcore/component/tests/order/inter2.py
U grokcore.component/trunk/src/grokcore/component/tests/order/noarg_orderdirective.py
U grokcore.component/trunk/src/grokcore/component/tests/order/nodirective.py
U grokcore.component/trunk/src/grokcore/component/tests/test_grok.py
U grokcore.component/trunk/src/grokcore/component/tests/testsetup/basicsetup.py
U grokcore.component/trunk/src/grokcore/component/tests/testsetup/unittestsetup.py
U grokcore.component/trunk/src/grokcore/component/tests/util/class_annotation.py
U grokcore.component/trunk/src/grokcore/component/tests/util/public_methods_from_class.py
U grokcore.component/trunk/src/grokcore/component/tests/utility/implementsmany.py
U grokcore.component/trunk/src/grokcore/component/tests/utility/implementsmany2.py
U grokcore.component/trunk/src/grokcore/component/tests/utility/implementsnone.py
U grokcore.component/trunk/src/grokcore/component/tests/utility/implementsnone2.py
U grokcore.component/trunk/src/grokcore/component/tests/utility/utility.py
U grokcore.component/trunk/src/grokcore/component/tests/view/nomodulename.py
U grokcore.component/trunk/src/grokcore/component/tests/view/nomodulename_fixture.py
-=-
Modified: grokcore.component/trunk/buildout.cfg
===================================================================
--- grokcore.component/trunk/buildout.cfg 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/buildout.cfg 2008-03-18 16:30:10 UTC (rev 84754)
@@ -59,5 +59,5 @@
[test]
recipe = zc.recipe.testrunner
-eggs = grok
+eggs = grokcore.component
defaults = ['--tests-pattern', '^f?tests$', '-v']
Modified: grokcore.component/trunk/setup.py
===================================================================
--- grokcore.component/trunk/setup.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/setup.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -14,13 +14,13 @@
)
setup(
- name='grok',
+ name='grokcore.component',
version='0.12dev',
author='Grok Team',
author_email='grok-dev at zope.org',
url='http://grok.zope.org',
download_url='http://cheeseshop.python.org/pypi/grok/',
- description='Grok: Now even cavemen can use Zope 3!',
+ description='Grok component registration core',
long_description=long_description,
license='ZPL',
classifiers=['Environment :: Web Environment',
Copied: grokcore.component/trunk/src/grokcore/component (from rev 84753, grokcore.component/trunk/src/grok)
Modified: grokcore.component/trunk/src/grokcore/component/__init__.py
===================================================================
--- grokcore.component/trunk/src/grok/__init__.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/__init__.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -18,20 +18,20 @@
from zope.component import adapts
from martian import ClassGrokker, InstanceGrokker, GlobalGrokker
-from grok.components import Adapter, GlobalUtility, MultiAdapter, Context
+from grokcore.component.components import Adapter, GlobalUtility, MultiAdapter, Context
-from grok.directive import (context, name, title,
+from grokcore.component.directive import (context, name, title,
provides, baseclass, global_utility,
direct, order)
-from grok.decorators import adapter, implementer
+from grokcore.component.decorators import adapter, implementer
from martian.error import GrokError, GrokImportError
# BBB These two functions are meant for test fixtures and should be
-# imported from grok.testing, not from grok.
-from grok.testing import grok, grok_component
+# imported from grokcore.component.testing, not from grokcore.component.
+from grokcore.component.testing import grok, grok_component
# Our __init__ provides the grok API directly so using 'import grok' is enough.
-from grok.interfaces import IGrokAPI
+from grokcore.component.interfaces import IGrokAPI
from zope.interface import moduleProvides
moduleProvides(IGrokAPI)
__all__ = list(IGrokAPI)
Modified: grokcore.component/trunk/src/grokcore/component/configure.zcml
===================================================================
--- grokcore.component/trunk/src/grok/configure.zcml 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/configure.zcml 2008-03-18 16:30:10 UTC (rev 84754)
@@ -7,7 +7,7 @@
<include package="zope.i18n" file="meta.zcml" />
<include package="zope.securitypolicy" file="meta.zcml" />
<include package="zope.app.zcmlfiles" file="meta.zcml" />
- <include package="grok" file="meta.zcml" />
+ <include package="grokcore.component" file="meta.zcml" />
<include package="zope.annotation" />
<include package="zope.copypastemove" />
Modified: grokcore.component/trunk/src/grokcore/component/directive.py
===================================================================
--- grokcore.component/trunk/src/grok/directive.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/directive.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -18,9 +18,8 @@
from martian.error import GrokImportError
from martian.directive import (OnceDirective,
- MultipleTimesDirective, BaseTextDirective,
- SingleValue, SingleTextDirective,
- MultipleTextDirective,
+ MultipleTimesDirective,
+ SingleTextDirective,
MarkerDirective,
InterfaceDirective,
InterfaceOrClassDirective,
Modified: grokcore.component/trunk/src/grokcore/component/meta.py
===================================================================
--- grokcore.component/trunk/src/grok/meta.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/meta.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -17,10 +17,10 @@
import martian
from martian import util
-import grok
-from grok.util import check_adapts
-from grok.util import check_module_component, determine_module_component
-from grok.util import determine_class_component
+import grokcore.component
+from grokcore.component.util import check_adapts
+from grokcore.component.util import check_module_component, determine_module_component
+from grokcore.component.util import determine_class_component
def get_context(module_info, factory):
return determine_class_component(module_info, factory,
@@ -30,7 +30,7 @@
return get_name(factory, factory.__name__.lower())
def get_name(factory, default=''):
- return grok.util.class_annotation(factory, 'grok.name', default)
+ return grokcore.component.util.class_annotation(factory, 'grok.name', default)
def get_provides(factory):
provides = util.class_annotation(factory, 'grok.provides', None)
@@ -44,12 +44,12 @@
def grok(self, name, module, module_info, config, **kw):
context = determine_module_component(module_info, 'grok.context',
- [grok.Context])
+ [grokcore.component.Context])
module.__grok_context__ = context
return True
class AdapterGrokker(martian.ClassGrokker):
- component_class = grok.Adapter
+ component_class = grokcore.component.Adapter
def grok(self, name, factory, module_info, config, **kw):
adapter_context = get_context(module_info, factory)
@@ -64,7 +64,7 @@
return True
class MultiAdapterGrokker(martian.ClassGrokker):
- component_class = grok.MultiAdapter
+ component_class = grokcore.component.MultiAdapter
def grok(self, name, factory, module_info, config, **kw):
provides = get_provides(factory)
@@ -81,7 +81,7 @@
return True
class GlobalUtilityGrokker(martian.ClassGrokker):
- component_class = grok.GlobalUtility
+ component_class = grokcore.component.GlobalUtility
# This needs to happen before the FilesystemPageTemplateGrokker grokker
# happens, since it relies on the ITemplateFileFactories being grokked.
Modified: grokcore.component/trunk/src/grokcore/component/testing.py
===================================================================
--- grokcore.component/trunk/src/grok/testing.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/testing.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -15,15 +15,13 @@
"""
from zope.configuration.config import ConfigurationMachine
from martian import scan
-from grok import zcml
+from grokcore.component import zcml
import unittest
from os import listdir
import os.path
import re
from zope.testing import doctest, cleanup
-from zope.app.testing.functional import (
- HTTPCaller, getRootFolder, sync)
#, FunctionalDocFileSuite
#, FunctionalTestSetup
@@ -162,7 +160,7 @@
def grok(module_name):
config = ConfigurationMachine()
- zcml.do_grok('grok.meta', config)
+ zcml.do_grok('grokcore.component.meta', config)
zcml.do_grok(module_name, config)
config.execute_actions()
Modified: grokcore.component/trunk/src/grokcore/component/tests/adapter/adapter.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/adapter.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/adapter/adapter.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -16,7 +16,7 @@
True
"""
-import grok
+import grokcore.component as grok
from zope import interface
class Cave(grok.Context):
Modified: grokcore.component/trunk/src/grokcore/component/tests/adapter/adapterdecorator.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/adapterdecorator.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/adapter/adapterdecorator.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -19,19 +19,19 @@
>>> isinstance(yetanotherhome, Home)
True
- >>> from grok.tests.adapter import noarguments_fixture
+ >>> from grokcore.component.tests.adapter import noarguments_fixture
Traceback (most recent call last):
...
GrokImportError: @grok.adapter requires at least one argument.
- >>> from grok.tests.adapter import functionasargument_fixture
+ >>> from grokcore.component.tests.adapter import functionasargument_fixture
Traceback (most recent call last):
...
GrokImportError: @grok.adapter requires at least one argument.
"""
-import grok
+import grokcore.component as grok
from zope import interface
class IDummy(interface.Interface):
Modified: grokcore.component/trunk/src/grokcore/component/tests/adapter/alphabetical.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/alphabetical.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/adapter/alphabetical.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -12,7 +12,7 @@
True
"""
-import grok
+import grokcore.component as grok
from zope import interface
class ZCave(grok.Context):
Modified: grokcore.component/trunk/src/grokcore/component/tests/adapter/classcontext.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/classcontext.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/adapter/classcontext.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -12,7 +12,7 @@
True
"""
-import grok
+import grokcore.component as grok
from zope import interface
class Cave(grok.Context):
Modified: grokcore.component/trunk/src/grokcore/component/tests/adapter/classcontextimported.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/classcontextimported.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/adapter/classcontextimported.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -12,8 +12,8 @@
True
"""
-import grok
-from grok.tests.adapter.adapter import Cave
+import grokcore.component as grok
+from grokcore.component.tests.adapter.adapter import Cave
from zope import interface
class IPainting(interface.Interface):
Modified: grokcore.component/trunk/src/grokcore/component/tests/adapter/classcontextmultiple.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/classcontextmultiple.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/adapter/classcontextmultiple.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -1,7 +1,7 @@
"""
You can't call grok.context multiple times on class level:
- >>> import grok.tests.adapter.classcontextmultiple_fixture
+ >>> import grokcore.component.tests.adapter.classcontextmultiple_fixture
Traceback (most recent call last):
...
GrokImportError: grok.context can only be called once per class or module.
Modified: grokcore.component/trunk/src/grokcore/component/tests/adapter/classcontextmultiple_fixture.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/classcontextmultiple_fixture.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/adapter/classcontextmultiple_fixture.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -1,4 +1,4 @@
-import grok
+import grokcore.component as grok
class Cave(grok.Context):
pass
Modified: grokcore.component/trunk/src/grokcore/component/tests/adapter/classorinterface.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/classorinterface.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/adapter/classorinterface.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -23,7 +23,7 @@
GrokImportError: You can only pass classes or interfaces to grok.context.
"""
-import grok
+import grokcore.component as grok
def function_context():
def a():
Modified: grokcore.component/trunk/src/grokcore/component/tests/adapter/functionasargument_fixture.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/functionasargument_fixture.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/adapter/functionasargument_fixture.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -1,4 +1,4 @@
-import grok
+import grokcore.component as grok
from zope import interface
class IDummy(interface.Interface):
Modified: grokcore.component/trunk/src/grokcore/component/tests/adapter/functioncontext.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/functioncontext.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/adapter/functioncontext.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -14,8 +14,8 @@
GrokImportError: grok.context can only be used on class or module level.
"""
-import grok
-from grok.tests.adapter.adapter import Cave
+import grokcore.component as grok
+from grokcore.component.tests.adapter.adapter import Cave
def func():
"""We don't allow calling `grok.context` from anything else than a
Modified: grokcore.component/trunk/src/grokcore/component/tests/adapter/implementsmany.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/implementsmany.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/adapter/implementsmany.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -5,10 +5,10 @@
>>> grok.testing.grok(__name__)
Traceback (most recent call last):
...
- GrokError: <class 'grok.tests.adapter.implementsmany.Home'> is implementing
+ GrokError: <class 'grokcore.component.tests.adapter.implementsmany.Home'> is implementing
more than one interface (use grok.provides to specify which one to use).
"""
-import grok
+import grokcore.component as grok
from zope import interface
Modified: grokcore.component/trunk/src/grokcore/component/tests/adapter/implementsnone.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/implementsnone.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/adapter/implementsnone.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -5,10 +5,10 @@
>>> grok.testing.grok(__name__)
Traceback (most recent call last):
...
- GrokError: <class 'grok.tests.adapter.implementsnone.Home'> must
+ GrokError: <class 'grokcore.component.tests.adapter.implementsnone.Home'> must
implement at least one interface (use grok.implements to specify).
"""
-import grok
+import grokcore.component as grok
class Cave(grok.Context):
pass
Modified: grokcore.component/trunk/src/grokcore/component/tests/adapter/implementsnonemulti.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/implementsnonemulti.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/adapter/implementsnonemulti.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -5,10 +5,10 @@
>>> grok.testing.grok(__name__)
Traceback (most recent call last):
...
- GrokError: <class 'grok.tests.adapter.implementsnonemulti.Home'> must
+ GrokError: <class 'grokcore.component.tests.adapter.implementsnonemulti.Home'> must
implement at least one interface (use grok.implements to specify).
"""
-import grok
+import grokcore.component as grok
class Cave(grok.Context):
pass
Modified: grokcore.component/trunk/src/grokcore/component/tests/adapter/importedmodel.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/importedmodel.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/adapter/importedmodel.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -1,14 +1,14 @@
"""
Imported model and adapter won't be grokked:
- >>> import grok
+ >>> import grokcore.component as grok
>>> grok.testing.grok(__name__)
- >>> from grok.tests.adapter.adapter import IHome
+ >>> from grokcore.component.tests.adapter.adapter import IHome
>>> cave = Cave()
>>> home = IHome(cave)
Traceback (most recent call last):
...
- TypeError: ('Could not adapt', <grok.tests.adapter.adapter.Cave object at ...>, <InterfaceClass grok.tests.adapter.adapter.IHome>)
+ TypeError: ('Could not adapt', <grokcore.component.tests.adapter.adapter.Cave object at ...>, <InterfaceClass grokcore.component.tests.adapter.adapter.IHome>)
"""
-from grok.tests.adapter.adapter import Cave, Home
+from grokcore.component.tests.adapter.adapter import Cave, Home
Modified: grokcore.component/trunk/src/grokcore/component/tests/adapter/importedmodel2.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/importedmodel2.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/adapter/importedmodel2.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -5,11 +5,11 @@
Traceback (most recent call last):
...
GrokError: No module-level context for
- <class 'grok.tests.adapter.importedmodel2.Painting'>, please use grok.context.
+ <class 'grokcore.component.tests.adapter.importedmodel2.Painting'>, please use grok.context.
"""
-import grok
-from grok.tests.adapter.adapter import Cave
+import grokcore.component as grok
+from grokcore.component.tests.adapter.adapter import Cave
from zope import interface
class IPainting(interface.Interface):
Modified: grokcore.component/trunk/src/grokcore/component/tests/adapter/interface.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/interface.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/adapter/interface.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -21,7 +21,7 @@
True
"""
-import grok
+import grokcore.component as grok
from zope import interface
class ICave(interface.Interface):
Modified: grokcore.component/trunk/src/grokcore/component/tests/adapter/interfacemodule.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/interfacemodule.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/adapter/interfacemodule.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -21,7 +21,7 @@
True
"""
-import grok
+import grokcore.component as grok
from zope import interface
class ICave(interface.Interface):
Modified: grokcore.component/trunk/src/grokcore/component/tests/adapter/modulecontext.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/modulecontext.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/adapter/modulecontext.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -12,7 +12,7 @@
True
"""
-import grok
+import grokcore.component as grok
from zope import interface
class Cave(grok.Context):
Modified: grokcore.component/trunk/src/grokcore/component/tests/adapter/modulecontextimported.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/modulecontextimported.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/adapter/modulecontextimported.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -12,8 +12,8 @@
True
"""
-import grok
-from grok.tests.adapter.adapter import Cave
+import grokcore.component as grok
+from grokcore.component.tests.adapter.adapter import Cave
from zope import interface
grok.context(Cave)
Modified: grokcore.component/trunk/src/grokcore/component/tests/adapter/modulecontextmultiple.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/modulecontextmultiple.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/adapter/modulecontextmultiple.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -1,7 +1,7 @@
"""
You can't call grok.context multiple times on module level:
- >>> import grok.tests.adapter.modulecontextmultiple_fixture
+ >>> import grokcore.component.tests.adapter.modulecontextmultiple_fixture
Traceback (most recent call last):
...
GrokImportError: grok.context can only be called once per class or module.
Modified: grokcore.component/trunk/src/grokcore/component/tests/adapter/modulecontextmultiple_fixture.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/modulecontextmultiple_fixture.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/adapter/modulecontextmultiple_fixture.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -1,4 +1,4 @@
-import grok
+import grokcore.component as grok
from zope import interface
class Cave(grok.Context):
Modified: grokcore.component/trunk/src/grokcore/component/tests/adapter/multiadapter.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/multiadapter.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/adapter/multiadapter.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -48,7 +48,7 @@
True
"""
-import grok
+import grokcore.component as grok
from zope import interface
class Cave(grok.Context):
Modified: grokcore.component/trunk/src/grokcore/component/tests/adapter/multiadaptsnone.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/multiadaptsnone.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/adapter/multiadaptsnone.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -4,10 +4,10 @@
>>> grok.testing.grok(__name__)
Traceback (most recent call last):
...
- GrokError: <class 'grok.tests.adapter.multiadaptsnone.Home'> must specify
+ GrokError: <class 'grokcore.component.tests.adapter.multiadaptsnone.Home'> must specify
which contexts it adapts (use grok.adapts to specify).
"""
-import grok
+import grokcore.component as grok
from zope import interface
Modified: grokcore.component/trunk/src/grokcore/component/tests/adapter/multiple.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/multiple.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/adapter/multiple.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -5,10 +5,10 @@
Traceback (most recent call last):
...
GrokError: Multiple possible contexts for
- <class 'grok.tests.adapter.multiple.Home'>, please use grok.context.
+ <class 'grokcore.component.tests.adapter.multiple.Home'>, please use grok.context.
"""
-import grok
+import grokcore.component as grok
from zope import interface
class Cave(grok.Context):
Modified: grokcore.component/trunk/src/grokcore/component/tests/adapter/namedadapter.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/namedadapter.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/adapter/namedadapter.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -7,7 +7,7 @@
>>> home = IHome(cave)
Traceback (most recent call last):
...
- TypeError: ('Could not adapt', <grok.tests.adapter.namedadapter.Cave object at 0x...>, <InterfaceClass grok.tests.adapter.namedadapter.IHome>)
+ TypeError: ('Could not adapt', <grokcore.component.tests.adapter.namedadapter.Cave object at 0x...>, <InterfaceClass grokcore.component.tests.adapter.namedadapter.IHome>)
>>> from zope.component import getAdapter
>>> home = getAdapter(cave, IHome, name='home')
@@ -17,7 +17,7 @@
True
"""
-import grok
+import grokcore.component as grok
from zope import interface
class Cave(grok.Context):
Modified: grokcore.component/trunk/src/grokcore/component/tests/adapter/noarguments_fixture.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/noarguments_fixture.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/adapter/noarguments_fixture.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -1,4 +1,4 @@
-import grok
+import grokcore.component as grok
from zope import interface
class IDummy(interface.Interface):
Modified: grokcore.component/trunk/src/grokcore/component/tests/adapter/nomodel.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/nomodel.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/adapter/nomodel.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -5,10 +5,10 @@
Traceback (most recent call last):
...
GrokError: No module-level context for
- <class 'grok.tests.adapter.nomodel.Home'>, please use grok.context.
+ <class 'grokcore.component.tests.adapter.nomodel.Home'>, please use grok.context.
"""
-import grok
+import grokcore.component as grok
from zope import interface
class IHome(interface.Interface):
Modified: grokcore.component/trunk/src/grokcore/component/tests/adapter/oldstyleclass.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/oldstyleclass.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/adapter/oldstyleclass.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -11,7 +11,7 @@
>>> isinstance(home, Home)
True
"""
-import grok
+import grokcore.component as grok
from zope import interface
class Cave:
Modified: grokcore.component/trunk/src/grokcore/component/tests/adapter/order.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/order.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/adapter/order.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -13,7 +13,7 @@
True
"""
-import grok
+import grokcore.component as grok
from zope import interface
class IHome(interface.Interface):
Modified: grokcore.component/trunk/src/grokcore/component/tests/directive/argumenterror.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/directive/argumenterror.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/directive/argumenterror.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -1,5 +1,5 @@
"""
- >>> import grok.tests.directive.argumenterror_fixture
+ >>> import grokcore.component.tests.directive.argumenterror_fixture
Traceback (most recent call last):
...
TypeError: grok.name takes exactly 1 argument (3 given)
Modified: grokcore.component/trunk/src/grokcore/component/tests/directive/argumenterror_fixture.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/directive/argumenterror_fixture.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/directive/argumenterror_fixture.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -1,3 +1,3 @@
-import grok
+import grokcore.component as grok
grok.name('too', 'many', 'arguments')
Modified: grokcore.component/trunk/src/grokcore/component/tests/directive/multipletimes.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/directive/multipletimes.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/directive/multipletimes.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -3,27 +3,27 @@
GlobalUtilityInfo objects annotated on the module.
>>> from martian import scan
- >>> from grok.tests.directive import multipletimes
+ >>> from grokcore.component.tests.directive import multipletimes
>>> module_info = scan.module_info_from_module(multipletimes)
>>> guis = module_info.getAnnotation('grok.global_utility', None)
>>> guis
- [<grok.directive.GlobalUtilityInfo object at 0x...>,
- <grok.directive.GlobalUtilityInfo object at 0x...>]
+ [<grokcore.component.directive.GlobalUtilityInfo object at 0x...>,
+ <grokcore.component.directive.GlobalUtilityInfo object at 0x...>]
>>> guis[0].factory
- <class 'grok.tests.directive.multipletimes.Club'>
+ <class 'grokcore.component.tests.directive.multipletimes.Club'>
>>> guis[0].provides
- <InterfaceClass grok.tests.directive.multipletimes.IClub>
+ <InterfaceClass grokcore.component.tests.directive.multipletimes.IClub>
>>> guis[0].name
'foo'
>>> guis[1].factory
- <class 'grok.tests.directive.multipletimes.Cave'>
+ <class 'grokcore.component.tests.directive.multipletimes.Cave'>
>>> guis[1].provides is None
True
>>> guis[1].name
u''
"""
-import grok
+import grokcore.component as grok
from zope import interface
class IClub(interface.Interface):
Modified: grokcore.component/trunk/src/grokcore/component/tests/grokker/continue_scanning.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/grokker/continue_scanning.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/grokker/continue_scanning.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -10,12 +10,12 @@
In the fixture there is AlphaBetaSub that inherits from both Alpha and Beta.
Thus, both Grokkers are executed, with AlphaGrokker coming before BetaGrokker::
- >>> grok.testing.grok('grok.tests.grokker.continue_scanning_fixture')
+ >>> grok.testing.grok('grokcore.component.tests.grokker.continue_scanning_fixture')
alpha
beta
"""
-import grok
+import grokcore.component as grok
class Alpha(object):
Modified: grokcore.component/trunk/src/grokcore/component/tests/grokker/continue_scanning_fixture.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/grokker/continue_scanning_fixture.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/grokker/continue_scanning_fixture.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -1,4 +1,4 @@
-from grok.tests.grokker.continue_scanning import Alpha, Beta
+from grokcore.component.tests.grokker.continue_scanning import Alpha, Beta
class AlphaBetaSub(Alpha, Beta):
pass
Modified: grokcore.component/trunk/src/grokcore/component/tests/grokker/grokcomponent.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/grokker/grokcomponent.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/grokker/grokcomponent.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -2,8 +2,8 @@
Let's first grok the meta module to define some basic grokkers::
- >>> import grok
- >>> grok.testing.grok('grok.meta')
+ >>> import grokcore.component as grok
+ >>> grok.testing.grok('grokcore.component.meta')
It is possible to grok an individual component. Let's define an adapter::
@@ -43,7 +43,7 @@
>>> grok.testing.grok_component('SecondAdapter', SecondAdapter)
Traceback (most recent call last):
...
- GrokError: No module-level context for <class 'grok.tests.grokker.grokcomponent.SecondAdapter'>, please use grok.context.
+ GrokError: No module-level context for <class 'grokcore.component.tests.grokker.grokcomponent.SecondAdapter'>, please use grok.context.
So we need to supply the context ourselves::
Modified: grokcore.component/trunk/src/grokcore/component/tests/grokker/onlyonce.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/grokker/onlyonce.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/grokker/onlyonce.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -8,8 +8,8 @@
We do it manually now::
- >>> import grok
- >>> grok.testing.grok('grok.tests.grokker.onlyonce_fixture._meta')
+ >>> import grokcore.component as grok
+ >>> grok.testing.grok('grokcore.component.tests.grokker.onlyonce_fixture._meta')
This _meta.py module then will be grokked again during 'normal' grok time. Grok
will not re-register the grokkers as this could have unwanted side-effects. It
@@ -21,7 +21,7 @@
To simulate this, we grok the whole package::
- >>> grok.testing.grok('grok.tests.grokker.onlyonce_fixture')
+ >>> grok.testing.grok('grokcore.component.tests.grokker.onlyonce_fixture')
alpha
"""
Modified: grokcore.component/trunk/src/grokcore/component/tests/grokker/onlyonce_fixture/component.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/grokker/onlyonce_fixture/component.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/grokker/onlyonce_fixture/component.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -1,4 +1,4 @@
-import grok
+import grokcore.component as grok
class Alpha(object):
grok.baseclass()
Modified: grokcore.component/trunk/src/grokcore/component/tests/grokker/priority.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/grokker/priority.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/grokker/priority.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -11,13 +11,13 @@
We grok a module that implements subclasses for Alpha, Beta, and Gamma and our
grokkers get executed in the order of priority (highest first)::
- >>> grok.testing.grok('grok.tests.grokker.priority_fixture')
+ >>> grok.testing.grok('grokcore.component.tests.grokker.priority_fixture')
beta
alpha
gamma
"""
-import grok
+import grokcore.component as grok
class Alpha(object):
Modified: grokcore.component/trunk/src/grokcore/component/tests/grokker/priority_fixture.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/grokker/priority_fixture.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/grokker/priority_fixture.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -1,10 +1,10 @@
-import grok.tests.grokker.priority
+import grokcore.component.tests.grokker.priority
-class AlphaSub(grok.tests.grokker.priority.Alpha):
+class AlphaSub(grokcore.component.tests.grokker.priority.Alpha):
pass
-class BetaSub(grok.tests.grokker.priority.Beta):
+class BetaSub(grokcore.component.tests.grokker.priority.Beta):
pass
-class GammaSub(grok.tests.grokker.priority.Gamma):
+class GammaSub(grokcore.component.tests.grokker.priority.Gamma):
pass
Modified: grokcore.component/trunk/src/grokcore/component/tests/order/arg_orderdirective.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/order/arg_orderdirective.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/order/arg_orderdirective.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -5,7 +5,7 @@
>>> components = [First(), Second(), Third(), Fourth(), Fifth()]
- >>> from grok.util import sort_components
+ >>> from grokcore.component.util import sort_components
>>> sort_components(components)
[<...Fifth object at ...>,
<...Fourth object at ...>,
@@ -15,7 +15,7 @@
"""
-import grok
+import grokcore.component as grok
class First(object):
grok.order(5)
Modified: grokcore.component/trunk/src/grokcore/component/tests/order/combined_orderdirective.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/order/combined_orderdirective.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/order/combined_orderdirective.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -6,7 +6,7 @@
>>> components = [First(), Second(), Third(), Fourth(), Fifth()]
- >>> from grok.util import sort_components
+ >>> from grokcore.component.util import sort_components
>>> sort_components(components)
[<...Third object at ...>,
<...Fourth object at ...>,
@@ -16,7 +16,7 @@
"""
-import grok
+import grokcore.component as grok
class First(object):
grok.order(2)
Modified: grokcore.component/trunk/src/grokcore/component/tests/order/combinednoorder_orderdirective.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/order/combinednoorder_orderdirective.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/order/combinednoorder_orderdirective.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -6,7 +6,7 @@
>>> components = [First(), Second(), Third(), Fourth(), Fifth()]
- >>> from grok.util import sort_components
+ >>> from grokcore.component.util import sort_components
>>> sort_components(components)
[<...Fifth object at ...>,
<...Third object at ...>,
@@ -16,7 +16,7 @@
"""
-import grok
+import grokcore.component as grok
class First(object):
grok.order()
Modified: grokcore.component/trunk/src/grokcore/component/tests/order/inter1.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/order/inter1.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/order/inter1.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -12,7 +12,7 @@
>>> from inter2 import Four, Five, Six
>>> components = [One(), Two(), Three(), Four(), Five(), Six()]
- >>> from grok.util import sort_components
+ >>> from grokcore.component.util import sort_components
>>> sort_components(components)
[<...Three object at ...>,
<...One object at ...>,
@@ -23,7 +23,7 @@
"""
-import grok
+import grokcore.component as grok
class One(object):
grok.order()
Modified: grokcore.component/trunk/src/grokcore/component/tests/order/inter2.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/order/inter2.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/order/inter2.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -2,7 +2,7 @@
This module used by inter1 tests
"""
-import grok
+import grokcore.component as grok
class Four(object):
grok.order(1)
Modified: grokcore.component/trunk/src/grokcore/component/tests/order/noarg_orderdirective.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/order/noarg_orderdirective.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/order/noarg_orderdirective.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -5,7 +5,7 @@
>>> components = [First(), Second(), Third(), Fourth(), Fifth()]
- >>> from grok.util import sort_components
+ >>> from grokcore.component.util import sort_components
>>> sort_components(components)
[<...First object at ...>,
<...Second object at ...>,
@@ -15,7 +15,7 @@
"""
-import grok
+import grokcore.component as grok
class First(object):
grok.order()
Modified: grokcore.component/trunk/src/grokcore/component/tests/order/nodirective.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/order/nodirective.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/order/nodirective.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -5,7 +5,7 @@
>>> components = [First(), Second(), Third(), Fourth(), Fifth()]
- >>> from grok.util import sort_components
+ >>> from grokcore.component.util import sort_components
>>> sort_components(components)
[<...Fifth object at ...>,
<...First object at ...>,
Modified: grokcore.component/trunk/src/grokcore/component/tests/test_grok.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/test_grok.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/test_grok.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -1,5 +1,5 @@
import re
-import unittest
+import unittest, traceback
from pkg_resources import resource_listdir
from zope.testing import doctest, cleanup, renormalizing
import zope.component.eventtesting
@@ -29,14 +29,17 @@
if filename == '__init__.py':
continue
- dottedname = 'grok.tests.%s.%s' % (name, filename[:-3])
- test = doctest.DocTestSuite(dottedname,
- setUp=setUpZope,
- tearDown=cleanUpZope,
- checker=checker,
- optionflags=doctest.ELLIPSIS+
- doctest.NORMALIZE_WHITESPACE)
-
+ dottedname = 'grokcore.component.tests.%s.%s' % (name, filename[:-3])
+ try:
+ test = doctest.DocTestSuite(dottedname,
+ setUp=setUpZope,
+ tearDown=cleanUpZope,
+ checker=checker,
+ optionflags=doctest.ELLIPSIS+
+ doctest.NORMALIZE_WHITESPACE)
+ except ImportError, e: # or should this accept anything?
+ traceback.print_exc()
+ raise
suite.addTest(test)
return suite
Modified: grokcore.component/trunk/src/grokcore/component/tests/testsetup/basicsetup.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/testsetup/basicsetup.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/testsetup/basicsetup.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -33,16 +33,16 @@
All we need to setup a testsuite, is the package to search::
- >>> from grok.tests.testsetup import cave
- >>> from grok.testing import BasicTestSetup
+ >>> from grokcore.component.tests.testsetup import cave
+ >>> from grokcore.component.testing import BasicTestSetup
>>> basic_setup = BasicTestSetup(cave)
>>> basic_setup
- <grok.testing.BasicTestSetup object at 0x...>
+ <grokcore.component.testing.BasicTestSetup object at 0x...>
The package is stored as an instance-attribute::
>>> basic_setup.package
- <module 'grok.tests.testsetup.cave' from ...>
+ <module 'grokcore.component.tests.testsetup.cave' from ...>
The ``BasicTestSetup`` serves merely as a container for attributes and
methods needed by derived classes, that provide proper test setup.
Modified: grokcore.component/trunk/src/grokcore/component/tests/testsetup/unittestsetup.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/testsetup/unittestsetup.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/testsetup/unittestsetup.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -42,14 +42,14 @@
package. This has to be imported first, because we need the package as
a parameter for the testseupt constructor::
- >>> from grok.tests.testsetup import cave
+ >>> from grokcore.component.tests.testsetup import cave
Using the ``UnitTestSetup`` then is easy::
- >>> from grok.testing import UnitTestSetup
+ >>> from grokcore.component.testing import UnitTestSetup
>>> setup = UnitTestSetup(cave)
>>> setup
- <grok.testing.UnitTestSetup object at 0x...>
+ <grokcore.component.testing.UnitTestSetup object at 0x...>
This setup is ready for use::
@@ -64,7 +64,7 @@
import grok
import cave
def test_suite():
- setup = grok.testing.UnitTestSetup(cave)
+ setup = grokcore.component.testing.UnitTestSetup(cave)
return setup.getTestSuite()
if __name__ == '__main__':
unittest.main(default='test_suite')
@@ -124,7 +124,7 @@
>>> setup.setUp
<bound method UnitTestSetup.setUp of
- <grok.testing.UnitTestSetup object at 0x...>>
+ <grokcore.component.testing.UnitTestSetup object at 0x...>>
* The setup-instance's `optionsflags` attribute is passed. It
includes by default the following doctest constants:
Modified: grokcore.component/trunk/src/grokcore/component/tests/util/class_annotation.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/util/class_annotation.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/util/class_annotation.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -9,7 +9,7 @@
[5, 7, 9]
"""
-import grok
+import grokcore.component as grok
from martian import util
class A(object):
Modified: grokcore.component/trunk/src/grokcore/component/tests/util/public_methods_from_class.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/util/public_methods_from_class.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/util/public_methods_from_class.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -1,11 +1,10 @@
"""
- >>> methods = grok.util.public_methods_from_class(A)
+ >>> methods = util.public_methods_from_class(A)
>>> sorted([m.__name__ for m in methods])
['should_also_be_public', 'should_be_public']
"""
-import grok
-import grok.util
+import grokcore.component.util as util
class A(object):
Modified: grokcore.component/trunk/src/grokcore/component/tests/utility/implementsmany.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/utility/implementsmany.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/utility/implementsmany.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -5,10 +5,10 @@
>>> grok.testing.grok(__name__)
Traceback (most recent call last):
...
- GrokError: <class 'grok.tests.utility.implementsmany.Club'> is implementing
+ GrokError: <class 'grokcore.component.tests.utility.implementsmany.Club'> is implementing
more than one interface (use grok.provides to specify which one to use).
"""
-import grok
+import grokcore.component as grok
from zope import interface
class IClub(interface.Interface):
Modified: grokcore.component/trunk/src/grokcore/component/tests/utility/implementsmany2.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/utility/implementsmany2.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/utility/implementsmany2.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -5,10 +5,10 @@
>>> grok.testing.grok(__name__)
Traceback (most recent call last):
...
- GrokError: <class 'grok.tests.utility.implementsmany2.Club'> is implementing
+ GrokError: <class 'grokcore.component.tests.utility.implementsmany2.Club'> is implementing
more than one interface (use grok.provides to specify which one to use).
"""
-import grok
+import grokcore.component as grok
from zope import interface
class IClub(interface.Interface):
Modified: grokcore.component/trunk/src/grokcore/component/tests/utility/implementsnone.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/utility/implementsnone.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/utility/implementsnone.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -4,10 +4,10 @@
>>> grok.testing.grok(__name__)
Traceback (most recent call last):
...
- GrokError: <class 'grok.tests.utility.implementsnone.Club'> must
+ GrokError: <class 'grokcore.component.tests.utility.implementsnone.Club'> must
implement at least one interface (use grok.implements to specify).
"""
-import grok
+import grokcore.component as grok
class Club(grok.GlobalUtility):
pass
Modified: grokcore.component/trunk/src/grokcore/component/tests/utility/implementsnone2.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/utility/implementsnone2.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/utility/implementsnone2.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -4,10 +4,10 @@
>>> grok.testing.grok(__name__)
Traceback (most recent call last):
...
- GrokError: <class 'grok.tests.utility.implementsnone2.Club'> must
+ GrokError: <class 'grokcore.component.tests.utility.implementsnone2.Club'> must
implement at least one interface (use grok.implements to specify).
"""
-import grok
+import grokcore.component as grok
class Club(object):
pass
Modified: grokcore.component/trunk/src/grokcore/component/tests/utility/utility.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/utility/utility.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/utility/utility.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -27,7 +27,7 @@
>>> component.getUtility(ISpikyClub, name='spiky')
Traceback (most recent call last):
...
- ComponentLookupError: (<InterfaceClass grok.tests.utility.utility.ISpikyClub>,
+ ComponentLookupError: (<InterfaceClass grokcore.component.tests.utility.utility.ISpikyClub>,
'spiky')
If a utility implements more than one interface, it has to specify the one to
@@ -125,7 +125,7 @@
"""
-import grok
+import grokcore.component as grok
from zope import interface
class IClub(interface.Interface):
Modified: grokcore.component/trunk/src/grokcore/component/tests/view/nomodulename.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/view/nomodulename.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/view/nomodulename.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -1,7 +1,7 @@
"""
You can't call grok.name on a module:
- >>> import grok.tests.view.nomodulename_fixture
+ >>> import grokcore.component.tests.view.nomodulename_fixture
Traceback (most recent call last):
...
GrokImportError: grok.name can only be used on class level.
Modified: grokcore.component/trunk/src/grokcore/component/tests/view/nomodulename_fixture.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/view/nomodulename_fixture.py 2008-03-17 21:30:53 UTC (rev 84753)
+++ grokcore.component/trunk/src/grokcore/component/tests/view/nomodulename_fixture.py 2008-03-18 16:30:10 UTC (rev 84754)
@@ -1,5 +1,5 @@
"""
This should fail:
"""
-import grok
+import grokcore.component as grok
grok.name('viewname')
More information about the Checkins
mailing list