Merge pull request #13754 from meeseeksmachine/auto-backport-of-pr-13712-on-v3.1.x

jklymak · web-flow · commit 382a5b9341ad · 2019-03-25T06:12:51.000-07:00
Backport PR #13712 on branch v3.1.x (Deprecate NavigationToolbar2QT.adj_window (unused and always None).)
diff --git a/doc/api/next_api_changes/2019-03-20-AL.rst b/doc/api/next_api_changes/2019-03-20-AL.rst
@@ -0,0 +1,5 @@
+Deprecations
+````````````
+
+The (unused and always None) ``NavigationToolbar2QT.adj_window`` attribute is
+deprecated.
diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py
@@ -724,9 +724,6 @@ def _init_toolbar(self):
             labelAction = self.addWidget(self.locLabel)
             labelAction.setVisible(True)
 
-        # reference holder for subplots_adjust window
-        self.adj_window = None
-
         # Esthetic adjustments - we need to set these explicitly in PyQt5
         # otherwise the layout looks different - but we don't want to set it if
         # not using HiDPI icons otherwise they look worse than before.
@@ -739,6 +736,11 @@ def _init_toolbar(self):
     def buttons(self):
         return {}
 
+    @cbook.deprecated("3.1")
+    @property
+    def adj_window(self):
+        return None
+
     if is_pyqt5():
         # For some reason, self.setMinimumHeight doesn't seem to carry over to
         # the actual sizeHint, so override it instead in order to make the
