X-Git-Url: https://yuggoth.org/gitweb?a=blobdiff_plain;f=weather.py;h=493be0aa0363e1770fa27b9039df55f8678113ba;hb=68518f4631fe9afa5eacd5a46d2cba77a2761922;hp=61d906703ef7f944e31533404a428559502ca99e;hpb=8b903a7f49f7d66b026726baf65024623208491c;p=weather.git diff --git a/weather.py b/weather.py index 61d9067..493be0a 100644 --- a/weather.py +++ b/weather.py @@ -1,12 +1,12 @@ """Contains various object definitions needed by the weather utility.""" weather_copyright = """\ -# Copyright (c) 2006-2021 Jeremy Stanley . Permission to +# Copyright (c) 2006-2024 Jeremy Stanley . Permission to # use, copy, modify, and distribute this software is granted under terms # provided in the LICENSE file distributed with this software. #""" -weather_version = "2.4.1" +weather_version = "2.4.4" radian_to_km = 6372.795484 radian_to_mi = 3959.871528 @@ -130,7 +130,7 @@ def filter_units(line, units="imperial"): # filter lines with both pressures in the form of "X inches (Y hPa)" or # "X in. Hg (Y hPa)" dual_p = re.match( - "(.* )(\d*(\.\d+)? (inches|in\. Hg)) \((\d*(\.\d+)? hPa)\)(.*)", + r"(.* )(\d*(\.\d+)? (inches|in\. Hg)) \((\d*(\.\d+)? hPa)\)(.*)", line ) if dual_p: @@ -139,7 +139,7 @@ def filter_units(line, units="imperial"): elif units == "metric": line = preamble + hpa + trailer # filter lines with both temperatures in the form of "X F (Y C)" dual_t = re.match( - "(.* )(-?\d*(\.\d+)? F) \((-?\d*(\.\d+)? C)\)(.*)", + r"(.* )(-?\d*(\.\d+)? F) \((-?\d*(\.\d+)? C)\)(.*)", line ) if dual_t: @@ -150,7 +150,7 @@ def filter_units(line, units="imperial"): # "Y kilometer(s)" if units == "metric": imperial_d = re.match( - "(.* )(\d+)( mile\(s\))(.*)", + r"(.* )(\d+)( mile\(s\))(.*)", line ) if imperial_d: @@ -160,7 +160,7 @@ def filter_units(line, units="imperial"): # filter speeds in the form of "X MPH (Y KT)" to just "X MPH"; if metric is # desired, convert to "Z KPH" imperial_s = re.match( - "(.* )(\d+)( MPH)( \(\d+ KT\))(.*)", + r"(.* )(\d+)( MPH)( \(\d+ KT\))(.*)", line ) if imperial_s: @@ -170,7 +170,7 @@ def filter_units(line, units="imperial"): line = preamble + str(int(round(int(mph)*1.609344))) + " KPH" + \ trailer imperial_s = re.match( - "(.* )(\d+)( MPH)( \(\d+ KT\))(.*)", + r"(.* )(\d+)( MPH)( \(\d+ KT\))(.*)", line ) if imperial_s: @@ -182,7 +182,7 @@ def filter_units(line, units="imperial"): # if imperial is desired, qualify given forcast temperatures like "X F"; if # metric is desired, convert to "Y C" imperial_t = re.match( - "(.* )(High |high |Low |low )(\d+)(\.|,)(.*)", + r"(.* )(High |high |Low |low )(\d+)(\.|,)(.*)", line ) if imperial_t: @@ -747,7 +747,7 @@ def guess( if pyversion("3"): stations.read_string( gzip.open(datafile).read().decode("utf-8") ) - else: stations.readfp( gzip.open(datafile) ) + else: stations.read_file( gzip.open(datafile) ) else: if pyversion("3"): stations.read(datafile, encoding="utf-8") @@ -768,7 +768,7 @@ def guess( import gzip if pyversion("3"): zones.read_string( gzip.open(datafile).read().decode("utf-8") ) - else: zones.readfp( gzip.open(datafile) ) + else: zones.read_file( gzip.open(datafile) ) else: if pyversion("3"): zones.read(datafile, encoding="utf-8") @@ -798,7 +798,7 @@ def guess( if pyversion("3"): airports.read_string( gzip.open(datafile).read().decode("utf-8") ) - else: airports.readfp( gzip.open(datafile) ) + else: airports.read_file( gzip.open(datafile) ) else: if pyversion("3"): airports.read(datafile, encoding="utf-8") @@ -890,7 +890,7 @@ def guess( if pyversion("3"): zctas.read_string( gzip.open(datafile).read().decode("utf-8") ) - else: zctas.readfp( gzip.open(datafile) ) + else: zctas.read_file( gzip.open(datafile) ) else: if pyversion("3"): zctas.read(datafile, encoding="utf-8") @@ -951,7 +951,7 @@ def guess( if pyversion("3"): places.read_string( gzip.open(datafile).read().decode("utf-8") ) - else: places.readfp( gzip.open(datafile) ) + else: places.read_file( gzip.open(datafile) ) else: if pyversion("3"): places.read(datafile, encoding="utf-8") @@ -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 \ @@ -1605,7 +1605,7 @@ def correlate(): removed = 0 changed = 0 overrides = configparser.ConfigParser() - overrides.readfp( codecs.open(overrides_fn, "r", "utf8") ) + overrides.read_file( codecs.open(overrides_fn, "r", "utf8") ) overrideslog = [] for section in overrides.sections(): addopt = 0