File tree Expand file tree Collapse file tree 1 file changed +11
-14
lines changed Expand file tree Collapse file tree 1 file changed +11
-14
lines changed Original file line number Diff line number Diff line change @@ -1985,24 +1985,21 @@ def backend_pyqt4_internal_check(self):
1985
1985
return ("Qt: %s, PyQt: %s" % (self .convert_qt_version (qt_version ), pyqt_version_str ))
1986
1986
1987
1987
def backend_qt4_internal_check (self ):
1988
+ successes = []
1989
+ failures = []
1988
1990
try :
1989
- result1 = backend_pyside_internal_check (self )
1990
- except CheckFailed :
1991
- result1 = None
1991
+ successes . append ( backend_pyside_internal_check (self ) )
1992
+ except CheckFailed as e :
1993
+ failures . append ( str ( e ))
1992
1994
1993
1995
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 )
1996
+ successes .append (backend_pyqt4_internal_check (self ))
1997
+ except CheckFailed as e :
1998
+ failures .append (str (e ))
2005
1999
2000
+ if len (successes ) == 0 :
2001
+ raise CheckFailed ('; ' .join (failures ))
2002
+ return '; ' .join (successes + failures )
2006
2003
2007
2004
class BackendQt4 (BackendQtBase ):
2008
2005
name = "qt4agg"
You can’t perform that action at this time.
0 commit comments