Revision b58c1078 kamaki/clients/pithos_rest_api.py
b/kamaki/clients/pithos_rest_api.py | ||
---|---|---|
159 | 159 |
|
160 | 160 |
self.set_param('update', iff=update) |
161 | 161 |
|
162 |
for group, usernames in groups.items(): |
|
163 |
userstr = '' |
|
164 |
dlm = '' |
|
165 |
for user in usernames: |
|
166 |
userstr = userstr + dlm + user |
|
167 |
dlm = ',' |
|
168 |
self.set_header('X-Account-Group-' + group, userstr) |
|
162 |
if groups: |
|
163 |
for group, usernames in groups.items(): |
|
164 |
userstr = '' |
|
165 |
dlm = '' |
|
166 |
for user in usernames: |
|
167 |
userstr = userstr + dlm + user |
|
168 |
dlm = ',' |
|
169 |
self.set_header('X-Account-Group-' + group, userstr) |
|
169 | 170 |
if metadata: |
170 | 171 |
for metaname, metaval in metadata.items(): |
171 | 172 |
self.set_header('X-Account-Meta-' + metaname, metaval) |
... | ... | |
275 | 276 |
else: |
276 | 277 |
self.set_param('path', path) |
277 | 278 |
self.set_param('shared', iff=show_only_shared) |
278 |
print('la%sla' % 1 if meta else 2)
|
|
279 |
self.set_param('meta', ','.join(meta), iff=meta)
|
|
279 |
if meta:
|
|
280 |
self.set_param('meta', ','.join(meta))
|
|
280 | 281 |
self.set_param('until', until, iff=until) |
281 | 282 |
|
282 | 283 |
self.set_header('If-Modified-Since', if_modified_since) |
... | ... | |
591 | 592 |
self.set_header('Content-Encoding', content_encoding) |
592 | 593 |
self.set_header('Content-Disposition', content_disposition) |
593 | 594 |
self.set_header('X-Object-Manifest', manifest) |
594 |
perms = None |
|
595 | 595 |
if permissions: |
596 |
for permission_type, permission_list in permissions.items(): |
|
597 |
if not perms: |
|
598 |
perms = '' # Remove permissions |
|
599 |
if len(permission_list) == 0: |
|
600 |
continue |
|
601 |
if len(perms): |
|
602 |
perms += ';' |
|
603 |
perms += '%s=%s' % ( |
|
604 |
permission_type, |
|
605 |
','.join(permission_list, separator=',')) |
|
606 |
self.set_header('X-Object-Sharing', perms) |
|
596 |
perms = None |
|
597 |
if permissions: |
|
598 |
for perm_type, perm_list in permissions.items(): |
|
599 |
if not perms: |
|
600 |
perms = '' # Remove permissions |
|
601 |
if perm_list: |
|
602 |
perms += ';' if perms else '' |
|
603 |
perms += '%s=%s' % (perm_type, ','.join(perm_list)) |
|
604 |
self.set_header('X-Object-Sharing', perms) |
|
607 | 605 |
self.set_header('X-Object-Public', public) |
608 | 606 |
if metadata: |
609 | 607 |
for key, val in metadata.items(): |
... | ... | |
687 | 685 |
self.set_header('Content-Encoding', content_encoding) |
688 | 686 |
self.set_header('Content-Disposition', content_disposition) |
689 | 687 |
self.set_header('X-Source-Version', source_version) |
690 |
perms = None |
|
691 | 688 |
if permissions: |
692 |
for permission_type, permission_list in permissions.items(): |
|
689 |
perms = '' |
|
690 |
for perm_type, perm_list in permissions.items(): |
|
693 | 691 |
if not perms: |
694 | 692 |
perms = '' # Remove permissions |
695 |
if len(permission_list) == 0: |
|
696 |
continue |
|
697 |
if len(perms): |
|
698 |
perms += ';' |
|
699 |
perms += '%s=%s' % ( |
|
700 |
permission_type, |
|
701 |
','.join(permission_list, separator=',')) |
|
702 |
self.set_header('X-Object-Sharing', perms) |
|
693 |
if perm_list: |
|
694 |
perms += ';' if perms else '' |
|
695 |
perms += '%s=%s' % (perm_type, ','.join(perm_list)) |
|
696 |
self.set_header('X-Object-Sharing', perms) |
|
703 | 697 |
self.set_header('X-Object-Public', public) |
704 | 698 |
if metadata: |
705 | 699 |
for key, val in metadata.items(): |
... | ... | |
778 | 772 |
self.set_header('Content-Type', content_type) |
779 | 773 |
self.set_header('Content-Encoding', content_encoding) |
780 | 774 |
self.set_header('Content-Disposition', content_disposition) |
781 |
perms = None |
|
782 |
for permission_type, permission_list in permissions.items(): |
|
783 |
if not perms: |
|
784 |
perms = '' # Remove permissions |
|
785 |
if len(permission_list) == 0: |
|
786 |
continue |
|
787 |
if len(perms): |
|
788 |
perms += ';' |
|
789 |
perms += '%s=%s' % ( |
|
790 |
permission_type, |
|
791 |
','.join(permission_list, separator=',')) |
|
792 |
self.set_header('X-Object-Sharing', perms) |
|
775 |
if permissions: |
|
776 |
perms = '' |
|
777 |
for perm_type, perm_list in permissions.items(): |
|
778 |
if not perms: |
|
779 |
perms = '' # Remove permissions |
|
780 |
if perm_list: |
|
781 |
perms += ';' if perms else '' |
|
782 |
perms += '%s=%s' % (perm_type, ','.join(perm_list)) |
|
783 |
self.set_header('X-Object-Sharing', perms) |
|
793 | 784 |
self.set_header('X-Object-Public', public) |
794 |
for key, val in metadata.items(): |
|
795 |
self.set_header('X-Object-Meta-' + key, val) |
|
785 |
if metadata: |
|
786 |
for key, val in metadata.items(): |
|
787 |
self.set_header('X-Object-Meta-' + key, val) |
|
796 | 788 |
|
797 | 789 |
path = path4url(self.account, self.container, object) |
798 | 790 |
success = kwargs.pop('success', 201) |
... | ... | |
893 | 885 |
self.set_header('X-Source-Version', source_version) |
894 | 886 |
self.set_header('X-Object-Bytes', object_bytes) |
895 | 887 |
self.set_header('X-Object-Manifest', manifest) |
896 |
perms = None |
|
897 |
for permission_type, permission_list in permissions.items(): |
|
898 |
if not perms: |
|
899 |
perms = '' # Remove permissions |
|
900 |
if len(permission_list) == 0: |
|
901 |
continue |
|
902 |
if len(perms): |
|
903 |
perms += ';' |
|
904 |
perms += '%s=%s' % ( |
|
905 |
permission_type, |
|
906 |
','.join(permission_list, separator=',')) |
|
907 |
self.set_header('X-Object-Sharing', perms) |
|
888 |
if permissions: |
|
889 |
perms = '' |
|
890 |
for perm_type, perm_list in permissions.items(): |
|
891 |
if not perms: |
|
892 |
perms = '' # Remove permissions |
|
893 |
if perm_list: |
|
894 |
perms += ';' if perms else '' |
|
895 |
perms += '%s=%s' % (perm_type, ','.join(perm_list)) |
|
896 |
self.set_header('X-Object-Sharing', perms) |
|
908 | 897 |
self.set_header('X-Object-Public', public) |
909 | 898 |
for key, val in metadata.items(): |
910 | 899 |
self.set_header('X-Object-Meta-' + key, val) |
Also available in: Unified diff