[Python-modules-commits] r30664 - in packages/pyke/trunk/debian (4 files)

[eriol-guest at users.alioth.debian.org]

    Date: Thursday, September 18, 2014 @ 14:51:41
  Author: eriol-guest
Revision: 30664

Update for wxPython 3.0

Added:
  packages/pyke/trunk/debian/patches/08_wxpython3.0.patch
Modified:
  packages/pyke/trunk/debian/changelog
  packages/pyke/trunk/debian/control
  packages/pyke/trunk/debian/patches/series

Modified: packages/pyke/trunk/debian/changelog
===================================================================
--- packages/pyke/trunk/debian/changelog	2014-09-17 21:18:25 UTC (rev 30663)
+++ packages/pyke/trunk/debian/changelog	2014-09-18 14:51:41 UTC (rev 30664)
@@ -1,3 +1,13 @@
+pyke (1.1.1-5) UNRELEASED; urgency=medium
+
+  * Update for wxPython 3.0 (Closes: #759077)
+  * debian/control
+    - Bump python-wxgtk to 3.0 in Build-Depends and Suggests.
+  * debian/patches/08_wxpython3.0.patch
+    - Update for wxPython 3.0. Thanks to Olly Betts for report and patch.
+
+ -- Daniele Tricoli <eriol at mornie.org>  Thu, 18 Sep 2014 16:07:56 +0200
+
 pyke (1.1.1-4) unstable; urgency=low
 
   * Team upload.

Modified: packages/pyke/trunk/debian/control
===================================================================
--- packages/pyke/trunk/debian/control	2014-09-17 21:18:25 UTC (rev 30663)
+++ packages/pyke/trunk/debian/control	2014-09-18 14:51:41 UTC (rev 30664)
@@ -8,7 +8,7 @@
                python-nose,
                python-ply (>= 3.4),
                python-setuptools,
-               python-wxgtk2.8,
+               python-wxgtk3.0,
                rest2web,
 Standards-Version: 3.9.5
 X-Python-Version: >= 2.6
@@ -21,7 +21,7 @@
 Depends: ${misc:Depends},
          ${python:Depends},
          ${python-ply:Depends}
-Suggests: python-wxgtk2.8
+Suggests: python-wxgtk3.0
 Description: Prolog-inspired Python logic programming toolkit
  Pyke introduces a form of Logic Programming (inspired by Prolog) to Python by
  providing a knowledge-based inference engine (or "expert system").

Added: packages/pyke/trunk/debian/patches/08_wxpython3.0.patch
===================================================================
--- packages/pyke/trunk/debian/patches/08_wxpython3.0.patch	                        (rev 0)
+++ packages/pyke/trunk/debian/patches/08_wxpython3.0.patch	2014-09-18 14:51:41 UTC (rev 30664)
@@ -0,0 +1,58 @@
+Description: Update for wxPython 3.0
+ These changes should remain compatible with wxPython 2.8.
+Author: Olly Betts <olly at survex.com>
+Bug-Debian: https://bugs.debian.org/759077
+Forwarded: no
+Last-Update: 2014-09-18
+
+--- a/pyke/ask_wx.py
++++ b/pyke/ask_wx.py
+@@ -67,12 +67,18 @@ def review_ans(dlg, ans, review=None):
+         msg = u'\n\n'.join(review_str for review_test, review_str in review
+                                        if matches(ans, review_test))
+         if msg:
++            global app
++            if app is None:
++                app = wx.App()
+             dlg2 = wx.MessageDialog(dlg, msg, 'Answer Information',
+                                     wx.OK | wx.ICON_INFORMATION)
+             dlg2.ShowModal()
+             dlg2.Destroy()
+ 
+ def get_answer(question, title, conv_fn=None, test=None, review=None):
++    global app
++    if app is None:
++        app = wx.App()
+     dlg = wx.TextEntryDialog(None, question, title, u'',
+                              wx.CENTRE | wx.RESIZE_BORDER | wx.OK)
+     while True:
+@@ -98,6 +104,9 @@ def get_answer(question, title, conv_fn=
+     return ans
+ 
+ def ask_yn(question, review=None):
++    global app
++    if app is None:
++        app = wx.App()
+     dlg = wx.MessageDialog(None, question, 'User Question',
+                            wx.YES_NO | wx.ICON_QUESTION)
+ 
+@@ -141,6 +150,9 @@ def ask_string(question, match=None, rev
+                       review=review)
+ 
+ def ask_select_1(question, alternatives, review=None):
++    global app
++    if app is None:
++        app = wx.App()
+     dlg = wx.SingleChoiceDialog(None, question, u'User Question',
+                                 [msg for tag, msg in alternatives],
+                                 wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER |
+@@ -156,6 +168,9 @@ def ask_select_1(question, alternatives,
+     return ans
+ 
+ def ask_select_n(question, alternatives, review=None):
++    global app
++    if app is None:
++        app = wx.App()
+     #dlg = wx.lib.dialogs.MultiChoiceDialog(None, question, u'User Question',
+     #                                       [msg for tag, msg in alternatives])
+     dlg = wx.MultiChoiceDialog(None, question, u'User Question',

Modified: packages/pyke/trunk/debian/patches/series
===================================================================
--- packages/pyke/trunk/debian/patches/series	2014-09-17 21:18:25 UTC (rev 30663)
+++ packages/pyke/trunk/debian/patches/series	2014-09-18 14:51:41 UTC (rev 30664)
@@ -5,3 +5,4 @@
 05_do-not-use-embedded-ply.patch
 06_remove-tracking-javascript-and-remote-images.patch
 07_disable_check_tables.patch
+08_wxpython3.0.patch