diff options
| -rw-r--r-- | pyramid/__init__.py | 6 | ||||
| -rw-r--r-- | pyramid/request.py | 2 | ||||
| -rw-r--r-- | pyramid/tests/test_request.py | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/pyramid/__init__.py b/pyramid/__init__.py index 473d5e1c6..5bb534f79 100644 --- a/pyramid/__init__.py +++ b/pyramid/__init__.py @@ -1,5 +1 @@ -from pyramid.request import Request -from pyramid.response import Response -Response.RequestClass = Request -Request.ResponseClass = Response -del Request, Response +# package diff --git a/pyramid/request.py b/pyramid/request.py index af3310829..9e275c2c0 100644 --- a/pyramid/request.py +++ b/pyramid/request.py @@ -328,6 +328,8 @@ class Request(BaseRequest, DeprecatedRequestMethodsMixin, URLMethodsMixin, matchdict = None matched_route = None + ResponseClass = Response + @reify def tmpl_context(self): # docs-deprecated template context for Pylons-like apps; do not diff --git a/pyramid/tests/test_request.py b/pyramid/tests/test_request.py index 86cfd8b09..945e36a7f 100644 --- a/pyramid/tests/test_request.py +++ b/pyramid/tests/test_request.py @@ -42,13 +42,17 @@ class TestRequest(unittest.TestCase): from zope.interface.verify import verifyClass from pyramid.interfaces import IRequest verifyClass(IRequest, self._getTargetClass()) - klass = self._getTargetClass() def test_instance_conforms_to_IRequest(self): from zope.interface.verify import verifyObject from pyramid.interfaces import IRequest verifyObject(IRequest, self._makeOne()) + def test_ResponseClass_is_pyramid_Response(self): + from pyramid.response import Response + cls = self._getTargetClass() + self.assertEqual(cls.ResponseClass, Response) + def test_charset_defaults_to_utf8(self): r = self._makeOne({'PATH_INFO':'/'}) self.assertEqual(r.charset, 'UTF-8') |