summaryrefslogtreecommitdiff
path: root/openstackclient/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-10-24 06:38:22 +0000
committerGerrit Code Review <review@openstack.org>2014-10-24 06:38:22 +0000
commit6a4b673e8828f3fc80c86ef8bfa7f3ab5a8f720f (patch)
tree56a56e5e02d086bd99ca3c7198dd0c1006c55554 /openstackclient/api
parent7153ff41fbdbb6f4cb0c0e291c801669af66fcef (diff)
parentbcf4b3caece9edc6a04be3ce59697301e48ad34a (diff)
downloadpython-openstackclient-6a4b673e8828f3fc80c86ef8bfa7f3ab5a8f720f.tar.gz
Merge "Update use of open() in object API"
Diffstat (limited to 'openstackclient/api')
-rw-r--r--openstackclient/api/object_store_v1.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/openstackclient/api/object_store_v1.py b/openstackclient/api/object_store_v1.py
index 57db9063..c52eeb3a 100644
--- a/openstackclient/api/object_store_v1.py
+++ b/openstackclient/api/object_store_v1.py
@@ -13,6 +13,7 @@
"""Object Store v1 API Library"""
+import io
import os
import six
@@ -187,7 +188,12 @@ class APIv1(api.BaseAPI):
return {}
full_url = "%s/%s" % (container, object)
- response = self.create(full_url, method='PUT', data=open(object))
+ with io.open(object, 'rb') as f:
+ response = self.create(
+ full_url,
+ method='PUT',
+ data=f,
+ )
url_parts = urlparse(self.endpoint)
data = {
'account': url_parts.path.split('/')[-1],