From 0ec4a4d5d57910c4d7249dd6a50ba19b6f5edc7e Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Thu, 9 Feb 2023 16:55:58 +0000 Subject: [PATCH] Don't use U mode, removed in python3.11 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. --- weather.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/weather.py b/weather.py index 61d9067..82960e8 100644 --- a/weather.py +++ b/weather.py @@ -1415,7 +1415,7 @@ def correlate(): 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: @@ -1430,7 +1430,7 @@ def correlate(): 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(";") @@ -1459,7 +1459,7 @@ def correlate(): 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: @@ -1497,7 +1497,7 @@ def correlate(): 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: @@ -1510,7 +1510,7 @@ def correlate(): 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 \ -- 2.11.0