[Checkins] SVN: megrok.jinja/trunk/ Get rid of the grok dependency and now it depends on grokcore.component, grokcore.view, grokcore.viewlet
Santiago Videla
santiago.videla at gmail.com
Thu Apr 9 12:20:40 EDT 2009
Log message for revision 99045:
Get rid of the grok dependency and now it depends on grokcore.component, grokcore.view, grokcore.viewlet
Changed:
U megrok.jinja/trunk/README.txt
U megrok.jinja/trunk/buildout.cfg
U megrok.jinja/trunk/setup.py
U megrok.jinja/trunk/src/megrok/jinja/configure.zcml
U megrok.jinja/trunk/src/megrok/jinja/extensions.py
U megrok.jinja/trunk/src/megrok/jinja/factory.py
U megrok.jinja/trunk/src/megrok/jinja/ftesting.zcml
U megrok.jinja/trunk/src/megrok/jinja/ftests/i18n/test_i18n.py
U megrok.jinja/trunk/src/megrok/jinja/ftests/inline/test_inline.py
U megrok.jinja/trunk/src/megrok/jinja/ftests/module_directory/test_module_directory.py
U megrok.jinja/trunk/src/megrok/jinja/ftests/providers/test_providers.py
-=-
Modified: megrok.jinja/trunk/README.txt
===================================================================
--- megrok.jinja/trunk/README.txt 2009-04-09 15:55:49 UTC (rev 99044)
+++ megrok.jinja/trunk/README.txt 2009-04-09 16:20:39 UTC (rev 99045)
@@ -11,7 +11,7 @@
Requirements
------------
-- Grok v1.0a or later. Tested with Grok v1.0a.
+- Grok v1.0a or later. Tested with Grok v1.0a2.
- Jinja v2.1.1 or later. Tested with Jinja v2.1.1
- PyYAML v3.08 or later. Tested with PyYAML v3.08
- simplejson v1.7.1 or later. Tested with simplejson v1.7.1
Modified: megrok.jinja/trunk/buildout.cfg
===================================================================
--- megrok.jinja/trunk/buildout.cfg 2009-04-09 15:55:49 UTC (rev 99044)
+++ megrok.jinja/trunk/buildout.cfg 2009-04-09 16:20:39 UTC (rev 99045)
@@ -1,7 +1,7 @@
[buildout]
develop = .
parts = interpreter test gettext
-extends = http://grok.zope.org/releaseinfo/grok-1.0a1.cfg
+extends = http://grok.zope.org/releaseinfo/grok-1.0a2.cfg
versions = versions
[interpreter]
Modified: megrok.jinja/trunk/setup.py
===================================================================
--- megrok.jinja/trunk/setup.py 2009-04-09 15:55:49 UTC (rev 99044)
+++ megrok.jinja/trunk/setup.py 2009-04-09 16:20:39 UTC (rev 99045)
@@ -32,7 +32,9 @@
zip_safe=True,
install_requires=[
'setuptools',
- 'grok',
+ 'grokcore.component',
+ 'grokcore.view',
+ 'grokcore.viewlet',
'Jinja2',
'simplejson',
'pyyaml'
Modified: megrok.jinja/trunk/src/megrok/jinja/configure.zcml
===================================================================
--- megrok.jinja/trunk/src/megrok/jinja/configure.zcml 2009-04-09 15:55:49 UTC (rev 99044)
+++ megrok.jinja/trunk/src/megrok/jinja/configure.zcml 2009-04-09 16:20:39 UTC (rev 99045)
@@ -1,7 +1,11 @@
<configure xmlns="http://namespaces.zope.org/zope"
xmlns:grok="http://namespaces.zope.org/grok">
- <include package="grok" />
- <includeDependencies package="." />
+
+ <!-- Load minimal support of grokcore.view, views + templates -->
+ <include package="grokcore.view" file="meta-minimal.zcml" />
+ <include package="grokcore.view" />
+ <include package="grokcore.viewlet" />
+
<grok:grok package="." />
</configure>
Modified: megrok.jinja/trunk/src/megrok/jinja/extensions.py
===================================================================
--- megrok.jinja/trunk/src/megrok/jinja/extensions.py 2009-04-09 15:55:49 UTC (rev 99044)
+++ megrok.jinja/trunk/src/megrok/jinja/extensions.py 2009-04-09 16:20:39 UTC (rev 99045)
@@ -15,8 +15,9 @@
from jinja2 import nodes
from jinja2.ext import Extension, InternationalizationExtension
from jinja2.utils import contextfunction
+
from zope.component import getUtility, getMultiAdapter
-from zope.i18n.interfaces import ITranslationDomain, IUserPreferredLanguages
+from zope.i18n.interfaces import ITranslationDomain
from zope.contentprovider.interfaces import IContentProvider
from zope.cachedescriptors import method
@@ -107,7 +108,7 @@
Jinja2 extension to support the use of viewlets (content
providers).
- It doesn't define any `tag`, just set the `provider` name function
+ It doesn't define any `tag`, just set the `provider` function name
in the `Environment.globals`
"""
def __init__(self, environment):
Modified: megrok.jinja/trunk/src/megrok/jinja/factory.py
===================================================================
--- megrok.jinja/trunk/src/megrok/jinja/factory.py 2009-04-09 15:55:49 UTC (rev 99044)
+++ megrok.jinja/trunk/src/megrok/jinja/factory.py 2009-04-09 16:20:39 UTC (rev 99045)
@@ -13,14 +13,15 @@
##############################################################################
from jinja2 import Environment, FileSystemLoader
+from extensions import i18nExtension, ContentProviderExtension
-import yaml, simplejson, grok, os
+import yaml, simplejson, os
+from grokcore.component import GlobalUtility, implements, name
+
from grokcore.view.components import GrokTemplate
from grokcore.view.interfaces import ITemplate, ITemplateFileFactory
-from extensions import i18nExtension, ContentProviderExtension
-
# Create an Environment instance with the i18n extension
# and the FileSystemLoader class loader that will look for
# absolute path templates.
@@ -52,31 +53,31 @@
self.filepath = os.path.join(_prefix, filename)
class JsonTemplate(JTemplate, GrokTemplate):
- grok.implements(ITemplate)
+ implements(ITemplate)
def render(self, view):
jinja_render = self.template.render(**self.getNamespace(view))
yaml_loader = yaml.load(jinja_render)
return simplejson.dumps(yaml_loader)
-class JsonTemplateFactory(grok.GlobalUtility):
+class JsonTemplateFactory(GlobalUtility):
- grok.implements(ITemplateFileFactory)
- grok.name('json')
+ implements(ITemplateFileFactory)
+ name('json')
def __call__(self, filename, _prefix=None):
return JsonTemplate(filename=filename, _prefix=_prefix)
class JinjaTemplate(JTemplate, GrokTemplate):
- grok.implements(ITemplate)
+ implements(ITemplate)
def render(self, view):
return self.template.render(**self.getNamespace(view))
-class JinjaTemplateFactory(grok.GlobalUtility):
+class JinjaTemplateFactory(GlobalUtility):
- grok.implements(ITemplateFileFactory)
- grok.name('jinja')
+ implements(ITemplateFileFactory)
+ name('jinja')
def __call__(self, filename, _prefix=None):
return JinjaTemplate(filename=filename, _prefix=_prefix)
Modified: megrok.jinja/trunk/src/megrok/jinja/ftesting.zcml
===================================================================
--- megrok.jinja/trunk/src/megrok/jinja/ftesting.zcml 2009-04-09 15:55:49 UTC (rev 99044)
+++ megrok.jinja/trunk/src/megrok/jinja/ftesting.zcml 2009-04-09 16:20:39 UTC (rev 99045)
@@ -6,13 +6,25 @@
package="megrok.jinja.ftests"
>
- <include package="grok" />
+ <include package="zope.app.zcmlfiles" file="meta.zcml" />
+ <include package="zope.securitypolicy" file="meta.zcml" />
+
+ <include package="zope.app.zcmlfiles" />
+ <include package="zope.app.authentication" />
+
+ <!-- Load minimal support of grokcore.view, views + templates -->
+ <include package="grokcore.view" file="meta-minimal.zcml" />
+ <include package="grokcore.view" />
+
+ <include package="grokcore.viewlet" file="meta.zcml" />
+
+ <include package="zope.i18n" file="meta.zcml" />
+ <i18n:registerTranslations directory="locales/mo" />
+
<include package="megrok.jinja" />
<grok:grok package="megrok.jinja.ftests" />
- <i18n:registerTranslations directory="locales/mo" />
-
<!-- Typical functional testing security setup -->
<securityPolicy
component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy"
@@ -38,4 +50,5 @@
<grantAll role="zope.Manager" />
<grant role="zope.Manager" principal="zope.mgr" />
+
</configure>
Modified: megrok.jinja/trunk/src/megrok/jinja/ftests/i18n/test_i18n.py
===================================================================
--- megrok.jinja/trunk/src/megrok/jinja/ftests/i18n/test_i18n.py 2009-04-09 15:55:49 UTC (rev 99044)
+++ megrok.jinja/trunk/src/megrok/jinja/ftests/i18n/test_i18n.py 2009-04-09 16:20:39 UTC (rev 99045)
@@ -63,19 +63,20 @@
"""
-import grok
+from grokcore.component import Context, context
+from grokcore.view import View
-class Context(grok.Context):
+class Context(Context):
pass
-class TransTagTranslate(grok.View):
- grok.context(Context)
+class TransTagTranslate(View):
+ context(Context)
-class UnderscoreTranslate(grok.View):
- grok.context(Context)
+class UnderscoreTranslate(View):
+ context(Context)
def update(self):
self.msg = 'testing-underscore'
-class NoDomain(grok.View):
- grok.context(Context)
+class NoDomain(View):
+ context(Context)
Modified: megrok.jinja/trunk/src/megrok/jinja/ftests/inline/test_inline.py
===================================================================
--- megrok.jinja/trunk/src/megrok/jinja/ftests/inline/test_inline.py 2009-04-09 15:55:49 UTC (rev 99044)
+++ megrok.jinja/trunk/src/megrok/jinja/ftests/inline/test_inline.py 2009-04-09 16:20:39 UTC (rev 99045)
@@ -47,7 +47,9 @@
"""
-import grok
+from grokcore.component import Context, context
+from grokcore.view import View
+
from zope.interface import Interface
from megrok.jinja.factory import JinjaTemplate, JsonTemplate
@@ -56,18 +58,19 @@
import megrok.jinja.ftests.inline as inline
templates = os.path.join(os.path.dirname(inline.__file__),
'test_inline_templates')
-class Mammoth(grok.Model):
+
+class Mammoth(Context):
pass
-class Macros(grok.View):
+class Macros(View):
"""
Templates that define blocks to be
extended must use a template file
"""
- grok.context(Mammoth)
+ context(Mammoth)
-class SayHi(grok.View):
- grok.context(Mammoth)
+class SayHi(View):
+ context(Mammoth)
def update(self):
self.macros_tpl = "%s/macros.jinja" % templates
@@ -78,16 +81,16 @@
{% endblock %}
""")
-class CavePainting(grok.View):
- grok.context(Mammoth)
+class CavePainting(View):
+ context(Mammoth)
def update(self):
self.color = 'BROWN'
cavepainting = JinjaTemplate("GROK SAY: I LIKE {{ view.color }} COLOR")
-class JsonView(grok.View):
- grok.context(Mammoth)
+class JsonView(View):
+ context(Mammoth)
def update(self):
self.dict = {'k1' : 'val1', 'k2' : 'val2'}
@@ -96,4 +99,4 @@
dicts :
- key1 : some_text
- {{ view.dict }}
-""")
\ No newline at end of file
+""")
Modified: megrok.jinja/trunk/src/megrok/jinja/ftests/module_directory/test_module_directory.py
===================================================================
--- megrok.jinja/trunk/src/megrok/jinja/ftests/module_directory/test_module_directory.py 2009-04-09 15:55:49 UTC (rev 99044)
+++ megrok.jinja/trunk/src/megrok/jinja/ftests/module_directory/test_module_directory.py 2009-04-09 16:20:39 UTC (rev 99045)
@@ -48,7 +48,9 @@
"""
-import grok
+from grokcore.component import Context, context
+from grokcore.view import View
+
from zope.interface import Interface
import os
@@ -56,26 +58,26 @@
templates = os.path.join(os.path.dirname(moduledir.__file__),
'test_module_directory_templates')
-class Mammoth(grok.Model):
+class Mammoth(Context):
pass
-class Macros(grok.View):
- grok.context(Mammoth)
+class Macros(View):
+ context(Mammoth)
-class SayHi(grok.View):
- grok.context(Mammoth)
+class SayHi(View):
+ context(Mammoth)
def update(self):
self.macros_tpl = "%s/macros.jinja" % templates
-class CavePainting(grok.View):
- grok.context(Mammoth)
+class CavePainting(View):
+ context(Mammoth)
def update(self):
self.color = 'BROWN'
-class JsonView(grok.View):
- grok.context(Mammoth)
+class JsonView(View):
+ context(Mammoth)
def update(self):
self.dict = {'k1' : 'val1', 'k2' : 'val2'}
Modified: megrok.jinja/trunk/src/megrok/jinja/ftests/providers/test_providers.py
===================================================================
--- megrok.jinja/trunk/src/megrok/jinja/ftests/providers/test_providers.py 2009-04-09 15:55:49 UTC (rev 99044)
+++ megrok.jinja/trunk/src/megrok/jinja/ftests/providers/test_providers.py 2009-04-09 16:20:39 UTC (rev 99045)
@@ -29,22 +29,25 @@
From the viewlet: A viewlet variable
"""
-import grok
+from grokcore.component import Context, context, name
+from grokcore.view import View
+from grokcore.viewlet import Viewlet, ViewletManager, viewletmanager
-class Context(grok.Context):
+
+class Context(Context):
pass
-class UsingViewlets(grok.View):
+class UsingViewlets(View):
def update(self):
self.something = 'A view variable'
-class ViewletMgr(grok.ViewletManager):
- grok.context(Context)
- grok.name('manager')
+class ViewletMgr(ViewletManager):
+ context(Context)
+ name('manager')
-class Viewlet(grok.Viewlet):
- grok.context(Context)
- grok.viewletmanager(ViewletMgr)
+class Viewlet(Viewlet):
+ context(Context)
+ viewletmanager(ViewletMgr)
def update(self):
self.another = 'A viewlet variable'
More information about the Checkins
mailing list