From 9d956b07e9ca9cad80ccd851328c1a58b026f221 Mon Sep 17 00:00:00 2001
From: Matthew Honnibal <honnibal@gmail.com>
Date: Thu, 16 Jul 2015 01:15:34 +0200
Subject: [PATCH] * Fix import of attrs in doc.pyx, and update the
 get_token_attr function.

---
 spacy/tokens/doc.pyx | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/spacy/tokens/doc.pyx b/spacy/tokens/doc.pyx
index 737fe3b8c..0dc8e88e9 100644
--- a/spacy/tokens/doc.pyx
+++ b/spacy/tokens/doc.pyx
@@ -6,10 +6,9 @@ import numpy
 from ..lexeme cimport EMPTY_LEXEME
 from ..serialize import BitArray
 from ..strings cimport slice_unicode
-from ..typedefs cimport attr_id_t, attr_t, flags_t
-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 attr_id_t, attr_t, flags_t
+from ..attrs cimport ID, ORTH, NORM, LOWER, SHAPE, PREFIX, SUFFIX, LENGTH, CLUSTER
+from ..attrs cimport POS, LEMMA, TAG, DEP, HEAD, SPACY, ENT_IOB, ENT_TYPE
 from ..parts_of_speech import UNIV_POS_NAMES
 from ..parts_of_speech cimport CONJ, PUNCT
 from ..lexeme cimport check_flag
@@ -37,6 +36,14 @@ cdef attr_t get_token_attr(const TokenC* token, attr_id_t feat_name) nogil:
         return token.tag
     elif feat_name == DEP:
         return token.dep
+    elif feat_name == HEAD:
+        return token.head
+    elif feat_name == SPACY:
+        return token.spacy
+    elif feat_name == ENT_IOB:
+        return token.ent_iob
+    elif feat_name == ENT_TYPE:
+        return token.ent_type
     else:
         return get_lex_attr(token.lex, feat_name)