Commit c98406d
Martin Fitzpatrick
Fix setupext.py for the case where both PyQt4 and PyQt5 are installed
If both PyQt4 and PyQt5 are installed in the same Python the setup check
for the modules will cause a RuntimeError as they are both imported.
The Gtk module uses a multiprocessing pool to perform the imports, and this
approach is used here. However, if we import PyQt4 normally, then PyQt5
using multiprocessing the import is incomplete (no version information).
Instead, we default to multiprocessing for both PyQt4 and PyQt5 and only
fall to normal imports if that is not available.
In the case of a RuntimeError on a normal-style import the error is raised
as `CheckFailed("Could not import: are PyQt4 & PyQt5 both installed?")` to
give a hint as to the problem.1 parent c9bf9ec commit c98406d
1 file changed
Lines changed: 75 additions & 30 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1852 | 1852 | | |
1853 | 1853 | | |
1854 | 1854 | | |
1855 | | - | |
1856 | | - | |
| 1855 | + | |
1857 | 1856 | | |
1858 | 1857 | | |
1859 | 1858 | | |
| |||
1864 | 1863 | | |
1865 | 1864 | | |
1866 | 1865 | | |
| 1866 | + | |
| 1867 | + | |
| 1868 | + | |
| 1869 | + | |
1867 | 1870 | | |
1868 | | - | |
1869 | | - | |
1870 | | - | |
1871 | | - | |
1872 | | - | |
1873 | | - | |
1874 | | - | |
1875 | | - | |
1876 | | - | |
1877 | | - | |
1878 | | - | |
1879 | | - | |
1880 | | - | |
1881 | | - | |
| 1871 | + | |
| 1872 | + | |
| 1873 | + | |
| 1874 | + | |
| 1875 | + | |
| 1876 | + | |
| 1877 | + | |
| 1878 | + | |
| 1879 | + | |
| 1880 | + | |
| 1881 | + | |
| 1882 | + | |
| 1883 | + | |
| 1884 | + | |
| 1885 | + | |
| 1886 | + | |
| 1887 | + | |
| 1888 | + | |
| 1889 | + | |
| 1890 | + | |
| 1891 | + | |
| 1892 | + | |
| 1893 | + | |
| 1894 | + | |
| 1895 | + | |
| 1896 | + | |
| 1897 | + | |
| 1898 | + | |
| 1899 | + | |
| 1900 | + | |
| 1901 | + | |
| 1902 | + | |
| 1903 | + | |
| 1904 | + | |
| 1905 | + | |
| 1906 | + | |
| 1907 | + | |
| 1908 | + | |
| 1909 | + | |
| 1910 | + | |
| 1911 | + | |
| 1912 | + | |
| 1913 | + | |
1882 | 1914 | | |
1883 | | - | |
| 1915 | + | |
| 1916 | + | |
| 1917 | + | |
| 1918 | + | |
| 1919 | + | |
| 1920 | + | |
| 1921 | + | |
| 1922 | + | |
| 1923 | + | |
| 1924 | + | |
| 1925 | + | |
| 1926 | + | |
| 1927 | + | |
| 1928 | + | |
| 1929 | + | |
| 1930 | + | |
| 1931 | + | |
| 1932 | + | |
| 1933 | + | |
| 1934 | + | |
| 1935 | + | |
| 1936 | + | |
| 1937 | + | |
1884 | 1938 | | |
1885 | 1939 | | |
1886 | | - | |
1887 | | - | |
1888 | | - | |
1889 | | - | |
1890 | | - | |
1891 | | - | |
1892 | | - | |
1893 | | - | |
1894 | | - | |
1895 | | - | |
1896 | | - | |
1897 | | - | |
1898 | | - | |
| 1940 | + | |
| 1941 | + | |
| 1942 | + | |
| 1943 | + | |
1899 | 1944 | | |
1900 | 1945 | | |
1901 | 1946 | | |
| |||
0 commit comments