[Checkins] SVN: z3c.ptcompat/trunk/ Rename z3c.pt.compat to z3c.ptcompat.
Brian Sutherland
jinty at web.de
Wed Dec 10 05:04:46 EST 2008
Log message for revision 93837:
Rename z3c.pt.compat to z3c.ptcompat.
There are failing tests with this commit, but they were failing in exactly the
same way before this commit as well.
Changed:
U z3c.ptcompat/trunk/CHANGES.txt
U z3c.ptcompat/trunk/README.txt
U z3c.ptcompat/trunk/buildout.cfg
U z3c.ptcompat/trunk/setup.py
D z3c.ptcompat/trunk/src/z3c/pt/
A z3c.ptcompat/trunk/src/z3c/ptcompat/
U z3c.ptcompat/trunk/src/z3c/ptcompat/config.py
U z3c.ptcompat/trunk/src/z3c/ptcompat/tests/test_doctests.py
U z3c.ptcompat/trunk/src/z3c/ptcompat/zcml.py
U z3c.ptcompat/trunk/src/z3c/ptcompat/zcml.txt
U z3c.ptcompat/trunk/tools/update.py
-=-
Modified: z3c.ptcompat/trunk/CHANGES.txt
===================================================================
--- z3c.ptcompat/trunk/CHANGES.txt 2008-12-10 09:16:55 UTC (rev 93836)
+++ z3c.ptcompat/trunk/CHANGES.txt 2008-12-10 10:04:46 UTC (rev 93837)
@@ -4,6 +4,9 @@
HEAD
~~~~
+- Rename project to z3c.ptcompat to deal with setuptools issues (as discussed
+ on zope-dev http://mail.zope.org/pipermail/zope-dev/2008-December/033820.html)
+
- Added optional option ``doctest`` for output checker to allow usage
with alternative implementations, e.g. the Zope doctest
module. [malthe]
Modified: z3c.ptcompat/trunk/README.txt
===================================================================
--- z3c.ptcompat/trunk/README.txt 2008-12-10 09:16:55 UTC (rev 93836)
+++ z3c.ptcompat/trunk/README.txt 2008-12-10 10:04:46 UTC (rev 93837)
@@ -7,13 +7,16 @@
* z3c.pt
* zope.pagetemplate
+This package superseeds and replaces the old z3c.pt.compat, please use
+z3c.ptcompat instead.
+
Usage
-----
Import page template classes directly from this package:
- >>> from z3c.pt.compat import PageTemplateFile
- >>> from z3c.pt.compat import ViewPageTemplateFile
+ >>> from z3c.ptcompat import PageTemplateFile
+ >>> from z3c.ptcompat import ViewPageTemplateFile
If the environment-variable ``PREFER_Z3C_PT`` is set to a true value,
the ``z3c.pt`` engine will be used instead of ``zope.pagetemplate``.
@@ -24,8 +27,8 @@
Two methods are available to bind templates and template macros to a
view:
- >>> from z3c.pt.compat import bind_template
- >>> from z3c.pt.compat import bind_macro
+ >>> from z3c.ptcompat import bind_template
+ >>> from z3c.ptcompat import bind_macro
Both function return render-methods that accept keyword arguments
which will be passed to the template.
Modified: z3c.ptcompat/trunk/buildout.cfg
===================================================================
--- z3c.ptcompat/trunk/buildout.cfg 2008-12-10 09:16:55 UTC (rev 93836)
+++ z3c.ptcompat/trunk/buildout.cfg 2008-12-10 10:04:46 UTC (rev 93837)
@@ -6,7 +6,7 @@
recipe = zc.recipe.testrunner
environment = test-environment
eggs =
- z3c.pt [lxml]
+ z3c.ptcompat [test]
[test-environment]
PREFER_Z3C_PT = True
Modified: z3c.ptcompat/trunk/setup.py
===================================================================
--- z3c.ptcompat/trunk/setup.py 2008-12-10 09:16:55 UTC (rev 93836)
+++ z3c.ptcompat/trunk/setup.py 2008-12-10 10:04:46 UTC (rev 93837)
@@ -3,7 +3,14 @@
version = '0.3'
-setup(name='z3c.pt.compat',
+tests_require = ['z3c.pt',
+ 'zope.tal',
+ 'zope.viewlet',
+ 'zope.app.publisher',
+ 'zope.app.pagetemplate',
+ ],
+
+setup(name='z3c.ptcompat',
version=version,
description="Compatibility-layer for Zope Page Template engines.",
long_description=open('README.txt').read(),
@@ -21,7 +28,7 @@
license='ZPL',
packages=find_packages('src'),
package_dir={'': 'src'},
- namespace_packages=['z3c', 'z3c.pt'],
+ namespace_packages=['z3c'],
include_package_data=True,
zip_safe=False,
install_requires=[
@@ -30,13 +37,8 @@
extras_require = dict(
zpt = ['zope.app.pagetemplate', 'zope.tal'],
z3cpt = ['z3c.pt'],
+ test = tests_require, # used by buildout.cfg testrunner
),
- tests_require = [
- 'z3c.pt',
- 'zope.tal',
- 'zope.viewlet',
- 'zope.app.publisher',
- 'zope.app.pagetemplate',
- ],
- test_suite="z3c.pt.compat.tests.test_doctests.test_suite",
+ tests_require = tests_require,
+ test_suite="z3c.ptcompat.tests.test_doctests.test_suite",
)
Modified: z3c.ptcompat/trunk/src/z3c/ptcompat/config.py
===================================================================
--- z3c.ptcompat/trunk/src/z3c/pt/compat/config.py 2008-12-10 09:03:41 UTC (rev 93835)
+++ z3c.ptcompat/trunk/src/z3c/ptcompat/config.py 2008-12-10 10:04:46 UTC (rev 93837)
@@ -1,6 +1,6 @@
import os
import logging
-import z3c.pt.compat
+import z3c.ptcompat
PREFER_Z3C_PT = os.environ.get("PREFER_Z3C_PT", 'false').lower() in \
('y', 'yes', 't', 'true', 'on', '1')
@@ -9,17 +9,17 @@
try:
import z3c.pt
except ImportError:
- logging.getLogger('z3c.pt.compat').warn(
+ logging.getLogger('z3c.ptcompat').warn(
"Unable to import ``z3c.pt``.")
PREFER_Z3C_PT = False
def enable():
global PREFER_Z3C_PT
PREFER_Z3C_PT = True
- reload(z3c.pt.compat)
+ reload(z3c.ptcompat)
def disable():
global PREFER_Z3C_PT
PREFER_Z3C_PT = False
- reload(z3c.pt.compat)
+ reload(z3c.ptcompat)
Modified: z3c.ptcompat/trunk/src/z3c/ptcompat/tests/test_doctests.py
===================================================================
--- z3c.ptcompat/trunk/src/z3c/pt/compat/tests/test_doctests.py 2008-12-10 09:03:41 UTC (rev 93835)
+++ z3c.ptcompat/trunk/src/z3c/ptcompat/tests/test_doctests.py 2008-12-10 10:04:46 UTC (rev 93837)
@@ -11,7 +11,7 @@
import zope.component.testing
import zope.configuration.xmlconfig
-import z3c.pt.compat
+import z3c.ptcompat
class TestParticipation(object):
principal = 'foobar'
@@ -19,15 +19,15 @@
def setUp(test):
zope.component.testing.setUp(test)
- zope.configuration.xmlconfig.XMLConfig('meta.zcml', z3c.pt.compat)()
+ zope.configuration.xmlconfig.XMLConfig('meta.zcml', z3c.ptcompat)()
zope.configuration.xmlconfig.XMLConfig('configure.zcml', z3c.pt)()
def tearDown(test):
zope.component.testing.tearDown(test)
def test_suite():
- import z3c.pt.compat.tests
- path = z3c.pt.compat.tests.__path__[0]
+ import z3c.ptcompat.tests
+ path = z3c.ptcompat.tests.__path__[0]
globs = dict(
os=os,
@@ -42,7 +42,7 @@
globs=globs,
setUp=setUp,
tearDown=tearDown,
- package="z3c.pt.compat")])
+ package="z3c.ptcompat")])
if __name__ == '__main__':
unittest.main(defaultTest='test_suite')
Modified: z3c.ptcompat/trunk/src/z3c/ptcompat/zcml.py
===================================================================
--- z3c.ptcompat/trunk/src/z3c/pt/compat/zcml.py 2008-12-10 09:03:41 UTC (rev 93835)
+++ z3c.ptcompat/trunk/src/z3c/ptcompat/zcml.py 2008-12-10 10:04:46 UTC (rev 93837)
@@ -8,7 +8,7 @@
from zope.app.publisher.browser import viewmeta
from zope.app.pagetemplate import simpleviewclass
-from z3c.pt.compat import ViewPageTemplateFile
+from z3c.ptcompat import ViewPageTemplateFile
def SimpleViewClass(src, offering=None, used_for=None, bases=(), name=u''):
if offering is None:
Modified: z3c.ptcompat/trunk/src/z3c/ptcompat/zcml.txt
===================================================================
--- z3c.ptcompat/trunk/src/z3c/pt/compat/zcml.txt 2008-12-10 09:03:41 UTC (rev 93835)
+++ z3c.ptcompat/trunk/src/z3c/ptcompat/zcml.txt 2008-12-10 10:04:46 UTC (rev 93837)
@@ -10,7 +10,7 @@
Pages
-----
- >>> from z3c.pt.compat import zcml
+ >>> from z3c.ptcompat import zcml
>>> zcml.page_directive(
... context, "test1", "zope.View", None,
... template=os.path.join(path, "test.pt"))
@@ -25,7 +25,7 @@
... interface.Interface, name="test1")
>>> factory.index
- <z3c.pt.compat.ViewPageTemplateFile object at ...>
+ <z3c.ptcompat.ViewPageTemplateFile object at ...>
We can base the view on an existing class.
@@ -43,7 +43,7 @@
... interface.Interface, name="test2")
>>> factory.index
- <z3c.pt.compat.ViewPageTemplateFile object at ...>
+ <z3c.ptcompat.ViewPageTemplateFile object at ...>
>>> issubclass(factory, View)
True
@@ -68,7 +68,7 @@
... IViewletManager, name="test1")
>>> factory.template
- <z3c.pt.compat.ViewPageTemplateFile object at ...>
+ <z3c.ptcompat.ViewPageTemplateFile object at ...>
We can base the viewlet manager on an existing class.
@@ -88,7 +88,7 @@
... IViewletManager, name="test2")
>>> factory.template
- <z3c.pt.compat.ViewPageTemplateFile object at ...>
+ <z3c.ptcompat.ViewPageTemplateFile object at ...>
>>> issubclass(factory, ViewletManager)
True
@@ -109,7 +109,7 @@
... interface.Interface, name="test1")
>>> factory.index
- <z3c.pt.compat.ViewPageTemplateFile object at ...>
+ <z3c.ptcompat.ViewPageTemplateFile object at ...>
We can base the viewlet on an existing class.
@@ -129,7 +129,7 @@
... interface.Interface, name="test2")
>>> factory.index
- <z3c.pt.compat.ViewPageTemplateFile object at ...>
+ <z3c.ptcompat.ViewPageTemplateFile object at ...>
>>> issubclass(factory, Viewlet)
True
Modified: z3c.ptcompat/trunk/tools/update.py
===================================================================
--- z3c.ptcompat/trunk/tools/update.py 2008-12-10 09:16:55 UTC (rev 93836)
+++ z3c.ptcompat/trunk/tools/update.py 2008-12-10 10:04:46 UTC (rev 93837)
@@ -19,13 +19,13 @@
re.compile(
r'^from zope\.app\.pagetemplate(\.viewpagetemplatefile)? import ViewPageTemplateFile$',
re.M),
- r'from z3c.pt.compat import ViewPageTemplateFile')
+ r'from z3c.ptcompat import ViewPageTemplateFile')
re_ptf_sub = (
re.compile(
r'^from zope\.pagetemplate(\.pagetemplatefile)? import PageTemplateFile$',
re.M),
- r'from z3c.pt.compat import PageTemplateFile')
+ r'from z3c.ptcompat import PageTemplateFile')
def log(msg):
for line in msg.split('\n'):
More information about the Checkins
mailing list