#20295: Teach imghdr to recognize OpenEXR format images.

bitdancer · bitdancer · commit 2f60820f4c1b · 2014-06-26T12:27:57.000-04:00
Patch by Martin Vignali, test by Claudiu Popa.
diff --git a/Doc/library/imghdr.rst b/Doc/library/imghdr.rst
@@ -50,6 +50,11 @@ from :func:`what`:
 +------------+-----------------------------------+
 | ``'webp'`` | WebP files                        |
 +------------+-----------------------------------+
+| ``'exr'``  | OpenEXR Files                     |
++------------+-----------------------------------+
+
+.. versionadded:: 3.5
+   The *exr* format was added.
 
 .. versionchanged:: 3.5
    The *webp* type was added.
diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst
@@ -141,6 +141,12 @@ doctest
   *module* contains no docstrings instead of raising :exc:`ValueError`
   (contributed by Glenn Jones in :issue:`15916`).
 
+imghdr
+------
+
+* :func:`~imghdr.what` now recognizes the `OpenEXR <http://www.openexr.com>`_
+  format (contributed by Martin vignali and Cladui Popa in :issue:`20295`).
+
 importlib
 ---------
 
diff --git a/Lib/imghdr.py b/Lib/imghdr.py
@@ -116,6 +116,12 @@ def test_webp(h, f):
 
 tests.append(test_webp)
 
+def test_exr(h, f):
+    if h.startswith(b'\x76\x2f\x31\x01'):
+        return 'exr'
+
+tests.append(test_exr)
+
 #--------------------#
 # Small test program #
 #--------------------#
diff --git a/Lib/test/imghdrdata/python.exr b/Lib/test/imghdrdata/python.exr
diff --git a/Lib/test/test_imghdr.py b/Lib/test/test_imghdr.py
@@ -18,6 +18,7 @@
     ('python.tiff', 'tiff'),
     ('python.xbm', 'xbm'),
     ('python.webp', 'webp'),
+    ('python.exr', 'exr'),
 )
 
 class UnseekableIO(io.FileIO):
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -103,6 +103,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #20295: imghdr now recognizes OpenEXR format images.
+
 - Issue #21729: Used the "with" statement in the dbm.dumb module to ensure
   files closing.  Patch by Claudiu Popa.
 

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`('python.tiff', 'tiff'),`
`19`	`19`	`('python.xbm', 'xbm'),`
`20`	`20`	`('python.webp', 'webp'),`
	`21`	`+ ('python.exr', 'exr'),`
`21`	`22`	`)`
`22`	`23`
`23`	`24`	`class UnseekableIO(io.FileIO):`