You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2011/04/11 01:02:21 UTC
svn commit: r1090906 -
/incubator/libcloud/trunk/libcloud/storage/drivers/s3.py
Author: tomaz
Date: Sun Apr 10 23:02:21 2011
New Revision: 1090906
URL: http://svn.apache.org/viewvc?rev=1090906&view=rev
Log:
Change method name: _clean_name -> _clean_object_name
Modified:
incubator/libcloud/trunk/libcloud/storage/drivers/s3.py
Modified: incubator/libcloud/trunk/libcloud/storage/drivers/s3.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/storage/drivers/s3.py?rev=1090906&r1=1090905&r2=1090906&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/storage/drivers/s3.py (original)
+++ incubator/libcloud/trunk/libcloud/storage/drivers/s3.py Sun Apr 10 23:02:21 2011
@@ -237,8 +237,8 @@ class S3StorageDriver(StorageDriver):
def download_object(self, obj, destination_path, overwrite_existing=False,
delete_on_failure=True):
- container_name = self._clean_name(obj.container.name)
- object_name = self._clean_name(obj.name)
+ container_name = self._clean_object_name(obj.container.name)
+ object_name = self._clean_object_name(obj.name)
response = self.connection.request('/%s/%s' % (container_name,
object_name),
@@ -255,8 +255,8 @@ class S3StorageDriver(StorageDriver):
success_status_code=httplib.OK)
def download_object_as_stream(self, obj, chunk_size=None):
- container_name = self._clean_name(obj.container.name)
- object_name = self._clean_name(obj.name)
+ container_name = self._clean_object_name(obj.container.name)
+ object_name = self._clean_object_name(obj.name)
response = self.connection.request('/%s/%s' % (container_name,
object_name),
method='GET', raw=True)
@@ -288,7 +288,7 @@ class S3StorageDriver(StorageDriver):
'upload_object_via_stream not implemented for this driver')
def delete_object(self, obj):
- object_name = self._clean_name(name=obj.name)
+ object_name = self._clean_object_name(name=obj.name)
response = self.connection.request('/%s/%s' % (obj.container.name,
object_name),
method='DELETE')
@@ -300,15 +300,10 @@ class S3StorageDriver(StorageDriver):
return False
- def _clean_name(self, name):
+ def _clean_object_name(self, name):
name = urllib.quote(name)
return name
- def _clean_container_name(self, name):
- # Invalid characters: _
- name = name.replace('_', '')
- return name
-
def _put_object(self, container, object_name, upload_func,
upload_func_kwargs, extra=None, file_path=None,
iterator=None, file_hash=None, storage_class=None):
@@ -321,7 +316,7 @@ class S3StorageDriver(StorageDriver):
headers['x-amz-storage-class'] = storage_class.upper()
container_name_cleaned = container.name
- object_name_cleaned = self._clean_name(object_name)
+ object_name_cleaned = self._clean_object_name(object_name)
content_type = extra.get('content_type', None)
meta_data = extra.get('meta_data', None)