[KSS-checkins] r45497 - in kukit/kss.core/trunk/kss/core: . pluginregistry/browser tests

[jvloothuis at codespeak.net]

Author: jvloothuis
Date: Sun Aug  5 10:28:41 2007
New Revision: 45497

Modified:
   kukit/kss.core/trunk/kss/core/actionwrapper.py
   kukit/kss.core/trunk/kss/core/browserview.py
   kukit/kss.core/trunk/kss/core/commands.py
   kukit/kss.core/trunk/kss/core/kssview.py
   kukit/kss.core/trunk/kss/core/pluginregistry/browser/develview.py
   kukit/kss.core/trunk/kss/core/tests/test_browserview.py
Log:
Changed all occurences of request.RESPONSE to request.response in order to get better Zope 3 compatibility (as Philipp requested)


Modified: kukit/kss.core/trunk/kss/core/actionwrapper.py
==============================================================================
--- kukit/kss.core/trunk/kss/core/actionwrapper.py	(original)
+++ kukit/kss.core/trunk/kss/core/actionwrapper.py	Sun Aug  5 10:28:41 2007
@@ -97,7 +97,6 @@
     tests.
 
         >>> from zope.publisher.browser import TestRequest
-        >>> from zope.publisher.http import HTTPResponse
 
         >>> class MyView(KSSView):
         ...     @kssaction
@@ -109,7 +108,6 @@
         ...         raise KSSExplicitError, 'The error'
  
         >>> request = TestRequest()
-        >>> request.RESPONSE = HTTPResponse()
         >>> view = MyView(None, request)
 
     Set debug-mode command rendering so we can see the results in a

Modified: kukit/kss.core/trunk/kss/core/browserview.py
==============================================================================
--- kukit/kss.core/trunk/kss/core/browserview.py	(original)
+++ kukit/kss.core/trunk/kss/core/browserview.py	Sun Aug  5 10:28:41 2007
@@ -1,4 +1,3 @@
-# -*- coding: UTF-8 -*-
 # Copyright (c) 2006-2007
 # Authors: KSS Project Contributors (see docs/CREDITS.txt)
 #
@@ -42,7 +41,7 @@
         'Attach the commands on the response'
         # get rid of newlines
         payload = payload.replace('\n', ' ')
-        self.request.RESPONSE.setHeader(header_name, payload)
+        self.request.response.setHeader(header_name, payload)
 
 # coherent naming KSS 
 # deprecate Kss

Modified: kukit/kss.core/trunk/kss/core/commands.py
==============================================================================
--- kukit/kss.core/trunk/kss/core/commands.py	(original)
+++ kukit/kss.core/trunk/kss/core/commands.py	Sun Aug  5 10:28:41 2007
@@ -1,4 +1,3 @@
-# -*- coding: ISO-8859-15 -*-
 # Copyright (c) 2005-2007
 # Authors: KSS Project Contributors (see docs/CREDITS.txt)
 #
@@ -27,7 +26,6 @@
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
 from interfaces import IKSSCommands, IKSSCommand, IKSSParam, IKSSCommandView
 from unicode_quirks import force_unicode
-from zope.interface import Interface
 import zope.component
 from parsers import XmlParser, HtmlParser
 from pluginregistry import checkRegisteredCommand_old
@@ -197,5 +195,5 @@
         # Always output text/xml to make sure browsers but the data in the
         # responseXML instead of responseText attribute of the
         # XMLHttpRequestobject.
-        self.request.RESPONSE.setHeader('Content-type', 'text/xml;charset=utf-8')
+        self.request.response.setHeader('Content-type', 'text/xml;charset=utf-8')
         return result

Modified: kukit/kss.core/trunk/kss/core/kssview.py
==============================================================================
--- kukit/kss.core/trunk/kss/core/kssview.py	(original)
+++ kukit/kss.core/trunk/kss/core/kssview.py	Sun Aug  5 10:28:41 2007
@@ -156,9 +156,9 @@
         return self.commands.render(self.request)
 
     def cancelRedirect(self):
-        if self.request.RESPONSE.getStatus() in (302, 303):
+        if self.request.response.getStatus() in (302, 303):
             # Try to not redirect if requested
-            self.request.RESPONSE.setStatus(200)
+            self.request.response.setStatus(200)
 
     def getCommands(self):
         return self.commands

Modified: kukit/kss.core/trunk/kss/core/pluginregistry/browser/develview.py
==============================================================================
--- kukit/kss.core/trunk/kss/core/pluginregistry/browser/develview.py	(original)
+++ kukit/kss.core/trunk/kss/core/pluginregistry/browser/develview.py	Sun Aug  5 10:28:41 2007
@@ -49,11 +49,11 @@
 
     def set(self):
         'XXX'
-        self.request.RESPONSE.setCookie(COOKIE_NAME, '1', path='/')
+        self.request.response.setCookie(COOKIE_NAME, '1', path='/')
 
     def unset(self):
         'XXX'
-        self.request.RESPONSE.expireCookie(COOKIE_NAME, path='/')
+        self.request.response.expireCookie(COOKIE_NAME, path='/')
 
     _ui = ViewPageTemplateFile('develui.pt', content_type='text/html;charset=utf-8')
 

Modified: kukit/kss.core/trunk/kss/core/tests/test_browserview.py
==============================================================================
--- kukit/kss.core/trunk/kss/core/tests/test_browserview.py	(original)
+++ kukit/kss.core/trunk/kss/core/tests/test_browserview.py	Sun Aug  5 10:28:41 2007
@@ -1,4 +1,3 @@
-# -*- coding: ISO-8859-15 -*-
 # Copyright (c) 2005-2007
 # Authors: KSS Project Contributors (see docs/CREDITS.txt)
 #
@@ -28,7 +27,7 @@
         view = context.restrictedTraverse('@@kss_view')
         self.assert_(view is not None)
         view.attach_error(err_type='TheError', err_value='the_<>message\n\n')
-        response = view.request.RESPONSE
+        response = view.request.response
         header = response.getHeader('x-ksscommands')
         self.assert_('the_&amp;lt;&amp;gt;message' in header)   # no < > in the message
         self.assert_('\n' not in header)   # no /n in the payload: would destroy the page