python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-10-31 07:57:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1024 from holg/master

Browse Source 
[ADD] added PySide compability
This commit is contained in:
wiredfool 2014-11-27 10:31:42 -08:00
commit 9f7ee1cf91
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PIL/ImageQt.py
View File

@ -24,7 +24,11 @@ if 'PyQt4.QtGui' not in sys.modules:
try: try:
from PyQt5.QtGui import QImage, qRgba from PyQt5.QtGui import QImage, qRgba
except: except:
try:
from PyQt4.QtGui import QImage, qRgba from PyQt4.QtGui import QImage, qRgba
except:
from PySide.QtGui import QImage, qRgba
else: #PyQt4 is used else: #PyQt4 is used
from PyQt4.QtGui import QImage, qRgba from PyQt4.QtGui import QImage, qRgba

8
Tests/test_imageqt.py
View File

@ -6,6 +6,9 @@ try:
except: except:
try: try:
from PyQt4.QtGui import QImage, qRgb, qRgba from PyQt4.QtGui import QImage, qRgb, qRgba
except:
try:
from PySide.QtGui import QImage, qRgb, qRgba
except: except:
# Will be skipped in setUp # Will be skipped in setUp
pass pass
@ -20,7 +23,10 @@ class TestImageQt(PillowTestCase):
try: try:
from PyQt4.QtGui import QImage, qRgb, qRgba from PyQt4.QtGui import QImage, qRgb, qRgba
except: except:
self.skipTest('PyQt4 or 5 not installed') try:
from PySide.QtGui import QImage, qRgb, qRgba
except:
self.skipTest('PyQt4 or 5 or PySide not installed')
def test_rgb(self): def test_rgb(self):
# from https://qt-project.org/doc/qt-4.8/qcolor.html # from https://qt-project.org/doc/qt-4.8/qcolor.html