[Checkins] SVN: grokcore.layout/trunk/ Rename megrok.layout to grokcore.layout.
Sylvain Viollon
sylvain at infrae.com
Wed Jul 13 12:41:51 EDT 2011
Log message for revision 122178:
Rename megrok.layout to grokcore.layout.
Changed:
U grokcore.layout/trunk/CHANGES.txt
U grokcore.layout/trunk/buildout.cfg
U grokcore.layout/trunk/setup.py
U grokcore.layout/trunk/src/grokcore/layout/README.txt
U grokcore.layout/trunk/src/grokcore/layout/__init__.py
U grokcore.layout/trunk/src/grokcore/layout/components.py
U grokcore.layout/trunk/src/grokcore/layout/configure.zcml
U grokcore.layout/trunk/src/grokcore/layout/meta.py
U grokcore.layout/trunk/src/grokcore/layout/tests/__init__.py
U grokcore.layout/trunk/src/grokcore/layout/tests/errors/norenderortemplatelayout.py
U grokcore.layout/trunk/src/grokcore/layout/tests/errors/renderandtemplate.py
U grokcore.layout/trunk/src/grokcore/layout/tests/errors/samecontext.py
U grokcore.layout/trunk/src/grokcore/layout/tests/ftesting.zcml
U grokcore.layout/trunk/src/grokcore/layout/tests/layout/layout.py
U grokcore.layout/trunk/src/grokcore/layout/tests/layout/layoutlayers.py
U grokcore.layout/trunk/src/grokcore/layout/tests/layout/no_staticfolder.py
U grokcore.layout/trunk/src/grokcore/layout/tests/layout/specializedlayout.py
U grokcore.layout/trunk/src/grokcore/layout/tests/layout/static_fixture/simple.py
U grokcore.layout/trunk/src/grokcore/layout/tests/layout/staticfolder.py
U grokcore.layout/trunk/src/grokcore/layout/tests/models/errorviews.py
U grokcore.layout/trunk/src/grokcore/layout/tests/models/forms.py
U grokcore.layout/trunk/src/grokcore/layout/tests/models/message.py
U grokcore.layout/trunk/src/grokcore/layout/tests/models/page.py
U grokcore.layout/trunk/src/grokcore/layout/tests/models/url.py
U grokcore.layout/trunk/src/grokcore/layout/tests/test_package.py
U grokcore.layout/trunk/src/grokcore/layout/tests/test_readme.py
-=-
Modified: grokcore.layout/trunk/CHANGES.txt
===================================================================
--- grokcore.layout/trunk/CHANGES.txt 2011-07-13 16:34:45 UTC (rev 122177)
+++ grokcore.layout/trunk/CHANGES.txt 2011-07-13 16:41:50 UTC (rev 122178)
@@ -7,7 +7,7 @@
- Added ExceptionPage, NotFoundPage and UnauthorizedPage layout-aware
components.
-- Fixed default template for megrok.layout.Form component.
+- Fixed default template for grokcore.layout.Form component.
1.3 (2011-01-12)
----------------
Modified: grokcore.layout/trunk/buildout.cfg
===================================================================
--- grokcore.layout/trunk/buildout.cfg 2011-07-13 16:34:45 UTC (rev 122177)
+++ grokcore.layout/trunk/buildout.cfg 2011-07-13 16:41:50 UTC (rev 122178)
@@ -4,15 +4,15 @@
extends = http://svn.zope.org/*checkout*/groktoolkit/trunk/grok.cfg
[versions]
-megrok.layout =
+grokcore.layout =
[interpreter]
recipe = zc.recipe.egg
-eggs = megrok.layout
+eggs = grokcore.layout
interpreter = python
[test]
recipe = zc.recipe.testrunner
-eggs = megrok.layout [test]
-defaults = ['--tests-pattern', '^f?tests$', '-v', '-c', '--package=megrok.layout']
+eggs = grokcore.layout [test]
+defaults = ['--tests-pattern', '^f?tests$', '-v', '-c', '--package=grokcore.layout']
Modified: grokcore.layout/trunk/setup.py
===================================================================
--- grokcore.layout/trunk/setup.py 2011-07-13 16:34:45 UTC (rev 122177)
+++ grokcore.layout/trunk/setup.py 2011-07-13 16:41:50 UTC (rev 122178)
@@ -1,7 +1,7 @@
from setuptools import setup, find_packages
import os
-readme_filename = os.path.join('src', 'megrok', 'layout', 'README.txt')
+readme_filename = os.path.join('src', 'grokcore', 'layout', 'README.txt')
long_description = open(readme_filename).read() + '\n\n' + \
open('CHANGES.txt').read()
@@ -16,7 +16,7 @@
'zope.traversing',
]
-setup(name='megrok.layout',
+setup(name='grokcore.layout',
version='1.4dev',
description="A layout component package for zope3 and Grok.",
long_description = long_description,
@@ -31,11 +31,11 @@
keywords='grok layout zope3 pagelet theming',
author='Souheil Chelfouh',
author_email='trollfot at gmail.com',
- url='http://pypi.python.org/pypi/megrok.layout',
+ url='http://pypi.python.org/pypi/grokcore.layout',
license='GPL',
packages=find_packages('src', exclude=['ez_setup']),
package_dir={'': 'src'},
- namespace_packages=['megrok'],
+ namespace_packages=['grokcore'],
include_package_data=True,
zip_safe=False,
extras_require={'test': test_requires},
Modified: grokcore.layout/trunk/src/grokcore/layout/README.txt
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/README.txt 2011-07-13 16:34:45 UTC (rev 122177)
+++ grokcore.layout/trunk/src/grokcore/layout/README.txt 2011-07-13 16:41:50 UTC (rev 122178)
@@ -1,8 +1,8 @@
=============
-megrok.layout
+grokcore.layout
=============
-The `megrok.layout` package provides a simple way to write view
+The `grokcore.layout` package provides a simple way to write view
components which can be included into a defined layout. It turns
around two main components : the Page and the Layout.
@@ -16,7 +16,7 @@
Let's implement a simple Layout:
- >>> from megrok.layout import Layout
+ >>> from grokcore.layout import Layout
>>> from zope.interface import Interface
>>> import grokcore.component as grok
@@ -34,7 +34,7 @@
We check it has been correctly registered:
- >>> from megrok.layout import ILayout
+ >>> from grokcore.layout import ILayout
>>> from zope.component import getMultiAdapter
>>> from zope.publisher.browser import TestRequest
@@ -66,7 +66,7 @@
Let's create now a page that will display their description.
- >>> from megrok.layout import Page
+ >>> from grokcore.layout import Page
>>> class AnimalDisplay(Page):
... grok.name('display')
... grok.context(Interface)
Modified: grokcore.layout/trunk/src/grokcore/layout/__init__.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/__init__.py 2011-07-13 16:34:45 UTC (rev 122177)
+++ grokcore.layout/trunk/src/grokcore/layout/__init__.py 2011-07-13 16:41:50 UTC (rev 122178)
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
-from megrok.layout.interfaces import ILayout, IPage
-from megrok.layout.components import Layout, Page, Form
-from megrok.layout.components import AddForm, EditForm, DisplayForm
-from megrok.layout.components import UnauthorizedPage, NotFoundPage
-from megrok.layout.components import ExceptionPage
+from grokcore.layout.interfaces import ILayout, IPage
+from grokcore.layout.components import Layout, Page, Form
+from grokcore.layout.components import AddForm, EditForm, DisplayForm
+from grokcore.layout.components import UnauthorizedPage, NotFoundPage
+from grokcore.layout.components import ExceptionPage
Modified: grokcore.layout/trunk/src/grokcore/layout/components.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/components.py 2011-07-13 16:34:45 UTC (rev 122177)
+++ grokcore.layout/trunk/src/grokcore/layout/components.py 2011-07-13 16:41:50 UTC (rev 122178)
@@ -6,7 +6,7 @@
import grokcore.view
import zope.component
-from megrok.layout.interfaces import IPage, ILayout
+from grokcore.layout.interfaces import IPage, ILayout
from zope.interface import Interface
import zope.publisher.interfaces
import zope.security.interfaces
Modified: grokcore.layout/trunk/src/grokcore/layout/configure.zcml
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/configure.zcml 2011-07-13 16:34:45 UTC (rev 122177)
+++ grokcore.layout/trunk/src/grokcore/layout/configure.zcml 2011-07-13 16:41:50 UTC (rev 122178)
@@ -2,7 +2,7 @@
xmlns="http://namespaces.zope.org/zope"
xmlns:grok="http://namespaces.zope.org/grok">
- <include package="megrok.layout" file="meta.zcml" />
+ <include package="grokcore.layout" file="meta.zcml" />
<include package="grokcore.view" />
<include package="grokcore.formlib" />
<include package="grokcore.message" />
Modified: grokcore.layout/trunk/src/grokcore/layout/meta.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/meta.py 2011-07-13 16:34:45 UTC (rev 122177)
+++ grokcore.layout/trunk/src/grokcore/layout/meta.py 2011-07-13 16:41:50 UTC (rev 122178)
@@ -3,7 +3,7 @@
import martian
import zope.component
import grokcore.component
-from megrok.layout import ILayout, Layout
+from grokcore.layout import ILayout, Layout
from zope.publisher.interfaces.browser import IDefaultBrowserLayer
from grokcore.view.meta.views import TemplateGrokker
Modified: grokcore.layout/trunk/src/grokcore/layout/tests/__init__.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/tests/__init__.py 2011-07-13 16:34:45 UTC (rev 122177)
+++ grokcore.layout/trunk/src/grokcore/layout/tests/__init__.py 2011-07-13 16:41:50 UTC (rev 122178)
@@ -18,7 +18,7 @@
from zope.traversing.testing import setUp as traversingSetUp
-class MegrokLayoutLayer(ZCMLFileLayer):
+class GrokcoreLayoutLayer(ZCMLFileLayer):
def setUp(self):
ZCMLFileLayer.setUp(self)
Modified: grokcore.layout/trunk/src/grokcore/layout/tests/errors/norenderortemplatelayout.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/tests/errors/norenderortemplatelayout.py 2011-07-13 16:34:45 UTC (rev 122177)
+++ grokcore.layout/trunk/src/grokcore/layout/tests/errors/norenderortemplatelayout.py 2011-07-13 16:41:50 UTC (rev 122178)
@@ -2,13 +2,13 @@
>>> grok.testing.grok(__name__)
Traceback (most recent call last):
...
- ConfigurationExecutionError: <class 'martian.error.GrokError'>: Layout <class 'megrok.layout.tests.errors.norenderortemplatelayout.MyLayout'> has no associated template or 'render' method.
+ ConfigurationExecutionError: <class 'martian.error.GrokError'>: Layout <class 'grokcore.layout.tests.errors.norenderortemplatelayout.MyLayout'> has no associated template or 'render' method.
in:
<BLANKLINE>
"""
import grokcore.component as grok
-from megrok.layout import Layout
+from grokcore.layout import Layout
from zope.interface import Interface
Modified: grokcore.layout/trunk/src/grokcore/layout/tests/errors/renderandtemplate.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/tests/errors/renderandtemplate.py 2011-07-13 16:34:45 UTC (rev 122177)
+++ grokcore.layout/trunk/src/grokcore/layout/tests/errors/renderandtemplate.py 2011-07-13 16:41:50 UTC (rev 122178)
@@ -2,13 +2,13 @@
>>> grok.testing.grok(__name__)
Traceback (most recent call last):
...
- ConfigurationExecutionError: <class 'martian.error.GrokError'>: Multiple possible ways to render layout <class 'megrok.layout.tests.errors.renderandtemplate.MyLayout'>. It has both a 'render' method as well as an associated template.
+ ConfigurationExecutionError: <class 'martian.error.GrokError'>: Multiple possible ways to render layout <class 'grokcore.layout.tests.errors.renderandtemplate.MyLayout'>. It has both a 'render' method as well as an associated template.
in:
<BLANKLINE>
"""
import grokcore.component as grok
-from megrok.layout import Layout
+from grokcore.layout import Layout
from zope.interface import Interface
Modified: grokcore.layout/trunk/src/grokcore/layout/tests/errors/samecontext.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/tests/errors/samecontext.py 2011-07-13 16:34:45 UTC (rev 122177)
+++ grokcore.layout/trunk/src/grokcore/layout/tests/errors/samecontext.py 2011-07-13 16:41:50 UTC (rev 122178)
@@ -3,11 +3,11 @@
Traceback (most recent call last):
...
ConfigurationConflictError: Conflicting configuration actions
- For: ('adapter', (<InterfaceClass zope.publisher.interfaces.browser.IDefaultBrowserLayer>, <InterfaceClass zope.interface.Interface>), <InterfaceClass megrok.layout.interfaces.ILayout>)
+ For: ('adapter', (<InterfaceClass zope.publisher.interfaces.browser.IDefaultBrowserLayer>, <InterfaceClass zope.interface.Interface>), <InterfaceClass grokcore.layout.interfaces.ILayout>)
"""
import grokcore.component as grok
-from megrok.layout import Layout
+from grokcore.layout import Layout
from zope.interface import Interface
Modified: grokcore.layout/trunk/src/grokcore/layout/tests/ftesting.zcml
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/tests/ftesting.zcml 2011-07-13 16:34:45 UTC (rev 122177)
+++ grokcore.layout/trunk/src/grokcore/layout/tests/ftesting.zcml 2011-07-13 16:41:50 UTC (rev 122178)
@@ -7,7 +7,7 @@
<include package="zope.annotation" />
<include package="zope.security" />
- <include package="megrok.layout" />
+ <include package="grokcore.layout" />
<grok:grok package=".layout" />
<grok:grok package=".models" />
Modified: grokcore.layout/trunk/src/grokcore/layout/tests/layout/layout.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/tests/layout/layout.py 2011-07-13 16:34:45 UTC (rev 122177)
+++ grokcore.layout/trunk/src/grokcore/layout/tests/layout/layout.py 2011-07-13 16:41:50 UTC (rev 122178)
@@ -1,5 +1,5 @@
"""
- >>> from megrok.layout import ILayout
+ >>> from grokcore.layout import ILayout
>>> from zope.component import getMultiAdapter
>>> from zope.publisher.browser import TestRequest
>>> request = TestRequest()
@@ -9,7 +9,7 @@
True
>>> mylayout.context
- <megrok.layout.tests.layout.layout.Mammoth object at ...>
+ <grokcore.layout.tests.layout.layout.Mammoth object at ...>
>>> mylayout.render()
'<div> MyLayout </div>'
@@ -22,7 +22,7 @@
import grokcore.component as grok
from zope.interface import Interface
-from megrok.layout import Layout
+from grokcore.layout import Layout
class Mammoth(grok.Context):
Modified: grokcore.layout/trunk/src/grokcore/layout/tests/layout/layoutlayers.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/tests/layout/layoutlayers.py 2011-07-13 16:34:45 UTC (rev 122177)
+++ grokcore.layout/trunk/src/grokcore/layout/tests/layout/layoutlayers.py 2011-07-13 16:41:50 UTC (rev 122178)
@@ -24,7 +24,7 @@
"""
import grokcore.view as grok
-from megrok.layout import Layout, Page
+from grokcore.layout import Layout, Page
from zope.interface import Interface
Modified: grokcore.layout/trunk/src/grokcore/layout/tests/layout/no_staticfolder.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/tests/layout/no_staticfolder.py 2011-07-13 16:34:45 UTC (rev 122177)
+++ grokcore.layout/trunk/src/grokcore/layout/tests/layout/no_staticfolder.py 2011-07-13 16:41:50 UTC (rev 122178)
@@ -1,5 +1,5 @@
"""
- >>> from megrok.layout import ILayout
+ >>> from grokcore.layout import ILayout
>>> from zope.component import getMultiAdapter
>>> from zope.publisher.browser import TestRequest
>>> request = TestRequest()
@@ -10,7 +10,7 @@
"""
import grokcore.component as grok
-from megrok.layout import Layout
+from grokcore.layout import Layout
class Dummy(grok.Context):
Modified: grokcore.layout/trunk/src/grokcore/layout/tests/layout/specializedlayout.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/tests/layout/specializedlayout.py 2011-07-13 16:34:45 UTC (rev 122177)
+++ grokcore.layout/trunk/src/grokcore/layout/tests/layout/specializedlayout.py 2011-07-13 16:41:50 UTC (rev 122178)
@@ -33,7 +33,7 @@
"""
import grokcore.view as grok
from zope.interface import Interface
-from megrok.layout import Layout, Page
+from grokcore.layout import Layout, Page
from grokcore.view import IDefaultBrowserLayer
Modified: grokcore.layout/trunk/src/grokcore/layout/tests/layout/static_fixture/simple.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/tests/layout/static_fixture/simple.py 2011-07-13 16:34:45 UTC (rev 122177)
+++ grokcore.layout/trunk/src/grokcore/layout/tests/layout/static_fixture/simple.py 2011-07-13 16:41:50 UTC (rev 122178)
@@ -1,5 +1,5 @@
import grokcore.component as grok
-from megrok.layout import Layout
+from grokcore.layout import Layout
class Dummy(grok.Context):
pass
Modified: grokcore.layout/trunk/src/grokcore/layout/tests/layout/staticfolder.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/tests/layout/staticfolder.py 2011-07-13 16:34:45 UTC (rev 122177)
+++ grokcore.layout/trunk/src/grokcore/layout/tests/layout/staticfolder.py 2011-07-13 16:41:50 UTC (rev 122178)
@@ -1,9 +1,9 @@
"""
- >>> from megrok.layout import ILayout
+ >>> from grokcore.layout import ILayout
>>> from zope.component import getMultiAdapter
>>> from zope.publisher.browser import TestRequest
>>> request = TestRequest()
- >>> from megrok.layout.tests.layout.static_fixture.simple import Dummy
+ >>> from grokcore.layout.tests.layout.static_fixture.simple import Dummy
>>> mongo = Dummy()
>>> mylayout = getMultiAdapter((request, mongo), ILayout)
>>> mylayout.static
@@ -11,7 +11,7 @@
"""
import grokcore.component as grok
-from megrok.layout import Layout
+from grokcore.layout import Layout
from grokcore.view.ftests.staticdir.simple import DummyResource
import zope.component
@@ -22,4 +22,4 @@
zope.component.provideAdapter(factory=DummyResource,
adapts=(IBrowserRequest,),
provides=zope.interface.Interface,
- name='megrok.layout.tests.layout.static_fixture')
+ name='grokcore.layout.tests.layout.static_fixture')
Modified: grokcore.layout/trunk/src/grokcore/layout/tests/models/errorviews.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/tests/models/errorviews.py 2011-07-13 16:34:45 UTC (rev 122177)
+++ grokcore.layout/trunk/src/grokcore/layout/tests/models/errorviews.py 2011-07-13 16:41:50 UTC (rev 122178)
@@ -2,8 +2,8 @@
>>> from zope.component import getMultiAdapter
>>> from zope.publisher.browser import TestRequest
>>> view = getMultiAdapter((Exception(), TestRequest()), name='index')
- >>> import megrok.layout
- >>> isinstance(view, megrok.layout.ExceptionPage)
+ >>> import grokcore.layout
+ >>> isinstance(view, grokcore.layout.ExceptionPage)
True
>>> print view.render()
A system error occurred.
@@ -42,7 +42,7 @@
import grokcore.component as grok
from grokcore.view import templatedir
-from megrok.layout import Layout, ExceptionPage, NotFoundPage, UnauthorizedPage
+from grokcore.layout import Layout, ExceptionPage, NotFoundPage, UnauthorizedPage
templatedir('templates')
Modified: grokcore.layout/trunk/src/grokcore/layout/tests/models/forms.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/tests/models/forms.py 2011-07-13 16:34:45 UTC (rev 122177)
+++ grokcore.layout/trunk/src/grokcore/layout/tests/models/forms.py 2011-07-13 16:41:50 UTC (rev 122178)
@@ -1,5 +1,5 @@
"""
- >>> from megrok.layout import ILayout
+ >>> from grokcore.layout import ILayout
>>> from zope.component import getMultiAdapter
>>> from zope.publisher.browser import TestRequest
@@ -69,9 +69,9 @@
</html>
>>> myview
- <megrok.layout.tests.models.forms.MyView object at ...>
+ <grokcore.layout.tests.models.forms.MyView object at ...>
>>> myview.layout
- <megrok.layout.tests.models.forms.Master object at ...>
+ <grokcore.layout.tests.models.forms.Master object at ...>
>>> print myview.content()
<table class="listing">
<thead>
@@ -144,9 +144,9 @@
<BLANKLINE>
>>> myeditview
- <megrok.layout.tests.models.forms.MyEditView object at ...>
+ <grokcore.layout.tests.models.forms.MyEditView object at ...>
>>> myeditview.layout
- <megrok.layout.tests.models.forms.Master object at ...>
+ <grokcore.layout.tests.models.forms.Master object at ...>
>>> print myeditview.content()
<form action="http://127.0.0.1" method="post"
class="edit-form" enctype="multipart/form-data">
@@ -160,7 +160,7 @@
import grokcore.component as grok
from grokcore.view import templatedir
-from megrok.layout import Layout, DisplayForm, EditForm, Form
+from grokcore.layout import Layout, DisplayForm, EditForm, Form
from zope import interface, schema
Modified: grokcore.layout/trunk/src/grokcore/layout/tests/models/message.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/tests/models/message.py 2011-07-13 16:34:45 UTC (rev 122177)
+++ grokcore.layout/trunk/src/grokcore/layout/tests/models/message.py 2011-07-13 16:41:50 UTC (rev 122178)
@@ -1,5 +1,5 @@
"""
- >>> from megrok.layout import ILayout
+ >>> from grokcore.layout import ILayout
>>> from zope.component import getMultiAdapter
>>> from zope.publisher.browser import TestRequest
@@ -38,7 +38,7 @@
import grokcore.component as grok
from grokcore.view import templatedir
from zope.interface import Interface
-from megrok.layout import Layout, Page, Form
+from grokcore.layout import Layout, Page, Form
templatedir('templates')
Modified: grokcore.layout/trunk/src/grokcore/layout/tests/models/page.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/tests/models/page.py 2011-07-13 16:34:45 UTC (rev 122177)
+++ grokcore.layout/trunk/src/grokcore/layout/tests/models/page.py 2011-07-13 16:41:50 UTC (rev 122178)
@@ -1,5 +1,5 @@
"""
- >>> from megrok.layout import ILayout
+ >>> from grokcore.layout import ILayout
>>> from zope.component import getMultiAdapter
>>> from zope.publisher.browser import TestRequest
>>> request = TestRequest()
@@ -15,16 +15,16 @@
</html>
>>> myview
- <megrok.layout.tests.models.page.MyView object at ...>
+ <grokcore.layout.tests.models.page.MyView object at ...>
>>> myview.layout
- <megrok.layout.tests.models.page.Master object at ...>
+ <grokcore.layout.tests.models.page.Master object at ...>
>>> print myview.content()
<p> My nice Content </p>
"""
import grokcore.component as grok
from grokcore.view import templatedir
-from megrok.layout import Layout, Page
+from grokcore.layout import Layout, Page
from zope import interface
templatedir('templates')
Modified: grokcore.layout/trunk/src/grokcore/layout/tests/models/url.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/tests/models/url.py 2011-07-13 16:34:45 UTC (rev 122177)
+++ grokcore.layout/trunk/src/grokcore/layout/tests/models/url.py 2011-07-13 16:41:50 UTC (rev 122178)
@@ -12,14 +12,14 @@
>>> request = TestRequest()
>>> view = getMultiAdapter((helmut, request), name='index')
>>> view
- <megrok.layout.tests.models.url.Index object at ...>
+ <grokcore.layout.tests.models.url.Index object at ...>
>>> print view.application_url()
http://127.0.0.1
>>> form = getMultiAdapter((helmut, request), name='form')
>>> form
- <megrok.layout.tests.models.url.BearForm object at ...>
+ <grokcore.layout.tests.models.url.BearForm object at ...>
>>> print form.application_url()
http://127.0.0.1
@@ -27,7 +27,7 @@
"""
import grokcore.view as grok
-from megrok.layout import Page, Layout, Form
+from grokcore.layout import Page, Layout, Form
from zope.interface import Interface, implements
grok.templatedir("templates")
Modified: grokcore.layout/trunk/src/grokcore/layout/tests/test_package.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/tests/test_package.py 2011-07-13 16:34:45 UTC (rev 122177)
+++ grokcore.layout/trunk/src/grokcore/layout/tests/test_package.py 2011-07-13 16:41:50 UTC (rev 122178)
@@ -2,7 +2,7 @@
import unittest
import pkg_resources
-import megrok.layout.tests
+import grokcore.layout.tests
from zope.testing import doctest
@@ -10,7 +10,7 @@
test = doctest.DocTestSuite(
dottedname,
optionflags=doctest.ELLIPSIS + doctest.NORMALIZE_WHITESPACE)
- test.layer = megrok.layout.tests.MegrokLayoutLayer(megrok.layout.tests)
+ test.layer = grokcore.layout.tests.GrokcoreLayoutLayer(grokcore.layout.tests)
return test
@@ -25,7 +25,7 @@
if filename == '__init__.py':
continue
- dottedname = 'megrok.layout.tests.%s.%s' % (name, filename[:-3])
+ dottedname = 'grokcore.layout.tests.%s.%s' % (name, filename[:-3])
suite.addTest(make_test(dottedname))
return suite
Modified: grokcore.layout/trunk/src/grokcore/layout/tests/test_readme.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/tests/test_readme.py 2011-07-13 16:34:45 UTC (rev 122177)
+++ grokcore.layout/trunk/src/grokcore/layout/tests/test_readme.py 2011-07-13 16:41:50 UTC (rev 122178)
@@ -2,13 +2,13 @@
import doctest
import unittest
-import megrok.layout.tests
+import grokcore.layout.tests
from grokcore.component.testing import grok_component
def test_suite():
optionflags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
- globs = {'grok_component': grok_component, '__name__': 'megrok.layout'}
+ globs = {'grok_component': grok_component, '__name__': 'grokcore.layout'}
suite = unittest.TestSuite()
suite.addTest(
@@ -16,6 +16,6 @@
'../README.txt',
optionflags=optionflags,
globs=globs))
- suite.layer = megrok.layout.tests.ZCMLFileLayer(megrok.layout.tests)
+ suite.layer = grokcore.layout.tests.ZCMLFileLayer(grokcore.layout.tests)
return suite
More information about the checkins
mailing list