diff --git a/core/utils.py b/core/utils.py index deca124..84a8191 100644 --- a/core/utils.py +++ b/core/utils.py @@ -40,7 +40,7 @@ TROG = { } } -# This is module-level executable. This is a Bad Thing. +# This is module-level executable. This is a Bad Thing. Especially when it touches the file system. try: logging.basicConfig(level=logging.DEBUG, filename=settings.LOGFILE, diff --git a/parsers/logbooks.py b/parsers/logbooks.py index 7a334d6..b6a326c 100644 --- a/parsers/logbooks.py +++ b/parsers/logbooks.py @@ -281,7 +281,7 @@ def Parseloghtml01(year, expedition, txt): logbook_entry_count += 1 try: tripentry = year + "." + str(logbook_entry_count) - s = re.match("(?s)\s*(?:
)?(.*?)?p>(.*)$(?i)", trippara) + s = re.match(r"(?s)\s*(?:
)?(.*?)?p>(.*)$(?i)", trippara) if not s: message = " ! - Skipping logentry on failure to parse header: " + tripentry + trippara[:300] + "..." DataIssue.objects.create(parser='logbooks', message=message) @@ -351,7 +351,7 @@ def Parseloghtml03(year, expedition, txt): for trippara in tripparas: logbook_entry_count += 1 - s = re.match("(?s)\s*
(.*?)
(.*)$", trippara) + s = re.match(r"(?s)\s*(.*?)
(.*)$", trippara) #assert s, trippara if not ( s ) : message = " ! - Skipping logentry on failure to parse Parseloghtml03: {} {} {}...".format(tripentry,s,trippara[:300])