X-Git-Url: https://yuggoth.org/gitweb?a=blobdiff_plain;f=weather.py;h=cc632e1cc4413522792066ad85e142f475800d67;hb=757b9658f985fb0ad05613bee174c3570cdcf9bd;hp=82960e8de332a4cb131f025072940f7cc4ca72fa;hpb=0ec4a4d5d57910c4d7249dd6a50ba19b6f5edc7e;p=weather.git diff --git a/weather.py b/weather.py index 82960e8..cc632e1 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-2023 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: