-
-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[fc] Repository: plone.portlet.static
Branch: refs/heads/master Date: 2024-11-27T15:44:07-03:00 Author: Peter Mathis (petschki) <[email protected]> Commit: plone/plone.portlet.static@de45a21 fix removed `unittest.makeSuite` in python 3.13 Files changed: M plone/portlet/static/tests/test_portlet_static.py Repository: plone.portlet.static Branch: refs/heads/master Date: 2024-11-27T15:45:02-03:00 Author: Peter Mathis (petschki) <[email protected]> Commit: plone/plone.portlet.static@ca35053 changenote Files changed: A news/45.bugfix Repository: plone.portlet.static Branch: refs/heads/master Date: 2024-11-28T11:33:23-03:00 Author: Peter Mathis (petschki) <[email protected]> Commit: plone/plone.portlet.static@6e10dac black Files changed: M plone/portlet/static/tests/test_portlet_static.py Repository: plone.portlet.static Branch: refs/heads/master Date: 2024-11-28T22:54:56-03:00 Author: Maurits van Rees (mauritsvanrees) <[email protected]> Commit: plone/plone.portlet.static@f09fe92 Merge pull request #45 from plone/py-3.13-unittest fix removed `unittest.makeSuite` in python 3.13 Files changed: A news/45.bugfix M plone/portlet/static/tests/test_portlet_static.py
- Loading branch information
1 parent
a6b7e38
commit 01f0efd
Showing
1 changed file
with
32 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,50 +1,63 @@ | ||
| Repository: plone.keyring | ||
| Repository: plone.portlet.static | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2024-11-27T15:40:56-03:00 | ||
| Date: 2024-11-27T15:44:07-03:00 | ||
| Author: Peter Mathis (petschki) <[email protected]> | ||
| Commit: https://github.com/plone/plone.keyring/commit/19021d0181a3d05fe2c9068ea5b4e884a13164a9 | ||
| Commit: https://github.com/plone/plone.portlet.static/commit/de45a2162a5904b089d332e144f20cc0a4645e4a | ||
|
|
||
| fix removed `unittest.makeSuite` in python 3.13 | ||
|
|
||
| Files changed: | ||
| M plone/keyring/tests/testKeymanager.py | ||
| M plone/keyring/tests/testKeyring.py | ||
| M plone/portlet/static/tests/test_portlet_static.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/portlet/static/tests/test_portlet_static.py b/plone/portlet/static/tests/test_portlet_static.py\nindex 86f4b9b..b910a75 100644\n--- a/plone/portlet/static/tests/test_portlet_static.py\n+++ b/plone/portlet/static/tests/test_portlet_static.py\n@@ -153,10 +153,9 @@ def test_relative_link(self):\n \n \n def test_suite():\n- from unittest import makeSuite\n- from unittest import TestSuite\n+ import unittest\n \n- suite = TestSuite()\n- suite.addTest(makeSuite(TestPortlet))\n- suite.addTest(makeSuite(TestRenderer))\n- return suite\n+ return unittest.TestSuite((\n+ unittest.defaultTestLoader.loadTestsFromTestCase(TestPortlet),\n+ unittest.defaultTestLoader.loadTestsFromTestCase(TestRenderer),\n+ ))\n' | ||
|
|
||
| Repository: plone.keyring | ||
| Repository: plone.portlet.static | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2024-11-27T15:41:47-03:00 | ||
| Date: 2024-11-27T15:45:02-03:00 | ||
| Author: Peter Mathis (petschki) <[email protected]> | ||
| Commit: https://github.com/plone/plone.keyring/commit/9051e7fdbb556866ee63cf0faf339a49b06e4b90 | ||
| Commit: https://github.com/plone/plone.portlet.static/commit/ca35053b2c755fd88bd7fbd07e0c0fa8ff0d3c3e | ||
|
|
||
| changenote | ||
|
|
||
| Files changed: | ||
| A news/33.bugfix | ||
| A news/45.bugfix | ||
|
|
||
| b'diff --git a/news/33.bugfix b/news/33.bugfix\nnew file mode 100644\nindex 0000000..41e6fd2\n--- /dev/null\n+++ b/news/33.bugfix\n@@ -0,0 +1,2 @@\n+Fix removed `unittest.makeSuite` in python 3.13.\n+[petschki]\n' | ||
| b'diff --git a/news/45.bugfix b/news/45.bugfix\nnew file mode 100644\nindex 0000000..41e6fd2\n--- /dev/null\n+++ b/news/45.bugfix\n@@ -0,0 +1,2 @@\n+Fix removed `unittest.makeSuite` in python 3.13.\n+[petschki]\n' | ||
|
|
||
| Repository: plone.keyring | ||
| Repository: plone.portlet.static | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2024-11-28T22:53:35-03:00 | ||
| Date: 2024-11-28T11:33:23-03:00 | ||
| Author: Peter Mathis (petschki) <[email protected]> | ||
| Commit: https://github.com/plone/plone.portlet.static/commit/6e10dac0f4e1c69922f9f8ede82cb20fe1bb579c | ||
|
|
||
| black | ||
|
|
||
| Files changed: | ||
| M plone/portlet/static/tests/test_portlet_static.py | ||
|
|
||
| b'diff --git a/plone/portlet/static/tests/test_portlet_static.py b/plone/portlet/static/tests/test_portlet_static.py\nindex b910a75..379e2c1 100644\n--- a/plone/portlet/static/tests/test_portlet_static.py\n+++ b/plone/portlet/static/tests/test_portlet_static.py\n@@ -155,7 +155,9 @@ def test_relative_link(self):\n def test_suite():\n import unittest\n \n- return unittest.TestSuite((\n- unittest.defaultTestLoader.loadTestsFromTestCase(TestPortlet),\n- unittest.defaultTestLoader.loadTestsFromTestCase(TestRenderer),\n- ))\n+ return unittest.TestSuite(\n+ (\n+ unittest.defaultTestLoader.loadTestsFromTestCase(TestPortlet),\n+ unittest.defaultTestLoader.loadTestsFromTestCase(TestRenderer),\n+ )\n+ )\n' | ||
|
|
||
| Repository: plone.portlet.static | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2024-11-28T22:54:56-03:00 | ||
| Author: Maurits van Rees (mauritsvanrees) <[email protected]> | ||
| Commit: https://github.com/plone/plone.keyring/commit/3ed20540f2eae72bbf09ef85d9ea5b414dd7c4c3 | ||
| Commit: https://github.com/plone/plone.portlet.static/commit/f09fe9210fdd95219fc2467cebf23976518dade0 | ||
|
|
||
| Merge pull request #33 from plone/py-3.13-unittest | ||
| Merge pull request #45 from plone/py-3.13-unittest | ||
|
|
||
| fix removed `unittest.makeSuite` in python 3.13 | ||
|
|
||
| Files changed: | ||
| A news/33.bugfix | ||
| M plone/keyring/tests/testKeymanager.py | ||
| M plone/keyring/tests/testKeyring.py | ||
| A news/45.bugfix | ||
| M plone/portlet/static/tests/test_portlet_static.py | ||
|
|
||
| b'diff --git a/news/33.bugfix b/news/33.bugfix\nnew file mode 100644\nindex 0000000..41e6fd2\n--- /dev/null\n+++ b/news/33.bugfix\n@@ -0,0 +1,2 @@\n+Fix removed `unittest.makeSuite` in python 3.13.\n+[petschki]\ndiff --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/news/45.bugfix b/news/45.bugfix\nnew file mode 100644\nindex 0000000..41e6fd2\n--- /dev/null\n+++ b/news/45.bugfix\n@@ -0,0 +1,2 @@\n+Fix removed `unittest.makeSuite` in python 3.13.\n+[petschki]\ndiff --git a/plone/portlet/static/tests/test_portlet_static.py b/plone/portlet/static/tests/test_portlet_static.py\nindex 86f4b9b..379e2c1 100644\n--- a/plone/portlet/static/tests/test_portlet_static.py\n+++ b/plone/portlet/static/tests/test_portlet_static.py\n@@ -153,10 +153,11 @@ def test_relative_link(self):\n \n \n def test_suite():\n- from unittest import makeSuite\n- from unittest import TestSuite\n+ import unittest\n \n- suite = TestSuite()\n- suite.addTest(makeSuite(TestPortlet))\n- suite.addTest(makeSuite(TestRenderer))\n- return suite\n+ return unittest.TestSuite(\n+ (\n+ unittest.defaultTestLoader.loadTestsFromTestCase(TestPortlet),\n+ unittest.defaultTestLoader.loadTestsFromTestCase(TestRenderer),\n+ )\n+ )\n' | ||
|
|