diff options
| author | Chris McDonough <chrism@plope.com> | 2015-04-12 16:48:05 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2015-04-12 16:48:05 -0400 |
| commit | d7734b0ca17e08fa12f8f8b9d6e44c9ef3aba99e (patch) | |
| tree | 4af2a36719da473dbeaa76f908e2df162011eeb4 | |
| parent | 200c9eb4cd69f7bdccb19cfa41d2c0ede79665e2 (diff) | |
| download | pyramid-d7734b0ca17e08fa12f8f8b9d6e44c9ef3aba99e.tar.gz pyramid-d7734b0ca17e08fa12f8f8b9d6e44c9ef3aba99e.tar.bz2 pyramid-d7734b0ca17e08fa12f8f8b9d6e44c9ef3aba99e.zip | |
omg how embarrassing, forgot to run tests before merging the request subclass fix branch
| -rw-r--r-- | pyramid/tests/test_request.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pyramid/tests/test_request.py b/pyramid/tests/test_request.py index 257e70435..eedef3af2 100644 --- a/pyramid/tests/test_request.py +++ b/pyramid/tests/test_request.py @@ -435,7 +435,6 @@ class Test_call_app_with_subpath_as_path_info(unittest.TestCase): self.assertEqual(request.environ['SCRIPT_NAME'], '/' + encoded) self.assertEqual(request.environ['PATH_INFO'], '/' + encoded) -<<<<<<< HEAD class Test_apply_request_extensions(unittest.TestCase): def setUp(self): self.config = testing.setUp() @@ -503,7 +502,8 @@ class Test_subclassing_Request(unittest.TestCase): def test_subclass_with_implementer(self): from pyramid.interfaces import IRequest from pyramid.request import Request - from zope.interface import providedBy, implementedBy, implementer + from pyramid.util import InstancePropertyHelper + from zope.interface import implementer @implementer(IRequest) class RequestSub(Request): @@ -517,7 +517,8 @@ class Test_subclassing_Request(unittest.TestCase): self.assertTrue(hasattr(RequestSub, '__implemented__')) req = RequestSub({}) - req._set_properties({'b': 'b'}) + helper = InstancePropertyHelper() + helper.apply_properties(req, {'b': 'b'}) self.assertTrue(IRequest.providedBy(req)) self.assertTrue(IRequest.implementedBy(RequestSub)) @@ -525,13 +526,14 @@ class Test_subclassing_Request(unittest.TestCase): def test_subclass_mutate_before_providedBy(self): from pyramid.interfaces import IRequest from pyramid.request import Request - from zope.interface import providedBy, implementedBy, implementer + from pyramid.util import InstancePropertyHelper class RequestSub(Request): pass req = RequestSub({}) - req._set_properties({'b': 'b'}) + helper = InstancePropertyHelper() + helper.apply_properties(req, {'b': 'b'}) self.assertTrue(IRequest.providedBy(req)) self.assertTrue(IRequest.implementedBy(RequestSub)) |