Hello community, here is the log from the commit of package python-Twisted for openSUSE:Factory checked in at 2013-12-08 19:49:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Twisted (Old) and /work/SRC/openSUSE:Factory/.python-Twisted.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Twisted" Changes: -------- --- /work/SRC/openSUSE:Factory/python-Twisted/python-Twisted.changes 2013-09-26 20:00:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-Twisted.new/python-Twisted.changes 2013-12-08 19:49:14.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Dec 6 15:22:17 UTC 2013 - speili...@suse.com + +- Add lp1102685.diff (bnc#853545): pygobject compatibility + +------------------------------------------------------------------- Old: ---- Twisted-13.1.0.tar.bz2 New: ---- Twisted-13.2.0.tar.bz2 lp1102685.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Twisted.spec ++++++ --- /var/tmp/diff_new_pack.3HyWwr/_old 2013-12-08 19:49:15.000000000 +0100 +++ /var/tmp/diff_new_pack.3HyWwr/_new 2013-12-08 19:49:15.000000000 +0100 @@ -17,13 +17,15 @@ Name: python-Twisted -Version: 13.1.0 +Version: 13.2.0 Release: 0 Url: http://twistedmatrix.com/ Summary: An asynchronous networking framework written in Python License: MIT Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/T/Twisted/Twisted-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM -- https://twistedmatrix.com/trac/ticket/6280 +Patch0: lp1102685.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-pam @@ -75,6 +77,7 @@ %prep %setup -q -n Twisted-%{version} +%patch0 -p1 sed -i "1d" twisted/{mail/test/pop3testserver,trial/test/scripttest}.py %build ++++++ Twisted-13.1.0.tar.bz2 -> Twisted-13.2.0.tar.bz2 ++++++ ++++ 24440 lines of diff (skipped) ++++++ lp1102685.diff ++++++ === modified file 'twisted/internet/gireactor.py' --- old/twisted/internet/gireactor.py 2013-01-16 17:44:26 +0000 +++ new/twisted/internet/gireactor.py 2013-01-23 17:13:29 +0000 @@ -37,9 +37,12 @@ else: from twisted.python.modules import theSystemPath _pygtkcompatPresent = True try: - theSystemPath["gi.pygtkcompat"] + theSystemPath["pygtkcompat"] except KeyError: - _pygtkcompatPresent = False + try: + theSystemPath["gi.pygtkcompat"] + except KeyError: + _pygtkcompatPresent = False # Modules that we want to ensure aren't imported if we're on older versions of @@ -75,8 +78,11 @@ else: # 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. - import gi.pygtkcompat - gi.pygtkcompat.enable() + try: + import pygtkcompat + except ImportError: + from gi import pygtkcompat + 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 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
