8000 TST: be a bit more defensive about imports/HAS_QT · matplotlib/matplotlib@d0153b7 · GitHub
[go: up one dir, main page]
Skip to content

Commit d0153b7

Browse files
tacaswelltacaswell
committed
TST: be a bit more defensive about imports/HAS_QT
1 parent cdc52bf commit d0153b7

File tree

2 files changed

+18
-13
lines changed

2 files changed

+18
-13
lines changed

‎lib/matplotlib/tests/test_backend_qt4.py

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from matplotlib.testing.decorators import cleanup, switch_backend
88
from matplotlib.testing.decorators import knownfailureif
99
from matplotlib._pylab_helpers import Gcf
10+
import matplotlib.style as mstyle
1011
import copy
1112

1213
try:
@@ -16,7 +17,8 @@
1617
import mock
1718

1819
try:
19-
from matplotlib.backends.qt_compat import QtCore
20+
with mstyle.context({'backend': 'Qt4Agg'}):
21+
from matplotlib.backends.qt_compat import QtCore
2022

2123
from matplotlib.backends.backend_qt4 import (MODIFIER_KEYS,
2224
SUPER, ALT, CTRL, SHIFT)
@@ -25,11 +27,14 @@
2527
_, AltModifier, AltKey = MODIFIER_KEYS[ALT]
2628
_, SuperModifier, SuperKey = MODIFIER_KEYS[SUPER]
2729
_, ShiftModifier, ShiftKey = MODIFIER_KEYS[SHIFT]
28-
py_qt_ver = int(QtCore.PYQT_VERSION_STR.split('.')[0])
29-
if py_qt_ver != 4:
30-
HAS_QT = False
31-
else:
32-
HAS_QT = True
30+
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
37+
3338
except ImportError:
3439
HAS_QT = False
3540

‎lib/matplotlib/tests/test_backend_qt5.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
from __future__ import (absolute_import, division, print_function,
22
unicode_literals)
3-
43
from matplotlib.externals import six
54

65
from matplotlib import pyplot as plt
76
from matplotlib.testing.decorators import cleanup, switch_backend
87
from matplotlib.testing.decorators import knownfailureif
98
from matplotlib._pylab_helpers import Gcf
9+
import matplotlib.style as mstyle
1010
import copy
1111

1212
try:
@@ -16,19 +16,19 @@
1616
import mock
1717

1818
try:
19-
from matplotlib.backends.qt_compat import QtCore
19+
with mstyle.context({'backend': 'Qt5Agg'}):
20+
from matplotlib.backends.qt_compat import QtCore, __version__
2021
from matplotlib.backends.backend_qt5 import (MODIFIER_KEYS,
2122
SUPER, ALT, CTRL, SHIFT)
2223

2324
_, ControlModifier, ControlKey = MODIFIER_KEYS[CTRL]
2425
_, AltModifier, AltKey = MODIFIER_KEYS[ALT]
2526
_, SuperModifier, SuperKey = MODIFIER_KEYS[SUPER]
2627
_, ShiftModifier, ShiftKey = MODIFIER_KEYS[SHIFT]
27-
py_qt_ver = int(QtCore.PYQT_VERSION_STR.split('.')[0])
28-
if py_qt_ver != 5:
29-
HAS_QT = False
30-
else:
31-
HAS_QT = True
28+
29+
py_qt_ver = int(__version__.split('.')[0])
30+
HAS_QT = py_qt_ver == 5
31+
3232
except ImportError:
3333
HAS_QT = False
3434

0 commit comments

Comments
 (0)
0