Rooba
/
kivy
mirror of https://github.com/kivy/kivy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5555 from kivy/img_pil_import 

python3 package of Pillow needs a updated Import
This commit is contained in:
Mathieu Virbel 2017-12-30 23:07:57 +01:00 committed by GitHub
parent 06af8eeddd 826fe38f52
commit f7226c88c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kivy/core/image/img_pil.py
View File

@ -4,7 +4,12 @@ PIL: PIL image loader
__all__ = ('ImageLoaderPIL', ) __all__ = ('ImageLoaderPIL', )
try:
import Image as PILImage import Image as PILImage
except ImportError:
# for python3
from PIL import Image as PILImage
from kivy.logger import Logger from kivy.logger import Logger
from kivy.core.image import ImageLoaderBase, ImageData, ImageLoader from kivy.core.image import ImageLoaderBase, ImageData, ImageLoader