/mirrors/bzr.webdav

To get this branch, use:
bzr branch bzr+ssh://bazaar.launchpad.net/+branch/bzr.webdav/

« back to all changes in this revision

Viewing changes to webdav.py

  • Committer: Vincent Ladeuil
  • Date: 2013-08-10 14:20:13 UTC
  • mfrom: (74.1.5 bzr-webdav)
  • Revision ID: v.ladeuil+lp@free.fr-20130810142013-puu3icldhuz891l4
Merge fixes from Reagan Sanders

Show diffs side-by-side

added added

removed removed

Lines of Context:
webdav.py
624
624
        abs_to = self._remote_path(rel_to)
625
625
 
626
626
        request = _urllib2_wrappers.Request('MOVE', abs_from, None,
627
 
                                            {'Destination': abs_to},
 
627
                                            {'Destination': abs_to,
 
628
                                             'Overwrite': 'T'},
628
629
                                            accepted_errors=[201, 204,
629
630
                                                             404, 409])
630
631
        response = self._perform(request)
651
652
        abs_path = self._remote_path(rel_path)
652
653
 
653
654
        request = _urllib2_wrappers.Request('DELETE', abs_path,
654
 
                                            accepted_errors=[200, 204,
 
655
                                            accepted_errors=[200, 202, 204,
655
656
                                                             404, 999])
656
657
        response = self._perform(request)
657
658
 
658
659
        code = response.code
659
660
        if code == 404:
660
661
            raise errors.NoSuchFile(abs_path)
661
 
        if code != 204:
 
662
        if code not in (200, 204):
662
663
            self._raise_http_error(abs_path, response, 'unable to delete')
663
664
 
664
665
    def copy(self, rel_from, rel_to):
866
867
def get_test_permutations():
867
868
    """Return the permutations to be used in testing."""
868
869
    import tests.dav_server
869
 
    return [(HttpDavTransport, tests.dav_server.DAVServer),]
 
870
    return [(HttpDavTransport, tests.dav_server.DAVServer),
 
871
            (HttpDavTransport, tests.dav_server.QuirkyDAVServer)]