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