mirror of
https://github.com/python/cpython.git
synced 2025-09-01 06:28:36 +00:00

svn+ssh://pythondev@svn.python.org/python/trunk ........ r53012 | walter.doerwald | 2006-12-12 22:55:31 +0100 (Tue, 12 Dec 2006) | 2 lines Fix typo. ........ r53023 | brett.cannon | 2006-12-13 23:31:37 +0100 (Wed, 13 Dec 2006) | 2 lines Remove an unneeded import of 'warnings'. ........ r53025 | brett.cannon | 2006-12-14 00:02:38 +0100 (Thu, 14 Dec 2006) | 2 lines Remove unneeded imports of 'warnings'. ........ r53026 | brett.cannon | 2006-12-14 00:09:53 +0100 (Thu, 14 Dec 2006) | 4 lines Add test.test_support.guard_warnings_filter . This function returns a context manager that protects warnings.filter from being modified once the context is exited. ........ r53029 | george.yoshida | 2006-12-14 03:22:44 +0100 (Thu, 14 Dec 2006) | 2 lines Note that guard_warnings_filter was added in 2.6 ........ r53031 | vinay.sajip | 2006-12-14 09:53:55 +0100 (Thu, 14 Dec 2006) | 1 line Added news on recent changes to logging ........ r53032 | andrew.kuchling | 2006-12-14 19:57:53 +0100 (Thu, 14 Dec 2006) | 1 line [Patch #1599256 from David Watson] check that os.fsync is available before using it ........ r53042 | kurt.kaiser | 2006-12-15 06:13:11 +0100 (Fri, 15 Dec 2006) | 6 lines 1. Avoid hang when encountering a duplicate in a completion list. Bug 1571112. 2. Duplicate some old entries from Python's NEWS to IDLE's NEWS.txt M AutoCompleteWindow.py M NEWS.txt ........ r53048 | andrew.kuchling | 2006-12-18 18:12:31 +0100 (Mon, 18 Dec 2006) | 1 line [Bug #1618083] Add missing word; make a few grammar fixes ........ r53050 | andrew.kuchling | 2006-12-18 18:16:05 +0100 (Mon, 18 Dec 2006) | 1 line Bump version ........ r53051 | andrew.kuchling | 2006-12-18 18:22:07 +0100 (Mon, 18 Dec 2006) | 1 line [Bug #1616726] Fix description of generator.close(); if you raise some random exception, the exception is raised and doesn't trigger a RuntimeError ........ r53052 | andrew.kuchling | 2006-12-18 18:38:14 +0100 (Mon, 18 Dec 2006) | 1 line Describe new methods in Queue module ........ r53053 | andrew.kuchling | 2006-12-18 20:22:24 +0100 (Mon, 18 Dec 2006) | 1 line [Patch #1615868 by Lars Gustaebel] Use Py_off_t to fix BZ2File.seek() for offsets > 2Gb ........ r53057 | andrew.kuchling | 2006-12-18 22:29:07 +0100 (Mon, 18 Dec 2006) | 1 line Fix markup ........ r53063 | thomas.wouters | 2006-12-19 09:17:50 +0100 (Tue, 19 Dec 2006) | 5 lines Make sre's SubPattern objects accept slice objects like it already accepts simple slices. ........ r53065 | andrew.kuchling | 2006-12-19 15:13:05 +0100 (Tue, 19 Dec 2006) | 6 lines [Patch #1618455 by Ben Maurer] Improve speed of HMAC by using str.translate() instead of a more general XOR that has to construct a list. Slightly modified from Maurer's patch: the _strxor() function is no longer necessary at all. ........ r53066 | andrew.kuchling | 2006-12-19 15:28:23 +0100 (Tue, 19 Dec 2006) | 9 lines [Bug #1613651] Document socket.recv_into, socket.recvfrom_into Also, the text for recvfrom told you to read recv() for an explanation of the 'flags' argument, but recv() just pointed you at the man page. Copied the man-page text to recvfrom(), recvfrom_into, recv_into to avoid the pointless redirection. I don't have LaTeX on this machine; hope my markup is OK. ........ r53067 | andrew.kuchling | 2006-12-19 15:29:04 +0100 (Tue, 19 Dec 2006) | 1 line Comment typo ........ r53068 | andrew.kuchling | 2006-12-19 16:11:41 +0100 (Tue, 19 Dec 2006) | 1 line [Patch #1617413 from Dug Song] Fix HTTP Basic authentication via HTTPS ........ r53071 | andrew.kuchling | 2006-12-19 16:18:12 +0100 (Tue, 19 Dec 2006) | 1 line [Patch #1600491 from Jim Jewett] Describe how to build help files on Windows ........ r53073 | andrew.kuchling | 2006-12-19 16:43:10 +0100 (Tue, 19 Dec 2006) | 6 lines [Patch #1587139 by kxroberto] Protect lock acquisition/release with try...finally to ensure the lock is always released. This could use the 'with' statement, but the patch uses 'finally'. 2.5 backport candidate. ........ r53074 | vinay.sajip | 2006-12-19 19:29:11 +0100 (Tue, 19 Dec 2006) | 1 line Updated documentation for findCaller() to indicate that a 3-tuple is now returned, rather than a 2-tuple. ........ r53090 | georg.brandl | 2006-12-19 23:06:46 +0100 (Tue, 19 Dec 2006) | 3 lines Patch #1484695: The tarfile module now raises a HeaderError exception if a buffer given to frombuf() is invalid. ........ r53099 | raymond.hettinger | 2006-12-20 07:42:06 +0100 (Wed, 20 Dec 2006) | 5 lines Bug #1590891: random.randrange don't return correct value for big number Needs to be backported. ........ r53106 | georg.brandl | 2006-12-20 12:55:16 +0100 (Wed, 20 Dec 2006) | 3 lines Testcase for patch #1484695. ........ r53110 | andrew.kuchling | 2006-12-20 20:48:20 +0100 (Wed, 20 Dec 2006) | 17 lines [Apply length-checking.diff from bug #1599254] Add length checking to single-file mailbox formats: before doing a flush() on a mailbox, seek to the end and verify its length is unchanged, raising ExternalClashError if the file's length has changed. This fix avoids potential data loss if some other process appends to the mailbox file after the table of contents has been generated; instead of overwriting the modified file, you'll get the exception. I also noticed that the self._lookup() call in self.flush() wasn't necessary (everything that sets self._pending to True also calls self.lookup()), and replaced it by an assertion. 2.5 backport candidate. ........ r53112 | andrew.kuchling | 2006-12-20 20:57:10 +0100 (Wed, 20 Dec 2006) | 1 line [Bug #1619674] Make sum() use the term iterable, not sequence ........ r53113 | andrew.kuchling | 2006-12-20 20:58:11 +0100 (Wed, 20 Dec 2006) | 1 line Two grammar fixes ........ r53115 | andrew.kuchling | 2006-12-20 21:11:12 +0100 (Wed, 20 Dec 2006) | 5 lines Some other built-in functions are described with 'sequence' arguments that should really be 'iterable'; this commit changes them. Did I miss any? Did I introduce any errors? ........ r53117 | andrew.kuchling | 2006-12-20 21:20:42 +0100 (Wed, 20 Dec 2006) | 1 line [Bug #1619680] in_dll() arguments are documented in the wrong order ........ r53120 | neal.norwitz | 2006-12-21 05:38:00 +0100 (Thu, 21 Dec 2006) | 1 line Lars asked for permission on on python-dev for work on tarfile.py ........ r53125 | andrew.kuchling | 2006-12-21 14:40:29 +0100 (Thu, 21 Dec 2006) | 1 line Mention the os.SEEK_* constants ........ r53129 | walter.doerwald | 2006-12-21 19:06:30 +0100 (Thu, 21 Dec 2006) | 2 lines Fix typo. ........ r53131 | thomas.heller | 2006-12-21 19:30:56 +0100 (Thu, 21 Dec 2006) | 3 lines Fix wrong markup of an argument in a method signature. Will backport. ........ r53137 | andrew.kuchling | 2006-12-22 01:50:56 +0100 (Fri, 22 Dec 2006) | 1 line Typo fix ........ r53139 | andrew.kuchling | 2006-12-22 14:25:02 +0100 (Fri, 22 Dec 2006) | 1 line [Bug #737202; fix from Titus Brown] Make CGIHTTPServer work for scripts in sub-directories ........ r53141 | andrew.kuchling | 2006-12-22 16:04:45 +0100 (Fri, 22 Dec 2006) | 6 lines [Bug #802128] Make the mode argument of dumbdbm actually work the way it's described, and add a test for it. 2.5 bugfix candidate, maybe; arguably this patch changes the API of dumbdbm and shouldn't be added in a point-release. ........ r53142 | andrew.kuchling | 2006-12-22 16:16:58 +0100 (Fri, 22 Dec 2006) | 6 lines [Bug #802128 continued] Modify mode depending on the process umask. Is there really no other way to read the umask than to set it? Hope this works on Windows... ........ r53145 | andrew.kuchling | 2006-12-22 17:43:26 +0100 (Fri, 22 Dec 2006) | 1 line [Bug #776202] Apply Walter Doerwald's patch to use text mode for encoded files ........ r53146 | andrew.kuchling | 2006-12-22 19:41:42 +0100 (Fri, 22 Dec 2006) | 9 lines [Patch #783050 from Patrick Lynch] The emulation of forkpty() is incorrect; the master should close the slave fd. Added a test to test_pty.py that reads from the master_fd after doing a pty.fork(); without the fix it hangs forever instead of raising an exception. (<crossing fingers for the buildbots>) 2.5 backport candidate. ........ r53147 | andrew.kuchling | 2006-12-22 20:06:16 +0100 (Fri, 22 Dec 2006) | 1 line [Patch #827559 from Chris Gonnerman] Make SimpleHTTPServer redirect when a directory URL is missing the trailing slash; this lets relative links work. ........ r53149 | andrew.kuchling | 2006-12-22 20:21:27 +0100 (Fri, 22 Dec 2006) | 1 line Darn; this test works when you run test_pty.py directly, but fails when regrtest runs it (the os.read() raises os.error). I can't figure out the cause, so am commenting out the test. ........ r53150 | andrew.kuchling | 2006-12-22 22:48:19 +0100 (Fri, 22 Dec 2006) | 1 line Frak; this test also fails ........ r53153 | lars.gustaebel | 2006-12-23 17:40:13 +0100 (Sat, 23 Dec 2006) | 5 lines Patch #1230446: tarfile.py: fix ExFileObject so that read() and tell() work correctly together with readline(). Will backport to 2.5. ........ r53155 | lars.gustaebel | 2006-12-23 18:57:23 +0100 (Sat, 23 Dec 2006) | 5 lines Patch #1262036: Prevent TarFiles from being added to themselves under certain conditions. Will backport to 2.5. ........ r53159 | andrew.kuchling | 2006-12-27 04:25:31 +0100 (Wed, 27 Dec 2006) | 4 lines [Part of patch #1182394] Move the HMAC blocksize to be a class-level constant; this allows changing it in a subclass. To accommodate this, copy() now uses __class__. Also add some text to a comment. ........ r53160 | andrew.kuchling | 2006-12-27 04:31:24 +0100 (Wed, 27 Dec 2006) | 1 line [Rest of patch #1182394] Add ._current() method so that we can use the written-in-C .hexdigest() method ........ r53161 | lars.gustaebel | 2006-12-27 11:30:46 +0100 (Wed, 27 Dec 2006) | 4 lines Patch #1504073: Fix tarfile.open() for mode "r" with a fileobj argument. Will backport to 2.5. ........ r53165 | neal.norwitz | 2006-12-28 05:39:20 +0100 (Thu, 28 Dec 2006) | 1 line Remove a stray (old) macro name left around (I guess) ........ r53188 | neal.norwitz | 2006-12-29 04:01:53 +0100 (Fri, 29 Dec 2006) | 1 line SF bug #1623890, fix argument name in docstring ........ r53200 | raymond.hettinger | 2006-12-30 05:01:17 +0100 (Sat, 30 Dec 2006) | 1 line For sets with cyclical reprs, emit an ellipsis instead of infinitely recursing. ........ r53232 | brett.cannon | 2007-01-04 01:23:49 +0100 (Thu, 04 Jan 2007) | 3 lines Add EnvironmentVarGuard to test.test_support. Provides a context manager to temporarily set or unset environment variables. ........ r53235 | neal.norwitz | 2007-01-04 07:25:31 +0100 (Thu, 04 Jan 2007) | 1 line SF #1627373, fix typo in CarbonEvt. ........ r53244 | raymond.hettinger | 2007-01-04 18:53:34 +0100 (Thu, 04 Jan 2007) | 1 line Fix stability of heapq's nlargest() and nsmallest(). ........ r53249 | martin.v.loewis | 2007-01-04 22:06:12 +0100 (Thu, 04 Jan 2007) | 3 lines Bug #1566280: Explicitly invoke threading._shutdown from Py_Main, to avoid relying on atexit. Will backport to 2.5. ........ r53252 | gregory.p.smith | 2007-01-05 02:59:42 +0100 (Fri, 05 Jan 2007) | 3 lines Support linking of the bsddb module against BerkeleyDB 4.5.x (will backport to 2.5) ........ r53253 | gregory.p.smith | 2007-01-05 03:06:17 +0100 (Fri, 05 Jan 2007) | 2 lines bump module version to match supported berkeleydb version ........ r53255 | neal.norwitz | 2007-01-05 06:25:22 +0100 (Fri, 05 Jan 2007) | 6 lines Prevent crash on shutdown which can occur if we are finalizing and the module dict has been cleared already and some object raises a warning (like in a __del__). Will backport. ........ r53258 | gregory.p.smith | 2007-01-05 08:21:35 +0100 (Fri, 05 Jan 2007) | 2 lines typo fix ........ r53260 | neal.norwitz | 2007-01-05 09:06:43 +0100 (Fri, 05 Jan 2007) | 1 line Add Collin Winter for access to update PEP 3107 ........ r53262 | andrew.kuchling | 2007-01-05 15:22:17 +0100 (Fri, 05 Jan 2007) | 1 line [Bug #1622533] Make docstrings raw strings because they contain control characters (\0, \1) ........ r53264 | andrew.kuchling | 2007-01-05 16:51:24 +0100 (Fri, 05 Jan 2007) | 1 line [Patch #1520904] Fix bsddb tests to write to the temp directory instead of the Lib/bsddb/test directory ........ r53279 | brett.cannon | 2007-01-05 22:45:09 +0100 (Fri, 05 Jan 2007) | 3 lines Silence a warning from gcc 4.0.1 by specifying a function's parameter list is 'void' instead of just a set of empty parentheses. ........ r53285 | raymond.hettinger | 2007-01-06 02:14:41 +0100 (Sat, 06 Jan 2007) | 2 lines SF# 1409443: Expand comment to cover the interaction between f->f_lasti and the PREDICT macros. ........ r53286 | anthony.baxter | 2007-01-06 05:45:54 +0100 (Sat, 06 Jan 2007) | 1 line update to (c) years to include 2007 ........ r53291 | neal.norwitz | 2007-01-06 22:24:35 +0100 (Sat, 06 Jan 2007) | 1 line Add Josiah to SF for maintaining asyncore/asynchat ........ r53293 | peter.astrand | 2007-01-07 09:53:46 +0100 (Sun, 07 Jan 2007) | 1 line Re-implemented fix for #1531862 once again, in a way that works with Python 2.2. Fixes bug #1603424. ........ r53295 | peter.astrand | 2007-01-07 15:34:16 +0100 (Sun, 07 Jan 2007) | 1 line Avoid O(N**2) bottleneck in _communicate_(). Fixes #1598181. ........ r53300 | raymond.hettinger | 2007-01-08 19:09:20 +0100 (Mon, 08 Jan 2007) | 1 line Fix zero-length corner case for iterating over a mutating deque. ........ r53301 | vinay.sajip | 2007-01-08 19:50:32 +0100 (Mon, 08 Jan 2007) | 4 lines Bare except clause removed from SMTPHandler.emit(). Now, only ImportError is trapped. Bare except clause removed from SocketHandler.createSocket(). Now, only socket.error is trapped. (SF #411881) ........ r53302 | vinay.sajip | 2007-01-08 19:51:46 +0100 (Mon, 08 Jan 2007) | 2 lines Bare except clause removed from LogRecord.__init__. Now, only ValueError, TypeError and AttributeError are trapped. (SF #411881) ........ r53303 | vinay.sajip | 2007-01-08 19:52:36 +0100 (Mon, 08 Jan 2007) | 1 line Added entries about removal of some bare except clauses from logging. ........
614 lines
21 KiB
Python
614 lines
21 KiB
Python
from test.test_support import TestFailed, verbose, verify, vereq
|
|
import test.test_support
|
|
import struct
|
|
import array
|
|
import warnings
|
|
|
|
import sys
|
|
ISBIGENDIAN = sys.byteorder == "big"
|
|
del sys
|
|
verify((struct.pack('=i', 1)[0] == chr(0)) == ISBIGENDIAN,
|
|
"bigendian determination appears wrong")
|
|
|
|
try:
|
|
import _struct
|
|
except ImportError:
|
|
PY_STRUCT_RANGE_CHECKING = 0
|
|
PY_STRUCT_OVERFLOW_MASKING = 1
|
|
PY_STRUCT_FLOAT_COERCE = 2
|
|
else:
|
|
PY_STRUCT_RANGE_CHECKING = getattr(_struct, '_PY_STRUCT_RANGE_CHECKING', 0)
|
|
PY_STRUCT_OVERFLOW_MASKING = getattr(_struct, '_PY_STRUCT_OVERFLOW_MASKING', 0)
|
|
PY_STRUCT_FLOAT_COERCE = getattr(_struct, '_PY_STRUCT_FLOAT_COERCE', 0)
|
|
|
|
def string_reverse(s):
|
|
return "".join(reversed(s))
|
|
|
|
def bigendian_to_native(value):
|
|
if ISBIGENDIAN:
|
|
return value
|
|
else:
|
|
return string_reverse(value)
|
|
|
|
def simple_err(func, *args):
|
|
try:
|
|
func(*args)
|
|
except struct.error:
|
|
pass
|
|
else:
|
|
raise TestFailed, "%s%s did not raise struct.error" % (
|
|
func.__name__, args)
|
|
|
|
def any_err(func, *args):
|
|
try:
|
|
func(*args)
|
|
except (struct.error, TypeError):
|
|
pass
|
|
else:
|
|
raise TestFailed, "%s%s did not raise error" % (
|
|
func.__name__, args)
|
|
|
|
def with_warning_restore(func):
|
|
def _with_warning_restore(*args, **kw):
|
|
with test.test_support.guard_warnings_filter():
|
|
# Grrr, we need this function to warn every time. Without removing
|
|
# the warningregistry, running test_tarfile then test_struct would fail
|
|
# on 64-bit platforms.
|
|
globals = func.func_globals
|
|
if '__warningregistry__' in globals:
|
|
del globals['__warningregistry__']
|
|
warnings.filterwarnings("error", r"""^struct.*""", DeprecationWarning)
|
|
warnings.filterwarnings("error", r""".*format requires.*""",
|
|
DeprecationWarning)
|
|
return func(*args, **kw)
|
|
return _with_warning_restore
|
|
|
|
def deprecated_err(func, *args):
|
|
try:
|
|
func(*args)
|
|
except (struct.error, TypeError):
|
|
pass
|
|
except DeprecationWarning:
|
|
if not PY_STRUCT_OVERFLOW_MASKING:
|
|
raise TestFailed, "%s%s expected to raise struct.error" % (
|
|
func.__name__, args)
|
|
else:
|
|
raise TestFailed, "%s%s did not raise error" % (
|
|
func.__name__, args)
|
|
deprecated_err = with_warning_restore(deprecated_err)
|
|
|
|
|
|
simple_err(struct.calcsize, 'Z')
|
|
|
|
sz = struct.calcsize('i')
|
|
if sz * 3 != struct.calcsize('iii'):
|
|
raise TestFailed, 'inconsistent sizes'
|
|
|
|
fmt = 'cbxxxxxxhhhhiillffd'
|
|
fmt3 = '3c3b18x12h6i6l6f3d'
|
|
sz = struct.calcsize(fmt)
|
|
sz3 = struct.calcsize(fmt3)
|
|
if sz * 3 != sz3:
|
|
raise TestFailed, 'inconsistent sizes (3*%r -> 3*%d = %d, %r -> %d)' % (
|
|
fmt, sz, 3*sz, fmt3, sz3)
|
|
|
|
simple_err(struct.pack, 'iii', 3)
|
|
simple_err(struct.pack, 'i', 3, 3, 3)
|
|
simple_err(struct.pack, 'i', 'foo')
|
|
simple_err(struct.pack, 'P', 'foo')
|
|
simple_err(struct.unpack, 'd', 'flap')
|
|
s = struct.pack('ii', 1, 2)
|
|
simple_err(struct.unpack, 'iii', s)
|
|
simple_err(struct.unpack, 'i', s)
|
|
|
|
c = 'a'
|
|
b = 1
|
|
h = 255
|
|
i = 65535
|
|
l = 65536
|
|
f = 3.1415
|
|
d = 3.1415
|
|
|
|
for prefix in ('', '@', '<', '>', '=', '!'):
|
|
for format in ('xcbhilfd', 'xcBHILfd'):
|
|
format = prefix + format
|
|
if verbose:
|
|
print "trying:", format
|
|
s = struct.pack(format, c, b, h, i, l, f, d)
|
|
cp, bp, hp, ip, lp, fp, dp = struct.unpack(format, s)
|
|
if (cp != c or bp != b or hp != h or ip != i or lp != l or
|
|
int(100 * fp) != int(100 * f) or int(100 * dp) != int(100 * d)):
|
|
# ^^^ calculate only to two decimal places
|
|
raise TestFailed, "unpack/pack not transitive (%s, %s)" % (
|
|
str(format), str((cp, bp, hp, ip, lp, fp, dp)))
|
|
|
|
# Test some of the new features in detail
|
|
|
|
# (format, argument, big-endian result, little-endian result, asymmetric)
|
|
tests = [
|
|
('c', 'a', 'a', 'a', 0),
|
|
('xc', 'a', '\0a', '\0a', 0),
|
|
('cx', 'a', 'a\0', 'a\0', 0),
|
|
('s', 'a', 'a', 'a', 0),
|
|
('0s', 'helloworld', '', '', 1),
|
|
('1s', 'helloworld', 'h', 'h', 1),
|
|
('9s', 'helloworld', 'helloworl', 'helloworl', 1),
|
|
('10s', 'helloworld', 'helloworld', 'helloworld', 0),
|
|
('11s', 'helloworld', 'helloworld\0', 'helloworld\0', 1),
|
|
('20s', 'helloworld', 'helloworld'+10*'\0', 'helloworld'+10*'\0', 1),
|
|
('b', 7, '\7', '\7', 0),
|
|
('b', -7, '\371', '\371', 0),
|
|
('B', 7, '\7', '\7', 0),
|
|
('B', 249, '\371', '\371', 0),
|
|
('h', 700, '\002\274', '\274\002', 0),
|
|
('h', -700, '\375D', 'D\375', 0),
|
|
('H', 700, '\002\274', '\274\002', 0),
|
|
('H', 0x10000-700, '\375D', 'D\375', 0),
|
|
('i', 70000000, '\004,\035\200', '\200\035,\004', 0),
|
|
('i', -70000000, '\373\323\342\200', '\200\342\323\373', 0),
|
|
('I', 70000000L, '\004,\035\200', '\200\035,\004', 0),
|
|
('I', 0x100000000L-70000000, '\373\323\342\200', '\200\342\323\373', 0),
|
|
('l', 70000000, '\004,\035\200', '\200\035,\004', 0),
|
|
('l', -70000000, '\373\323\342\200', '\200\342\323\373', 0),
|
|
('L', 70000000L, '\004,\035\200', '\200\035,\004', 0),
|
|
('L', 0x100000000L-70000000, '\373\323\342\200', '\200\342\323\373', 0),
|
|
('f', 2.0, '@\000\000\000', '\000\000\000@', 0),
|
|
('d', 2.0, '@\000\000\000\000\000\000\000',
|
|
'\000\000\000\000\000\000\000@', 0),
|
|
('f', -2.0, '\300\000\000\000', '\000\000\000\300', 0),
|
|
('d', -2.0, '\300\000\000\000\000\000\000\000',
|
|
'\000\000\000\000\000\000\000\300', 0),
|
|
]
|
|
|
|
for fmt, arg, big, lil, asy in tests:
|
|
if verbose:
|
|
print "%r %r %r %r" % (fmt, arg, big, lil)
|
|
for (xfmt, exp) in [('>'+fmt, big), ('!'+fmt, big), ('<'+fmt, lil),
|
|
('='+fmt, ISBIGENDIAN and big or lil)]:
|
|
res = struct.pack(xfmt, arg)
|
|
if res != exp:
|
|
raise TestFailed, "pack(%r, %r) -> %r # expected %r" % (
|
|
fmt, arg, res, exp)
|
|
n = struct.calcsize(xfmt)
|
|
if n != len(res):
|
|
raise TestFailed, "calcsize(%r) -> %d # expected %d" % (
|
|
xfmt, n, len(res))
|
|
rev = struct.unpack(xfmt, res)[0]
|
|
if rev != arg and not asy:
|
|
raise TestFailed, "unpack(%r, %r) -> (%r,) # expected (%r,)" % (
|
|
fmt, res, rev, arg)
|
|
|
|
###########################################################################
|
|
# Simple native q/Q tests.
|
|
|
|
has_native_qQ = 1
|
|
try:
|
|
struct.pack("q", 5)
|
|
except struct.error:
|
|
has_native_qQ = 0
|
|
|
|
if verbose:
|
|
print "Platform has native q/Q?", has_native_qQ and "Yes." or "No."
|
|
|
|
any_err(struct.pack, "Q", -1) # can't pack -1 as unsigned regardless
|
|
simple_err(struct.pack, "q", "a") # can't pack string as 'q' regardless
|
|
simple_err(struct.pack, "Q", "a") # ditto, but 'Q'
|
|
|
|
def test_native_qQ():
|
|
bytes = struct.calcsize('q')
|
|
# The expected values here are in big-endian format, primarily because
|
|
# I'm on a little-endian machine and so this is the clearest way (for
|
|
# me) to force the code to get exercised.
|
|
for format, input, expected in (
|
|
('q', -1, '\xff' * bytes),
|
|
('q', 0, '\x00' * bytes),
|
|
('Q', 0, '\x00' * bytes),
|
|
('q', 1L, '\x00' * (bytes-1) + '\x01'),
|
|
('Q', (1L << (8*bytes))-1, '\xff' * bytes),
|
|
('q', (1L << (8*bytes-1))-1, '\x7f' + '\xff' * (bytes - 1))):
|
|
got = struct.pack(format, input)
|
|
native_expected = bigendian_to_native(expected)
|
|
verify(got == native_expected,
|
|
"%r-pack of %r gave %r, not %r" %
|
|
(format, input, got, native_expected))
|
|
retrieved = struct.unpack(format, got)[0]
|
|
verify(retrieved == input,
|
|
"%r-unpack of %r gave %r, not %r" %
|
|
(format, got, retrieved, input))
|
|
|
|
if has_native_qQ:
|
|
test_native_qQ()
|
|
|
|
###########################################################################
|
|
# Standard integer tests (bBhHiIlLqQ).
|
|
|
|
import binascii
|
|
|
|
class IntTester:
|
|
|
|
# XXX Most std integer modes fail to test for out-of-range.
|
|
# The "i" and "l" codes appear to range-check OK on 32-bit boxes, but
|
|
# fail to check correctly on some 64-bit ones (Tru64 Unix + Compaq C
|
|
# reported by Mark Favas).
|
|
BUGGY_RANGE_CHECK = "bBhHiIlL"
|
|
|
|
def __init__(self, formatpair, bytesize):
|
|
assert len(formatpair) == 2
|
|
self.formatpair = formatpair
|
|
for direction in "<>!=":
|
|
for code in formatpair:
|
|
format = direction + code
|
|
verify(struct.calcsize(format) == bytesize)
|
|
self.bytesize = bytesize
|
|
self.bitsize = bytesize * 8
|
|
self.signed_code, self.unsigned_code = formatpair
|
|
self.unsigned_min = 0
|
|
self.unsigned_max = 2L**self.bitsize - 1
|
|
self.signed_min = -(2L**(self.bitsize-1))
|
|
self.signed_max = 2L**(self.bitsize-1) - 1
|
|
|
|
def test_one(self, x, pack=struct.pack,
|
|
unpack=struct.unpack,
|
|
unhexlify=binascii.unhexlify):
|
|
if verbose:
|
|
print "trying std", self.formatpair, "on", x, "==", hex(x)
|
|
|
|
# Try signed.
|
|
code = self.signed_code
|
|
if self.signed_min <= x <= self.signed_max:
|
|
# Try big-endian.
|
|
expected = long(x)
|
|
if x < 0:
|
|
expected += 1L << self.bitsize
|
|
assert expected > 0
|
|
expected = hex(expected)[2:] # chop "0x"
|
|
if len(expected) & 1:
|
|
expected = "0" + expected
|
|
expected = unhexlify(expected)
|
|
expected = "\x00" * (self.bytesize - len(expected)) + expected
|
|
|
|
# Pack work?
|
|
format = ">" + code
|
|
got = pack(format, x)
|
|
verify(got == expected,
|
|
"'%s'-pack of %r gave %r, not %r" %
|
|
(format, x, got, expected))
|
|
|
|
# Unpack work?
|
|
retrieved = unpack(format, got)[0]
|
|
verify(x == retrieved,
|
|
"'%s'-unpack of %r gave %r, not %r" %
|
|
(format, got, retrieved, x))
|
|
|
|
# Adding any byte should cause a "too big" error.
|
|
any_err(unpack, format, '\x01' + got)
|
|
|
|
# Try little-endian.
|
|
format = "<" + code
|
|
expected = string_reverse(expected)
|
|
|
|
# Pack work?
|
|
got = pack(format, x)
|
|
verify(got == expected,
|
|
"'%s'-pack of %r gave %r, not %r" %
|
|
(format, x, got, expected))
|
|
|
|
# Unpack work?
|
|
retrieved = unpack(format, got)[0]
|
|
verify(x == retrieved,
|
|
"'%s'-unpack of %r gave %r, not %r" %
|
|
(format, got, retrieved, x))
|
|
|
|
# Adding any byte should cause a "too big" error.
|
|
any_err(unpack, format, '\x01' + got)
|
|
|
|
else:
|
|
# x is out of range -- verify pack realizes that.
|
|
if not PY_STRUCT_RANGE_CHECKING and code in self.BUGGY_RANGE_CHECK:
|
|
if verbose:
|
|
print "Skipping buggy range check for code", code
|
|
else:
|
|
deprecated_err(pack, ">" + code, x)
|
|
deprecated_err(pack, "<" + code, x)
|
|
|
|
# Much the same for unsigned.
|
|
code = self.unsigned_code
|
|
if self.unsigned_min <= x <= self.unsigned_max:
|
|
# Try big-endian.
|
|
format = ">" + code
|
|
expected = long(x)
|
|
expected = hex(expected)[2:] # chop "0x"
|
|
if len(expected) & 1:
|
|
expected = "0" + expected
|
|
expected = unhexlify(expected)
|
|
expected = "\x00" * (self.bytesize - len(expected)) + expected
|
|
|
|
# Pack work?
|
|
got = pack(format, x)
|
|
verify(got == expected,
|
|
"'%s'-pack of %r gave %r, not %r" %
|
|
(format, x, got, expected))
|
|
|
|
# Unpack work?
|
|
retrieved = unpack(format, got)[0]
|
|
verify(x == retrieved,
|
|
"'%s'-unpack of %r gave %r, not %r" %
|
|
(format, got, retrieved, x))
|
|
|
|
# Adding any byte should cause a "too big" error.
|
|
any_err(unpack, format, '\x01' + got)
|
|
|
|
# Try little-endian.
|
|
format = "<" + code
|
|
expected = string_reverse(expected)
|
|
|
|
# Pack work?
|
|
got = pack(format, x)
|
|
verify(got == expected,
|
|
"'%s'-pack of %r gave %r, not %r" %
|
|
(format, x, got, expected))
|
|
|
|
# Unpack work?
|
|
retrieved = unpack(format, got)[0]
|
|
verify(x == retrieved,
|
|
"'%s'-unpack of %r gave %r, not %r" %
|
|
(format, got, retrieved, x))
|
|
|
|
# Adding any byte should cause a "too big" error.
|
|
any_err(unpack, format, '\x01' + got)
|
|
|
|
else:
|
|
# x is out of range -- verify pack realizes that.
|
|
if not PY_STRUCT_RANGE_CHECKING and code in self.BUGGY_RANGE_CHECK:
|
|
if verbose:
|
|
print "Skipping buggy range check for code", code
|
|
else:
|
|
deprecated_err(pack, ">" + code, x)
|
|
deprecated_err(pack, "<" + code, x)
|
|
|
|
def run(self):
|
|
from random import randrange
|
|
|
|
# Create all interesting powers of 2.
|
|
values = []
|
|
for exp in range(self.bitsize + 3):
|
|
values.append(1L << exp)
|
|
|
|
# Add some random values.
|
|
for i in range(self.bitsize):
|
|
val = 0L
|
|
for j in range(self.bytesize):
|
|
val = (val << 8) | randrange(256)
|
|
values.append(val)
|
|
|
|
# Try all those, and their negations, and +-1 from them. Note
|
|
# that this tests all power-of-2 boundaries in range, and a few out
|
|
# of range, plus +-(2**n +- 1).
|
|
for base in values:
|
|
for val in -base, base:
|
|
for incr in -1, 0, 1:
|
|
x = val + incr
|
|
try:
|
|
x = int(x)
|
|
except OverflowError:
|
|
pass
|
|
self.test_one(x)
|
|
|
|
# Some error cases.
|
|
for direction in "<>":
|
|
for code in self.formatpair:
|
|
for badobject in "a string", 3+42j, randrange:
|
|
any_err(struct.pack, direction + code, badobject)
|
|
|
|
for args in [("bB", 1),
|
|
("hH", 2),
|
|
("iI", 4),
|
|
("lL", 4),
|
|
("qQ", 8)]:
|
|
t = IntTester(*args)
|
|
t.run()
|
|
|
|
|
|
###########################################################################
|
|
# The p ("Pascal string") code.
|
|
|
|
def test_p_code():
|
|
for code, input, expected, expectedback in [
|
|
('p','abc', '\x00', ''),
|
|
('1p', 'abc', '\x00', ''),
|
|
('2p', 'abc', '\x01a', 'a'),
|
|
('3p', 'abc', '\x02ab', 'ab'),
|
|
('4p', 'abc', '\x03abc', 'abc'),
|
|
('5p', 'abc', '\x03abc\x00', 'abc'),
|
|
('6p', 'abc', '\x03abc\x00\x00', 'abc'),
|
|
('1000p', 'x'*1000, '\xff' + 'x'*999, 'x'*255)]:
|
|
got = struct.pack(code, input)
|
|
if got != expected:
|
|
raise TestFailed("pack(%r, %r) == %r but expected %r" %
|
|
(code, input, got, expected))
|
|
(got,) = struct.unpack(code, got)
|
|
if got != expectedback:
|
|
raise TestFailed("unpack(%r, %r) == %r but expected %r" %
|
|
(code, input, got, expectedback))
|
|
|
|
test_p_code()
|
|
|
|
|
|
###########################################################################
|
|
# SF bug 705836. "<f" and ">f" had a severe rounding bug, where a carry
|
|
# from the low-order discarded bits could propagate into the exponent
|
|
# field, causing the result to be wrong by a factor of 2.
|
|
|
|
def test_705836():
|
|
import math
|
|
|
|
for base in range(1, 33):
|
|
# smaller <- largest representable float less than base.
|
|
delta = 0.5
|
|
while base - delta / 2.0 != base:
|
|
delta /= 2.0
|
|
smaller = base - delta
|
|
# Packing this rounds away a solid string of trailing 1 bits.
|
|
packed = struct.pack("<f", smaller)
|
|
unpacked = struct.unpack("<f", packed)[0]
|
|
# This failed at base = 2, 4, and 32, with unpacked = 1, 2, and
|
|
# 16, respectively.
|
|
verify(base == unpacked)
|
|
bigpacked = struct.pack(">f", smaller)
|
|
verify(bigpacked == string_reverse(packed),
|
|
">f pack should be byte-reversal of <f pack")
|
|
unpacked = struct.unpack(">f", bigpacked)[0]
|
|
verify(base == unpacked)
|
|
|
|
# Largest finite IEEE single.
|
|
big = (1 << 24) - 1
|
|
big = math.ldexp(big, 127 - 23)
|
|
packed = struct.pack(">f", big)
|
|
unpacked = struct.unpack(">f", packed)[0]
|
|
verify(big == unpacked)
|
|
|
|
# The same, but tack on a 1 bit so it rounds up to infinity.
|
|
big = (1 << 25) - 1
|
|
big = math.ldexp(big, 127 - 24)
|
|
try:
|
|
packed = struct.pack(">f", big)
|
|
except OverflowError:
|
|
pass
|
|
else:
|
|
TestFailed("expected OverflowError")
|
|
|
|
test_705836()
|
|
|
|
###########################################################################
|
|
# SF bug 1229380. No struct.pack exception for some out of range integers
|
|
|
|
def test_1229380():
|
|
import sys
|
|
for endian in ('', '>', '<'):
|
|
for cls in (int, long):
|
|
for fmt in ('B', 'H', 'I', 'L'):
|
|
deprecated_err(struct.pack, endian + fmt, cls(-1))
|
|
|
|
deprecated_err(struct.pack, endian + 'B', cls(300))
|
|
deprecated_err(struct.pack, endian + 'H', cls(70000))
|
|
|
|
deprecated_err(struct.pack, endian + 'I', sys.maxint * 4L)
|
|
deprecated_err(struct.pack, endian + 'L', sys.maxint * 4L)
|
|
|
|
if PY_STRUCT_RANGE_CHECKING:
|
|
test_1229380()
|
|
|
|
###########################################################################
|
|
# SF bug 1530559. struct.pack raises TypeError where it used to convert.
|
|
|
|
def check_float_coerce(format, number):
|
|
if PY_STRUCT_FLOAT_COERCE == 2:
|
|
# Test for pre-2.5 struct module
|
|
packed = struct.pack(format, number)
|
|
floored = struct.unpack(format, packed)[0]
|
|
if floored != int(number):
|
|
raise TestFailed("did not correcly coerce float to int")
|
|
return
|
|
try:
|
|
func(*args)
|
|
except (struct.error, TypeError):
|
|
if PY_STRUCT_FLOAT_COERCE:
|
|
raise TestFailed("expected DeprecationWarning for float coerce")
|
|
except DeprecationWarning:
|
|
if not PY_STRUCT_FLOAT_COERCE:
|
|
raise TestFailed("expected to raise struct.error for float coerce")
|
|
else:
|
|
raise TestFailed("did not raise error for float coerce")
|
|
|
|
check_float_coerce = with_warning_restore(deprecated_err)
|
|
|
|
def test_1530559():
|
|
for endian in ('', '>', '<'):
|
|
for fmt in ('B', 'H', 'I', 'L', 'b', 'h', 'i', 'l'):
|
|
check_float_coerce(endian + fmt, 1.0)
|
|
check_float_coerce(endian + fmt, 1.5)
|
|
|
|
test_1530559()
|
|
|
|
###########################################################################
|
|
# Packing and unpacking to/from buffers.
|
|
|
|
# Copied and modified from unittest.
|
|
def assertRaises(excClass, callableObj, *args, **kwargs):
|
|
try:
|
|
callableObj(*args, **kwargs)
|
|
except excClass:
|
|
return
|
|
else:
|
|
raise TestFailed("%s not raised." % excClass)
|
|
|
|
def test_unpack_from():
|
|
test_string = 'abcd01234'
|
|
fmt = '4s'
|
|
s = struct.Struct(fmt)
|
|
for cls in (str, buffer):
|
|
data = cls(test_string)
|
|
vereq(s.unpack_from(data), ('abcd',))
|
|
vereq(s.unpack_from(data, 2), ('cd01',))
|
|
vereq(s.unpack_from(data, 4), ('0123',))
|
|
for i in xrange(6):
|
|
vereq(s.unpack_from(data, i), (data[i:i+4],))
|
|
for i in xrange(6, len(test_string) + 1):
|
|
simple_err(s.unpack_from, data, i)
|
|
for cls in (str, buffer):
|
|
data = cls(test_string)
|
|
vereq(struct.unpack_from(fmt, data), ('abcd',))
|
|
vereq(struct.unpack_from(fmt, data, 2), ('cd01',))
|
|
vereq(struct.unpack_from(fmt, data, 4), ('0123',))
|
|
for i in xrange(6):
|
|
vereq(struct.unpack_from(fmt, data, i), (data[i:i+4],))
|
|
for i in xrange(6, len(test_string) + 1):
|
|
simple_err(struct.unpack_from, fmt, data, i)
|
|
|
|
def test_pack_into():
|
|
test_string = 'Reykjavik rocks, eow!'
|
|
writable_buf = array.array('c', ' '*100)
|
|
fmt = '21s'
|
|
s = struct.Struct(fmt)
|
|
|
|
# Test without offset
|
|
s.pack_into(writable_buf, 0, test_string)
|
|
from_buf = writable_buf.tostring()[:len(test_string)]
|
|
vereq(from_buf, test_string)
|
|
|
|
# Test with offset.
|
|
s.pack_into(writable_buf, 10, test_string)
|
|
from_buf = writable_buf.tostring()[:len(test_string)+10]
|
|
vereq(from_buf, test_string[:10] + test_string)
|
|
|
|
# Go beyond boundaries.
|
|
small_buf = array.array('c', ' '*10)
|
|
assertRaises(struct.error, s.pack_into, small_buf, 0, test_string)
|
|
assertRaises(struct.error, s.pack_into, small_buf, 2, test_string)
|
|
|
|
def test_pack_into_fn():
|
|
test_string = 'Reykjavik rocks, eow!'
|
|
writable_buf = array.array('c', ' '*100)
|
|
fmt = '21s'
|
|
pack_into = lambda *args: struct.pack_into(fmt, *args)
|
|
|
|
# Test without offset.
|
|
pack_into(writable_buf, 0, test_string)
|
|
from_buf = writable_buf.tostring()[:len(test_string)]
|
|
vereq(from_buf, test_string)
|
|
|
|
# Test with offset.
|
|
pack_into(writable_buf, 10, test_string)
|
|
from_buf = writable_buf.tostring()[:len(test_string)+10]
|
|
vereq(from_buf, test_string[:10] + test_string)
|
|
|
|
# Go beyond boundaries.
|
|
small_buf = array.array('c', ' '*10)
|
|
assertRaises(struct.error, pack_into, small_buf, 0, test_string)
|
|
assertRaises(struct.error, pack_into, small_buf, 2, test_string)
|
|
|
|
|
|
# Test methods to pack and unpack from buffers rather than strings.
|
|
test_unpack_from()
|
|
test_pack_into()
|
|
test_pack_into_fn()
|