diff --git a/powerline/lib/url.py b/powerline/lib/url.py index 0ff53ade..7387acc9 100644 --- a/powerline/lib/url.py +++ b/powerline/lib/url.py @@ -1,26 +1,16 @@ # vim:fileencoding=utf-8:noet +try: + from urllib.error import HTTPError + from urllib.request import urlopen + from urllib.parse import urlencode as urllib_urlencode # NOQA +except ImportError: + from urllib2 import urlopen, HTTPError + from urllib import urlencode as urllib_urlencode # NOQA + def urllib_read(url): try: - import urllib.error - import urllib.request - try: - return urllib.request.urlopen(url, timeout=5).read().decode('utf-8') - except: - return - except ImportError: - import urllib2 - try: - return urllib2.urlopen(url, timeout=5).read() - except: - return - - -def urllib_urlencode(string): - try: - import urllib.parse - return urllib.parse.urlencode(string) - except ImportError: - import urllib - return urllib.urlencode(string) + return urlopen(url, timeout=100).read().decode('utf-8') + except HTTPError: + return