Rev 3442: Define _remote_is_at_least_1_2 on SmartClientMedium base class, in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3442
revision-id:pqm at pqm.ubuntu.com-20080521031911-acjem4ky3hjs8gjh
parent: pqm at pqm.ubuntu.com-20080520210027-wetfxldz1ggc5u2a
parent: andrew.bennetts at canonical.com-20080520233028-i3ta801y65fxsxea
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-05-21 04:19:11 +0100
message:
  Define _remote_is_at_least_1_2 on SmartClientMedium base class,
  	rather than just SmartClientStreamMedium. (Andrew Bennetts)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
    ------------------------------------------------------------
    revno: 3435.1.2
    revision-id:andrew.bennetts at canonical.com-20080520233028-i3ta801y65fxsxea
    parent: andrew.bennetts at canonical.com-20080520014329-rn5y7i81klqm05c0
    parent: pqm at pqm.ubuntu.com-20080520210027-wetfxldz1ggc5u2a
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: bug-220806
    timestamp: Wed 2008-05-21 09:30:28 +1000
    message:
      Merge from bzr.dev.
    modified:
      Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
      bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
      bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
      bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
      bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
      bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
      bzrlib/tests/test_missing.py   test_missing.py-20051212000028-694fa4f658a81f48
      bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
      bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
      bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
      bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
      bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
      bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
      doc/en/user-guide/distributed_intro.txt distributed_intro.tx-20071123154453-dk2mjhrg1vpjm5w2-2
    ------------------------------------------------------------
    revno: 3435.1.1
    revision-id:andrew.bennetts at canonical.com-20080520014329-rn5y7i81klqm05c0
    parent: pqm at pqm.ubuntu.com-20080519212735-kzpy4bvzd76o2c2x
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: bug-220806
    timestamp: Tue 2008-05-20 11:43:29 +1000
    message:
      Define _remote_is_at_least_1_2 on SmartClientMedium base class, rather than just SmartClientStreamMedium.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
=== modified file 'NEWS'
--- a/NEWS	2008-05-20 21:00:27 +0000
+++ b/NEWS	2008-05-20 23:30:28 +0000
@@ -42,6 +42,11 @@
       branches in shared repositories accessed over bzr+http.
       (Andrew Bennetts, #230550)
 
+    * Define ``_remote_is_at_least_1_2`` on ``SmartClientMedium`` so that all
+      implementations have the attribute.  Fixes 'PyCurlTransport' object has no
+      attribute '_remote_is_at_least_1_2' attribute errors.
+      (Andrew Bennetts, #220806)
+      
     * Issue a warning and ignore passwords declared in authentication.conf when
       used for an ssh scheme (sftp or bzr+ssh).
       (Vincent Ladeuil, #203186)

=== modified file 'bzrlib/smart/medium.py'
--- a/bzrlib/smart/medium.py	2008-05-20 00:42:19 +0000
+++ b/bzrlib/smart/medium.py	2008-05-20 23:30:28 +0000
@@ -439,6 +439,10 @@
         self._protocol_version_error = None
         self._protocol_version = None
         self._done_hello = False
+        # Be optimistic: we assume the remote end can accept new remote
+        # requests until we get an error saying otherwise.  (1.2 adds some
+        # requests that send bodies, which confuses older servers.)
+        self._remote_is_at_least_1_2 = True
 
     def protocol_version(self):
         """Find out if 'hello' smart request works."""
@@ -505,10 +509,6 @@
     def __init__(self, base):
         SmartClientMedium.__init__(self, base)
         self._current_request = None
-        # Be optimistic: we assume the remote end can accept new remote
-        # requests until we get an error saying otherwise.  (1.2 adds some
-        # requests that send bodies, which confuses older servers.)
-        self._remote_is_at_least_1_2 = True
 
     def accept_bytes(self, bytes):
         self._accept_bytes(bytes)