From a15d5ba25d19564f21e53dba5294448d6550cfce Mon Sep 17 00:00:00 2001
From: Scott Maxwell <scott@codecobblers.com>
Date: Wed, 4 Dec 2013 00:43:03 -0500
Subject: [PATCH] Fix deprecation warning in array conversion

---
 paramiko/buffered_pipe.py | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/paramiko/buffered_pipe.py b/paramiko/buffered_pipe.py
index 0391dee..02408a2 100644
--- a/paramiko/buffered_pipe.py
+++ b/paramiko/buffered_pipe.py
@@ -49,6 +49,20 @@ class BufferedPipe (object):
         self._buffer = array.array('B')
         self._closed = False
 
+    if PY2:
+        def _buffer_frombytes(self, data):
+            self._buffer.fromstring(data)
+
+        def _buffer_tobytes(self, limit=None):
+            return self._buffer[:limit].tostring()
+    else:
+        def _buffer_frombytes(self, data):
+            self._buffer.frombytes(data)
+
+        def _buffer_tobytes(self, limit=None):
+            return self._buffer[:limit].tobytes()
+
+
     def set_event(self, event):
         """
         Set an event on this buffer.  When data is ready to be read (or the
@@ -76,7 +90,7 @@ class BufferedPipe (object):
         try:
             if self._event is not None:
                 self._event.set()
-            self._buffer.fromstring(data)
+            self._buffer_frombytes(b(data))
             self._cv.notifyAll()
         finally:
             self._lock.release()
@@ -143,12 +157,12 @@ class BufferedPipe (object):
 
             # something's in the buffer and we have the lock!
             if len(self._buffer) <= nbytes:
-                out = self._buffer.tostring()
+                out = self._buffer_tobytes()
                 del self._buffer[:]
                 if (self._event is not None) and not self._closed:
                     self._event.clear()
             else:
-                out = self._buffer[:nbytes].tostring()
+                out = self._buffer_tobytes(nbytes)
                 del self._buffer[:nbytes]
         finally:
             self._lock.release()
@@ -164,7 +178,7 @@ class BufferedPipe (object):
         """
         self._lock.acquire()
         try:
-            out = self._buffer.tostring()
+            out = self._buffer_tobytes()
             del self._buffer[:]
             if (self._event is not None) and not self._closed:
                 self._event.clear()