From fa348ee9fe4de303ab5e03ef50795496d403fb1d Mon Sep 17 00:00:00 2001
From: Brian Crowell <brian@fluggo.com>
Date: Tue, 16 Oct 2012 21:56:20 -0500
Subject: [PATCH] py3k: __builtin__ module is now builtins

---
 PIL/GdImageFile.py  |  9 +++++++--
 PIL/Image.py        | 12 ++++++++----
 PIL/ImageMath.py    |  9 +++++++--
 PIL/WalImageFile.py |  9 +++++++--
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/PIL/GdImageFile.py b/PIL/GdImageFile.py
index e211d3528..0aebe857c 100644
--- a/PIL/GdImageFile.py
+++ b/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 = ""
 
diff --git a/PIL/Image.py b/PIL/Image.py
index ddd9fb8cc..f2a7de141 100644
--- a/PIL/Image.py
+++ b/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 = __builtin__.open(fp, "wb")
+            fp = builtins.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 = ""
 
diff --git a/PIL/ImageMath.py b/PIL/ImageMath.py
index f43501400..86f6bdeab 100644
--- a/PIL/ImageMath.py
+++ b/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 =__builtin__.eval(expression, args)
+    out = builtins.eval(expression, args)
     try:
         return out.im
     except AttributeError:
diff --git a/PIL/WalImageFile.py b/PIL/WalImageFile.py
index 16c2d90d5..d67d6d62d 100644
--- a/PIL/WalImageFile.py
+++ b/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 = __builtin__.open(filename, "rb")
+        fp = builtins.open(filename, "rb")
 
     # read header fields
     header = fp.read(32+24+32+12)