Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-Twisted for openSUSE:Factory checked in at 2021-08-16 10:08:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Twisted (Old) and /work/SRC/openSUSE:Factory/.python-Twisted.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Twisted" Mon Aug 16 10:08:37 2021 rev:48 rq:911988 version:21.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-Twisted/python-Twisted.changes 2021-08-12 09:01:45.482142225 +0200 +++ /work/SRC/openSUSE:Factory/.python-Twisted.new.1899/python-Twisted.changes 2021-08-16 10:13:09.678987601 +0200 @@ -1,0 +2,5 @@ +Sat Aug 13 11:50:00 UTC 2021 - Michael Gumsley <gumsle...@hotmail.com> + +- Restore no-pygtkcompat.patch due to boo#1110669 + +------------------------------------------------------------------- New: ---- no-pygtkcompat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Twisted.spec ++++++ --- /var/tmp/diff_new_pack.eWqMUV/_old 2021-08-16 10:13:10.190987000 +0200 +++ /var/tmp/diff_new_pack.eWqMUV/_new 2021-08-16 10:13:10.194986996 +0200 @@ -36,6 +36,8 @@ Patch3: 1521_delegate_parseqs_stdlib_bpo42967.patch # We don't want to package yet another module, and it is easily skippable Patch4: no-cython_test_exception_raiser.patch +# boo#1110669 Our variant of PyGObject has pygtkcompat stripped which Twisted does not handle +Patch5: no-pygtkcompat.patch BuildRequires: %{python_module Automat >= 0.8.0} BuildRequires: %{python_module PyHamcrest >= 1.9.0} BuildRequires: %{python_module appdirs >= 1.4.0} ++++++ no-pygtkcompat.patch ++++++ diff -ur Twisted-21.7.0.orig/src/twisted/internet/gireactor.py Twisted-21.7.0/src/twisted/internet/gireactor.py --- Twisted-21.7.0.orig/src/twisted/internet/gireactor.py +++ Twisted-21.7.0/src/twisted/internet/gireactor.py @@ -24,16 +24,21 @@ from twisted.internet.error import ReactorAlreadyRunning from twisted.internet import _glibbase from twisted.python import runtime -import gi.pygtkcompat # type: ignore[import] from gi.repository import GLib # type: ignore[import] -# We require a sufficiently new version of pygobject, so always exists: -_pygtkcompatPresent = True +try: + import gi.pygtkcompat # type: ignore[import] +except ImportError: + pass # This is probably Python 3, with pygtkcompat removed +else: + # We require a sufficiently new version of pygobject, so always exists: + _pygtkcompatPresent = True + + # Newer version of gi, so we can try to initialize compatibility layer; if + # real pygtk was already imported we'll get ImportError at this point + # rather than segfault, so unconditional import is fine. + gi.pygtkcompat.enable() -# Newer version of gi, so we can try to initialize compatibility layer; if -# real pygtk was already imported we'll get ImportError at this point -# rather than segfault, so unconditional import is fine. -gi.pygtkcompat.enable() # At this point importing gobject will get you gi version, and importing # e.g. gtk will either fail in non-segfaulty way or use gi version if user # does gi.pygtkcompat.enable_gtk(). So, no need to prevent imports of