[X2Go-Commits] python-x2go.git - brokerclient (branch) updated: 0.1.1.4-117-g57027a9

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


The branch, brokerclient has been updated
       via  57027a93cd98ec52fac9e2d5272dffcae1382b40 (commit)
      from  ca2f9e2dc54d5d41c1c569b812cd724e8511139f (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       |    2 ++
 x2go/mimeboxactions.py |    2 +-
 x2go/printactions.py   |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index ef8021a..ab10767 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,8 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
     - Rename control session method is_folder_sharing_available to
       is_sshfs_available.
     - Make x2go module importable on Win32 platforms again.
+    - Fix faking of WindowsError exception object in printactions.py and
+      mimeboxactions.py.
   * Depend on python-xlib.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sat, 28 Sep 2012 01:44:21 +0100
diff --git a/x2go/mimeboxactions.py b/x2go/mimeboxactions.py
index 4dec16d..2e247c1 100644
--- a/x2go/mimeboxactions.py
+++ b/x2go/mimeboxactions.py
@@ -34,9 +34,9 @@ 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
+    import x2go_exceptions.WindowsError as WindowsError
 
 # Python X2Go modules
 import log
diff --git a/x2go/printactions.py b/x2go/printactions.py
index f62e804..d7af7a5 100644
--- a/x2go/printactions.py
+++ b/x2go/printactions.py
@@ -39,9 +39,9 @@ if _X2GOCLIENT_OS in ("Windows"):
     import subprocess
     import win32api
     import win32print
-    import x2go_exceptions.WindowsError as WindowsError
 else:
     import gevent_subprocess as subprocess
+    import x2go_exceptions.WindowsError as WindowsError
 
 # Python X2Go modules
 import log


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