summaryrefslogtreecommitdiff
path: root/python/downloadprovider.py
diff options
context:
space:
mode:
authorKyleMiles <krm504@nyu.edu>2018-07-13 19:23:31 -0400
committerKyleMiles <krm504@nyu.edu>2018-07-13 19:25:15 -0400
commit2c7f443ce0b3d92ea44acb440c1891344eacc6d4 (patch)
tree2b792808b858de83d7f2b90040b023534a4455a6 /python/downloadprovider.py
parentb460b9495a91897d9f8ed192c148e5afc366fb59 (diff)
Python2/3 String Compatibility Fix
Diffstat (limited to 'python/downloadprovider.py')
-rw-r--r--python/downloadprovider.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/python/downloadprovider.py b/python/downloadprovider.py
index 09abd516..14368ee7 100644
--- a/python/downloadprovider.py
+++ b/python/downloadprovider.py
@@ -31,6 +31,9 @@ from binaryninja import with_metaclass
from binaryninja import startup
from binaryninja import log
+# 2-3 compatibility
+from binaryninja import pyNativeStr
+
class DownloadInstance(object):
def __init__(self, provider, handle = None):
@@ -166,7 +169,7 @@ if sys.version_info >= (2, 7, 9):
opener = build_opener(ProxyHandler({'https': proxy_setting}))
install_opener(opener)
- r = urlopen(url.decode("charmap"))
+ r = urlopen(pyNativeStr(url))
total_size = int(r.headers.get('content-length', 0))
bytes_sent = 0
while True:
@@ -224,7 +227,7 @@ else:
else:
proxies = None
- r = requests.get(url.decode("charmap"), proxies=proxies)
+ r = requests.get(pyNativeStr(url), proxies=proxies)
if not r.ok:
core.BNSetErrorForDownloadInstance(self.handle, "Received error from server")
return -1