[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: 0.1.0.2-3-g4a64420

X2Go dev team git-admin at x2go.org
Sat Sep 14 15:56:45 CEST 2013


The branch, twofactorauth has been updated
       via  4a6442089ce241a377969707a9a6ec0c4e4ba509 (commit)
      from  b05f63fd5f08d1d1878bdcf65ebbd4ad10c6f2c9 (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/backends/proxy/_nx3.py |    5 +++++
 x2go/utils.py               |   22 ++++++++++++++++++++++
 2 files changed, 27 insertions(+)

The diff of changes is:
diff --git a/x2go/backends/proxy/_nx3.py b/x2go/backends/proxy/_nx3.py
index 1d48649..abed34c 100644
--- a/x2go/backends/proxy/_nx3.py
+++ b/x2go/backends/proxy/_nx3.py
@@ -119,6 +119,11 @@ class X2goProxyNX3(base.X2goProxyBASE):
         cmd_line.append(_proxy_options)
         return cmd_line
 
+#    def process_proxy_options():
+#
+#        for opt in self.proxy_options:
+            
+
     def start_proxy(self):
         self.logger('starting local NX3 proxy...', loglevel=log.loglevel_INFO)
         self.logger('NX3 Proxy mode is server, cookie=%s, host=localhost, port=%s.' % (self.session_info.cookie, self.session_info.graphics_port,), loglevel=log.loglevel_DEBUG)
diff --git a/x2go/utils.py b/x2go/utils.py
index 95bed7d..dffca68 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -34,6 +34,7 @@ import socket
 import gevent
 import string
 import re
+import subprocess
 
 # Python X2go modules
 from defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS
@@ -375,3 +376,24 @@ def is_abs_path(path):
     @rtype: C{bool}
     """
     return bool((path.startswith('/') or re.match('^[%s]\:\\\\' % string.ascii_letters, path)))
+
+def xkb_rules_names():
+    """\
+    Wrapper for: xprop -root _XKB_RULES_NAMES
+
+    @return: A Python dictionary that contains the current X11 keyboard rules.
+    @rtype: C{dict}
+
+    """
+    p = subprocess.Popen(['xprop', '-root', '_XKB_RULES_NAMES',], stdout=subprocess.PIPE, )
+    _rn_list = p.stdout.read().split('"')
+    _rn_dict = {
+        'rules': _rn_list[1],
+        'model': _rn_list[3],
+        'layout': _rn_list[5],
+        'variant': _rn_list[7],
+        'options': _rn_list[9],
+    }
+    return _rn_dict
+
+


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