From 2735b6247b4dda3b0edc46b076b5c0934c9c7cfb Mon Sep 17 00:00:00 2001
From: Matthew Honnibal <honnibal+gh@gmail.com>
Date: Wed, 21 Sep 2016 14:52:05 +0200
Subject: [PATCH] Fix orths_and_spaces in Doc.__init__

---
 spacy/tokens/doc.pyx | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/spacy/tokens/doc.pyx b/spacy/tokens/doc.pyx
index e432c83be..661a14153 100644
--- a/spacy/tokens/doc.pyx
+++ b/spacy/tokens/doc.pyx
@@ -83,6 +83,23 @@ cdef class Doc:
         self._py_tokens = []
         self._vector = None
         self.noun_chunks_iterator = CHUNKERS.get(self.vocab.lang)
+        cdef unicode orth
+        cdef bint has_space
+        if orths_and_spaces is not None:
+            for orth_space in orths_and_spaces:
+                if isinstance(orth_space, unicode):
+                    orth = orth_space
+                    has_space = True
+                elif isinstance(orth_space, bytes):
+                    raise ValueError(
+                        "orths_and_spaces expects either List(unicode) or "
+                        "List((unicode, bool)). Got bytes instance: %s" % (str(orth_space)))
+                else:
+                    orth, has_space = orth_space
+                # Note that we pass self.mem here --- we have ownership, if LexemeC
+                # must be created.
+                self.push_back(
+                    <const LexemeC*>self.vocab.get(self.mem, orth), has_space)
 
     def __getitem__(self, object i):
         """Get a Token or a Span from the Doc.