summaryrefslogtreecommitdiff
path: root/paramiko/buffered_pipe.py
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2023-01-09 21:29:04 -0500
committerJeff Forcier <jeff@bitprophet.org>2023-01-09 23:26:00 -0500
commit74eae059e2ae71044e31a580bc4ede1057c0053b (patch)
tree8c26afc3ce0c0c6494352791fd79b59ad222fb7f /paramiko/buffered_pipe.py
parent4495c4054233c5f7b3c4ffb3fb52ca525bc0d983 (diff)
downloadparamiko-74eae059e2ae71044e31a580bc4ede1057c0053b.tar.gz
Remove py3compat.PY2, including related streamlining
Diffstat (limited to 'paramiko/buffered_pipe.py')
-rw-r--r--paramiko/buffered_pipe.py20
1 files changed, 5 insertions, 15 deletions
diff --git a/paramiko/buffered_pipe.py b/paramiko/buffered_pipe.py
index aa7c06ce..d825efdf 100644
--- a/paramiko/buffered_pipe.py
+++ b/paramiko/buffered_pipe.py
@@ -25,7 +25,7 @@ read operations are blocking and can have a timeout set.
import array
import threading
import time
-from paramiko.py3compat import PY2, b
+from paramiko.py3compat import b
class PipeTimeout(IOError):
@@ -50,21 +50,11 @@ class BufferedPipe(object):
self._buffer = array.array("B")
self._closed = False
- if PY2:
+ def _buffer_frombytes(self, data):
+ self._buffer.frombytes(data)
- 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 _buffer_tobytes(self, limit=None):
+ return self._buffer[:limit].tobytes()
def set_event(self, event):
"""