From 23c03b812242736bbfa1bf2e7780911ff180aaae Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Sun, 25 May 2014 14:57:58 -0700
Subject: We support 3.2

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 9305bfb3..61c5c852 100644
--- a/README
+++ b/README
@@ -35,7 +35,7 @@ Requirements
 ------------
 
   - Python 2.6 or better <http://www.python.org/> - this includes Python
-    3.3 and higher as well.
+    3.2 and higher as well.
   - pycrypto 2.1 or better <https://www.dlitz.net/software/pycrypto/>
   - ecdsa 0.9 or better <https://pypi.python.org/pypi/ecdsa>
 
-- 
cgit v1.2.3


From c3ba66b90e9da0cce9c88fbc45894fde492edfd0 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 5 Jul 2014 23:51:38 +0200
Subject: Support passing in "buffer" objects again where bytestrings are
 expected.

This fixes bzr's use of paramiko.

Fixes issue #343/#285.
---
 paramiko/py3compat.py |  4 ++++
 tests/test_file.py    | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/paramiko/py3compat.py b/paramiko/py3compat.py
index 8842b988..57c096b2 100644
--- a/paramiko/py3compat.py
+++ b/paramiko/py3compat.py
@@ -39,6 +39,8 @@ if PY2:
             return s
         elif isinstance(s, unicode):
             return s.encode(encoding)
+        elif isinstance(s, buffer):
+            return s
         else:
             raise TypeError("Expected unicode or bytes, got %r" % s)
 
@@ -49,6 +51,8 @@ if PY2:
             return s.decode(encoding)
         elif isinstance(s, unicode):
             return s
+        elif isinstance(s, buffer):
+            return s.decode(encoding)
         else:
             raise TypeError("Expected unicode or bytes, got %r" % s)
 
diff --git a/tests/test_file.py b/tests/test_file.py
index c6edd7af..22a34aca 100755
--- a/tests/test_file.py
+++ b/tests/test_file.py
@@ -23,6 +23,7 @@ Some unit tests for the BufferedFile abstraction.
 import unittest
 from paramiko.file import BufferedFile
 from paramiko.common import linefeed_byte, crlf, cr_byte
+import sys
 
 
 class LoopbackFile (BufferedFile):
@@ -151,6 +152,15 @@ class BufferedFileTest (unittest.TestCase):
                             b'need to close them again.\n')
         f.close()
 
+    def test_8_buffering(self):
+        """
+        verify that buffered objects can be written
+        """
+        if sys.version_info[0] == 2:
+            f = LoopbackFile('r+', 16)
+            f.write(buffer(b'Too small.'))
+            f.close()
+
 if __name__ == '__main__':
     from unittest import main
     main()
-- 
cgit v1.2.3


From d05ca17db876055a5f584e720b1b0733116b4365 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 25 Aug 2014 21:59:59 -0700
Subject: Changelog re #285, re #352

Conflicts:
	sites/www/changelog.rst
---
 sites/www/changelog.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index a652e565..5c8e02f4 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,12 @@
 Changelog
 =========
 
+* :bug:`285` (also :issue:`352`) Update our Python 3 ``b()`` compatibility shim
+  to handle ``buffer`` objects correctly; this fixes a frequently reported
+  issue affecting many users, including users of the ``bzr`` software suite.
+  Thanks to ``@basictheprogram`` for the initial report, Jelmer Vernooij for
+  the fix and Andrew Starr-Bochicchio & Jeremy T. Bouse (among others) for
+  discussion & feedback.
 * :release:`1.13.1 <2014-05-07>`
 * :release:`1.12.4 <2014-05-07>`
 * :release:`1.11.6 <2014-05-07>`
-- 
cgit v1.2.3