restore existing ion/ioff behavior + add test

ianhi · ianhi · commit 0d93f1b44993 · 2020-08-05T17:22:31.000-04:00
diff --git a/doc/api/next_api_changes/behavior/17371-IHI.rst b/doc/api/next_api_changes/behavior/17371-IHI.rst
@@ -2,6 +2,6 @@ ioff and ion can be used as context managers
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 ``plt.ion()`` and ``plt.ioff()`` may now be used as context managers to create
-a context with interactive mode off, or on respectively. The old behavior of
+a context with interactive mode on, or off respectively. The old behavior of
 calling these functions was maintained. To use the new functionality
 call as ``with plt.ioff():``
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -364,36 +364,35 @@ def isinteractive():
     return matplotlib.is_interactive()
 
 
-class _ioff():
-    def __call__(self):
+class _ioff:
+    def __init__(self):
+        self.wasinteractive = isinteractive()
         matplotlib.interactive(False)
         uninstall_repl_displayhook()
 
     def __enter__(self):
-        self.wasinteractive = isinteractive()
-        self.__call__()
+        pass
 
     def __exit__(self, exc_type, exc_value, traceback):
         if self.wasinteractive:
             matplotlib.interactive(True)
             install_repl_displayhook()
-        del self.wasinteractive
 
 
-class _ion():
-    def __call__(self):
+class _ion:
+    def __init__(self):
+        self.wasinteractive = isinteractive()
         matplotlib.interactive(True)
         install_repl_displayhook()
 
     def __enter__(self):
-        self.wasinteractive = isinteractive()
-        self.__call__()
+        pass
 
     def __exit__(self, exc_type, exc_value, traceback):
         if not self.wasinteractive:
             matplotlib.interactive(False)
             uninstall_repl_displayhook()
-        del self.wasinteractive
+        self._used
 
 
 def ioff():
diff --git a/lib/matplotlib/tests/test_pyplot.py b/lib/matplotlib/tests/test_pyplot.py
@@ -83,25 +83,29 @@ def test_nrows_error():
         plt.subplot(ncols=1)
 
 
-def test_ioff_context():
-    mpl.interactive(True)
+def test_ioff():
+    plt.ion()
+    assert mpl.is_interactive()
     with plt.ioff():
         assert not mpl.is_interactive()
     assert mpl.is_interactive()
 
-    mpl.interactive(False)
+    plt.ioff()
+    assert not mpl.is_interactive()
     with plt.ioff():
         assert not mpl.is_interactive()
     assert not mpl.is_interactive()
 
 
-def test_ion_context():
-    mpl.interactive(False)
+def test_ion():
+    plt.ioff()
+    assert not mpl.is_interactive()
     with plt.ion():
         assert mpl.is_interactive()
     assert not mpl.is_interactive()
 
-    mpl.interactive(True)
+    plt.ion()
+    assert mpl.is_interactive()
     with plt.ion():
         assert mpl.is_interactive()
     assert mpl.is_interactive()
