Revision db117cac snf-pithos-tools/pithos/tools/lib/client.py

b/snf-pithos-tools/pithos/tools/lib/client.py
460 460
461 461 
    def _change_obj_location(self, src_container, src_object, dst_container,
462 462 
                             dst_object, remove=False, meta={}, account=None,
463 
                             content_type=None, **headers):
463 
                             content_type=None, delimiter=None, **headers):
464 464 
        account = account or self.account
465 465 
        path = '/%s/%s/%s' % (account, dst_container, dst_object)
466 466 
        headers = {} if not headers else headers
......
476 476 
            headers['content_type'] = content_type
477 477 
        else:
478 478 
            params['ignore_content_type'] = ''
479 
        if delimiter:
480 
        	params['delimiter'] = delimiter
479 481 
        return self.put(path, headers=headers, params=params)
480 482
481 483 
    def copy_object(self, src_container, src_object, dst_container, dst_object,
482 
                   meta={}, account=None, content_type=None, **headers):
484 
                   meta={}, account=None, content_type=None, delimiter=None, **headers):
483 485 
        """copies an object"""
484 486 
        account = account or self.account
485 487 
        return self._change_obj_location(src_container, src_object,
486 488 
                                   dst_container, dst_object, account=account,
487 489 
                                   remove=False, meta=meta,
488 
                                   content_type=content_type, **headers)
490 
                                   content_type=content_type, delimiter=delimiter, **headers)
489 491
490 492 
    def move_object(self, src_container, src_object, dst_container,
491 493 
                             dst_object, meta={}, account=None,
......
870 872 
        args['x_source_object'] = source
871 873 
        return self.update_object(container, object, f=None, **args)
872 874
873 
    def delete_object(self, container, object, until=None, account=None):
875 
    def delete_object(self, container, object, until=None, account=None, delimiter=None):
874 876 
        """deletes an object or the object history until the date provided"""
875 877 
        account = account or self.account
876 878 
        params = {'until':until} if until else {}
879 
        if delimiter:
880 
        	params['delimiter'] = delimiter
877 881 
        return OOS_Client.delete_object(self, container, object, params, account)
878 882
879 883 
    def trash_object(self, container, object):
......
908 912
909 913 
    def copy_object(self, src_container, src_object, dst_container, dst_object,
910 914 
                    meta={}, public=False, version=None, account=None,
911 
                    content_type=None):
915 
                    content_type=None, delimiter=None):
912 916 
        """copies an object"""
913 917 
        account = account or self.account
914 918 
        headers = {}
......
918 922 
        return OOS_Client.copy_object(self, src_container, src_object,
919 923 
                                      dst_container, dst_object, meta=meta,
920 924 
                                      account=account, content_type=content_type,
925 
                                      delimiter=delimiter,
921 926 
                                      **headers)
922 927
923 928 
    def move_object(self, src_container, src_object, dst_container,
924 929 
                             dst_object, meta={}, public=False,
925 
                             account=None, content_type=None):
930 
                             account=None, content_type=None, delimiter=None):
926 931 
        """moves an object"""
927 932 
        headers = {}
928 933 
        headers['x_object_public'] = public
929 934 
        return OOS_Client.move_object(self, src_container, src_object,
930 935 
                                      dst_container, dst_object, meta=meta,
931 936 
                                      account=account, content_type=content_type,
937 
                                      delimiter=delimiter,
932 938 
                                      **headers)
933 939
934 940 
    def list_shared_by_others(self, limit=None, marker=None, format='text'):

Also available in: Unified diff