From 4e058ea94ac23a5cc1987fdf7bf49a657464416c Mon Sep 17 00:00:00 2001 From: Steffen Allner Date: Wed, 13 Apr 2022 11:37:40 +0200 Subject: re #83: Remove `unittest.makeSuite` as it is deprecated in Python 3.11+. --- CHANGES.rst | 4 ++++ src/zope/security/tests/test_protectclass.py | 6 +++--- src/zope/security/tests/test_simpleinteraction.py | 2 +- src/zope/security/tests/test_zcml.py | 8 ++++---- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 5a7e37a..884b2b5 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -10,6 +10,10 @@ ``ForbiddenAttribute`` on Python 3. See `issue 75 `_. +- Remove usage of ``unittest.makeSuite`` as it is deprecated in Python 3.11+. + See `issue 83 + `_. + 5.2 (2022-03-10) ================ diff --git a/src/zope/security/tests/test_protectclass.py b/src/zope/security/tests/test_protectclass.py index 2f8e490..16999e5 100644 --- a/src/zope/security/tests/test_protectclass.py +++ b/src/zope/security/tests/test_protectclass.py @@ -141,7 +141,7 @@ class Bar(Foo): def test_suite(): return unittest.TestSuite(( - unittest.makeSuite(Test_protectName), - unittest.makeSuite(Test_protectSetAttribute), - unittest.makeSuite(Test_protectLikeUnto), + unittest.defaultTestLoader.loadTestsFromTestCase(Test_protectName), + unittest.defaultTestLoader.loadTestsFromTestCase(Test_protectSetAttribute), + unittest.defaultTestLoader.loadTestsFromTestCase(Test_protectLikeUnto), )) diff --git a/src/zope/security/tests/test_simpleinteraction.py b/src/zope/security/tests/test_simpleinteraction.py index d5031e4..3135027 100644 --- a/src/zope/security/tests/test_simpleinteraction.py +++ b/src/zope/security/tests/test_simpleinteraction.py @@ -76,5 +76,5 @@ class TestInteraction(unittest.TestCase): def test_suite(): return unittest.TestSuite(( - unittest.makeSuite(TestInteraction), + unittest.defaultTestLoader.loadTestsFromTestCase(TestInteraction), )) diff --git a/src/zope/security/tests/test_zcml.py b/src/zope/security/tests/test_zcml.py index 2cdf62a..0cf9616 100644 --- a/src/zope/security/tests/test_zcml.py +++ b/src/zope/security/tests/test_zcml.py @@ -193,8 +193,8 @@ class DummyZCMLContext(object): def test_suite(): return unittest.TestSuite(( - unittest.makeSuite(PermissionTests), - unittest.makeSuite(Test_securityPolicy), - unittest.makeSuite(Test_permission), - unittest.makeSuite(Test_redefinePermission), + unittest.defaultTestLoader.loadTestsFromTestCase(PermissionTests), + unittest.defaultTestLoader.loadTestsFromTestCase(Test_securityPolicy), + unittest.defaultTestLoader.loadTestsFromTestCase(Test_permission), + unittest.defaultTestLoader.loadTestsFromTestCase(Test_redefinePermission), )) -- cgit v1.2.1