Rev 62: Fix bug 238101 by upgrading to bzr-1.12. in http://bazaar.launchpad.net/%7Ebzr/bzr.webdav/webdav

[Vincent Ladeuil]

At http://bazaar.launchpad.net/%7Ebzr/bzr.webdav/webdav

------------------------------------------------------------
revno: 62
revision-id: v.ladeuil+lp at free.fr-20090211172928-d1m8d8phdkwm5oj7
parent: v.ladeuil+lp at free.fr-20080703155215-9xw0791rqkets403
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: webdav
timestamp: Wed 2009-02-11 18:29:28 +0100
message:
  Fix bug 238101 by upgrading to bzr-1.12.
  
  * webdav.py:
  (DavOpener.__init__): Accept a 'report_activity' parameter.
  (HttpDavTransport.__init__): Deleted since it's useless.
  
  * __init__.py: 
  Bump version to 1.12.0 to match bzr.
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py	2008-06-09 07:50:46 +0000
+++ b/__init__.py	2009-02-11 17:29:28 +0000
@@ -20,7 +20,7 @@
 handling of WebDAV to allow pushing on an http server.
 """
 
-__version__ = '1.6.0'
+__version__ = '1.12.0'
 version_info = tuple(int(n) for n in __version__.split('.'))
 
 # Don't go further if we are not compatible
@@ -28,11 +28,11 @@
 major, minor, micro, releaselevel = bzrlib.version_info[:4]
 
 
-if major != 1 or minor < 6:
-    # We need bzr 1.6
+if major < 1 or minor < 12:
+    # We need bzr 1.12
     from bzrlib import trace
     trace.note('not installing http[s]+webdav:// support'
-               ' (only supported for bzr 1.6 and above)')
+               ' (only supported for bzr 1.12 and above)')
 else:
     from bzrlib import transport
 

=== modified file 'tests/dav_server.py'
--- a/tests/dav_server.py	2008-07-03 15:52:15 +0000
+++ b/tests/dav_server.py	2009-02-11 17:29:28 +0000
@@ -151,12 +151,12 @@
     def do_PUT(self):
         """Serve a PUT request."""
         # FIXME: test_put_file_unicode makes us emit a traceback because a
-        # UnicodeEncodeError occurs after the request headers have been sent be
-        # before the body can be send. It's harmless and do not make the test
-        # fails. Adressing that will mean protecting all reads from the socket,
-        # which is too heavy for now -- vila 20070917
+        # UnicodeEncodeError occurs after the request headers have been sent
+        # but before the body can be send. It's harmless and does not make the
+        # test fails. Adressing that will mean protecting all reads from the
+        # socket, which is too heavy for now -- vila 20070917
         path = self.translate_path(self.path)
-        trace.mutter("do_PUT rel: [%s], abs: [%s]" % (self.path,path))
+        trace.mutter("do_PUT rel: [%s], abs: [%s]" % (self.path, path))
 
         do_append = False
         # Check the Content-Range header
@@ -186,6 +186,8 @@
             else:
                 f = open(path, 'wb')
         except (IOError, OSError), e :
+            trace.mutter("do_PUT got: [%r] while opening/seeking on [%s]"
+                         % (e, self.path))
             self.send_error(409, 'Conflict')
             return
 

=== modified file 'webdav.py'
--- a/webdav.py	2008-06-30 15:58:20 +0000
+++ b/webdav.py	2009-02-11 17:29:28 +0000
@@ -387,8 +387,9 @@
 class DavOpener(_urllib2_wrappers.Opener):
     """Dav specific needs regarding HTTP(S)"""
 
-    def __init__(self):
-        super(DavOpener, self).__init__(connection=DavConnectionHandler)
+    def __init__(self, report_activity=None):
+        super(DavOpener, self).__init__(connection=DavConnectionHandler,
+                                        report_activity=report_activity)
 
 
 class HttpDavTransport(_urllib.HttpTransport_urllib):
@@ -401,11 +402,6 @@
     _debuglevel = 0
     _opener_class = DavOpener
 
-    def __init__(self, base, _from_transport=None):
-        assert base.startswith('https+webdav') or base.startswith('http+webdav')
-        super(HttpDavTransport, self).__init__(base,
-                                               _from_transport=_from_transport)
-
     def is_readonly(self):
         """See Transport.is_readonly."""
         return False
@@ -681,7 +677,7 @@
         code = response.code
         if code in (404, 409):
             raise errors.NoSuchFile(abs_from)
-        # XXX: out test server returns 201 but apache2 returns 204, need
+        # XXX: our test server returns 201 but apache2 returns 204, need
         # investivation.
         if code not in(201, 204):
             self._raise_http_error(abs_from, response,