[Checkins] SVN: z3c.zrtresource/trunk/ Use zope.browserresource instead of zope.app.publisher.
Dan Korostelev
nadako at gmail.com
Thu Aug 27 12:04:30 EDT 2009
Log message for revision 103300:
Use zope.browserresource instead of zope.app.publisher.
Get rid of zope.app.testing test dependency.
Remove SETUP.CFG and z3c.zrtresource-meta.zcml zcml slug.
Changed:
U z3c.zrtresource/trunk/CHANGES.txt
U z3c.zrtresource/trunk/setup.py
D z3c.zrtresource/trunk/src/z3c/zrtresource/SETUP.cfg
U z3c.zrtresource/trunk/src/z3c/zrtresource/tests.py
D z3c.zrtresource/trunk/src/z3c/zrtresource/z3c.zrtresource-meta.zcml
U z3c.zrtresource/trunk/src/z3c/zrtresource/zcml.py
U z3c.zrtresource/trunk/src/z3c/zrtresource/zrtresource.py
-=-
Modified: z3c.zrtresource/trunk/CHANGES.txt
===================================================================
--- z3c.zrtresource/trunk/CHANGES.txt 2009-08-27 15:52:10 UTC (rev 103299)
+++ z3c.zrtresource/trunk/CHANGES.txt 2009-08-27 16:04:30 UTC (rev 103300)
@@ -2,12 +2,17 @@
CHANGES
=======
-1.2.1 (unreleased)
+1.3.0 (unreleased)
------------------
-- Nothing changed yet.
+- Use new ``zope.browserresource`` package instead of ``zope.app.publisher``,
+ as the resources mechanism was moved there to reduce dependencies.
+- Get rid of ``zope.app.testing`` test dependency.
+- Remove unused SETUP.CFG and z3c.zrtresource-meta.zcml files.
+
+
1.2.0 (2009-06-25)
------------------
Modified: z3c.zrtresource/trunk/setup.py
===================================================================
--- z3c.zrtresource/trunk/setup.py 2009-08-27 15:52:10 UTC (rev 103299)
+++ z3c.zrtresource/trunk/setup.py 2009-08-27 16:04:30 UTC (rev 103300)
@@ -21,7 +21,7 @@
def read(*rnames):
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
-version = '1.2.1dev'
+version = '1.3.0dev'
setup(name='z3c.zrtresource',
@@ -54,14 +54,13 @@
packages=find_packages('src'),
package_dir = {'': 'src'},
namespace_packages=['z3c'],
- extras_require = dict(test=['zope.app.testing',
- 'zope.testing',
+ extras_require = dict(test=['zope.testing',
'zope.traversing',
]),
install_requires = ['setuptools',
'zope.site',
'zope.pagetemplate >= 3.5.0',
- 'zope.app.publisher',
+ 'zope.browserresource',
'zope.component',
'zope.configuration',
'zope.interface',
Deleted: z3c.zrtresource/trunk/src/z3c/zrtresource/SETUP.cfg
===================================================================
--- z3c.zrtresource/trunk/src/z3c/zrtresource/SETUP.cfg 2009-08-27 15:52:10 UTC (rev 103299)
+++ z3c.zrtresource/trunk/src/z3c/zrtresource/SETUP.cfg 2009-08-27 16:04:30 UTC (rev 103300)
@@ -1,3 +0,0 @@
-<data-files zopeskel/etc/package-includes>
- z3c.zrtresource-*.zcml
-</data-files>
Modified: z3c.zrtresource/trunk/src/z3c/zrtresource/tests.py
===================================================================
--- z3c.zrtresource/trunk/src/z3c/zrtresource/tests.py 2009-08-27 15:52:10 UTC (rev 103299)
+++ z3c.zrtresource/trunk/src/z3c/zrtresource/tests.py 2009-08-27 16:04:30 UTC (rev 103300)
@@ -20,33 +20,32 @@
import doctest
import unittest
import zope.component
-from zope.app.testing import placelesssetup
-from zope.testing.doctestunit import DocFileSuite
+from zope.testing import cleanup, doctest
from zope.traversing import testing
from zope.traversing.interfaces import ITraversable
from zope.traversing.namespace import view
def setUp(test):
- placelesssetup.setUp(test)
+ cleanup.setUp()
testing.setUp()
zope.component.provideAdapter(view, (None, None), ITraversable, name="view")
+def tearDown(test):
+ cleanup.tearDown()
+
def test_suite():
return unittest.TestSuite((
- DocFileSuite('README.txt',
+ doctest.DocFileSuite('README.txt',
setUp=setUp,
- tearDown=placelesssetup.tearDown,
+ tearDown=tearDown,
optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
),
- DocFileSuite('zcml.txt',
- setUp=placelesssetup.setUp,
- tearDown=placelesssetup.tearDown,
+ doctest.DocFileSuite('zcml.txt',
+ setUp=lambda test:cleanup.setUp(),
+ tearDown=tearDown,
optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
),
))
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
Deleted: z3c.zrtresource/trunk/src/z3c/zrtresource/z3c.zrtresource-meta.zcml
===================================================================
--- z3c.zrtresource/trunk/src/z3c/zrtresource/z3c.zrtresource-meta.zcml 2009-08-27 15:52:10 UTC (rev 103299)
+++ z3c.zrtresource/trunk/src/z3c/zrtresource/z3c.zrtresource-meta.zcml 2009-08-27 16:04:30 UTC (rev 103300)
@@ -1 +0,0 @@
-<include package="z3c.zrtresource" file="meta.zcml" />
Modified: z3c.zrtresource/trunk/src/z3c/zrtresource/zcml.py
===================================================================
--- z3c.zrtresource/trunk/src/z3c/zrtresource/zcml.py 2009-08-27 15:52:10 UTC (rev 103299)
+++ z3c.zrtresource/trunk/src/z3c/zrtresource/zcml.py 2009-08-27 16:04:30 UTC (rev 103300)
@@ -21,7 +21,8 @@
from zope.interface import Interface
from zope.publisher.interfaces import browser
from zope.security.checker import CheckerPublic, NamesChecker
-from zope.app.publisher.browser import metadirectives, resourcemeta
+from zope.browserresource import metadirectives
+from zope.browserresource import metaconfigure as resourcemeta
import z3c.zrtresource
Modified: z3c.zrtresource/trunk/src/z3c/zrtresource/zrtresource.py
===================================================================
--- z3c.zrtresource/trunk/src/z3c/zrtresource/zrtresource.py 2009-08-27 15:52:10 UTC (rev 103299)
+++ z3c.zrtresource/trunk/src/z3c/zrtresource/zrtresource.py 2009-08-27 16:04:30 UTC (rev 103300)
@@ -16,9 +16,11 @@
$Id$
"""
__docformat__='restructuredtext'
+from zope.browserresource.file import File, FileResource
+from zope.browserresource.interfaces import IResourceFactory
+from zope.browserresource.interfaces import IResourceFactoryFactory
+from zope.interface import implements, classProvides
from zope.site.hooks import getSite
-from zope.app.publisher.fileresource import File
-from zope.app.publisher.browser.fileresource import FileResource
from z3c.zrtresource import processor, replace
@@ -33,6 +35,9 @@
class ZRTFileResourceFactory(object):
+
+ implements(IResourceFactory)
+ classProvides(IResourceFactoryFactory)
def __init__(self, path, checker, name):
self.__file = File(path, name)
More information about the Checkins
mailing list