Revision 96ee45a3 pithos/api/functions.py

b/pithos/api/functions.py
757 757 
    except NotAllowedError:
758 758 
        raise Unauthorized('Access denied')
759 759 
    except IndexError, e:
760 
        raise Conflict(json.dumps(e.data))
760 
        raise Conflict('\n'.join(e.data) + '\n')
761 761 
    except NameError:
762 762 
        raise ItemNotFound('Container does not exist')
763 763 
    except ValueError:
764 764 
        raise BadRequest('Invalid sharing header')
765 765 
    except AttributeError, e:
766 
        raise Conflict(json.dumps(e.data))
766 
        raise Conflict('\n'.join(e.data) + '\n')
767 767 
    if public is not None:
768 768 
        try:
769 769 
            backend.update_object_public(request.user, v_account, v_container, v_object, public)
......
924 924 
            except ValueError:
925 925 
                raise BadRequest('Invalid sharing header')
926 926 
            except AttributeError, e:
927 
                raise Conflict(json.dumps(e.data))
927 
                raise Conflict('\n'.join(e.data) + '\n')
928 928 
        if public is not None:
929 929 
            try:
930 930 
                backend.update_object_public(request.user, v_account, v_container, v_object, public)
......
1061 1061 
    except ValueError:
1062 1062 
        raise BadRequest('Invalid sharing header')
1063 1063 
    except AttributeError, e:
1064 
        raise Conflict(json.dumps(e.data))
1064 
        raise Conflict('\n'.join(e.data) + '\n')
1065 1065 
    if public is not None:
1066 1066 
        try:
1067 1067 
            backend.update_object_public(request.user, v_account, v_container, v_object, public)

Also available in: Unified diff