mirror of
https://github.com/python-pillow/Pillow.git
synced 2025-08-18 19:24:47 +03:00
Merge c97229466c
into c05099f45c
This commit is contained in:
commit
50d1ff4260
|
@ -5,7 +5,7 @@ from PIL import ImageQt, Image
|
|||
|
||||
|
||||
if ImageQt.qt_is_installed:
|
||||
from PIL.ImageQt import QImage, QPixmap
|
||||
from PIL.ImageQt import QImage
|
||||
|
||||
try:
|
||||
from PyQt5 import QtGui
|
||||
|
@ -21,7 +21,6 @@ if ImageQt.qt_is_installed:
|
|||
from PySide.QtGui import QWidget, QHBoxLayout, QLabel, QApplication
|
||||
QT_VERSION = 4
|
||||
|
||||
|
||||
class TestToQImage(PillowQtTestCase, PillowTestCase):
|
||||
|
||||
def test_sanity(self):
|
||||
|
@ -59,12 +58,13 @@ class TestToQImage(PillowQtTestCase, PillowTestCase):
|
|||
src = src.convert('P')
|
||||
self.assert_image_equal(reloaded, src)
|
||||
|
||||
|
||||
def test_segfault(self):
|
||||
PillowQtTestCase.setUp(self)
|
||||
|
||||
app = QApplication([])
|
||||
ex = Example()
|
||||
assert(app) # Silence warning
|
||||
assert(ex) # Silence warning
|
||||
|
||||
|
||||
if ImageQt.qt_is_installed:
|
||||
|
@ -86,15 +86,5 @@ if ImageQt.qt_is_installed:
|
|||
lbl.setPixmap(pixmap1.copy())
|
||||
|
||||
|
||||
|
||||
|
||||
def main():
|
||||
app = QApplication(sys.argv)
|
||||
ex = Example()
|
||||
sys.exit(app.exec_())
|
||||
|
||||
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
|
Loading…
Reference in New Issue
Block a user