Merge pull request facebookresearch#104 from dfenglei/master

continue to fix for membership in the set
hanst · Mar 28, 2018 · 36a6e3f · 36a6e3f
2 parents 8a3da1f + a9f3385
commit 36a6e3f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/drqa/tokenizers/spacy_tokenizer.py b/drqa/tokenizers/spacy_tokenizer.py
@@ -25,19 +25,19 @@ def __init__(self, **kwargs):
         model = kwargs.get('model', 'en')
         self.annotators = copy.deepcopy(kwargs.get('annotators', set()))
         nlp_kwargs = {'parser': False}
-        if not {'lemma', 'pos', 'ner'} in self.annotators:
+        if not any([p in self.annotators for p in ['lemma', 'pos', 'ner']]):
             nlp_kwargs['tagger'] = False
-        if not {'ner'} in self.annotators:
+        if 'ner' not in self.annotators:
             nlp_kwargs['entity'] = False
         self.nlp = spacy.load(model, **nlp_kwargs)
 
     def tokenize(self, text):
         # We don't treat new lines as tokens.
         clean_text = text.replace('\n', ' ')
         tokens = self.nlp.tokenizer(clean_text)
-        if {'lemma', 'pos', 'ner'} in self.annotators:
+        if any([p in self.annotators for p in ['lemma', 'pos', 'ner']]):
             self.nlp.tagger(tokens)
-        if {'ner'} in self.annotators:
+        if 'ner' in self.annotators:
             self.nlp.entity(tokens)
 
         data = []