not all sftp servers obey the 'all filenames are utf8' requirement, so if both ascii and utf8 codecs fail, just return the filename as a byte string
This commit is contained in:
parent
97496845bb
commit
08c9efc86a
|
@ -31,11 +31,18 @@ from paramiko.sftp_file import SFTPFile
|
||||||
|
|
||||||
|
|
||||||
def _to_unicode(s):
|
def _to_unicode(s):
|
||||||
"if a str is not ascii, decode its utf8 into unicode"
|
"""
|
||||||
|
decode a string as ascii or utf8 if possible (as required by the sftp
|
||||||
|
protocol). if neither works, just return a byte string because the server
|
||||||
|
probably doesn't know the filename's encoding.
|
||||||
|
"""
|
||||||
try:
|
try:
|
||||||
return s.encode('ascii')
|
return s.encode('ascii')
|
||||||
except:
|
except UnicodeError:
|
||||||
return s.decode('utf-8')
|
try:
|
||||||
|
return s.decode('utf-8')
|
||||||
|
except UnicodeError:
|
||||||
|
return s
|
||||||
|
|
||||||
|
|
||||||
class SFTPClient (BaseSFTP):
|
class SFTPClient (BaseSFTP):
|
||||||
|
|
Loading…
Reference in New Issue