@@ -1958,7 +1958,18 @@ def check_requirements(self):
1958
1958
return msg
1959
1959
1960
1960
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 ):
1962
1973
try :
1963
1974
from PyQt4 import QtCore
1964
1975
except ImportError :
@@ -1973,6 +1984,25 @@ def backend_qt4_internal_check(self):
1973
1984
BackendAgg .force = True
1974
1985
return ("Qt: %s, PyQt: %s" % (self .convert_qt_version (qt_version ), pyqt_version_str ))
1975
1986
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
+
1976
2006
1977
2007
class BackendQt4 (BackendQtBase ):
1978
2008
name = "qt4agg"
@@ -2006,27 +2036,6 @@ def __init__(self, *args, **kwargs):
2006
2036
self .callback = backend_qt5_internal_check
2007
2037
2008
2038
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
-
2030
2039
class BackendCairo (OptionalBackendPackage ):
2031
2040
name = "cairo"
2032
2041
0 commit comments