[Python-3000-checkins] r65714 - in python/branches/py3k: Lib/imghdr.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Sat Aug 16 18:48:16 2008
New Revision: 65714

Log:
Merged revisions 65713 via svnmerge from
svn+ssh://pythondev at svn.python.org/python/trunk

........
r65713 | benjamin.peterson | 2008-08-16 11:29:02 -0500 (Sat, 16 Aug 2008) | 1 line

#3424 rearrange the order of tests in imghdr to place more common types first
........


Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/imghdr.py

Modified: python/branches/py3k/Lib/imghdr.py
==============================================================================
--- python/branches/py3k/Lib/imghdr.py (original)
+++ python/branches/py3k/Lib/imghdr.py Sat Aug 16 18:48:16 2008
@@ -34,12 +34,18 @@

tests = []

-def test_rgb(h, f):
- """SGI image library"""
- if h.startswith(b'\001\332'):
- return 'rgb'
+def test_jpeg(h, f):
+ """JPEG data in JFIF or Exif format"""
+ if h[6:10] in (b'JFIF', b'Exif'):
+ return 'jpeg'

-tests.append(test_rgb)
+tests.append(test_jpeg)
+
+def test_png(h, f):
+ if h.startswith(b'\211PNG\r\n\032\n'):
+ return 'png'
+
+tests.append(test_png)

def test_gif(h, f):
"""GIF ('87 and '89 variants)"""
@@ -48,6 +54,20 @@

tests.append(test_gif)

+def test_tiff(h, f):
+ """TIFF (can be in Motorola or Intel byte order)"""
+ if h[:2] in (b'MM', b'II'):
+ return 'tiff'
+
+tests.append(test_tiff)
+
+def test_rgb(h, f):
+ """SGI image library"""
+ if h.startswith(b'\001\332'):
+ return 'rgb'
+
+tests.append(test_rgb)
+
def test_pbm(h, f):
"""PBM (portable bitmap)"""
if len(h) >= 3 and \
@@ -72,13 +92,6 @@

tests.append(test_ppm)

-def test_tiff(h, f):
- """TIFF (can be in Motorola or Intel byte order)"""
- if h[:2] in (b'MM', b'II'):
- return 'tiff'
-
-tests.append(test_tiff)
-
def test_rast(h, f):
"""Sun raster file"""
if h.startswith(b'\x59\xA6\x6A\x95'):
@@ -93,25 +106,12 @@

tests.append(test_xbm)

-def test_jpeg(h, f):
- """JPEG data in JFIF or Exif format"""
- if h[6:10] in (b'JFIF', b'Exif'):
- return 'jpeg'
-
-tests.append(test_jpeg)
-
def test_bmp(h, f):
if h.startswith(b'BM'):
return 'bmp'

tests.append(test_bmp)

-def test_png(h, f):
- if h.startswith(b'\211PNG\r\n\032\n'):
- return 'png'
-
-tests.append(test_png)
-
#--------------------#
# Small test program #
#--------------------#