Revision cb146cf9 pithos/backends/simple.py

b/pithos/backends/simple.py
272 272
            self.con.execute(sql, (dest_version_id, k, v))
273 273
        self.con.commit()
274 274
    
275
    def move_object(self, user, account, src_container, src_name, dest_container, dest_name, dest_meta={}, replace_meta=False, src_version=None):
275
    def move_object(self, user, account, src_container, src_name, dest_container, dest_name, dest_meta={}, replace_meta=False):
276 276
        """Move an object's data and metadata."""
277 277
        
278
        logger.debug("move_object: %s %s %s %s, %s %s %s %s", account, src_container, src_name, dest_container, dest_name, dest_meta, replace_meta, src_version)
279
        self.copy_object(user, account, src_container, src_name, dest_container, dest_name, dest_meta, replace_meta, src_version)
278
        logger.debug("move_object: %s %s %s %s %s %s %s", account, src_container, src_name, dest_container, dest_name, dest_meta, replace_meta)
279
        self.copy_object(user, account, src_container, src_name, dest_container, dest_name, dest_meta, replace_meta, None)
280 280
        self.delete_object(user, account, src_container, src_name)
281 281
    
282 282
    def delete_object(self, user, account, container, name):
......
353 353
        return int(row[0]), int(row[1]), int(tstamp)
354 354
    
355 355
    def _get_version(self, path, version=None):
356
        if version in [None, 'list']:
356
        if version is None:
357 357
            sql = '''select version_id, strftime('%s', tstamp), size, hide from versions where name = ?
358 358
                        order by version_id desc limit 1'''
359 359
            c = self.con.execute(sql, (path,))

Also available in: Unified diff