From b4f0e0288332ca8f8160ae76642df17efc36defb Mon Sep 17 00:00:00 2001 From: davisagli Date: Thu, 28 Nov 2024 11:39:26 -0300 Subject: [PATCH] [fc] Repository: plone.theme Branch: refs/heads/master Date: 2024-11-27T15:56:37-03:00 Author: Peter Mathis (petschki) Commit: https://github.com/plone/plone.theme/commit/40138abc80a63585ad19240bdc114d5321100314 Fix removed `unittest.makeSuite` in python 3.13 Files changed: M plone/theme/tests/testBrowserLayerPrecedence.py Repository: plone.theme Branch: refs/heads/master Date: 2024-11-27T15:57:40-03:00 Author: Peter Mathis (petschki) Commit: https://github.com/plone/plone.theme/commit/ca9d80fc047b7fc05f9ce83551f258838bc9bcf1 changenote Files changed: A news/27.bugfix Repository: plone.theme Branch: refs/heads/master Date: 2024-11-28T10:29:39-03:00 Author: David Glick (davisagli) Commit: https://github.com/plone/plone.theme/commit/6c98c57e29b708e60aeaf462ba487eb1875040c1 black Files changed: M plone/theme/tests/testBrowserLayerPrecedence.py Repository: plone.theme Branch: refs/heads/master Date: 2024-11-28T11:39:26-03:00 Author: David Glick (davisagli) Commit: https://github.com/plone/plone.theme/commit/81406c9c9f3e759a28f38e4ef5a16bc19d3903cc Merge pull request #27 from plone/py-3.13-unittest Fix removed `unittest.makeSuite` in python 3.13 Files changed: A news/27.bugfix M plone/theme/tests/testBrowserLayerPrecedence.py --- last_commit.txt | 61 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 53 insertions(+), 8 deletions(-) diff --git a/last_commit.txt b/last_commit.txt index 46ae86a2c4..07922bb80d 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,18 +1,63 @@ -Repository: plone.keyring +Repository: plone.theme Branch: refs/heads/master -Date: 2024-11-27T15:38:28-03:00 +Date: 2024-11-27T15:56:37-03:00 Author: Peter Mathis (petschki) -Commit: https://github.com/plone/plone.keyring/commit/34726b9c667bb5395bb63a8ec40311cb22bb19a9 +Commit: https://github.com/plone/plone.theme/commit/40138abc80a63585ad19240bdc114d5321100314 -Revert "fix removed `unittest.makeSuite` in python 3.13" +Fix removed `unittest.makeSuite` in python 3.13 -This reverts commit c10e755bd20d7bdb7d9308e74b8989bdb6f3760f. +Files changed: +M plone/theme/tests/testBrowserLayerPrecedence.py + +b'diff --git a/plone/theme/tests/testBrowserLayerPrecedence.py b/plone/theme/tests/testBrowserLayerPrecedence.py\nindex 2c50a56..105d74d 100644\n--- a/plone/theme/tests/testBrowserLayerPrecedence.py\n+++ b/plone/theme/tests/testBrowserLayerPrecedence.py\n@@ -101,11 +101,10 @@ class TestPrecedenceWithNoThemeLayer(LayerPrecedenceTestCase):\n \n \n def test_suite():\n- from unittest import makeSuite\n- from unittest import TestSuite\n-\n- suite = TestSuite()\n- suite.addTest(makeSuite(TestPrecedenceWithAdditiveLayerExtendingInterface))\n- suite.addTest(makeSuite(TestPrecedenceWithAdditiveLayerExtendingDefault))\n- suite.addTest(makeSuite(TestPrecedenceWithNoThemeLayer))\n- return suite\n+ import unittest\n+\n+ return unittest.TestSuite((\n+ unittest.defaultTestLoader.loadTestsFromTestCase(TestPrecedenceWithAdditiveLayerExtendingInterface),\n+ unittest.defaultTestLoader.loadTestsFromTestCase(TestPrecedenceWithAdditiveLayerExtendingDefault),\n+ unittest.defaultTestLoader.loadTestsFromTestCase(TestPrecedenceWithNoThemeLayer),\n+ ))\n' + +Repository: plone.theme + + +Branch: refs/heads/master +Date: 2024-11-27T15:57:40-03:00 +Author: Peter Mathis (petschki) +Commit: https://github.com/plone/plone.theme/commit/ca9d80fc047b7fc05f9ce83551f258838bc9bcf1 + +changenote + +Files changed: +A news/27.bugfix + +b'diff --git a/news/27.bugfix b/news/27.bugfix\nnew file mode 100644\nindex 0000000..41e6fd2\n--- /dev/null\n+++ b/news/27.bugfix\n@@ -0,0 +1,2 @@\n+Fix removed `unittest.makeSuite` in python 3.13.\n+[petschki]\n' + +Repository: plone.theme + + +Branch: refs/heads/master +Date: 2024-11-28T10:29:39-03:00 +Author: David Glick (davisagli) +Commit: https://github.com/plone/plone.theme/commit/6c98c57e29b708e60aeaf462ba487eb1875040c1 + +black + +Files changed: +M plone/theme/tests/testBrowserLayerPrecedence.py + +b'diff --git a/plone/theme/tests/testBrowserLayerPrecedence.py b/plone/theme/tests/testBrowserLayerPrecedence.py\nindex 105d74d..90e0da1 100644\n--- a/plone/theme/tests/testBrowserLayerPrecedence.py\n+++ b/plone/theme/tests/testBrowserLayerPrecedence.py\n@@ -103,8 +103,16 @@ class TestPrecedenceWithNoThemeLayer(LayerPrecedenceTestCase):\n def test_suite():\n import unittest\n \n- return unittest.TestSuite((\n- unittest.defaultTestLoader.loadTestsFromTestCase(TestPrecedenceWithAdditiveLayerExtendingInterface),\n- unittest.defaultTestLoader.loadTestsFromTestCase(TestPrecedenceWithAdditiveLayerExtendingDefault),\n- unittest.defaultTestLoader.loadTestsFromTestCase(TestPrecedenceWithNoThemeLayer),\n- ))\n+ return unittest.TestSuite(\n+ (\n+ unittest.defaultTestLoader.loadTestsFromTestCase(\n+ TestPrecedenceWithAdditiveLayerExtendingInterface\n+ ),\n+ unittest.defaultTestLoader.loadTestsFromTestCase(\n+ TestPrecedenceWithAdditiveLayerExtendingDefault\n+ ),\n+ unittest.defaultTestLoader.loadTestsFromTestCase(\n+ TestPrecedenceWithNoThemeLayer\n+ ),\n+ )\n+ )\n' + +Repository: plone.theme + + +Branch: refs/heads/master +Date: 2024-11-28T11:39:26-03:00 +Author: David Glick (davisagli) +Commit: https://github.com/plone/plone.theme/commit/81406c9c9f3e759a28f38e4ef5a16bc19d3903cc + +Merge pull request #27 from plone/py-3.13-unittest + +Fix removed `unittest.makeSuite` in python 3.13 Files changed: -M plone/keyring/tests/testKeymanager.py -M plone/keyring/tests/testKeyring.py +A news/27.bugfix +M plone/theme/tests/testBrowserLayerPrecedence.py -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' +b'diff --git a/news/27.bugfix b/news/27.bugfix\nnew file mode 100644\nindex 0000000..41e6fd2\n--- /dev/null\n+++ b/news/27.bugfix\n@@ -0,0 +1,2 @@\n+Fix removed `unittest.makeSuite` in python 3.13.\n+[petschki]\ndiff --git a/plone/theme/tests/testBrowserLayerPrecedence.py b/plone/theme/tests/testBrowserLayerPrecedence.py\nindex 2c50a56..90e0da1 100644\n--- a/plone/theme/tests/testBrowserLayerPrecedence.py\n+++ b/plone/theme/tests/testBrowserLayerPrecedence.py\n@@ -101,11 +101,18 @@ class TestPrecedenceWithNoThemeLayer(LayerPrecedenceTestCase):\n \n \n def test_suite():\n- from unittest import makeSuite\n- from unittest import TestSuite\n-\n- suite = TestSuite()\n- suite.addTest(makeSuite(TestPrecedenceWithAdditiveLayerExtendingInterface))\n- suite.addTest(makeSuite(TestPrecedenceWithAdditiveLayerExtendingDefault))\n- suite.addTest(makeSuite(TestPrecedenceWithNoThemeLayer))\n- return suite\n+ import unittest\n+\n+ return unittest.TestSuite(\n+ (\n+ unittest.defaultTestLoader.loadTestsFromTestCase(\n+ TestPrecedenceWithAdditiveLayerExtendingInterface\n+ ),\n+ unittest.defaultTestLoader.loadTestsFromTestCase(\n+ TestPrecedenceWithAdditiveLayerExtendingDefault\n+ ),\n+ unittest.defaultTestLoader.loadTestsFromTestCase(\n+ TestPrecedenceWithNoThemeLayer\n+ ),\n+ )\n+ )\n'