The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated via 1905006936b073dc6c754f8617b2e5196146ca85 (commit) from 38b545056110856358a2273b0a6dc53235ffb403 (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 | 106 ++++++++++++++++++++--------------------- pyhoca/wxgui/logon.py | 8 ++-- pyhoca/wxgui/menus_taskbar.py | 6 +-- pyhoca/wxgui/sessiontitle.py | 2 +- 4 files changed, 61 insertions(+), 61 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 6bc336e..671e210 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -344,7 +344,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): if not self.args.single_session_profile: self.auto_connect = True self._pyhoca_logger('opening default session profile %s' % profile_name, loglevel=x2go.log.loglevel_NOTICE) - self._X2goClient__register_session(profile_name=profile_name, auto_connect=self.auto_connect) + self._X2GoClient__register_session(profile_name=profile_name, auto_connect=self.auto_connect) if self.auto_connect: gevent.spawn(self._auto_connect) @@ -361,7 +361,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): if not self.args.disable_splash: gevent.sleep(1) if not self.args.session_profile: - self._X2goClient__register_all_session_profiles() + self._X2GoClient__register_all_session_profiles() def session_auto_connect(self, session_uuid, **kwargs): """\ @@ -405,11 +405,11 @@ class PyHocaGUI(wx.App, x2go.X2goClient): """ if not self.get_session(session_uuid).published_applications: if self.resume_newest_on_connect: - self._X2goClient__session_auto_start_or_resume(session_uuid, newest=True, start=self.start_on_connect, **kwargs) + self._X2GoClient__session_auto_start_or_resume(session_uuid, newest=True, start=self.start_on_connect, **kwargs) elif self.resume_oldest_on_connect: - self._X2goClient__session_auto_start_or_resume(session_uuid, newest=False, oldest=True, start=self.start_on_connect, **kwargs) + self._X2GoClient__session_auto_start_or_resume(session_uuid, newest=False, oldest=True, start=self.start_on_connect, **kwargs) elif self.resume_all_on_connect: - self._X2goClient__session_auto_start_or_resume(session_uuid, newest=False, all_suspended=True, start=self.start_on_connect, **kwargs) + self._X2GoClient__session_auto_start_or_resume(session_uuid, newest=False, all_suspended=True, start=self.start_on_connect, **kwargs) def _exit_handler(self, *args): """\ @@ -434,7 +434,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): # close open password dialogs (or other remaining windows) for _win in self._sub_windows: _win.Close() - for session_obj in [ _s for _s in self._X2goClient__client_running_sessions(return_objects=True) if _s.is_associated() ]: + for session_obj in [ _s for _s in self._X2GoClient__client_running_sessions(return_objects=True) if _s.is_associated() ]: profile_name = session_obj.get_profile_name() if not self._hide_notifications_map.has_key(profile_name): self._hide_notifications_map[profile_name] = [] @@ -481,18 +481,18 @@ class PyHocaGUI(wx.App, x2go.X2goClient): """ if profile_name is None and session_uuid: - profile_name = self._X2goClient__get_session_profile_name(session_uuid) + profile_name = self._X2GoClient__get_session_profile_name(session_uuid) if not self._temp_launching_pubapp_locks.has_key(profile_name): self._temp_launching_pubapp_locks[profile_name] = threading.Lock() - if not self._X2goClient__client_connected_sessions_of_profile_name(profile_name): + if not self._X2GoClient__client_connected_sessions_of_profile_name(profile_name): return None if session_uuid is None and profile_name: - session_uuid = self._X2goClient__client_connected_sessions_of_profile_name(profile_name, return_objects=False)[0] + session_uuid = self._X2GoClient__client_connected_sessions_of_profile_name(profile_name, return_objects=False)[0] - connected_session = self._X2goClient__get_session(session_uuid) + connected_session = self._X2GoClient__get_session(session_uuid) if connected_session.has_server_feature('X2GO_PUBLISHED_APPLICATIONS') and self.get_profile_config(profile_name)['published']: if len(self.client_pubapp_sessions_of_profile_name(profile_name=profile_name)): @@ -508,7 +508,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): ### PyHoca-GUI does not support more than one session in published applications mode... # suspend any running session that is in published applications mode (unless we are already associated with it) - session_list = self._X2goClient__list_sessions(session_uuid=session_uuid, profile_name=profile_name) + session_list = self._X2GoClient__list_sessions(session_uuid=session_uuid, profile_name=profile_name) if session_list: pubapp_sessions_running = [ _sn for _sn in session_list.keys() if session_list[_sn].is_running() and session_list[_sn].is_published_applications_provider() ] for session_name in pubapp_sessions_running: @@ -519,7 +519,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): # be one) if pubapp_sessions_running: gevent.sleep(1) - session_list = self._X2goClient__list_sessions(session_uuid=session_uuid, profile_name=profile_name, refresh_cache=True) + session_list = self._X2GoClient__list_sessions(session_uuid=session_uuid, profile_name=profile_name, refresh_cache=True) if session_list: pubapp_sessions_suspended = [ _sn for _sn in session_list.keys() if session_list[_sn].is_suspended() and session_list[_sn].is_published_applications_provider() ] @@ -528,7 +528,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): if not pubapp_session_resumed: # resume one single session in published applications mode immediately, if available - pubapp_session = self._X2goClient__register_session(profile_name=profile_name, + pubapp_session = self._X2GoClient__register_session(profile_name=profile_name, published_applications=True, cmd='PUBLISHED', session_type='published', @@ -545,7 +545,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): if not pubapp_session_resumed: - pubapp_session = self._X2goClient__register_session(profile_name=profile_name, + pubapp_session = self._X2GoClient__register_session(profile_name=profile_name, published_applications=True, cmd='PUBLISHED', session_type='published', @@ -598,13 +598,13 @@ class PyHocaGUI(wx.App, x2go.X2goClient): connect_failed = False profile_name = self.get_session(session_uuid).get_profile_name() try: - _can_session_auto_connect = self._X2goClient__session_can_auto_connect(session_uuid) - _can_sshproxy_auto_connect = self._X2goClient__session_can_sshproxy_auto_connect(session_uuid) - _session_uses_sshproxy = self._X2goClient__session_uses_sshproxy(session_uuid) - _session_reuses_sshproxy_authinfo = self._X2goClient__session_reuses_sshproxy_authinfo(session_uuid) + _can_session_auto_connect = self._X2GoClient__session_can_auto_connect(session_uuid) + _can_sshproxy_auto_connect = self._X2GoClient__session_can_sshproxy_auto_connect(session_uuid) + _session_uses_sshproxy = self._X2GoClient__session_uses_sshproxy(session_uuid) + _session_reuses_sshproxy_authinfo = self._X2GoClient__session_reuses_sshproxy_authinfo(session_uuid) if _can_session_auto_connect: - self._X2goClient__connect_session(session_uuid, add_to_known_hosts=self.add_to_known_hosts) - if not self._X2goClient__server_valid_x2gouser(session_uuid): + self._X2GoClient__connect_session(session_uuid, add_to_known_hosts=self.add_to_known_hosts) + if not self._X2GoClient__server_valid_x2gouser(session_uuid): self.notifier.send(_(u'%s - connect failure') % profile_name, _(u'User is not allowed to start X2Go sessions!'), icon='session_warning', timeout=10000) self.OnServerDisconnect(evt) try: @@ -613,7 +613,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): pass else: self.notifier.send(_(u'%s - connect') % profile_name, _(u'SSH key authentication has been successful.'), icon='auth_success', timeout=4000) - self._X2goClient__list_sessions(session_uuid, refresh_cache=True, update_sessionregistry=True) + self._X2GoClient__list_sessions(session_uuid, refresh_cache=True, update_sessionregistry=True) self._post_authenticate(evt, session_uuid) try: self._temp_disabled_profile_names.remove(profile_name) @@ -735,7 +735,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): return self.taskbar.SetIconConnecting(profile_name) if session_uuid is None: - session_uuid = self._X2goClient__register_session(profile_name=profile_name) + session_uuid = self._X2GoClient__register_session(profile_name=profile_name) if session_uuid: self._temp_disabled_profile_names.append(profile_name) gevent.spawn(self._do_authenticate, evt, session_uuid) @@ -753,10 +753,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient): """ profile_name = self._eventid_profilenames_map[evt.GetId()] - session_uuid = self._X2goClient__register_session(profile_name=profile_name, published_applications=False) - if self._X2goClient__server_is_alive(session_uuid): - gevent.spawn(self._X2goClient__start_session, session_uuid) - self._X2goClient__list_sessions(session_uuid, refresh_cache=True) + session_uuid = self._X2GoClient__register_session(profile_name=profile_name, published_applications=False) + if self._X2GoClient__server_is_alive(session_uuid): + gevent.spawn(self._X2GoClient__start_session, session_uuid) + self._X2GoClient__list_sessions(session_uuid, refresh_cache=True) def OnPubAppSessionStart(self, evt): """\ @@ -811,10 +811,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient): """ profile_name = self._eventid_profilenames_map[evt.GetId()] _application = self._eventid_applications_map[evt.GetId()] - session_uuid = self._X2goClient__register_session(profile_name=profile_name, cmd=_application, session_type="application") - if self._X2goClient__server_is_alive(session_uuid): - gevent.spawn(self._X2goClient__start_session, session_uuid) - self._X2goClient__list_sessions(session_uuid, refresh_cache=True) + session_uuid = self._X2GoClient__register_session(profile_name=profile_name, cmd=_application, session_type="application") + if self._X2GoClient__server_is_alive(session_uuid): + gevent.spawn(self._X2GoClient__start_session, session_uuid) + self._X2GoClient__list_sessions(session_uuid, refresh_cache=True) def _disable_session_name(self, profile_name, session_name): """\ @@ -883,12 +883,12 @@ class PyHocaGUI(wx.App, x2go.X2goClient): """ profile_name = self._eventid_profilenames_map[evt.GetId()] - session_uuid = self._X2goClient__client_registered_sessions_of_profile_name(profile_name)[0] + session_uuid = self._X2GoClient__client_registered_sessions_of_profile_name(profile_name)[0] session_name = self._eventid_sessionnames_map[evt.GetId()] self._disable_session_name(profile_name, session_name) - if self._X2goClient__server_is_alive(session_uuid): - gevent.spawn(self._X2goClient__resume_session, session_name=session_name, match_profile_name=profile_name) - self._X2goClient__list_sessions(session_uuid, refresh_cache=True) + if self._X2GoClient__server_is_alive(session_uuid): + gevent.spawn(self._X2GoClient__resume_session, session_name=session_name, match_profile_name=profile_name) + self._X2GoClient__list_sessions(session_uuid, refresh_cache=True) self._eventid_sessionnames_map = {} def OnSessionSuspend(self, evt): @@ -900,10 +900,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient): """ profile_name = self._eventid_profilenames_map[evt.GetId()] - session_uuid = self._X2goClient__client_registered_sessions_of_profile_name(profile_name)[0] + session_uuid = self._X2GoClient__client_registered_sessions_of_profile_name(profile_name)[0] session_name = self._eventid_sessionnames_map[evt.GetId()] self._disable_session_name(profile_name, session_name) - gevent.spawn(self._X2goClient__suspend_session, session_uuid, session_name=session_name, match_profile_name=profile_name) + gevent.spawn(self._X2GoClient__suspend_session, session_uuid, session_name=session_name, match_profile_name=profile_name) self._eventid_sessionnames_map = {} if self.disconnect_on_suspend and self.get_session(session_uuid).has_terminal_session(): self.OnServerDisconnect(evt) @@ -917,10 +917,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient): """ profile_name = self._eventid_profilenames_map[evt.GetId()] - session_uuid = self._X2goClient__client_registered_sessions_of_profile_name(profile_name)[0] + session_uuid = self._X2GoClient__client_registered_sessions_of_profile_name(profile_name)[0] session_name = self._eventid_sessionnames_map[evt.GetId()] self._disable_session_name(profile_name, session_name) - gevent.spawn(self._X2goClient__terminate_session, session_uuid, session_name=session_name, match_profile_name=profile_name) + gevent.spawn(self._X2GoClient__terminate_session, session_uuid, session_name=session_name, match_profile_name=profile_name) self._eventid_sessionnames_map = {} if self.disconnect_on_terminate and self.get_session(session_uuid).has_terminal_session(): self.OnServerDisconnect(evt) @@ -934,9 +934,9 @@ class PyHocaGUI(wx.App, x2go.X2goClient): """ profile_name = self._eventid_profilenames_map[evt.GetId()] - session_uuid = self._X2goClient__client_registered_sessions_of_profile_name(profile_name)[0] - session_list = self._X2goClient__list_sessions(session_uuid) - if self._X2goClient__server_is_alive(session_uuid): + session_uuid = self._X2GoClient__client_registered_sessions_of_profile_name(profile_name)[0] + session_list = self._X2GoClient__list_sessions(session_uuid) + if self._X2GoClient__server_is_alive(session_uuid): if session_list: _notify_text = _(u'Cleaning X2Go sessions...') if not self._hide_notifications_map.has_key(profile_name): @@ -948,7 +948,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): self._hide_notifications_map[profile_name].append(session_name) self._disable_session_name(profile_name, session_name) self.notifier.send(profile_name, _notify_text, icon='session_cleanall', timeout=10000) - gevent.spawn(self._X2goClient__clean_sessions, session_uuid, published_applications=False) + gevent.spawn(self._X2GoClient__clean_sessions, session_uuid, published_applications=False) def OnServerDisconnect(self, evt): """\ @@ -959,14 +959,14 @@ class PyHocaGUI(wx.App, x2go.X2goClient): """ profile_name = self._eventid_profilenames_map[evt.GetId()] - session_uuids = self._X2goClient__client_registered_sessions_of_profile_name(profile_name) + session_uuids = self._X2GoClient__client_registered_sessions_of_profile_name(profile_name) if session_uuids: # disconnect all sessions of profile - if self._X2goClient__server_is_alive(session_uuids[0]) and not self.args.single_session_profile: - self._hide_notifications_map[profile_name] = self._X2goClient__client_running_sessions_of_profile_name(profile_name, return_session_names=True) + if self._X2GoClient__server_is_alive(session_uuids[0]) and not self.args.single_session_profile: + self._hide_notifications_map[profile_name] = self._X2GoClient__client_running_sessions_of_profile_name(profile_name, return_session_names=True) - gevent.spawn(self._X2goClient__disconnect_profile, profile_name) + gevent.spawn(self._X2GoClient__disconnect_profile, profile_name) if self.exit_on_disconnect: self._pyhoca_logger('Exiting %s because %s got disconnected.' % (self.appname, profile_name), loglevel=x2go.loglevel_NOTICE) @@ -1081,7 +1081,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): if profile_group: # This returns a Python list of files that were selected. - filtered_profile_names = [ pn for pn in self._X2goClient__get_profiles().profile_names if pn.startswith(unicode(profile_group)) ] + filtered_profile_names = [ pn for pn in self._X2GoClient__get_profiles().profile_names if pn.startswith(unicode(profile_group)) ] dlg = wx.FileDialog( self.about, message=_(u"%s - export session profiles") % profile_group, defaultFile="%s.x2go" % profile_group.replace("/", "::"), wildcard="*.x2go", style=wx.FD_SAVE) @@ -1111,7 +1111,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): exported_sessions = x2go.X2goSessionProfiles(config_files=[_export_file]) for profile_name in filtered_profile_names: - this_profile = self._X2goClient__get_profile_config(profile_name) + this_profile = self._X2GoClient__get_profile_config(profile_name) # clean up session profile options that are unknown to Python X2Go for key in copy.deepcopy(this_profile).keys(): @@ -1154,7 +1154,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): # process the data. if dlg.ShowModal() == wx.ID_OK: # This returns a Python list of files that were selected. - self._X2goClient__share_local_folder_with_session(profile_name=profile_name, folder_name=str(dlg.GetPath())) + self._X2GoClient__share_local_folder_with_session(profile_name=profile_name, folder_name=str(dlg.GetPath())) def OnRememberSharedFolders(self, evt): """\ @@ -1178,7 +1178,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): """ profile_name = self._eventid_profilenames_map[evt.GetId()] - self._X2goClient__unshare_all_local_folders_from_profile(profile_name=profile_name) + self._X2GoClient__unshare_all_local_folders_from_profile(profile_name=profile_name) def OnShareLocalFolder(self, evt): """\ @@ -1190,7 +1190,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): """ profile_name = self._eventid_profilenames_map[evt.GetId()] _share_folder = self._eventid_unshared_folders_map[evt.GetId()] - self._X2goClient__share_local_folder(profile_name=profile_name, local_path=_share_folder) + self._X2GoClient__share_local_folder(profile_name=profile_name, local_path=_share_folder) def OnUnshareLocalFolder(self, evt): """\ @@ -1202,7 +1202,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): """ profile_name = self._eventid_profilenames_map[evt.GetId()] _unshare_folder = self._eventid_shared_folders_map[evt.GetId()] - self._X2goClient__unshare_local_folder_from_profile(profile_name=profile_name, local_path=_unshare_folder) + self._X2GoClient__unshare_local_folder_from_profile(profile_name=profile_name, local_path=_unshare_folder) def OnListSessions(self, evt): """\ @@ -1235,7 +1235,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): """ session_name = self._eventid_sessionnames_map[evt.GetId()] - _s = self._X2goClient__get_session_of_session_name(session_name, return_object=True) + _s = self._X2GoClient__get_session_of_session_name(session_name, return_object=True) _s.raise_session_window() def OnAbout(self, evt): diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index 0557288..2db22bb 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -281,9 +281,9 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): sshproxy_force_password_auth = True wx.BeginBusyCursor() - session_uuid = self._PyHocaGUI._X2goClient__client_registered_sessions_of_profile_name(self.current_profile_name)[0] + session_uuid = self._PyHocaGUI._X2GoClient__client_registered_sessions_of_profile_name(self.current_profile_name)[0] try: - self._PyHocaGUI._X2goClient__connect_session(session_uuid, + self._PyHocaGUI._X2GoClient__connect_session(session_uuid, username=username, password=password, force_password_auth=force_password_auth, @@ -292,7 +292,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): sshproxy_password=sshproxy_password, sshproxy_force_password_auth=sshproxy_force_password_auth, ) - if not self._PyHocaGUI._X2goClient__server_valid_x2gouser(session_uuid): + if not self._PyHocaGUI._X2GoClient__server_valid_x2gouser(session_uuid): self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, title=_(u'%s - connect failure') % self.current_profile_name, text=_(u'User is not allowed to start X2Go sessions!'), @@ -437,7 +437,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): self._PyHocaGUI.WakeUpIdle() self._PyHocaGUI.ExitMainLoop() - if self._PyHocaGUI._X2goClient__is_session_connected(session_uuid): + if self._PyHocaGUI._X2GoClient__is_session_connected(session_uuid): self._PyHocaGUI._post_authenticate(evt, session_uuid) self.sshproxy_started = False try: del self._PyHocaGUI._logon_windows[self.current_profile_name] diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index d853ecd..963da2a 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -329,7 +329,7 @@ class PyHocaGUI_Menu_TaskbarProfileSharedFolders(wx.Menu): self.AppendSeparator() _exported_folders = self._PyHocaGUI.get_profile_config(profile_name, 'export') - _shared_folders = self._PyHocaGUI._X2goClient__profile_get_shared_folders(profile_name=profile_name, check_list_mounts=True) or [] + _shared_folders = self._PyHocaGUI._X2GoClient__profile_get_shared_folders(profile_name=profile_name, check_list_mounts=True) or [] _sharable_folders = [] for _folder_path in _exported_folders.keys(): @@ -763,7 +763,7 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu): self._PyHocaGUI._eventid_profilenames_map[ID_UNSHAREFOLDERS] = profile_name if current_profile_config['useexports'] and \ - self._PyHocaGUI._X2goClient__profile_is_folder_sharing_available(profile_name=profile_name) and \ + self._PyHocaGUI._X2GoClient__profile_is_folder_sharing_available(profile_name=profile_name) and \ self._PyHocaGUI.get_master_session(profile_name) is not None and \ self._PyHocaGUI.is_session_name_enabled(profile_name, self._PyHocaGUI.get_master_session(profile_name).get_session_name()): @@ -987,7 +987,7 @@ class PyHocaGUI_Menu_TaskbarSessionManager(wx.Menu): _connected_sessions = False for profile_name in _profile_names: - if profile_name in self._PyHocaGUI._X2goClient__client_connected_sessions(return_profile_names=True): + if profile_name in self._PyHocaGUI._X2GoClient__client_connected_sessions(return_profile_names=True): _connected_sessions = True _this_id = wx.NewId() diff --git a/pyhoca/wxgui/sessiontitle.py b/pyhoca/wxgui/sessiontitle.py index 975c52d..ef69ece 100644 --- a/pyhoca/wxgui/sessiontitle.py +++ b/pyhoca/wxgui/sessiontitle.py @@ -144,7 +144,7 @@ class PyHocaGUI_DialogBoxSessionTitle(wx.Dialog): """ title = self.titleTxt.GetValue() - _session = self._PyHocaGUI._X2goClient__get_session_of_session_name(session_name=self.current_session_name, return_object=True) + _session = self._PyHocaGUI._X2GoClient__get_session_of_session_name(session_name=self.current_session_name, return_object=True) _session.set_session_window_title(title=title) self.Close() 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)).