[Checkins] SVN: zope.publisher/trunk/ Make IBrowserPage inherit IBrowserView. Stop inheriting from some of deprecated (for years) interfaces defined in zope.component.

[Dan Korostelev]

Log message for revision 97611:
  Make IBrowserPage inherit IBrowserView. Stop inheriting from some of deprecated (for years) interfaces defined in zope.component.

Changed:
  U   zope.publisher/trunk/CHANGES.txt
  U   zope.publisher/trunk/src/zope/publisher/interfaces/__init__.py
  U   zope.publisher/trunk/src/zope/publisher/interfaces/browser.py

-=-
Modified: zope.publisher/trunk/CHANGES.txt
===================================================================
--- zope.publisher/trunk/CHANGES.txt	2009-03-07 09:19:12 UTC (rev 97610)
+++ zope.publisher/trunk/CHANGES.txt	2009-03-07 09:52:35 UTC (rev 97611)
@@ -31,6 +31,11 @@
 
 - Fix: Don't cause warnings on Python 2.6
 
+- Fix: Make IBrowserPage inherit IBrowserView.
+
+- Stop inheriting from some of deprecated (for years) interfaces defined
+  in zope.component.
+
 - Remove deprecated code.
 
 - Clean-up: Move "zope.testing" from extras to dependencies, per Zope

Modified: zope.publisher/trunk/src/zope/publisher/interfaces/__init__.py
===================================================================
--- zope.publisher/trunk/src/zope/publisher/interfaces/__init__.py	2009-03-07 09:19:12 UTC (rev 97610)
+++ zope.publisher/trunk/src/zope/publisher/interfaces/__init__.py	2009-03-07 09:52:35 UTC (rev 97611)
@@ -16,7 +16,6 @@
 $Id$
 """
 __docformat__ = "reStructuredText"
-from zope.component.interfaces import IPresentationRequest
 from zope.interface import Interface, Attribute, implements
 from zope.interface.common.mapping import IEnumerableMapping
 from zope.interface.common.interfaces import IException, ILookupError
@@ -284,7 +283,7 @@
         """
 
 
-class IPublicationRequest(IPresentationRequest, IParticipation):
+class IPublicationRequest(IParticipation):
     """Interface provided by requests to IPublication objects
     """
 

Modified: zope.publisher/trunk/src/zope/publisher/interfaces/browser.py
===================================================================
--- zope.publisher/trunk/src/zope/publisher/interfaces/browser.py	2009-03-07 09:19:12 UTC (rev 97610)
+++ zope.publisher/trunk/src/zope/publisher/interfaces/browser.py	2009-03-07 09:52:35 UTC (rev 97611)
@@ -20,7 +20,6 @@
 
 from zope.interface import Interface, Attribute, directlyProvides, alsoProvides
 from zope.interface.interfaces import IInterface
-from zope.component.interfaces import IView
 
 from zope.publisher.interfaces import IPublication
 from zope.publisher.interfaces import IPublishTraverse
@@ -128,14 +127,19 @@
         the base href.
         """
 
-class IBrowserPage(IBrowserPublisher):
+class IBrowserView(Interface):
+    """Browser View"""
+
+    request = Attribute("The request object that requested the view")
+    context = Attribute("The context object that the view is for")
+
+
+class IBrowserPage(IBrowserView, IBrowserPublisher):
     """Browser page"""
 
     def __call__(*args, **kw):
         """Compute a response body"""
 
-class IBrowserView(IView):
-    """Browser View"""
 
 class IDefaultBrowserLayer(IBrowserRequest):
     """The default layer."""