summaryrefslogtreecommitdiff
path: root/paramiko/sftp_server.py
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2023-01-09 22:55:48 -0500
committerJeff Forcier <jeff@bitprophet.org>2023-01-09 23:26:00 -0500
commit78abb0e542ae5f74b30e5e2aa15a04a815bc55ae (patch)
tree82ba70b54e6c598ada435c4779d1450f034caf80 /paramiko/sftp_server.py
parent9e83ca9d8acb5e9d41d45d46a0339e2f633e2dea (diff)
downloadparamiko-78abb0e542ae5f74b30e5e2aa15a04a815bc55ae.tar.gz
string_types -> str
Diffstat (limited to 'paramiko/sftp_server.py')
-rw-r--r--paramiko/sftp_server.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/paramiko/sftp_server.py b/paramiko/sftp_server.py
index b93c8168..e120e7ad 100644
--- a/paramiko/sftp_server.py
+++ b/paramiko/sftp_server.py
@@ -36,7 +36,7 @@ from paramiko.sftp import (
from paramiko.sftp_si import SFTPServerInterface
from paramiko.sftp_attr import SFTPAttributes
from paramiko.common import DEBUG
-from paramiko.py3compat import string_types, bytes_types
+from paramiko.py3compat import bytes_types
from paramiko.server import SubsystemHandler
from paramiko.util import b
@@ -233,7 +233,7 @@ class SFTPServer(BaseSFTP, SubsystemHandler):
msg.add_int64(item)
elif isinstance(item, int):
msg.add_int(item)
- elif isinstance(item, (string_types, bytes_types)):
+ elif isinstance(item, (str, bytes_types)):
msg.add_string(item)
elif type(item) is SFTPAttributes:
item._pack(msg)
@@ -409,7 +409,7 @@ class SFTPServer(BaseSFTP, SubsystemHandler):
)
return
data = self.file_table[handle].read(offset, length)
- if isinstance(data, (bytes_types, string_types)):
+ if isinstance(data, (bytes_types, str)):
if len(data) == 0:
self._send_status(request_number, SFTP_EOF)
else:
@@ -501,7 +501,7 @@ class SFTPServer(BaseSFTP, SubsystemHandler):
elif t == CMD_READLINK:
path = msg.get_text()
resp = self.server.readlink(path)
- if isinstance(resp, (bytes_types, string_types)):
+ if isinstance(resp, (bytes_types, str)):
self._response(
request_number, CMD_NAME, 1, resp, "", SFTPAttributes()
)