python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-27 17:54:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1942 from python-pillow/pyqt4-pyqt5

Browse Source 
Fix for program importing PyQt4 when PyQt5 also installed
This commit is contained in:
wiredfool 2016-06-25 12:16:16 +01:00 committed by GitHub
commit 8d8990a9d4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PIL/ImageQt.py
View File

@ -26,12 +26,12 @@ try:
from PyQt5.QtGui import QImage, qRgba, QPixmap from PyQt5.QtGui import QImage, qRgba, QPixmap
from PyQt5.QtCore import QBuffer, QIODevice from PyQt5.QtCore import QBuffer, QIODevice
qt_version = '5' qt_version = '5'
except ImportError: except (ImportError, RuntimeError):
try: try:
from PyQt4.QtGui import QImage, qRgba, QPixmap from PyQt4.QtGui import QImage, qRgba, QPixmap
from PyQt4.QtCore import QBuffer, QIODevice from PyQt4.QtCore import QBuffer, QIODevice
qt_version = '4' qt_version = '4'
except ImportError: except (ImportError, RuntimeError):
try: try:
from PySide.QtGui import QImage, qRgba, QPixmap from PySide.QtGui import QImage, qRgba, QPixmap
from PySide.QtCore import QBuffer, QIODevice from PySide.QtCore import QBuffer, QIODevice