[Checkins] SVN: z3c.pagelet/trunk/ - ``zope.app.pagetemplate.metaconfigure.registerType`` was moved to
Michael Howitz
mh at gocept.com
Thu Jul 29 02:47:32 EDT 2010
Log message for revision 115185:
- ``zope.app.pagetemplate.metaconfigure.registerType`` was moved to
``zope.browserpage``, so it gets now imported from there.
- Dropped test dependency on ``zope.app.security``, it is no longer
needed.
- Using python's ``docteest`` instead of deprecated
``zope.testing.doctest[unit]``.
Changed:
U z3c.pagelet/trunk/CHANGES.txt
U z3c.pagelet/trunk/setup.py
U z3c.pagelet/trunk/src/z3c/__init__.py
U z3c.pagelet/trunk/src/z3c/pagelet/tests.py
-=-
Modified: z3c.pagelet/trunk/CHANGES.txt
===================================================================
--- z3c.pagelet/trunk/CHANGES.txt 2010-07-29 05:57:30 UTC (rev 115184)
+++ z3c.pagelet/trunk/CHANGES.txt 2010-07-29 06:47:32 UTC (rev 115185)
@@ -5,9 +5,16 @@
1.2.1 (unreleased)
------------------
-- ...
+- ``zope.app.pagetemplate.metaconfigure.registerType`` was moved to
+ ``zope.browserpage``, so it gets now imported from there.
+- Dropped test dependency on ``zope.app.security``, it is no longer
+ needed.
+- Using python's ``docteest`` instead of deprecated
+ ``zope.testing.doctest[unit]``.
+
+
1.2.0 (2009-08-27)
------------------
Modified: z3c.pagelet/trunk/setup.py
===================================================================
--- z3c.pagelet/trunk/setup.py 2010-07-29 05:57:30 UTC (rev 115184)
+++ z3c.pagelet/trunk/setup.py 2010-07-29 06:47:32 UTC (rev 115185)
@@ -61,7 +61,6 @@
'lxml>=2.1.1',
'z3c.pt>=1.0b4',
'z3c.ptcompat',
- 'zope.app.security',
'zope.formlib',
],
docs = ['z3c.recipe.sphinxdoc'],
Modified: z3c.pagelet/trunk/src/z3c/__init__.py
===================================================================
--- z3c.pagelet/trunk/src/z3c/__init__.py 2010-07-29 05:57:30 UTC (rev 115184)
+++ z3c.pagelet/trunk/src/z3c/__init__.py 2010-07-29 06:47:32 UTC (rev 115185)
@@ -1,7 +1 @@
-try:
- # Declare this a namespace package if pkg_resources is available.
- import pkg_resources
- pkg_resources.declare_namespace('z3c')
-except ImportError:
- pass
-
+__import__('pkg_resources').declare_namespace(__name__)
Modified: z3c.pagelet/trunk/src/z3c/pagelet/tests.py
===================================================================
--- z3c.pagelet/trunk/src/z3c/pagelet/tests.py 2010-07-29 05:57:30 UTC (rev 115184)
+++ z3c.pagelet/trunk/src/z3c/pagelet/tests.py 2010-07-29 06:47:32 UTC (rev 115185)
@@ -18,6 +18,7 @@
import unittest
import itertools
+import doctest
import zope.component
import zope.schema
@@ -27,8 +28,6 @@
import zope.app.form.browser.exception
import zope.app.form.browser.interfaces
from zope.publisher.interfaces.browser import IBrowserRequest
-from zope.testing import doctest
-from zope.testing.doctestunit import DocFileSuite
from zope.app.form.interfaces import IInputWidget
from zope.app.testing import setup
from zope.formlib import form
@@ -71,7 +70,7 @@
setUp(test)
# register provider TALES
- from zope.app.pagetemplate import metaconfigure
+ from zope.browserpage import metaconfigure
from zope.contentprovider import tales
metaconfigure.registerType('provider', tales.TALESProviderExpression)
@@ -87,12 +86,12 @@
checker = z3c.ptcompat.testing.OutputChecker()
tests = ((
- DocFileSuite('README.txt',
+ doctest.DocFileSuite('README.txt',
setUp=setUp, tearDown=tearDown,
optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
checker=checker,
),
- DocFileSuite('zcml.txt', setUp=setUp, tearDown=tearDown,
+ doctest.DocFileSuite('zcml.txt', setUp=setUp, tearDown=tearDown,
optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,),
) for setUp in (setUpZPT, setUpZ3CPT, ))
More information about the checkins
mailing list