From 05b55e76f07805af719f53d9c832871774a855aa Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Wed, 3 Jun 1992 16:48:44 +0000 Subject: [PATCH] Fix pnm test for short files and add X bitmap as recognized type --- Lib/imghdr.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Lib/imghdr.py b/Lib/imghdr.py index b653cded2fd..981340fff07 100644 --- a/Lib/imghdr.py +++ b/Lib/imghdr.py @@ -37,7 +37,8 @@ tests.append(test_gif) def test_pnm(h, f): # PBM, PGM, PPM (portable {bit,gray,pix}map; together portable anymap) - if h[0] == 'P' and h[1] in '123456' and h[2] in ' \t\n\r': + if len(h) >= 3 and \ + h[0] == 'P' and h[1] in '123456' and h[2] in ' \t\n\r': return 'pnm' tests.append(test_pnm) @@ -56,6 +57,14 @@ def test_rast(h, f): tests.append(test_rast) +def test_xbm(h, f): + # X bitmap (X10 or X11) + s = '#define ' + if h[:len(s)] == s: + return 'xbm' + +tests.append(test_xbm) + #--------------------# # Small test program #