bugfix DisabledPipes

svlandeg · svlandeg · commit 8316bc7d4a6d · 2020-10-09T12:06:20.000+02:00
diff --git a/spacy/language.py b/spacy/language.py
@@ -1034,6 +1034,9 @@ def select_pipes(
                     )
                 )
             disable = to_disable
+        # DisabledPipes will restore the pipes in 'disable' when it's done, so we need to exclude
+        # those pipes that were already disabled.
+        disable = [d for d in disable if d not in self._disabled]
         return DisabledPipes(self, disable)
 
     def make_doc(self, text: str) -> Doc:
diff --git a/spacy/tests/pipeline/test_pipe_methods.py b/spacy/tests/pipeline/test_pipe_methods.py
@@ -129,13 +129,27 @@ def test_enable_pipes_method(nlp, name):
 
 @pytest.mark.parametrize("name", ["my_component"])
 def test_disable_pipes_context(nlp, name):
+    """Test that an enabled component stays enabled after running the context manager."""
     nlp.add_pipe("new_pipe", name=name)
     assert nlp.has_pipe(name)
     with nlp.select_pipes(disable=name):
         assert not nlp.has_pipe(name)
     assert nlp.has_pipe(name)
 
 
+@pytest.mark.parametrize("name", ["my_component"])
+def test_disable_pipes_context_restore(nlp, name):
+    """Test that a disabled component stays disabled after running the context manager."""
+    nlp.add_pipe("new_pipe", name=name)
+    assert nlp.has_pipe(name)
+    nlp.disable_pipes(name)
+    assert not nlp.has_pipe(name)
+    with nlp.select_pipes(disable=name):
+        assert not nlp.has_pipe(name)
+    assert not nlp.has_pipe(name)
+
+
+
 def test_select_pipes_list_arg(nlp):
     for name in ["c1", "c2", "c3"]:
         nlp.add_pipe("new_pipe", name=name)

Original file line number	Diff line number	Diff line change
`@@ -1034,6 +1034,9 @@ def select_pipes(`
`1034`	`1034`	`)`
`1035`	`1035`	`)`
`1036`	`1036`	`disable = to_disable`
	`1037`	`+ # DisabledPipes will restore the pipes in 'disable' when it's done, so we need to exclude`
	`1038`	`+ # those pipes that were already disabled.`
	`1039`	`+ disable = [d for d in disable if d not in self._disabled]`
`1037`	`1040`	`return DisabledPipes(self, disable)`
`1038`	`1041`
`1039`	`1042`	`def make_doc(self, text: str) -> Doc:`