From 21513a14fddd3f8e02d5883e92daab7a0da4dc42 Mon Sep 17 00:00:00 2001 From: petschki Date: Wed, 27 Nov 2024 15:38:28 -0300 Subject: [PATCH] [fc] Repository: plone.keyring Branch: refs/heads/master Date: 2024-11-27T15:38:28-03:00 Author: Peter Mathis (petschki) Commit: https://github.com/plone/plone.keyring/commit/34726b9c667bb5395bb63a8ec40311cb22bb19a9 Revert "fix removed `unittest.makeSuite` in python 3.13" This reverts commit c10e755bd20d7bdb7d9308e74b8989bdb6f3760f. Files changed: M plone/keyring/tests/testKeymanager.py M plone/keyring/tests/testKeyring.py --- last_commit.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/last_commit.txt b/last_commit.txt index 10fe2cfc0e..46ae86a2c4 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -2,15 +2,17 @@ Repository: plone.keyring Branch: refs/heads/master -Date: 2024-11-27T15:38:05-03:00 +Date: 2024-11-27T15:38:28-03:00 Author: Peter Mathis (petschki) -Commit: https://github.com/plone/plone.keyring/commit/c10e755bd20d7bdb7d9308e74b8989bdb6f3760f +Commit: https://github.com/plone/plone.keyring/commit/34726b9c667bb5395bb63a8ec40311cb22bb19a9 -fix removed `unittest.makeSuite` in python 3.13 +Revert "fix removed `unittest.makeSuite` in python 3.13" + +This reverts commit c10e755bd20d7bdb7d9308e74b8989bdb6f3760f. Files changed: M plone/keyring/tests/testKeymanager.py M plone/keyring/tests/testKeyring.py -b'diff --git a/plone/keyring/tests/testKeymanager.py b/plone/keyring/tests/testKeymanager.py\nindex 86e9fbe..4ae58f1 100644\n--- a/plone/keyring/tests/testKeymanager.py\n+++ b/plone/keyring/tests/testKeymanager.py\n@@ -2,7 +2,7 @@\n from plone.keyring.interfaces import IKeyManager\n from plone.keyring.keymanager import KeyManager\n from plone.keyring.keyring import Keyring\n-from unittest import makeSuite\n+from unittest import defaultTestLoader\n from unittest import TestCase\n from unittest import TestSuite\n from zope.interface.verify import verifyClass\n@@ -110,5 +110,5 @@ def testSecretUnknownRing(self):\n \n def test_suite():\n suite = TestSuite()\n- suite.addTest(makeSuite(KeyManagerTests))\n+ suite.addTest(defaultTestLoader.loadTestsFromTestCase(KeyManagerTests))\n return suite\ndiff --git a/plone/keyring/tests/testKeyring.py b/plone/keyring/tests/testKeyring.py\nindex 34f0876..b4f61ad 100644\n--- a/plone/keyring/tests/testKeyring.py\n+++ b/plone/keyring/tests/testKeyring.py\n@@ -1,6 +1,6 @@\n from plone.keyring.interfaces import IKeyring\n from plone.keyring.keyring import Keyring\n-from unittest import makeSuite\n+from unittest import defaultTestLoader\n from unittest import TestCase\n from unittest import TestSuite\n from zope.interface.verify import verifyClass\n@@ -60,5 +60,5 @@ def testCurrent(self):\n \n def test_suite():\n suite = TestSuite()\n- suite.addTest(makeSuite(KeyringTests))\n+ suite.addTest(defaultTestLoader.loadTestsFromTestCase(KeyringTests))\n return suite\n' +b'diff --git a/plone/keyring/tests/testKeymanager.py b/plone/keyring/tests/testKeymanager.py\nindex 4ae58f1..86e9fbe 100644\n--- a/plone/keyring/tests/testKeymanager.py\n+++ b/plone/keyring/tests/testKeymanager.py\n@@ -2,7 +2,7 @@\n from plone.keyring.interfaces import IKeyManager\n from plone.keyring.keymanager import KeyManager\n from plone.keyring.keyring import Keyring\n-from unittest import defaultTestLoader\n+from unittest import makeSuite\n from unittest import TestCase\n from unittest import TestSuite\n from zope.interface.verify import verifyClass\n@@ -110,5 +110,5 @@ def testSecretUnknownRing(self):\n \n def test_suite():\n suite = TestSuite()\n- suite.addTest(defaultTestLoader.loadTestsFromTestCase(KeyManagerTests))\n+ suite.addTest(makeSuite(KeyManagerTests))\n return suite\ndiff --git a/plone/keyring/tests/testKeyring.py b/plone/keyring/tests/testKeyring.py\nindex b4f61ad..34f0876 100644\n--- a/plone/keyring/tests/testKeyring.py\n+++ b/plone/keyring/tests/testKeyring.py\n@@ -1,6 +1,6 @@\n from plone.keyring.interfaces import IKeyring\n from plone.keyring.keyring import Keyring\n-from unittest import defaultTestLoader\n+from unittest import makeSuite\n from unittest import TestCase\n from unittest import TestSuite\n from zope.interface.verify import verifyClass\n@@ -60,5 +60,5 @@ def testCurrent(self):\n \n def test_suite():\n suite = TestSuite()\n- suite.addTest(defaultTestLoader.loadTestsFromTestCase(KeyringTests))\n+ suite.addTest(makeSuite(KeyringTests))\n return suite\n'