tMerge pull request #1286 from kyuupichan/remove_urllib2 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 2b9b42d5f776b2d4e328d3d61da324eebdbd9c4a
DIR parent e517321f76cdc6855fcb97e42ad6922ccc148dac
HTML Author: ThomasV <electrumdev@gmail.com>
Date: Wed, 10 Jun 2015 21:15:27 +0200
Merge pull request #1286 from kyuupichan/remove_urllib2
Use requests instead - SSL handling is superior
Diffstat:
M contrib/make_locale | 7 ++++---
M lib/paymentrequest.py | 1 -
2 files changed, 4 insertions(+), 4 deletions(-)
---
DIR diff --git a/contrib/make_locale b/contrib/make_locale
t@@ -1,6 +1,7 @@
#!/usr/bin/env python2
from StringIO import StringIO
-import urllib2, os, zipfile, pycurl
+import os, zipfile, pycurl
+import requests
os.chdir(os.path.dirname(os.path.realpath(__file__)))
os.chdir('..')
t@@ -31,12 +32,12 @@ if os.path.exists('../contrib/crowdin_api_key.txt'):
c.perform()
# Build translations
print 'Build translations'
- response = urllib2.urlopen('http://api.crowdin.net/api/project/' + crowdin_identifier + '/export?key=' + crowdin_api_key).read()
+ response = requests.request('GET', 'http://api.crowdin.net/api/project/' + crowdin_identifier + '/export?key=' + crowdin_api_key).content
print response
# Download & unzip
print 'Download translations'
-zfobj = zipfile.ZipFile(StringIO(urllib2.urlopen('http://crowdin.net/download/project/' + crowdin_identifier + '.zip').read()))
+zfobj = zipfile.ZipFile(StringIO(requests.request('GET', 'http://crowdin.net/download/project/' + crowdin_identifier + '.zip').content))
print 'Unzip translations'
for name in zfobj.namelist():
DIR diff --git a/lib/paymentrequest.py b/lib/paymentrequest.py
t@@ -24,7 +24,6 @@ import sys
import threading
import time
import traceback
-import urllib2
import urlparse
import requests