summaryrefslogtreecommitdiffstats
path: root/keystone/common
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-03-20 08:26:50 +0000
committerGerrit Code Review <review@openstack.org>2013-03-20 08:26:50 +0000
commit3c9768f6e002eac556a0e2f23d8f2cdd0ecfa5eb (patch)
tree9f90c4b02c5ce7f90c31db3bc5ee8f30e1f9d789 /keystone/common
parent533bb01947199e20b840917ab5ee387451b174a0 (diff)
parentcd3f58a8d05010838bd5e2d095103c2623499112 (diff)
downloadkeystone-3c9768f6e002eac556a0e2f23d8f2cdd0ecfa5eb.tar.gz
keystone-3c9768f6e002eac556a0e2f23d8f2cdd0ecfa5eb.tar.xz
keystone-3c9768f6e002eac556a0e2f23d8f2cdd0ecfa5eb.zip
Merge "Validate domains unconditionally (bug 1130236)"
Diffstat (limited to 'keystone/common')
-rw-r--r--keystone/common/kvs.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/keystone/common/kvs.py b/keystone/common/kvs.py
index a0062fa2..b517bc5d 100644
--- a/keystone/common/kvs.py
+++ b/keystone/common/kvs.py
@@ -20,7 +20,10 @@ from keystone import exception
class DictKvs(dict):
def get(self, key, default=None):
try:
- return self[key]
+ if isinstance(self[key], dict):
+ return self[key].copy()
+ else:
+ return self[key][:]
except KeyError:
if default is not None:
return default