[Checkins] SVN: grokcore.view/new/src/grokcore/view/tests/ Fix up
unittests
Philipp von Weitershausen
philikon at philikon.de
Sat Aug 2 09:27:08 EDT 2008
Log message for revision 89222:
Fix up unittests
Changed:
U grokcore.view/new/src/grokcore/view/tests/skin/conflict.py
U grokcore.view/new/src/grokcore/view/tests/skin/directive.py
U grokcore.view/new/src/grokcore/view/tests/skin/directive_fixture.py
U grokcore.view/new/src/grokcore/view/tests/skin/directive_onaclass_fixture.py
U grokcore.view/new/src/grokcore/view/tests/skin/directive_textonly_fixture.py
U grokcore.view/new/src/grokcore/view/tests/skin/notonlayer.py
U grokcore.view/new/src/grokcore/view/tests/static/statichaspy.py
U grokcore.view/new/src/grokcore/view/tests/static/staticispackage.py
U grokcore.view/new/src/grokcore/view/tests/template/pluggability.py
U grokcore.view/new/src/grokcore/view/tests/template/zpt.py
U grokcore.view/new/src/grokcore/view/tests/view/ambiguouscontext.py
U grokcore.view/new/src/grokcore/view/tests/view/dirandinlinetemplate.py
U grokcore.view/new/src/grokcore/view/tests/view/dirtemplate.py
U grokcore.view/new/src/grokcore/view/tests/view/dirtemplateandrender.py
U grokcore.view/new/src/grokcore/view/tests/view/dirtemplatesonly.py
U grokcore.view/new/src/grokcore/view/tests/view/eithertemplateorrender.py
U grokcore.view/new/src/grokcore/view/tests/view/explicitimplicittemplate.py
U grokcore.view/new/src/grokcore/view/tests/view/inline.py
U grokcore.view/new/src/grokcore/view/tests/view/inline_unassociated.py
U grokcore.view/new/src/grokcore/view/tests/view/inlinebogus.py
U grokcore.view/new/src/grokcore/view/tests/view/missingcontext.py
U grokcore.view/new/src/grokcore/view/tests/view/modequalspkgname/modequalspkgname.py
U grokcore.view/new/src/grokcore/view/tests/view/namemultiple.py
U grokcore.view/new/src/grokcore/view/tests/view/namemultiple_fixture.py
U grokcore.view/new/src/grokcore/view/tests/view/nameunicode.py
U grokcore.view/new/src/grokcore/view/tests/view/nomodulename.py
U grokcore.view/new/src/grokcore/view/tests/view/nomodulename_fixture.py
U grokcore.view/new/src/grokcore/view/tests/view/notemplateorrender.py
U grokcore.view/new/src/grokcore/view/tests/view/template.py
U grokcore.view/new/src/grokcore/view/tests/view/templatedirectory.py
U grokcore.view/new/src/grokcore/view/tests/view/templatefile.py
U grokcore.view/new/src/grokcore/view/tests/view/templatenotfound.py
U grokcore.view/new/src/grokcore/view/tests/view/templatereload.py
U grokcore.view/new/src/grokcore/view/tests/view/twoviewsusetemplate.py
U grokcore.view/new/src/grokcore/view/tests/view/unassociated.py
U grokcore.view/new/src/grokcore/view/tests/view/unassociated_templates/index.pt
U grokcore.view/new/src/grokcore/view/tests/view/update.py
U grokcore.view/new/src/grokcore/view/tests/view/update_redirect.py
U grokcore.view/new/src/grokcore/view/tests/view/view.py
U grokcore.view/new/src/grokcore/view/tests/view/view_decorator.py
-=-
Modified: grokcore.view/new/src/grokcore/view/tests/skin/conflict.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/skin/conflict.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/skin/conflict.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -8,7 +8,7 @@
For: ('utility', <InterfaceClass zope.publisher.interfaces.browser.IBrowserSkinType>, 'foo')
"""
-import grok
+import grokcore.view as grok
class Skin1(grok.IBrowserRequest):
grok.skin('foo')
Modified: grokcore.view/new/src/grokcore/view/tests/skin/directive.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/skin/directive.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/skin/directive.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -7,9 +7,9 @@
Import -- and thus "execute" -- the skindirective fixture to make the
directive have effect::
- >>> from grok.tests.skin import directive_fixture
+ >>> from grokcore.view.tests.skin import directive_fixture
- >>> import grok
+ >>> import grokcore.view as grok
>>> grok.skin.bind().get(directive_fixture.IIsAnInterface)
'skin_name'
@@ -19,7 +19,7 @@
retrieve data will fail due to the way the directive's store is
implemented::
- >>> from grok.tests.skin import directive_onaclass_fixture
+ >>> from grokcore.view.tests.skin import directive_onaclass_fixture
>>> grok.skin.bind().get(directive_onaclass_fixture.NotAnInterfaceClass)
Traceback (most recent call last):
@@ -29,7 +29,7 @@
Note that the directive only supports text (ASCII string or unicode):
- >>> from grok.tests.skin import directive_textonly_fixture
+ >>> from grokcore.view.tests.skin import directive_textonly_fixture
Traceback (most recent call last):
...
GrokImportError: The 'skin' directive can only be called with unicode or ASCII.
Modified: grokcore.view/new/src/grokcore/view/tests/skin/directive_fixture.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/skin/directive_fixture.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/skin/directive_fixture.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -1,4 +1,4 @@
-import grok
+import grokcore.view as grok
from zope import interface
class IIsAnInterface(interface.Interface):
Modified: grokcore.view/new/src/grokcore/view/tests/skin/directive_onaclass_fixture.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/skin/directive_onaclass_fixture.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/skin/directive_onaclass_fixture.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -1,4 +1,4 @@
-import grok
+import grokcore.view as grok
class NotAnInterfaceClass(object):
grok.skin('failing_directive')
Modified: grokcore.view/new/src/grokcore/view/tests/skin/directive_textonly_fixture.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/skin/directive_textonly_fixture.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/skin/directive_textonly_fixture.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -1,4 +1,4 @@
-import grok
+import grokcore.view as grok
from zope.interface import Interface
some_obj = object()
Modified: grokcore.view/new/src/grokcore/view/tests/skin/notonlayer.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/skin/notonlayer.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/skin/notonlayer.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -6,12 +6,12 @@
Traceback (most recent call last):
...
GrokError: The grok.skin() directive is used on interface
- 'grok.tests.skin.notonlayer.NotALayer'. However,
- 'grok.tests.skin.notonlayer.NotALayer' does not extend
+ 'grokcore.view.tests.skin.notonlayer.NotALayer'. However,
+ 'grokcore.view.tests.skin.notonlayer.NotALayer' does not extend
IBrowserRequest which is required for interfaces that are used as
layers and are to be registered as a skin.
"""
-import grok
+import grokcore.view as grok
from zope.interface import Interface
class NotALayer(Interface):
Modified: grokcore.view/new/src/grokcore/view/tests/static/statichaspy.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/static/statichaspy.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/static/statichaspy.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -2,8 +2,8 @@
When a package contains a 'static' resource directory, it must not also contain
a module called 'static.py':
- >>> import grok
- >>> grok.testing.grok('grok.tests.static.statichaspy_fixture')
+ >>> import grokcore.view as grok
+ >>> grok.testing.grok('grokcore.view.tests.static.statichaspy_fixture')
Traceback (most recent call last):
...
GrokError: A package can not contain both a 'static' resource directory
Modified: grokcore.view/new/src/grokcore/view/tests/static/staticispackage.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/static/staticispackage.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/static/staticispackage.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -1,8 +1,8 @@
"""
It is an error for the 'static' directory to be a python package:
- >>> import grok
- >>> grok.testing.grok('grok.tests.static.staticispackage_fixture')
+ >>> import grokcore.view as grok
+ >>> grok.testing.grok('grokcore.view.tests.static.staticispackage_fixture')
Traceback (most recent call last):
...
GrokError: The 'static' resource directory must not be a python package.
Modified: grokcore.view/new/src/grokcore/view/tests/template/pluggability.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/template/pluggability.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/template/pluggability.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -29,7 +29,7 @@
<html><body>Sierra de San Fransisco is in Mexico</body></html>
"""
-import grok, os
+import grokcore.view as grok, os
# Dummy template language:
class MyTemplate(object):
@@ -65,7 +65,7 @@
def __call__(self, filename, _prefix=None):
return MyPageTemplate(filename=filename, _prefix=_prefix)
-class Cave(grok.Model):
+class Cave(grok.Context):
pass
class Sebaayeni(grok.View):
Modified: grokcore.view/new/src/grokcore/view/tests/template/zpt.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/template/zpt.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/template/zpt.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -13,9 +13,9 @@
"""
-import grok
+import grokcore.view as grok
-class Cave(grok.Model):
+class Cave(grok.Context):
pass
class Piepmatz(grok.View):
Modified: grokcore.view/new/src/grokcore/view/tests/view/ambiguouscontext.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/ambiguouscontext.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/ambiguouscontext.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -5,17 +5,17 @@
Traceback (most recent call last):
...
GrokError: Multiple possible contexts for
- <class 'grok.tests.view.ambiguouscontext.Club'>, please use the
+ <class 'grokcore.view.tests.view.ambiguouscontext.Club'>, please use the
'context' directive.
"""
-import grok
+import grokcore.view as grok
-class Cave(grok.Model):
+class Cave(grok.Context):
pass
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
class Club(grok.View):
Modified: grokcore.view/new/src/grokcore/view/tests/view/dirandinlinetemplate.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/dirandinlinetemplate.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/dirandinlinetemplate.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -6,12 +6,12 @@
Traceback (most recent call last):
...
ConfigurationExecutionError: martian.error.GrokError: Conflicting templates found for name 'cavepainting' in module
- <module 'grok.tests.view.dirandinlinetemplate' from ...
+ <module 'grokcore.view.tests.view.dirandinlinetemplate' from ...
"""
-import grok
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
class CavePainting(grok.View):
Modified: grokcore.view/new/src/grokcore/view/tests/view/dirtemplate.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/dirtemplate.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/dirtemplate.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -24,9 +24,9 @@
</html>
"""
-import grok
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
class CavePainting(grok.View):
Modified: grokcore.view/new/src/grokcore/view/tests/view/dirtemplateandrender.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/dirtemplateandrender.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/dirtemplateandrender.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -6,14 +6,14 @@
Traceback (most recent call last):
...
ConfigurationExecutionError: martian.error.GrokError: Multiple possible ways to render view
- <class 'grok.tests.view.dirtemplateandrender.CavePainting'>.
+ <class 'grokcore.view.tests.view.dirtemplateandrender.CavePainting'>.
It has both a 'render' method as well as an associated template.
in:
"""
-import grok
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
class CavePainting(grok.View):
Modified: grokcore.view/new/src/grokcore/view/tests/view/dirtemplatesonly.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/dirtemplatesonly.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/dirtemplatesonly.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -1,7 +1,7 @@
"""
A template directory may only contain recognized template files::
- >>> from grok.testing import warn
+ >>> from grokcore.view.testing import warn
>>> import warnings
>>> saved_warn = warnings.warn
>>> warnings.warn = warn
@@ -14,9 +14,9 @@
>>> warnings.warn = saved_warn
"""
-import grok
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
class Index(grok.View):
Modified: grokcore.view/new/src/grokcore/view/tests/view/eithertemplateorrender.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/eithertemplateorrender.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/eithertemplateorrender.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -5,13 +5,13 @@
Traceback (most recent call last):
...
ConfigurationExecutionError: martian.error.GrokError: Multiple possible ways to render view
- <class 'grok.tests.view.eithertemplateorrender.CavePainting'>.
+ <class 'grokcore.view.tests.view.eithertemplateorrender.CavePainting'>.
It has both a 'render' method as well as an associated template.
in:
"""
-import grok
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
class CavePainting(grok.View):
Modified: grokcore.view/new/src/grokcore/view/tests/view/explicitimplicittemplate.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/explicitimplicittemplate.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/explicitimplicittemplate.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -7,15 +7,15 @@
Traceback (most recent call last):
...
ConfigurationExecutionError: martian.error.GrokError: Multiple possible templates for view
- <class 'grok.tests.view.explicitimplicittemplate.Painting'>.
+ <class 'grokcore.view.tests.view.explicitimplicittemplate.Painting'>.
It uses grok.template('cavepainting'), but there is also a template
called 'painting'.
in:
"""
-import grok
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
class Painting(grok.View):
Modified: grokcore.view/new/src/grokcore/view/tests/view/inline.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/inline.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/inline.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -15,8 +15,8 @@
<h1>Mammoth Cave Painting</h1>
<ul>
<li><zope.publisher.browser.TestRequest instance URL=http://127.0.0.1></li>
- <li><grok.tests.view.inline.CavePainting object at 0x...></li>
- <li><grok.tests.view.inline.Mammoth object at 0x...></li>
+ <li><grokcore.view.tests.view.inline.CavePainting object at 0x...></li>
+ <li><grokcore.view.tests.view.inline.Mammoth object at 0x...></li>
<li><zope.app.pagetemplate.engine.TraversableModuleImporter object at 0x...></li>
</ul>
</body>
@@ -34,9 +34,9 @@
<html><body><h1>GROK HUNT MAMMOTH!</h1></body></html>
"""
-import grok
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
class CavePainting(grok.View):
Modified: grokcore.view/new/src/grokcore/view/tests/view/inline_unassociated.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/inline_unassociated.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/inline_unassociated.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -2,7 +2,7 @@
Inline templates that are not associated with a view class will
provoke an error:
- >>> from grok.testing import warn
+ >>> from grokcore.view.testing import warn
>>> import warnings
>>> saved_warn = warnings.warn
>>> warnings.warn = warn
@@ -10,15 +10,15 @@
>>> grok.testing.grok(__name__)
From grok.testing's warn():
...UserWarning: Found the following unassociated template(s) when grokking
- 'grok.tests.view.inline_unassociated': club. Define view classes inheriting
+ 'grokcore.view.tests.view.inline_unassociated': club. Define view classes inheriting
from grok.View to enable the template(s)...
>>> warnings.warn = saved_warn
"""
-import grok
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
club = grok.PageTemplate("""\
Modified: grokcore.view/new/src/grokcore/view/tests/view/inlinebogus.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/inlinebogus.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/inlinebogus.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -3,7 +3,7 @@
We do not accept bogus inline template such as ones that contain
encoded strings:
- >>> import grok
+ >>> import grokcore.view as grok
>>> grok.PageTemplate('''
... <html>
... <body><h1 tal:content="string:Mammoth Cave Painting"/>
Modified: grokcore.view/new/src/grokcore/view/tests/view/missingcontext.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/missingcontext.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/missingcontext.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -5,12 +5,12 @@
Traceback (most recent call last):
...
GrokError: No module-level context for
- <class 'grok.tests.view.missingcontext.Club'>, please use the
+ <class 'grokcore.view.tests.view.missingcontext.Club'>, please use the
'context' directive.
"""
-import grok
+import grokcore.view as grok
class Club(grok.View):
pass
Modified: grokcore.view/new/src/grokcore/view/tests/view/modequalspkgname/modequalspkgname.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/modequalspkgname/modequalspkgname.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/modequalspkgname/modequalspkgname.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -3,8 +3,8 @@
resides in. Grokking it should not provoke an `unassociated template`
error or warning.
"""
-import grok
-class Cave(grok.Model):
+import grokcore.view as grok
+class Cave(grok.Context):
pass
class Index(grok.View):
Modified: grokcore.view/new/src/grokcore/view/tests/view/namemultiple.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/namemultiple.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/namemultiple.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -1,7 +1,7 @@
"""
You can't call grok.name multiple times for a view
- >>> import grok.tests.view.namemultiple_fixture
+ >>> import grokcore.view.tests.view.namemultiple_fixture
Traceback (most recent call last):
...
GrokImportError: The 'name' directive can only be called once per class.
Modified: grokcore.view/new/src/grokcore/view/tests/view/namemultiple_fixture.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/namemultiple_fixture.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/namemultiple_fixture.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -1,7 +1,7 @@
"""
This should fail:
"""
-import grok
+import grokcore.view as grok
class MultipleNames(grok.View):
grok.name('mammoth')
Modified: grokcore.view/new/src/grokcore/view/tests/view/nameunicode.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/nameunicode.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/nameunicode.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -16,7 +16,7 @@
unicode or ASCII.
"""
-import grok
+import grokcore.view as grok
def pass_unicode():
class View(object):
Modified: grokcore.view/new/src/grokcore/view/tests/view/nomodulename.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/nomodulename.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/nomodulename.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -1,7 +1,7 @@
"""
You can't call grok.name on a module:
- >>> import grok.tests.view.nomodulename_fixture
+ >>> import grokcore.view.tests.view.nomodulename_fixture
Traceback (most recent call last):
...
GrokImportError: The 'name' directive can only be used on class level.
Modified: grokcore.view/new/src/grokcore/view/tests/view/nomodulename_fixture.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/nomodulename_fixture.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/nomodulename_fixture.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -1,5 +1,5 @@
"""
This should fail:
"""
-import grok
+import grokcore.view as grok
grok.name('viewname')
Modified: grokcore.view/new/src/grokcore/view/tests/view/notemplateorrender.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/notemplateorrender.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/notemplateorrender.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -4,15 +4,15 @@
>>> grok.testing.grok(__name__)
Traceback (most recent call last):
...
- ConfigurationExecutionError: martian.error.GrokError: View <class 'grok.tests.view.notemplateorrender.CavePainting'>
+ ConfigurationExecutionError: martian.error.GrokError: View <class 'grokcore.view.tests.view.notemplateorrender.CavePainting'>
has no associated template or 'render' method.
in:
"""
-import grok
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
class CavePainting(grok.View):
Modified: grokcore.view/new/src/grokcore/view/tests/view/template.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/template.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/template.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -20,9 +20,9 @@
<html><body><h1>GROK EAT MAMMOTH!</h1></body></html>
"""
-import grok
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
class Painting(grok.View):
Modified: grokcore.view/new/src/grokcore/view/tests/view/templatedirectory.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/templatedirectory.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/templatedirectory.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -16,11 +16,11 @@
</html>
"""
-import grok
+import grokcore.view as grok
grok.templatedir('templatedirectoryname')
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
class Food(grok.View):
Modified: grokcore.view/new/src/grokcore/view/tests/view/templatefile.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/templatefile.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/templatefile.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -18,10 +18,10 @@
</html>
"""
-import grok
+import grokcore.view as grok
import os.path
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
class Food(grok.View):
Modified: grokcore.view/new/src/grokcore/view/tests/view/templatenotfound.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/templatenotfound.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/templatenotfound.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -5,13 +5,13 @@
>>> grok.testing.grok(__name__)
Traceback (most recent call last):
...
- ConfigurationExecutionError: martian.error.GrokError: View <class 'grok.tests.view.templatenotfound.Painting'>
+ ConfigurationExecutionError: martian.error.GrokError: View <class 'grokcore.view.tests.view.templatenotfound.Painting'>
has no associated template or 'render' method.
in:
"""
-import grok
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
class Painting(grok.View):
Modified: grokcore.view/new/src/grokcore/view/tests/view/templatereload.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/templatereload.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/templatereload.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -30,9 +30,9 @@
>>> template.write('before')
>>> template.close()
"""
-import grok
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
class Index(grok.View):
Modified: grokcore.view/new/src/grokcore/view/tests/view/twoviewsusetemplate.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/twoviewsusetemplate.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/twoviewsusetemplate.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -33,15 +33,15 @@
Traceback (most recent call last):
...
ComponentLookupError:
- ((<grok.tests.view.twoviewsusetemplate.Mammoth object at 0x...>,
+ ((<grokcore.view.tests.view.twoviewsusetemplate.Mammoth object at 0x...>,
<zope.publisher.browser.TestRequest instance URL=http://127.0.0.1>),
<InterfaceClass zope.interface.Interface>, 'templ')
"""
-import grok
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
class A(grok.View):
Modified: grokcore.view/new/src/grokcore/view/tests/view/unassociated.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/unassociated.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/unassociated.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -2,7 +2,7 @@
Templates that are not associated with a view class will provoke an
error:
- >>> from grok.testing import warn
+ >>> from grokcore.view.testing import warn
>>> import warnings
>>> saved_warn = warnings.warn
>>> warnings.warn = warn
@@ -10,7 +10,7 @@
>>> grok.testing.grok(__name__)
From grok.testing's warn():
...UserWarning: Found the following unassociated template(s) when grokking
- 'grok.tests.view.unassociated': index. Define view classes inheriting from
+ 'grokcore.view.tests.view.unassociated': index. Define view classes inheriting from
grok.View to enable the template(s)...
Also templates of modules named equally as the package name the module
@@ -26,7 +26,7 @@
>>> warnings.warn = saved_warn
"""
-import grok
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
Modified: grokcore.view/new/src/grokcore/view/tests/view/unassociated_templates/index.pt
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/unassociated_templates/index.pt 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/unassociated_templates/index.pt 2008-08-02 13:27:07 UTC (rev 89222)
@@ -1,3 +1,3 @@
This template does not have an associated view class (in other words,
-there's no grok.tests.view.unassociated.Index class), therefore it
+there's no grokcore.view.tests.view.unassociated.Index class), therefore it
provokes a GrokError.
Modified: grokcore.view/new/src/grokcore/view/tests/view/update.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/update.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/update.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -26,9 +26,9 @@
"""
-import grok
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
class CavePainting(grok.View):
Modified: grokcore.view/new/src/grokcore/view/tests/view/update_redirect.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/update_redirect.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/update_redirect.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -17,9 +17,9 @@
somewhere-else
"""
-import grok
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
class CavePainting(grok.View):
Modified: grokcore.view/new/src/grokcore/view/tests/view/view.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/view.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/view.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -28,13 +28,13 @@
>>> view = component.getMultiAdapter((manfred, request), name='food')
Traceback (most recent call last):
...
- ComponentLookupError: ((<grok.tests.view.view.Mammoth object at 0x...>, <zope.publisher.browser.TestRequest instance URL=http://127.0.0.1>), <InterfaceClass zope.interface.Interface>, 'food')
+ ComponentLookupError: ((<grokcore.view.tests.view.view.Mammoth object at 0x...>, <zope.publisher.browser.TestRequest instance URL=http://127.0.0.1>), <InterfaceClass zope.interface.Interface>, 'food')
"""
-import grok
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
class CavePainting(grok.View):
Modified: grokcore.view/new/src/grokcore/view/tests/view/view_decorator.py
===================================================================
--- grokcore.view/new/src/grokcore/view/tests/view/view_decorator.py 2008-08-02 13:20:29 UTC (rev 89221)
+++ grokcore.view/new/src/grokcore/view/tests/view/view_decorator.py 2008-08-02 13:27:07 UTC (rev 89222)
@@ -3,12 +3,13 @@
>>> grok.testing.grok(__name__)
Traceback (most recent call last):
- GrokError: The @grok.require decorator is used for method 'render' in view <class 'grok.tests.security.view_decorator.BogusView'>. It may only be used for XML-RPC methods.
+ ...
+ GrokError: The @grok.require decorator is used for method 'render' in view <class 'grokcore.view.tests.view.view_decorator.BogusView'>. It may only be used for XML-RPC methods.
"""
-import grok
+import grokcore.view as grok
import zope.interface
class Bogus(grok.Permission):
More information about the Checkins
mailing list