Skip to content

Commit 1700282

Browse files
author
Martin Fitzpatrick
committed
BackendPySide using multiprocessing + added to setup.py
BackendPySide is now implemented using the same approach as for PyQt4 and PyQt5. The calls in setup.py have been updated to include the 3 Qt interfaces: setupext.BackendQt5(), setupext.BackendQt4(), setupext.BackendPySide(),
1 parent c98406d commit 1700282

File tree

2 files changed

+26
-16
lines changed

2 files changed

+26
-16
lines changed

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,9 @@
9090
# being the most preferred. The first one that looks like it will
9191
# work will be selected as the default backend.
9292
setupext.BackendMacOSX(),
93-
setupext.BackendQt4(),
9493
setupext.BackendQt5(),
94+
setupext.BackendQt4(),
95+
setupext.BackendPySide(),
9596
setupext.BackendGtk3Agg(),
9697
setupext.BackendGtk3Cairo(),
9798
setupext.BackendGtkAgg(),

setupext.py

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1903,13 +1903,15 @@ def backend_qt4_internal_check(self):
19031903
from PyQt4 import QtCore
19041904
except ImportError:
19051905
raise CheckFailed("PyQt4 not found")
1906+
19061907
try:
19071908
qt_version = QtCore.QT_VERSION
19081909
pyqt_version_str = QtCore.QT_VERSION_STR
19091910
except AttributeError:
19101911
raise CheckFailed('PyQt4 not correctly imported')
1911-
1912-
return ("Qt: %s, PyQt: %s" % (self.convert_qt_version(qt_version), pyqt_version_str))
1912+
else:
1913+
BackendAgg.force = True
1914+
return ("Qt: %s, PyQt: %s" % (self.convert_qt_version(qt_version), pyqt_version_str))
19131915

19141916

19151917
class BackendQt4(BackendQtBase):
@@ -1925,13 +1927,15 @@ def backend_qt5_internal_check(self):
19251927
from PyQt5 import QtCore
19261928
except ImportError:
19271929
raise CheckFailed("PyQt5 not found")
1930+
19281931
try:
19291932
qt_version = QtCore.QT_VERSION
19301933
pyqt_version_str = QtCore.QT_VERSION_STR
19311934
except AttributeError:
19321935
raise CheckFailed('PyQt5 not correctly imported')
1933-
1934-
return ("Qt: %s, PyQt: %s" % (self.convert_qt_version(qt_version), pyqt_version_str))
1936+
else:
1937+
BackendAgg.force = True
1938+
return ("Qt: %s, PyQt: %s" % (self.convert_qt_version(qt_version), pyqt_version_str))
19351939

19361940

19371941
class BackendQt5(BackendQtBase):
@@ -1942,20 +1946,25 @@ def __init__(self, *args, **kwargs):
19421946
self.callback = backend_qt5_internal_check
19431947

19441948

1945-
class BackendPySide(OptionalBackendPackage):
1949+
def backend_pyside_internal_check(self):
1950+
try:
1951+
from PySide import __version__
1952+
from PySide import QtCore
1953+
except ImportError:
1954+
raise CheckFailed("PySide not found")
1955+
else:
1956+
BackendAgg.force = True
1957+
return ("Qt: %s, PySide: %s" %
1958+
(QtCore.__version__, __version__))
1959+
1960+
1961+
class BackendPySide(BackendQtBase):
19461962
name = "pyside"
19471963

1948-
def check_requirements(self):
1949-
try:
1950-
from PySide import __version__
1951-
from PySide import QtCore
1952-
except ImportError:
1953-
raise CheckFailed("PySide not found")
1954-
else:
1955-
BackendAgg.force = True
1964+
def __init__(self, *args, **kwargs):
1965+
BackendQtBase.__init__(self, *args, **kwargs)
1966+
self.callback = backend_pyside_internal_check
19561967

1957-
return ("Qt: %s, PySide: %s" %
1958-
(QtCore.__version__, __version__))
19591968

19601969

19611970
class BackendCairo(OptionalBackendPackage):

0 commit comments

Comments
 (0)