From 2e0b7427ba3067aeb57fac6cd25e67f3826f7b22 Mon Sep 17 00:00:00 2001 From: Martyn Gigg <martyn.gigg@gmail.com> Date: Tue, 14 Jan 2020 12:05:30 +0000 Subject: [PATCH] Remove deprecated toolbar attributes As far as I can tell these were leftover attributes from a very old version of the matplotlib NavigationToolbarQT class that have now been deprecated in matplotlib 3.1 and set as readonly. A search back through matplotlib 1.5 suggests that they were not used and 1.5 is the minimum we are required to support. --- qt/applications/workbench/workbench/plotting/toolbar.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/qt/applications/workbench/workbench/plotting/toolbar.py b/qt/applications/workbench/workbench/plotting/toolbar.py index 53018e5862d..d0b7a5bdd38 100644 --- a/qt/applications/workbench/workbench/plotting/toolbar.py +++ b/qt/applications/workbench/workbench/plotting/toolbar.py @@ -76,7 +76,6 @@ class WorkbenchNavigationToolbar(NavigationToolbar2QT): if tooltip_text is not None: a.setToolTip(tooltip_text) - self.buttons = {} # Add the x,y location widget at the right side of the toolbar # The stretch factor is 1 which means any resizing of the toolbar # will resize this label instead of the buttons. @@ -88,9 +87,6 @@ class WorkbenchNavigationToolbar(NavigationToolbar2QT): labelAction = self.addWidget(self.locLabel) labelAction.setVisible(True) - # reference holder for subplots_adjust window - self.adj_window = None - # Adjust icon size or they are too small in PyQt5 by default dpi_ratio = QtWidgets.QApplication.instance().desktop().physicalDpiX() / 100 self.setIconSize(QtCore.QSize(24 * dpi_ratio, 24 * dpi_ratio)) -- GitLab