diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-19 23:14:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-19 23:14:31 +0000 |
| commit | d26650b57daa6219756a9a3e27421cc7efa4bae2 (patch) | |
| tree | ff80dd8c3d184623a6db032a8ac5ccfce084cdd7 /openstackclient | |
| parent | 6dc136f2d754245e6a9fb71045492fa30c6aea2e (diff) | |
| parent | 00b4e38d3c3acf01ca5d7ff3cae287b4f8c9df2a (diff) | |
| download | python-openstackclient-d26650b57daa6219756a9a3e27421cc7efa4bae2.tar.gz | |
Merge "Removes trailing blank in trust show"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/identity/v3/trust.py | 4 | ||||
| -rw-r--r-- | openstackclient/tests/identity/v3/test_trust.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/openstackclient/identity/v3/trust.py b/openstackclient/identity/v3/trust.py index c8e5c4c7..5104864c 100644 --- a/openstackclient/identity/v3/trust.py +++ b/openstackclient/identity/v3/trust.py @@ -144,7 +144,7 @@ class CreateTrust(show.ShowOne): # Format roles into something sensible roles = trust._info.pop('roles') - msg = ''.join([r['name'] + ' ' for r in roles]) + msg = ' '.join(r['name'] for r in roles) trust._info['roles'] = msg return zip(*sorted(six.iteritems(trust._info))) @@ -215,7 +215,7 @@ class ShowTrust(show.ShowOne): # Format roles into something sensible roles = trust._info.pop('roles') - msg = ''.join([r['name'] + ' ' for r in roles]) + msg = ' '.join(r['name'] for r in roles) trust._info['roles'] = msg return zip(*sorted(six.iteritems(trust._info))) diff --git a/openstackclient/tests/identity/v3/test_trust.py b/openstackclient/tests/identity/v3/test_trust.py index b3fbe7f0..b90e7815 100644 --- a/openstackclient/tests/identity/v3/test_trust.py +++ b/openstackclient/tests/identity/v3/test_trust.py @@ -107,7 +107,7 @@ class TestTrustCreate(TestTrust): identity_fakes.trust_id, identity_fakes.trust_impersonation, identity_fakes.project_id, - identity_fakes.role_name + ' ', + identity_fakes.role_name, identity_fakes.user_id, identity_fakes.user_id ) @@ -222,7 +222,7 @@ class TestTrustShow(TestTrust): identity_fakes.trust_id, identity_fakes.trust_impersonation, identity_fakes.project_id, - identity_fakes.role_name + ' ', + identity_fakes.role_name, identity_fakes.user_id, identity_fakes.user_id ) |