diff --git a/spacy/deprecated.py b/spacy/deprecated.py index b806acad3..a0cbb12a1 100644 --- a/spacy/deprecated.py +++ b/spacy/deprecated.py @@ -1,9 +1,9 @@ # coding: utf8 from __future__ import unicode_literals -from . import about from .util import prints from .cli import download +from . import about PRON_LEMMA = "-PRON-" diff --git a/spacy/tokens/doc.pyx b/spacy/tokens/doc.pyx index 52205018d..8d8ddc9db 100644 --- a/spacy/tokens/doc.pyx +++ b/spacy/tokens/doc.pyx @@ -16,20 +16,17 @@ from libc.math cimport sqrt from .span cimport Span from .token cimport Token -from ..lexeme cimport Lexeme -from ..lexeme cimport EMPTY_LEXEME +from .span cimport Span +from .token cimport Token +from .printers import parse_tree +from ..lexeme cimport Lexeme, EMPTY_LEXEME from ..typedefs cimport attr_t, flags_t from ..attrs cimport attr_id_t from ..attrs cimport ID, ORTH, NORM, LOWER, SHAPE, PREFIX, SUFFIX, LENGTH, CLUSTER from ..attrs cimport LENGTH, POS, LEMMA, TAG, DEP, HEAD, SPACY, ENT_IOB, ENT_TYPE -from ..parts_of_speech cimport CCONJ, PUNCT, NOUN -from ..parts_of_speech cimport univ_pos_t -from ..lexeme cimport Lexeme -from .span cimport Span -from .token cimport Token -from .printers import parse_tree -from ..util import normalize_slice +from ..parts_of_speech cimport CCONJ, PUNCT, NOUN, univ_pos_t from ..syntax.iterators import CHUNKERS +from ..util import normalize_slice from ..compat import is_config diff --git a/spacy/tokens/token.pyx b/spacy/tokens/token.pyx index f146f5cd6..d9dc123e7 100644 --- a/spacy/tokens/token.pyx +++ b/spacy/tokens/token.pyx @@ -13,18 +13,11 @@ import numpy from ..typedefs cimport hash_t from ..lexeme cimport Lexeme from .. import parts_of_speech -from ..attrs cimport LEMMA -from ..attrs cimport ID, ORTH, NORM, LOWER, SHAPE, PREFIX, SUFFIX, LENGTH, CLUSTER -from ..attrs cimport POS, LEMMA, TAG, DEP -from ..parts_of_speech cimport CCONJ, PUNCT from ..attrs cimport IS_ALPHA, IS_ASCII, IS_DIGIT, IS_LOWER, IS_PUNCT, IS_SPACE -from ..attrs cimport IS_BRACKET -from ..attrs cimport IS_QUOTE -from ..attrs cimport IS_LEFT_PUNCT -from ..attrs cimport IS_RIGHT_PUNCT +from ..attrs cimport IS_BRACKET, IS_QUOTE, IS_LEFT_PUNCT, IS_RIGHT_PUNCT, IS_OOV from ..attrs cimport IS_TITLE, IS_UPPER, LIKE_URL, LIKE_NUM, LIKE_EMAIL, IS_STOP -from ..attrs cimport IS_OOV -from ..lexeme cimport Lexeme +from ..attrs cimport ID, ORTH, NORM, LOWER, SHAPE, PREFIX, SUFFIX, LENGTH, CLUSTER +from ..attrs cimport LEMMA, POS, TAG, DEP from ..compat import is_config