Merge lp:~dobey/ubuntu/raring/twisted/fix-pygtkcompat into lp:ubuntu/raring/twisted

[dobey]

[Barry Warsaw (barry)]

The patch looks good to me and I'd happily sponsor it, but I have two suggestions:

* Could you add DEP 3 headers to the patch? http://dep.debian.net/deps/dep3/
* Is this appropriate for upstream? If so, please file the bug and patch upstream and include the url in the DEP 3 headers

I'll mark this as needs fixing for now, but those two things should be pretty easy to add and update.

review: Needs Fixing

[lp:~dobey/ubuntu/raring/twisted/fix-pygtkcompat]

53. By dobey on 2013-01-25

Add dep3 headers to patch.

[Barry Warsaw (barry)]

Looks great, thanks!

review: Approve

[Martin Pitt (pitti)]

Apparently this got merged without pushing, closing manually.

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-23 11:41:25 +0000
+++ debian/changelog	2013-01-25 20:25:22 +0000
@@ -1,3 +1,11 @@
+twisted (12.3.0-1ubuntu4) raring; urgency=low
+
+  * debian/patches/lp1102685.diff:
+    - Try to use plain pygtkcompat and fall back to gi.pygtkcompat, to
+      avoid a DeprecationWarning, and a crash. (LP: #1102685)
+
+ -- Rodney Dawes <[e-mail]>  Wed, 23 Jan 2013 12:19:06 -0500
+
 twisted (12.3.0-1ubuntu3) raring; urgency=low
 
   * Explicitly call 2to3 to build the py3k source.

=== added file 'debian/patches/lp1102685.diff'
--- debian/patches/lp1102685.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/lp1102685.diff	2013-01-25 20:25:22 +0000
@@ -0,0 +1,36 @@
+Description: Use pygtkcompat directly and fall back to gi.pygtkcompat
+Bug: https://twistedmatrix.com/trac/ticket/6280
+Author: Rodney Dawes <[e-mail]>
+=== 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
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-01-21 13:43:44 +0000
+++ debian/patches/series	2013-01-25 20:25:22 +0000
@@ -2,3 +2,4 @@
 index-doc.diff
 python3.diff
 python3_modules.diff
+lp1102685.diff