8000 Simplify Qt test imports using pytest. · matplotlib/matplotlib@476be29 · GitHub
[go: up one dir, main page]
Skip to content

Commit 476be29

Browse files
QuLogicQuLogic
committed
Simplify Qt test imports using pytest.
1 parent a7cdeab commit 476be29

File tree

2 files changed

+25
-39
lines changed

2 files changed

+25
-39
lines changed

‎lib/matplotlib/tests/test_backend_qt4.py

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,23 @@
1616
except ImportError:
1717
import mock
1818

19-
try:
20-
with matplotlib.rc_context(rc={'backend': 'Qt4Agg'}):
21-
from matplotlib.backends.qt_compat import QtCore
22-
23-
from matplotlib.backends.backend_qt4 import (MODIFIER_KEYS,
24-
SUPER, ALT, CTRL, SHIFT)
25-
26-
_, ControlModifier, ControlKey = MODIFIER_KEYS[CTRL]
27-
_, AltModifier, AltKey = MODIFIER_KEYS[ALT]
28-
_, SuperModifier, SuperKey = MODIFIER_KEYS[SUPER]
29-
_, ShiftModifier, ShiftKey = MODIFIER_KEYS[SHIFT]
19+
with matplotlib.rc_context(rc={'backend': 'Qt4Agg'}):
20+
qt_compat = pytest.importorskip('matplotlib.backends.qt_compat')
21+
from matplotlib.backends.backend_qt4 import (MODIFIER_KEYS,
22+
SUPER, ALT, CTRL, SHIFT) # noqa
3023

31-
try:
32-
py_qt_ver = int(QtCore.PYQT_VERSION_STR.split('.')[0])
33-
except AttributeError:
34-
py_qt_ver = QtCore.__version_info__[0]
35-
print(py_qt_ver)
36-
HAS_QT = py_qt_ver == 4
24+
QtCore = qt_compat.QtCore
25+
_, ControlModifier, ControlKey = MODIFIER_KEYS[CTRL]
26+
_, AltModifier, AltKey = MODIFIER_KEYS[ALT]
27+
_, SuperModifier, SuperKey = MODIFIER_KEYS[SUPER]
28+
_, ShiftModifier, ShiftKey = MODIFIER_KEYS[SHIFT]
3729

38-
except ImportError:
39-
HAS_QT = False
30+
try:
31+
py_qt_ver = int(QtCore.PYQT_VERSION_STR.split('.')[0])
32+
except AttributeError:
33+
py_qt_ver = QtCore.__version_info__[0]
4034

41-
if not HAS_QT:
35+
if py_qt_ver != 4:
4236
pytestmark = pytest.mark.xfail(reason='Qt4 is not available')
4337

4438

‎lib/matplotlib/tests/test_backend_qt5.py

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,17 @@
1515
except ImportError:
1616
import mock
1717

18-
try:
19-
with matplotlib.rc_context(rc={'backend': 'Qt5Agg'}):
20-
from matplotlib.backends.qt_compat import QtCore, __version__
21-
from matplotlib.backends.backend_qt5 import (MODIFIER_KEYS,
22-
SUPER, ALT, CTRL, SHIFT)
23-
24-
_, ControlModifier, ControlKey = MODIFIER_KEYS[CTRL]
25-
_, AltModifier, AltKey = MODIFIER_KEYS[ALT]
26-
_, SuperModifier, SuperKey = MODIFIER_KEYS[SUPER]
27-
_, ShiftModifier, ShiftKey = MODIFIER_KEYS[SHIFT]
28-
29-
py_qt_ver = int(__version__.split('.')[0])
30-
HAS_QT = py_qt_ver == 5
31-
32-
except ImportError:
33-
HAS_QT = False
34-
35-
if not HAS_QT:
36-
pytestmark = pytest.mark.xfail(reason='Qt5 is not available')
18+
with matplotlib.rc_context(rc={'backend': 'Qt5Agg'}):
19+
qt_compat = pytest.importorskip('matplotlib.backends.qt_compat',
20+
minversion='5')
21+
from matplotlib.backends.backend_qt5 import (MODIFIER_KEYS,
22+
SUPER, ALT, CTRL, SHIFT) # noqa
23+
24+
QtCore = qt_compat.QtCore
25+
_, ControlModifier, ControlKey = MODIFIER_KEYS[CTRL]
26+
_, AltModifier, AltKey = MODIFIER_KEYS[ALT]
27+
_, SuperModifier, SuperKey = MODIFIER_KEYS[SUPER]
28+
_, ShiftModifier, ShiftKey = MODIFIER_KEYS[SHIFT]
3729

3830

3931
@cleanup

0 commit comments

Comments
 (0)
0