mirror of
https://github.com/python/cpython.git
synced 2025-10-22 17:33:55 +00:00

svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r55413 | fred.drake | 2007-05-17 12:30:10 -0700 (Thu, 17 May 2007) | 1 line fix argument name in documentation; match the implementation ................ r55430 | jack.diederich | 2007-05-18 06:39:59 -0700 (Fri, 18 May 2007) | 1 line Implements class decorators, PEP 3129. ................ r55432 | guido.van.rossum | 2007-05-18 08:09:41 -0700 (Fri, 18 May 2007) | 2 lines obsubmit. ................ r55434 | guido.van.rossum | 2007-05-18 09:39:10 -0700 (Fri, 18 May 2007) | 3 lines Fix bug in test_inspect. (I presume this is how it should be fixed; Jack Diedrich, please verify.) ................ r55460 | brett.cannon | 2007-05-20 00:31:57 -0700 (Sun, 20 May 2007) | 4 lines Remove the imageop module. With imgfile already removed in Python 3.0 and rgbimg gone in Python 2.6 the unit tests themselves were made worthless. Plus third-party libraries perform the same function much better. ................ r55469 | neal.norwitz | 2007-05-20 11:28:20 -0700 (Sun, 20 May 2007) | 118 lines Merged revisions 55324-55467 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55348 | georg.brandl | 2007-05-15 13:19:34 -0700 (Tue, 15 May 2007) | 4 lines HTML-escape the plain traceback in cgitb's HTML output, to prevent the traceback inadvertently or maliciously closing the comment and injecting HTML into the error page. ........ r55372 | neal.norwitz | 2007-05-15 21:33:50 -0700 (Tue, 15 May 2007) | 6 lines Port rev 55353 from Guido: Add what looks like a necessary call to PyErr_NoMemory() when PyMem_MALLOC() fails. Will backport. ........ r55377 | neal.norwitz | 2007-05-15 22:06:33 -0700 (Tue, 15 May 2007) | 1 line Mention removal of some directories for obsolete platforms ........ r55380 | brett.cannon | 2007-05-15 22:50:03 -0700 (Tue, 15 May 2007) | 2 lines Change the maintainer of the BeOS port. ........ r55383 | georg.brandl | 2007-05-16 06:44:18 -0700 (Wed, 16 May 2007) | 2 lines Bug #1719995: don't use deprecated method in sets example. ........ r55386 | neal.norwitz | 2007-05-16 13:05:11 -0700 (Wed, 16 May 2007) | 5 lines Fix bug in marshal where bad data would cause a segfault due to lack of an infinite recursion check. Contributed by Damien Miller at Google. ........ r55389 | brett.cannon | 2007-05-16 15:42:29 -0700 (Wed, 16 May 2007) | 6 lines Remove the gopherlib module. It has been raising a DeprecationWarning since Python 2.5. Also remove gopher support from urllib/urllib2. As both imported gopherlib the usage of the support would have raised a DeprecationWarning. ........ r55394 | raymond.hettinger | 2007-05-16 18:08:04 -0700 (Wed, 16 May 2007) | 1 line calendar.py gets no benefit from xrange() instead of range() ........ r55395 | brett.cannon | 2007-05-16 19:02:56 -0700 (Wed, 16 May 2007) | 3 lines Complete deprecation of BaseException.message. Some subclasses were directly accessing the message attribute instead of using the descriptor. ........ r55396 | neal.norwitz | 2007-05-16 23:11:36 -0700 (Wed, 16 May 2007) | 4 lines Reduce the max stack depth to see if this fixes the segfaults on Windows and some other boxes. If this is successful, this rev should be backported. I'm not sure how close to the limit we should push this. ........ r55397 | neal.norwitz | 2007-05-16 23:23:50 -0700 (Wed, 16 May 2007) | 4 lines Set the depth to something very small to try to determine if the crashes on Windows are really due to the stack size or possibly some other problem. ........ r55398 | neal.norwitz | 2007-05-17 00:04:46 -0700 (Thu, 17 May 2007) | 4 lines Last try for tweaking the max stack depth. 5000 was the original value, 4000 didn't work either. 1000 does work on Windows. If 2000 works, that will hopefully be a reasonable balance. ........ r55412 | fred.drake | 2007-05-17 12:29:58 -0700 (Thu, 17 May 2007) | 1 line fix argument name in documentation; match the implementation ........ r55427 | neal.norwitz | 2007-05-17 22:47:16 -0700 (Thu, 17 May 2007) | 1 line Verify neither dumps or loads overflow the stack and segfault. ........ r55446 | collin.winter | 2007-05-18 16:11:24 -0700 (Fri, 18 May 2007) | 1 line Backport PEP 3110's new 'except' syntax to 2.6. ........ r55448 | raymond.hettinger | 2007-05-18 18:11:16 -0700 (Fri, 18 May 2007) | 1 line Improvements to NamedTuple's implementation, tests, and documentation ........ r55449 | raymond.hettinger | 2007-05-18 18:50:11 -0700 (Fri, 18 May 2007) | 1 line Fix beginner mistake -- don't mix spaces and tabs. ........ r55450 | neal.norwitz | 2007-05-18 20:48:47 -0700 (Fri, 18 May 2007) | 1 line Clear data so random memory does not get freed. Will backport. ........ r55452 | neal.norwitz | 2007-05-18 21:34:55 -0700 (Fri, 18 May 2007) | 3 lines Whoops, need to pay attention to those test failures. Move the clear to *before* the first use, not after. ........ r55453 | neal.norwitz | 2007-05-18 21:35:52 -0700 (Fri, 18 May 2007) | 1 line Give some clue as to what happened if the test fails. ........ r55455 | georg.brandl | 2007-05-19 11:09:26 -0700 (Sat, 19 May 2007) | 2 lines Fix docstring for add_package in site.py. ........ r55458 | brett.cannon | 2007-05-20 00:09:50 -0700 (Sun, 20 May 2007) | 2 lines Remove the rgbimg module. It has been deprecated since Python 2.5. ........ r55465 | nick.coghlan | 2007-05-20 04:12:49 -0700 (Sun, 20 May 2007) | 1 line Fix typo in example (should be backported, but my maintenance branch is woefully out of date) ........ ................ r55472 | brett.cannon | 2007-05-20 12:06:18 -0700 (Sun, 20 May 2007) | 2 lines Remove imageop from the Windows build process. ................ r55486 | neal.norwitz | 2007-05-20 23:59:52 -0700 (Sun, 20 May 2007) | 1 line Remove callable() builtin ................ r55506 | neal.norwitz | 2007-05-22 00:43:29 -0700 (Tue, 22 May 2007) | 78 lines Merged revisions 55468-55505 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55468 | neal.norwitz | 2007-05-20 11:06:27 -0700 (Sun, 20 May 2007) | 1 line rotor is long gone. ........ r55470 | neal.norwitz | 2007-05-20 11:43:00 -0700 (Sun, 20 May 2007) | 1 line Update directories/files at the top-level. ........ r55471 | brett.cannon | 2007-05-20 12:05:06 -0700 (Sun, 20 May 2007) | 2 lines Try to remove rgbimg from Windows builds. ........ r55474 | brett.cannon | 2007-05-20 16:17:38 -0700 (Sun, 20 May 2007) | 4 lines Remove the macfs module. This led to the deprecation of macostools.touched(); it completely relied on macfs and is a no-op on OS X according to code comments. ........ r55476 | brett.cannon | 2007-05-20 16:56:18 -0700 (Sun, 20 May 2007) | 3 lines Move imgfile import to the global namespace to trigger an import error ASAP to prevent creation of a test file. ........ r55477 | brett.cannon | 2007-05-20 16:57:38 -0700 (Sun, 20 May 2007) | 3 lines Cause posixfile to raise a DeprecationWarning. Documented as deprecated since Ptyhon 1.5. ........ r55479 | andrew.kuchling | 2007-05-20 17:03:15 -0700 (Sun, 20 May 2007) | 1 line Note removed modules ........ r55481 | martin.v.loewis | 2007-05-20 21:35:47 -0700 (Sun, 20 May 2007) | 2 lines Add Alexandre Vassalotti. ........ r55482 | george.yoshida | 2007-05-20 21:41:21 -0700 (Sun, 20 May 2007) | 4 lines fix against r55474 [Remove the macfs module] Remove "libmacfs.tex" from Makefile.deps and mac/mac.tex. ........ r55487 | raymond.hettinger | 2007-05-21 01:13:35 -0700 (Mon, 21 May 2007) | 1 line Replace assertion with straight error-checking. ........ r55489 | raymond.hettinger | 2007-05-21 09:40:10 -0700 (Mon, 21 May 2007) | 1 line Allow all alphanumeric and underscores in type and field names. ........ r55490 | facundo.batista | 2007-05-21 10:32:32 -0700 (Mon, 21 May 2007) | 5 lines Added timeout support to HTTPSConnection, through the socket.create_connection function. Also added a small test for this, and updated NEWS file. ........ r55495 | georg.brandl | 2007-05-21 13:34:16 -0700 (Mon, 21 May 2007) | 2 lines Patch #1686487: you can now pass any mapping after '**' in function calls. ........ r55502 | neal.norwitz | 2007-05-21 23:03:36 -0700 (Mon, 21 May 2007) | 1 line Document new params to HTTPSConnection ........ r55504 | neal.norwitz | 2007-05-22 00:16:10 -0700 (Tue, 22 May 2007) | 1 line Stop using METH_OLDARGS ........ r55505 | neal.norwitz | 2007-05-22 00:16:44 -0700 (Tue, 22 May 2007) | 1 line Stop using METH_OLDARGS implicitly ........ ................
174 lines
6.3 KiB
Python
Executable file
174 lines
6.3 KiB
Python
Executable file
"""Test the binascii C module."""
|
|
|
|
from test import test_support
|
|
import unittest
|
|
import binascii
|
|
|
|
class BinASCIITest(unittest.TestCase):
|
|
|
|
# Create binary test data
|
|
data = "The quick brown fox jumps over the lazy dog.\r\n"
|
|
# Be slow so we don't depend on other modules
|
|
data += "".join(map(chr, range(256)))
|
|
data += "\r\nHello world.\n"
|
|
|
|
def test_exceptions(self):
|
|
# Check module exceptions
|
|
self.assert_(issubclass(binascii.Error, Exception))
|
|
self.assert_(issubclass(binascii.Incomplete, Exception))
|
|
|
|
def test_functions(self):
|
|
# Check presence of all functions
|
|
funcs = []
|
|
for suffix in "base64", "hqx", "uu", "hex":
|
|
prefixes = ["a2b_", "b2a_"]
|
|
if suffix == "hqx":
|
|
prefixes.extend(["crc_", "rlecode_", "rledecode_"])
|
|
for prefix in prefixes:
|
|
name = prefix + suffix
|
|
self.assert_(hasattr(getattr(binascii, name), '__call__'))
|
|
self.assertRaises(TypeError, getattr(binascii, name))
|
|
for name in ("hexlify", "unhexlify"):
|
|
self.assert_(hasattr(getattr(binascii, name), '__call__'))
|
|
self.assertRaises(TypeError, getattr(binascii, name))
|
|
|
|
def test_base64valid(self):
|
|
# Test base64 with valid data
|
|
MAX_BASE64 = 57
|
|
lines = []
|
|
for i in range(0, len(self.data), MAX_BASE64):
|
|
b = self.data[i:i+MAX_BASE64]
|
|
a = binascii.b2a_base64(b)
|
|
lines.append(a)
|
|
res = ""
|
|
for line in lines:
|
|
b = binascii.a2b_base64(line)
|
|
res = res + b
|
|
self.assertEqual(res, self.data)
|
|
|
|
def test_base64invalid(self):
|
|
# Test base64 with random invalid characters sprinkled throughout
|
|
# (This requires a new version of binascii.)
|
|
MAX_BASE64 = 57
|
|
lines = []
|
|
for i in range(0, len(self.data), MAX_BASE64):
|
|
b = self.data[i:i+MAX_BASE64]
|
|
a = binascii.b2a_base64(b)
|
|
lines.append(a)
|
|
|
|
fillers = ""
|
|
valid = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+/"
|
|
for i in range(256):
|
|
c = chr(i)
|
|
if c not in valid:
|
|
fillers += c
|
|
def addnoise(line):
|
|
noise = fillers
|
|
ratio = len(line) // len(noise)
|
|
res = ""
|
|
while line and noise:
|
|
if len(line) // len(noise) > ratio:
|
|
c, line = line[0], line[1:]
|
|
else:
|
|
c, noise = noise[0], noise[1:]
|
|
res += c
|
|
return res + noise + line
|
|
res = ""
|
|
for line in map(addnoise, lines):
|
|
b = binascii.a2b_base64(line)
|
|
res += b
|
|
self.assertEqual(res, self.data)
|
|
|
|
# Test base64 with just invalid characters, which should return
|
|
# empty strings. TBD: shouldn't it raise an exception instead ?
|
|
self.assertEqual(binascii.a2b_base64(fillers), '')
|
|
|
|
def test_uu(self):
|
|
MAX_UU = 45
|
|
lines = []
|
|
for i in range(0, len(self.data), MAX_UU):
|
|
b = self.data[i:i+MAX_UU]
|
|
a = binascii.b2a_uu(b)
|
|
lines.append(a)
|
|
res = ""
|
|
for line in lines:
|
|
b = binascii.a2b_uu(line)
|
|
res += b
|
|
self.assertEqual(res, self.data)
|
|
|
|
self.assertEqual(binascii.a2b_uu("\x7f"), "\x00"*31)
|
|
self.assertEqual(binascii.a2b_uu("\x80"), "\x00"*32)
|
|
self.assertEqual(binascii.a2b_uu("\xff"), "\x00"*31)
|
|
self.assertRaises(binascii.Error, binascii.a2b_uu, "\xff\x00")
|
|
self.assertRaises(binascii.Error, binascii.a2b_uu, "!!!!")
|
|
|
|
self.assertRaises(binascii.Error, binascii.b2a_uu, 46*"!")
|
|
|
|
def test_crc32(self):
|
|
crc = binascii.crc32("Test the CRC-32 of")
|
|
crc = binascii.crc32(" this string.", crc)
|
|
self.assertEqual(crc, 1571220330)
|
|
|
|
self.assertRaises(TypeError, binascii.crc32)
|
|
|
|
# The hqx test is in test_binhex.py
|
|
|
|
def test_hex(self):
|
|
# test hexlification
|
|
s = '{s\005\000\000\000worldi\002\000\000\000s\005\000\000\000helloi\001\000\000\0000'
|
|
t = binascii.b2a_hex(s)
|
|
u = binascii.a2b_hex(t)
|
|
self.assertEqual(s, u)
|
|
self.assertRaises(TypeError, binascii.a2b_hex, t[:-1])
|
|
self.assertRaises(TypeError, binascii.a2b_hex, t[:-1] + 'q')
|
|
|
|
# Verify the treatment of Unicode strings
|
|
if test_support.have_unicode:
|
|
self.assertEqual(binascii.hexlify(str('a', 'ascii')), '61')
|
|
|
|
def test_qp(self):
|
|
# A test for SF bug 534347 (segfaults without the proper fix)
|
|
try:
|
|
binascii.a2b_qp("", **{1:1})
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
self.fail("binascii.a2b_qp(**{1:1}) didn't raise TypeError")
|
|
self.assertEqual(binascii.a2b_qp("= "), "= ")
|
|
self.assertEqual(binascii.a2b_qp("=="), "=")
|
|
self.assertEqual(binascii.a2b_qp("=AX"), "=AX")
|
|
self.assertRaises(TypeError, binascii.b2a_qp, foo="bar")
|
|
self.assertEqual(binascii.a2b_qp("=00\r\n=00"), "\x00\r\n\x00")
|
|
self.assertEqual(
|
|
binascii.b2a_qp("\xff\r\n\xff\n\xff"),
|
|
"=FF\r\n=FF\r\n=FF"
|
|
)
|
|
self.assertEqual(
|
|
binascii.b2a_qp("0"*75+"\xff\r\n\xff\r\n\xff"),
|
|
"0"*75+"=\r\n=FF\r\n=FF\r\n=FF"
|
|
)
|
|
|
|
self.assertEqual(binascii.b2a_qp('\0\n'), '=00\n')
|
|
self.assertEqual(binascii.b2a_qp('\0\n', quotetabs=True), '=00\n')
|
|
self.assertEqual(binascii.b2a_qp('foo\tbar\t\n'), 'foo\tbar=09\n')
|
|
self.assertEqual(binascii.b2a_qp('foo\tbar\t\n', quotetabs=True), 'foo=09bar=09\n')
|
|
|
|
self.assertEqual(binascii.b2a_qp('.'), '=2E')
|
|
self.assertEqual(binascii.b2a_qp('.\n'), '=2E\n')
|
|
self.assertEqual(binascii.b2a_qp('a.\n'), 'a.\n')
|
|
|
|
def test_empty_string(self):
|
|
# A test for SF bug #1022953. Make sure SystemError is not raised.
|
|
for n in ['b2a_qp', 'a2b_hex', 'b2a_base64', 'a2b_uu', 'a2b_qp',
|
|
'b2a_hex', 'unhexlify', 'hexlify', 'crc32', 'b2a_hqx',
|
|
'a2b_hqx', 'a2b_base64', 'rlecode_hqx', 'b2a_uu',
|
|
'rledecode_hqx']:
|
|
f = getattr(binascii, n)
|
|
f('')
|
|
binascii.crc_hqx('', 0)
|
|
|
|
def test_main():
|
|
test_support.run_unittest(BinASCIITest)
|
|
|
|
if __name__ == "__main__":
|
|
test_main()
|