diff -r 69bdf8bdfd61 Lib/imghdr.py --- a/Lib/imghdr.py Thu Nov 10 13:28:03 2016 -0500 +++ b/Lib/imghdr.py Thu Nov 10 17:12:16 2016 -0400 @@ -36,7 +36,7 @@ def test_jpeg(h, f): """JPEG data in JFIF or Exif format""" - if h[6:10] in (b'JFIF', b'Exif'): + if h[6:10] in (b'JFIF', b'Exif') or h[:2] == b'\xff\xd8': return 'jpeg' tests.append(test_jpeg) diff -r 69bdf8bdfd61 Lib/test/imghdrdata/python1.jpg Binary file Lib/test/imghdrdata/python1.jpg has changed diff -r 69bdf8bdfd61 Lib/test/test_imghdr.py --- a/Lib/test/test_imghdr.py Thu Nov 10 13:28:03 2016 -0500 +++ b/Lib/test/test_imghdr.py Thu Nov 10 17:12:16 2016 -0400 @@ -14,6 +14,7 @@ ('python.pgm', 'pgm'), ('python.pbm', 'pbm'), ('python.jpg', 'jpeg'), + ('python1.jpg', 'jpeg'), ('python.ras', 'rast'), ('python.sgi', 'rgb'), ('python.tiff', 'tiff'),