py3k: __builtin__ module is now builtins

PIL/GdImageFile.py

@@ -27,6 +27,12 @@ __version__ = "0.1"
 
 from . import ImageFile, ImagePalette
 
+try:
+    import builtins
+except ImportError:
+    import __builtin__
+    builtins = __builtin__
+
 def i16(c):
     return ord(c[1]) + (ord(c[0])<<8)
 
@@ -73,9 +79,8 @@ def open(fp, mode = "r"):
         raise ValueError("bad mode")
 
     if type(fp) == type(""):
-        import __builtin__
         filename = fp
-        fp = __builtin__.open(fp, "rb")
+        fp = builtins.open(fp, "rb")
     else:
         filename = ""
 

PIL/Image.py

@@ -66,6 +66,12 @@ except ImportError as v:
             RuntimeWarning
             )
 
+try:
+    import builtins
+except ImportError:
+    import __builtin__
+    builtins = __builtin__
+
 from . import ImageMode
 
 import os, sys
@@ -1419,8 +1425,7 @@ class Image:
             save_handler = SAVE[format.upper()] # unknown format
 
         if isStringType(fp):
-            import __builtin__
+            fp = builtins.open(fp, "wb")
-            fp = __builtin__.open(fp, "wb")
             close = 1
         else:
             close = 0
@@ -1937,9 +1942,8 @@ def open(fp, mode="r"):
         raise ValueError("bad mode")
 
     if isStringType(fp):
-        import __builtin__
         filename = fp
-        fp = __builtin__.open(fp, "rb")
+        fp = builtins.open(fp, "rb")
     else:
         filename = ""
 

PIL/ImageMath.py

@@ -19,6 +19,12 @@ from . import Image
 import _imagingmath
 import sys
 
+try:
+    import builtins
+except ImportError:
+    import __builtin__
+    builtins = __builtin__
+
 VERBOSE = 0
 
 def _isconstant(v):
@@ -206,8 +212,7 @@ def eval(expression, _dict={}, **kw):
         if hasattr(v, "im"):
             args[k] = _Operand(v)
 
-    import __builtin__
+    out = builtins.eval(expression, args)
-    out =__builtin__.eval(expression, args)
     try:
         return out.im
     except AttributeError:

PIL/WalImageFile.py

@@ -25,6 +25,12 @@ from __future__ import print_function
 
 from . import Image
 
+try:
+    import builtins
+except ImportError:
+    import __builtin__
+    builtins = __builtin__
+
 def i32(c, o=0):
     return ord(c[o])+(ord(c[o+1])<<8)+(ord(c[o+2])<<16)+(ord(c[o+3])<<24)
 
@@ -44,8 +50,7 @@ def open(filename):
     if hasattr(filename, "read"):
         fp = filename
     else:
-        import __builtin__
+        fp = builtins.open(filename, "rb")
-        fp = __builtin__.open(filename, "rb")
 
     # read header fields
     header = fp.read(32+24+32+12)