[X2Go-Commits] python-x2go.git - brokerclient (branch) updated: 0.0.38.0-65-g3f8753a

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


The branch, brokerclient has been updated
       via  3f8753abec12763656009b19356ca030ebf239d1 (commit)
      from  07fc893fe910b501909124b8ca8985cf941da97f (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/printactions.py |    2 +-
 x2go/utils.py        |    5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/x2go/printactions.py b/x2go/printactions.py
index ff3071d..139ca95 100644
--- a/x2go/printactions.py
+++ b/x2go/printactions.py
@@ -233,7 +233,7 @@ class X2goPrintActionPDFSAVE(X2goPrintAction):
         """
         if save_to_folder is None:
             save_to_folder = defaults.DEFAULT_PDFSAVE_LOCATION
-        if not (save_to_folder.startswith('/') or re.match('^[%s]\:\\\\' % string.ascii_letters, save_to_folder)):
+        if not utils.is_abs_path(save_to_folder):
             if not save_to_folder.startswith('~'):
                 save_to_folder = os.path.normpath('~/%s' % save_to_folder)
             save_to_folder = os.path.expanduser(save_to_folder)
diff --git a/x2go/utils.py b/x2go/utils.py
index bf3e5b2..c4f76ce 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -32,6 +32,8 @@ import copy
 import paramiko
 import socket
 import gevent
+import string
+import re
 
 # Python X2go modules
 from defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS
@@ -301,3 +303,6 @@ def get_encoding():
     except:
         encoding = sys.getdefaultencoding()
     return encoding
+
+def is_abs_path(path):
+    return bool((path.startswith('/') or re.match('^[%s]\:\\\\' % string.ascii_letters, path)))
\ No newline at end of file


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