commit: b70ef3b35fcac7c64f266417dad5cc92e15caabf Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> AuthorDate: Fri Jul 15 12:17:47 2022 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Fri Jul 15 12:18:34 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b70ef3b3
dev-python/oslo-i18n: remove added by mistake files in FILESDIR Follows: a1a215050efe609fa9d41ad7ceff600a74614c10 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> .../oslo-i18n/files/oslo-i18n-5.1.0-fix-py3.11.patch | 11 ++++++----- .../oslo-i18n/files/oslo-i18n-5.1.0-fix-py3.11.patch.bck | 14 -------------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/dev-python/oslo-i18n/files/oslo-i18n-5.1.0-fix-py3.11.patch b/dev-python/oslo-i18n/files/oslo-i18n-5.1.0-fix-py3.11.patch index 488dac1dedc6..d684cf2ed294 100644 --- a/dev-python/oslo-i18n/files/oslo-i18n-5.1.0-fix-py3.11.patch +++ b/dev-python/oslo-i18n/files/oslo-i18n-5.1.0-fix-py3.11.patch @@ -1,11 +1,12 @@ -diff --git a/oslo_i18n/tests/test_message.py b/oslo_i18n/tests/test_message.py -index 85dbd67..16492bb 100644 +On python 3.11, we have some more warnings (deprecation warnings), +so the count is >=1 + --- a/oslo_i18n/tests/test_message.py +++ b/oslo_i18n/tests/test_message.py @@ -386,7 +386,7 @@ class MessageTestCase(test_base.BaseTestCase): - + self.assertEqual(default_translation, msg.translation('es')) - + - self.assertEqual(1, len(w)) + self.assertLessEqual(1, len(w)) # Note(gibi): in python 3.4 str.__repr__ does not put the unicode @@ -17,6 +18,6 @@ index 85dbd67..16492bb 100644 "not enough arguments for format string", - str(w[0].message).replace("u'", "'")) + str(w[-1].message).replace("u'", "'")) - + mock_log.debug.assert_called_with(('Failed to insert replacement ' 'values into translated message ' diff --git a/dev-python/oslo-i18n/files/oslo-i18n-5.1.0-fix-py3.11.patch.bck b/dev-python/oslo-i18n/files/oslo-i18n-5.1.0-fix-py3.11.patch.bck deleted file mode 100644 index 2faae7eb88af..000000000000 --- a/dev-python/oslo-i18n/files/oslo-i18n-5.1.0-fix-py3.11.patch.bck +++ /dev/null @@ -1,14 +0,0 @@ -On python 3.11, we have some more warnings (deprecation warnings), -so the count is >=1 - ---- a/oslo_i18n/tests/test_message.py -+++ b/oslo_i18n/tests/test_message.py -@@ -386,7 +386,7 @@ class MessageTestCase(test_base.BaseTestCase): - - self.assertEqual(default_translation, msg.translation('es')) - -- self.assertEqual(1, len(w)) -+ self.assertLessEqual(1, len(w)) - # Note(gibi): in python 3.4 str.__repr__ does not put the unicode - # marker 'u' in front of the string representations so the test - # removes that to have the same result in python 2.7 and 3.4