Skip to content

Commit

Permalink
Merge pull request #2325 from matthew-brett/deal-with-broken-qt4
Browse files Browse the repository at this point in the history
BF: guard against broken PyQt import
  • Loading branch information
mdboom committed Aug 26, 2013
1 parent cd51da8 commit 388f8fd
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions setupext.py
Expand Up @@ -1656,14 +1656,16 @@ def check(self):
from PyQt4 import pyqtconfig
except ImportError:
raise CheckFailed("PyQt4 not found")
else:

BackendAgg.force = True

return ("Qt: %s, PyQt4: %s" %
(self.convert_qt_version(
pyqtconfig.Configuration().qt_version),
pyqtconfig.Configuration().pyqt_version_str))
# Import may still be broken for our python
try:
qtconfig = pyqtconfig.Configuration()
except AttributeError:
raise CheckFailed('PyQt4 not correctly imported')
BackendAgg.force = True
return ("Qt: %s, PyQt4: %s" %
(self.convert_qt_version(
qtconfig.qt_version),
qtconfig.pyqt_version_str))


class BackendPySide(OptionalBackendPackage):
Expand Down

0 comments on commit 388f8fd

Please sign in to comment.