Mirrors/wttr.in
2
0
Fork 0
mirror of https://github.com/chubin/wttr.in synced 2025-01-26 02:34:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Observe new region var in get_location

Browse source
This commit is contained in:
Gregory Danielson 2020-11-01 13:50:05 -06:00
parent c65614d230
commit 08be8787b1
No known key found for this signature in database
GPG key ID: 88D4EF22F6C14CA7
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/location.py
View file

@ -188,16 +188,16 @@ def get_location(ip_addr):
"""
for method in IPLOCATION_ORDER:
if method == 'geoip':
city, country = geoip(ip_addr)
city, region, country = geoip(ip_addr)
elif method == 'ip2location':
city, country = ip2location(ip_addr)
city, region, country = ip2location(ip_addr)
elif method == 'ipinfo':
city, country = ipinfo(ip_addr)
city, region, country = ipinfo(ip_addr)
else:
print("ERROR: invalid iplocation method speficied: %s" % method)
if city is not None:
city, country = workaround(city, country)
return city, country
city, region, country = workaround(city, region, country)
return city, region, country
#
# temporary disabled it because of geoip services capcacity
#
@ -210,7 +210,7 @@ def get_location(ip_addr):
# pass
# No methods resulted in a location - return default
return NOT_FOUND_LOCATION, None
return NOT_FOUND_LOCATION, None, None
def location_canonical_name(location):