From 6859f6adac6fec1f35f6adcac13eba94b162f287 Mon Sep 17 00:00:00 2001
From: Matthew Honnibal <honnibal@gmail.com>
Date: Wed, 8 Jul 2015 19:34:55 +0200
Subject: [PATCH] * Restore merge_mwe in English class

---
 spacy/en/__init__.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/spacy/en/__init__.py b/spacy/en/__init__.py
index 1b9887902..4dc4c6ac3 100644
--- a/spacy/en/__init__.py
+++ b/spacy/en/__init__.py
@@ -36,6 +36,7 @@ def get_lex_props(string):
     }
 
 if_model_present = -1
+LOCAL_DATA_DIR = path.join(path.dirname(__file__), 'data')
 
 
 class English(object):
@@ -64,7 +65,7 @@ class English(object):
     EntityTransitionSystem = BiluoPushDown
 
     def __init__(self,
-      data_dir=path.join(path.dirname(__file__), 'data'),
+      data_dir=LOCAL_DATA_DIR
       Tokenizer=Tokenizer.from_dir,
       Tagger=EnPosTagger,
       Parser=ParserFactory(ParserTransitionSystem),
@@ -106,7 +107,7 @@ class English(object):
             ('NNP', 'DATE', regexes.DAYS_RE),
             ('CD', 'MONEY', regexes.MONEY_RE)])
 
-    def __call__(self, text, tag=True, parse=True, entity=True):
+    def __call__(self, text, tag=True, parse=True, entity=True, merge_mwes=False):
         """Apply the pipeline to some text.  The text can span multiple sentences,
         and can contain arbtrary whitespace.  Alignment into the original string
         is preserved.
@@ -130,6 +131,8 @@ class English(object):
             self.parser(tokens)
         if self.entity and entity:
             self.entity(tokens)
+        if merge_mwes and self.mwe_merger is not None:
+            self.mwe_merger(tokens)
         return tokens
 
     @property