enable zope.component tests on py3

Michael Merickel

2016-12-26 6c3f4f8d0598cb62e37aa278e9c2c3e4194f8831

enable zope.component tests on py3

 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 @@
    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 @@
        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 @@
    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 @@
            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

 setup.py

@@ -20,8 +20,6 @@

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 @@

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',