Merge pull request #2422 from wiredfool/cleanup-test_image_toqimage

Test: Removed unrunnable code in test_image_toqimage
This commit is contained in:
wiredfool 2017-02-23 11:06:47 +00:00 committed by GitHub
commit 1b98687b6b

View File

@ -5,7 +5,7 @@ from PIL import ImageQt, Image
if ImageQt.qt_is_installed: if ImageQt.qt_is_installed:
from PIL.ImageQt import QImage, QPixmap from PIL.ImageQt import QImage
try: try:
from PyQt5 import QtGui from PyQt5 import QtGui
@ -21,7 +21,6 @@ if ImageQt.qt_is_installed:
from PySide.QtGui import QWidget, QHBoxLayout, QLabel, QApplication from PySide.QtGui import QWidget, QHBoxLayout, QLabel, QApplication
QT_VERSION = 4 QT_VERSION = 4
class TestToQImage(PillowQtTestCase, PillowTestCase): class TestToQImage(PillowQtTestCase, PillowTestCase):
def test_sanity(self): def test_sanity(self):
@ -65,6 +64,8 @@ class TestToQImage(PillowQtTestCase, PillowTestCase):
app = QApplication([]) app = QApplication([])
ex = Example() ex = Example()
assert(app) # Silence warning
assert(ex) # Silence warning
if ImageQt.qt_is_installed: if ImageQt.qt_is_installed:
@ -73,7 +74,7 @@ if ImageQt.qt_is_installed:
def __init__(self): def __init__(self):
super(Example, self).__init__() super(Example, self).__init__()
img = hopper().resize((1000,1000)) img = hopper().resize((1000, 1000))
qimage = ImageQt.ImageQt(img) qimage = ImageQt.ImageQt(img)
@ -86,15 +87,5 @@ if ImageQt.qt_is_installed:
lbl.setPixmap(pixmap1.copy()) lbl.setPixmap(pixmap1.copy())
def main():
app = QApplication(sys.argv)
ex = Example()
sys.exit(app.exec_())
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()