Skip to content

Commit ab95c91

Browse files
authored
Merge pull request matplotlib#20775 from anntzer/uq4
2 parents e291cdb + 1b1b11a commit ab95c91

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

lib/matplotlib/backends/backend_qt5.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,11 +246,7 @@ def set_cursor(self, cursor):
246246
self.setCursor(_api.check_getitem(cursord, cursor=cursor))
247247

248248
def enterEvent(self, event):
249-
try:
250-
x, y = self.mouseEventCoords(event.pos())
251-
except AttributeError:
252-
# the event from PyQt4 does not include the position
253-
x = y = None
249+
x, y = self.mouseEventCoords(event.pos())
254250
FigureCanvasBase.enter_notify_event(self, guiEvent=event, xy=(x, y))
255251

256252
def leaveEvent(self, event):

lib/matplotlib/style/core.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
# A list of rcParams that should not be applied from styles
3939
STYLE_BLACKLIST = {
40-
'interactive', 'backend', 'backend.qt4', 'webagg.port', 'webagg.address',
40+
'interactive', 'backend', 'webagg.port', 'webagg.address',
4141
'webagg.port_retries', 'webagg.open_in_browser', 'backend_fallback',
4242
'toolbar', 'timezone', 'datapath', 'figure.max_open_warning',
4343
'figure.raise_window', 'savefig.directory', 'tk.window_focus',

0 commit comments

Comments
 (0)