Revision 85a93d09 pithos/backends/modular.py

b/pithos/backends/modular.py
99 99 
                  'namelen': self.blocker.hashlen}
100 100 
        self.mapper = Mapper(**params)
101 101
102 
        params = {'connection': self.wrapper.conn,
103 
                  'cursor': self.wrapper.conn.cursor()}
102 
        params = {'wrapper': self.wrapper}
104 103 
        self.permissions = self.mod.permissions.Permissions(**params)
105 104 
        for x in ['READ', 'WRITE']:
106 105 
            setattr(self, x, getattr(self.mod.permissions, x))
......
481 480 
            ie = IndexError()
482 481 
            ie.data = [binascii.hexlify(x) for x in missing]
483 482 
            raise ie
484 
        path = '/'.join((account, container, name))
485 483 
        if permissions is not None:
484 
            path = '/'.join((account, container, name))
486 485 
            self._check_permissions(path, permissions)
487 486 
        path, node = self._put_object_node(account, container, name)
488 487 
        src_version_id, dest_version_id = self._copy_version(user, node, None, node, size)
......
505 504 
        self._can_write(user, account, dest_container, dest_name)
506 505 
        src_path, src_node = self._lookup_object(account, src_container, src_name)
507 506 
        if permissions is not None:
507 
            dest_path = '/'.join((account, container, name))
508 508 
            self._check_permissions(dest_path, permissions)
509 509 
        dest_path, dest_node = self._put_object_node(account, dest_container, dest_name)
510 510 
        src_version_id, dest_version_id = self._copy_version(user, src_node, src_version, dest_node)
......
514 514 
            self.node.attribute_copy(src_version_id, dest_version_id)
515 515 
        self.node.attribute_set(dest_version_id, ((k, v) for k, v in dest_meta.iteritems()))
516 516 
        if permissions is not None:
517 
            dest_path = '/'.join((account, container, name))
518 517 
            self.permissions.access_set(dest_path, permissions)
519 518 
        return dest_version_id
520 519

Also available in: Unified diff