reorganize imports to penalize file formats without accept

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
 

PIL/__init__.py

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