[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.1.1.4-256-gd4ec52b

X2Go dev team git-admin at x2go.org
Wed Jan 8 15:29:10 CET 2014


The branch, build-baikal has been updated
       via  d4ec52b42c35c39ef19a7f73d4ab48529cee219f (commit)
      from  1a37bcdf844a3497b5d476be8ecfb96ee9f5b094 (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:
 x2go/checkhosts.py |    2 +-
 x2go/session.py    |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/x2go/checkhosts.py b/x2go/checkhosts.py
index 3e10307..98badbb 100644
--- a/x2go/checkhosts.py
+++ b/x2go/checkhosts.py
@@ -217,7 +217,7 @@ def check_ssh_host_key(x2go_sshclient_instance, hostname, port=22):
     @return: returns a tuple with the following components (<host_ok>, <hostname>, <port>, <fingerprint>, <fingerprint_type>)
     @rtype: C{tuple}
 
-    @raise: SSHException: if an SSH exception occurred, that we did not provocate in L{X2goInteractiveAddPolicy.missing_host_key()}
+    @raise SSHException: if an SSH exception occurred, that we did not provocate in L{X2goInteractiveAddPolicy.missing_host_key()}
 
     """
     _hostname = hostname
diff --git a/x2go/session.py b/x2go/session.py
index 64322e5..287d442 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -476,7 +476,7 @@ class X2goSession(object):
         The master session is the session has been launched first for a specific connection,
         it also is _the_ session that controls the client-side shared folders.
 
-        If this L{X2goSession} instance is a standalone instance (without parent L{X2goCLient})
+        If this L{X2goSession} instance is a standalone instance (without parent L{X2goClient})
         this method will always return C{True}.
 
         @return: returns C{True} if this session is a master session
@@ -1836,7 +1836,7 @@ class X2goSession(object):
 
         @return: C{True} if the session will display on this client screen, 
             C{False} otherwise. If no terminal session is yet registered with this session, C{None} is returned.
-        @rtype C{bool}
+        @rtype: C{bool}
 
         """
         return utils.is_color_depth_ok(depth_session=self.color_depth_from_session_name(), depth_local=utils.local_color_depth())


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