Merge 3d35232 into b5d0cf5

PIL/Image.py

@@ -92,7 +92,7 @@ def __getattr__(self, id):
 
 from PIL import ImageMode
 from PIL._binary import i8, o8
-from PIL._util import isPath, isStringType
+from PIL._util import isPath, isStringType, deferred_error
 
 import os, sys
 
@@ -497,6 +497,28 @@ def _new(self, im):
 
     _makeself = _new # compatibility
 
+    # with compatibility
+    def __enter__(self):
+        return self
+    def __exit__(self, *args):
+        self.close()
+
+    def close(self):
+        """ Close the file pointer, if possible. Destroy the image core.
+            This releases memory, and the image will be unusable afterward
+            """
+        try:
+            self.fp.close()
+        except Exception as msg:
+            if Image.DEBUG:
+                print ("Error closing: %s" %msg)
+
+        # Instead of simply setting to None, we're setting up a
+        # deferred error that will better explain that the core image
+        # object is gone.
+        self.im = deferred_error(ValueError("Operation on closed image"))
+
+
     def _copy(self):
         self.load()
         self.im = self.im.copy()

PIL/ImageCms.py

@@ -89,8 +89,8 @@
 except ImportError as ex:
     # Allow error import for doc purposes, but error out when accessing
     # anything in core. 
-    from _util import import_err
-    _imagingcms = import_err(ex)
+    from _util import deferred_error
+    _imagingcms = deferred_error(ex)
 from PIL._util import isStringType
 
 core = _imagingcms

PIL/_util.py

@@ -15,7 +15,7 @@ def isPath(f):
 def isDirectory(f):
     return isPath(f) and os.path.isdir(f)
 
-class import_err(object):
+class deferred_error(object):
     def __init__(self, ex):
         self.ex = ex
     def __getattr__(self, elt):