Merge branch 'master' of https://github.com/explosion/spaCy

spacy/compat.py

@@ -23,6 +23,8 @@
 is_linux = sys.platform.startswith('linux')
 is_osx = sys.platform == 'darwin'
 
+fix_text = ftfy.fix_text
+
 
 if is_python2:
     bytes_ = str
@@ -39,9 +41,6 @@
     json_dumps = lambda data: ujson.dumps(data, indent=2)
 
 
-fix_text = lambda text: ftfy.fix_text(text)
-
-
 def symlink_to(orig, dest):
     if is_python2 and is_windows:
         import subprocess

spacy/tests/test_download.py → spacy/tests/test_cli.py

@@ -2,24 +2,25 @@
 from __future__ import unicode_literals
 
 from ..cli.download import download, get_compatibility, get_version, check_error_depr
+
 import pytest
 
 
 @pytest.mark.parametrize('model', ['en_core_web_md'])
-def test_download_get_matching_version_succeeds(model):
+def test_cli_download_get_matching_version_succeeds(model):
     comp = { model: ['1.7.0', '0.100.0'] }
     assert get_version(model, comp)
 
 
 @pytest.mark.parametrize('model', ['en_core_web_md'])
-def test_download_get_matching_version_fails(model):
+def test_cli_download_get_matching_version_fails(model):
     diff_model = 'test_' + model
     comp = { diff_model: ['1.7.0', '0.100.0'] }
     with pytest.raises(SystemExit):
         assert get_version(model, comp)
 
 
 @pytest.mark.parametrize('model', [False, None, '', 'all'])
-def test_download_no_model_depr_error(model):
+def test_cli_download_no_model_depr_error(model):
     with pytest.raises(SystemExit):
         check_error_depr(model)

spacy/tests/test_misc.py

@@ -0,0 +1,13 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
+from ..util import ensure_path
+
+from pathlib import Path
+import pytest
+
+
+@pytest.mark.parametrize('text', ['hello/world', 'hello world'])
+def test_util_ensure_path_succeeds(text):
+    path = ensure_path(text)
+    assert isinstance(path, Path)