reorganize imports to penalize file formats without accept

This commit is contained in:
wiredfool 2016-11-22 03:36:16 -08:00
parent 76d156bef0
commit de4313f00b
2 changed files with 56 additions and 54 deletions

View File

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

View File

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