[X2Go-Commits] python-x2go.git - brokerclient (branch) updated: 0.1.1.4-76-g6bdd1a0
X2Go dev team
git-admin at x2go.org
Tue Jan 7 16:20:56 CET 2014
The branch, brokerclient has been updated
via 6bdd1a0fc23e939ca7dbd05fa4e516c9328ba7f2 (commit)
from 05d0d3836a8c1a8ea67c14feffcc08c0e375e354 (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 | 1 +
x2go/inifiles.py | 14 ++++++++------
2 files changed, 9 insertions(+), 6 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index c02355c..ed3fc55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ python-x2go (0.1.1.9-0-x2go1) UNRELEASED; urgency=low
- Add ,,autostart'' parameter to default session profile parameters.
- Add support for session window title renaming from client-side.
- Introduce additional session profile parameter: setsessiontitle.
+ - Fix for list processing in INI files.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 12 Oct 2011 10:54:23 +0200
diff --git a/x2go/inifiles.py b/x2go/inifiles.py
index c95b2b2..f789de1 100644
--- a/x2go/inifiles.py
+++ b/x2go/inifiles.py
@@ -247,13 +247,15 @@ class X2goIniFile(object):
elif key_type is types.IntType:
return self.iniConfig.getint(section, key)
elif key_type is types.ListType:
- val = self.iniConfig.get(section, key)
- if val.startswith('[') and val.endswith(']'):
- return eval(val)
- elif ',' in val:
- val = [ v.strip() for v in val.split(',') ]
+ _val = self.iniConfig.get(section, key)
+ _val = _val.strip()
+ if _val.startswith('[') and _val.endswith(']'):
+ return eval(_val)
+ elif ',' in _val:
+ _val = [ v.strip() for v in _val.split(',') ]
else:
- val = [ val ]
+ _val = [ _val ]
+ return _val
else:
_val = self.iniConfig.get(section, key)
return _val.decode(utils.get_encoding())
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