From 372e57ed2ed7edd5ea93fa277097d3ab87eb9f90 Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Fri, 29 Sep 2023 18:37:12 +0200
Subject: [PATCH] =?UTF-8?q?Import:=20Funkce=20na=20v=C3=BDpis=20varov?=
=?UTF-8?q?=C3=A1n=C3=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
mo/imports.py | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/mo/imports.py b/mo/imports.py
index f326b767..6bccc47d 100644
--- a/mo/imports.py
+++ b/mo/imports.py
@@ -76,16 +76,25 @@ class Import:
self.to_log = []
self.user = user
- def error(self, msg: str) -> Any:
+ def _format_message(self, msg: str) -> str:
if self.line_number > 0:
if self.row_name:
- msg = f"Řádek {self.line_number} ({self.row_name}): {msg}"
+ return f"Řádek {self.line_number} ({self.row_name}): {msg}"
else:
- msg = f"Řádek {self.line_number}: {msg}"
+ return f"Řádek {self.line_number}: {msg}"
+ return msg
+
+ def error(self, msg: str) -> Any:
+ msg = self._format_message(msg)
self.errors.append(msg)
- logger.info('Import: >> %s', msg)
+ logger.info('Import: E> %s', msg)
return None # Kdyby bylo otypováno správně jako -> None, při volání by si mypy stěžoval
+ def warning(self, msg: str) -> None:
+ msg = self._format_message(msg)
+ self.warnings.append(msg)
+ logger.info('Import: W> %s', msg)
+
def parse_user_id(self, user_id_str: str) -> Optional[int]:
if user_id_str == "":
return self.error('Chybí ID uživatele')
--
GitLab