[Checkins] SVN: zope.app.publisher/trunk/ Adapt to removal of deprecated interfaces from zope.component.interfaces. Remove zpkg file.
Dan Korostelev
nadako at gmail.com
Sun Mar 8 04:32:59 EDT 2009
Log message for revision 97651:
Adapt to removal of deprecated interfaces from zope.component.interfaces. Remove zpkg file.
Changed:
U zope.app.publisher/trunk/CHANGES.txt
D zope.app.publisher/trunk/src/zope/app/publisher/DEPENDENCIES.cfg
U zope.app.publisher/trunk/src/zope/app/publisher/browser/__init__.py
U zope.app.publisher/trunk/src/zope/app/publisher/browser/configure.zcml
U zope.app.publisher/trunk/src/zope/app/publisher/browser/resource.py
U zope.app.publisher/trunk/src/zope/app/publisher/interfaces/__init__.py
U zope.app.publisher/trunk/src/zope/app/publisher/interfaces/ftp.py
U zope.app.publisher/trunk/src/zope/app/publisher/interfaces/http.py
U zope.app.publisher/trunk/src/zope/app/publisher/interfaces/xmlrpc.py
-=-
Modified: zope.app.publisher/trunk/CHANGES.txt
===================================================================
--- zope.app.publisher/trunk/CHANGES.txt 2009-03-08 08:27:27 UTC (rev 97650)
+++ zope.app.publisher/trunk/CHANGES.txt 2009-03-08 08:32:59 UTC (rev 97651)
@@ -7,6 +7,11 @@
- Remove deprecated code.
+- Adapt to removal of deprecated interfaces from zope.component.interfaces.
+ The IResource is now moved to zope.app.publisher.interfaces. The IView
+ is now in zope.publisher.interfaces. The IPresentation interface was
+ removed completely.
+
3.6.0 (2009-01-31)
==================
Deleted: zope.app.publisher/trunk/src/zope/app/publisher/DEPENDENCIES.cfg
===================================================================
--- zope.app.publisher/trunk/src/zope/app/publisher/DEPENDENCIES.cfg 2009-03-08 08:27:27 UTC (rev 97650)
+++ zope.app.publisher/trunk/src/zope/app/publisher/DEPENDENCIES.cfg 2009-03-08 08:32:59 UTC (rev 97651)
@@ -1 +0,0 @@
-zope.contenttype
Modified: zope.app.publisher/trunk/src/zope/app/publisher/browser/__init__.py
===================================================================
--- zope.app.publisher/trunk/src/zope/app/publisher/browser/__init__.py 2009-03-08 08:27:27 UTC (rev 97650)
+++ zope.app.publisher/trunk/src/zope/app/publisher/browser/__init__.py 2009-03-08 08:32:59 UTC (rev 97651)
@@ -30,8 +30,6 @@
def getDefaultViewName(object, request, context=None):
"""Get the name of the default view for the object and request.
- The request must implement IPresentationRequest, and provides the
- desired view type. The nearest one to the object is found.
If a matching default view name cannot be found, raises
ComponentLookupError.
@@ -42,10 +40,7 @@
def queryDefaultViewName(object, request, default=None, context=None):
"""Look for the name of the default view for the object and request.
- The request must implement IPresentationRequest, and provides
- the desired view type. The nearest one to the object is
- found. If a matching default view name cannot be found,
- returns the default.
+ If a matching default view name cannot be found, returns the default.
If context is not specified, attempts to use object to specify
a context.
Modified: zope.app.publisher/trunk/src/zope/app/publisher/browser/configure.zcml
===================================================================
--- zope.app.publisher/trunk/src/zope/app/publisher/browser/configure.zcml 2009-03-08 08:27:27 UTC (rev 97650)
+++ zope.app.publisher/trunk/src/zope/app/publisher/browser/configure.zcml 2009-03-08 08:32:59 UTC (rev 97651)
@@ -16,8 +16,6 @@
interface="zope.publisher.interfaces.browser.IBrowserApplicationRequest"
attributes="response locale __str__"
/>
- <allow
- interface="zope.component.interfaces.IPresentationRequest" />
</class>
<class class="zope.publisher.browser.TestRequest">
@@ -25,8 +23,6 @@
interface="zope.publisher.interfaces.browser.IBrowserApplicationRequest"
attributes="response"
/>
- <allow
- interface="zope.component.interfaces.IPresentationRequest" />
</class>
<class class="zope.publisher.browser.BrowserResponse">
Modified: zope.app.publisher/trunk/src/zope/app/publisher/browser/resource.py
===================================================================
--- zope.app.publisher/trunk/src/zope/app/publisher/browser/resource.py 2009-03-08 08:27:27 UTC (rev 97650)
+++ zope.app.publisher/trunk/src/zope/app/publisher/browser/resource.py 2009-03-08 08:32:59 UTC (rev 97651)
@@ -17,13 +17,13 @@
"""
from zope.component import getMultiAdapter
from zope.component import queryMultiAdapter
-from zope.component.interfaces import IResource
from zope.interface import implements
-from zope.traversing.browser.interfaces import IAbsoluteURL
from zope.location import Location
-
from zope.site.hooks import getSite
+from zope.traversing.browser.interfaces import IAbsoluteURL
+from zope.app.publisher.interfaces import IResource
+
class Resource(Location):
implements(IResource)
Modified: zope.app.publisher/trunk/src/zope/app/publisher/interfaces/__init__.py
===================================================================
--- zope.app.publisher/trunk/src/zope/app/publisher/interfaces/__init__.py 2009-03-08 08:27:27 UTC (rev 97650)
+++ zope.app.publisher/trunk/src/zope/app/publisher/interfaces/__init__.py 2009-03-08 08:32:59 UTC (rev 97651)
@@ -1,2 +1,23 @@
+##############################################################################
#
-# This file is necessary to make this directory a package.
+# Copyright (c) 2009 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Resource
+
+$Id$
+"""
+from zope.interface import Interface, Attribute
+
+
+class IResource(Interface):
+
+ request = Attribute('Request object that is requesting the resource')
Modified: zope.app.publisher/trunk/src/zope/app/publisher/interfaces/ftp.py
===================================================================
--- zope.app.publisher/trunk/src/zope/app/publisher/interfaces/ftp.py 2009-03-08 08:27:27 UTC (rev 97650)
+++ zope.app.publisher/trunk/src/zope/app/publisher/interfaces/ftp.py 2009-03-08 08:32:59 UTC (rev 97651)
@@ -15,16 +15,11 @@
$Id$
"""
-from zope.component.interfaces import IPresentation
-from zope.component.interfaces import IView
-
+from zope.publisher.interfaces import IView
from zope.publisher.interfaces.ftp import IFTPPublisher
-class IFTPPresentation(IPresentation):
- """FTP presentations"""
-
-class IFTPView(IFTPPresentation, IView):
+class IFTPView(IView):
"FTP View"
Modified: zope.app.publisher/trunk/src/zope/app/publisher/interfaces/http.py
===================================================================
--- zope.app.publisher/trunk/src/zope/app/publisher/interfaces/http.py 2009-03-08 08:27:27 UTC (rev 97650)
+++ zope.app.publisher/trunk/src/zope/app/publisher/interfaces/http.py 2009-03-08 08:32:59 UTC (rev 97651)
@@ -15,15 +15,10 @@
$Id$
"""
-from zope.component.interfaces import IPresentation
-from zope.component.interfaces import IView
+from zope.publisher.interfaces import IView
-class IHTTPPresentation(IPresentation):
- """HTTP presentations are for interaction with users using Web HTTPs
- """
-
-class IHTTPView(IHTTPPresentation, IView):
+class IHTTPView(IView):
"HTTP View"
Modified: zope.app.publisher/trunk/src/zope/app/publisher/interfaces/xmlrpc.py
===================================================================
--- zope.app.publisher/trunk/src/zope/app/publisher/interfaces/xmlrpc.py 2009-03-08 08:27:27 UTC (rev 97650)
+++ zope.app.publisher/trunk/src/zope/app/publisher/interfaces/xmlrpc.py 2009-03-08 08:32:59 UTC (rev 97651)
@@ -15,12 +15,8 @@
$Id$
"""
-from zope.component.interfaces import IView
-from zope.component.interfaces import IPresentation
+from zope.publisher.interfaces import IView
-class IXMLRPCPresentation(IPresentation):
- """XML-RPC presentation
- """
-class IXMLRPCView(IXMLRPCPresentation, IView):
+class IXMLRPCView(IView):
"""XMLRPC View"""
More information about the Checkins
mailing list