From 0e131e30da1c5ce9c35965252a5718f1b2660eea Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 24 Sep 2011 05:30:03 -0400 Subject: fix test_renderers tests on py3 --- pyramid/renderers.py | 4 ++-- pyramid/tests/test_renderers.py | 8 ++++---- setup.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pyramid/renderers.py b/pyramid/renderers.py index 2d420f67a..88cb869a5 100644 --- a/pyramid/renderers.py +++ b/pyramid/renderers.py @@ -149,7 +149,7 @@ def json_renderer_factory(info): def string_renderer_factory(info): def _render(value, system): if not isinstance(value, string_types): - value = native_(value, 'utf-8') + value = str(value) request = system.get('request') if request is not None: response = request.response @@ -441,7 +441,7 @@ class RendererHelper(object): result = '' if isinstance(result, text_type): - response.unicode_body = result + response.text = result else: response.body = result diff --git a/pyramid/tests/test_renderers.py b/pyramid/tests/test_renderers.py index 758331788..1054dcb1c 100644 --- a/pyramid/tests/test_renderers.py +++ b/pyramid/tests/test_renderers.py @@ -453,14 +453,14 @@ class Test_string_renderer_factory(unittest.TestCase): def test_with_request_content_type_notset(self): request = testing.DummyRequest() renderer = self._callFUT(None) - renderer(None, {'request':request}) + renderer('', {'request':request}) self.assertEqual(request.response.content_type, 'text/plain') def test_with_request_content_type_set(self): request = testing.DummyRequest() request.response.content_type = 'text/mishmash' renderer = self._callFUT(None) - renderer(None, {'request':request}) + renderer('', {'request':request}) self.assertEqual(request.response.content_type, 'text/mishmash') @@ -600,7 +600,7 @@ class TestRendererHelper(unittest.TestCase): self._registerResponseFactory() request = None helper = self._makeOne('loo.foo') - response = helper._make_response('abc', request) + response = helper._make_response(b'abc', request) self.assertEqual(response.__class__.__name__, 'ResponseFactory') self.assertEqual(response.body, b'abc') @@ -687,7 +687,7 @@ class TestRendererHelper(unittest.TestCase): self.config.registry.registerUtility(ResponseFactory, IResponseFactory) request = testing.DummyRequest() helper = self._makeOne('loo.foo') - response = helper._make_response('abc', request) + response = helper._make_response(b'abc', request) self.assertEqual(response.__class__, ResponseFactory) self.assertEqual(response.body, b'abc') diff --git a/setup.py b/setup.py index 4213bb628..010dd06cc 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ except IOError: install_requires=[ 'Chameleon >= 1.2.3', 'Mako >= 0.3.6', # strict_undefined - 'WebOb >= 1.0.2', # no "default_charset"; request.script_name doesnt error + 'WebOb >= 1.2dev', # response.text / py3 compat 'repoze.lru', 'setuptools', 'zope.interface >= 3.8.0', # has zope.interface.registry -- cgit v1.2.3