[Checkins] SVN: Sandbox/darrylcousins/mars.macro/ Updates to get
this old code working again
Darryl Cousins
darryl at darrylcousins.net.nz
Sat Feb 9 21:22:47 EST 2008
Log message for revision 83689:
Updates to get this old code working again
Changed:
U Sandbox/darrylcousins/mars.macro/buildout.cfg
U Sandbox/darrylcousins/mars.macro/setup.py
U Sandbox/darrylcousins/mars.macro/src/mars/macro/ftests/directive.py
U Sandbox/darrylcousins/mars.macro/src/mars/macro/ftests/ftesting.zcml
U Sandbox/darrylcousins/mars.macro/src/mars/macro/ftests/macro.py
U Sandbox/darrylcousins/mars.macro/src/mars/macro/ftests/test_functional.py
U Sandbox/darrylcousins/mars.macro/src/mars/macro/meta.py
U Sandbox/darrylcousins/mars.macro/src/mars/macro/tests.py
-=-
Modified: Sandbox/darrylcousins/mars.macro/buildout.cfg
===================================================================
--- Sandbox/darrylcousins/mars.macro/buildout.cfg 2008-02-10 02:20:29 UTC (rev 83688)
+++ Sandbox/darrylcousins/mars.macro/buildout.cfg 2008-02-10 02:22:46 UTC (rev 83689)
@@ -1,11 +1,12 @@
[buildout]
develop = .
parts = test
-extends = http://grok.zope.org/releaseinfo/grok-0.11.1.cfg
+extends = http://download.zope.org/zope3.4/versions-3.4.0c1.cfg
versions = versions
[versions]
-martian = 0.9.2
+grok = 0.12dev
+martian = 0.9.3
[test]
recipe = zc.recipe.testrunner
Modified: Sandbox/darrylcousins/mars.macro/setup.py
===================================================================
--- Sandbox/darrylcousins/mars.macro/setup.py 2008-02-10 02:20:29 UTC (rev 83688)
+++ Sandbox/darrylcousins/mars.macro/setup.py 2008-02-10 02:22:46 UTC (rev 83689)
@@ -14,14 +14,20 @@
This package uses ``martian`` and ``grok`` to register template macros
for applications built on the ``zope`` framework.""",
long_description=(
- read('src/mars/macro/README.txt') +
+ read('mars/macro/README.txt') +
read('CHANGES.txt')),
- packages=find_packages('src'),
- package_dir = {'': 'src'},
- include_package_data = True,
- zip_safe=False,
+ classifiers = ['Development Status :: 1 - Planning',
+ 'Intended Audience :: Developers',
+ 'License :: Other/Proprietary License',
+ 'Programming Language :: Python',
+ 'Operating System :: OS Independent',
+ 'Topic :: Software Development :: Build Tools',
+ 'Framework :: Zope3',
+ ],
+ packages=find_packages(),
+ namespace_packages=['mars'],
+ zip_safe=True,
license='ZPL',
- dependency_links = ['http://download.zope.org/distribution'],
extras_require = dict(
test=['zope.app.testing',
'zope.testbrowser',
Modified: Sandbox/darrylcousins/mars.macro/src/mars/macro/ftests/directive.py
===================================================================
--- Sandbox/darrylcousins/mars.macro/src/mars/macro/ftests/directive.py 2008-02-10 02:20:29 UTC (rev 83688)
+++ Sandbox/darrylcousins/mars.macro/src/mars/macro/ftests/directive.py 2008-02-10 02:22:46 UTC (rev 83689)
@@ -1,10 +1,6 @@
"""
Test the claimed directives.
- >>> import grok
- >>> grok.grok('mars.macro.ftests.directive')
-
- >>> from mars.macro.ftests.directive import Mammoth
>>> mammoth = getRootFolder()["mammoth"] = Mammoth()
>>> from zope.testbrowser.testing import Browser
Modified: Sandbox/darrylcousins/mars.macro/src/mars/macro/ftests/ftesting.zcml
===================================================================
--- Sandbox/darrylcousins/mars.macro/src/mars/macro/ftests/ftesting.zcml 2008-02-10 02:20:29 UTC (rev 83688)
+++ Sandbox/darrylcousins/mars.macro/src/mars/macro/ftests/ftesting.zcml 2008-02-10 02:22:46 UTC (rev 83689)
@@ -3,16 +3,37 @@
i18n_domain="zope"
package="mars.macro.ftests">
- <include package="grok" file="meta.zcml" />
+ <include package="grok" />
+ <include package="z3c.macro" />
+
<include package="mars.template" file="meta.zcml" />
<include package="mars.macro" file="meta.zcml" />
+ <grok:grok package="mars.macro.ftests" />
- <include package="grok" />
+ <securityPolicy
+ component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy"
+ />
- <include package="z3c.macro" />
+ <unauthenticatedPrincipal
+ id="zope.anybody"
+ title="Unauthenticated User"
+ />
+ <grant
+ permission="zope.View"
+ principal="zope.anybody"
+ />
- <grok:grok package="mars.macro.ftests" />
+ <principal
+ id="zope.mgr"
+ title="Manager"
+ login="mgr"
+ password="mgrpw"
+ />
+ <role id="zope.Manager" title="Site Manager" />
+ <grantAll role="zope.Manager" />
+ <grant role="zope.Manager" principal="zope.mgr" />
+
</configure>
Modified: Sandbox/darrylcousins/mars.macro/src/mars/macro/ftests/macro.py
===================================================================
--- Sandbox/darrylcousins/mars.macro/src/mars/macro/ftests/macro.py 2008-02-10 02:20:29 UTC (rev 83688)
+++ Sandbox/darrylcousins/mars.macro/src/mars/macro/ftests/macro.py 2008-02-10 02:22:46 UTC (rev 83689)
@@ -1,5 +1,4 @@
"""
- >>> from mars.macro.ftests.macro import Mammoth
>>> mammoth = getRootFolder()["mammoth"] = Mammoth()
>>> from zope.testbrowser.testing import Browser
@@ -7,7 +6,7 @@
>>> browser.handleErrors = False
>>> #browser.addHeader('Authorization', 'Basic mgr:mgrpw')
- >>> browser.open('http://localhost/mammoth/@@first')
+ >>> browser.open('http://localhost/mammoth/@@page')
>>> print browser.contents
<html>
<body>
@@ -45,7 +44,7 @@
module context - in this case Mammoth."""
grok.template('templates/navigation.pt') # required
-class First(grok.View):
+class Page(grok.View):
def __call__(self):
template = zope.component.getMultiAdapter(
@@ -55,7 +54,7 @@
def render(self):
pass
-class FirstLayout(mars.template.LayoutFactory):
+class PageLayout(mars.template.LayoutFactory):
grok.template('templates/first.pt')
- grok.context(First)
+ grok.context(Page)
Modified: Sandbox/darrylcousins/mars.macro/src/mars/macro/ftests/test_functional.py
===================================================================
--- Sandbox/darrylcousins/mars.macro/src/mars/macro/ftests/test_functional.py 2008-02-10 02:20:29 UTC (rev 83688)
+++ Sandbox/darrylcousins/mars.macro/src/mars/macro/ftests/test_functional.py 2008-02-10 02:22:46 UTC (rev 83689)
@@ -22,7 +22,7 @@
dottedname = 'mars.macro.ftests.%s'
for name in ['macro', 'directive']:
test = doctest.DocTestSuite(
- dottedname % name, setUp=setUp, globs=globs,
+ dottedname % name, setUp=setUp, extraglobs=globs,
tearDown=tearDown, optionflags=optionflags)
test.layer = TestLayer
suite.addTest(test)
Modified: Sandbox/darrylcousins/mars.macro/src/mars/macro/meta.py
===================================================================
--- Sandbox/darrylcousins/mars.macro/src/mars/macro/meta.py 2008-02-10 02:20:29 UTC (rev 83688)
+++ Sandbox/darrylcousins/mars.macro/src/mars/macro/meta.py 2008-02-10 02:22:46 UTC (rev 83689)
@@ -51,7 +51,7 @@
view_name = util.class_annotation(factory, 'grok.name', factory_name)
macro = util.class_annotation(factory, 'mars.macro.macro', view_name)
view = util.class_annotation(factory, 'mars.macro.view', IBrowserView)
- self.view_context = determine_class_directive('grok.context',
+ view_context = determine_class_directive('grok.context',
factory, module_info,
default=zope.interface.Interface)
Modified: Sandbox/darrylcousins/mars.macro/src/mars/macro/tests.py
===================================================================
--- Sandbox/darrylcousins/mars.macro/src/mars/macro/tests.py 2008-02-10 02:20:29 UTC (rev 83688)
+++ Sandbox/darrylcousins/mars.macro/src/mars/macro/tests.py 2008-02-10 02:22:46 UTC (rev 83689)
@@ -28,7 +28,7 @@
# register provider TALES
from zope.app.pagetemplate import metaconfigure
from zope.contentprovider import tales
- metaconfigure.registerType('provider', tales.TALESProviderExpression)
+ #metaconfigure.registerType('provider', tales.TALESProviderExpression)
def test_suite():
suite = unittest.TestSuite()
More information about the Checkins
mailing list