From 2f60820f4c1bdfce75f30ddc53d97587a3256dcf Mon Sep 17 00:00:00 2001
From: R David Murray <rdmurray@bitdance.com>
Date: Thu, 26 Jun 2014 12:27:57 -0400
Subject: [PATCH] #20295: Teach imghdr to recognize OpenEXR format images.

Patch by Martin Vignali, test by Claudiu Popa.
---
 Doc/library/imghdr.rst         |   5 +++++
 Doc/whatsnew/3.5.rst           |   6 ++++++
 Lib/imghdr.py                  |   6 ++++++
 Lib/test/imghdrdata/python.exr | Bin 0 -> 2635 bytes
 Lib/test/test_imghdr.py        |   1 +
 Misc/NEWS                      |   2 ++
 6 files changed, 20 insertions(+)
 create mode 100644 Lib/test/imghdrdata/python.exr

diff --git a/Doc/library/imghdr.rst b/Doc/library/imghdr.rst
index 06faa883d3f8..c60df24c5a17 100644
--- 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
index 1b4253ce7280..9fff48cf55f9 100644
--- 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
index fe77e495fb6a..b26792539d5b 100644
--- 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
new file mode 100644
index 0000000000000000000000000000000000000000..773c81ee1fb850cdbb6cccd3ae5edabb80146481
GIT binary patch
literal 2635
zc-p;|OK2NM7{|ws9&uwQJ-GIvd6eQfHgzm%ceFb*t0bhgEea`tRK}M!MYSYHph(72
z+!T@$D6)J>DHO-P^Z~_|Pi>*d$t8)QC^D2jE^Z7Z=}ESswDrYtq0si5*^yQ&sqL*Z
zEZ=$_-~9GJ{~3AO<7;U}2#sF~CzH`c8eS6dbOyZ)ZD&ynGE0kmUTkOyHnd!5XhGwt
z%ac>lbUL0&+TKNHB%BG4#gmcLTj<TyRV9v|Mpii_pGZ7CnFzoApW_noWc2)0Bsx{|
zCRUk@UyUZtrYEE0nG4}eJcVM3R5*hiV)l(Q>G7#(G-;-PDVof{v}q-V_SY;?J7g>#
z$y};SfxedC{c5Wjf0S{2pBaCaF>TI3f5`Z*(~JjPX8b_LXWeG}RK^!1&6hG7ZD#zc
z&4Rp91ALvP3>4sX)tDnQ{jTSct+?0^bctT3r|2#z5Y$i-1e3#LTc6dt^_<q&U&f0#
zi-)iS&#GIB)!tIaVKP*z(>K#^&$CHU;5r?q&(KF?u?a_rpuq3?f*#cOwD~3+MT`O=
z+=<uJpjxWoX#H1?PCR_lp64EYkB-tK^cPU08OH!|kURRA?$+~7Ip%N#_W;ENs8P$Y
zugbBlJ81{3a0=ELr6xxfy9O&Gd)c3K1$Lx^7D$%d1qwUIH4-8NWCN5aX)&z?6n2g>
zF2asrysVx8CEW1TayTT%uhgzYg@gN~lQ{b|c91<5&hS$w{YFr5j#2+2d>ukJNrDW4
zGd92(y8cj5aE@-{H}*M0=(v9u7o;;x63G$RF}^nta#r+cLa{<I<}qbty+_$5{fu&F
zbO>kg8UT(0>^0AKjhrJr#Bv6&F5uW>4+V$Q&(+}0SQgIUbwn}O-2o2QKX9xXD|8nR
z5%aHQ^$ER4XM{7#!WnadA_RNAr7ZandX3nfkrNctKyjOW3>@p&?u@*kn2=`^A$J|e
z3Vk5RGeCY@Tb1J?_*;65zD`fl4@n4D&jyTft4qF!7p9YTvZhby^IC6p*N?LA*nOaQ
z2RIfXBgWfYiK^qejh!mTe#v33I7-XdPb;fi+GOx8;f$N0!IqZSy0k0)b@)2B`oNd<
z^33hR8PlM_A>+KE8^?^l*iVw;B5*{6Gx!cJSgXs*_oYp8+-E`!|3^*y+QmBY72%8m
z-h-21Qeb>SP`Eug;Mfq(7*UQHZy0B66ftl(LRdJ%?fJrJ%>M~+JS92y#2yrIGrunD
zIpql4TxC$Br1feu{<5Ih6clbxb^xI<I3;c!p+<@rTZefL;m_vhp$j+<NDfC|k9Sth
zD`w9qeWh9#^iJ&XR&NnOv8?8lVPB8eHRu}T6jm`QPP0MQ#h%c|P#@WEJCQ#Ks#U7S
zcyoJ&<GE~KaR74G-KTkF#y9J+Zg);GgoCO}Sp+Q_?@LRI94OJ)U#CU2bkyDJwH{qH
z92ivZa~^jbwr)j}qUc2d%lTH>1Bw#M0|g3PY{F6NQSQ%5IatS0#4%>Fl-M18Lba<7
zx4+7LQ3NeU2J8EH$$=8{LW|SvZj;}i_l*sCUN#IDv;Xf?%i-t?dh$vSoc0i$$~BLp
I5B)FYZ}0KvRR910

literal 0
Hc-jL100001

diff --git a/Lib/test/test_imghdr.py b/Lib/test/test_imghdr.py
index e2a1acab3228..b54daf8e2ca1 100644
--- a/Lib/test/test_imghdr.py
+++ b/Lib/test/test_imghdr.py
@@ -18,6 +18,7 @@ TEST_FILES = (
     ('python.tiff', 'tiff'),
     ('python.xbm', 'xbm'),
     ('python.webp', 'webp'),
+    ('python.exr', 'exr'),
 )
 
 class UnseekableIO(io.FileIO):
diff --git a/Misc/NEWS b/Misc/NEWS
index 9ae200a61e67..1cd7d58ff058 100644
--- 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.
 
-- 
2.47.3