Salastil/weather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get correlate() working in modern Python 3

Browse Source 
Update a bunch of the parsing for various correlation source files
to work in both Python 2.7 and 3.5+, mostly where str vs bytes and
UTF-8 encoding/decoding are concerned. This can be cleaned up
significantly once support for 2.7 is finally dropped.
This commit is contained in:
Jeremy Stanley
2020-06-21 20:13:14 +00:00
parent 0a4712f9a8
commit 1bbdcd7e89
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
weather.py
View File

@@ -1330,7 +1330,7 @@ def correlate():
sys.stdout.write(message) sys.stdout.write(message)
sys.stdout.flush() sys.stdout.flush()
count = 0 count = 0
gcounties = zipfile.ZipFile(gcounties_an).open(gcounties_fn, "rU") gcounties = zipfile.ZipFile(gcounties_an).open(gcounties_fn, "r")
columns = gcounties.readline().decode("utf-8").strip().split("\t") columns = gcounties.readline().decode("utf-8").strip().split("\t")
for line in gcounties: for line in gcounties:
fields = line.decode("utf-8").strip().split("\t") fields = line.decode("utf-8").strip().split("\t")
@@ -1353,7 +1353,7 @@ def correlate():
sys.stdout.write(message) sys.stdout.write(message)
sys.stdout.flush() sys.stdout.flush()
count = 0 count = 0
gcousubs = zipfile.ZipFile(gcousubs_an).open(gcousubs_fn, "rU") gcousubs = zipfile.ZipFile(gcousubs_an).open(gcousubs_fn, "r")
columns = gcousubs.readline().decode("utf-8").strip().split("\t") columns = gcousubs.readline().decode("utf-8").strip().split("\t")
for line in gcousubs: for line in gcousubs:
fields = line.decode("utf-8").strip().split("\t") fields = line.decode("utf-8").strip().split("\t")
@@ -1376,7 +1376,7 @@ def correlate():
sys.stdout.write(message) sys.stdout.write(message)
sys.stdout.flush() sys.stdout.flush()
count = 0 count = 0
gplace = zipfile.ZipFile(gplace_an).open(gplace_fn, "rU") gplace = zipfile.ZipFile(gplace_an).open(gplace_fn, "r")
columns = gplace.readline().decode("utf-8").strip().split("\t") columns = gplace.readline().decode("utf-8").strip().split("\t")
for line in gplace: for line in gplace:
fields = line.decode("utf-8").strip().split("\t") fields = line.decode("utf-8").strip().split("\t")
@@ -1445,18 +1445,18 @@ def correlate():
count = 0 count = 0
ourairports = open(ourairports_fn, "rU") ourairports = open(ourairports_fn, "rU")
for row in csv.reader(ourairports): for row in csv.reader(ourairports):
icao = row[12].decode('utf-8').lower() icao = row[12].lower()
if icao in stations: if icao in stations:
iata = row[13].decode('utf-8').lower() iata = row[13].lower()
if len(iata) == 3: airports[iata] = { "station": icao } if len(iata) == 3: airports[iata] = { "station": icao }
if "description" not in stations[icao]: if "description" not in stations[icao]:
description = [] description = []
name = row[3].decode('utf-8') name = row[3]
if name: description.append(name) if name: description.append(name)
municipality = row[10].decode('utf-8') municipality = row[10]
if municipality: description.append(municipality) if municipality: description.append(municipality)
region = row[9].decode('utf-8') region = row[9]
country = row[8].decode('utf-8') country = row[8]
if region: if region:
if "-" in region: if "-" in region:
c,r = region.split("-", 1) c,r = region.split("-", 1)
@@ -1467,9 +1467,9 @@ def correlate():
if description: if description:
stations[icao]["description"] = ", ".join(description) stations[icao]["description"] = ", ".join(description)
if "location" not in stations[icao]: if "location" not in stations[icao]:
lat = row[4].decode('utf-8') lat = row[4]
if lat: if lat:
lon = row[5].decode('utf-8') lon = row[5]
if lon: if lon:
stations[icao]["location"] = gecos( stations[icao]["location"] = gecos(
"%s,%s" % (lat, lon) "%s,%s" % (lat, lon)
@@ -1566,7 +1566,7 @@ def correlate():
sys.stdout.write(message) sys.stdout.write(message)
sys.stdout.flush() sys.stdout.flush()
count = 0 count = 0
gzcta = zipfile.ZipFile(gzcta_an).open(gzcta_fn, "rU") gzcta = zipfile.ZipFile(gzcta_an).open(gzcta_fn, "r")
columns = gzcta.readline().decode("utf-8").strip().split("\t") columns = gzcta.readline().decode("utf-8").strip().split("\t")
for line in gzcta: for line in gzcta:
fields = line.decode("utf-8").strip().split("\t") fields = line.decode("utf-8").strip().split("\t")
@@ -1955,6 +1955,8 @@ def correlate():
if type(element) is float: elements.append("%.7f"%element) if type(element) is float: elements.append("%.7f"%element)
else: elements.append( repr(element) ) else: elements.append( repr(element) )
value = "(%s)"%", ".join(elements) value = "(%s)"%", ".join(elements)
if type(value) is bytes:
value = value.decode("utf-8")
stations_fd.write( "\n%s = %s" % (key, value) ) stations_fd.write( "\n%s = %s" % (key, value) )
count += 1 count += 1
stations_fd.write("\n") stations_fd.write("\n")