8000 always include response from both PySide & PyQt4 · matplotlib/matplotlib@27e3bd2 · GitHub
[go: up one dir, main page]

Skip to content

Commit 27e3bd2

Browse files
committed
always include response from both PySide & PyQt4
1 parent 0863d30 commit 27e3bd2

File tree

1 file changed

+11
-14
lines changed

1 file changed

+11
-14
lines changed

setupext.py

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1985,24 +1985,21 @@ def backend_pyqt4_internal_check(self):
19851985
return ("Qt: %s, PyQt: %s" % (self.convert_qt_version(qt_version), pyqt_version_str))
19861986

19871987
def backend_qt4_internal_check(self):
1988+
successes = []
1989+
failures = []
19881990
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))
19921994

19931995
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))
20051999

2000+
if len(successes) == 0:
2001+
raise CheckFailed('; '.join(failures))
2002+
return '; '.join(successes+failures)
20062003

20072004
class BackendQt4(BackendQtBase):
20082005
name = "qt4agg"

0 commit comments

Comments
 (0)
0