[X2Go-Commits] python-x2go.git - release/0.4.0.x (branch) updated: 0.1.1.4-93-ga2e0625

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


The branch, release/0.4.0.x has been updated
       via  a2e0625441c1653d71c27f9ed4f791c487338fd4 (commit)
      from  159dd4b571172941dd44687fac7068de1b3fb58e (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                       |   21 ++++++++++-------
 x2go/backends/control/_stdout.py       |    2 +-
 x2go/backends/printing/_gconf.py       |    2 +-
 x2go/backends/printing/_winreg.py      |    2 ++
 x2go/backends/profiles/_file.py        |    2 +-
 x2go/backends/profiles/_gconf.py       |    2 +-
 x2go/backends/profiles/_httpsbroker.py |    3 ++-
 x2go/backends/profiles/_winreg.py      |    2 +-
 x2go/backends/settings/_gconf.py       |    1 +
 x2go/backends/settings/_winreg.py      |    1 +
 x2go/checkhosts.py                     |    2 ++
 x2go/client.py                         |    4 ++--
 x2go/log.py                            |    1 +
 x2go/mimebox.py                        |    2 +-
 x2go/mimeboxactions.py                 |    5 ++--
 x2go/printactions.py                   |    5 ++--
 x2go/registry.py                       |   16 ++++++-------
 x2go/session.py                        |   40 ++++++++++++++++----------------
 x2go/sshproxy.py                       |   24 +++++++++----------
 x2go/utils.py                          |    2 +-
 20 files changed, 76 insertions(+), 63 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 5d25404..451a5ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,18 @@
 python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
 
-  * License change upstream: GPLv3+ -> AGPLv3+
+  *New upstream version (0.1.2.0)
+    - License change upstream: GPLv3+ -> AGPLv3+
+    - Add support for session window title renaming.
+    - Add support for bringing session windows on top.
+    - Terminal session now remember the X window of a terminal session in as
+      an internal property.
+    - Fix many undefined symbols reported by Debian developer
+      Jakub Wilk. (THANKS!)
+  * Depend on python-xlib.
 
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 25 Sep 2011 02:08:11 +0200
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sat, 28 Sep 2012 01:44:21 +0100
 
-python-x2go (0.1.1.9-0-x2go1) UNRELEASED; urgency=low
+python-x2go (0.1.1.9-0-x2go1) unstable; urgency=low
 
   * New upstream version (0.1.1.9), bugfix release for 0.1.1.x series:
     - Ignore session registry exceptions for profiles that just got disconnected.
@@ -18,13 +26,8 @@ python-x2go (0.1.1.9-0-x2go1) UNRELEASED; urgency=low
     - Fix for list processing in  INI files.
     - Make terminal backend ,,applications'' aware.
     - Allow session parameter change for already registered sessions.
-    - Add support for session window title renaming.
-    - Add support for bringing session windows on top.
-    - Terminal session now remember the X window of a terminal session in as
-      an internal property.
-  * Depend on python-xlib.
 
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 12 Oct 2011 10:54:23 +0200
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 27 Jan 2012 23:36:13 +0100
 
 python-x2go (0.1.1.8-0-x2go1) unstable; urgency=low
 
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index 0fb0171..ba6c1ea 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -174,7 +174,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
             self.logger('sFTP-write: writing content: %s' % content, loglevel=log.loglevel_DEBUG_SFTPXFER)
             remote_fileobj.write(content)
             remote_fileobj.close()
-        except SSHException:
+        except x2go_exceptions.SSHException:
             self.logger('sFTP-write: opening remote file %s on host %s failed' % (remote_path, self.get_transport().getpeername()), loglevel=log.loglevel_WARN)
 
     def _x2go_sftp_remove(self, remote_path):
diff --git a/x2go/backends/printing/_gconf.py b/x2go/backends/printing/_gconf.py
index 3d5b6e2..aa97de4 100644
--- a/x2go/backends/printing/_gconf.py
+++ b/x2go/backends/printing/_gconf.py
@@ -39,7 +39,7 @@ from x2go.defaults import X2GO_CLIENTPRINTING_DEFAULTS as _X2GO_CLIENTPRINTING_D
 from x2go.defaults import X2GO_PRINTING_CONFIGFILES as _X2GO_PRINTING_CONFIGFILES
 import x2go.inifiles as inifiles
 
-from x2go.x2go_exceptions import *
+from x2go.x2go_exceptions import X2goNotImplementedYetException
 
 class X2goClientPrintingGCONF(inifiles.X2goIniFile):
     """\
diff --git a/x2go/backends/printing/_winreg.py b/x2go/backends/printing/_winreg.py
index 50e44f1..ba02a29 100644
--- a/x2go/backends/printing/_winreg.py
+++ b/x2go/backends/printing/_winreg.py
@@ -39,6 +39,8 @@ from x2go.defaults import X2GO_CLIENTPRINTING_DEFAULTS as _X2GO_CLIENTPRINTING_D
 from x2go.defaults import X2GO_PRINTING_CONFIGFILES as _X2GO_PRINTING_CONFIGFILES
 import x2go.inifiles as inifiles
 
+from x2go.x2go_exceptions import X2goNotImplementedYetException
+
 class X2goClientPrintingWINREG(inifiles.X2goIniFile):
     """\
     L{X2goClientPrinting} provides access to the X2go ini-like file
diff --git a/x2go/backends/profiles/_file.py b/x2go/backends/profiles/_file.py
index 5b56c1d..0a49a3c 100644
--- a/x2go/backends/profiles/_file.py
+++ b/x2go/backends/profiles/_file.py
@@ -80,7 +80,7 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile):
         STILL UNDOCUMENTED
 
         """
-        _profile_id = check_profile_id_or_name(self, profile_id_or_name)
+        _profile_id = self.check_profile_id_or_name(self, profile_id_or_name)
         return self.get_profile_config(profile_id=_profile_id)
 
     def get_profile_metatype(self, profile_id_or_name, force=False):
diff --git a/x2go/backends/profiles/_gconf.py b/x2go/backends/profiles/_gconf.py
index a6aedb8..d8c689c 100644
--- a/x2go/backends/profiles/_gconf.py
+++ b/x2go/backends/profiles/_gconf.py
@@ -36,7 +36,7 @@ import x2go.log as log
 import x2go.utils as hostname 
 
 from x2go.x2go_exceptions import X2goProfileException
-
+from x2go.x2go_exceptions import X2goNotImplementedYetException
 
 class X2goSessionProfilesGCONF(inifiles.X2goIniFile):
 
diff --git a/x2go/backends/profiles/_httpsbroker.py b/x2go/backends/profiles/_httpsbroker.py
index 832b3b2..f46672b 100644
--- a/x2go/backends/profiles/_httpsbroker.py
+++ b/x2go/backends/profiles/_httpsbroker.py
@@ -34,8 +34,9 @@ from x2go.defaults import X2GO_SESSIONPROFILE_DEFAULTS
 import x2go.inifiles as inifiles
 import x2go.log as log
 import x2go.utils as utils
-from x2go.x2go_exceptions import X2goProfileException
 
+from x2go.x2go_exceptions import X2goProfileException
+from x2go.x2go_exceptions import X2goNotImplementedYetException
 
 class X2goSessionProfilesHTTPSBROKER(inifiles.X2goIniFile):
 
diff --git a/x2go/backends/profiles/_winreg.py b/x2go/backends/profiles/_winreg.py
index 4142030..bc0f043 100644
--- a/x2go/backends/profiles/_winreg.py
+++ b/x2go/backends/profiles/_winreg.py
@@ -36,7 +36,7 @@ import x2go.log as log
 import x2go.utils as hostname 
 
 from x2go.x2go_exceptions import X2goProfileException
-
+from x2go.x2go_exceptions import X2goNotImplementedYetException
 
 class X2goSessionProfilesWINREG(inifiles.X2goIniFile):
 
diff --git a/x2go/backends/settings/_gconf.py b/x2go/backends/settings/_gconf.py
index e29d8a1..8ee8aef 100644
--- a/x2go/backends/settings/_gconf.py
+++ b/x2go/backends/settings/_gconf.py
@@ -37,6 +37,7 @@ from x2go.defaults import X2GO_SETTINGS_CONFIGFILES as _X2GO_SETTINGS_CONFIGFILE
 from x2go.defaults import X2GO_CLIENTSETTINGS_DEFAULTS as _X2GO_CLIENTSETTINGS_DEFAULTS
 import x2go.inifiles as inifiles
 
+from x2go.x2go_exceptions import X2goNotImplementedYetException
 
 class X2goClientSettingsGCONF(inifiles.X2goIniFile):
     """\
diff --git a/x2go/backends/settings/_winreg.py b/x2go/backends/settings/_winreg.py
index 6db8604..2e1e633 100644
--- a/x2go/backends/settings/_winreg.py
+++ b/x2go/backends/settings/_winreg.py
@@ -37,6 +37,7 @@ from x2go.defaults import X2GO_SETTINGS_CONFIGFILES as _X2GO_SETTINGS_CONFIGFILE
 from x2go.defaults import X2GO_CLIENTSETTINGS_DEFAULTS as _X2GO_CLIENTSETTINGS_DEFAULTS
 import x2go.inifiles as inifiles
 
+from x2go.x2go_exceptions import X2goNotImplementedYetException
 
 class X2goClientSettingsWINREG(inifiles.X2goIniFile):
     """\
diff --git a/x2go/checkhosts.py b/x2go/checkhosts.py
index b47193c..79a3bd9 100644
--- a/x2go/checkhosts.py
+++ b/x2go/checkhosts.py
@@ -32,6 +32,8 @@ import uuid
 import sshproxy
 import log
 import x2go_exceptions
+import random
+import string
 
 class X2goInteractiveAddPolicy(paramiko.MissingHostKeyPolicy):
     """\
diff --git a/x2go/client.py b/x2go/client.py
index e8db628..6853447 100644
--- a/x2go/client.py
+++ b/x2go/client.py
@@ -994,7 +994,7 @@ class X2goClient(object):
         """
         try:
             return self.session_registry.get_session_of_session_name(session_name=session_name, return_object=return_object)
-        except X2goSessionExceptionRegistryException:
+        except x2go_exceptions.X2goSessionRegistryException:
             return None
     __get_session_of_session_name = get_session_of_session_name
 
@@ -2545,6 +2545,6 @@ class X2goClient(object):
         for profile_name in self.client_connected_profiles(return_profile_names=True):
             try:
                 self.__register_available_server_sessions_by_profile_name(profile_name)
-            except X2goSessionRegistryException:
+            except x2go_exceptions.X2goSessionRegistryException:
                 pass
     __register_available_server_sessions_all_profiles = register_available_server_sessions_all_profiles
diff --git a/x2go/log.py b/x2go/log.py
index 13e9c0f..0fced4d 100644
--- a/x2go/log.py
+++ b/x2go/log.py
@@ -26,6 +26,7 @@ __NAME__ = 'x2gologger-pylib'
 # modules
 import os
 import sys
+import types
 
 loglevel_NONE = 0
 loglevel_ERROR = 8
diff --git a/x2go/mimebox.py b/x2go/mimebox.py
index 8ecc94c..5bfdb75 100644
--- a/x2go/mimebox.py
+++ b/x2go/mimebox.py
@@ -97,7 +97,7 @@ class X2goMIMEboxQueue(threading.Thread):
         self._accept_jobs = False
 
         if mimebox_action is None:
-            mimebox_action = mimebox_actions.X2goMIMEboxActionOPEN(client_instance=self.client_instance, logger=self.logger)
+            mimebox_action = mimeboxactions.X2goMIMEboxActionOPEN(client_instance=self.client_instance, logger=self.logger)
         elif type(mimebox_action) in (types.StringType, types.UnicodeType):
             mimebox_action = self.set_mimebox_action(mimebox_action, client_instance=self.client_instance, logger=self.logger)
         else:
diff --git a/x2go/mimeboxactions.py b/x2go/mimeboxactions.py
index 095e0e2..1b815f9 100644
--- a/x2go/mimeboxactions.py
+++ b/x2go/mimeboxactions.py
@@ -38,6 +38,7 @@ from defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS
 if _X2GOCLIENT_OS in ("Windows"):
     import subprocess
     import win32api
+    import x2go_exceptions.WindowsError as WindowsError
 else:
     import gevent_subprocess as subprocess
 
@@ -84,7 +85,7 @@ class X2goMIMEboxAction(object):
         self.client_instance = client_instance
 
     @property
-    def name():
+    def name(self):
         """\
         Return the X2go MIME box action's name.
 
@@ -92,7 +93,7 @@ class X2goMIMEboxAction(object):
         return self.__name__
 
     @property
-    def description():
+    def description(self):
         """\
         Return the X2go MIME box action's description text.
 
diff --git a/x2go/printactions.py b/x2go/printactions.py
index e14369f..4f26499 100644
--- a/x2go/printactions.py
+++ b/x2go/printactions.py
@@ -44,6 +44,7 @@ if _X2GOCLIENT_OS in ("Windows"):
     import subprocess
     import win32api
     import win32print
+    import x2go_exceptions.WindowsError as WindowsError
 else:
     import gevent_subprocess as subprocess
 
@@ -90,7 +91,7 @@ class X2goPrintAction(object):
         self.client_instance = client_instance
 
     @property
-    def name():
+    def name(self):
         """\
         Return the X2go print action's name.
 
@@ -98,7 +99,7 @@ class X2goPrintAction(object):
         return self.__name__
 
     @property
-    def description():
+    def description(self):
         """\
         Return the X2go print action's description text.
 
diff --git a/x2go/registry.py b/x2go/registry.py
index cfed8ec..7df4dd1 100644
--- a/x2go/registry.py
+++ b/x2go/registry.py
@@ -34,7 +34,7 @@ import threading
 import log
 import utils
 import session
-from x2go_exceptions import *
+import x2go_exceptions
 
 # import the default terminal session backend
 from x2go.backends.control import X2goControlSession as _X2goControlSession
@@ -112,7 +112,7 @@ class X2goSessionRegistry(object):
         try:
             return self.registry[session_uuid]
         except KeyError:
-            raise X2goSessionRegistryException('No session found for UUID %s' % session_uuid)
+            raise x2go_exceptions.X2goSessionRegistryException('No session found for UUID %s' % session_uuid)
 
     def disable_session_auto_registration(self):
         """\
@@ -238,9 +238,9 @@ class X2goSessionRegistry(object):
 
         """
         if session_uuid and profile_name or session_uuid and profile_id or profile_name and profile_id:
-            raise X2goSessionRegistryException('only one of the possible method parameters is allowed (session_uuid, profile_name or profile_id)')
+            raise x2go_exceptions.X2goSessionRegistryException('only one of the possible method parameters is allowed (session_uuid, profile_name or profile_id)')
         elif session_uuid is None and profile_name is None and profile_id is None:
-            raise X2goSessionRegistryException('at least one of the method parameters session_uuid, profile_name or profile_id must be given')
+            raise x2go_exceptions.X2goSessionRegistryException('at least one of the method parameters session_uuid, profile_name or profile_id must be given')
 
         if session_uuid:
             session_uuids = [ session_uuid ]
@@ -301,9 +301,9 @@ class X2goSessionRegistry(object):
                 # session has terminated
                 self.client_instance.HOOK_on_session_has_terminated(session_uuid=_session_uuid, profile_name=_profile_name, session_name=_session_name)
                 try: self(_session_uuid).session_cleanup()
-                except X2goSessionException: pass
+                except x2go_exceptions.X2goSessionException: pass
                 try: self(_session_uuid).__del__()
-                except X2goSessionException: pass
+                except x2go_exceptions.X2goSessionException: pass
                 if len(self.virgin_sessions_of_profile_name(profile_name)) > 1:
                     self.forget(_session_uuid)
 
@@ -324,7 +324,7 @@ class X2goSessionRegistry(object):
             _now = time.time()
             _time_delta = _now - self._last_available_session_registration
             if _time_delta < 2:
-                self.logger('registration interval too short (%s), skipping automatic session registration...' % _timedelta, loglevel=log.loglevel_DEBUG)
+                self.logger('registration interval too short (%s), skipping automatic session registration...' % _time_delta, loglevel=log.loglevel_DEBUG)
                 return
             self._last_available_session_registration = _now
 
@@ -530,7 +530,7 @@ class X2goSessionRegistry(object):
             else:
                 return session.get_uuid()
         elif len(found_sessions) > 1:
-            raise X2goSessionRegistryException('there should only be one registered session of name ,,%s\'\'' % session_name)
+            raise x2go_exceptions.X2goSessionRegistryException('there should only be one registered session of name ,,%s\'\'' % session_name)
         else:
             return None
 
diff --git a/x2go/session.py b/x2go/session.py
index 75eefcc..1017b71 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -40,7 +40,7 @@ import gevent
 import log
 import utils
 import session
-from x2go_exceptions import *
+import x2go_exceptions
 
 from x2go.backends.control import X2goControlSession as _X2goControlSession
 from x2go.backends.terminal import X2goTerminalSession as _X2goTerminalSession
@@ -813,9 +813,9 @@ class X2goSession(object):
                                                               use_sshproxy=self.use_sshproxy, 
                                                               session_instance=self, 
                                                               **_params)
-            except X2goControlSessionException, e:
-                raise X2goSessionException(str(e))
-            except X2goRemoteHomeException, e:
+            except x2go_exceptions.X2goControlSessionException, e:
+                raise x2go_exceptions.X2goSessionException(str(e))
+            except x2go_exceptions.X2goRemoteHomeException, e:
                 self.disconnect()
                 raise e
             except:
@@ -857,7 +857,7 @@ class X2goSession(object):
         self.faults = None
         try:
             self.update_status(force_update=True)
-        except X2goControlSessionException:
+        except x2go_exceptions.X2goControlSessionException:
             pass
         retval = self.control_session.disconnect()
         return retval
@@ -945,7 +945,7 @@ class X2goSession(object):
         """
         try:
             return self.control_session.list_sessions(raw=raw)
-        except X2goControlSessionException:
+        except x2go_exceptions.X2goControlSessionException:
             self._X2goSession__disconnect()
             return None
     __list_sessions = list_sessions
@@ -964,12 +964,12 @@ class X2goSession(object):
         """
         try:
             return self.control_session.list_desktops(raw=raw)
-        except X2goDesktopSharingException:
+        except x2go_exceptions.X2goDesktopSharingException:
             if raw:
                 return ('','')
             else:
                 return []
-        except X2goControlSessionException:
+        except x2go_exceptions.X2goControlSessionException:
             self._X2goSession__disconnect()
             return None
     __list_desktops = list_desktops
@@ -1009,7 +1009,7 @@ class X2goSession(object):
             try:
                 session_list = self.control_session.list_sessions()
                 self.connected = True
-            except X2goControlSessionException, e:
+            except x2go_exceptions.X2goControlSessionException, e:
                 self.connected = False
                 self.running = None
                 self.suspended = None
@@ -1107,7 +1107,7 @@ class X2goSession(object):
                        (self._SUPPORTED_MIMEBOX and self.allow_mimebox) or \
                        (self._SUPPORTED_FOLDERSHARING and self.allow_share_local_folders):
                         self.terminal_session and not self.faulty and self.terminal_session.start_sshfs()
-                except X2goUserException, e:
+                except x2go_exceptions.X2goUserException, e:
                     self.logger('%s' % str(e), loglevel=log.loglevel_WARN)
                     # TODO: handle this exception as a notification hook method...
                     self._SUPPORTED_PRINTING = False
@@ -1118,7 +1118,7 @@ class X2goSession(object):
                     if SUPPORTED_PRINTING and self.printing:
                         self.terminal_session and not self.faulty and self.terminal_session.start_printing()
                         self.terminal_session and not self.faulty and self.session_environment.update({'X2GO_SPOOLDIR': self.terminal_session.get_printing_spooldir(), })
-                except X2goUserException, e:
+                except x2go_exceptions.X2goUserException, e:
                     self.logger('%s' % str(e), loglevel=log.loglevel_WARN)
                     # TODO: handle this exception as a notification hook method...
                     self._SUPPORTED_PRINTING = False
@@ -1194,7 +1194,7 @@ class X2goSession(object):
                 _orig_desktop = _desktop
                 _desktop = '%s.0' % _desktop
                 if not _desktop in self._X2GoSession__list_desktops():
-                    raise X2goDesktopSharingException('No such desktop ID: %s' % _orig_desktop)
+                    raise x2go_exceptions.X2goDesktopSharingException('No such desktop ID: %s' % _orig_desktop)
 
         _session_owner = _desktop.split('@')[0]
         _display = _desktop.split('@')[1]
@@ -1211,7 +1211,7 @@ class X2goSession(object):
             except ValueError:
                 # x2gostartagent output parsing will result in a ValueError. This one we will catch
                 # here and change it into an X2goSessionException
-                raise X2goSessionException('the session on desktop %s is seemingly dead' % _desktop)
+                raise x2go_exceptions.X2goSessionException('the session on desktop %s is seemingly dead' % _desktop)
 
             if self.has_terminal_session():
                 self.session_name = self.terminal_session.session_info.name
@@ -1267,7 +1267,7 @@ class X2goSession(object):
                     return True
 
             else:
-                raise X2goClientException('cannot suspend session')
+                raise x2go_exceptions.X2goClientException('cannot suspend session')
 
         else:
             self._X2goSession__disconnect()
@@ -1304,7 +1304,7 @@ class X2goSession(object):
                     self.session_cleanup()
                     return True
             else:
-                raise X2goClientException('cannot terminate session')
+                raise x2go_exceptions.X2goClientException('cannot terminate session')
 
         else:
             self._X2goSession__disconnect()
@@ -1372,7 +1372,7 @@ class X2goSession(object):
 
         """
         return utils.is_color_depth_ok(depth_session=self.color_depth_from_session_name(), depth_local=utils.local_color_depth())
-        __is_color_depth_ok = is_color_depth_ok
+    __is_color_depth_ok = is_color_depth_ok
 
     def is_connected(self):
         """\
@@ -1490,7 +1490,7 @@ class X2goSession(object):
             else:
                 self.logger('local folder sharing is disabled for this session profile', loglevel=log.loglevel_WARN)
         else:
-            raise X2goSessionException('this X2goSession object does not have any associated terminal')
+            raise x2go_exceptions.X2goSessionException('this X2goSession object does not have any associated terminal')
     __share_local_folder = share_local_folder
 
     def unshare_all_local_folders(self, force_all=False):
@@ -1520,7 +1520,7 @@ class X2goSession(object):
             else:
                 self.logger('local folder sharing is disabled for this session profile', loglevel=log.loglevel_WARN)
         else:
-            raise X2goSessionException('this X2goSession object does not have any associated terminal')
+            raise x2go_exceptions.X2goSessionException('this X2goSession object does not have any associated terminal')
         return False
     __unshare_all_local_folders = unshare_all_local_folders
 
@@ -1544,7 +1544,7 @@ class X2goSession(object):
             else:
                 self.logger('local folder sharing is disabled for this session profile', loglevel=log.loglevel_WARN)
         else:
-            raise X2goSessionException('this X2goSession object does not have any associated terminal')
+            raise x2go_exceptions.X2goSessionException('this X2goSession object does not have any associated terminal')
     __unshare_local_folder = unshare_local_folder
 
     def get_shared_folders(self):
@@ -1583,7 +1583,7 @@ class X2goSession(object):
         # unmount shared folders
         try:
             self.unshare_all_local_folders()
-        except X2goSessionException:
+        except x2go_exceptions.X2goSessionException:
             pass
 
         # remove client-side session cache
diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py
index f50bc32..cc547b7 100644
--- a/x2go/sshproxy.py
+++ b/x2go/sshproxy.py
@@ -35,11 +35,11 @@ import string
 import random
 
 # Python X2go modules
-import x2go.forward as forward
-import x2go.checkhosts as checkhosts
-import x2go.log as log
-import x2go.utils as utils
-from x2go.x2go_exceptions import *
+import forward
+import checkhosts
+import log
+import utils
+import x2go_exceptions
 
 from x2go.defaults import CURRENT_LOCAL_USER as _CURRENT_LOCAL_USER
 from x2go.defaults import LOCAL_HOME as _LOCAL_HOME
@@ -196,9 +196,9 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread):
                                  look_for_keys=False,
                                  allow_agent=False,
                                 )
-                except AuthenticationException, e:
+                except x2go_exceptions.AuthenticationException, e:
                     self.close()
-                    raise X2goSSHProxyAuthenticationException('pubkey auth mechanisms both failed')
+                    raise x2go_exceptions.X2goSSHProxyAuthenticationException('pubkey auth mechanisms both failed')
                 except:
                     self.close()
                     raise
@@ -215,16 +215,16 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread):
                                  look_for_keys=False,
                                  allow_agent=False,
                                 )
-                except AuthenticationException:
+                except x2go_exceptions.AuthenticationException:
                     self.close()
-                    raise X2goSSHProxyAuthenticationException('interactive auth mechanisms failed')
+                    raise x2go_exceptions.X2goSSHProxyAuthenticationException('interactive auth mechanisms failed')
                 except:
                     self.close()
                     raise
 
-        except paramiko.SSHException, e:
+        except x2go_exceptions.SSHException, e:
             self.close()
-            raise X2goSSHProxyException(str(e))
+            raise x2go_exceptions.X2goSSHProxyException(str(e))
         except:
             self.close()
             raise
@@ -272,7 +272,7 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread):
                 gevent.sleep(.1)
 
         else:
-            raise X2goSSHProxyException('SSH proxy connection could not retrieve an SSH transport')
+            raise x2go_exceptions.X2goSSHProxyException('SSH proxy connection could not retrieve an SSH transport')
 
     def get_local_proxy_port(self):
         """\
diff --git a/x2go/utils.py b/x2go/utils.py
index 46b2d95..58c7f9e 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -56,7 +56,7 @@ def is_in_nx3packmethods(method):
     return method in pack_methods_nx3
 
 
-def find_session_line_in_x2golistsessions(session_name, x2go_stdout):
+def find_session_line_in_x2golistsessions(session_name, stdout):
     """\
     Return the X2go session meta information as returned by the 
     C{x2golistsessions} server command for session C{session_name}.


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