Control: tags 759073 + patch
Control: severity -1 serious
# Justification: blocks the on-going wxpython3.0 transition
I've rebuilt twisted with the attached patch, and tested the two wx-using
examples I found, both of which look good to me:
doc/_downloads/wxacceptance.py
doc/_downloads/wxdemo.py
Let me know if you'd like me to NMU these changes.
Cheers,
Olly
diff -Nru twisted-14.0.0/debian/changelog twisted-14.0.0/debian/changelog
--- twisted-14.0.0/debian/changelog 2014-07-24 01:39:32.000000000 +1200
+++ twisted-14.0.0/debian/changelog 2014-09-20 15:48:56.000000000 +1200
@@ -1,3 +1,11 @@
+twisted (14.0.0-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxPython 3.0 (Closes: #759073):
+ - New patch: wxpython3.0.patch
+
+ -- Olly Betts <o...@survex.com> Sat, 20 Sep 2014 03:48:30 +0000
+
twisted (14.0.0-2) unstable; urgency=medium
* python-twisted-core: Depend on python-openssl and python-service-identity.
diff -Nru twisted-14.0.0/debian/control twisted-14.0.0/debian/control
--- twisted-14.0.0/debian/control 2014-07-24 01:39:47.000000000 +1200
+++ twisted-14.0.0/debian/control 2014-09-20 15:48:21.000000000 +1200
@@ -39,7 +39,7 @@
python-zope.interface (>= 3.6), python (>= 2.5),
${python:Depends}, ${misc:Depends},
python-openssl, python-service-identity
-Suggests: python-tk, python-gtk2, python-glade2, python-qt3, python-wxgtk2.8
+Suggests: python-tk, python-gtk2, python-glade2, python-qt3, python-wxgtk3.0
Recommends: python-openssl, python-pam, python-serial
Provides: ${python:Provides}
Description: Event-based framework for internet applications
diff -Nru twisted-14.0.0/debian/patches/series twisted-14.0.0/debian/patches/series
--- twisted-14.0.0/debian/patches/series 2013-11-07 08:51:30.000000000 +1300
+++ twisted-14.0.0/debian/patches/series 2014-09-20 15:47:37.000000000 +1200
@@ -1 +1,2 @@
tap2deb.diff
+wxpython3.0.patch
diff -Nru twisted-14.0.0/debian/patches/wxpython3.0.patch twisted-14.0.0/debian/patches/wxpython3.0.patch
--- twisted-14.0.0/debian/patches/wxpython3.0.patch 1970-01-01 12:00:00.000000000 +1200
+++ twisted-14.0.0/debian/patches/wxpython3.0.patch 2014-09-20 15:48:10.000000000 +1200
@@ -0,0 +1,32 @@
+Description: Update for wxPython 3.0
+ These changes should remain compatible with wxPython 2.8.
+Author: Olly Betts <o...@survex.com>
+Bug-Debian: https://bugs.debian.org/759073
+Forwarded: no
+Last-Update: 2014-09-20
+
+--- twisted-14.0.0.orig/twisted/internet/wxreactor.py
++++ twisted-14.0.0/twisted/internet/wxreactor.py
+@@ -25,11 +25,11 @@ real applications.
+
+ import Queue
+ try:
+- from wx import PySimpleApp as wxPySimpleApp, CallAfter as wxCallAfter, \
++ from wx import App as wxApp, CallAfter as wxCallAfter, \
+ Timer as wxTimer
+ except ImportError:
+ # older version of wxPython:
+- from wxPython.wx import wxPySimpleApp, wxCallAfter, wxTimer
++ from wxPython.wx import wxApp, wxCallAfter, wxTimer
+
+ from twisted.python import log, runtime
+ from twisted.internet import _threadedselect
+@@ -125,7 +125,7 @@ class WxReactor(_threadedselect.Threaded
+ if not hasattr(self, "wxapp"):
+ log.msg("registerWxApp() was not called on reactor, "
+ "registering my own wxApp instance.")
+- self.registerWxApp(wxPySimpleApp())
++ self.registerWxApp(wxApp(False))
+
+ # start select() thread:
+ self.interleave(self._runInMainThread,
