Activated MPO detection.

Added MPO to the list to be checked. Removed the superfluous second os import. Added OS X & Komodo work files to .gitignore.
HansBug · Jul 17, 2014 · 5857053 · 5857053
1 parent 53b7f62
commit 5857053
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -60,3 +60,9 @@ docs/_build/
 \#*#
 .#*
 
+#Komodo
+*.komodoproject
+
+#OS
+.DS_Store
+
diff --git a/PIL/Image.py b/PIL/Image.py
@@ -352,6 +352,10 @@ def preinit():
         from PIL import JpegImagePlugin
     except ImportError:
         pass
+    try:
+        from PIL import MpoImagePlugin
+    except ImportError:
+        pass
     try:
         from PIL import PpmImagePlugin
     except ImportError:
@@ -554,7 +558,6 @@ def _copy(self):
         self.readonly = 0
 
     def _dump(self, file=None, format=None):
-        import os
         import tempfile
         suffix = ''
         if format:
@@ -2228,6 +2231,7 @@ def open(fp, mode="r"):
 
     for i in ID:
         try:
+            print(ID)
             factory, accept = OPEN[i]
             if not accept or accept(prefix):
                 fp.seek(0)
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,3 +60,9 @@ docs/_build/ @@
     \#*#
     .#*
+    #Komodo
+    *.komodoproject
+    #OS
+    .DS_Store