Skip to content

Commit 0863d30

Browse files
committed
include PySide in qt4agg backend check
1 parent fb27b4c commit 0863d30

File tree

2 files changed

+31
-23
lines changed

2 files changed

+31
-23
lines changed

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@
9393
setupext.BackendMacOSX(),
9494
setupext.BackendQt5(),
9595
setupext.BackendQt4(),
96-
setupext.BackendPySide(),
9796
setupext.BackendGtk3Agg(),
9897
setupext.BackendGtk3Cairo(),
9998
setupext.BackendGtkAgg(),

setupext.py

Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1958,7 +1958,18 @@ def check_requirements(self):
19581958
return msg
19591959

19601960

1961-
def backend_qt4_internal_check(self):
1961+
def backend_pyside_internal_check(self):
1962+
try:
1963+
from PySide import __version__
1964+
from PySide import QtCore
1965+
except ImportError:
1966+
raise CheckFailed("PySide not found")
1967+
else:
1968+
BackendAgg.force = True
1969+
return ("Qt: %s, PySide: %s" %
1970+
(QtCore.__version__, __version__))
1971+
1972+
def backend_pyqt4_internal_check(self):
19621973
try:
19631974
from PyQt4 import QtCore
19641975
except ImportError:
@@ -1973,6 +1984,25 @@ def backend_qt4_internal_check(self):
19731984
BackendAgg.force = True
19741985
return ("Qt: %s, PyQt: %s" % (self.convert_qt_version(qt_version), pyqt_version_str))
19751986

1987+
def backend_qt4_internal_check(self):
1988+
try:
1989+
result1 = backend_pyside_internal_check(self)
1990+
except CheckFailed:
1991+
result1 = None
1992+
1993+
try:
1994+
result2 = backend_pyqt4_internal_check(self)
1995+
except CheckFailed:
1996+
if result1 == None:
1997+
raise
1998+
result2 = None
1999+
2000+
if result1 == None:
2001+
return result2
2002+
if result2 == None:
2003+
return result1
2004+
return '{}; {}'.format(result1, result2)
2005+
19762006

19772007
class BackendQt4(BackendQtBase):
19782008
name = "qt4agg"
@@ -2006,27 +2036,6 @@ def __init__(self, *args, **kwargs):
20062036
self.callback = backend_qt5_internal_check
20072037

20082038

2009-
def backend_pyside_internal_check(self):
2010-
try:
2011-
from PySide import __version__
2012-
from PySide import QtCore
2013-
except ImportError:
2014-
raise CheckFailed("PySide not found")
2015-
else:
2016-
BackendAgg.force = True
2017-
return ("Qt: %s, PySide: %s" %
2018-
(QtCore.__version__, __version__))
2019-
2020-
2021-
class BackendPySide(BackendQtBase):
2022-
name = "pyside"
2023-
2024-
def __init__(self, *args, **kwargs):
2025-
BackendQtBase.__init__(self, *args, **kwargs)
2026-
self.callback = backend_pyside_internal_check
2027-
2028-
2029-
20302039
class BackendCairo(OptionalBackendPackage):
20312040
name = "cairo"
20322041

0 commit comments

Comments
 (0)