Merge pull request #3421 from mmerickel/drop-py2

remove py2 from the codebase

1 files changed, 10 insertions, 6 deletions

diff --git a/tests/test_config/test_testing.py b/tests/test_config/test_testing.py
index ede31e1b6..0fb73d268 100644
--- a/tests/test_config/test_testing.py
+++ b/tests/test_config/test_testing.py
@@ -1,8 +1,8 @@
 import unittest
 from zope.interface import implementer
 
-from pyramid.compat import text_
 from pyramid.security import AuthenticationAPIMixin, AuthorizationAPIMixin
+from pyramid.util import text_
 from . import IDummy
 
 
@@ -69,23 +69,27 @@ class TestingConfiguratorMixinTests(unittest.TestCase):
         config = self._makeOne(autocommit=True)
         config.testing_resources(resources)
         adapter = config.registry.getAdapter(None, ITraverser)
-        result = adapter(DummyRequest({'PATH_INFO': '/ob1'}))
+        request = DummyRequest()
+        request.path_info = '/ob1'
+        result = adapter(request)
         self.assertEqual(result['context'], ob1)
         self.assertEqual(result['view_name'], '')
         self.assertEqual(result['subpath'], ())
         self.assertEqual(result['traversed'], (text_('ob1'),))
         self.assertEqual(result['virtual_root'], ob1)
         self.assertEqual(result['virtual_root_path'], ())
-        result = adapter(DummyRequest({'PATH_INFO': '/ob2'}))
+        request = DummyRequest()
+        request.path_info = '/ob2'
+        result = adapter(request)
         self.assertEqual(result['context'], ob2)
         self.assertEqual(result['view_name'], '')
         self.assertEqual(result['subpath'], ())
         self.assertEqual(result['traversed'], (text_('ob2'),))
         self.assertEqual(result['virtual_root'], ob2)
         self.assertEqual(result['virtual_root_path'], ())
-        self.assertRaises(
-            KeyError, adapter, DummyRequest({'PATH_INFO': '/ob3'})
-        )
+        request = DummyRequest()
+        request.path_info = '/ob3'
+        self.assertRaises(KeyError, adapter, request)
         try:
             config.begin()
             self.assertEqual(find_resource(None, '/ob1'), ob1)