Revision af7bb62f pithos/api/functions.py
| b/pithos/api/functions.py | ||
|---|---|---|
| 51 | 51 |
put_object_headers, update_manifest_meta, update_sharing_meta, update_public_meta, |
| 52 | 52 |
validate_modification_preconditions, validate_matching_preconditions, split_container_object_string, |
| 53 | 53 |
copy_or_move_object, get_int_parameter, get_content_length, get_content_range, socket_read_iterator, |
| 54 |
SaveToBackendHandler, object_data_response, put_object_block, hashmap_md5, object_conflict_response, api_method)
|
|
| 54 |
SaveToBackendHandler, object_data_response, put_object_block, hashmap_md5, simple_list_response, api_method)
|
|
| 55 | 55 |
from pithos.backends.base import NotAllowedError, QuotaError |
| 56 | 56 |
|
| 57 | 57 |
|
| ... | ... | |
| 376 | 376 |
|
| 377 | 377 |
return HttpResponse(status=ret) |
| 378 | 378 |
|
| 379 |
@api_method('POST')
|
|
| 379 |
@api_method('POST', format_allowed=True)
|
|
| 380 | 380 |
def container_update(request, v_account, v_container): |
| 381 | 381 |
# Normal Response Codes: 202 |
| 382 | 382 |
# Error Response Codes: internalServerError (500), |
| ... | ... | |
| 421 | 421 |
|
| 422 | 422 |
response = HttpResponse(status=202) |
| 423 | 423 |
if hashmap: |
| 424 |
response.content = '\n'.join(hashmap) + '\n'
|
|
| 424 |
response.content = simple_list_response(request, hashmap)
|
|
| 425 | 425 |
return response |
| 426 | 426 |
|
| 427 | 427 |
@api_method('DELETE')
|
| ... | ... | |
| 853 | 853 |
except NotAllowedError: |
| 854 | 854 |
raise Forbidden('Not allowed')
|
| 855 | 855 |
except IndexError, e: |
| 856 |
raise Conflict(object_conflict_response(request, e.data))
|
|
| 856 |
raise Conflict(simple_list_response(request, e.data))
|
|
| 857 | 857 |
except NameError: |
| 858 | 858 |
raise ItemNotFound('Container does not exist')
|
| 859 | 859 |
except ValueError: |
| 860 | 860 |
raise BadRequest('Invalid sharing header')
|
| 861 | 861 |
except AttributeError, e: |
| 862 |
raise Conflict(object_conflict_response(request, e.data))
|
|
| 862 |
raise Conflict(simple_list_response(request, e.data))
|
|
| 863 | 863 |
except QuotaError: |
| 864 | 864 |
raise RequestEntityTooLarge('Quota exceeded')
|
| 865 | 865 |
if 'ETag' not in meta: |
| ... | ... | |
| 1044 | 1044 |
except ValueError: |
| 1045 | 1045 |
raise BadRequest('Invalid sharing header')
|
| 1046 | 1046 |
except AttributeError, e: |
| 1047 |
raise Conflict(object_conflict_response(request, e.data))
|
|
| 1047 |
raise Conflict(simple_list_response(request, e.data))
|
|
| 1048 | 1048 |
if public is not None: |
| 1049 | 1049 |
try: |
| 1050 | 1050 |
request.backend.update_object_public(request.user_uniq, v_account, |
| ... | ... | |
| 1190 | 1190 |
except ValueError: |
| 1191 | 1191 |
raise BadRequest('Invalid sharing header')
|
| 1192 | 1192 |
except AttributeError, e: |
| 1193 |
raise Conflict(object_conflict_response(request, e.data))
|
|
| 1193 |
raise Conflict(simple_list_response(request, e.data))
|
|
| 1194 | 1194 |
except QuotaError: |
| 1195 | 1195 |
raise RequestEntityTooLarge('Quota exceeded')
|
| 1196 | 1196 |
if public is not None: |
Also available in: Unified diff