mirror of
https://github.com/python/cpython.git
synced 2025-07-19 09:15:34 +00:00

svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r56322 | kurt.kaiser | 2007-07-12 11:35:03 -0700 (Thu, 12 Jul 2007) | 2 lines Replace obscure code which was failing in py3k. ................ r56323 | kurt.kaiser | 2007-07-12 11:44:12 -0700 (Thu, 12 Jul 2007) | 3 lines 1. Remove new division option 2. Update IDLE version to 3.0x ................ r56327 | kurt.kaiser | 2007-07-12 12:20:20 -0700 (Thu, 12 Jul 2007) | 5 lines Fix another instance of this defect in Tkinter, and one in IDLE. Patch 1724999 by Ali Gholami Rudi -- avoid complaints about dict size change during iter in destroy call. ................ r56339 | georg.brandl | 2007-07-13 03:07:25 -0700 (Fri, 13 Jul 2007) | 2 lines Fix #1753310: regrtest -x doesn't work anymore ................ r56361 | kurt.kaiser | 2007-07-13 18:25:24 -0700 (Fri, 13 Jul 2007) | 2 lines convert a map() iterator to a list to get this working. ................ r56362 | kurt.kaiser | 2007-07-13 18:53:45 -0700 (Fri, 13 Jul 2007) | 2 lines Was modifying dict during iteration. ................ r56376 | collin.winter | 2007-07-14 11:56:19 -0700 (Sat, 14 Jul 2007) | 1 line Add an example of class decorators to test_grammar. ................ r56377 | collin.winter | 2007-07-14 12:00:17 -0700 (Sat, 14 Jul 2007) | 1 line Add a basic example of dictcomps to test_grammar. ................ r56413 | neal.norwitz | 2007-07-17 00:21:18 -0700 (Tue, 17 Jul 2007) | 149 lines Merged revisions 56202-56412 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r56204 | ronald.oussoren | 2007-07-08 23:02:21 -0700 (Sun, 08 Jul 2007) | 2 lines Patch 1693258: Fix for duplicate "preferences" menu-OS X ........ r56207 | ronald.oussoren | 2007-07-09 01:41:15 -0700 (Mon, 09 Jul 2007) | 4 lines Patch 1673122: be explicit about which libtool to use, to avoid name clashes when a users install GNU libtool early in his PATH ........ r56280 | georg.brandl | 2007-07-11 12:41:49 -0700 (Wed, 11 Jul 2007) | 2 lines Fix #1752132: wrong comment in opcode description. ........ r56293 | georg.brandl | 2007-07-12 01:05:45 -0700 (Thu, 12 Jul 2007) | 3 lines Patch #1752270, #1750931: complain if urllib2 add_handler called without handler. ........ r56296 | georg.brandl | 2007-07-12 01:11:29 -0700 (Thu, 12 Jul 2007) | 2 lines Patch #1739696: use code.co_code only if really necessary ........ r56298 | georg.brandl | 2007-07-12 01:38:00 -0700 (Thu, 12 Jul 2007) | 3 lines Patch #1673759: add a missing overflow check when formatting floats with %G. ........ r56302 | georg.brandl | 2007-07-12 02:06:41 -0700 (Thu, 12 Jul 2007) | 2 lines Patch #1731659: improve time.strptime docs. ........ r56304 | georg.brandl | 2007-07-12 02:24:04 -0700 (Thu, 12 Jul 2007) | 2 lines Patch #1731169: clean up expected skips list. ........ r56306 | georg.brandl | 2007-07-12 02:37:49 -0700 (Thu, 12 Jul 2007) | 3 lines Bug #1637365: add subsection about "__name__ == __main__" to the Python tutorial. ........ r56308 | georg.brandl | 2007-07-12 02:59:22 -0700 (Thu, 12 Jul 2007) | 5 lines Patch #1675424: Added tests for uncovered code in the zipfile module. The KeyError raised by Zipfile.getinfo for nonexistent names now has a descriptive message. ........ r56340 | facundo.batista | 2007-07-13 03:43:44 -0700 (Fri, 13 Jul 2007) | 6 lines Added tests for basic behavior of DateTime, Binary, and Fault classes and the escape function. Check that marshalling recursive sequences & dicts raises TypeError. Check that marshalling out-of-range ints raises OverflowError [Alan McIntyre - GSoC] ........ r56345 | raymond.hettinger | 2007-07-13 05:09:41 -0700 (Fri, 13 Jul 2007) | 1 line Correct the docs for takewhile(). Improve the recipe for nth(). Should be backported ........ r56348 | thomas.heller | 2007-07-13 06:59:39 -0700 (Fri, 13 Jul 2007) | 4 lines Repair COMError. Since exceptions are new style classes now, setting the methods and docstring after the type creation does not work, they must be in the dictionary before creating the type. ........ r56349 | thomas.heller | 2007-07-13 07:18:06 -0700 (Fri, 13 Jul 2007) | 1 line Add tests for _ctypes.COMError. ........ r56350 | thomas.heller | 2007-07-13 09:50:43 -0700 (Fri, 13 Jul 2007) | 4 lines Do not try to load the GLUT library in the ctypes tests. This test adds little value, but has a large problem on OS X, as explained in SF# 1581906. ........ r56352 | thomas.heller | 2007-07-13 10:12:23 -0700 (Fri, 13 Jul 2007) | 3 lines Fix for SF# 1701409: segfault in c_char_p of ctypes. The repr output of c_char_p and c_wchar_p has changed as a sideeffect. ........ r56355 | thomas.heller | 2007-07-13 10:46:54 -0700 (Fri, 13 Jul 2007) | 3 lines Fix for SF# 1649098: avoid zero-sized array declaration in structure. ........ r56357 | thomas.heller | 2007-07-13 12:51:55 -0700 (Fri, 13 Jul 2007) | 3 lines PyType_stgdict() returns a borrowed reference which must not be Py_DECREF'd. ........ r56360 | barry.warsaw | 2007-07-13 15:12:58 -0700 (Fri, 13 Jul 2007) | 10 lines In response to this SF bug: [ 1752723 ] email.message_from_string: initial line gets discarded I added a test to assert that when the first line of text passed to message_from_string() contains a leading space, the message ends up with the appropriate FirstHeaderLineIsContinuationDefect on its defects list. The bug is invalid. ........ r56364 | georg.brandl | 2007-07-14 10:12:23 -0700 (Sat, 14 Jul 2007) | 2 lines Bug #1753406: missing \versionadded for subprocess.check_call. ........ r56366 | georg.brandl | 2007-07-14 10:32:41 -0700 (Sat, 14 Jul 2007) | 2 lines Clarify webbrowser.open description. ........ r56380 | andrew.kuchling | 2007-07-14 13:58:21 -0700 (Sat, 14 Jul 2007) | 1 line Typo fix ........ r56382 | andrew.kuchling | 2007-07-14 14:56:19 -0700 (Sat, 14 Jul 2007) | 7 lines Avoid exception if there's a stray directory inside a Maildir folder. The Maildir specification doesn't seem to say anything about this situation, and it can happen if you're keeping a Maildir mailbox in Subversion (.svn directories) or some similar system. The patch just ignores directories in the cur/, new/, tmp/ folders. ........ r56392 | facundo.batista | 2007-07-14 15:41:45 -0700 (Sat, 14 Jul 2007) | 6 lines First version. Includes tests for helper functions: read, write, _exception, readwrite, closeall, compact_traceback; and for classes dispatcher, dispatcher_with_send, and file_wrapper. [Alan McIntyre - GSoC] ........ r56399 | facundo.batista | 2007-07-15 13:30:39 -0700 (Sun, 15 Jul 2007) | 5 lines Changed the used port and commented out some tests that uses a non documented function that appers to uses resources not present in Windows. ........ r56412 | facundo.batista | 2007-07-16 19:19:39 -0700 (Mon, 16 Jul 2007) | 6 lines Prevent asyncore.dispatcher tests from hanging by adding loop counters to server & client, and by adding asyncore.close_all calls in tearDown. Also choose correct expected logging results based on the value of __debug__ [Alan McIntyre - GSoC] ........ ................ r56442 | guido.van.rossum | 2007-07-18 10:26:38 -0700 (Wed, 18 Jul 2007) | 14 lines Merged revisions 56413-56441 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r56439 | georg.brandl | 2007-07-17 23:37:55 -0700 (Tue, 17 Jul 2007) | 2 lines Use "Unix" as platform name, not "UNIX". ........ r56441 | guido.van.rossum | 2007-07-18 10:19:14 -0700 (Wed, 18 Jul 2007) | 3 lines SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. (Slightly tweaked for style and refcounts.) ........ ................
244 lines
9.9 KiB
Python
244 lines
9.9 KiB
Python
from test.test_support import verbose, TestFailed
|
|
import sys
|
|
from test.test_support import MAX_Py_ssize_t
|
|
maxsize = MAX_Py_ssize_t
|
|
|
|
# test string formatting operator (I am not sure if this is being tested
|
|
# elsewhere but, surely, some of the given cases are *not* tested because
|
|
# they crash python)
|
|
# test on unicode strings as well
|
|
|
|
overflowok = 1
|
|
overflowrequired = 0
|
|
|
|
def testformat(formatstr, args, output=None):
|
|
if verbose:
|
|
if output:
|
|
print("%r %% %r =? %r ..." %\
|
|
(formatstr, args, output), end=' ')
|
|
else:
|
|
print("%r %% %r works? ..." % (formatstr, args), end=' ')
|
|
try:
|
|
result = formatstr % args
|
|
except OverflowError:
|
|
if not overflowok:
|
|
raise
|
|
if verbose:
|
|
print('overflow (this is fine)')
|
|
else:
|
|
if overflowrequired:
|
|
if verbose:
|
|
print('no')
|
|
print("overflow expected on %r %% %r" % (formatstr, args))
|
|
elif output and result != output:
|
|
if verbose:
|
|
print('no')
|
|
print("%r %% %r == %r != %r" %\
|
|
(formatstr, args, result, output))
|
|
else:
|
|
if verbose:
|
|
print('yes')
|
|
|
|
def testboth(formatstr, *args):
|
|
testformat(str8(formatstr), *args)
|
|
testformat(formatstr, *args)
|
|
|
|
|
|
testboth("%.1d", (1,), "1")
|
|
testboth("%.*d", (sys.maxint,1)) # expect overflow
|
|
testboth("%.100d", (1,), '0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001')
|
|
testboth("%#.117x", (1,), '0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001')
|
|
testboth("%#.118x", (1,), '0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001')
|
|
|
|
testboth("%f", (1.0,), "1.000000")
|
|
# these are trying to test the limits of the internal magic-number-length
|
|
# formatting buffer, if that number changes then these tests are less
|
|
# effective
|
|
testboth("%#.*g", (109, -1.e+49/3.))
|
|
testboth("%#.*g", (110, -1.e+49/3.))
|
|
testboth("%#.*g", (110, -1.e+100/3.))
|
|
|
|
# test some ridiculously large precision, expect overflow
|
|
testboth('%12.*f', (123456, 1.0))
|
|
|
|
# check for internal overflow validation on length of precision
|
|
overflowrequired = 1
|
|
testboth("%#.*g", (110, -1.e+100/3.))
|
|
testboth("%#.*G", (110, -1.e+100/3.))
|
|
testboth("%#.*f", (110, -1.e+100/3.))
|
|
testboth("%#.*F", (110, -1.e+100/3.))
|
|
overflowrequired = 0
|
|
|
|
# Formatting of long integers. Overflow is not ok
|
|
overflowok = 0
|
|
testboth("%x", 10, "a")
|
|
testboth("%x", 100000000000, "174876e800")
|
|
testboth("%o", 10, "12")
|
|
testboth("%o", 100000000000, "1351035564000")
|
|
testboth("%d", 10, "10")
|
|
testboth("%d", 100000000000, "100000000000")
|
|
|
|
big = 123456789012345678901234567890
|
|
testboth("%d", big, "123456789012345678901234567890")
|
|
testboth("%d", -big, "-123456789012345678901234567890")
|
|
testboth("%5d", -big, "-123456789012345678901234567890")
|
|
testboth("%31d", -big, "-123456789012345678901234567890")
|
|
testboth("%32d", -big, " -123456789012345678901234567890")
|
|
testboth("%-32d", -big, "-123456789012345678901234567890 ")
|
|
testboth("%032d", -big, "-0123456789012345678901234567890")
|
|
testboth("%-032d", -big, "-123456789012345678901234567890 ")
|
|
testboth("%034d", -big, "-000123456789012345678901234567890")
|
|
testboth("%034d", big, "0000123456789012345678901234567890")
|
|
testboth("%0+34d", big, "+000123456789012345678901234567890")
|
|
testboth("%+34d", big, " +123456789012345678901234567890")
|
|
testboth("%34d", big, " 123456789012345678901234567890")
|
|
testboth("%.2d", big, "123456789012345678901234567890")
|
|
testboth("%.30d", big, "123456789012345678901234567890")
|
|
testboth("%.31d", big, "0123456789012345678901234567890")
|
|
testboth("%32.31d", big, " 0123456789012345678901234567890")
|
|
|
|
big = 0x1234567890abcdef12345 # 21 hex digits
|
|
testboth("%x", big, "1234567890abcdef12345")
|
|
testboth("%x", -big, "-1234567890abcdef12345")
|
|
testboth("%5x", -big, "-1234567890abcdef12345")
|
|
testboth("%22x", -big, "-1234567890abcdef12345")
|
|
testboth("%23x", -big, " -1234567890abcdef12345")
|
|
testboth("%-23x", -big, "-1234567890abcdef12345 ")
|
|
testboth("%023x", -big, "-01234567890abcdef12345")
|
|
testboth("%-023x", -big, "-1234567890abcdef12345 ")
|
|
testboth("%025x", -big, "-0001234567890abcdef12345")
|
|
testboth("%025x", big, "00001234567890abcdef12345")
|
|
testboth("%0+25x", big, "+0001234567890abcdef12345")
|
|
testboth("%+25x", big, " +1234567890abcdef12345")
|
|
testboth("%25x", big, " 1234567890abcdef12345")
|
|
testboth("%.2x", big, "1234567890abcdef12345")
|
|
testboth("%.21x", big, "1234567890abcdef12345")
|
|
testboth("%.22x", big, "01234567890abcdef12345")
|
|
testboth("%23.22x", big, " 01234567890abcdef12345")
|
|
testboth("%-23.22x", big, "01234567890abcdef12345 ")
|
|
testboth("%X", big, "1234567890ABCDEF12345")
|
|
testboth("%#X", big, "0X1234567890ABCDEF12345")
|
|
testboth("%#x", big, "0x1234567890abcdef12345")
|
|
testboth("%#x", -big, "-0x1234567890abcdef12345")
|
|
testboth("%#.23x", -big, "-0x001234567890abcdef12345")
|
|
testboth("%#+.23x", big, "+0x001234567890abcdef12345")
|
|
testboth("%# .23x", big, " 0x001234567890abcdef12345")
|
|
testboth("%#+.23X", big, "+0X001234567890ABCDEF12345")
|
|
testboth("%#-+.23X", big, "+0X001234567890ABCDEF12345")
|
|
testboth("%#-+26.23X", big, "+0X001234567890ABCDEF12345")
|
|
testboth("%#-+27.23X", big, "+0X001234567890ABCDEF12345 ")
|
|
testboth("%#+27.23X", big, " +0X001234567890ABCDEF12345")
|
|
# next one gets two leading zeroes from precision, and another from the
|
|
# 0 flag and the width
|
|
testboth("%#+027.23X", big, "+0X0001234567890ABCDEF12345")
|
|
# same, except no 0 flag
|
|
testboth("%#+27.23X", big, " +0X001234567890ABCDEF12345")
|
|
|
|
big = 0o12345670123456701234567012345670 # 32 octal digits
|
|
testboth("%o", big, "12345670123456701234567012345670")
|
|
testboth("%o", -big, "-12345670123456701234567012345670")
|
|
testboth("%5o", -big, "-12345670123456701234567012345670")
|
|
testboth("%33o", -big, "-12345670123456701234567012345670")
|
|
testboth("%34o", -big, " -12345670123456701234567012345670")
|
|
testboth("%-34o", -big, "-12345670123456701234567012345670 ")
|
|
testboth("%034o", -big, "-012345670123456701234567012345670")
|
|
testboth("%-034o", -big, "-12345670123456701234567012345670 ")
|
|
testboth("%036o", -big, "-00012345670123456701234567012345670")
|
|
testboth("%036o", big, "000012345670123456701234567012345670")
|
|
testboth("%0+36o", big, "+00012345670123456701234567012345670")
|
|
testboth("%+36o", big, " +12345670123456701234567012345670")
|
|
testboth("%36o", big, " 12345670123456701234567012345670")
|
|
testboth("%.2o", big, "12345670123456701234567012345670")
|
|
testboth("%.32o", big, "12345670123456701234567012345670")
|
|
testboth("%.33o", big, "012345670123456701234567012345670")
|
|
testboth("%34.33o", big, " 012345670123456701234567012345670")
|
|
testboth("%-34.33o", big, "012345670123456701234567012345670 ")
|
|
testboth("%o", big, "12345670123456701234567012345670")
|
|
testboth("%#o", big, "0o12345670123456701234567012345670")
|
|
testboth("%#o", -big, "-0o12345670123456701234567012345670")
|
|
testboth("%#.34o", -big, "-0o0012345670123456701234567012345670")
|
|
testboth("%#+.34o", big, "+0o0012345670123456701234567012345670")
|
|
testboth("%# .34o", big, " 0o0012345670123456701234567012345670")
|
|
testboth("%#-+.34o", big, "+0o0012345670123456701234567012345670")
|
|
testboth("%#-+39.34o", big, "+0o0012345670123456701234567012345670 ")
|
|
testboth("%#+39.34o", big, " +0o0012345670123456701234567012345670")
|
|
# next one gets one leading zero from precision
|
|
testboth("%.33o", big, "012345670123456701234567012345670")
|
|
# one leading zero from precision
|
|
testboth("%#.33o", big, "0o012345670123456701234567012345670")
|
|
# leading zero vanishes
|
|
testboth("%#.32o", big, "0o12345670123456701234567012345670")
|
|
# one leading zero from precision, and another from '0' flag & width
|
|
testboth("%034.33o", big, "0012345670123456701234567012345670")
|
|
# max width includes base marker; padding zeroes come after marker
|
|
testboth("%0#38.33o", big, "0o000012345670123456701234567012345670")
|
|
# padding spaces come before marker
|
|
testboth("%#36.33o", big, " 0o012345670123456701234567012345670")
|
|
|
|
# Some small ints, in both Python int and long flavors).
|
|
testboth("%d", 42, "42")
|
|
testboth("%d", -42, "-42")
|
|
testboth("%#x", 1, "0x1")
|
|
testboth("%#X", 1, "0X1")
|
|
testboth("%#o", 1, "0o1")
|
|
testboth("%#o", 1, "0o1")
|
|
testboth("%#o", 0, "0o0")
|
|
testboth("%#o", 0, "0o0")
|
|
testboth("%o", 0, "0")
|
|
testboth("%d", 0, "0")
|
|
testboth("%#x", 0, "0x0")
|
|
testboth("%#X", 0, "0X0")
|
|
|
|
testboth("%x", 0x42, "42")
|
|
testboth("%x", -0x42, "-42")
|
|
|
|
testboth("%o", 0o42, "42")
|
|
testboth("%o", -0o42, "-42")
|
|
testboth("%o", 0o42, "42")
|
|
testboth("%o", -0o42, "-42")
|
|
|
|
# Test exception for unknown format characters
|
|
if verbose:
|
|
print('Testing exceptions')
|
|
|
|
def test_exc(formatstr, args, exception, excmsg):
|
|
try:
|
|
testformat(formatstr, args)
|
|
except exception as exc:
|
|
if str(exc) == excmsg:
|
|
if verbose:
|
|
print("yes")
|
|
else:
|
|
if verbose: print('no')
|
|
print('Unexpected ', exception, ':', repr(str(exc)))
|
|
except:
|
|
if verbose: print('no')
|
|
print('Unexpected exception')
|
|
raise
|
|
else:
|
|
raise TestFailed, 'did not get expected exception: %s' % excmsg
|
|
|
|
test_exc('abc %a', 1, ValueError,
|
|
"unsupported format character 'a' (0x61) at index 5")
|
|
test_exc(str(b'abc %\u3000', 'raw-unicode-escape'), 1, ValueError,
|
|
"unsupported format character '?' (0x3000) at index 5")
|
|
|
|
test_exc('%d', '1', TypeError, "an integer is required")
|
|
test_exc('%g', '1', TypeError, "a float is required")
|
|
test_exc('no format', '1', TypeError,
|
|
"not all arguments converted during string formatting")
|
|
test_exc('no format', '1', TypeError,
|
|
"not all arguments converted during string formatting")
|
|
test_exc('no format', '1', TypeError,
|
|
"not all arguments converted during string formatting")
|
|
test_exc('no format', '1', TypeError,
|
|
"not all arguments converted during string formatting")
|
|
|
|
if maxsize == 2**31-1:
|
|
# crashes 2.2.1 and earlier:
|
|
try:
|
|
"%*d"%(maxsize, -127)
|
|
except MemoryError:
|
|
pass
|
|
else:
|
|
raise TestFailed, '"%*d"%(maxsize, -127) should fail'
|