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

Don't use U mode, removed in python3.11

Browse Source 
This patch was helpfully submitted by Bas Couwenberg to drop use of
the universal newline flag, since Python 3.11 no longer supports it.
It probably breaks the ability to build new correlation files under
Python 2.7 and earlier, but since it shouldn't affect operation of
the utility with prebuilt correlations (the way it's typically
used), this isn't yet considered to drop Python 2.7 support
altogether.
This commit is contained in:
Jeremy Stanley
2023-02-09 16:55:58 +00:00
parent 8b903a7f49
commit 0ec4a4d5d5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
weather.py
View File

@@ -1415,7 +1415,7 @@ def correlate():
sys.stdout.write(message) sys.stdout.write(message)
sys.stdout.flush() sys.stdout.flush()
count = 0 count = 0
slist = codecs.open(slist_fn, "rU", "utf-8") slist = codecs.open(slist_fn, "r", "utf-8")
for line in slist: for line in slist:
icao = line.split("#")[0].strip() icao = line.split("#")[0].strip()
if icao: if icao:
@@ -1430,7 +1430,7 @@ def correlate():
sys.stdout.write(message) sys.stdout.write(message)
sys.stdout.flush() sys.stdout.flush()
count = 0 count = 0
nsdcccc = codecs.open(nsdcccc_fn, "rU", "utf-8") nsdcccc = codecs.open(nsdcccc_fn, "r", "utf-8")
for line in nsdcccc: for line in nsdcccc:
line = str(line) line = str(line)
fields = line.split(";") fields = line.split(";")
@@ -1459,7 +1459,7 @@ def correlate():
sys.stdout.write(message) sys.stdout.write(message)
sys.stdout.flush() sys.stdout.flush()
count = 0 count = 0
ourairports = open(ourairports_fn, "rU") ourairports = open(ourairports_fn, "r")
for row in csv.reader(ourairports): for row in csv.reader(ourairports):
icao = row[12].lower() icao = row[12].lower()
if icao in stations: if icao in stations:
@@ -1497,7 +1497,7 @@ def correlate():
sys.stdout.write(message) sys.stdout.write(message)
sys.stdout.flush() sys.stdout.flush()
count = 0 count = 0
zlist = codecs.open(zlist_fn, "rU", "utf-8") zlist = codecs.open(zlist_fn, "r", "utf-8")
for line in zlist: for line in zlist:
line = line.split("#")[0].strip() line = line.split("#")[0].strip()
if line: if line:
@@ -1510,7 +1510,7 @@ def correlate():
sys.stdout.flush() sys.stdout.flush()
count = 0 count = 0
cpfz = {} cpfz = {}
cpfzcf = codecs.open(cpfzcf_fn, "rU", "utf-8") cpfzcf = codecs.open(cpfzcf_fn, "r", "utf-8")
for line in cpfzcf: for line in cpfzcf:
fields = line.strip().split("|") fields = line.strip().split("|")
if len(fields) == 11 \ if len(fields) == 11 \