Skip to content
Snippets Groups Projects
Commit 5a510bd0 authored by Jan Prachař's avatar Jan Prachař
Browse files

remove UnknownColumnError

parent a294a0c4
No related branches found
No related tags found
No related merge requests found
This commit is part of merge request !39. Comments created here will be created in the context of that merge request.
...@@ -95,13 +95,6 @@ class MissingHeaderError(RuntimeError): ...@@ -95,13 +95,6 @@ class MissingHeaderError(RuntimeError):
pass 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]): def write(file: IO, fmt: FileFormat, row_class: Type[Row], rows: Sequence[Row]):
writer = csv.writer(file, dialect=fmt.get_dialect()) writer = csv.writer(file, dialect=fmt.get_dialect())
......
...@@ -7,7 +7,7 @@ from sqlalchemy.orm import joinedload, Query ...@@ -7,7 +7,7 @@ from sqlalchemy.orm import joinedload, Query
from typing import List, Optional, Any, Dict, Type, Union from typing import List, Optional, Any, Dict, Type, Union
import mo.csv import mo.csv
from mo.csv import FileFormat, MissingHeaderError, UnknownColumnError from mo.csv import FileFormat, MissingHeaderError
import mo.db as db import mo.db as db
import mo.rights import mo.rights
import mo.users import mo.users
...@@ -388,8 +388,6 @@ class Import: ...@@ -388,8 +388,6 @@ class Import:
self.warnings += warnings self.warnings += warnings
except MissingHeaderError: except MissingHeaderError:
return self.error('Souboru chybí první řádek s názvy sloupců') return self.error('Souboru chybí první řádek s názvy sloupců')
except UnknownColumnError as e:
return self.error(e.message)
except UnicodeDecodeError: except UnicodeDecodeError:
return self.error(f'Soubor není v kódování {self.fmt.get_charset()}') return self.error(f'Soubor není v kódování {self.fmt.get_charset()}')
except Exception as e: except Exception as e:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment