Merge pull request #3100 from radarhere/imagetk

Change test_imagetk to run on Python 3
This commit is contained in:
Hugo 2018-04-17 22:39:34 +03:00 committed by GitHub
commit 48c8f1f219
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,10 +1,13 @@
from helper import unittest, PillowTestCase, hopper from helper import unittest, PillowTestCase, hopper, py3
from PIL import Image from PIL import Image
try: try:
from PIL import ImageTk from PIL import ImageTk
import Tkinter as tk if py3:
import tkinter as tk
else:
import Tkinter as tk
dir(ImageTk) dir(ImageTk)
HAS_TK = True HAS_TK = True
except (OSError, ImportError) as v: except (OSError, ImportError) as v: