[Checkins] SVN: grokcore.view/trunk/src/grokcore/view/ Import stuff
from grokcore.component's public API so that they can be accessed
Philipp von Weitershausen
philikon at philikon.de
Tue Jul 22 08:47:06 EDT 2008
Log message for revision 88682:
Import stuff from grokcore.component's public API so that they can be accessed
from grokcore.view as well. That way you can simply say
from grokcore.view import *
or
import grokcore.view as grok
and have everything you need available.
Changed:
U grokcore.view/trunk/src/grokcore/view/__init__.py
D grokcore.view/trunk/src/grokcore/view/tests/grok.py
U grokcore.view/trunk/src/grokcore/view/tests/security/missing_permission.py
U grokcore.view/trunk/src/grokcore/view/tests/security/missing_permission_name.py
U grokcore.view/trunk/src/grokcore/view/tests/security/multiple_require.py
U grokcore.view/trunk/src/grokcore/view/tests/security/not_a_permissionclass.py
U grokcore.view/trunk/src/grokcore/view/tests/security/view_decorator.py
U grokcore.view/trunk/src/grokcore/view/tests/static/statichaspy.py
U grokcore.view/trunk/src/grokcore/view/tests/static/staticispackage.py
U grokcore.view/trunk/src/grokcore/view/tests/template/pluggability.py
U grokcore.view/trunk/src/grokcore/view/tests/template/zpt.py
U grokcore.view/trunk/src/grokcore/view/tests/view/ambiguouscontext.py
U grokcore.view/trunk/src/grokcore/view/tests/view/dirandinlinetemplate.py
U grokcore.view/trunk/src/grokcore/view/tests/view/dirtemplate.py
U grokcore.view/trunk/src/grokcore/view/tests/view/dirtemplateandrender.py
U grokcore.view/trunk/src/grokcore/view/tests/view/dirtemplatesonly.py
U grokcore.view/trunk/src/grokcore/view/tests/view/eithertemplateorrender.py
U grokcore.view/trunk/src/grokcore/view/tests/view/explicitimplicittemplate.py
U grokcore.view/trunk/src/grokcore/view/tests/view/inline.py
U grokcore.view/trunk/src/grokcore/view/tests/view/inline_unassociated.py
U grokcore.view/trunk/src/grokcore/view/tests/view/missingcontext.py
U grokcore.view/trunk/src/grokcore/view/tests/view/modequalspkgname/modequalspkgname.py
U grokcore.view/trunk/src/grokcore/view/tests/view/namemultiple_fixture.py
U grokcore.view/trunk/src/grokcore/view/tests/view/nameunicode.py
U grokcore.view/trunk/src/grokcore/view/tests/view/nomodulename_fixture.py
U grokcore.view/trunk/src/grokcore/view/tests/view/notemplateorrender.py
U grokcore.view/trunk/src/grokcore/view/tests/view/template.py
U grokcore.view/trunk/src/grokcore/view/tests/view/templatedirectory.py
U grokcore.view/trunk/src/grokcore/view/tests/view/templatefile.py
U grokcore.view/trunk/src/grokcore/view/tests/view/templatenotfound.py
U grokcore.view/trunk/src/grokcore/view/tests/view/templatereload.py
U grokcore.view/trunk/src/grokcore/view/tests/view/twoviewsusetemplate.py
U grokcore.view/trunk/src/grokcore/view/tests/view/unassociated.py
U grokcore.view/trunk/src/grokcore/view/tests/view/update.py
U grokcore.view/trunk/src/grokcore/view/tests/view/update_redirect.py
U grokcore.view/trunk/src/grokcore/view/tests/view/view.py
-=-
Modified: grokcore.view/trunk/src/grokcore/view/__init__.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/__init__.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/__init__.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -1,3 +1,14 @@
+# TODO when grokcore.component has a proper __all__, we can simply say
+#
+# from grokcore.commponent import *
+#
+from grokcore.component import (
+ context, scan, direct, implementer, subscribe, description, title,
+ provides, name, implements, adapts, adapter, global_utility, baseclass,
+ Adapter, MultiAdapter, Context, GrokImportError, GrokError,
+ GlobalGrokker, InstanceGrokker, GlobalUtility, ClassGrokker,
+ )
+
from grokcore.view.directive import layer, view, require, template, templatedir
from grokcore.view.util import url
from grokcore.view.components import View, Permission, GrokForm, Skin
@@ -3,2 +14,6 @@
from grokcore.view.components import PageTemplate, PageTemplateFile
from grokcore.view.components import IGrokLayer
+
+# Import this module so that it's available as soon as you import the
+# 'grokcore.view' package. Useful for tests and interpreter examples.
+import grokcore.view.testing
Deleted: grokcore.view/trunk/src/grokcore/view/tests/grok.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/grok.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/grok.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -1,4 +0,0 @@
-from grokcore.view.components import View
-from grokcore.view import testing
-from grokcore.component import name, context
-from grokcore.component import Context as Model
Modified: grokcore.view/trunk/src/grokcore/view/tests/security/missing_permission.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/security/missing_permission.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/security/missing_permission.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -9,15 +9,13 @@
...
"""
+import grokcore.view as grok
import zope.interface
-from grokcore.view.tests import grok
-import grokcore.view
-
class MissingPermission(grok.View):
grok.context(zope.interface.Interface)
- grokcore.view.require('doesnt.exist')
+ grok.require('doesnt.exist')
def render(self):
pass
Modified: grokcore.view/trunk/src/grokcore/view/tests/security/missing_permission_name.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/security/missing_permission_name.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/security/missing_permission_name.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -7,8 +7,7 @@
GrokError: A permission needs to have a dotted name for its id.
Use grok.name to specify one.
"""
-from grokcore.view.tests import grok
-import grokcore.view
+import grokcore.view as grok
-class MissingName(grokcore.view.Permission):
+class MissingName(grok.Permission):
pass
Modified: grokcore.view/trunk/src/grokcore/view/tests/security/multiple_require.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/security/multiple_require.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/security/multiple_require.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -7,24 +7,22 @@
GrokError: grok.require was called multiple times in <class 'grokcore.view.tests.security.multiple_require.MultipleView'>. It may only be set once for a class.
"""
+import grokcore.view as grok
import zope.interface
-from grokcore.view.tests import grok
-import grokcore.view
-
-class One(grokcore.view.Permission):
+class One(grok.Permission):
grok.name('permission.1')
-class Two(grokcore.view.Permission):
+class Two(grok.Permission):
grok.name('permission.2')
class MultipleView(grok.View):
grok.context(zope.interface.Interface)
- grokcore.view.require(One)
- grokcore.view.require(Two)
+ grok.require(One)
+ grok.require(Two)
def render(self):
pass
Modified: grokcore.view/trunk/src/grokcore/view/tests/security/not_a_permissionclass.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/security/not_a_permissionclass.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/security/not_a_permissionclass.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -8,7 +8,7 @@
>>>
>>> class NoPermission(grok.View):
... grok.context(Interface)
- ... grokcore.view.require(NotAProperPermission)
+ ... grok.require(NotAProperPermission)
...
... def render(self):
... pass
@@ -18,5 +18,4 @@
grok.Permission to the 'require' directive.
"""
-from grokcore.view.tests import grok
-import grokcore.view
+import grokcore.view as grok
Modified: grokcore.view/trunk/src/grokcore/view/tests/security/view_decorator.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/security/view_decorator.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/security/view_decorator.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -7,19 +7,17 @@
"""
+import grokcore.view as grok
import zope.interface
-from grokcore.view.tests import grok
-import grokcore.view
-
-class Bogus(grokcore.view.Permission):
+class Bogus(grok.Permission):
grok.name('bogus.perm')
class BogusView(grok.View):
grok.context(zope.interface.Interface)
- @grokcore.view.require(Bogus)
+ @grok.require(Bogus)
def render(self):
pass
Modified: grokcore.view/trunk/src/grokcore/view/tests/static/statichaspy.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/static/statichaspy.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/static/statichaspy.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -2,7 +2,7 @@
When a package contains a 'static' resource directory, it must not also contain
a module called 'static.py':
- >>> from grokcore.view.tests import grok
+ >>> import grokcore.view as grok
>>> grok.testing.grok('grokcore.view.tests.static.statichaspy_fixture')
Traceback (most recent call last):
...
Modified: grokcore.view/trunk/src/grokcore/view/tests/static/staticispackage.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/static/staticispackage.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/static/staticispackage.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -1,7 +1,7 @@
"""
It is an error for the 'static' directory to be a python package:
- >>> from grokcore.view.tests import grok
+ >>> import grokcore.view as grok
>>> grok.testing.grok('grokcore.view.tests.static.staticispackage_fixture')
Traceback (most recent call last):
...
Modified: grokcore.view/trunk/src/grokcore/view/tests/template/pluggability.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/template/pluggability.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/template/pluggability.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -32,11 +32,10 @@
import os
import grokcore.component
import grokcore.view
+import grokcore.view as grok
from grokcore.view import components
-from grokcore.view.tests import grok
-
class MyTemplate(object):
'''Dummy template language'''
@@ -75,7 +74,7 @@
return MyPageTemplate(filename=filename, _prefix=_prefix)
-class Cave(grok.Model):
+class Cave(grok.Context):
pass
Modified: grokcore.view/trunk/src/grokcore/view/tests/template/zpt.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/template/zpt.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/template/zpt.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -12,11 +12,10 @@
<p>Piep! Piep!</p>
"""
+import grokcore.view as grok
-from grokcore.view.tests import grok
-
-class Cave(grok.Model):
+class Cave(grok.Context):
pass
Modified: grokcore.view/trunk/src/grokcore/view/tests/view/ambiguouscontext.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/ambiguouscontext.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/ambiguouscontext.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -9,14 +9,14 @@
'context' directive.
"""
-from grokcore.view.tests 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
Modified: grokcore.view/trunk/src/grokcore/view/tests/view/dirandinlinetemplate.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/dirandinlinetemplate.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/dirandinlinetemplate.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -9,13 +9,12 @@
<module 'grokcore.view.tests.view.dirandinlinetemplate' from ...
"""
-from grokcore.view.tests import grok
-import grokcore.view
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
class CavePainting(grok.View):
pass
-cavepainting = grokcore.view.PageTemplate("nothing")
+cavepainting = grok.PageTemplate("nothing")
Modified: grokcore.view/trunk/src/grokcore/view/tests/view/dirtemplate.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/dirtemplate.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/dirtemplate.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -24,10 +24,10 @@
</html>
"""
-from grokcore.view.tests import grok
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
Modified: grokcore.view/trunk/src/grokcore/view/tests/view/dirtemplateandrender.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/dirtemplateandrender.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/dirtemplateandrender.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -11,10 +11,10 @@
in:
"""
-from grokcore.view.tests import grok
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
Modified: grokcore.view/trunk/src/grokcore/view/tests/view/dirtemplatesonly.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/dirtemplatesonly.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/dirtemplatesonly.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -13,10 +13,10 @@
>>> warnings.warn = saved_warn
"""
-from grokcore.view.tests import grok
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
Modified: grokcore.view/trunk/src/grokcore/view/tests/view/eithertemplateorrender.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/eithertemplateorrender.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/eithertemplateorrender.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -9,11 +9,10 @@
It has both a 'render' method as well as an associated template.
in:
"""
-from grokcore.view.tests import grok
-import grokcore.view
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
@@ -22,4 +21,4 @@
def render(self):
pass
-cavepainting = grokcore.view.PageTemplate("nothing")
+cavepainting = grok.PageTemplate("nothing")
Modified: grokcore.view/trunk/src/grokcore/view/tests/view/explicitimplicittemplate.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/explicitimplicittemplate.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/explicitimplicittemplate.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -13,18 +13,17 @@
in:
"""
-from grokcore.view.tests import grok
-import grokcore.view
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
class Painting(grok.View):
- grokcore.view.template('cavepainting')
+ grok.template('cavepainting')
-cavepainting = grokcore.view.PageTemplate("GROK CAVEPAINT MAMMOTH!")
+cavepainting = grok.PageTemplate("GROK CAVEPAINT MAMMOTH!")
-painting = grokcore.view.PageTemplate("GROK PAINT MAMMOTH!")
+painting = grok.PageTemplate("GROK PAINT MAMMOTH!")
Modified: grokcore.view/trunk/src/grokcore/view/tests/view/inline.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/inline.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/inline.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -34,11 +34,10 @@
<html><body><h1>GROK HUNT MAMMOTH!</h1></body></html>
"""
-from grokcore.view.tests import grok
-import grokcore.view
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
@@ -46,7 +45,7 @@
pass
-cavepainting = grokcore.view.PageTemplate("""\
+cavepainting = grok.PageTemplate("""\
<html>
<body>
<h1 tal:content="string:Mammoth Cave Painting"/>
@@ -65,6 +64,6 @@
grok.name('hunting')
-hunt = grokcore.view.PageTemplate("""\
+hunt = grok.PageTemplate("""\
<html><body><h1>GROK HUNT MAMMOTH!</h1></body></html>
""")
Modified: grokcore.view/trunk/src/grokcore/view/tests/view/inline_unassociated.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/inline_unassociated.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/inline_unassociated.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -15,14 +15,13 @@
>>> warnings.warn = saved_warn
"""
-from grokcore.view.tests import grok
-import grokcore.view
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
-club = grokcore.view.PageTemplate("""\
+club = grok.PageTemplate("""\
<html><body><h1>GROK CLUB MAMMOTH!</h1></body></html>
""")
Modified: grokcore.view/trunk/src/grokcore/view/tests/view/missingcontext.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/missingcontext.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/missingcontext.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -9,7 +9,7 @@
'context' directive.
"""
-from grokcore.view.tests import grok
+import grokcore.view as grok
class Club(grok.View):
Modified: grokcore.view/trunk/src/grokcore/view/tests/view/modequalspkgname/modequalspkgname.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/modequalspkgname/modequalspkgname.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/modequalspkgname/modequalspkgname.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -3,9 +3,9 @@
resides in. Grokking it should not provoke an `unassociated template`
error or warning.
"""
-from grokcore.view.tests import grok
+import grokcore.view as grok
-class Cave(grok.Model):
+class Cave(grok.Context):
pass
Modified: grokcore.view/trunk/src/grokcore/view/tests/view/namemultiple_fixture.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/namemultiple_fixture.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/namemultiple_fixture.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -1,7 +1,7 @@
"""
This should fail:
"""
-from grokcore.view.tests import grok
+import grokcore.view as grok
class MultipleNames(grok.View):
grok.name('mammoth')
Modified: grokcore.view/trunk/src/grokcore/view/tests/view/nameunicode.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/nameunicode.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/nameunicode.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -16,7 +16,7 @@
unicode or ASCII.
"""
-from grokcore.view.tests import grok
+import grokcore.view as grok
def pass_unicode():
Modified: grokcore.view/trunk/src/grokcore/view/tests/view/nomodulename_fixture.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/nomodulename_fixture.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/nomodulename_fixture.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -1,6 +1,6 @@
"""
This should fail:
"""
-from grokcore.view.tests import grok
+import grokcore.view as grok
grok.name('viewname')
Modified: grokcore.view/trunk/src/grokcore/view/tests/view/notemplateorrender.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/notemplateorrender.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/notemplateorrender.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -9,10 +9,10 @@
in:
"""
-from grokcore.view.tests import grok
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
Modified: grokcore.view/trunk/src/grokcore/view/tests/view/template.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/template.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/template.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -20,28 +20,27 @@
<html><body><h1>GROK EAT MAMMOTH!</h1></body></html>
"""
-from grokcore.view.tests import grok
-import grokcore.view
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
class Painting(grok.View):
- grokcore.view.template('cavepainting')
+ grok.template('cavepainting')
-cavepainting = grokcore.view.PageTemplate("""\
+cavepainting = grok.PageTemplate("""\
<html><body><h1>GROK PAINT MAMMOTH!</h1></body></html>
""")
class Food(grok.View):
- grokcore.view.template('food_template')
+ grok.template('food_template')
grok.name('meal')
-food_template = grokcore.view.PageTemplate("""\
+food_template = grok.PageTemplate("""\
<html><body><h1>GROK EAT MAMMOTH!</h1></body></html>
""")
Modified: grokcore.view/trunk/src/grokcore/view/tests/view/templatedirectory.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/templatedirectory.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/templatedirectory.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -16,14 +16,13 @@
</html>
"""
-from grokcore.view.tests import grok
-import grokcore.view
+import grokcore.view as grok
-grokcore.view.templatedir('templatedirectoryname')
+grok.templatedir('templatedirectoryname')
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
Modified: grokcore.view/trunk/src/grokcore/view/tests/view/templatefile.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/templatefile.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/templatefile.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -20,11 +20,10 @@
"""
import os.path
-from grokcore.view.tests import grok
-import grokcore.view
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
@@ -32,5 +31,5 @@
pass
-food = grokcore.view.PageTemplate(filename=os.path.join(
+food = grok.PageTemplate(filename=os.path.join(
'templatedirectoryname', 'food.pt'))
Modified: grokcore.view/trunk/src/grokcore/view/tests/view/templatenotfound.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/templatenotfound.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/templatenotfound.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -9,15 +9,14 @@
has no associated template or 'render' method.
in:
"""
-from grokcore.view.tests import grok
-import grokcore.view
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
class Painting(grok.View):
- grokcore.view.template('cavepainting')
+ grok.template('cavepainting')
# no cavepainting template here
Modified: grokcore.view/trunk/src/grokcore/view/tests/view/templatereload.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/templatereload.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/templatereload.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -30,10 +30,10 @@
>>> template.write('before')
>>> template.close()
"""
-from grokcore.view.tests import grok
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
Modified: grokcore.view/trunk/src/grokcore/view/tests/view/twoviewsusetemplate.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/twoviewsusetemplate.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/twoviewsusetemplate.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -39,11 +39,10 @@
"""
-from grokcore.view.tests import grok
-import grokcore.view
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
@@ -51,19 +50,19 @@
pass
-a = grokcore.view.PageTemplate("View A")
+a = grok.PageTemplate("View A")
class B(grok.View):
- grokcore.view.template('a')
+ grok.template('a')
class C(grok.View):
- grokcore.view.template('templ')
+ grok.template('templ')
class D(grok.View):
- grokcore.view.template('templ')
+ grok.template('templ')
-templ = grokcore.view.PageTemplate('Template')
+templ = grok.PageTemplate('Template')
Modified: grokcore.view/trunk/src/grokcore/view/tests/view/unassociated.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/unassociated.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/unassociated.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -23,8 +23,8 @@
>>> warnings.warn = saved_warn
"""
-from grokcore.view.tests import grok
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
Modified: grokcore.view/trunk/src/grokcore/view/tests/view/update.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/update.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/update.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -26,11 +26,10 @@
"""
-from grokcore.view.tests import grok
-import grokcore.view
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
@@ -40,7 +39,7 @@
self.color = "red"
-cavepainting = grokcore.view.PageTemplate("""\
+cavepainting = grok.PageTemplate("""\
<html>
<body>
<h1 tal:content="view/color"/>
Modified: grokcore.view/trunk/src/grokcore/view/tests/view/update_redirect.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/update_redirect.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/update_redirect.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -17,11 +17,10 @@
somewhere-else
"""
-from grokcore.view.tests import grok
-import grokcore.view
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
@@ -31,7 +30,7 @@
self.request.response.redirect('somewhere-else')
-cavepainting = grokcore.view.PageTemplate("""\
+cavepainting = grok.PageTemplate("""\
<html>
<body>
<h1 tal:content="this-is-an-error" />
Modified: grokcore.view/trunk/src/grokcore/view/tests/view/view.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/view.py 2008-07-22 12:44:40 UTC (rev 88681)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/view.py 2008-07-22 12:47:02 UTC (rev 88682)
@@ -31,10 +31,10 @@
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')
"""
-from grokcore.view.tests import grok
+import grokcore.view as grok
-class Mammoth(grok.Model):
+class Mammoth(grok.Context):
pass
More information about the Checkins
mailing list