[Checkins] SVN: zope.publisher/branches/py3-attempt2/src/zope/publisher/ All import exception fixed
Andrey Lebedev
cvs-admin at zope.org
Mon Feb 18 15:14:51 UTC 2013
Log message for revision 129450:
All import exception fixed
Changed:
U zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_browserrequest.py
U zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_ipublication.py
U zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_publisher.py
U zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_xmlrpc.py
U zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_xmlrpcrequest.py
U zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_zcml.py
U zope.publisher/branches/py3-attempt2/src/zope/publisher/xmlrpc.py
-=-
Modified: zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_browserrequest.py
===================================================================
--- zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_browserrequest.py 2013-02-18 14:38:24 UTC (rev 129449)
+++ zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_browserrequest.py 2013-02-18 15:14:50 UTC (rev 129450)
@@ -14,7 +14,7 @@
import sys
import unittest
-from StringIO import StringIO
+from io import BytesIO
from zope.interface import implementer, directlyProvides, Interface
from zope.interface.verify import verifyObject
@@ -101,7 +101,7 @@
class Item(object):
"""Required docstring for the publisher."""
def __call__(self, a, b):
- return u"%s, %s" % (`a`, `b`)
+ return u"%s, %s" % (repr(a), repr(b))
class Item3(object):
"""Required docstring for the publisher."""
@@ -115,7 +115,7 @@
def index(self, a, b):
"""Required docstring for the publisher."""
- return u"%s, %s" % (`a`, `b`)
+ return u"%s, %s" % (repr(a), repr(b))
class Item2(object):
"""Required docstring for the publisher."""
@@ -131,14 +131,14 @@
self.app.folder.item2 = Item2()
self.app.folder.item3 = Item3()
- def _createRequest(self, extra_env={}, body=""):
+ def _createRequest(self, extra_env={}, body=b""):
env = self._testEnv.copy()
env.update(extra_env)
if len(body):
env['CONTENT_LENGTH'] = str(len(body))
publication = Publication(self.app)
- instream = StringIO(body)
+ instream = BytesIO(body)
request = TestBrowserRequest(instream, env)
request.setPublication(publication)
return request
@@ -554,11 +554,11 @@
def _Test__new(self, environ=None, **kw):
if environ is None:
environ = kw
- return BrowserRequest(StringIO(''), environ)
+ return BrowserRequest(BytesIO(b''), environ)
def test_IApplicationRequest_bodyStream(self):
- request = BrowserRequest(StringIO('spam'), {})
- self.assertEqual(request.bodyStream.read(), 'spam')
+ request = BrowserRequest(BytesIO(b'spam'), {})
+ self.assertEqual(request.bodyStream.read(), b'spam')
# Needed by BaseTestIEnumerableMapping tests:
def _IEnumerableMapping__stateDict(self):
Modified: zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_ipublication.py
===================================================================
--- zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_ipublication.py 2013-02-18 14:38:24 UTC (rev 129449)
+++ zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_ipublication.py 2013-02-18 15:14:50 UTC (rev 129450)
@@ -16,7 +16,7 @@
import sys
from unittest import TestCase, main, makeSuite
-from StringIO import StringIO
+from io import BytesIO
from zope.interface.verify import verifyObject
from zope.publisher.interfaces import IPublication
@@ -46,7 +46,7 @@
def _Test__request(self):
from zope.publisher.base import BaseRequest
- request = BaseRequest(StringIO(''), {})
+ request = BaseRequest(BytesIO(b''), {})
request.setTraversalStack(['Engineering', 'ZopeCorp'])
publication = self._Test__new()
request.setPublication(publication)
Modified: zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_publisher.py
===================================================================
--- zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_publisher.py 2013-02-18 14:38:24 UTC (rev 129449)
+++ zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_publisher.py 2013-02-18 15:14:50 UTC (rev 129450)
@@ -26,7 +26,7 @@
from zope.interface.verify import verifyClass
from zope.interface import implementedBy
-from StringIO import StringIO
+from io import BytesIO
class ErrorToRetry(Exception):
"""A sample exception that should be retried."""
@@ -65,7 +65,7 @@
publication = DefaultPublication(self.app)
path = path.split('/')
path.reverse()
- request = TestRequest(StringIO(''), **kw)
+ request = TestRequest(BytesIO(b''), **kw)
request.setTraversalStack(path)
request.setPublication(publication)
return request
Modified: zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_xmlrpc.py
===================================================================
--- zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_xmlrpc.py 2013-02-18 14:38:24 UTC (rev 129449)
+++ zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_xmlrpc.py 2013-02-18 15:14:50 UTC (rev 129450)
@@ -13,12 +13,17 @@
##############################################################################
"""Testing the XML-RPC Publisher code.
"""
+import sys
import doctest
-import xmlrpclib
import zope.component.testing
from zope.publisher import xmlrpc
from zope.security.checker import defineChecker, Checker, CheckerPublic
+if sys.version_info[0] == 2:
+ import xmlrpclib
+else:
+ import xmlrpc.client as xmlrpclib
+
def setUp(test):
zope.component.testing.setUp(test)
zope.component.provideAdapter(xmlrpc.ListPreMarshaller)
Modified: zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_xmlrpcrequest.py
===================================================================
--- zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_xmlrpcrequest.py 2013-02-18 14:38:24 UTC (rev 129449)
+++ zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_xmlrpcrequest.py 2013-02-18 15:14:50 UTC (rev 129450)
@@ -81,7 +81,7 @@
class Item(object):
def __call__(self, a, b):
- return "%s, %s" % (`a`, `b`)
+ return "%s, %s" % (repr(a), repr(b))
def doit(self, a, b):
return 'do something %s %s' % (a, b)
@@ -90,7 +90,7 @@
def action(self, a):
return "Parameter[type: %s; value: %s" %(
- type(a).__name__, `a`)
+ type(a).__name__, repr(a))
class Item2(object):
view = View()
Modified: zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_zcml.py
===================================================================
--- zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_zcml.py 2013-02-18 14:38:24 UTC (rev 129449)
+++ zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_zcml.py 2013-02-18 15:14:50 UTC (rev 129450)
@@ -13,7 +13,7 @@
##############################################################################
"""Tests for browser:defaultSkin and browser:defaultView directives
"""
-from cStringIO import StringIO
+from io import BytesIO
import doctest
import unittest
@@ -68,7 +68,7 @@
def testDefaultView(self):
self.assertTrue(
component.queryMultiAdapter((ob, request), IDefaultViewName) is None)
- xmlconfig(StringIO(template % (
+ xmlconfig(BytesIO(template % (
'''
<browser:defaultView
name="test"
@@ -88,7 +88,7 @@
component.queryMultiAdapter((ob, request2), IDefaultViewName),
None)
- xmlconfig(StringIO(template % (
+ xmlconfig(BytesIO(template % (
'''
<browser:defaultView
for="zope.publisher.tests.test_zcml.IOb"
@@ -114,7 +114,7 @@
component.queryMultiAdapter((ob, request), IDefaultViewName),
None)
- xmlconfig(StringIO(template % (
+ xmlconfig(BytesIO(template % (
'''
<browser:defaultView
for="zope.publisher.tests.test_zcml.Ob"
@@ -134,7 +134,7 @@
None)
XMLConfig('meta.zcml', component)()
- xmlconfig(StringIO(template % (
+ xmlconfig(BytesIO(template % (
'''
<interface
interface="
Modified: zope.publisher/branches/py3-attempt2/src/zope/publisher/xmlrpc.py
===================================================================
--- zope.publisher/branches/py3-attempt2/src/zope/publisher/xmlrpc.py 2013-02-18 14:38:24 UTC (rev 129449)
+++ zope.publisher/branches/py3-attempt2/src/zope/publisher/xmlrpc.py 2013-02-18 15:14:50 UTC (rev 129450)
@@ -18,9 +18,8 @@
__docformat__ = 'restructuredtext'
import sys
-import xmlrpclib
import datetime
-from StringIO import StringIO
+from io import StringIO
import zope.component
import zope.interface
@@ -31,6 +30,11 @@
from zope.publisher.http import HTTPRequest, HTTPResponse, DirectResult
from zope.security.proxy import isinstance
+if sys.version_info[0] == 2:
+ import xmlrpclib
+else:
+ import xmlrpc.client as xmlrpclib
+
@implementer(IXMLRPCRequest)
class XMLRPCRequest(HTTPRequest):
@@ -183,7 +187,7 @@
self.data = data
def __call__(self):
- raise Exception, "Not implemented"
+ raise Exception("Not implemented")
@zope.component.adapter(dict)
class DictPreMarshaller(PreMarshallerBase):
More information about the checkins
mailing list