Commits

Fredrik Lundh committed 454b4d2

Don't try to open files twice if plugins are already loaded.

  • Participants
  • Parent commits 64f9636
  • Tags pil-117-20090317, pil-117a1-20090317

Comments (0)

Files changed (1)

 
     global _initialized
     if _initialized >= 2:
-        return
+        return 0
 
     visited = {}
 
 
     if OPEN or SAVE:
         _initialized = 2
-
+        return 1
 
 # --------------------------------------------------------------------
 # Codec factories (used by tostring/fromstring and ImageFile.load)
         except (SyntaxError, IndexError, TypeError):
             pass
 
-    init()
+    if init():
 
-    for i in ID:
-        try:
-            factory, accept = OPEN[i]
-            if not accept or accept(prefix):
-                fp.seek(0)
-                return factory(fp, filename)
-        except (SyntaxError, IndexError, TypeError):
-            pass
+        for i in ID:
+            try:
+                factory, accept = OPEN[i]
+                if not accept or accept(prefix):
+                    fp.seek(0)
+                    return factory(fp, filename)
+            except (SyntaxError, IndexError, TypeError):
+                pass
 
     raise IOError("cannot identify image file")