[Checkins] SVN: zc.resourcelibrary/trunk/ Use zope.browserresource instead of zope.app.publisher.
Dan Korostelev
nadako at gmail.com
Mon Aug 31 08:51:37 EDT 2009
Log message for revision 103394:
Use zope.browserresource instead of zope.app.publisher.
Changed:
U zc.resourcelibrary/trunk/CHANGES.txt
U zc.resourcelibrary/trunk/buildout.cfg
U zc.resourcelibrary/trunk/setup.py
U zc.resourcelibrary/trunk/src/zc/resourcelibrary/publication.py
U zc.resourcelibrary/trunk/src/zc/resourcelibrary/zcml.py
-=-
Modified: zc.resourcelibrary/trunk/CHANGES.txt
===================================================================
--- zc.resourcelibrary/trunk/CHANGES.txt 2009-08-31 12:27:40 UTC (rev 103393)
+++ zc.resourcelibrary/trunk/CHANGES.txt 2009-08-31 12:51:37 UTC (rev 103394)
@@ -2,10 +2,11 @@
CHANGES
=======
-1.2.1 (unreleased)
+1.3.0 (unreleased)
------------------
-- Nothing changed yet.
+- Use ``zope.browserresource`` instead of ``zope.app.publisher``, removing
+ a dependency on latter.
1.2.0 (2009-06-04)
Modified: zc.resourcelibrary/trunk/buildout.cfg
===================================================================
--- zc.resourcelibrary/trunk/buildout.cfg 2009-08-31 12:27:40 UTC (rev 103393)
+++ zc.resourcelibrary/trunk/buildout.cfg 2009-08-31 12:51:37 UTC (rev 103394)
@@ -1,7 +1,11 @@
[buildout]
develop = .
-parts = test
+parts = test pydev
[test]
recipe = zc.recipe.testrunner
eggs = zc.resourcelibrary [test]
+
+[pydev]
+recipe = pb.recipes.pydev
+eggs = zc.resourcelibrary
Modified: zc.resourcelibrary/trunk/setup.py
===================================================================
--- zc.resourcelibrary/trunk/setup.py 2009-08-31 12:27:40 UTC (rev 103393)
+++ zc.resourcelibrary/trunk/setup.py 2009-08-31 12:51:37 UTC (rev 103394)
@@ -22,7 +22,7 @@
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
setup(name='zc.resourcelibrary',
- version = '1.2.1dev',
+ version = '1.3.0dev',
author='Zope Corporation and Contributors',
author_email='zope-dev at zope.org',
description='Post-rendering Resource Inclusion',
@@ -61,7 +61,7 @@
]),
install_requires=['setuptools',
'zope.app.publication',
- 'zope.app.publisher',
+ 'zope.browserresource',
'zope.component',
'zope.configuration',
'zope.interface',
Modified: zc.resourcelibrary/trunk/src/zc/resourcelibrary/publication.py
===================================================================
--- zc.resourcelibrary/trunk/src/zc/resourcelibrary/publication.py 2009-08-31 12:27:40 UTC (rev 103393)
+++ zc.resourcelibrary/trunk/src/zc/resourcelibrary/publication.py 2009-08-31 12:51:37 UTC (rev 103394)
@@ -16,15 +16,13 @@
"""
from zope import interface
from zope.app.publication.interfaces import IBrowserRequestFactory
-from zope.app.publisher.browser.resource import Resource
-from zope.publisher.interfaces.browser import IBrowserPublisher
+from zope.browserresource.resource import Resource
+from zope.component import queryMultiAdapter, getMultiAdapter, getSiteManager
+from zope.location.interfaces import ISite
from zope.publisher.browser import BrowserRequest, BrowserResponse
from zope.publisher.browser import isHTML
-from zope.location.interfaces import ISite
+from zope.publisher.interfaces.browser import IBrowserPublisher
from zope.site.hooks import getSite
-from zope.component import queryMultiAdapter
-from zope.component import getMultiAdapter
-from zope.component import getSiteManager
from zope.traversing.browser.interfaces import IAbsoluteURL
import zc.resourcelibrary
@@ -116,7 +114,7 @@
else:
# a setup with no resources factory is supported; in this
# case, we manually craft a URL to the resource publisher
- # (see ``zope.app.publisher.browser.resource``).
+ # (see ``zope.browserresource.resource``).
resources = None
base = queryMultiAdapter(
(site, self._request), IAbsoluteURL, name="resource")
Modified: zc.resourcelibrary/trunk/src/zc/resourcelibrary/zcml.py
===================================================================
--- zc.resourcelibrary/trunk/src/zc/resourcelibrary/zcml.py 2009-08-31 12:27:40 UTC (rev 103393)
+++ zc.resourcelibrary/trunk/src/zc/resourcelibrary/zcml.py 2009-08-31 12:51:37 UTC (rev 103394)
@@ -11,19 +11,22 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-from zc.resourcelibrary.resourcelibrary import LibraryInfo, library_info
-from zope.app.publisher.browser import directoryresource
-from zope.app.publisher.browser.metadirectives import IBasicResourceInformation
-from zope.app.publisher.browser.resourcemeta import allowed_names
+import os.path
+
+from zope.browserresource.directory import DirectoryResourceFactory
+from zope.browserresource.metadirectives import IBasicResourceInformation
+from zope.browserresource.metaconfigure import allowed_names
+from zope.component import getGlobalSiteManager
from zope.configuration.exceptions import ConfigurationError
-from zope.component import getGlobalSiteManager
from zope.interface import Interface
from zope.publisher.interfaces.browser import IBrowserRequest
from zope.publisher.interfaces.browser import IDefaultBrowserLayer
from zope.security.checker import CheckerPublic, NamesChecker
-import os.path
import zope.configuration.fields
+from zc.resourcelibrary.resourcelibrary import LibraryInfo, library_info
+
+
class IResourceLibraryDirective(IBasicResourceInformation):
"""
Defines a resource library
@@ -114,7 +117,7 @@
library_info[self.name].included.extend(include)
if factory is None:
- factory = directoryresource.DirectoryResourceFactory
+ factory = DirectoryResourceFactory
factory = factory(source, self.checker, self.name)
_context.action(
More information about the checkins
mailing list