summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-19 05:30:42 +0000
committerGerrit Code Review <review@openstack.org>2016-10-19 05:30:42 +0000
commit379b57d48da0b272d0edcc1be6faac9d4712776f (patch)
tree9cc9c8964fe0164dff9686aa3e198e0360067078
parentac232c21322f9bf3b7a6c8dba60c75f3df679fce (diff)
parent594d4fae0b18bee8f1c6a3832641ebe9034a65ca (diff)
downloadpython-barbicanclient-379b57d48da0b272d0edcc1be6faac9d4712776f.tar.gz
Merge "Fix bug when uploading secret using unified CLI"
-rw-r--r--barbicanclient/secrets.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/barbicanclient/secrets.py b/barbicanclient/secrets.py
index a5a1402..220d7f3 100644
--- a/barbicanclient/secrets.py
+++ b/barbicanclient/secrets.py
@@ -169,7 +169,7 @@ class Secret(SecretFormatter):
if self._content_types:
return self._content_types
elif self._payload_content_type:
- return {u'default': six.u(self.payload_content_type)}
+ return {u'default': self.payload_content_type}
return None
@property