Rooba
/
spaCy
mirror of https://github.com/explosion/spaCy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Fix merge problem in test_parse_navigate

This commit is contained in:
Matthew Honnibal 2015-10-10 15:04:01 +11:00
parent c12d36d5f4
commit 1521cf25c9
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/parser/test_parse_navigate.py
View File

@ -7,11 +7,7 @@ import pytest
@pytest.fixture
def sun_text():
<<<<<<< HEAD:tests/parser/test_parse_navigate.py
with codecs.open(path.join(path.dirname(__file__), '..', 'sun.txt'), 'r', 'utf8') as file_:
=======
with io.open(path.join(path.dirname(__file__), 'sun.txt'), 'r', encoding='utf8') as file_:
>>>>>>> 8caedba42a5255b9996533a732e17eee3f20a2dd:tests/test_parse_navigate.py
text = file_.read()
return text