[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 7d7bb6b77b574458d06fd8e13e963a3afbcc4025
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:27:30 CET 2014
The branch, build-baikal has been updated
via 7d7bb6b77b574458d06fd8e13e963a3afbcc4025 (commit)
from 9aef83f1d18bf927d33765836293b2296d87c73a (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/client.py | 5 ++++-
x2go/xserver.py | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/x2go/client.py b/x2go/client.py
index 575ade9..723a28b 100644
--- a/x2go/client.py
+++ b/x2go/client.py
@@ -123,7 +123,6 @@ import sys
import types
# Python X2go modules
-from xserver import X2goClientXConfig, X2goXServer
from settings import X2goClientSettings
from printing import X2goClientPrinting
from registry import X2goSessionRegistry
@@ -141,6 +140,10 @@ from defaults import X2GO_CLIENT_ROOTDIR as _X2GO_CLIENT_ROOTDIR
from x2go.backends.profiles import X2goSessionProfiles
+if _X2GOCLIENT_OS == 'Windows':
+ from xserver import X2goClientXConfig, X2goXServer
+
+
class X2goClient(object):
"""\
The X2goClient implements _THE_ public Python X2go API. With it you can
diff --git a/x2go/xserver.py b/x2go/xserver.py
index 191fab5..3adfcc0 100644
--- a/x2go/xserver.py
+++ b/x2go/xserver.py
@@ -32,7 +32,7 @@ from defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS
if _X2GOCLIENT_OS not in ("Windows"):
import exceptions
class OSNotSupportedException(exceptions.StandardError): pass
- raise OSNotSupportedException('x2go.xserver module is for Windows only' % platform.system())
+ raise OSNotSupportedException('x2go.xserver module is for Windows only')
# modules
import os
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