You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

156 lines
3.4 KiB

35 years ago
35 years ago
35 years ago
Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r65012 | jesse.noller | 2008-07-16 15:24:06 +0200 (Wed, 16 Jul 2008) | 2 lines Apply patch for issue 3090: ARCHFLAGS parsing incorrect ........ r65035 | georg.brandl | 2008-07-16 23:19:28 +0200 (Wed, 16 Jul 2008) | 2 lines #3045: fix pydoc behavior for TEMP path with spaces. ........ r65037 | georg.brandl | 2008-07-16 23:31:41 +0200 (Wed, 16 Jul 2008) | 2 lines #1608818: errno can get set by every call to readdir(). ........ r65038 | georg.brandl | 2008-07-17 00:04:20 +0200 (Thu, 17 Jul 2008) | 2 lines #3305: self->stream can be NULL. ........ r65039 | georg.brandl | 2008-07-17 00:09:17 +0200 (Thu, 17 Jul 2008) | 2 lines #3345: fix docstring. ........ r65040 | georg.brandl | 2008-07-17 00:33:18 +0200 (Thu, 17 Jul 2008) | 2 lines #3312: fix two sqlite3 crashes. ........ r65048 | georg.brandl | 2008-07-17 01:35:54 +0200 (Thu, 17 Jul 2008) | 2 lines #3388: add a paragraph about using "with" for file objects. ........ r65057 | gregory.p.smith | 2008-07-17 05:13:05 +0200 (Thu, 17 Jul 2008) | 2 lines news note for r63052 ........ r65077 | jesse.noller | 2008-07-17 23:01:05 +0200 (Thu, 17 Jul 2008) | 3 lines Fix issue 3395, update _debugInfo to be _debug_info ........ r65091 | ronald.oussoren | 2008-07-18 07:48:03 +0200 (Fri, 18 Jul 2008) | 2 lines Last bit of a fix for issue3381 (addon for my patch in r65061) ........ r65092 | vinay.sajip | 2008-07-18 10:59:06 +0200 (Fri, 18 Jul 2008) | 1 line Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch. ........ r65093 | vinay.sajip | 2008-07-18 11:00:00 +0200 (Fri, 18 Jul 2008) | 1 line Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch. ........ r65094 | vinay.sajip | 2008-07-18 11:00:35 +0200 (Fri, 18 Jul 2008) | 1 line Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch. ........ r65095 | vinay.sajip | 2008-07-18 11:01:10 +0200 (Fri, 18 Jul 2008) | 1 line Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch. ........ r65097 | georg.brandl | 2008-07-18 12:20:59 +0200 (Fri, 18 Jul 2008) | 2 lines Remove duplicate entry in __all__. ........ r65098 | georg.brandl | 2008-07-18 12:29:30 +0200 (Fri, 18 Jul 2008) | 2 lines Correct attribute name. ........ r65099 | georg.brandl | 2008-07-18 13:15:06 +0200 (Fri, 18 Jul 2008) | 3 lines Document the different meaning of precision for {:f} and {:g}. Also document how inf and nan are formatted. #3404. ........ r65127 | raymond.hettinger | 2008-07-19 02:42:03 +0200 (Sat, 19 Jul 2008) | 1 line Improve accuracy of gamma test function ........ r65128 | raymond.hettinger | 2008-07-19 02:43:00 +0200 (Sat, 19 Jul 2008) | 1 line Add recipe to the itertools docs. ........ r65131 | georg.brandl | 2008-07-19 12:08:55 +0200 (Sat, 19 Jul 2008) | 2 lines #3378: in case of no memory, don't leak even more memory. :) ........ r65133 | georg.brandl | 2008-07-19 14:39:10 +0200 (Sat, 19 Jul 2008) | 3 lines #3302: fix segfaults when passing None for arguments that can't be NULL for the C functions. ........ r65134 | georg.brandl | 2008-07-19 14:46:12 +0200 (Sat, 19 Jul 2008) | 2 lines #3303: fix crash with invalid Py_DECREF in strcoll(). ........ r65135 | georg.brandl | 2008-07-19 15:00:22 +0200 (Sat, 19 Jul 2008) | 3 lines #3319: don't raise ZeroDivisionError if number of rounds is so low that benchtime is zero. ........ r65136 | georg.brandl | 2008-07-19 15:09:42 +0200 (Sat, 19 Jul 2008) | 3 lines #3323: mention that if inheriting from a class without __slots__, the subclass will have a __dict__ available too. ........ r65139 | georg.brandl | 2008-07-19 15:48:44 +0200 (Sat, 19 Jul 2008) | 2 lines Add ordering info for findall and finditer. ........ r65149 | raymond.hettinger | 2008-07-20 01:21:57 +0200 (Sun, 20 Jul 2008) | 1 line Fix compress() recipe in docs to use itertools. ........ r65150 | raymond.hettinger | 2008-07-20 01:58:47 +0200 (Sun, 20 Jul 2008) | 1 line Clean-up itertools docs and recipes. ........ r65151 | gregory.p.smith | 2008-07-20 02:22:08 +0200 (Sun, 20 Jul 2008) | 9 lines fix issue3120 - don't truncate handles on 64-bit Windows. This is still messy, realistically PC/_subprocess.c should never cast pointers to python numbers and back at all. I don't have a 64-bit windows build environment because microsoft apparently thinks that should cost money. Time to watch the buildbots. It builds and passes tests on 32-bit windows. ........ r65155 | georg.brandl | 2008-07-20 13:50:29 +0200 (Sun, 20 Jul 2008) | 2 lines #926501: add info where to put the docstring. ........ r65158 | neal.norwitz | 2008-07-20 21:35:23 +0200 (Sun, 20 Jul 2008) | 1 line Fix a couple of names in error messages that were wrong ........ r65159 | neal.norwitz | 2008-07-20 22:39:36 +0200 (Sun, 20 Jul 2008) | 1 line Fix misspeeld method name (negative) ........ r65176 | amaury.forgeotdarc | 2008-07-21 23:36:24 +0200 (Mon, 21 Jul 2008) | 4 lines Increment version number in NEWS file, and move items that were added after 2.6b2. (I thought there was a script to automate this kind of updates) ........ r65177 | amaury.forgeotdarc | 2008-07-22 00:00:38 +0200 (Tue, 22 Jul 2008) | 5 lines Issue2378: pdb would delete free variables when stepping into a class statement. The problem was introduced by r53954, the correction is to restore the symmetry between PyFrame_FastToLocals and PyFrame_LocalsToFast ........ r65178 | benjamin.peterson | 2008-07-22 00:05:34 +0200 (Tue, 22 Jul 2008) | 1 line don't use assert statement ........ r65183 | ronald.oussoren | 2008-07-22 09:06:00 +0200 (Tue, 22 Jul 2008) | 2 lines Fix buglet in fix for issue3381 ........ r65184 | ronald.oussoren | 2008-07-22 09:06:33 +0200 (Tue, 22 Jul 2008) | 2 lines Fix build issue on OSX 10.4, somehow this wasn't committed before. ........ r65187 | raymond.hettinger | 2008-07-22 20:54:02 +0200 (Tue, 22 Jul 2008) | 1 line Remove out-of-date section on Exact/Inexact. ........ r65188 | raymond.hettinger | 2008-07-22 21:00:47 +0200 (Tue, 22 Jul 2008) | 1 line Tuples now have both count() and index(). ........ r65189 | raymond.hettinger | 2008-07-22 21:03:05 +0200 (Tue, 22 Jul 2008) | 1 line Fix credits for math.sum() ........ r65190 | raymond.hettinger | 2008-07-22 21:18:50 +0200 (Tue, 22 Jul 2008) | 1 line One more attribution. ........ r65192 | benjamin.peterson | 2008-07-23 01:44:37 +0200 (Wed, 23 Jul 2008) | 1 line remove unneeded import ........ r65194 | benjamin.peterson | 2008-07-23 15:25:06 +0200 (Wed, 23 Jul 2008) | 1 line use isinstance ........
18 years ago
35 years ago
35 years ago
35 years ago
35 years ago
35 years ago
35 years ago
35 years ago
35 years ago
35 years ago
  1. """Recognize image file formats based on their first few bytes."""
  2. __all__ = ["what"]
  3. #-------------------------#
  4. # Recognize image headers #
  5. #-------------------------#
  6. def what(file, h=None):
  7. if h is None:
  8. if isinstance(file, str):
  9. f = open(file, 'rb')
  10. h = f.read(32)
  11. else:
  12. location = file.tell()
  13. h = file.read(32)
  14. file.seek(location)
  15. f = None
  16. else:
  17. f = None
  18. try:
  19. for tf in tests:
  20. res = tf(h, f)
  21. if res:
  22. return res
  23. finally:
  24. if f: f.close()
  25. return None
  26. #---------------------------------#
  27. # Subroutines per image file type #
  28. #---------------------------------#
  29. tests = []
  30. def test_jpeg(h, f):
  31. """JPEG data in JFIF or Exif format"""
  32. if h[6:10] in (b'JFIF', b'Exif'):
  33. return 'jpeg'
  34. tests.append(test_jpeg)
  35. def test_png(h, f):
  36. if h.startswith(b'\211PNG\r\n\032\n'):
  37. return 'png'
  38. tests.append(test_png)
  39. def test_gif(h, f):
  40. """GIF ('87 and '89 variants)"""
  41. if h[:6] in (b'GIF87a', b'GIF89a'):
  42. return 'gif'
  43. tests.append(test_gif)
  44. def test_tiff(h, f):
  45. """TIFF (can be in Motorola or Intel byte order)"""
  46. if h[:2] in (b'MM', b'II'):
  47. return 'tiff'
  48. tests.append(test_tiff)
  49. def test_rgb(h, f):
  50. """SGI image library"""
  51. if h.startswith(b'\001\332'):
  52. return 'rgb'
  53. tests.append(test_rgb)
  54. def test_pbm(h, f):
  55. """PBM (portable bitmap)"""
  56. if len(h) >= 3 and \
  57. h[0] == ord(b'P') and h[1] in b'14' and h[2] in b' \t\n\r':
  58. return 'pbm'
  59. tests.append(test_pbm)
  60. def test_pgm(h, f):
  61. """PGM (portable graymap)"""
  62. if len(h) >= 3 and \
  63. h[0] == ord(b'P') and h[1] in b'25' and h[2] in b' \t\n\r':
  64. return 'pgm'
  65. tests.append(test_pgm)
  66. def test_ppm(h, f):
  67. """PPM (portable pixmap)"""
  68. if len(h) >= 3 and \
  69. h[0] == ord(b'P') and h[1] in b'36' and h[2] in b' \t\n\r':
  70. return 'ppm'
  71. tests.append(test_ppm)
  72. def test_rast(h, f):
  73. """Sun raster file"""
  74. if h.startswith(b'\x59\xA6\x6A\x95'):
  75. return 'rast'
  76. tests.append(test_rast)
  77. def test_xbm(h, f):
  78. """X bitmap (X10 or X11)"""
  79. if h.startswith(b'#define '):
  80. return 'xbm'
  81. tests.append(test_xbm)
  82. def test_bmp(h, f):
  83. if h.startswith(b'BM'):
  84. return 'bmp'
  85. tests.append(test_bmp)
  86. #--------------------#
  87. # Small test program #
  88. #--------------------#
  89. def test():
  90. import sys
  91. recursive = 0
  92. if sys.argv[1:] and sys.argv[1] == '-r':
  93. del sys.argv[1:2]
  94. recursive = 1
  95. try:
  96. if sys.argv[1:]:
  97. testall(sys.argv[1:], recursive, 1)
  98. else:
  99. testall(['.'], recursive, 1)
  100. except KeyboardInterrupt:
  101. sys.stderr.write('\n[Interrupted]\n')
  102. sys.exit(1)
  103. def testall(list, recursive, toplevel):
  104. import sys
  105. import os
  106. for filename in list:
  107. if os.path.isdir(filename):
  108. print(filename + '/:', end=' ')
  109. if recursive or toplevel:
  110. print('recursing down:')
  111. import glob
  112. names = glob.glob(os.path.join(filename, '*'))
  113. testall(names, recursive, 0)
  114. else:
  115. print('*** directory (use -r) ***')
  116. else:
  117. print(filename + ':', end=' ')
  118. sys.stdout.flush()
  119. try:
  120. print(what(filename))
  121. except IOError:
  122. print('*** not found ***')
  123. if __name__ == '__main__':
  124. test()