Rev 3705: Fix '_in_buffer' AttributeError when using the -Dhpss debug flag. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3705
revision-id: pqm at pqm.ubuntu.com-20080912075746-kg3w6klh2bufrjd6
parent: pqm at pqm.ubuntu.com-20080911142801-kssx0sqg51xsvqzr
parent: andrew.bennetts at canonical.com-20080911130159-qg42ybitc63im5ly
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-09-12 08:57:46 +0100
message:
  Fix '_in_buffer' AttributeError when using the -Dhpss debug flag.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/smart/message.py        message.py-20080222013625-ncqmh3nrxjkxab87-1
  bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
    ------------------------------------------------------------
    revno: 3702.2.1
    revision-id: andrew.bennetts at canonical.com-20080911130159-qg42ybitc63im5ly
    parent: pqm at pqm.ubuntu.com-20080910204500-1hs4q0smfcsk7wz0
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: trivial
    timestamp: Thu 2008-09-11 23:01:59 +1000
    message:
      Fix '_in_buffer' AttributeError when using the -Dhpss debug flag.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/smart/message.py        message.py-20080222013625-ncqmh3nrxjkxab87-1
      bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
=== modified file 'NEWS'
--- a/NEWS	2008-09-11 13:47:35 +0000
+++ b/NEWS	2008-09-12 07:57:46 +0000
@@ -15,6 +15,9 @@
 
   BUG FIXES:
 
+    * Fix '_in_buffer' AttributeError when using the -Dhpss debug flag.
+      (Andrew Bennetts)
+
   DOCUMENTATION:
 
   API CHANGES:

=== modified file 'bzrlib/smart/message.py'
--- a/bzrlib/smart/message.py	2008-09-08 05:49:27 +0000
+++ b/bzrlib/smart/message.py	2008-09-11 13:01:59 +0000
@@ -240,7 +240,7 @@
             if 'hpss' in debug.debug_flags:
                 mutter(
                     'decoder state: buf[:10]=%r, state_accept=%s',
-                    self._protocol_decoder._in_buffer[:10],
+                    self._protocol_decoder._get_in_buffer()[:10],
                     self._protocol_decoder.state_accept.__name__)
             raise errors.ConnectionReset(
                 "please check connectivity and permissions",

=== modified file 'bzrlib/smart/protocol.py'
--- a/bzrlib/smart/protocol.py	2008-08-29 19:32:00 +0000
+++ b/bzrlib/smart/protocol.py	2008-09-11 13:01:59 +0000
@@ -456,7 +456,6 @@
 
     def _finished(self):
         self.unused_data = self._get_in_buffer()
-        # self._in_buffer = None
         self._in_buffer_list = []
         self._in_buffer_len = 0
         self.state_accept = self._state_accept_reading_unused