This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-gui. commit 3f6545b82aeee842ada53a79e4583a3d09da562d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Sep 15 11:42:16 2014 +0200 Support Python wxWidgets 3.0. --- debian/changelog | 1 + pyhoca/wxgui/about.py | 12 +----------- pyhoca/wxgui/brokerlogon.py | 12 +----------- pyhoca/wxgui/frontend.py | 15 +++------------ pyhoca/wxgui/launcher.py | 12 +----------- pyhoca/wxgui/listdesktops.py | 12 +----------- pyhoca/wxgui/logon.py | 12 +----------- pyhoca/wxgui/menus_taskbar.py | 12 +----------- pyhoca/wxgui/messages.py | 12 +----------- pyhoca/wxgui/notify.py | 12 +----------- pyhoca/wxgui/passphrase.py | 12 +----------- pyhoca/wxgui/printingprefs.py | 19 +++++++------------ pyhoca/wxgui/profilemanager.py | 30 ++++++++++++++++-------------- pyhoca/wxgui/serverinfo.py | 12 +----------- pyhoca/wxgui/sessiontitle.py | 12 +----------- pyhoca/wxgui/splash.py | 12 +----------- pyhoca/wxgui/taskbar.py | 12 +----------- 17 files changed, 40 insertions(+), 181 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0b696be..b742784 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ pyhoca-gui (0.5.0.0-0x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * New upstream version (0.5.0.0): + - Support Python wxWidgets 3.0. - Add X2Go Session Broker support. - Adapt to new backend concept found in Python X2Go (>= 0.5.0.0). - Move most code of the pyhoca-gui executable into a dedicated class diff --git a/pyhoca/wxgui/about.py b/pyhoca/wxgui/about.py index 9d8844b..ea846b1 100644 --- a/pyhoca/wxgui/about.py +++ b/pyhoca/wxgui/about.py @@ -24,17 +24,7 @@ import os try: import wxversion - wxversion.select('3.0') -except: pass - -try: - import wxversion - wxversion.select('2.9') -except: pass - -try: - import wxversion - wxversion.select('2.8') + wxversion.select(['3.0', '2.9', '2.8']) except: pass # Python X2Go diff --git a/pyhoca/wxgui/brokerlogon.py b/pyhoca/wxgui/brokerlogon.py index 8fff733..29d2ec7 100644 --- a/pyhoca/wxgui/brokerlogon.py +++ b/pyhoca/wxgui/brokerlogon.py @@ -22,17 +22,7 @@ modules ={} try: import wxversion - wxversion.select('3.0') -except: pass - -try: - import wxversion - wxversion.select('2.9') -except: pass - -try: - import wxversion - wxversion.select('2.8') + wxversion.select(['3.0', '2.9', '2.8']) except: pass # Python X2Go diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 7b08de3..e19c73d 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -22,17 +22,7 @@ modules ={} try: import wxversion - wxversion.select('3.0') -except: pass - -try: - import wxversion - wxversion.select('2.9') -except: pass - -try: - import wxversion - wxversion.select('2.8') + wxversion.select(['3.0', '2.9', '2.8']) except: pass import os @@ -67,7 +57,8 @@ import listdesktops import serverinfo wx.SetDefaultPyEncoding("utf-8") -wx.InitAllImageHandlers() +if wx.__version__.startswith('2.') + wx.InitAllImageHandlers() #def SetExitHandler(func): # """\ diff --git a/pyhoca/wxgui/launcher.py b/pyhoca/wxgui/launcher.py index 83ee09d..340d8ca 100644 --- a/pyhoca/wxgui/launcher.py +++ b/pyhoca/wxgui/launcher.py @@ -34,17 +34,7 @@ gevent.monkey.patch_all() try: import wxversion - wxversion.select('3.0') -except: pass - -try: - import wxversion - wxversion.select('2.9') -except: pass - -try: - import wxversion - wxversion.select('2.8') + wxversion.select(['3.0', '2.9', '2.8']) except: pass import wx diff --git a/pyhoca/wxgui/listdesktops.py b/pyhoca/wxgui/listdesktops.py index 5970514..8d553f0 100644 --- a/pyhoca/wxgui/listdesktops.py +++ b/pyhoca/wxgui/listdesktops.py @@ -22,17 +22,7 @@ modules ={} try: import wxversion - wxversion.select('3.0') -except: pass - -try: - import wxversion - wxversion.select('2.9') -except: pass - -try: - import wxversion - wxversion.select('2.8') + wxversion.select(['3.0', '2.9', '2.8']) except: pass # Python X2Go diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index 93d80a8..dc35875 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -22,17 +22,7 @@ modules ={} try: import wxversion - wxversion.select('3.0') -except: pass - -try: - import wxversion - wxversion.select('2.9') -except: pass - -try: - import wxversion - wxversion.select('2.8') + wxversion.select(['3.0', '2.9', '2.8']) except: pass # Python X2Go diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index a31faa9..0451227 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -20,17 +20,7 @@ try: import wxversion - wxversion.select('3.0') -except: pass - -try: - import wxversion - wxversion.select('2.9') -except: pass - -try: - import wxversion - wxversion.select('2.8') + wxversion.select(['3.0', '2.9', '2.8']) except: pass import os.path diff --git a/pyhoca/wxgui/messages.py b/pyhoca/wxgui/messages.py index 1acd9cb..15ce000 100644 --- a/pyhoca/wxgui/messages.py +++ b/pyhoca/wxgui/messages.py @@ -23,17 +23,7 @@ try: import wxversion - wxversion.select('3.0') -except: pass - -try: - import wxversion - wxversion.select('2.9') -except: pass - -try: - import wxversion - wxversion.select('2.8') + wxversion.select(['3.0', '2.9', '2.8']) except: pass import wx diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py index 58d89e6..4e15251 100644 --- a/pyhoca/wxgui/notify.py +++ b/pyhoca/wxgui/notify.py @@ -20,17 +20,7 @@ try: import wxversion - wxversion.select('3.0') -except: pass - -try: - import wxversion - wxversion.select('2.9') -except: pass - -try: - import wxversion - wxversion.select('2.8') + wxversion.select(['3.0', '2.9', '2.8']) except: pass import wx diff --git a/pyhoca/wxgui/passphrase.py b/pyhoca/wxgui/passphrase.py index ce91001..6929445 100644 --- a/pyhoca/wxgui/passphrase.py +++ b/pyhoca/wxgui/passphrase.py @@ -22,17 +22,7 @@ modules ={} try: import wxversion - wxversion.select('3.0') -except: pass - -try: - import wxversion - wxversion.select('2.9') -except: pass - -try: - import wxversion - wxversion.select('2.8') + wxversion.select(['3.0', '2.9', '2.8']) except: pass # Python X2Go diff --git a/pyhoca/wxgui/printingprefs.py b/pyhoca/wxgui/printingprefs.py index 9cbce6f..5ddbc3f 100644 --- a/pyhoca/wxgui/printingprefs.py +++ b/pyhoca/wxgui/printingprefs.py @@ -23,17 +23,7 @@ import re try: import wxversion - wxversion.select('3.0') -except: pass - -try: - import wxversion - wxversion.select('2.9') -except: pass - -try: - import wxversion - wxversion.select('2.8') + wxversion.select(['3.0', '2.9', '2.8']) except: pass import wx @@ -419,10 +409,15 @@ class PyHocaGUI_PrintingPreferences(wx.Dialog): @type evt: C{obj} """ + if wx.__version__.startswith('2.'): + _style = wx.OPEN | wx.CHANGE_DIR + else: + _style = wx.FD_OPEN | wx.FD_CHANGE_DIR + wildcard = "All files (*.*)|*" dlg = wx.FileDialog( self, message=_(u"Choose PDF viewer application"), defaultDir=_LOCAL_HOME, - defaultFile="", wildcard=wildcard, style=wx.OPEN | wx.CHANGE_DIR ) + defaultFile="", wildcard=wildcard, style=_style ) # Show the dialog and retrieve the user response. If it is the OK response, # process the data. if dlg.ShowModal() == wx.ID_OK: diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 35334c9..be1e5d9 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -20,17 +20,7 @@ try: import wxversion - wxversion.select('3.0') -except: pass - -try: - import wxversion - wxversion.select('2.9') -except: pass - -try: - import wxversion - wxversion.select('2.8') + wxversion.select(['3.0', '2.9', '2.8']) except: pass import wx @@ -1519,9 +1509,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog): iconsdir = os.getcwd() wildcard = _(u"Icon Files (*.png)|*.png|" \ u"All files (*.*)|*") + if wx.__version__.startswith('2.'): + _style = wx.OPEN | wx.CHANGE_DIR + else: + _style = wx.FD_OPEN | wx.FD_CHANGE_DIR dlg = wx.FileDialog( self, message=_(u"Choose an icon for this session profile"), defaultDir=iconsdir, - defaultFile="", wildcard=wildcard, style=wx.OPEN | wx.CHANGE_DIR ) + defaultFile="", wildcard=wildcard, style=_style ) # Show the dialog and retrieve the user response. If it is the OK response, # process the data. if dlg.ShowModal() == wx.ID_OK: @@ -1970,9 +1964,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog): if not os.path.exists(sshdir): sshdir = os.getcwd() wildcard = _(u"All files (*.*)|*") + if wx.__version__.startswith('2.'): + _style = wx.OPEN | wx.CHANGE_DIR + else: + _style = wx.FD_OPEN | wx.FD_CHANGE_DIR dlg = wx.FileDialog( self, message=_(u"Choose a public SSH key"), defaultDir=sshdir, - defaultFile="", wildcard=wildcard, style=wx.OPEN | wx.CHANGE_DIR ) + defaultFile="", wildcard=wildcard, style=_style ) # Show the dialog and retrieve the user response. If it is the OK response, # process the data. if dlg.ShowModal() == wx.ID_OK: @@ -1994,9 +1992,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog): if not os.path.exists(sshdir): sshdir = os.getcwd() wildcard = "All files (*.*)|*" + if wx.__version__.startswith('2.'): + _style = wx.OPEN | wx.CHANGE_DIR + else: + _style = wx.FD_OPEN | wx.FD_CHANGE_DIR dlg = wx.FileDialog( self, message=_(u"Choose a public SSH key"), defaultDir=sshdir, - defaultFile="", wildcard=wildcard, style=wx.OPEN | wx.CHANGE_DIR ) + defaultFile="", wildcard=wildcard, style=_style ) # Show the dialog and retrieve the user response. If it is the OK response, # process the data. if dlg.ShowModal() == wx.ID_OK: diff --git a/pyhoca/wxgui/serverinfo.py b/pyhoca/wxgui/serverinfo.py index 1853a83..2a095b1 100644 --- a/pyhoca/wxgui/serverinfo.py +++ b/pyhoca/wxgui/serverinfo.py @@ -22,17 +22,7 @@ modules ={} try: import wxversion - wxversion.select('3.0') -except: pass - -try: - import wxversion - wxversion.select('2.9') -except: pass - -try: - import wxversion - wxversion.select('2.8') + wxversion.select(['3.0', '2.9', '2.8']) except: pass # Python X2Go diff --git a/pyhoca/wxgui/sessiontitle.py b/pyhoca/wxgui/sessiontitle.py index c0c6c8f..e9781a0 100644 --- a/pyhoca/wxgui/sessiontitle.py +++ b/pyhoca/wxgui/sessiontitle.py @@ -22,17 +22,7 @@ modules ={} try: import wxversion - wxversion.select('3.0') -except: pass - -try: - import wxversion - wxversion.select('2.9') -except: pass - -try: - import wxversion - wxversion.select('2.8') + wxversion.select(['3.0', '2.9', '2.8']) except: pass # Python X2Go diff --git a/pyhoca/wxgui/splash.py b/pyhoca/wxgui/splash.py index e393f68..cf9ff4c 100644 --- a/pyhoca/wxgui/splash.py +++ b/pyhoca/wxgui/splash.py @@ -20,17 +20,7 @@ try: import wxversion - wxversion.select('3.0') -except: pass - -try: - import wxversion - wxversion.select('2.9') -except: pass - -try: - import wxversion - wxversion.select('2.8') + wxversion.select(['3.0', '2.9', '2.8']) except: pass import wx diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py index 3813c81..d14b181 100644 --- a/pyhoca/wxgui/taskbar.py +++ b/pyhoca/wxgui/taskbar.py @@ -22,17 +22,7 @@ modules ={} try: import wxversion - wxversion.select('3.0') -except: pass - -try: - import wxversion - wxversion.select('2.9') -except: pass - -try: - import wxversion - wxversion.select('2.8') + wxversion.select(['3.0', '2.9', '2.8']) except: pass # Python X2Go -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git