From 3d48c8cd60ecd19aeea71f884f037c8cb0e9b38d Mon Sep 17 00:00:00 2001 From: JackDandy Date: Sat, 4 Jul 2020 13:30:28 +0100 Subject: [PATCH] Change fix some regexes. --- lib/apprise/plugins/NotifyGrowl/gntp/core.py | 8 ++++---- lib/apprise/plugins/NotifyNotifico.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/apprise/plugins/NotifyGrowl/gntp/core.py b/lib/apprise/plugins/NotifyGrowl/gntp/core.py index 698b291..41ebddc 100644 --- a/lib/apprise/plugins/NotifyGrowl/gntp/core.py +++ b/lib/apprise/plugins/NotifyGrowl/gntp/core.py @@ -17,20 +17,20 @@ __all__ = [ 'parse_gntp', ] -#GNTP/ [:][ :.] +# GNTP/ [:][ :.] GNTP_INFO_LINE = re.compile( - 'GNTP/(?P\d+\.\d+) (?PREGISTER|NOTIFY|SUBSCRIBE|\-OK|\-ERROR)' + + r'GNTP/(?P\d+\.\d+) (?PREGISTER|NOTIFY|SUBSCRIBE|\-OK|\-ERROR)' + ' (?P[A-Z0-9]+(:(?P[A-F0-9]+))?) ?' + '((?P[A-Z0-9]+):(?P[A-F0-9]+).(?P[A-F0-9]+))?\r\n', re.IGNORECASE ) GNTP_INFO_LINE_SHORT = re.compile( - 'GNTP/(?P\d+\.\d+) (?PREGISTER|NOTIFY|SUBSCRIBE|\-OK|\-ERROR)', + r'GNTP/(?P\d+\.\d+) (?PREGISTER|NOTIFY|SUBSCRIBE|\-OK|\-ERROR)', re.IGNORECASE ) -GNTP_HEADER = re.compile('([\w-]+):(.+)') +GNTP_HEADER = re.compile(r'([\w-]+):(.+)') GNTP_EOL = shim.b('\r\n') GNTP_SEP = shim.b(': ') diff --git a/lib/apprise/plugins/NotifyNotifico.py b/lib/apprise/plugins/NotifyNotifico.py index c76180f..d0678e8 100644 --- a/lib/apprise/plugins/NotifyNotifico.py +++ b/lib/apprise/plugins/NotifyNotifico.py @@ -249,7 +249,7 @@ class NotifyNotifico(NotifyBase): # Colors were specified, make sure we capture and correctly # allow them to exist inline in the message # \g<1> is less ambigious than \1 - body = re.sub(r'\\x03(\d{0,2})', '\x03\g<1>', body) + body = re.sub(r'\\x03(\d{0,2})', r'\x03\g<1>', body) else: # no colors specified, make sure we strip out any colors found