Mailman 3 September 2004 - Python-checkins

python/dist/src/Lib/test list_tests.py, 1.3, 1.4 test_list.py, 1.2, 1.3
by rhettinger＠users.sourceforge.net Sept. 29, 2004

Sept. 29, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3516 Modified Files: list_tests.py test_list.py Log Message: Improve test coverage. Index: list_tests.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/list_tests.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- list_tests.py 13 Aug 2004 03:18:29 -0000 1.3 +++ list_tests.py 29 Sep 2004 08:03:17 -0000 1.4 @@ -3,12 +3,40 @@ """ import sys +import os import unittest from test import test_support, seq_tests class CommonTest(seq_tests.CommonTest): + def test_init(self): + # Iterable arg is optional + self.assertEqual(self.type2test([]), self.type2test()) + + # Init clears previous values + a = self.type2test([1, 2, 3]) + a.__init__() + self.assertEqual(a, self.type2test([])) + + # Init overwrites previous values + a = self.type2test([1, 2, 3]) + a.__init__([4, 5, 6]) + self.assertEqual(a, self.type2test([4, 5, 6])) + + # Mutables always return a new object + b = self.type2test(a) + self.assertNotEqual(id(a), id(b)) + self.assertEqual(a, b) + + def test_mul(self): + for m in xrange(4): + s = tuple(range(m)) + for n in xrange(-3, 5): + self.assertEqual(self.type2test(s*n), self.type2test(s)*n) + self.assertEqual(self.type2test(s)*(-4), self.type2test([])) + self.assertEqual(id(s), id(s*1)) + def test_repr(self): l0 = [] l2 = [0, 1, 2] @@ -21,6 +49,71 @@ self.assertEqual(str(a2), "[0, 1, 2]") self.assertEqual(repr(a2), "[0, 1, 2]") + a2.append(a2) + a2.append(3) + self.assertEqual(str(a2), "[0, 1, 2, [...], 3]") + self.assertEqual(repr(a2), "[0, 1, 2, [...], 3]") + + def test_print(self): + d = self.type2test(xrange(200)) + d.append(d) + d.extend(xrange(200,400)) + d.append(d) + d.append(400) + try: + fo = open(test_support.TESTFN, "wb") + print >> fo, d, + fo.close() + fo = open(test_support.TESTFN, "rb") + self.assertEqual(fo.read(), repr(d)) + finally: + fo.close() + os.remove(test_support.TESTFN) + + def test_getitem(self): + a = self.type2test([10, 11]) + self.assertEqual(a[0], 10) + self.assertEqual(a[1], 11) + self.assertEqual(a[-2], 10) + self.assertEqual(a[-1], 11) + self.assertRaises(IndexError, a.__getitem__, -3) + self.assertRaises(IndexError, a.__getitem__, 3) + + def test_subscript(self): + a = self.type2test([10, 11]) + self.assertEqual(a.__getitem__(0L), 10) + self.assertEqual(a.__getitem__(1L), 11) + self.assertEqual(a.__getitem__(-2L), 10) + self.assertEqual(a.__getitem__(-1L), 11) + self.assertRaises(IndexError, a.__getitem__, -3) + self.assertRaises(IndexError, a.__getitem__, 3) + self.assertEqual(a.__getitem__(slice(0,1)), self.type2test([10])) + self.assertEqual(a.__getitem__(slice(1,2)), self.type2test([11])) + self.assertEqual(a.__getitem__(slice(0,2)), self.type2test([10, 11])) + self.assertEqual(a.__getitem__(slice(0,3)), self.type2test([10, 11])) + self.assertEqual(a.__getitem__(slice(3,5)), self.type2test([])) + self.assertRaises(ValueError, a.__getitem__, slice(0, 10, 0)) + self.assertRaises(TypeError, a.__getitem__, 'x') + + def test_set_subscript(self): + a = self.type2test(range(20)) + self.assertRaises(ValueError, a.__setitem__, slice(0, 10, 0), [1,2,3]) + self.assertRaises(TypeError, a.__setitem__, slice(0, 10), 1) + self.assertRaises(ValueError, a.__setitem__, slice(0, 10, 2), [1,2]) + self.assertRaises(TypeError, a.__getitem__, 'x', 1) + a[slice(2,10,3)] = [1,2,3] + self.assertEqual(a, self.type2test([0, 1, 1, 3, 4, 2, 6, 7, 3, + 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19])) + + def test_reversed(self): + a = self.type2test(range(20)) + r = reversed(a) + self.assertEqual(list(r), self.type2test(range(19, -1, -1))) + self.assertRaises(StopIteration, r.next) + self.assertEqual(list(reversed(self.type2test())), + self.type2test()) + def test_setitem(self): a = self.type2test([0, 1]) a[0] = 0 @@ -36,7 +129,6 @@ a = self.type2test([]) self.assertRaises(IndexError, a.__setitem__, 0, 200) self.assertRaises(IndexError, a.__setitem__, -1, 200) - self.assertRaises(TypeError, a.__setitem__) a = self.type2test([0,1,2,3,4]) @@ -210,6 +302,7 @@ self.assertRaises(TypeError, a.insert) def test_pop(self): + from decimal import Decimal a = self.type2test([-1, 0, 1]) a.pop() self.assertEqual(a, [-1, 0]) @@ -219,8 +312,10 @@ a.pop(0) self.assertEqual(a, []) self.assertRaises(IndexError, a.pop) - self.assertRaises(TypeError, a.pop, 42, 42) + a = self.type2test([0, 10, 20, 30, 40]) + self.assertEqual(a.pop(Decimal(2)), 20) + self.assertRaises(IndexError, a.pop, Decimal(25)) def test_remove(self): a = self.type2test([0, 0, 1]) @@ -390,6 +485,10 @@ self.assertEqual(u, self.type2test([0, 1, 0, 1, 0, 1])) u *= 0 self.assertEqual(u, self.type2test([])) + s = self.type2test([]) + oldid = id(s) + s *= 10 + self.assertEqual(id(s), oldid) def test_extendedslicing(self): # subscript Index: test_list.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_list.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- test_list.py 18 Jan 2004 21:03:23 -0000 1.2 +++ test_list.py 29 Sep 2004 08:03:17 -0000 1.3 @@ -18,8 +18,20 @@ self.assertEqual(len([0]), 1) self.assertEqual(len([0, 1, 2]), 3) -def test_main(): +def test_main(verbose=None): test_support.run_unittest(ListTest) -if __name__=="__main__": - test_main() + # verify reference counting + import sys + if verbose and hasattr(sys, "gettotalrefcount"): + import gc + counts = [None] * 5 + for i in xrange(len(counts)): + test_support.run_unittest(ListTest) + gc.collect() + counts[i] = sys.gettotalrefcount() + print counts + + +if __name__ == "__main__": + test_main(verbose=True)

1 0

python/dist/src/Doc/lib xmldomminidom.tex, 1.9, 1.10
by montanaro＠users.sourceforge.net Sept. 28, 2004

Sept. 28, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13555 Modified Files: xmldomminidom.tex Log Message: minor doc tweaks for writexml Index: xmldomminidom.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/xmldomminidom.tex,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- xmldomminidom.tex 25 Mar 2004 16:39:46 -0000 1.9 +++ xmldomminidom.tex 28 Sep 2004 18:40:42 -0000 1.10 @@ -137,16 +137,20 @@ children of that node. \end{methoddesc} -\begin{methoddesc}[Node]{writexml}{writer} +\begin{methoddesc}[Node]{writexml}{writer\optional{,indent=""\optional{,addindent=""\optional{,newl=""}}}} Write XML to the writer object. The writer should have a \method{write()} method which matches that of the file object -interface. +interface. The \var{indent} parameter is the indentation of the current +node. The \var{addindent} parameter is the incremental indentation to use +for subnodes of the current one. The \var{newl} parameter specifies the +string to use to terminate newlines. -\versionchanged[To support pretty output, new keyword parameters -\var{indent}, \var{addindent}, and \var{newl} have been added]{2.1} +\versionchanged[The optional keyword parameters +\var{indent}, \var{addindent}, and \var{newl} were added to support pretty +output]{2.1} \versionchanged[For the \class{Document} node, an additional keyword -argument encoding can be used to specify the encoding field of the XML +argument \var{encoding} can be used to specify the encoding field of the XML header]{2.3} \end{methoddesc}

1 0

python/dist/src/Doc/lib libtime.tex,1.66,1.67
by montanaro＠users.sourceforge.net Sept. 28, 2004

Sept. 28, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11362 Modified Files: libtime.tex Log Message: typo Index: libtime.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libtime.tex,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- libtime.tex 13 Aug 2004 02:34:06 -0000 1.66 +++ libtime.tex 28 Sep 2004 18:30:03 -0000 1.67 @@ -308,7 +308,7 @@ according to \var{format}, \exception{ValueError} is raised. If the string to be parsed has excess data after parsing, \exception{ValueError} is raised. The default values used to fill in -any missing data is \code{(1900, 1, 1, 0, 0, 0, 0, 1, -1)} . +any missing data are \code{(1900, 1, 1, 0, 0, 0, 0, 1, -1)} . Support for the \code{\%Z} directive is based on the values contained in \code{tzname} and whether \code{daylight} is true. Because of this,

1 0

python/dist/src/Python compile.c,2.327,2.328
by rhettinger＠users.sourceforge.net Sept. 28, 2004

Sept. 28, 2004

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27403 Modified Files: compile.c Log Message: Replaced a test with an assertion. (Suggested by Michael Hudson.) Index: compile.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/compile.c,v retrieving revision 2.327 retrieving revision 2.328 diff -u -d -r2.327 -r2.328 --- compile.c 22 Sep 2004 18:44:20 -0000 2.327 +++ compile.c 28 Sep 2004 17:22:12 -0000 2.328 @@ -509,10 +509,8 @@ if (memchr(lineno, 255, tabsiz) != NULL) goto exitUnchanged; - if (!PyString_Check(code)) - goto exitUnchanged; - /* Avoid situations where jump retargeting could overflow */ + assert(PyString_Check(code)); codelen = PyString_Size(code); if (codelen > 32700) goto exitUnchanged;

1 0

python/dist/src/Doc/tut tut.tex,1.252,1.253
by tim_one＠users.sourceforge.net Sept. 28, 2004

Sept. 28, 2004

Update of /cvsroot/python/python/dist/src/Doc/tut In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9941/Doc/tut Modified Files: tut.tex Log Message: A number of list examples used 66.6, but I doubt there's any box on which repr(66.6) == "66.6", so doubt that the claimed output has ever been seen. Changed it to 66.25 everywhere, and manually verified that the new claimed output is correct. Index: tut.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/tut/tut.tex,v retrieving revision 1.252 retrieving revision 1.253 diff -u -d -r1.252 -r1.253 --- tut.tex 25 Sep 2004 00:55:38 -0000 1.252 +++ tut.tex 28 Sep 2004 16:12:50 -0000 1.253 @@ -1749,24 +1749,24 @@ An example that uses most of the list methods: \begin{verbatim} ->>> a = [66.6, 333, 333, 1, 1234.5] ->>> print a.count(333), a.count(66.6), a.count('x') +>>> a = [66.25, 333, 333, 1, 1234.5] +>>> print a.count(333), a.count(66.25), a.count('x') 2 1 0 >>> a.insert(2, -1) >>> a.append(333) >>> a -[66.6, 333, -1, 333, 1, 1234.5, 333] +[66.25, 333, -1, 333, 1, 1234.5, 333] >>> a.index(333) 1 >>> a.remove(333) >>> a -[66.6, -1, 333, 1, 1234.5, 333] +[66.25, -1, 333, 1, 1234.5, 333] >>> a.reverse() >>> a -[333, 1234.5, 1, 333, -1, 66.6] +[333, 1234.5, 1, 333, -1, 66.25] >>> a.sort() >>> a -[-1, 1, 66.6, 333, 333, 1234.5] +[-1, 1, 66.25, 333, 333, 1234.5] \end{verbatim} @@ -1958,13 +1958,13 @@ empty list to the slice). For example: \begin{verbatim} ->>> a = [-1, 1, 66.6, 333, 333, 1234.5] +>>> a = [-1, 1, 66.25, 333, 333, 1234.5] >>> del a[0] >>> a -[1, 66.6, 333, 333, 1234.5] +[1, 66.25, 333, 333, 1234.5] >>> del a[2:4] >>> a -[1, 66.6, 1234.5] +[1, 66.25, 1234.5] \end{verbatim} \keyword{del} can also be used to delete entire variables:

1 0

python/nondist/peps pep-0302.txt,1.16,1.17
by goodger＠users.sourceforge.net Sept. 28, 2004

Sept. 28, 2004

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28245 Modified Files: pep-0302.txt Log Message: not complete; I stand corrected ;-) Index: pep-0302.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0302.txt,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- pep-0302.txt 28 Sep 2004 01:11:15 -0000 1.16 +++ pep-0302.txt 28 Sep 2004 12:39:00 -0000 1.17 @@ -526,10 +526,10 @@ Implementation - The PEP 302 implementation is complete and has been integrated - with Python as of 2.3a1. An earlier version is available as - SourceForge patch #652586, but more interestingly, the SF item - contains a fairly detailed history of the development and design. + The PEP 302 implementation has been integrated with Python as of + 2.3a1. An earlier version is available as SourceForge patch + #652586, but more interestingly, the SF item contains a fairly + detailed history of the development and design. http://www.python.org/sf/652586 PEP 273 has been implemented using PEP 302's import hooks.

1 0

python/dist/src/Lib/test test_doctest.py, 1.50, 1.51
by edloper＠users.sourceforge.net Sept. 28, 2004

Sept. 28, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14073/Lib/test Modified Files: test_doctest.py Log Message: Reverted the addition of a NORMALIZE_NUMBERS option, per Tim Peter's request. Tim says that "correct 'fuzzy' comparison of floats cannot be automated." (The motivation behind adding the new option was verifying interactive examples in Python's latex documentation; several such examples use numbers that don't print consistently on different platforms.) Index: test_doctest.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_doctest.py,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- test_doctest.py 28 Sep 2004 04:29:57 -0000 1.50 +++ test_doctest.py 28 Sep 2004 05:50:57 -0000 1.51 @@ -1032,107 +1032,6 @@ [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19] -The NORMALIZE_NUMBERS flag causes numbers that are equal (to -approximately 10 decimal places) but formatted differently to match. - - >>> def f(x): ''' - ... Numbers will match if they are exactly equal: - ... - ... >>> print 1.1, 'intervening text', 1L # should match - ... 1.1 intervening text 1L - ... >>> print 1.0j, 22, 22.0, 1, 1e1 # should match - ... 1j 22.0 22 1 10.0 - ... - ... Numbers will match if they are equal to 14 digits of - ... precision: - ... - ... >>> 2.00000000001 # should match - ... 1.99999999999 - ... >>> 2.000000001 # should not match - ... 1.999999999 - ... >>> 2.00000000001e10 # should match - ... 1.99999999999e10 - ... >>> 2.000000001e10 # should not match - ... 1.999999999e10 - ... ''' - - >>> # Without the flag: - >>> test = doctest.DocTestFinder().find(f)[0] - >>> doctest.DocTestRunner(verbose=False).run(test) - ... # doctest: +ELLIPSIS - ********************************************************************** - File ..., line 4, in f - Failed example: - print 1.1, 'intervening text', 1L # should match - Expected: - 1.1 intervening text 1L - Got: - 1.1 intervening text 1 - ********************************************************************** - File ..., line 6, in f - Failed example: - print 1.0j, 22, 22.0, 1, 1e1 # should match - Expected: - 1j 22.0 22 1 10.0 - Got: - 1j 22 22.0 1 10.0 - ********************************************************************** - File ..., line 12, in f - Failed example: - 2.00000000001 # should match - Expected: - 1.99999999999 - Got: - 2.00000000001 - ********************************************************************** - File ..., line 14, in f - Failed example: - 2.000000001 # should not match - Expected: - 1.999999999 - Got: - 2.0000000010000001 - ********************************************************************** - File ..., line 16, in f - Failed example: - 2.00000000001e10 # should match - Expected: - 1.99999999999e10 - Got: - 20000000000.099998 - ********************************************************************** - File ..., line 18, in f - Failed example: - 2.000000001e10 # should not match - Expected: - 1.999999999e10 - Got: - 20000000010.0 - (6, 6) - - >>> # With the flag: - >>> test = doctest.DocTestFinder().find(f)[0] - >>> flags = doctest.NORMALIZE_NUMBERS - >>> doctest.DocTestRunner(verbose=False, optionflags=flags).run(test) - ... # doctest: +ELLIPSIS - ********************************************************************** - File ..., line 14, in f - Failed example: - 2.000000001 # should not match - Expected: - 1.999999999 - Got: - 2.0000000010000001 - ********************************************************************** - File ..., line 18, in f - Failed example: - 2.000000001e10 # should not match - Expected: - 1.999999999e10 - Got: - 20000000010.0 - (2, 6) - The ELLIPSIS flag causes ellipsis marker ("...") in the expected output to match any substring in the actual output:

1 0

python/dist/src/Doc/lib libdoctest.tex,1.62,1.63
by edloper＠users.sourceforge.net Sept. 28, 2004

Sept. 28, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14073/Doc/lib Modified Files: libdoctest.tex Log Message: Reverted the addition of a NORMALIZE_NUMBERS option, per Tim Peter's request. Tim says that "correct 'fuzzy' comparison of floats cannot be automated." (The motivation behind adding the new option was verifying interactive examples in Python's latex documentation; several such examples use numbers that don't print consistently on different platforms.) Index: libdoctest.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libdoctest.tex,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- libdoctest.tex 28 Sep 2004 04:29:57 -0000 1.62 +++ libdoctest.tex 28 Sep 2004 05:50:57 -0000 1.63 @@ -581,17 +581,6 @@ \end{datadesc} -\begin{datadesc}{NORMALIZE_NUMBERS} - When specified, number literals in the expected output will match - corresponding number literals in the actual output if their values - are equal (to ten digits of precision). For example, \code{1.1} - will match \code{1.1000000000000001}; and \code{1L} will match - \code{1} and \code{1.0}. Currently, \constant{NORMALIZE_NUMBERS} - can fail to normalize numbers when used in conjunction with - ellipsis. In particular, if an ellipsis marker matches one or - more numbers, then number normalization is not supported. -\end{datadesc} - \begin{datadesc}{COMPARISON_FLAGS} A bitmask or'ing together all the comparison flags above. \end{datadesc} @@ -713,7 +702,7 @@ \versionchanged[Constants \constant{DONT_ACCEPT_BLANKLINE}, \constant{NORMALIZE_WHITESPACE}, \constant{ELLIPSIS}, - \constant{IGNORE_EXCEPTION_DETAIL}, \constant{NORMALIZE_NUMBERS}, + \constant{IGNORE_EXCEPTION_DETAIL}, \constant{REPORT_UDIFF}, \constant{REPORT_CDIFF}, \constant{REPORT_NDIFF}, \constant{REPORT_ONLY_FIRST_FAILURE}, \constant{COMPARISON_FLAGS} and \constant{REPORTING_FLAGS} @@ -751,7 +740,6 @@ % Hey! What happened to Monty Python examples? % Tim: ask Guido -- it's his example! -% doctest: ignore \begin{verbatim} >>> foo() {"Hermione": "hippogryph", "Harry": "broomstick"} @@ -759,7 +747,6 @@ is vulnerable! One workaround is to do -% doctest: ignore \begin{verbatim} >>> foo() == {"Hermione": "hippogryph", "Harry": "broomstick"} True @@ -767,7 +754,6 @@ instead. Another is to do -% doctest: ignore \begin{verbatim} >>> d = foo().items() >>> d.sort() @@ -779,7 +765,6 @@ Another bad idea is to print things that embed an object address, like -% doctest: ignore \begin{verbatim} >>> id(1.0) # certain to fail some of the time 7948648 @@ -791,7 +776,6 @@ The \constant{ELLIPSIS} directive gives a nice approach for the last example: -% doctest: ignore \begin{verbatim} >>> C() #doctest: +ELLIPSIS <__main__.C instance at 0x...> @@ -801,7 +785,6 @@ platforms, because Python defers to the platform C library for float formatting, and C libraries vary widely in quality here. -% doctest: ignore \begin{verbatim} >>> 1./7 # risky 0.14285714285714285 @@ -1635,7 +1618,6 @@ Then an interactive Python session may look like this: -% doctest: ignore \begin{verbatim} >>> import a, doctest >>> doctest.testmod(a)

1 0

python/dist/src/Lib doctest.py,1.115,1.116
by edloper＠users.sourceforge.net Sept. 28, 2004

Sept. 28, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14073/Lib Modified Files: doctest.py Log Message: Reverted the addition of a NORMALIZE_NUMBERS option, per Tim Peter's request. Tim says that "correct 'fuzzy' comparison of floats cannot be automated." (The motivation behind adding the new option was verifying interactive examples in Python's latex documentation; several such examples use numbers that don't print consistently on different platforms.) Index: doctest.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/doctest.py,v retrieving revision 1.115 retrieving revision 1.116 diff -u -d -r1.115 -r1.116 --- doctest.py 28 Sep 2004 04:29:57 -0000 1.115 +++ doctest.py 28 Sep 2004 05:50:57 -0000 1.116 @@ -55,7 +55,6 @@ 'NORMALIZE_WHITESPACE', 'ELLIPSIS', 'IGNORE_EXCEPTION_DETAIL', - 'NORMALIZE_NUMBERS', 'COMPARISON_FLAGS', 'REPORT_UDIFF', 'REPORT_CDIFF', @@ -140,14 +139,12 @@ NORMALIZE_WHITESPACE = register_optionflag('NORMALIZE_WHITESPACE') ELLIPSIS = register_optionflag('ELLIPSIS') IGNORE_EXCEPTION_DETAIL = register_optionflag('IGNORE_EXCEPTION_DETAIL') -NORMALIZE_NUMBERS = register_optionflag('NORMALIZE_NUMBERS') COMPARISON_FLAGS = (DONT_ACCEPT_TRUE_FOR_1 | DONT_ACCEPT_BLANKLINE | NORMALIZE_WHITESPACE | ELLIPSIS | - IGNORE_EXCEPTION_DETAIL | - NORMALIZE_NUMBERS) + IGNORE_EXCEPTION_DETAIL) REPORT_UDIFF = register_optionflag('REPORT_UDIFF') REPORT_CDIFF = register_optionflag('REPORT_CDIFF') @@ -280,72 +277,6 @@ if hasattr(self, "softspace"): del self.softspace -# The number of digits of precision that must be equal for -# NORMALIZE_NUMBERS to consider two numbers equal. -_NORMALIZE_NUMBERS_PRECISION_THRESHOLD = 10 - -# A regular expression that matches Python number literals. This is -# used by _normalize_numbers to look for numbers that should be -# normalized. -_NUMBER_LITERAL = re.compile(r''' - (\d+[.]\d*(?:[eE][-+]?\d+)?[jJ]? | # float (w/ digits left of ".") - [.]\d+(?:[eE][-+]?\d+)?[jJ]? | # float (no digits left of ".") - \d+ (?:[eE][-+]?\d+) [jJ]? | # float (no ".", exponent only) - \d [jJ] | # float (no ".", imaginary only) - 0[xX]\d+[lL]? | # hexint - 0[0-7]*[lL]? | # octint or zero - \d+[lL]? ) # decint - ''', re.VERBOSE) - -def _normalize_numbers(want, got): - """ - If all the numbers in `want` and `got` match (one-for-one), then - return a new version of `got` with the exact number strings from - `want` spliced in. Two numbers match if `str` of their float - values are equal. (I.e., `x` matches `y` if - `str(float(x))==str(float(y))`). - """ - want_pieces = _NUMBER_LITERAL.split(want) - got_pieces = _NUMBER_LITERAL.split(got) - - # If they don't have the same number of numbers, fail immediately. - if len(want_pieces) != len(got_pieces): - return got - - # If any individual numbers don't match, then fail. - for i in range(1, len(got_pieces), 2): - w, g = eval(want_pieces[i]), eval(got_pieces[i]) - if not _numbers_match(w, g): - return got - - # Success; replace numbers in got w/ numbers from want. - for i in range(1, len(got_pieces), 2): - got_pieces[i] = want_pieces[i] - return ''.join(got_pieces) - -def _numbers_match(x, y): - """ - A helper function for _normalize_numbers, that returns true if the - numbers `x` and `y` are close enough to match for NORMALIZE_NUMBERS. - """ - # Equal numbers match. - if x == y: - return True - # Split up complex numbers into real & imag. - if isinstance(x, complex): - return (isinstance(y, complex) and - _numbers_match(x.real, y.real) and - _numbers_match(x.imag, y.imag)) - # If the signs are different, they don't match. - if x*y < 0: - return False - # If one is zero and the other isn't, they don't match. - if x==0 or y==0: - return False - # They're not exactly equal, but are they close enough? - threshold = 10**-_NORMALIZE_NUMBERS_PRECISION_THRESHOLD - return (abs(x-y) / min(abs(x), abs(y))) < threshold - # Worst-case linear-time ellipsis matching. def _ellipsis_match(want, got): """ @@ -1572,13 +1503,6 @@ if got == want: return True - # This flag causes doctest to treat numbers that are within a - # small threshold as if they are equal. - if optionflags & NORMALIZE_NUMBERS: - got = _normalize_numbers(want, got) - if got == want: - return True - # The ELLIPSIS flag says to let the sequence "..." in `want` # match any substring in `got`. if optionflags & ELLIPSIS: @@ -1859,7 +1783,6 @@ NORMALIZE_WHITESPACE ELLIPSIS IGNORE_EXCEPTION_DETAIL - NORMALIZE_NUMBERS REPORT_UDIFF REPORT_CDIFF REPORT_NDIFF @@ -1982,7 +1905,6 @@ NORMALIZE_WHITESPACE ELLIPSIS IGNORE_EXCEPTION_DETAIL - NORMALIZE_NUMBERS REPORT_UDIFF REPORT_CDIFF REPORT_NDIFF

1 0

python/dist/src/Lib/email Message.py, 1.32.10.4, 1.32.10.5
by bwarsaw＠users.sourceforge.net Sept. 28, 2004

Sept. 28, 2004

Update of /cvsroot/python/python/dist/src/Lib/email In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4759 Modified Files: Tag: release23-maint Message.py Log Message: __getitem__(): Fix docstring, SF 979924. Index: Message.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/email/Message.py,v retrieving revision 1.32.10.4 retrieving revision 1.32.10.5 diff -u -d -r1.32.10.4 -r1.32.10.5 --- Message.py 16 Aug 2004 15:31:42 -0000 1.32.10.4 +++ Message.py 28 Sep 2004 04:55:34 -0000 1.32.10.5 @@ -298,7 +298,7 @@ Return None if the header is missing instead of raising an exception. Note that if the header appeared multiple times, exactly which - occurrance gets returned is undefined. Use getall() to get all + occurrance gets returned is undefined. Use get_all() to get all the values matching a header field name. """ return self.get(name)

1 0