[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 0.2.1.1-30-g0b4cf0d
X2Go dev team
git-admin at x2go.org
Tue Aug 27 13:22:51 CEST 2013
The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
via 0b4cf0d09b946d208da1a7ac4ed98e18ed2b0336 (commit)
from 1905006936b073dc6c754f8617b2e5196146ca85 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
pyhoca/wxgui/frontend.py | 48 ++++++++++++++++++++---------------------
pyhoca/wxgui/logon.py | 10 ++++-----
pyhoca/wxgui/menus_taskbar.py | 4 ++--
3 files changed, 31 insertions(+), 31 deletions(-)
The diff of changes is:
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index 671e210..f2d0cf1 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -90,7 +90,7 @@ wx.InitAllImageHandlers()
# signal.signal( signal.SIGINT, func )
-class PyHocaGUI(wx.App, x2go.X2goClient):
+class PyHocaGUI(wx.App, x2go.X2GoClient):
"""\
The main application instance.
@@ -125,12 +125,12 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
@param args: a class with properties representing the command-line options that are available to L{PyHocaGUI} instances.
@type args: C{argparse.ArgumentParser} (or similar)
- @param logger: you can pass an L{X2goLogger} object to the
+ @param logger: you can pass an L{X2GoLogger} object to the
L{PyHocaGUI} constructor for logging application events
- @type logger: Python X2Go C{X2goLogger} instance
- @param liblogger: you can pass an L{X2goLogger} object to the
- L{PyHocaGUI} constructor for logging application events, this object is forwarded to the C{X2goClient}. class in Python X2Go.
- @type liblogger: Python X2Go C{X2goLogger} instance
+ @type logger: Python X2Go C{X2GoLogger} instance
+ @param liblogger: you can pass an L{X2GoLogger} object to the
+ L{PyHocaGUI} constructor for logging application events, this object is forwarded to the C{X2GoClient}. class in Python X2Go.
+ @type liblogger: Python X2Go C{X2GoLogger} instance
@param appname: name of the application instance
@type appname: C{str}
@param vendorname: name of the company distributing this application
@@ -149,13 +149,13 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
self.args = args
if logger is None:
- self._pyhoca_logger = x2go.X2goLogger(tag=self.appname)
+ self._pyhoca_logger = x2go.X2GoLogger(tag=self.appname)
else:
self._pyhoca_logger = copy.deepcopy(logger)
self._pyhoca_logger.tag = self.appname
if liblogger is None:
- self._pyhoca_liblogger = x2go.X2goLogger()
+ self._pyhoca_liblogger = x2go.X2GoLogger()
else:
self._pyhoca_liblogger = copy.deepcopy(liblogger)
@@ -217,7 +217,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
except:
self.logon_window_position_x = self.logon_window_position_y = None
- x2go.X2goClient.__init__(self, **_x2goclient_kwargs)
+ x2go.X2GoClient.__init__(self, **_x2goclient_kwargs)
wx.App.__init__(self, redirect=False, clearSigInt=False)
@@ -354,7 +354,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
Register all available session profiles on application start.
The auto-registration of all session profiles will trigger the auto-connect feature
- implemented in C{X2goClient} of Python X2Go.
+ implemented in C{X2GoClient} of Python X2Go.
"""
# wait for splash to appear
@@ -365,19 +365,19 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def session_auto_connect(self, session_uuid, **kwargs):
"""\
- Override C{X2goClient.session_auto_connect()} to always divert authentication to L{OnSessionAuthenticate}.
+ Override C{X2GoClient.session_auto_connect()} to always divert authentication to L{OnSessionAuthenticate}.
@param session_uuid: session UUID
@type session_uuid: C{str}
"""
- # override X2goClient method
+ # override X2GoClient method
if self.auto_connect and self.get_session(session_uuid).get_session_profile_option('auto_connect'):
self.HOOK_profile_auto_connect(self.get_session_profile_name(session_uuid))
def HOOK_profile_auto_connect(self, profile_name, **kwargs):
"""\
- Override C{X2goClient.HOOK_profile_auto_connect()} to always divert authentication to L{OnSessionAuthenticate}.
+ Override C{X2GoClient.HOOK_profile_auto_connect()} to always divert authentication to L{OnSessionAuthenticate}.
@param profile_name: session profile name
@type profile_name: C{str}
@@ -396,7 +396,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def session_auto_start_or_resume(self, session_uuid, newest=True, oldest=False, all_suspended=False, **kwargs):
"""\
- Override C{X2goClient.session_auto_start_or_resume()} to differentiate between the application options
+ Override C{X2GoClient.session_auto_start_or_resume()} to differentiate between the application options
C{resume_newest_on_connect}, C{resume_oldest_on_connect} and C{resume_all_on_connect}.
@param profile_name: session profile name
@@ -581,7 +581,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
self._hide_notifications_map[profile_name] = []
gevent.spawn(self._init_pubapp_session, session_uuid)
- except x2go.X2goSessionRegistryException:
+ except x2go.X2GoSessionRegistryException:
# there might have been a disconnect event inbetween...
pass
@@ -627,7 +627,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
self._pyhoca_logger('SSH key authentication to server failed, trying next auth-mechanism', loglevel=x2go.log.loglevel_INFO, )
_logon_window = logon.PyHocaGUI_DialogBoxPassword(self, profile_name, caller=self, )
self._logon_windows[profile_name] = _logon_window
- except x2go.X2goSSHProxyAuthenticationException:
+ except x2go.X2GoSSHProxyAuthenticationException:
self._pyhoca_logger('SSH key authentication for SSH proxy failed, trying next auth-mechanism', loglevel=x2go.log.loglevel_INFO, )
if _session_reuses_sshproxy_authinfo:
_logon_window = logon.PyHocaGUI_DialogBoxPassword(self, profile_name, caller=self, sshproxy_auth=False, )
@@ -641,14 +641,14 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
except ValueError:
pass
connect_failed = True
- except x2go.X2goHostKeyException, e:
+ except x2go.X2GoHostKeyException, e:
self.notifier.send(_(u'%s - host key error') % profile_name, _(u'The remote server\'s host key is invalid or has not been accepted by the user') + '!', icon='auth_error', timeout=4000)
try:
self._temp_disabled_profile_names.remove(profile_name)
except ValueError:
pass
connect_failed = True
- except x2go.X2goSSHProxyHostKeyException, e:
+ except x2go.X2GoSSHProxyHostKeyException, e:
self.notifier.send(_(u'%s - host key error') % profile_name, _(u'The SSH proxy\'s host key is invalid or has not been accepted by the user') + '!', icon='auth_error', timeout=4000)
try:
self._temp_disabled_profile_names.remove(profile_name)
@@ -676,21 +676,21 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
except ValueError:
pass
connect_failed = True
- except x2go.X2goSSHProxyException, e:
+ except x2go.X2GoSSHProxyException, e:
self.notifier.send(_(u'%s - auth key error') % profile_name, u'%s' % str(e), icon='auth_error', timeout=4000)
try:
self._temp_disabled_profile_names.remove(profile_name)
except ValueError:
pass
connect_failed = True
- except x2go.X2goRemoteHomeException, e:
+ except x2go.X2GoRemoteHomeException, e:
self.notifier.send(_(u'%s - missing home directory') % profile_name, _("The remote user's home directory does not exist."), icon='auth_error', timeout=4000)
try:
self._temp_disabled_profile_names.remove(profile_name)
except ValueError:
pass
connect_failed = True
- except x2go.X2goSessionException, e:
+ except x2go.X2GoSessionException, e:
self.notifier.send(_(u'%s - auth error') % profile_name, u'%s' % str(e), icon='auth_error', timeout=4000)
try:
self._temp_disabled_profile_names.remove(profile_name)
@@ -795,8 +795,8 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
_s = self.get_session_of_session_name(_session_name, return_object=True)
if _s is not None and _s.is_alive():
try:
- _s._X2goSession__exec_published_application(exec_name=_exec, timeout=40)
- except x2go.x2go_exceptions.X2goControlSessionException:
+ _s._X2GoSession__exec_published_application(exec_name=_exec, timeout=40)
+ except x2go.x2go_exceptions.X2GoControlSessionException:
self.notifier.send(_(u'%s - session warning') % profile_name, _(u'Execution of command ,,%s\'\' failed.') % _exec, icon='session_warning', timeout=10000)
except KeyError:
pass
@@ -1109,7 +1109,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
if not m.Yes(): return
else: os.remove(_export_file)
- exported_sessions = x2go.X2goSessionProfiles(config_files=[_export_file])
+ exported_sessions = x2go.X2GoSessionProfiles(config_files=[_export_file])
for profile_name in filtered_profile_names:
this_profile = self._X2GoClient__get_profile_config(profile_name)
diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py
index 2db22bb..87ee451 100644
--- a/pyhoca/wxgui/logon.py
+++ b/pyhoca/wxgui/logon.py
@@ -341,7 +341,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
icon='auth_failed')
connect_failed = True
- except x2go.X2goSSHProxyAuthenticationException:
+ except x2go.X2GoSSHProxyAuthenticationException:
try: wx.EndBusyCursor()
except: pass
self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
@@ -378,7 +378,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
icon='auth_error')
connect_failed = True
- except x2go.X2goHostKeyException, e:
+ except x2go.X2GoHostKeyException, e:
self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
title=_(u'%s - host key error') % self.current_profile_name,
text=_(u'The remote server\'s host key is invalid or has not been accepted by the user') + '!',
@@ -386,7 +386,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
timeout=4000)
connect_failed = True
- except x2go.X2goRemoteHomeException, e:
+ except x2go.X2GoRemoteHomeException, e:
self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
title=_(u'%s - missing home directory') % self.current_profile_name,
text=_("The remote user's home directory does not exist."),
@@ -394,7 +394,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
timeout=4000)
connect_failed = True
- except x2go.X2goSSHProxyException, e:
+ except x2go.X2GoSSHProxyException, e:
self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
title=_(u'%s - key error') % self.current_profile_name,
text='%s!' % str(e),
@@ -402,7 +402,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
timeout=4000)
connect_failed = True
- except x2go.X2goSessionException, e:
+ except x2go.X2GoSessionException, e:
self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
title=_(u'%s - auth error') % self.current_profile_name,
text='%s!' % str(e),
diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py
index 963da2a..864e58e 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -178,7 +178,7 @@ class PyHocaGUI_Menu_TaskbarSessionActions(wx.Menu):
@type profile_name: C{str}
@param session_name: X2Go session name this submenu is for
@type session_name: C{str}
- @param session_info: session info object (C{X2goServerSessionInfo*} from Python X2Go)
+ @param session_info: session info object (C{X2GoServerSessionInfo*} from Python X2Go)
@type session_info: C{obj}
@param status: status of this session (R for running, S for suspended)
@type status: C{str}
@@ -996,7 +996,7 @@ class PyHocaGUI_Menu_TaskbarSessionManager(wx.Menu):
self.AppendMenu(text=_menu_profile_name,
id=_this_id,
submenu=PyHocaGUI_Menu_TaskbarSessionProfile(self._PyHocaGUI, caller=self, profile_name=profile_name))
- except x2go.x2go_exceptions.X2goSessionRegistryException:
+ except x2go.x2go_exceptions.X2GoSessionRegistryException:
pass
if _connected_sessions:
hooks/post-receive
--
pyhoca-gui.git (Python X2Go Client (wxPython GUI))
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).
More information about the x2go-commits
mailing list