mostm
/
frida-ios-dump
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #98 from xiofee/master 

Fix: py3 can't concat str to bytes
This commit is contained in:
Alone_Monkey 2020-03-08 09:16:32 +08:00 committed by GitHub
parent 64b58d1c3e c5eff3b063
commit 850a38efd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dump.py
View File

@ -98,7 +98,7 @@ def on_message(message, data):
def progress(filename, size, sent): def progress(filename, size, sent):
baseName = os.path.basename(filename) baseName = os.path.basename(filename)
if IS_PY2: if IS_PY2 or isinstance(baseName, bytes):
t.desc = baseName.decode("utf-8") t.desc = baseName.decode("utf-8")
else: else:
t.desc = baseName t.desc = baseName