extern/wttr.in
1
0
Fork 0
mirror of https://github.com/chubin/wttr.in.git synced 2025-08-14 07:48:24 +02:00
Code Issues Packages Projects Releases 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
1 changed files with 6 additions and 6 deletions
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: for method in IPLOCATION_ORDER:
if method == 'geoip': if method == 'geoip':
city, country = geoip(ip_addr) city, region, country = geoip(ip_addr)
elif method == 'ip2location': elif method == 'ip2location':
city, country = ip2location(ip_addr) city, region, country = ip2location(ip_addr)
elif method == 'ipinfo': elif method == 'ipinfo':
city, country = ipinfo(ip_addr) city, region, country = ipinfo(ip_addr)
else: else:
print("ERROR: invalid iplocation method speficied: %s" % method) print("ERROR: invalid iplocation method speficied: %s" % method)
if city is not None: if city is not None:
city, country = workaround(city, country) city, region, country = workaround(city, region, country)
return city, country return city, region, country
# #
# temporary disabled it because of geoip services capcacity # temporary disabled it because of geoip services capcacity
# #
@ -210,7 +210,7 @@ def get_location(ip_addr):
# pass # pass
# No methods resulted in a location - return default # No methods resulted in a location - return default
return NOT_FOUND_LOCATION, None return NOT_FOUND_LOCATION, None, None
def location_canonical_name(location): def location_canonical_name(location):