[X2Go-Commits] [python-x2go] 01/01: Make sure we do a deepcopy of the default session profile parameters.
git-admin at x2go.org
git-admin at x2go.org
Thu Oct 16 16:34:16 CEST 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository python-x2go.
commit af9972acc9dd67f087c42308e4fd9cb589eea8bf
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Oct 16 16:34:12 2014 +0200
Make sure we do a deepcopy of the default session profile parameters.
---
debian/changelog | 1 +
x2go/backends/profiles/base.py | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3453629..28df526 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -116,6 +116,7 @@ python-x2go (0.5.0.0-0x2go1) UNRELEASED; urgency=low
- Fix various hrefs in __doc__ strings.
- Fix creating/renaming/reconfiguring session profiles. Handle host
option properly (as list).
+ - Make sure we do a deepcopy of the default session profile parameters.
* debian/control:
+ Add dependencies: python-requests, python-simplejson.
+ Add R (python-x2go): sshfs.
diff --git a/x2go/backends/profiles/base.py b/x2go/backends/profiles/base.py
index fe53a96..4275a99 100644
--- a/x2go/backends/profiles/base.py
+++ b/x2go/backends/profiles/base.py
@@ -40,7 +40,7 @@ from x2go.x2go_exceptions import X2GoProfileException
class X2GoSessionProfiles():
- defaultSessionProfile = _X2GO_SESSIONPROFILE_DEFAULTS
+ defaultSessionProfile = copy.deepcopy(_X2GO_SESSIONPROFILE_DEFAULTS)
_non_profile_sections = ('embedded')
def __init__(self, session_profile_defaults=None, logger=None, loglevel=log.loglevel_DEFAULT, **kwargs):
@@ -502,7 +502,7 @@ class X2GoSessionProfiles():
"""
if profile_id is None or profile_id in self.profile_ids:
profile_id = utils._genSessionProfileId()
- self.session_profiles[profile_id] = self.defaultSessionProfile
+ self.session_profiles[profile_id] = self.default_profile_config()
if 'name' not in kwargs.keys():
raise X2GoProfileException('session profile parameter ,,name\'\' is missing in method parameters')
@@ -515,7 +515,8 @@ class X2GoSessionProfiles():
for key, value in kwargs.items():
self.update_value(None, key, value, profile_id=profile_id)
- for key, value in self.defaultSessionProfile.items():
+ _default_session_profile = self.default_profile_config()
+ for key, value in _default_session_profile.items():
if key in kwargs: continue
self.update_value(None, key, value, profile_id=profile_id)
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
More information about the x2go-commits
mailing list