Mirrors/wttr.in
2
0
Fork 0
mirror of https://github.com/chubin/wttr.in synced 2024-11-15 08:37:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix _geoip() format bug

Browse source
This commit is contained in:
Igor Chubin 2021-01-21 23:12:06 +01:00
parent 49daae6f40
commit a6d0adbbf7
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/location.py
View file

@ -204,9 +204,12 @@ def _ipinfo(ip_addr):
def _geoip(ip_addr): def _geoip(ip_addr):
try: try:
_debug_log("[_geoip] %s search" % ip_addr)
response = GEOIP_READER.city(ip_addr) response = GEOIP_READER.city(ip_addr)
city, region, country, ccode, lat, long = response.city.name, response.subdivisions.name, response.country.name, response.country.iso_code, response.location.latitude, response.location.longitude # print(response.subdivisions)
except (geoip2.errors.AddressNotFoundError, AttributeError): city, region, country, ccode, lat, long = response.city.name, response.subdivisions[0].names["en"], response.country.name, response.country.iso_code, response.location.latitude, response.location.longitude
_debug_log("[_geoip] %s found" % ip_addr)
except (geoip2.errors.AddressNotFoundError):
return None return None
return [city, region, country, ccode, lat, long] return [city, region, country, ccode, lat, long]