From 30be4f15da200c4973d8a1655ab19db88d14b9a0 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Thu, 16 Jul 2015 11:23:25 +0200 Subject: [PATCH] * Import attrs from spacy.attrs, not spacy.typedefs --- spacy/tokens/token.pxd | 2 +- spacy/tokens/token.pyx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spacy/tokens/token.pxd b/spacy/tokens/token.pxd index 83664d02e..8ff0e9587 100644 --- a/spacy/tokens/token.pxd +++ b/spacy/tokens/token.pxd @@ -1,6 +1,6 @@ from ..vocab cimport Vocab from ..structs cimport TokenC -from ..typedefs cimport attr_id_t +from ..attrs cimport attr_id_t from .doc cimport Doc diff --git a/spacy/tokens/token.pyx b/spacy/tokens/token.pyx index 17350501c..194205cc1 100644 --- a/spacy/tokens/token.pyx +++ b/spacy/tokens/token.pyx @@ -11,9 +11,9 @@ import numpy from ..parts_of_speech import UNIV_POS_NAMES -from ..typedefs cimport LEMMA -from ..typedefs cimport ID, ORTH, NORM, LOWER, SHAPE, PREFIX, SUFFIX, LENGTH, CLUSTER -from ..typedefs cimport POS, LEMMA, TAG, DEP +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 CONJ, PUNCT