From 5a510bd0ad84925ce8e8544b48d2313f3878450b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Pracha=C5=99?= <jan.prachar@gmail.com>
Date: Thu, 4 Mar 2021 22:39:46 +0100
Subject: [PATCH] remove UnknownColumnError
---
mo/csv.py | 7 -------
mo/imports.py | 4 +---
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/mo/csv.py b/mo/csv.py
index 1a5d5165..39051bcd 100644
--- a/mo/csv.py
+++ b/mo/csv.py
@@ -95,13 +95,6 @@ class MissingHeaderError(RuntimeError):
pass
-class UnknownColumnError(RuntimeError):
- def __init__(self, unknown_name: str, expected_name: str):
- self.message = (
- "Neznámý sloupec '{}', měli jste na mysli '{}'?".format(
- unknown_name, expected_name))
-
-
def write(file: IO, fmt: FileFormat, row_class: Type[Row], rows: Sequence[Row]):
writer = csv.writer(file, dialect=fmt.get_dialect())
diff --git a/mo/imports.py b/mo/imports.py
index 8993a7f8..b89ae901 100644
--- a/mo/imports.py
+++ b/mo/imports.py
@@ -7,7 +7,7 @@ from sqlalchemy.orm import joinedload, Query
from typing import List, Optional, Any, Dict, Type, Union
import mo.csv
-from mo.csv import FileFormat, MissingHeaderError, UnknownColumnError
+from mo.csv import FileFormat, MissingHeaderError
import mo.db as db
import mo.rights
import mo.users
@@ -388,8 +388,6 @@ class Import:
self.warnings += warnings
except MissingHeaderError:
return self.error('Souboru chybí první řádek s názvy sloupců')
- except UnknownColumnError as e:
- return self.error(e.message)
except UnicodeDecodeError:
return self.error(f'Soubor není v kódování {self.fmt.get_charset()}')
except Exception as e:
--
GitLab