[X2Go-Commits] python-x2go.git - release/0.4.0.x (branch) updated: 0.2.0.5-3-gca6ee3d

X2Go dev team git-admin at x2go.org
Tue Jan 7 16:18:06 CET 2014


The branch, release/0.4.0.x has been updated
       via  ca6ee3d9c05a9c67adaf02b39fe1b66516bdebcd (commit)
      from  74e94b351511c2dd1c8e7a7ca6eb92e97f4ec220 (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:
 debian/changelog |    1 +
 x2go/session.py  |   28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a8769bb..52f8d49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ python-x2go (0.2.0.6-0~x2go1) UNRELEASED; urgency=low
   * New upstream version (0.2.0.6)
     - Ignore non-master sessions before calling the foldersharing-
       not-available hook.
+    - Add several double underscore method aliases in X2goSession class.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 12 Jun 2012 15:51:52 +0200
 
diff --git a/x2go/session.py b/x2go/session.py
index 2edba02..504bd72 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -357,6 +357,7 @@ class X2goSession(object):
 
         """
         return self.client_instance
+    __get_client_instance = get_client_instance
 
     def HOOK_on_control_session_death(self):
         """\
@@ -505,6 +506,7 @@ class X2goSession(object):
                                                         sessions_rootdir=self.sessions_rootdir,
                                                         ssh_rootdir=self.ssh_rootdir,
                                                         logger=self.logger)
+    __init_control_session = init_control_session
 
     def is_master_session(self):
         """\
@@ -523,6 +525,7 @@ class X2goSession(object):
         if self.master_session is None and self.client_instance is None:
             return True
         return bool(self.master_session)
+    __is_master_session = is_master_session
 
     def set_master_session(self, wait=0, max_wait=20):
         """\
@@ -552,6 +555,7 @@ class X2goSession(object):
             gevent.spawn_later(wait, self.share_all_local_folders)
         else:
             gevent.spawn(self.share_all_local_folders)
+    __set_master_session = set_master_session
 
     def unset_master_session(self):
         """\
@@ -562,6 +566,7 @@ class X2goSession(object):
         if self.has_terminal_session():
             self.unshare_all_local_folders()
         self.master_session = False
+    __unset_master_session = unset_master_session
 
     def set_server(self, server):
         """\
@@ -572,6 +577,7 @@ class X2goSession(object):
 
         """
         self.server = server
+    __set_server = set_server
 
     def set_port(self, port):
         """\
@@ -582,6 +588,7 @@ class X2goSession(object):
 
         """
         self.port = port
+    __set_port = set_port
 
     def set_profile_name(self, profile_name):
         """\
@@ -593,6 +600,7 @@ class X2goSession(object):
         """
         self.profile_name = profile_name
         self.control_session.set_profile_name(profile_name)
+    __set_profile_name = set_profile_name
 
     def get_session_profile_option(self, option):
         """\
@@ -611,6 +619,7 @@ class X2goSession(object):
             return eval("self.%s" % option)
         else:
             raise x2go_exceptions.X2goProfileException('Unknown session profile option: %s.' % option)
+    __get_session_profile_name = get_session_profile_name
 
     def __str__(self):
         return self.__get_uuid()
@@ -889,6 +898,7 @@ class X2goSession(object):
             return self.terminal_session.get_session_type()
         else:
             return None
+    __get_session_type = get_session_type
 
     def get_session_title(self):
         """\
@@ -903,6 +913,7 @@ class X2goSession(object):
             return self.terminal_session.session_title
         else:
             return 'X2GO-%s' % self.get_session_name()
+    __get_session_title = get_session_title
 
     def get_control_session(self):
         """\
@@ -979,6 +990,7 @@ class X2goSession(object):
 
         """
         return self.use_sshproxy
+    __uses_sshproxy = uses_sshproxy
 
     def can_sshproxy_auto_connect(self):
         """\
@@ -1050,6 +1062,7 @@ class X2goSession(object):
                     gevent.spawn(self.connect)
                 elif self.auto_connect:
                     gevent.spawn(self.HOOK_auto_connect)
+    __do_auto_connect = do_auto_connect
 
     def connect(self, username='', password='', add_to_known_hosts=False, force_password_auth=False,
                 use_sshproxy=False, sshproxy_user='', sshproxy_password=''):
@@ -1174,6 +1187,7 @@ class X2goSession(object):
 
         """
         self.server_features = self.control_session.query_server_features()
+    __retrieve_server_features = retrieve_server_features
 
     def get_server_features(self):
         """\
@@ -1184,6 +1198,7 @@ class X2goSession(object):
 
         """
         return self.server_features
+    __get_server_features = get_server_features
 
     def has_server_feature(self, feature):
         """\
@@ -1197,6 +1212,7 @@ class X2goSession(object):
 
         """
         return feature in self.get_server_features()
+    __has_server_feature = has_server_feature
 
     def set_session_window_title(self, title=''):
         """\
@@ -1210,6 +1226,7 @@ class X2goSession(object):
         """
         if self.terminal_session is not None:
             self.terminal_session.set_session_window_title(title=title)
+    __set_session_window_title = set_session_window_title
 
     def raise_session_window(self):
         """\
@@ -1219,6 +1236,7 @@ class X2goSession(object):
         """
         if self.terminal_session is not None:
             self.terminal_session.raise_session_window()
+    __raise_session_window = raise_session_window
 
     def set_print_action(self, print_action, **kwargs):
         """\
@@ -1337,6 +1355,7 @@ class X2goSession(object):
             self.HOOK_on_control_session_death()
             self._X2goSession__disconnect()
             return None
+    __list_mounts = list_mounts
 
     def update_status(self, session_list=None, force_update=False):
         """\
@@ -1428,6 +1447,7 @@ class X2goSession(object):
         if self.has_terminal_session() and self.is_running() :
             return self.terminal_session.is_published_applications_provider()
         return False
+    __is_published_applications_provider = is_published_applications_provider
 
     def is_desktop_session(self):
         """\
@@ -1440,6 +1460,7 @@ class X2goSession(object):
         if self.has_terminal_session():
             return self.terminal_session.is_desktop_session()
         return False
+    __is_desktop_session = is_desktop_session
 
     def get_published_applications(self, lang=None, refresh=False, raw=False, very_raw=False, max_no_submenus=defaults.PUBAPP_MAX_NO_SUBMENUS):
         """\
@@ -1464,6 +1485,7 @@ class X2goSession(object):
         if self.client_instance and hasattr(self.client_instance, 'lang'):
             lang = self.client_instance.lang
         return self.control_session.get_published_applications(lang=lang, refresh=refresh, raw=raw, very_raw=very_raw, max_no_submenus=max_no_submenus)
+    __get_published_applications = get_published_applications
 
     def exec_published_application(self, exec_name, timeout=20):
         """\
@@ -1525,6 +1547,7 @@ class X2goSession(object):
                 else:
                     if not self.published_applications:
                         return self.start()
+    __do_auto_start_or_resume = do_auto_start_or_resume
 
     def resume(self, session_name=None, session_list=None, cmd=None):
         """\
@@ -2015,6 +2038,7 @@ class X2goSession(object):
         else:
             self.logger('local folder sharing is disabled for this session profile', loglevel=log.loglevel_WARN)
         return False
+    __is_folder_sharing_available = is_folder_sharing_available
 
     def share_local_folder(self, local_path=None, folder_name=None):
         """\
@@ -2069,6 +2093,7 @@ class X2goSession(object):
                 else:
                     self.HOOK_foldersharing_not_available()
         return _retval
+    __share_all_local_folders = share_all_local_folders
 
     def unshare_all_local_folders(self, force_all=False):
         """\
@@ -2190,6 +2215,7 @@ class X2goSession(object):
         if self.control_session is not None:
             return self.control_session.locked or self.locked
         return None
+    __is_locked = is_locked
 
     def session_cleanup(self):
         """\
@@ -2209,3 +2235,5 @@ class X2goSession(object):
             self.terminal_session.__del__()
 
         self.terminal_session = None
+    __session_cleanup = session_cleanup
+


hooks/post-receive
-- 
python-x2go.git (Python X2Go Client API)

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 "python-x2go.git" (Python X2Go Client API).




More information about the x2go-commits mailing list