Rev 3700: Cherrypick Andrew's _get_buffer fix in http://bzr.arbash-meinel.com/branches/bzr/1.7-dev/1.7rc2

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.7-dev/1.7rc2

------------------------------------------------------------
revno: 3700
revision-id: john at arbash-meinel.com-20080911211222-s2strfs3qt1iih7i
parent: pqm at pqm.ubuntu.com-20080910041720-8c3wxgxrciqwxumq
author: Andrew Bennetts <andrew.bennetts at canonical.com>
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.7rc2
timestamp: Thu 2008-09-11 16:12:22 -0500
message:
  Cherrypick Andrew's _get_buffer fix
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2008-09-10 03:46:39 +0000
+++ b/NEWS	2008-09-11 21:12:22 +0000
@@ -4,6 +4,15 @@
 
 .. contents::
 
+bzr 1.7rc2 IN DEVELOPMENT
+-------------------------
+
+  BUG FIXES:
+
+    * Fix '_in_buffer' AttributeError when using the -Dhpss debug flag.
+      (Andrew Bennetts)
+
+
 bzr 1.7rc1 2008-09-09
 ---------------------
 

=== 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 21:12:22 +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 21:12:22 +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