From 6c3f4f8d0598cb62e37aa278e9c2c3e4194f8831 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Sun, 25 Dec 2016 19:51:55 -0600
Subject: enable zope.component tests on py3

---
 pyramid/tests/test_testing.py | 51 ++++++++++---------------------------------
 setup.py                      |  5 +----
 2 files changed, 13 insertions(+), 43 deletions(-)

diff --git a/pyramid/tests/test_testing.py b/pyramid/tests/test_testing.py
index 113f7e5f4..0b4619de4 100644
--- a/pyramid/tests/test_testing.py
+++ b/pyramid/tests/test_testing.py
@@ -1,4 +1,5 @@
 import unittest
+from zope.component import getSiteManager
 
 class TestDummyRootFactory(unittest.TestCase):
     def _makeOne(self, environ):
@@ -320,22 +321,11 @@ class Test_setUp(unittest.TestCase):
     def tearDown(self):
         from pyramid.threadlocal import manager
         manager.clear()
-        getSiteManager = self._getSM()
-        if getSiteManager is not None:
-            getSiteManager.reset()
-
-    def _getSM(self):
-        try:
-            from zope.component import getSiteManager
-        except ImportError: # pragma: no cover
-            getSiteManager = None
-        return getSiteManager
+        getSiteManager.reset()
 
     def _assertSMHook(self, hook):
-        getSiteManager = self._getSM()
-        if getSiteManager is not None:
-            result = getSiteManager.sethook(None)
-            self.assertEqual(result, hook)
+        result = getSiteManager.sethook(None)
+        self.assertEqual(result, hook)
 
     def test_it_defaults(self):
         from pyramid.threadlocal import manager
@@ -375,10 +365,8 @@ class Test_setUp(unittest.TestCase):
         from pyramid.registry import Registry
         registry = Registry()
         self._callFUT(registry=registry, hook_zca=False)
-        getSiteManager = self._getSM()
-        if getSiteManager is not None:
-            sm = getSiteManager()
-            self.assertFalse(sm is registry)
+        sm = getSiteManager()
+        self.assertFalse(sm is registry)
 
     def test_it_with_settings_passed_explicit_registry(self):
         from pyramid.registry import Registry
@@ -403,27 +391,14 @@ class Test_tearDown(unittest.TestCase):
     def tearDown(self):
         from pyramid.threadlocal import manager
         manager.clear()
-        getSiteManager = self._getSM()
-        if getSiteManager is not None:
-            getSiteManager.reset()
-
-    def _getSM(self):
-        try:
-            from zope.component import getSiteManager
-        except ImportError: # pragma: no cover
-            getSiteManager = None
-        return getSiteManager
+        getSiteManager.reset()
 
     def _assertSMHook(self, hook):
-        getSiteManager = self._getSM()
-        if getSiteManager is not None:
-            result = getSiteManager.sethook(None)
-            self.assertEqual(result, hook)
+        result = getSiteManager.sethook(None)
+        self.assertEqual(result, hook)
 
     def _setSMHook(self, hook):
-        getSiteManager = self._getSM()
-        if getSiteManager is not None:
-            getSiteManager.sethook(hook)
+        getSiteManager.sethook(hook)
 
     def test_defaults(self):
         from pyramid.threadlocal import manager
@@ -438,10 +413,8 @@ class Test_tearDown(unittest.TestCase):
             self.assertNotEqual(current, old)
             self.assertEqual(registry.inited, 2)
         finally:
-            getSiteManager = self._getSM()
-            if getSiteManager is not None:
-                result = getSiteManager.sethook(None)
-                self.assertNotEqual(result, hook)
+            result = getSiteManager.sethook(None)
+            self.assertNotEqual(result, hook)
 
     def test_registry_cannot_be_inited(self):
         from pyramid.threadlocal import manager
diff --git a/setup.py b/setup.py
index 63e82e707..687ed5700 100644
--- a/setup.py
+++ b/setup.py
@@ -20,8 +20,6 @@ from setuptools import setup, find_packages
 
 py_version = sys.version_info[:2]
 
-PY2 = py_version[0] == 2
-
 if (3, 0) <= py_version < (3, 4):
     warnings.warn(
         'On Python 3, Pyramid only supports Python 3.4 or better',
@@ -53,10 +51,9 @@ install_requires = [
 
 tests_require = [
     'WebTest >= 1.3.1', # py3 compat
+    'zope.component >= 4.0', # py3 compat
     ]
 
-if PY2:
-    tests_require.append('zope.component>=3.11.0')
 
 docs_extras = [
     'Sphinx >= 1.3.5',
-- 
cgit v1.2.3