diff options
| author | mathieui <mathieui@mathieui.net> | 2017-09-28 00:59:45 +0200 |
|---|---|---|
| committer | mathieui <mathieui@mathieui.net> | 2017-09-28 00:59:45 +0200 |
| commit | 9f1c0c3d541eb67101b1cca33543d71940a4168f (patch) | |
| tree | 5141b9115f78c9e24227f02979e6b647bf21a72e | |
| parent | 377b58f1e8e98afa5beb8f560609ca55cba418ce (diff) | |
| download | poezio-9f1c0c3d541eb67101b1cca33543d71940a4168f.tar.gz poezio-9f1c0c3d541eb67101b1cca33543d71940a4168f.tar.bz2 poezio-9f1c0c3d541eb67101b1cca33543d71940a4168f.tar.xz poezio-9f1c0c3d541eb67101b1cca33543d71940a4168f.zip | |
Rename parse_message_line to parse_log_line
| -rw-r--r-- | poezio/logger.py | 4 | ||||
| -rwxr-xr-x | scripts/poezio_logs | 4 | ||||
| -rw-r--r-- | test/test_logger.py | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/poezio/logger.py b/poezio/logger.py index 002953f3..9a3c8a4e 100644 --- a/poezio/logger.py +++ b/poezio/logger.py @@ -51,7 +51,7 @@ class LogMessage(LogItem): nb_lines, message) self.nick = nick -def parse_message_line(msg): +def parse_log_line(msg): match = re.match(MESSAGE_LOG_RE, msg) if match: return LogMessage(*match.groups()) @@ -188,7 +188,7 @@ class Logger(object): idx += 1 log.debug('fail?') continue - log_item = parse_message_line(lines[idx]) + log_item = parse_log_line(lines[idx]) idx += 1 if not isinstance(log_item, LogItem): log.debug('wrong log format? %s', log_item) diff --git a/scripts/poezio_logs b/scripts/poezio_logs index 0ad89e4b..c97b304f 100755 --- a/scripts/poezio_logs +++ b/scripts/poezio_logs @@ -3,7 +3,7 @@ A simple script to parse and output logs from a poezio logfile """ -from poezio.logger import LogInfo, LogMessage, parse_message_line +from poezio.logger import LogInfo, LogMessage, parse_log_line from functools import singledispatch from poezio import poopt import argparse @@ -71,7 +71,7 @@ def parse_messages(fd): elif in_text: more_lines.append(line[1:]) continue - current_log = parse_message_line(line) + current_log = parse_log_line(line) in_text = True print_log(current_log, more_lines) diff --git a/test/test_logger.py b/test/test_logger.py index 40257536..d0e2a89b 100644 --- a/test/test_logger.py +++ b/test/test_logger.py @@ -3,14 +3,14 @@ Test the functions in the `logger` module """ import pytest -from poezio.logger import LogInfo, LogMessage, parse_message_line +from poezio.logger import LogInfo, LogMessage, parse_log_line def test_parse_message(): line = 'MR 20170909T09:09:09Z 000 <nick> body' - assert vars(parse_message_line(line)) == vars(LogMessage('2017', '09', '09', '09', '09', '09', '0', 'nick', 'body')) + assert vars(parse_log_line(line)) == vars(LogMessage('2017', '09', '09', '09', '09', '09', '0', 'nick', 'body')) line = '<>' - assert parse_message_line(line) == None + assert parse_log_line(line) == None line = 'MR 20170908T07:05:04Z 003 <nick> ' - assert vars(parse_message_line(line)) == vars(LogMessage('2017', '09', '08', '07', '05', '04', '003', 'nick', '')) + assert vars(parse_log_line(line)) == vars(LogMessage('2017', '09', '08', '07', '05', '04', '003', 'nick', '')) |