Merge pull request #3421 from mmerickel/drop-py2

remove py2 from the codebase

7 files changed, 30 insertions, 47 deletions

diff --git a/tests/test_config/test_adapters.py b/tests/test_config/test_adapters.py
index d871e8825..60a4f3090 100644
--- a/tests/test_config/test_adapters.py
+++ b/tests/test_config/test_adapters.py
@@ -1,6 +1,5 @@
 import unittest
 
-from pyramid.compat import PY2
 from . import IDummy
 
 
@@ -270,10 +269,7 @@ class AdaptersConfiguratorMixinTests(unittest.TestCase):
         from pyramid.interfaces import IResponse
 
         config = self._makeOne(autocommit=True)
-        if PY2:
-            str_name = '__builtin__.str'
-        else:
-            str_name = 'builtins.str'
+        str_name = 'builtins.str'
         config.add_response_adapter('pyramid.response.Response', str_name)
         result = config.registry.queryAdapter('foo', IResponse)
         self.assertTrue(result.body, b'foo')
diff --git a/tests/test_config/test_factories.py b/tests/test_config/test_factories.py
index c03d3f68b..bbc38b6cd 100644
--- a/tests/test_config/test_factories.py
+++ b/tests/test_config/test_factories.py
@@ -160,8 +160,7 @@ class TestFactoriesMixin(unittest.TestCase):
         config = self._makeOne(autocommit=True)
         self.assertRaises(AttributeError, config.add_request_method)
 
-    def test_add_request_method_with_text_type_name(self):
-        from pyramid.compat import text_, PY2
+    def test_add_request_method_with_text_name(self):
         from pyramid.exceptions import ConfigurationError
 
         config = self._makeOne(autocommit=True)
@@ -170,11 +169,7 @@ class TestFactoriesMixin(unittest.TestCase):
             pass
 
         def get_bad_name():
-            if PY2:
-                name = text_(b'La Pe\xc3\xb1a', 'utf-8')
-            else:
-                name = b'La Pe\xc3\xb1a'
-
+            name = b'La Pe\xc3\xb1a'
             config.add_request_method(boomshaka, name=name)
 
         self.assertRaises(ConfigurationError, get_bad_name)
diff --git a/tests/test_config/test_init.py b/tests/test_config/test_init.py
index 811672fb3..ce2b042ec 100644
--- a/tests/test_config/test_init.py
+++ b/tests/test_config/test_init.py
@@ -1,9 +1,6 @@
 import os
 import unittest
 
-from pyramid.compat import im_func
-from pyramid.testing import skip_on
-
 from . import dummy_tween_factory
 from . import dummy_include
 from . import dummy_extend
@@ -1157,7 +1154,6 @@ test_config.dummy_include2"""
                 "@view_config(name='two', renderer='string')" in which
             )
 
-    @skip_on('py3')
     def test_hook_zca(self):
         from zope.component import getSiteManager
 
@@ -1173,7 +1169,6 @@ test_config.dummy_include2"""
         finally:
             getSiteManager.reset()
 
-    @skip_on('py3')
     def test_unhook_zca(self):
         from zope.component import getSiteManager
 
@@ -1208,7 +1203,7 @@ test_config.dummy_include2"""
         directives = {'foo': (foo, True)}
         config.registry._directives = directives
         foo_meth = config.foo
-        self.assertTrue(getattr(foo_meth, im_func).__docobj__ is foo)
+        self.assertTrue(getattr(foo_meth, '__func__').__docobj__ is foo)
 
     def test___getattr__matches_no_action_wrap(self):
         config = self._makeOne()
@@ -1219,7 +1214,7 @@ test_config.dummy_include2"""
         directives = {'foo': (foo, False)}
         config.registry._directives = directives
         foo_meth = config.foo
-        self.assertTrue(getattr(foo_meth, im_func) is foo)
+        self.assertTrue(getattr(foo_meth, '__func__') is foo)
 
 
 class TestConfigurator_add_directive(unittest.TestCase):
diff --git a/tests/test_config/test_predicates.py b/tests/test_config/test_predicates.py
index 079652b39..c27b41639 100644
--- a/tests/test_config/test_predicates.py
+++ b/tests/test_config/test_predicates.py
@@ -1,6 +1,6 @@
 import unittest
 
-from pyramid.compat import text_
+from pyramid.util import text_
 
 
 class TestPredicateList(unittest.TestCase):
diff --git a/tests/test_config/test_routes.py b/tests/test_config/test_routes.py
index e6540c343..4ff67cf66 100644
--- a/tests/test_config/test_routes.py
+++ b/tests/test_config/test_routes.py
@@ -2,7 +2,7 @@ import unittest
 
 from . import dummyfactory
 from . import DummyContext
-from pyramid.compat import text_
+from pyramid.util import text_
 
 
 class RoutesConfiguratorMixinTests(unittest.TestCase):
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)
diff --git a/tests/test_config/test_views.py b/tests/test_config/test_views.py
index b72b9b36a..685b81a0f 100644
--- a/tests/test_config/test_views.py
+++ b/tests/test_config/test_views.py
@@ -3,11 +3,11 @@ import unittest
 from zope.interface import implementer
 
 from pyramid import testing
-from pyramid.compat import im_func, text_
 from pyramid.exceptions import ConfigurationError
 from pyramid.exceptions import ConfigurationExecutionError
 from pyramid.exceptions import ConfigurationConflictError
 from pyramid.interfaces import IResponse, IRequest, IMultiView
+from pyramid.util import text_
 
 from . import IDummy
 from . import dummy_view
@@ -1357,6 +1357,7 @@ class TestViewsConfigurationMixin(unittest.TestCase):
             request_method='POST',
         )
         request = self._makeRequest(config)
+        request.path_info = '/'
         request.method = 'POST'
         request.params = {}
         router = Router(config.registry)
@@ -1412,6 +1413,7 @@ class TestViewsConfigurationMixin(unittest.TestCase):
             request_method='POST',
         )
         request = self._makeRequest(config)
+        request.path_info = '/'
         request.method = 'POST'
         request.params = {}
         router = Router(config.registry)
@@ -2722,7 +2724,7 @@ class TestViewsConfigurationMixin(unittest.TestCase):
             view, renderer=null_renderer, append_slash=True
         )
         request = self._makeRequest(config)
-        request.environ['PATH_INFO'] = '/foo'
+        request.path_info = '/foo'
         request.query_string = 'a=1&b=2'
         request.path = '/scriptname/foo'
         view = self._getViewCallable(
@@ -2751,7 +2753,7 @@ class TestViewsConfigurationMixin(unittest.TestCase):
             view, renderer=null_renderer, append_slash=HTTPMovedPermanently
         )
         request = self._makeRequest(config)
-        request.environ['PATH_INFO'] = '/foo'
+        request.path_info = '/foo'
         request.query_string = 'a=1&b=2'
         request.path = '/scriptname/foo'
         view = self._getViewCallable(
@@ -2795,15 +2797,6 @@ class TestViewsConfigurationMixin(unittest.TestCase):
         request = self._makeRequest(config)
         self.assertRaises(PredicateMismatch, wrapper, context, request)
 
-    # Since Python 3 has to be all cool and fancy and different...
-    def _assertBody(self, response, value):
-        from pyramid.compat import text_type
-
-        if isinstance(value, text_type):  # pragma: no cover
-            self.assertEqual(response.text, value)
-        else:  # pragma: no cover
-            self.assertEqual(response.body, value)
-
     def test_add_notfound_view_with_renderer(self):
         from zope.interface import implementedBy
         from pyramid.interfaces import IRequest
@@ -2820,7 +2813,7 @@ class TestViewsConfigurationMixin(unittest.TestCase):
             request_iface=IRequest,
         )
         result = view(None, request)
-        self._assertBody(result, '{}')
+        self.assertEqual(result.text, '{}')
 
     def test_add_forbidden_view_with_renderer(self):
         from zope.interface import implementedBy
@@ -2838,7 +2831,7 @@ class TestViewsConfigurationMixin(unittest.TestCase):
             request_iface=IRequest,
         )
         result = view(None, request)
-        self._assertBody(result, '{}')
+        self.assertEqual(result.text, '{}')
 
     def test_set_view_mapper(self):
         from pyramid.interfaces import IViewMapperFactory
@@ -3732,16 +3725,16 @@ class Test_preserve_view_attrs(unittest.TestCase):
         self.assertTrue(view1.__module__ is view2.__module__)
         self.assertTrue(view1.__name__ is view2.__name__)
         self.assertTrue(
-            getattr(view1.__call_permissive__, im_func)
-            is getattr(view2.__call_permissive__, im_func)
+            getattr(view1.__call_permissive__, '__func__')
+            is getattr(view2.__call_permissive__, '__func__')
         )
         self.assertTrue(
-            getattr(view1.__permitted__, im_func)
-            is getattr(view2.__permitted__, im_func)
+            getattr(view1.__permitted__, '__func__')
+            is getattr(view2.__permitted__, '__func__')
         )
         self.assertTrue(
-            getattr(view1.__predicated__, im_func)
-            is getattr(view2.__predicated__, im_func)
+            getattr(view1.__predicated__, '__func__')
+            is getattr(view2.__predicated__, '__func__')
         )