diff options
Diffstat (limited to 'dev-python/twisted/files')
| -rw-r--r-- | dev-python/twisted/files/twisted-22.1.0-force-gtk3.patch | 67 | ||||
| -rw-r--r-- | dev-python/twisted/files/twisted-22.4.0-py311.patch | 55 |
2 files changed, 0 insertions, 122 deletions
diff --git a/dev-python/twisted/files/twisted-22.1.0-force-gtk3.patch b/dev-python/twisted/files/twisted-22.1.0-force-gtk3.patch deleted file mode 100644 index 7c9f2d558d65..000000000000 --- a/dev-python/twisted/files/twisted-22.1.0-force-gtk3.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 9344f8cd80ecb2907dbfddfeeb8cc9ffdb50bc94 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Sat, 22 May 2021 01:11:48 +0200 -Subject: [PATCH] Force using GTK+3 in twisted.internet.gireactor - -Modify twisted.internet.gireactor to explicitly request GTK+ version 3. -Otherwise it uses the newest version installed which could be GTK+4 -that gireactor is currently incompatible with. ---- - src/twisted/internet/gireactor.py | 3 +++ - src/twisted/internet/test/test_gireactor.py | 3 +++ - src/twisted/newsfragments/10200.bugfix | 1 + - 3 files changed, 7 insertions(+) - create mode 100644 src/twisted/newsfragments/10200.bugfix - -diff --git a/src/twisted/internet/gireactor.py b/src/twisted/internet/gireactor.py -index e2d24b599..838fa982e 100644 ---- a/src/twisted/internet/gireactor.py -+++ b/src/twisted/internet/gireactor.py -@@ -21,6 +21,7 @@ On Python 3, pygobject v3.4 or later is required. - """ - - -+import gi # type: ignore[import] - import gi.pygtkcompat # type: ignore[import] - from gi.repository import GLib # type: ignore[import] - -@@ -69,6 +70,7 @@ class GIReactor(_glibbase.GlibReactorBase): - def __init__(self, useGtk=False): - _gtk = None - if useGtk is True: -+ gi.require_version("Gtk", "3.0") - from gi.repository import Gtk as _gtk - - _glibbase.GlibReactorBase.__init__(self, GLib, _gtk, useGtk=useGtk) -@@ -113,6 +115,7 @@ class PortableGIReactor(_glibbase.PortableGlibReactorBase): - def __init__(self, useGtk=False): - _gtk = None - if useGtk is True: -+ gi.require_version("Gtk", "3.0") - from gi.repository import Gtk as _gtk - - _glibbase.PortableGlibReactorBase.__init__(self, GLib, _gtk, useGtk=useGtk) -diff --git a/src/twisted/internet/test/test_gireactor.py b/src/twisted/internet/test/test_gireactor.py -index c25ada63f..3bb88a07f 100644 ---- a/src/twisted/internet/test/test_gireactor.py -+++ b/src/twisted/internet/test/test_gireactor.py -@@ -26,6 +26,9 @@ else: - gtk3reactor = None - else: - gtk3reactor = _gtk3reactor -+ import gi # type: ignore[import] -+ -+ gi.require_version("Gtk", "3.0") - from gi.repository import Gtk - - from twisted.internet.error import ReactorAlreadyRunning -diff --git a/src/twisted/newsfragments/10200.bugfix b/src/twisted/newsfragments/10200.bugfix -new file mode 100644 -index 000000000..7afb343be ---- /dev/null -+++ b/src/twisted/newsfragments/10200.bugfix -@@ -0,0 +1 @@ -+twisted.internet.gireactor was fixed to force GTK+3 in order to fix use of incompatible GTK+4 API when installed --- -2.35.1 - diff --git a/dev-python/twisted/files/twisted-22.4.0-py311.patch b/dev-python/twisted/files/twisted-22.4.0-py311.patch deleted file mode 100644 index ed8ded87d4de..000000000000 --- a/dev-python/twisted/files/twisted-22.4.0-py311.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 074fc742a699278ea5266b34aace1e34049b3de3 Mon Sep 17 00:00:00 2001 -From: Colin Watson <cjwatson@canonical.com> -Date: Sat, 23 Apr 2022 22:29:07 +0100 -Subject: [PATCH] Implement twisted.python.failure._Code.co_positions - -This is needed for compatibility with Python 3.11. ---- - src/twisted/newsfragments/10336.bugfix | 1 + - src/twisted/python/failure.py | 5 ++++- - src/twisted/test/test_failure.py | 1 + - 3 files changed, 6 insertions(+), 1 deletion(-) - create mode 100644 src/twisted/newsfragments/10336.bugfix - -diff --git a/src/twisted/newsfragments/10336.bugfix b/src/twisted/newsfragments/10336.bugfix -new file mode 100644 -index 00000000000..a7ffab3627d ---- /dev/null -+++ b/src/twisted/newsfragments/10336.bugfix -@@ -0,0 +1 @@ -+Implement twisted.python.failure._Code.co_positions for compatibility with Python 3.11. -diff --git a/src/twisted/python/failure.py b/src/twisted/python/failure.py -index 6471e7bca59..c5a359e405b 100644 ---- a/src/twisted/python/failure.py -+++ b/src/twisted/python/failure.py -@@ -130,7 +130,7 @@ def _Traceback(stackFrames, tbFrames): - - - # The set of attributes for _TracebackFrame, _Frame and _Code were taken from --# https://docs.python.org/3.10/library/inspect.html Other Pythons may have a -+# https://docs.python.org/3.11/library/inspect.html Other Pythons may have a - # few more attributes that should be added if needed. - class _TracebackFrame: - """ -@@ -202,6 +202,9 @@ def __init__(self, name, filename): - self.co_nlocals = 0 - self.co_stacksize = 0 - -+ def co_positions(self): -+ return ((None, None, None, None),) -+ - - _inlineCallbacksExtraneous = [] - -diff --git a/src/twisted/test/test_failure.py b/src/twisted/test/test_failure.py -index 6dd7c682bf9..6fd82c868ec 100644 ---- a/src/twisted/test/test_failure.py -+++ b/src/twisted/test/test_failure.py -@@ -825,6 +825,7 @@ def test_fakeCodeAttributes(self): - self.assertIsInstance(code.co_nlocals, int) - self.assertIsInstance(code.co_stacksize, int) - self.assertIsInstance(code.co_varnames, list) -+ self.assertIsInstance(code.co_positions(), tuple) - - def test_fakeTracebackFrame(self): - """ |