From 2d5424869375bb9d3c4b24489aa164d9b8095e29 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Tue, 19 Jan 2010 17:33:29 +0000 Subject: - When WebOb 0.9.7.1 was used, a deprecation warning was issued for the class attribute named ``charset`` within ``repoze.bfg.request.Request``. BFG now *requires* WebOb >= 0.9.7, and code was added so that this deprecation warning has disappeared. --- repoze/bfg/tests/test_request.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'repoze/bfg/tests/test_request.py') diff --git a/repoze/bfg/tests/test_request.py b/repoze/bfg/tests/test_request.py index 6dd05a1ec..851389d39 100644 --- a/repoze/bfg/tests/test_request.py +++ b/repoze/bfg/tests/test_request.py @@ -9,7 +9,7 @@ class TestMakeRequestASCII(unittest.TestCase): request = DummyRequest() event = DummyNewRequestEvent(request) self._callFUT(event) - self.assertEqual(request.charset, None) + self.assertEqual(request.default_charset, None) class TestRequest(unittest.TestCase): def _makeOne(self, environ): @@ -18,7 +18,10 @@ class TestRequest(unittest.TestCase): def _getTargetClass(self): from repoze.bfg.request import Request return Request - + + def test_charset_defaults_to_utf8(self): + r = self._makeOne({'PATH_INFO':'/'}) + self.assertEqual(r.charset, 'utf-8') def test_params_decoded_from_utf_8_by_default(self): environ = { @@ -28,13 +31,13 @@ class TestRequest(unittest.TestCase): request = self._makeOne(environ) self.assertEqual(request.GET['la'], u'La Pe\xf1a') - def test_params_bystring_when_charset_None(self): + def test_params_bystring_when_default_charset_is_None(self): environ = { 'PATH_INFO':'/', 'QUERY_STRING':'la=La%20Pe%C3%B1a' } request = self._makeOne(environ) - request.charset = None + request.default_charset = None self.assertEqual(request.GET['la'], 'La Pe\xc3\xb1a') def test_class_implements(self): -- cgit v1.2.3