Skip to content

TST: properly fence-post qt{4,5} backend tests #5195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jenshnielsen merged 5 commits into from
Oct 7, 2015
Merged

TST: properly fence-post qt{4,5} backend tests #5195

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
84aa9f7
TST: properly fence-post qt{4,5} backend tests
tacaswell Oct 6, 2015
f67ea3c
FIX: mro issue with pyside/pyqt4
tacaswell Oct 6, 2015
cdc52bf
FIX: be more careful about pyside
tacaswell Oct 6, 2015
d0153b7
TST: be a bit more defensive about imports/HAS_QT
tacaswell Oct 6, 2015
ada2f99
FIX: restore lpy compat
tacaswell Oct 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/matplotlib/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1429,6 +1429,7 @@ def tk_window_focus():
'matplotlib.tests.test_backend_pgf',
'matplotlib.tests.test_backend_ps',
'matplotlib.tests.test_backend_qt4',
'matplotlib.tests.test_backend_qt5',
'matplotlib.tests.test_backend_svg',
'matplotlib.tests.test_basic',
'matplotlib.tests.test_bbox_tight',
Expand Down
7 changes: 6 additions & 1 deletion lib/matplotlib/backends/backend_qt4agg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from matplotlib.figure import Figure


from .backend_qt5agg import FigureCanvasQTAggBase
from .backend_qt5agg import FigureCanvasQTAggBase as _FigureCanvasQTAggBase

from .backend_agg import FigureCanvasAgg
from .backend_qt4 import QtCore
Expand Down Expand Up @@ -54,6 +54,11 @@ def new_figure_manager_given_figure(num, figure):
return FigureManagerQT(canvas, num)


class FigureCanvasQTAggBase(_FigureCanvasQTAggBase):
def __init__(self, figure):
self._agg_draw_pending = False


class FigureCanvasQTAgg(FigureCanvasQTAggBase,
FigureCanvasQT, FigureCanvasAgg):
"""
Expand Down
25 changes: 14 additions & 11 deletions lib/matplotlib/backends/qt_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,19 +139,22 @@ def _getSaveFileName(*args, **kwargs):
# call to getapi() can fail in older versions of sip
def _getSaveFileName(*args, **kwargs):
return QtGui.QFileDialog.getSaveFileName(*args, **kwargs), None

# Alias PyQt-specific functions for PySide compatibility.
QtCore.Signal = QtCore.pyqtSignal
try:
QtCore.Slot = QtCore.pyqtSlot
except AttributeError:
# Not a perfect match but works in simple cases
QtCore.Slot = QtCore.pyqtSignature

QtCore.Property = QtCore.pyqtProperty
__version__ = QtCore.PYQT_VERSION_STR
# Alias PyQt-specific functions for PySide compatibility.
QtCore.Signal = QtCore.pyqtSignal
try:
QtCore.Slot = QtCore.pyqtSlot
except AttributeError:
# Not a perfect match but works in simple cases
QtCore.Slot = QtCore.pyqtSignature

QtCore.Property = QtCore.pyqtProperty
__version__ = QtCore.PYQT_VERSION_STR
except NameError:
# QtCore did not get imported, fall back to pyside
QT_API = QT_API_PYSIDE

else: # try importing pyside
if QT_API == QT_API_PYSIDE: # try importing pyside
try:
from PySide import QtCore, QtGui, __version__, __version_info__
except ImportError:
Expand Down
16 changes: 13 additions & 3 deletions lib/matplotlib/tests/test_backend_qt4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from matplotlib.testing.decorators import cleanup, switch_backend
from matplotlib.testing.decorators import knownfailureif
from matplotlib._pylab_helpers import Gcf
import matplotlib.style as mstyle
import copy

try:
Expand All @@ -16,15 +17,24 @@
import mock

try:
from matplotlib.backends.qt_compat import QtCore
with mstyle.context({'backend': 'Qt4Agg'}):
from matplotlib.backends.qt_compat import QtCore

from matplotlib.backends.backend_qt4 import (MODIFIER_KEYS,
SUPER, ALT, CTRL, SHIFT)

_, ControlModifier, ControlKey = MODIFIER_KEYS[CTRL]
_, AltModifier, AltKey = MODIFIER_KEYS[ALT]
_, SuperModifier, SuperKey = MODIFIER_KEYS[SUPER]
_, ShiftModifier, ShiftKey = MODIFIER_KEYS[SHIFT]
HAS_QT = True

try:
py_qt_ver = int(QtCore.PYQT_VERSION_STR.split('.')[0])
except AttributeError:
py_qt_ver = QtCore.__version_info__[0]
print(py_qt_ver)
HAS_QT = py_qt_ver == 4

except ImportError:
HAS_QT = False

Expand All @@ -33,7 +43,7 @@
@knownfailureif(not HAS_QT)
@switch_backend('Qt4Agg')
def test_fig_close():
#save the state of Gcf.figs
# save the state of Gcf.figs
init_figs = copy.copy(Gcf.figs)

# make a figure using pyplot interface
Expand Down
24 changes: 13 additions & 11 deletions lib/matplotlib/tests/test_backend_qt5.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)

from matplotlib.externals import six

from matplotlib import pyplot as plt
from matplotlib.testing.decorators import cleanup
from matplotlib.testing.decorators import cleanup, switch_backend
from matplotlib.testing.decorators import knownfailureif
from matplotlib._pylab_helpers import Gcf
import matplotlib.style as mstyle
import copy

try:
Expand All @@ -16,25 +16,27 @@
import mock

try:
from matplotlib.backends.qt_compat import QtCore
with mstyle.context({'backend': 'Qt5Agg'}):
from matplotlib.backends.qt_compat import QtCore, __version__
from matplotlib.backends.backend_qt5 import (MODIFIER_KEYS,
SUPER, ALT, CTRL, SHIFT)

_, ControlModifier, ControlKey = MODIFIER_KEYS[CTRL]
_, AltModifier, AltKey = MODIFIER_KEYS[ALT]
_, SuperModifier, SuperKey = MODIFIER_KEYS[SUPER]
_, ShiftModifier, ShiftKey = MODIFIER_KEYS[SHIFT]
HAS_QT = True

py_qt_ver = int(__version__.split('.')[0])
HAS_QT = py_qt_ver == 5

except ImportError:
HAS_QT = False


@cleanup
@knownfailureif(not HAS_QT)
@switch_backend('Qt5Agg')
def test_fig_close():
# force switch to the Qt5 backend
plt.switch_backend('Qt5Agg')

# save the state of Gcf.figs
init_figs = copy.copy(Gcf.figs)

Expand All @@ -50,14 +52,14 @@ def test_fig_close():
assert(init_figs == Gcf.figs)


@switch_backend('Qt5Agg')
def assert_correct_key(qt_key, qt_mods, answer):
"""
Make a figure
Send a key_press_event event (using non-public, qt5 backend specific api)
Catch the event
Assert sent and caught keys are the same
"""
plt.switch_backend('Qt5Agg')
qt_canvas = plt.figure().canvas

event = mock.Mock()
Expand Down Expand Up @@ -101,15 +103,15 @@ def test_control():
def test_unicode_upper():
assert_correct_key(QtCore.Qt.Key_Aacute,
ShiftModifier,
unichr(193))
chr(193))


@cleanup
@knownfailureif(not HAS_QT)
def test_unicode_lower():
assert_correct_key(QtCore.Qt.Key_Aacute,
QtCore.Qt.NoModifier,
unichr(225))
chr(225))


@cleanup
Expand All @@ -133,7 +135,7 @@ def test_control_alt():
def test_modifier_order():
assert_correct_key(QtCore.Qt.Key_Aacute,
(ControlModifier | AltModifier | SuperModifier),
'ctrl+alt+super+' + unichr(225))
'ctrl+alt+super+' + chr(225))

@mdboom mdboom Oct 6, 2015

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe this should be six.unichr so it doesn't fail if the default encoding is something that can't handle Unicode codepoint 225...

@tacaswell tacaswell Oct 6, 2015

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as i know pyqt5 is py3 so I thought this was fine.

On Tue, Oct 6, 2015, 08:37 Michael Droettboom notifications@github.com
wrote:

In lib/matplotlib/tests/test_backend_qt5.py
#5195 (comment):

@@ -133,7 +135,7 @@ def test_control_alt():
def test_modifier_order():
assert_correct_key(QtCore.Qt.Key_Aacute,
(ControlModifier | AltModifier | SuperModifier),

  •                   'ctrl+alt+super+' + unichr(225))

  •                   'ctrl+alt+super+' + chr(225))

Maybe this should be six.unichr so it doesn't fail if the default encoding
is something that can't handle Unicode codepoint 225...

—
Reply to this email directly or view it on GitHub
https://github.com/matplotlib/matplotlib/pull/5195/files#r41257615.

@jenshnielsen jenshnielsen Oct 6, 2015

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pyqt5 also runs on python 2.7



@cleanup
Expand Down