[Zope3-checkins] CVS: Zope3/src/zope/app/publisher/browser - directoryresource.py:1.4 fileresource.py:1.9 i18nfileresource.py:1.6 pagetemplateresource.py:1.3

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/publisher/browser
In directory cvs.zope.org:/tmp/cvs-serv30215/src/zope/app/publisher/browser

Modified Files:
	directoryresource.py fileresource.py i18nfileresource.py 
	pagetemplateresource.py 
Log Message:
Got rid of IBrowserResource


=== Zope3/src/zope/app/publisher/browser/directoryresource.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/publisher/browser/directoryresource.py:1.3	Wed Sep 24 13:22:07 2003
+++ Zope3/src/zope/app/publisher/browser/directoryresource.py	Fri Nov 21 12:10:05 2003
@@ -21,8 +21,7 @@
 from zope.exceptions import NotFoundError
 from zope.security.proxy import Proxy
 from zope.publisher.browser import BrowserView
-from zope.publisher.interfaces.browser import IBrowserResource, \
-     IBrowserPublisher
+from zope.publisher.interfaces.browser import IBrowserPublisher
 
 from zope.app.publisher.browser.resource import Resource
 
@@ -41,7 +40,7 @@
 
 class DirectoryResource(BrowserView, Resource):
 
-    implements(IBrowserResource, IBrowserPublisher)
+    implements(IBrowserPublisher)
 
     resource_factories = {
         'gif':  ImageResourceFactory,


=== Zope3/src/zope/app/publisher/browser/fileresource.py 1.8 => 1.9 ===
--- Zope3/src/zope/app/publisher/browser/fileresource.py:1.8	Mon Nov  3 16:37:58 2003
+++ Zope3/src/zope/app/publisher/browser/fileresource.py	Fri Nov 21 12:10:05 2003
@@ -20,7 +20,6 @@
 from zope.exceptions import NotFoundError
 
 from zope.publisher.browser import BrowserView
-from zope.publisher.interfaces.browser import IBrowserResource
 from zope.publisher.interfaces.browser import IBrowserPublisher
 
 from zope.app.publisher.fileresource import File, Image
@@ -33,7 +32,7 @@
 
 class FileResource(BrowserView, Resource):
 
-    implements(IBrowserResource, IBrowserPublisher)
+    implements(IBrowserPublisher)
 
     def publishTraverse(self, request, name):
         '''See interface IBrowserPublisher'''


=== Zope3/src/zope/app/publisher/browser/i18nfileresource.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/publisher/browser/i18nfileresource.py:1.5	Sat Jun  7 01:46:02 2003
+++ Zope3/src/zope/app/publisher/browser/i18nfileresource.py	Fri Nov 21 12:10:05 2003
@@ -18,7 +18,6 @@
 """
 __metaclass__ = type # All classes are new style when run with Python 2.2+
 
-from zope.publisher.interfaces.browser import IBrowserResource
 from zope.publisher.interfaces.browser import IBrowserPublisher
 
 from zope.app.publisher.browser.fileresource import FileResource
@@ -30,7 +29,7 @@
 
 class I18nFileResource(FileResource):
 
-    implements(IBrowserResource, IBrowserPublisher, II18nAware)
+    implements(IBrowserPublisher, II18nAware)
 
     def __init__(self, data, request, defaultLanguage='en'):
         """Creates an internationalized file resource.  data should be


=== Zope3/src/zope/app/publisher/browser/pagetemplateresource.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/publisher/browser/pagetemplateresource.py:1.2	Mon Sep 22 17:05:13 2003
+++ Zope3/src/zope/app/publisher/browser/pagetemplateresource.py	Fri Nov 21 12:10:05 2003
@@ -20,15 +20,14 @@
 from zope.exceptions import NotFoundError
 from zope.security.proxy import Proxy
 from zope.publisher.browser import BrowserView
-from zope.publisher.interfaces.browser import IBrowserResource, \
-     IBrowserPublisher
+from zope.publisher.interfaces.browser import IBrowserPublisher
 
 from zope.app.publisher.pagetemplateresource import PageTemplate
 from zope.app.publisher.browser.resource import Resource
 
 class PageTemplateResource(BrowserView, Resource):
 
-    implements(IBrowserResource, IBrowserPublisher)
+    implements(IBrowserPublisher)
 
     def publishTraverse(self, request, name):
         '''See interface IBrowserPublisher'''