Control: tags 759074 + patch

I've rebuilt pyserial with the attached patch, and tested both:

python /usr/share/doc/python-serial/examples/wxSerialConfigDialog.py
python /usr/share/doc/python-serial/examples/wxTerminal.py

I don't have anything on a serial port to connect a terminal to, so I couldn't
actually open a terminal, but the UIs seem to work aside from that.

Cheers,
    Olly
diff -u pyserial-2.6/debian/control pyserial-2.6/debian/control
--- pyserial-2.6/debian/control
+++ pyserial-2.6/debian/control
@@ -11,7 +11,7 @@
 Package: python-serial
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}
-Suggests: python-wxgtk2.8 | python-wxgtk
+Suggests: python-wxgtk3.0 | python-wxgtk
 XB-Python-Version: ${python:Versions}
 Description: pyserial - module encapsulating access for the serial port
  This module encapsulates the access for the serial port. It provides
@@ -22,7 +22,7 @@
 Package: python3-serial
 Architecture: all
 Depends: ${python3:Depends}, ${misc:Depends}
-Suggests: python3-wxgtk2.8 | python3-wxgtk
+Suggests: python3-wxgtk3.0 | python3-wxgtk
 XB-Python-Version: ${python3:Versions}
 Description: pyserial - module encapsulating access for the serial port
  This module encapsulates the access for the serial port. It provides
diff -u pyserial-2.6/debian/changelog pyserial-2.6/debian/changelog
--- pyserial-2.6/debian/changelog
+++ pyserial-2.6/debian/changelog
@@ -1,3 +1,14 @@
+pyserial (2.6-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Update for wxPython 3.0, Closes: #759074:
+    - debian/control: Update dependencies.
+    - examples/wxSerialConfigDialog.py,examples/wxTerminal.py: Drop calls to
+      wx.InitAllImageHandlers() which is a no-op for 2.8 and gives a
+      deprecation warning with 3.0.  Update deprecated wx.SAVE to wx.FD_SAVE.
+
+ -- Olly Betts <o...@survex.com>  Fri, 12 Sep 2014 02:10:04 +0000
+
 pyserial (2.6-1) unstable; urgency=low
 
   * New upstream version. Closes: #664788.
only in patch2:
unchanged:
--- pyserial-2.6.orig/examples/wxSerialConfigDialog.py
+++ pyserial-2.6/examples/wxSerialConfigDialog.py
@@ -229,8 +229,6 @@
 class MyApp(wx.App):
     """Test code"""
     def OnInit(self):
-        wx.InitAllImageHandlers()
-        
         ser = serial.Serial()
         print ser
         #loop until cancel is pressed, old values are used as start for the next run
only in patch2:
unchanged:
--- pyserial-2.6.orig/examples/wxTerminal.py
+++ pyserial-2.6/examples/wxTerminal.py
@@ -202,7 +202,7 @@
     def OnSaveAs(self, event):
         """Save contents of output window."""
         filename = None
-        dlg = wx.FileDialog(None, "Save Text As...", ".", "", "Text File|*.txt|All Files|*",  wx.SAVE)
+        dlg = wx.FileDialog(None, "Save Text As...", ".", "", "Text File|*.txt|All Files|*",  wx.FD_SAVE)
         if dlg.ShowModal() ==  wx.ID_OK:
             filename = dlg.GetPath()
         dlg.Destroy()
@@ -320,7 +320,6 @@
 
 class MyApp(wx.App):
     def OnInit(self):
-        wx.InitAllImageHandlers()
         frame_terminal = TerminalFrame(None, -1, "")
         self.SetTopWindow(frame_terminal)
         frame_terminal.Show(1)

Reply via email to