[SCM] python-pyo/master: Removing uneeded patch

[tiago at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9e2f090fe44614bb3eb26be6f3e7c93d712b7d62
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date:   Tue Jul 28 17:50:58 2015 -0400

    Removing uneeded patch

diff --git a/debian/patches/wx3.0.patch b/debian/patches/wx3.0.patch
deleted file mode 100644
index dc575e6..0000000
--- a/debian/patches/wx3.0.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Index: python-pyo/pyolib/_widgets.py
-===================================================================
---- python-pyo.orig/pyolib/_widgets.py
-+++ python-pyo/pyolib/_widgets.py
-@@ -29,12 +29,13 @@ except:
- 
- try:
-     try:
--        import wxversion
--        if (wxversion.checkInstalled("2.8")):
-+        if 'wx' not in sys.modules:
-+            # Don't try to load if already loaded.
-+            import wxversion
-             wxversion.ensureMinimal("2.8")
-+            import wx
-     except:
-         pass
--    import wx
-     from _wxwidgets import *
-     PYO_USE_WX = True
- except:
-Index: python-pyo/utils/E-Pyo.py
-===================================================================
---- python-pyo.orig/utils/E-Pyo.py
-+++ python-pyo/utils/E-Pyo.py
-@@ -2337,7 +2337,7 @@ class MainFrame(wx.Frame):
-     def saveListPaste(self, evt):
-         if self.pastingList != []:
-             dlg = wx.FileDialog(self, message="Save file as ...", 
--                defaultDir=os.path.expanduser('~'), style=wx.SAVE)
-+                defaultDir=os.path.expanduser('~'), style=wx.FD_SAVE)
-             if dlg.ShowModal() == wx.ID_OK:
-                 path = ensureNFD(dlg.GetPath())
-                 with open(path, "w") as f:
-@@ -2345,7 +2345,7 @@ class MainFrame(wx.Frame):
- 
-     def loadListPaste(self, evt):
-         dlg = wx.FileDialog(self, message="Choose a file", 
--            defaultDir=os.path.expanduser("~"), style=wx.OPEN)
-+            defaultDir=os.path.expanduser("~"), style=wx.FD_OPEN)
-         if dlg.ShowModal() == wx.ID_OK:
-             path = dlg.GetPath()
-             self.pastingList = []
-@@ -2605,7 +2605,7 @@ class MainFrame(wx.Frame):
-     def insertPath(self, evt):
-         dlg = wx.FileDialog(self, message="Choose a file", 
-                             defaultDir=PREFERENCES.get("insert_path", os.path.expanduser("~")),
--                            defaultFile="", style=wx.OPEN | wx.MULTIPLE)
-+                            defaultFile="", style=wx.FD_OPEN | wx.FD_MULTIPLE)
-         if dlg.ShowModal() == wx.ID_OK:
-             paths = dlg.GetPaths()
-             if len(paths) == 1:
-@@ -2795,7 +2795,7 @@ class MainFrame(wx.Frame):
-     def open(self, event, encoding=None):
-         dlg = wx.FileDialog(self, message="Choose a file", 
-             defaultDir=PREFERENCES.get("open_file_path", os.path.expanduser("~")),
--            defaultFile="", style=wx.OPEN | wx.MULTIPLE)
-+            defaultFile="", style=wx.FD_OPEN | wx.FD_MULTIPLE)
-         if dlg.ShowModal() == wx.ID_OK:
-             paths = dlg.GetPaths()
-             for path in paths:
-@@ -2860,7 +2860,7 @@ class MainFrame(wx.Frame):
-         deffile = os.path.split(self.panel.editor.path)[1]
-         dlg = wx.FileDialog(self, message="Save file as ...", 
-             defaultDir=PREFERENCES.get("save_file_path", os.path.expanduser("~")),
--            defaultFile=deffile, style=wx.SAVE)
-+            defaultFile=deffile, style=wx.FD_SAVE)
-         dlg.SetFilterIndex(0)
-         if dlg.ShowModal() == wx.ID_OK:
-             path = ensureNFD(dlg.GetPath())
-@@ -3750,7 +3750,7 @@ class Editor(stc.StyledTextCtrl):
-                 dlg.Destroy()
-                 if not self.path or "Untitled-" in self.path:
-                     dlg2 = wx.FileDialog(None, message="Save file as ...", defaultDir=os.getcwd(), 
--                                         defaultFile="", style=wx.SAVE|wx.FD_OVERWRITE_PROMPT)
-+                                         defaultFile="", style=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT)
-                     dlg2.SetFilterIndex(0)
-                     if dlg2.ShowModal() == wx.ID_OK:
-                         path = dlg2.GetPath()
-@@ -3781,7 +3781,7 @@ class Editor(stc.StyledTextCtrl):
-                 dlg.Destroy()
-                 if not self.path or "Untitled-" in self.path:
-                     dlg2 = wx.FileDialog(None, message="Save file as ...", defaultDir=os.getcwd(),
--                                         defaultFile="", style=wx.SAVE|wx.FD_OVERWRITE_PROMPT)
-+                                         defaultFile="", style=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT)
-                     dlg2.SetFilterIndex(0)
- 
-                     if dlg2.ShowModal() == wx.ID_OK:
-Index: python-pyo/utils/PyoDoc.py
-===================================================================
---- python-pyo.orig/utils/PyoDoc.py
-+++ python-pyo/utils/PyoDoc.py
-@@ -1122,7 +1122,7 @@ def toSysEncoding(unistr):
- 
- if __name__ == "__main__":
-     DOC_AS_SINGLE_APP = True
--    app = wx.PySimpleApp()
-+    app = wx.App(False)
-     doc_frame = ManualFrame()
-     doc_frame.Show()
-     app.MainLoop()

-- 
python-pyo packaging