Mailman 3 September 2004 - Python-checkins

python/dist/src/Doc/lib libheapq.tex,1.9,1.10
by rhettinger＠users.sourceforge.net Sept. 6, 2004

Sept. 6, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29812/Doc/lib Modified Files: libheapq.tex Log Message: Fix erroneous docstring comment. Index: libheapq.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libheapq.tex,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- libheapq.tex 20 Jun 2004 09:07:53 -0000 1.9 +++ libheapq.tex 6 Sep 2004 07:04:09 -0000 1.10 @@ -60,9 +60,10 @@ by \function{heappush()}, and can be more appropriate when using a fixed-size heap. Note that the value returned may be larger than \var{item}! That constrains reasonable uses of this routine -unless written as part of a larger expression: +unless written as part of a conditional replacement: \begin{verbatim} - result = item <= heap[0] and item or heapreplace(heap, item) + if item > heap[0]: + item = heapreplace(heap, item) \end{verbatim} \end{funcdesc}

1 0

python/dist/src/Modules _heapqmodule.c,1.6,1.7
by rhettinger＠users.sourceforge.net Sept. 6, 2004

Sept. 6, 2004

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29812/Modules Modified Files: _heapqmodule.c Log Message: Fix erroneous docstring comment. Index: _heapqmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/_heapqmodule.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- _heapqmodule.c 20 Jun 2004 09:07:52 -0000 1.6 +++ _heapqmodule.c 6 Sep 2004 07:04:08 -0000 1.7 @@ -186,8 +186,9 @@ This is more efficient than heappop() followed by heappush(), and can be\n\ more appropriate when using a fixed-size heap. Note that the value\n\ returned may be larger than item! That constrains reasonable uses of\n\ -this routine unless written as part of a larger expression:\n\n\ - result = item <= heap[0] and item or heapreplace(heap, item)\n"); +this routine unless written as part of a conditional replacement:\n\n\ + if item > heap[0]:\n\ + item = heapreplace(heap, item)\n"); static PyObject * heapify(PyObject *self, PyObject *heap)

1 0

python/dist/src/Lib heapq.py,1.25,1.26
by rhettinger＠users.sourceforge.net Sept. 6, 2004

Sept. 6, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29812/Lib Modified Files: heapq.py Log Message: Fix erroneous docstring comment. Index: heapq.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/heapq.py,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- heapq.py 20 Jun 2004 09:07:52 -0000 1.25 +++ heapq.py 6 Sep 2004 07:04:09 -0000 1.26 @@ -154,9 +154,10 @@ This is more efficient than heappop() followed by heappush(), and can be more appropriate when using a fixed-size heap. Note that the value returned may be larger than item! That constrains reasonable uses of - this routine unless written as part of a larger expression: + this routine unless written as part of a conditional replacement: - result = item <= heap[0] and item or heapreplace(heap, item) + if item > heap[0]: + item = heapreplace(heap, item) """ returnitem = heap[0] # raises appropriate IndexError if heap is empty heap[0] = item

1 0

python/dist/src/Tools/msi msi.py,1.5,1.6
by loewis＠users.sourceforge.net Sept. 6, 2004

Sept. 6, 2004

Update of /cvsroot/python/python/dist/src/Tools/msi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24599 Modified Files: msi.py Log Message: Add test_difflib_expect.html. Fix open Verbs. Properly add "Edit with IDLE" to TclTk feature. Index: msi.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Tools/msi/msi.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- msi.py 1 Sep 2004 14:51:06 -0000 1.5 +++ msi.py 6 Sep 2004 06:31:12 -0000 1.6 @@ -880,6 +880,7 @@ lib.add_file("test.xml") lib.add_file("test.xml.out") lib.add_file("testtar.tar") + lib.add_file("test_difflib_expect.html") lib.glob("*.uue") lib.add_file("readme.txt", src="README") if dir=='decimaltestdata': @@ -1012,7 +1013,7 @@ # will cause pythonw.exe to be installed. tcldata = [] if have_tcl: - tcltkdata = [(tcltk.id, "REGISTRY.tcl"), + tcldata = [(tcltk.id, "REGISTRY.tcl"), (tcltk.id, "pythonw.exe")] add_data(db, "FeatureComponents", [(default_feature.id, "REGISTRY"), @@ -1032,10 +1033,10 @@ ("pyo", "python.exe", "Python.CompiledFile", None, default_feature.id)]) # add_data(db, "MIME") XXX add_data(db, "Verb", - [("py", "open", 1, None, r'-n -e "%1"'), - ("pyw", "open", 1, None, r'-n -e "%1"'), - ("pyc", "open", 1, None, r'-n -e "%1"'), - ("pyo", "open", 1, None, r'-n -e "%1"')]) + [("py", "open", 1, None, r'"%1"'), + ("pyw", "open", 1, None, r'"%1"'), + ("pyc", "open", 1, None, r'"%1"'), + ("pyo", "open", 1, None, r'"%1"')]) add_data(db, "ProgId", [("Python.File", None, None, "Python File", "python_icon.exe", 0), ("Python.NoConFile", None, None, "Python File (no console)", "python_icon.exe", 0),

1 0

python/dist/src/Doc/lib libstring.tex,1.60,1.61
by rhettinger＠users.sourceforge.net Sept. 6, 2004

Sept. 6, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11082 Modified Files: libstring.tex Log Message: Markup nits. Index: libstring.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libstring.tex,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- libstring.tex 25 Aug 2004 03:09:58 -0000 1.60 +++ libstring.tex 6 Sep 2004 01:01:08 -0000 1.61 @@ -105,15 +105,17 @@ \item \samp{\$\{identifier\}} is equivalent to \samp{\$identifier}. It is required when valid identifier characters follow the placeholder but are - not part of the placeholder, e.g. "\$\{noun\}ification". + not part of the placeholder, such as "\$\{noun\}ification". \end{itemize} Any other appearance of \samp{\$} in the string will result in a \exception{ValueError} being raised. +\versionadded{2.4} + Template strings are used just like normal strings, in that the modulus operator is used to interpolate a dictionary of values into a Template string, -e.g.: +for example: \begin{verbatim} >>> from string import Template @@ -151,7 +153,7 @@ placeholder rule: \begin{itemize} -\item \var{escaped} -- This group matches the escape sequence, i.e. \samp{\$\$} +\item \var{escaped} -- This group matches the escape sequence, \samp{\$\$}, in the default pattern. \item \var{named} -- This group matches the unbraced placeholder name; it should not include the \samp{\$} in capturing group. @@ -242,7 +244,7 @@ \end{funcdesc} \begin{funcdesc}{expandtabs}{s\optional{, tabsize}} - Expand tabs in a string, i.e.\ replace them by one or more spaces, + Expand tabs in a string replacing them by one or more spaces, depending on the current column and the given tab size. The column number is reset to zero after each newline occurring in the string. This doesn't understand other non-printing characters or escape

1 0

python/dist/src/Doc/lib libstdtypes.tex, 1.164, 1.165
by rhettinger＠users.sourceforge.net Sept. 6, 2004

Sept. 6, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8146 Modified Files: libstdtypes.tex Log Message: Add missing close parenthesis. Index: libstdtypes.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libstdtypes.tex,v retrieving revision 1.164 retrieving revision 1.165 diff -u -d -r1.164 -r1.165 --- libstdtypes.tex 6 Sep 2004 00:12:04 -0000 1.164 +++ libstdtypes.tex 6 Sep 2004 00:42:14 -0000 1.165 @@ -755,16 +755,16 @@ is no limit on the number of splits (all possible splits are made). Consecutive delimiters are not grouped together and are deemed to delimit empty strings (for example, \samp{'1,,2'.split(',')} -returns \samp{['1', '', '2']}. The \var{sep} argument may consist of +returns \samp{['1', '', '2']}). The \var{sep} argument may consist of multiple characters (for example, \samp{'1, 2, 3'.split(', ')} returns -\samp{['1', '2', '3']}. Splitting an empty string with a specified +\samp{['1', '2', '3']}). Splitting an empty string with a specified separator returns an empty list. If \var{sep} is not specified or is \code{None}, a different splitting algorithm is applied. Words are separated by arbitrary length strings of whitespace characters (spaces, tabs, newlines, returns, and formfeeds). Consecutive whitespace delimiters are treated as a single delimiter -(\samp{'1 2 3'.split()} returns \samp{['1', '2', '3']}. Splitting an +(\samp{'1 2 3'.split()} returns \samp{['1', '2', '3']}). Splitting an empty string returns \samp{['']}. \end{methoddesc}

1 0

python/dist/src/Doc/lib libstdtypes.tex, 1.163, 1.164
by rhettinger＠users.sourceforge.net Sept. 6, 2004

Sept. 6, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3272 Modified Files: libstdtypes.tex Log Message: SF bug #901654: split method documentation can be improved * Discuss the algorithmic distinctions between s.split() and s.split(sep). * Document the split behavior for empty strings. * Note the behavior when maxsplit is zero. * Include short examples. Index: libstdtypes.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libstdtypes.tex,v retrieving revision 1.163 retrieving revision 1.164 diff -u -d -r1.163 -r1.164 --- libstdtypes.tex 12 Aug 2004 18:12:43 -0000 1.163 +++ libstdtypes.tex 6 Sep 2004 00:12:04 -0000 1.164 @@ -750,8 +750,22 @@ \begin{methoddesc}[string]{split}{\optional{sep \optional{,maxsplit}}} Return a list of the words in the string, using \var{sep} as the delimiter string. If \var{maxsplit} is given, at most \var{maxsplit} -splits are done. If \var{sep} is not specified or \code{None}, any -whitespace string is a separator. +splits are done. (thus, the list will have at most \code{\var{maxsplit}+1} +elements). If \var{maxsplit} is not specified or is zero, then there +is no limit on the number of splits (all possible splits are made). +Consecutive delimiters are not grouped together and are +deemed to delimit empty strings (for example, \samp{'1,,2'.split(',')} +returns \samp{['1', '', '2']}. The \var{sep} argument may consist of +multiple characters (for example, \samp{'1, 2, 3'.split(', ')} returns +\samp{['1', '2', '3']}. Splitting an empty string with a specified +separator returns an empty list. + +If \var{sep} is not specified or is \code{None}, a different splitting +algorithm is applied. Words are separated by arbitrary length strings of +whitespace characters (spaces, tabs, newlines, returns, and formfeeds). +Consecutive whitespace delimiters are treated as a single delimiter +(\samp{'1 2 3'.split()} returns \samp{['1', '2', '3']}. Splitting an +empty string returns \samp{['']}. \end{methoddesc} \begin{methoddesc}[string]{splitlines}{\optional{keepends}}

1 0

python/dist/src/Doc/lib libxmlrpclib.tex, 1.17, 1.18
by bcannon＠users.sourceforge.net Sept. 5, 2004

Sept. 5, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22126/Doc/lib Modified Files: libxmlrpclib.tex Log Message: Rework some wording. Index: libxmlrpclib.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libxmlrpclib.tex,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- libxmlrpclib.tex 7 Aug 2004 17:39:35 -0000 1.17 +++ libxmlrpclib.tex 5 Sep 2004 19:42:15 -0000 1.18 @@ -170,7 +170,7 @@ \subsection{DateTime Objects \label{datetime-objects}} -This class may initialized from date in seconds since the epoch, a +This class may be initialized with seconds since the epoch, a time tuple, or an ISO 8601 time/date string. It has the following methods, supported mainly for internal use by the marshalling/unmarshalling code:

1 0

python/nondist/sandbox/statistics statistics.py, 1.12, 1.13 test_statistics.py, 1.3, 1.4
by rhettinger＠users.sourceforge.net Sept. 5, 2004

Sept. 5, 2004

Update of /cvsroot/python/python/nondist/sandbox/statistics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2748 Modified Files: statistics.py test_statistics.py Log Message: * removed nlargest() and nsmallest() which are now in the heapq module. * removed product() which did not fit with the rest of the module. * merged mean() and variance() into one function returning (count, mean, variance) after a single pass. * verified that the functions work with Decimal objects as well as floats. Index: statistics.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/statistics/statistics.py,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- statistics.py 2 Apr 2004 06:09:45 -0000 1.12 +++ statistics.py 5 Sep 2004 11:42:35 -0000 1.13 @@ -1,52 +1,8 @@ -"""statistics.py A collection of functions for summarizing data - -The module focuses on everyday data reduction functions and omits more -sophisticated statistical tools. - -Unless otherwise noted, each function is designed to accept any iterable -and make only a single pass over the data. This makes the tools suitable -for use with generator expressions and keeps them as memory friendly as -possible. Except for median() and select(), the use of iterators means -that the dataset can be processed one element at a time without bringing -it all into memory. - -The functions, nlargest and nsmallest, are also designed to use the fewest -possible data comparisions and the data elements may be non-numerical (such -as strings) as long they support __cmp__ or __lt__. - -Written and maintained by Raymond D. Hettinger <python at rcn.com>. -Copyright (c) 2004 Python Software Foundation. All rights reserved. - -""" - from __future__ import division -import operator -import itertools -import heapq -import bisect import random -__all__ = ['mean', 'median', 'nlargest', 'nsmallest', - 'product', 'select', 'stddev'] - -def mean(data): - """Compute the arithmetic mean of a data sample""" - try: - cnt = len(data) # do it the fast way if possible - except TypeError: - cum = 0.0 - for cnt, elem in enumerate(data): - cum += elem - cnt += 1 # enumerate counts from zero - else: - cum = sum(data, 0.0) - try: - return cum / cnt - except ZeroDivisionError: - raise ValueError('data must have at least one element') - -def variance(data, sample=True): - """Computes the variance of the dataset. +def describe(data, sample=True): + """Computes the size, mean, and variance of the dataset. If sample is True, computes the variance with an n-1 divisor to reflect the additional degree of freedom in sampled data. If sample is False, @@ -80,25 +36,16 @@ m = newm if sample: try: - return (s / (k-1)) # sample variance + return (k, m, s / (k-1)) # sample variance except ZeroDivisionError: - raise ValueError('sample variance requires at least two elements') + return (k, m, None) else: - return (s / k) # population variance - -def stddev(data, sample=True): - """Computes the standard deviation of the dataset. - - If sample is True, computes the standard deviation with an n-1 divisor - for an unbiased estimator for a data sample. If sample is False, computes - with a divisor of n, giving the standard deviation for a complete population. - """ - return variance(data, sample) ** 0.5 + return (k, m, s / k, m) # population variance def select(data, n): """Find the nth rank ordered element (the least value has rank 0). - Equivalent to sorted(data)[n] + Equivalent to sorted(data)[n] but runs in O(n) time. """ data = list(data) if not 0 <= n < len(data): @@ -138,45 +85,12 @@ return select(data, n//2) return (select(data, n//2) + select(data, n//2-1)) / 2 -def product(iterable): - """Compute the product of the data elements""" - return reduce(operator.mul, iterable, 1) - -def nlargest(iterable, n=1): # XXX implement key= - """Find the n largest elements in the dataset""" - ## When collections.fibheap is available, use it instead of heapq - it = iter(iterable) - result = list(itertools.islice(it, n)) - heapq.heapify(result) - if len(result) == 0: - raise ValueError('data must have at least one element') - subst = heapq.heapreplace - sol = result[0] # sol --> Smallest of the nlargest - for elem in it: - if (elem > sol): - subst(result, elem) - sol = result[0] - result.sort(reverse=True) - return result - -def nsmallest(iterable, n=1): - """Find the n smallest elements in the dataset""" - ## When collections.fibheap is available, use it instead of bisect - it = iter(iterable) - result = sorted(itertools.islice(it, 0, n)) - if len(result) == 0: - raise ValueError('data must have at least one element') - insort = bisect.insort - pop = result.pop - los = result[-1] # los --> Largest of the nsmallest - for elem in it: - if (elem < los): - insort(result, elem) - pop() - los = result[-1] - return result - -XXX = """ - Other possible functions include data groupers for - binning, counting, and splitting into equivalence classes. -""" +if __name__ == '__main__': + print stats([3,4,5]) == (3, 4.0, 1.0) + print stats([2,4,6]) == (3, 4.0, 4.0) + print stats([3,5,7]) == (3, 5.0, 4.0) + from decimal import Decimal + print stats(map(Decimal,[3,5,7])) == (3, Decimal("5"), Decimal("4")) + print median(map(Decimal,[3,5,7])) == Decimal('5') + print median(map(Decimal,[3,5,7,9])) == Decimal('6') + print median(map(Decimal,[3,6,7,9])) == Decimal('6.5') Index: test_statistics.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/statistics/test_statistics.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- test_statistics.py 29 Feb 2004 09:12:28 -0000 1.3 +++ test_statistics.py 5 Sep 2004 11:42:36 -0000 1.4 @@ -1,5 +1,5 @@ from __future__ import division -from statistics import mean, stddev, product, nlargest, nsmallest, select, median +from statistics import describe, select, median ### UNITTESTS ################################################# @@ -15,6 +15,8 @@ class TestStats(unittest.TestCase): def test_mean(self): + def mean(data): + return describe(data)[1] self.assertEqual(mean(range(6)), 15/6.0) self.assertEqual(mean(g(6)), 15/6.0) self.assertEqual(mean([10]), 10) @@ -22,11 +24,14 @@ self.assertRaises(TypeError, mean, 'abc') def test_stddev(self): + def stddev(data, *args): + var = describe(data, *args)[2] + return var and var ** 0.5 or var self.assertEqual(stddev([10,15,20]), 5) self.assertEqual(round(stddev([11.1,4,9,13]), 3), 3.878) self.assertEqual(round(stddev([11.1,4,9,13], False), 3), 3.358) self.assertEqual(stddev([10], False), 0.0) - self.assertRaises(ValueError, stddev, [1]) + self.assertEqual(stddev([1]), None) self.assertRaises(ValueError, stddev, [], False) def test_median(self): @@ -42,13 +47,6 @@ self.assertEqual(median([30,10,2]), 10) self.assertRaises(ValueError, median, []) - def test_product(self): - self.assertEqual(product(range(1, 5)), 24) - def g(lo, hi): - for i in xrange(lo, hi): - yield i - self.assertEqual(product(g(1, 5)), 24) - def test_select(self): testdata = range(2000) + [20] * 500 + [85] * 500 sorteddata = sorted(testdata) @@ -74,30 +72,6 @@ self.assertRaises(ValueError, select, a, n+1) - def test_nlargest(self): - n = 10 - data = range(n) - random.shuffle(data) - copy = data[:] - self.assertEqual(nlargest(data), [n-1]) - self.assertRaises(ValueError, nlargest, data, 0) - for i in xrange(1, n+1): - self.assertEqual(nlargest(data, i), range(n-1, n-i-1, -1)) - self.assertEqual(data, copy) - self.assertEqual(nlargest('abcde', 3), list('edc')) - - def test_nsmallest(self): - n = 10 - data = range(n) - random.shuffle(data) - copy = data[:] - self.assertEqual(nsmallest(data), [0]) - self.assertRaises(ValueError, nlargest, data, 0) - for i in xrange(1, n+1): - self.assertEqual(nsmallest(data, i), range(i)) - self.assertEqual(data, copy) - self.assertEqual(nsmallest('abcde', 3), list('abc')) - if __name__ == '__main__': suite = unittest.TestSuite() suite.addTest(unittest.makeSuite(TestStats))

1 0

python/dist/src/Lib/test test_random.py, 1.19, 1.20
by rhettinger＠users.sourceforge.net Sept. 5, 2004

Sept. 5, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18618/test Modified Files: test_random.py Log Message: Fulfill Martin's request to use try/except rather than a "look before you leap" approach. Makes the early call to os.urandom() unnecessary. Index: test_random.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_random.py,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- test_random.py 4 Sep 2004 20:13:29 -0000 1.19 +++ test_random.py 5 Sep 2004 00:00:42 -0000 1.20 @@ -495,7 +495,11 @@ TestDistributions, TestModule] - if random._urandom is not None: + try: + random.HardwareRandom().random() + except NotImplementedError: + pass + else: testclasses.append(HardwareRandom_TestBasicOps) test_support.run_unittest(*testclasses)

1 0