extern/wttr.in
1
0
Fork 0
mirror of https://github.com/chubin/wttr.in.git synced 2025-08-13 15:37:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Unpack region from get_location call or fail case

Browse Source
This commit is contained in:
Gregory Danielson
2020-11-01 16:27:13 -06:00
parent 4fa1ebd995
commit f3bce5f806
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/location.py
View File

@ -291,7 +291,7 @@ def location_processing(location, ip_addr):
if location and location.lstrip('~ ').startswith('@'): if location and location.lstrip('~ ').startswith('@'):
try: try:
location, country = get_location( location, region, country = get_location(
socket.gethostbyname( socket.gethostbyname(
location.lstrip('~ ')[1:])) location.lstrip('~ ')[1:]))
location = '~' + location location = '~' + location
@ -299,7 +299,7 @@ def location_processing(location, ip_addr):
location += ", %s" % country location += ", %s" % country
hide_full_address = not force_show_full_address hide_full_address = not force_show_full_address
except: except:
location, country = NOT_FOUND_LOCATION, None location, region, country = NOT_FOUND_LOCATION, None, None
query_source_location = get_location(ip_addr) query_source_location = get_location(ip_addr)
@ -314,7 +314,8 @@ def location_processing(location, ip_addr):
location = ip_addr location = ip_addr
if is_ip(location): if is_ip(location):
location, country = get_location(location) location, region, country = get_location(location)
# location is just city here
# here too # here too
if location: if location: