diff options
Diffstat (limited to 'quality_control/parsing.py')
-rw-r--r-- | quality_control/parsing.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/quality_control/parsing.py b/quality_control/parsing.py index 28a311e..5fc5f62 100644 --- a/quality_control/parsing.py +++ b/quality_control/parsing.py @@ -2,10 +2,10 @@ import collections from enum import Enum from functools import partial -from zipfile import ZipFile, is_zipfile from typing import Tuple, Union, Iterable, Generator, Callable, Optional import quality_control.average as avg +from quality_control.file_utils import open_file import quality_control.standard_error as se from quality_control.errors import ( InvalidValue, DuplicateHeading, InconsistentColumns) @@ -92,14 +92,7 @@ def collect_errors( return errors + tuple(error for error in errs if error is not None) return errors + (errs,) - def __open_file__(filepath): - if not is_zipfile(filepath): - return open(filepath, encoding="utf-8") - - with ZipFile(filepath, "r") as zfile: - return zfile.open(zfile.infolist()[0], "r") - - with __open_file__(filepath) as input_file: + with open_file(filepath) as input_file: for line_number, line in enumerate(input_file, start=1): if user_aborted(): break |