8000 Merge 1.5 into 2x. by jenshnielsen · Pull Request #6187 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Merge 1.5 into 2x. #6187

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
merged 17 commits into from
Mar 19, 2016
Merged

Merge 1.5 into 2x. #6187

Changes from 3 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
259483a
FIX: always normalize dpi
tacaswell Mar 6, 2016
a175e95
MNT: remove redundant normalization
tacaswell Mar 6, 2016
637c3da
Merge pull request #6114 from tacaswell/fix_print_figure_dpi
jenshnielsen Mar 6, 2016
eadeb1a
Merge pull request #6140 from kylerbrown/scatter-doc2
tacaswell Mar 10, 2016
1d7f0d9
Merge pull request #6148 from has2k1/fix-pandas-indexing
tacaswell Mar 12, 2016
44afc73
Merge pull request #6091 from KyleBsingh/master
tacaswell Mar 13, 2016
1540c98
FIX: deal with negative canvas dimension in Qt
tacaswell Mar 14, 2016
cd88b31
Merge pull request #6152 from tacaswell/fix_qt_segfault
jenshnielsen Mar 14, 2016
54ec43f
Merge pull request #5343 from phobson/bxp-equal-quartiles
jenshnielsen Mar 14, 2016
7266b4f
Merge pull request #6153 from jenshnielsen/backport_5343
jenshnielsen Mar 14, 2016
c78ca18
Merge pull request #6158 from has2k1/fix-pandas-iterables
tacaswell Mar 16, 2016
7f5ae1f
MNT: check PySide, PyQt4, or PyQt5 are imported
tacaswell Mar 17, 2016
f43a30d
MNT: simplify fallback Qt behavior
tacaswell Mar 17, 2016
a0c9759
TST: conditionally import assert_sequence_equal
tacaswell Mar 17, 2016
41007a5
Merge pull request #6177 from tacaswell/tst_fix26_compat
tacaswell Mar 17, 2016
0853446
Merge pull request #6174 from tacaswell/mnt_qt_imports
jenshnielsen Mar 19, 2016
35a1cc8
Merge remote-tracking branch 'matplotlib/v1.5.x' into v2.x
jenshnielsen Mar 19, 2016
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
33 changes: 23 additions & 10 deletions lib/matplotlib/backends/qt_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,23 @@

QT_API = None

if (QT_API_ENV is not None):
# check if any binding is already imported, if so silently ignore the
# rcparams/ENV settings and use what ever is already imported.
if 'PySide' in sys.modules:
# user has imported PySide before importing mpl
QT_API = QT_API_PYSIDE

if 'PyQt4' in sys.modules:
# user has imported PyQt4 before importing mpl
# this case also handles the PyQt4v2 case as once sip is imported
# the API versions can not be changed so do not try
QT_API = QT_API_PYQT

if 'PyQt5' in sys.modules:
# the user has imported PyQt5 before importing mpl
QT_API = QT_API_PYQT5

if (QT_API_ENV is not None) and QT_API is None:
try:
QT_ENV_MAJOR_VERSION = ETS[QT_API_ENV][1]
except KeyError:
Expand All @@ -61,15 +77,12 @@
elif rcParams['backend'] == 'Qt4Agg':
QT_API = rcParams['backend.qt4']
else:
# A different backend was specified, but we still got here because a Qt
# related file was imported. This is allowed, so lets try and guess
# what we should be using.
if "PyQt4" in sys.modules or "PySide" in sys.modules:
# PyQt4 or PySide is actually used.
QT_API = rcParams['backend.qt4']
else:
# This is a fallback: PyQt5
QT_API = rcParams['backend.qt5']
# A non-Qt backend was specified, no version of the Qt
# bindings is imported, but we still got here because a Qt
# related file was imported. This is allowed, fall back to Qt5
# using which ever binding the rparams ask for.

QT_API = rcParams['backend.qt5']

# We will define an appropriate wrapper for the differing versions
# of file dialog.
Expand Down
0