diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-08 04:13:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-08 04:13:41 +0000 |
| commit | 53dc900025c34378854425f40e3dea82d0416254 (patch) | |
| tree | 253669397407ab0cf3e15b7b6273e8672f1a3641 /keystoneclient/fixture | |
| parent | cf472fa6d7a717eb45e99b3bc1feac413c9e73fd (diff) | |
| parent | 161c869c6c29800ee0ba9c2b81564cdc5e9664a2 (diff) | |
| download | python-keystoneclient-53dc900025c34378854425f40e3dea82d0416254.tar.gz | |
Merge "Return None for missing trust_id in fixture"
Diffstat (limited to 'keystoneclient/fixture')
| -rw-r--r-- | keystoneclient/fixture/v2.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keystoneclient/fixture/v2.py b/keystoneclient/fixture/v2.py index 3d6898b..bbac2dc 100644 --- a/keystoneclient/fixture/v2.py +++ b/keystoneclient/fixture/v2.py @@ -171,7 +171,7 @@ class Token(dict): @property def trust_id(self): - return self.root.setdefault('trust', {})['id'] + return self.root.setdefault('trust', {}).get('id') @trust_id.setter def trust_id(self, value): |