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

displayed location names for implied locations fixes (fixes #265)

Browse Source
This commit is contained in:
Igor Chubin
2019-02-01 23:32:17 +01:00
parent 5a4c57ce96
commit 65855a6d6a
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/location.py
View File

@ -207,11 +207,11 @@ def location_processing(location, ip_addr):
if location == '~':
location = None
if location and location.lstrip('~').startswith('@'):
if location and location.lstrip('~ ').startswith('@'):
try:
location, country = get_location(
socket.gethostbyname(
location.lstrip('~')[1:]))
location.lstrip('~ ')[1:]))
location = '~' + location
if country:
location += ", %s" % country
@ -243,13 +243,16 @@ def location_processing(location, ip_addr):
hide_full_address = not force_show_full_address
if location and not location.startswith('~'):
location = location_canonical_name(location)
tmp_location = location_canonical_name(location)
if tmp_location != location:
override_location_name = location
locaiton = tmp_location
# up to this point it is possible that the name
# contains some unicode symbols
# here we resolve them
if location is not None and not ascii_only(location):
location = "~" + location.lstrip('~')
location = "~" + location.lstrip('~ ')
if location is not None and location.upper() in IATA_CODES:
location = '~%s' % location