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

Move weather condition codes into weather function

This commit is contained in:
Kim Silkebækken 2013-02-11 07:20:39 +01:00
parent 28547930cc
commit d961116485
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
powerline/segments/common.py
View File

@ -5,19 +5,6 @@ import sys
from powerline.lib import memoize
# Weather condition code descriptions available at http://developer.yahoo.com/weather/#codes
weather_conditions_codes = {
u'〇': [25, 34],
u'⚑': [24],
u'☔': [5, 6, 8, 9, 10, 11, 12, 35, 40, 45, 47],
u'☁': [26, 27, 28, 29, 30, 44],
u'❅': [7, 13, 14, 15, 16, 17, 18, 41, 42, 43, 46],
u'☈': [0, 1, 2, 3, 4, 37, 38, 39],
u'〰': [19, 20, 21, 22, 23],
u'☼': [32, 36],
u'☾': [31, 33],
}
def _urllib_read(url):
try:
@ -184,6 +171,19 @@ def weather(unit='c', location_query=None):
'''
import json
# Weather condition code descriptions available at http://developer.yahoo.com/weather/#codes
weather_conditions_codes = {
u'〇': [25, 34],
u'⚑': [24],
u'☔': [5, 6, 8, 9, 10, 11, 12, 35, 40, 45, 47],
u'☁': [26, 27, 28, 29, 30, 44],
u'❅': [7, 13, 14, 15, 16, 17, 18, 41, 42, 43, 46],
u'☈': [0, 1, 2, 3, 4, 37, 38, 39],
u'〰': [19, 20, 21, 22, 23],
u'☼': [32, 36],
u'☾': [31, 33],
}
if not location_query:
try:
location = json.loads(_urllib_read('http://freegeoip.net/json/' + external_ip()))