python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-08-20 12:14:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge faac38c4f8 into c1b510c72c

Browse Source
This commit is contained in:
wiredfool 2017-01-17 13:20:49 +00:00 committed by GitHub
commit 93376d3b39
2 changed files with 57 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
PIL/Image.py
View File

@ -355,7 +355,11 @@ def preinit():
return return
try: try:
from PIL import BmpImagePlugin from PIL import JpegImagePlugin
except ImportError:
pass
try:
from PIL import PngImagePlugin
except ImportError: except ImportError:
pass pass
try: try:
@ -363,21 +367,13 @@ def preinit():
except ImportError: except ImportError:
pass pass
try: try:
from PIL import JpegImagePlugin from PIL import BmpImagePlugin
except ImportError: except ImportError:
pass pass
try: try:
from PIL import PpmImagePlugin from PIL import PpmImagePlugin
except ImportError: except ImportError:
pass pass
try:
from PIL import PngImagePlugin
except ImportError:
pass
# try:
# import TiffImagePlugin
# except ImportError:
# pass
_initialized = 1 _initialized = 1

37
PIL/__init__.py
View File

@ -16,7 +16,18 @@ PILLOW_VERSION = '4.1.0.dev0' # Pillow
__version__ = PILLOW_VERSION __version__ = PILLOW_VERSION
_plugins = ['BmpImagePlugin', _plugins = [
#core
'JpegImagePlugin',
'PngImagePlugin',
'GifImagePlugin',
'BmpImagePlugin',
'PpmImagePlugin',
'TiffImagePlugin',
'WebPImagePlugin',
'Jpeg2KImagePlugin',
#non-core
'BufrStubImagePlugin', 'BufrStubImagePlugin',
'CurImagePlugin', 'CurImagePlugin',
'DcxImagePlugin', 'DcxImagePlugin',
@ -27,19 +38,12 @@ _plugins = ['BmpImagePlugin',
'FpxImagePlugin', 'FpxImagePlugin',
'FtexImagePlugin', 'FtexImagePlugin',
'GbrImagePlugin', 'GbrImagePlugin',
'GifImagePlugin',
'GribStubImagePlugin', 'GribStubImagePlugin',
'Hdf5StubImagePlugin', 'Hdf5StubImagePlugin',
'IcnsImagePlugin', 'IcnsImagePlugin',
'IcoImagePlugin', 'IcoImagePlugin',
'ImImagePlugin',
'ImtImagePlugin',
'IptcImagePlugin',
'JpegImagePlugin',
'Jpeg2KImagePlugin',
'McIdasImagePlugin', 'McIdasImagePlugin',
'MicImagePlugin', 'MicImagePlugin',
'MpegImagePlugin',
'MpoImagePlugin', 'MpoImagePlugin',
'MspImagePlugin', 'MspImagePlugin',
'PalmImagePlugin', 'PalmImagePlugin',
@ -47,16 +51,19 @@ _plugins = ['BmpImagePlugin',
'PcxImagePlugin', 'PcxImagePlugin',
'PdfImagePlugin', 'PdfImagePlugin',
'PixarImagePlugin', 'PixarImagePlugin',
'PngImagePlugin',
'PpmImagePlugin',
'PsdImagePlugin', 'PsdImagePlugin',
'SgiImagePlugin', 'SgiImagePlugin',
'SpiderImagePlugin',
'SunImagePlugin', 'SunImagePlugin',
'TgaImagePlugin',
'TiffImagePlugin',
'WebPImagePlugin',
'WmfImagePlugin', 'WmfImagePlugin',
'XbmImagePlugin', 'XbmImagePlugin',
'XpmImagePlugin', 'XpmImagePlugin',
'XVThumbImagePlugin'] 'XVThumbImagePlugin',
#no _accept function
'ImImagePlugin',
'ImtImagePlugin',
'IptcImagePlugin',
'MpegImagePlugin',
'SpiderImagePlugin',
'TgaImagePlugin',
]