Let Click handle nonexistent files (issue #318)

Author: juhoinkinen

annif/corpus/document.py

@@ -64,12 +64,9 @@ def opener(path):
                 return gzip.open(path, mode='rt')
         else:
             opener = open
-        try:
-            with opener(self.path) as tsvfile:
-                for line in tsvfile:
-                    yield from self._parse_tsv_line(line)
-        except FileNotFoundError as err:
-            raise AnnifException(str(err))
+        with opener(self.path) as tsvfile:
+            for line in tsvfile:
+                yield from self._parse_tsv_line(line)
 
     def _parse_tsv_line(self, line):
         if '\t' in line:

tests/test_corpus.py

@@ -220,14 +220,6 @@ def test_docfile_plain(tmpdir):
     assert len(list(docs.documents)) == 3
 
 
-def test_docfile_nonexistent(tmpdir):
-    docfile = tmpdir.join('documents_nonexistent.tsv')
-    with pytest.raises(AnnifException) as err:
-        docs = annif.corpus.DocumentFile(str(docfile))
-        list(docs.documents)
-    assert "No such file or directory: '{}'".format(docfile) in str(err.value)
-
-
 def test_docfile_plain_invalid_lines(tmpdir, caplog):
     logger = annif.logger
     logger.propagate = True