diff --git a/PIL/Image.py b/PIL/Image.py index 000757594..58cbf6772 100644 --- a/PIL/Image.py +++ b/PIL/Image.py @@ -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 diff --git a/PIL/__init__.py b/PIL/__init__.py index be672e825..da9d7188c 100644 --- a/PIL/__init__.py +++ b/PIL/__init__.py @@ -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', + ]