[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ - some cleanup

Yvo Schubbe cvs-admin at zope.org
Thu May 2 10:36:33 UTC 2013


Log message for revision 130223:
  - some cleanup

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/tests/test_syndication.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/skins/tests/test_icons.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/skins/tests/test_ursa.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/skins/ursa.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/test_utils.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/tests/test_syndication.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/tests/test_syndication.py	2013-05-02 10:31:11 UTC (rev 130222)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/tests/test_syndication.py	2013-05-02 10:36:32 UTC (rev 130223)
@@ -16,18 +16,16 @@
 import unittest
 
 from zope.component import getSiteManager
-from zope.interface import implements
 from zope.i18n.interfaces import IUserPreferredCharsets
 from zope.interface import alsoProvides
+from zope.interface import implements
 from zope.testing.cleanup import cleanUp
 
 from Products.CMFCore.interfaces import IActionsTool
 from Products.CMFCore.interfaces import IFolderish
-from Products.CMFCore.interfaces import IPropertiesTool
 from Products.CMFCore.interfaces import IMembershipTool
 from Products.CMFCore.interfaces import ISyndicationTool
 from Products.CMFCore.interfaces import IURLTool
-from Products.CMFCore.tests.base.dummy import DummyFolder
 from Products.CMFCore.tests.base.dummy import DummySite
 from Products.CMFCore.tests.base.dummy import DummyTool
 from Products.CMFDefault.browser.test_utils import DummyRequest
@@ -88,7 +86,7 @@
         view.handle_enable("enable", {})
         self.assertTrue(view.enabled())
         self.assertEqual(view.status, u"Syndication enabled.")
-        self.assertEqual(view.request.RESPONSE.location,
+        self.assertEqual(view.request.response.location,
             "http://www.foobar.com/bar/site?portal_status_message="
             "Syndication%20enabled.")
 
@@ -107,7 +105,7 @@
         for k, v in data.items():
             self.assertEqual(getattr(view.getContent(), k), v)
         self.assertEqual(view.status, u"Syndication settings changed.")
-        self.assertEqual(view.request.RESPONSE.location,
+        self.assertEqual(view.request.response.location,
             "http://www.foobar.com/bar/site?portal_status_message="
             "Syndication%20settings%20changed.")
 
@@ -118,7 +116,7 @@
         view.handle_disable("disable", {})
         self.assertTrue(view.disabled())
         self.assertEqual(view.status, u"Syndication disabled.")
-        self.assertEqual(view.request.RESPONSE.location,
+        self.assertEqual(view.request.response.location,
             "http://www.foobar.com/bar/site?portal_status_message="
             "Syndication%20disabled.")
 
@@ -170,7 +168,7 @@
         view.handle_enable("enable", {})
         self.assertTrue(view.enabled())
         self.assertEqual(view.status, u"Syndication enabled.")
-        self.assertEqual(view.request.RESPONSE.location,
+        self.assertEqual(view.request.response.location,
             "http://www.foobar.com/bar/site?portal_status_message="
             "Syndication%20enabled.")
 
@@ -182,7 +180,7 @@
         view.handle_disable("disable", {})
         self.assertFalse(view.enabled())
         self.assertEqual(view.status, u"Syndication disabled.")
-        self.assertEqual(view.request.RESPONSE.location,
+        self.assertEqual(view.request.response.location,
             "http://www.foobar.com/bar/site?portal_status_message="
             "Syndication%20disabled.")
 
@@ -195,7 +193,7 @@
         for k, v in values.items():
             self.assertEqual(getattr(view.getContent(), k), v)
         self.assertEqual(view.status, u"Syndication settings changed.")
-        self.assertEqual(view.request.RESPONSE.location,
+        self.assertEqual(view.request.response.location,
             "http://www.foobar.com/bar/site?portal_status_message="
             "Syndication%20settings%20changed.")
 
@@ -209,7 +207,7 @@
         for k, v in values.items():
             self.assertNotEqual(getattr(view.getContent(), k), v)
         self.assertEqual(view.status, u"Syndication reset to site default.")
-        self.assertEqual(view.request.RESPONSE.location,
+        self.assertEqual(view.request.response.location,
             "http://www.foobar.com/bar/site?portal_status_message="
             "Syndication%20reset%20to%20site%20default.")
 

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py	2013-05-02 10:31:11 UTC (rev 130222)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py	2013-05-02 10:36:32 UTC (rev 130223)
@@ -400,7 +400,7 @@
             else:
                 self.status = _(u'Items pasted.')
         except CopyError:
-            self.request['RESPONSE'].expireCookie('__cp',
+            self.request.response.expireCookie('__cp',
                     path='%s' % (self.request['BASEPATH1'] or "/"))
             self.status = _(u'CopyError: Paste failed.')
         except ValueError:

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/skins/tests/test_icons.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/skins/tests/test_icons.py	2013-05-02 10:31:11 UTC (rev 130222)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/skins/tests/test_icons.py	2013-05-02 10:36:32 UTC (rev 130223)
@@ -176,10 +176,10 @@
     pass
 
 
-class DummyRequest:
+class DummyRequest(object):
 
     def __init__(self):
-        self.RESPONSE = DummyResponse()
+        self.response = DummyResponse()
 
     def get(self, key, default=None):
         return {}

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/skins/tests/test_ursa.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/skins/tests/test_ursa.py	2013-05-02 10:31:11 UTC (rev 130222)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/skins/tests/test_ursa.py	2013-05-02 10:36:32 UTC (rev 130223)
@@ -67,14 +67,14 @@
     def test_ctor_wo_def_charset_doesnt_set_content_type(self):
         context = self._makeContext()
         request = DummyRequest()
-        response = request.RESPONSE
+        response = request.response
         self._makeOne(context, request)
         self.assertEqual(len(response._set_headers), 0)
 
     def test_ctor_w_resp_charset_doesnt_set_content_type(self):
         context = self._makeContext()
         request = DummyRequest()
-        response = request.RESPONSE
+        response = request.response
         response._orig_headers['content-type'] = 'text/html; charset=UTF-8'
         self._makeOne(context, request)
         self.assertEqual(len(response._set_headers), 0)
@@ -83,7 +83,7 @@
         context = self._makeContext()
         context.portal_properties.default_charset = 'latin1'
         request = DummyRequest()
-        response = request.RESPONSE
+        response = request.response
         response._orig_headers['content-type'] = 'text/html; charset=UTF-8'
         self._makeOne(context, request)
         self.assertEqual(len(response._set_headers), 0)
@@ -92,7 +92,7 @@
         context = self._makeContext()
         context.portal_properties.default_charset = 'latin1'
         request = DummyRequest()
-        response = request.RESPONSE
+        response = request.response
         response._orig_headers['content-type'] = 'text/html'
         self._makeOne(context, request)
         self.assertEqual(len(response._set_headers), 1)
@@ -574,10 +574,10 @@
         self._set_headers.append((key, value))
 
 
-class DummyRequest:
+class DummyRequest(object):
 
     def __init__(self):
-        self.RESPONSE = DummyResponse()
+        self.response = DummyResponse()
 
 
 def test_suite():

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/skins/ursa.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/skins/ursa.py	2013-05-02 10:31:11 UTC (rev 130222)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/skins/ursa.py	2013-05-02 10:36:32 UTC (rev 130223)
@@ -45,13 +45,13 @@
     """
     def __init__(self, context, request):
         super(ViewBase, self).__init__(context, request)
-        ct = self.request.RESPONSE.getHeader('content-type') or ''
+        ct = self.request.response.getHeader('content-type') or ''
         if not 'charset' in ct:
             # Some newstyle views set a different charset - don't override it.
             # Oldstyle views need the default_charset.
             default_charset = self.ptool.getProperty('default_charset', None)
             if default_charset:
-                self.request.RESPONSE.setHeader('content-type',
+                self.request.response.setHeader('content-type',
                               'text/html; charset=%s' % default_charset)
 
     @property

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/test_utils.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/test_utils.py	2013-05-02 10:31:11 UTC (rev 130222)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/test_utils.py	2013-05-02 10:36:32 UTC (rev 130223)
@@ -23,10 +23,9 @@
 
 class DummyRequest(TestRequest):
 
-
     def __init__(self, **kw):
         super(DummyRequest, self).__init__(kw)
-        self.RESPONSE = DummyResponse()
+        self._response = DummyResponse()
 
     def getPreferredCharsets(self):
         return ['utf-8']

Modified: Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py	2013-05-02 10:31:11 UTC (rev 130222)
+++ Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py	2013-05-02 10:36:32 UTC (rev 130223)
@@ -73,15 +73,15 @@
             if v and v != '0':
                 kw[k] = v
 
-        query = kw and ('?%s' % make_query(kw)) or ''
-        self.request.RESPONSE.redirect('%s%s' % (target, query))
+        query = kw and '?{0}'.format(make_query(kw)) or ''
+        self.request.response.redirect('{0}{1}'.format(target, query))
 
         return ''
 
     def update(self):
         # XXX: if we don't set default_encoding explicitly, main_template might
         #      set a different charset
-        self.request.RESPONSE.setHeader('Content-Type',
+        self.request.response.setHeader('Content-Type',
             'text/html; charset=%s' % HTTPRequest.default_encoding)
         # BBB: for Zope < 2.14
         if not getattr(self.request, 'postProcessInputs', False):
@@ -324,7 +324,7 @@
     def update(self):
         # XXX: if we don't set default_encoding explicitly, main_template might
         #      set a different charset
-        self.request.RESPONSE.setHeader('Content-Type',
+        self.request.response.setHeader('Content-Type',
             'text/html; charset=%s' % HTTPRequest.default_encoding)
         # BBB: for Zope < 2.14
         if not getattr(self.request, 'postProcessInputs', False):



More information about the checkins mailing list