python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-08-18 03:04:45 +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
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

95
PIL/__init__.py
View File

@ -16,47 +16,54 @@ PILLOW_VERSION = '4.1.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',
]