[Checkins] SVN: zope.publisher/trunk/ Fix: remove IBrowserRequest dependency in http implementation based on
Roger Ineichen
roger at projekt01.ch
Sun Mar 8 20:15:22 EDT 2009
Log message for revision 97674:
Fix: remove IBrowserRequest dependency in http implementation based on
condition for setDefaultSkin. Use ISkinnable instead of IBrowserRequest
Changed:
U zope.publisher/trunk/CHANGES.txt
U zope.publisher/trunk/src/zope/publisher/http.py
-=-
Modified: zope.publisher/trunk/CHANGES.txt
===================================================================
--- zope.publisher/trunk/CHANGES.txt 2009-03-08 22:50:48 UTC (rev 97673)
+++ zope.publisher/trunk/CHANGES.txt 2009-03-09 00:15:22 UTC (rev 97674)
@@ -4,7 +4,8 @@
3.6.1 (unreleased)
------------------
-- ...
+- Fix: remove IBrowserRequest dependency in http implementation based on
+ condition for setDefaultSkin. Use ISkinnable instead of IBrowserRequest.
3.6.0 (2009-03-08)
------------------
Modified: zope.publisher/trunk/src/zope/publisher/http.py
===================================================================
--- zope.publisher/trunk/src/zope/publisher/http.py 2009-03-08 22:50:48 UTC (rev 97673)
+++ zope.publisher/trunk/src/zope/publisher/http.py 2009-03-09 00:15:22 UTC (rev 97674)
@@ -29,18 +29,18 @@
import zope.publisher
from zope.publisher import contenttype
+from zope.publisher.interfaces import Redirect
+from zope.publisher.interfaces import ISkinnable
from zope.publisher.interfaces.http import IHTTPCredentials
from zope.publisher.interfaces.http import IHTTPRequest
from zope.publisher.interfaces.http import IHTTPApplicationRequest
from zope.publisher.interfaces.http import IHTTPPublisher
from zope.publisher.interfaces.http import IHTTPVirtualHostChangedEvent
from zope.publisher.interfaces.http import IResult
-
-from zope.publisher.interfaces import Redirect
-from zope.publisher.interfaces.browser import IBrowserRequest
from zope.publisher.interfaces.http import IHTTPResponse
from zope.publisher.interfaces.http import IHTTPApplicationResponse
from zope.publisher.interfaces.logginginfo import ILoggingInfo
+from zope.publisher.skinnable import setDefaultSkin
from zope.i18n.interfaces import IUserPreferredCharsets
from zope.i18n.interfaces import IUserPreferredLanguages
from zope.i18n.locales import locales, LoadLocaleError
@@ -449,9 +449,9 @@
response=self.response.retry(),
)
# restore the default skin
- if IBrowserRequest.providedBy(self):
- # only browser requests have skins
- zope.publisher.skinnable.setDefaultSkin(request)
+ if ISkinnable.providedBy(self):
+ # only ISkinnable requests have skins
+ setDefaultSkin(request)
request.setPublication(self.publication)
request._retry_count = self._retry_count
More information about the Checkins
mailing list