tyler.durden
/
powerline
mirror of https://github.com/powerline/powerline.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle more request errors in common segments

This commit is contained in:
Kim Silkebækken 2013-02-06 08:51:47 +01:00
parent 184dac1bff
commit 56e661b21b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
powerline/segments/common.py
View File

@ -24,13 +24,13 @@ def _urllib_read(url):
import urllib.error
import urllib.request
try:
return urllib.request.urlopen(url).read().decode('utf-8')
except urllib.error.HTTPError:
return urllib.request.urlopen(url, timeout=5).read().decode('utf-8')
except:
return
except ImportError:
import urllib2
try:
return urllib2.urlopen(url).read()
return urllib2.urlopen(url, timeout=5).read()
except urllib2.HTTPError:
return
@ -131,7 +131,7 @@ def weather(unit='c', location_query=None):
try:
location = json.loads(_urllib_read('http://freegeoip.net/json/' + external_ip()))
location_query = ','.join([location['city'], location['region_name'], location['country_name']])
except ValueError:
except (TypeError, ValueError):
return None
query_data = {
'q':