Mailman 3 September 2004 - Python-checkins

python/dist/src/Doc/tut tut.tex,1.251,1.252
by jlgijsbers＠users.sourceforge.net Sept. 25, 2004

Sept. 25, 2004

Update of /cvsroot/python/python/dist/src/Doc/tut In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13450 Modified Files: tut.tex Log Message: Raymond observed that sometimes it's better not to link modules, so I reverted part of my previous last changes. Index: tut.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/tut/tut.tex,v retrieving revision 1.251 retrieving revision 1.252 diff -u -d -r1.251 -r1.252 --- tut.tex 24 Sep 2004 23:25:25 -0000 1.251 +++ tut.tex 25 Sep 2004 00:55:38 -0000 1.252 @@ -4682,9 +4682,9 @@ \end{verbatim} In contrast to \module{timeit}'s fine level of granularity, the -\ulink{\module{profile}}{../lib/module-profile.html} and -\ulink{\module{pstats}}{../lib/module-pstats.html} modules provide tools for -identifying time critical sections in larger blocks of code. +\ulink{\module{profile}}{../lib/module-profile.html} and \module{pstats} +modules provide tools for identifying time critical sections in larger blocks +of code. \section{Quality Control\label{quality-control}} @@ -4744,10 +4744,9 @@ Despite the names, no direct knowledge or handling of XML is needed. \item The \ulink{\module{email}}{../lib/module-email.html} package is a library for managing email messages, including MIME and other RFC 2822-based message - documents. Unlike \ulink{\module{smptlib}}{../lib/module-smtplib.html} and - \ulink{\module{poplib}}{../lib/module-poplib.html} which actually send and - receive messages, the email package has a complete toolset for building or - decoding complex message structures (including attachments) and for + documents. Unlike \module{smptlib} and \module{poplib} which actually send + and receive messages, the email package has a complete toolset for building + or decoding complex message structures (including attachments) and for implementing internet encoding and header protocols. \item The \ulink{\module{xml.dom}}{../lib/module-xml.dom.html} and \ulink{\module{xml.sax}}{../lib/module-xml.sax.html} packages provide robust

1 0

python/dist/src/Doc/lib libdoctest.tex,1.46,1.47
by tim_one＠users.sourceforge.net Sept. 25, 2004

Sept. 25, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12175/Doc/lib Modified Files: libdoctest.tex Log Message: Beef up the section on testfile(), giving a complete example in reStructuredText format. Remove words describing the return value of testmod() and testfile() in the intro sections, since it's never useful in such simple cases. Index: libdoctest.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libdoctest.tex,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- libdoctest.tex 25 Sep 2004 00:11:43 -0000 1.46 +++ libdoctest.tex 25 Sep 2004 00:49:53 -0000 1.47 @@ -165,14 +165,13 @@ \begin{verbatim} def _test(): import doctest - return doctest.testmod() + doctest.testmod() if __name__ == "__main__": _test() \end{verbatim} -\module{doctest} then examines docstrings in the module calling -\function{testmod()}. +\module{doctest} then examines docstrings in module \module{M}. Running the module as a script causes the examples in the docstrings to get executed and verified: @@ -184,7 +183,7 @@ This won't display anything unless an example fails, in which case the failing example(s) and the cause(s) of the failure(s) are printed to stdout, and the final line of output is -\samp{'***Test Failed*** \var{N} failures.'}, where \var{N} is the +\samp{***Test Failed*** \var{N} failures.}, where \var{N} is the number of examples that failed. Run it with the \programopt{-v} switch instead: @@ -199,12 +198,8 @@ You can force verbose mode by passing \code{verbose=True} to \function{testmod()}, or prohibit it by passing \code{verbose=False}. In either of those cases, -\code{sys.argv} is not examined by \function{testmod()}. - -In any case, \function{testmod()} returns a 2-tuple of ints -\samp{(\var{failure_count}, \var{test_count})}, where -\var{failure_count} is the number of docstring examples that failed -and \var{test_count} is the total number of docstring examples tested. +\code{sys.argv} is not examined by \function{testmod()} (so passing +\programopt{-v} or not has no effect). For more information on \function{testmod()}, see section~\ref{doctest-basic-api}. @@ -218,15 +213,50 @@ \begin{verbatim} import doctest -doctest.testfile("mytests.txt") +doctest.testfile("example.txt") \end{verbatim} -This short script will execute and verify any interactive Python -examples contained in the file \file{mytests.txt}. As with -\function{testmod()}, it won't display anything unless an example -fails. If an example does fail, then the failing example(s) and the -cause(s) of the failure(s) are printed to stdout, using the same -format as \function{testmod()}. +That short script executes and verifies any interactive Python +examples contained in the file \file{example.txt}. The file content +is treated as if it were a single giant docstring; the file doesn't +need to contain a Python program! For example, perhaps \file{example.txt} +contains this: + +\begin{verbatim} +The ``example`` module +====================== + +Using ``factorial`` +------------------- + +This is an example text file in reStructuredText format. First import +``factorial`` from the ``example`` module: + + >>> from example import factorial + +Now use it: + + >>> factorial(6) + 120 +\end{verbatim} + +Running \code{doctest.testfile("example.txt")} then finds the error +in this documentation: + +\begin{verbatim} +File "./example.txt", line 14, in example.txt +Failed example: + factorial(6) +Expected: + 120 +Got: + 720 +\end{verbatim} + +As with \function{testmod()}, \function{testfile()} won't display anything +unless an example fails. If an example does fail, then the failing +example(s) and the cause(s) of the failure(s) are printed to stdout, using +the same format as \function{testmod()}. By default, \function{testfile()} looks for files in the calling module's directory. See section~\ref{doctest-basic-api} for a @@ -235,11 +265,7 @@ Like \function{testmod()}, \function{testfile()}'s verbosity can be set with the \programopt{-v} command-line switch or with the optional -keyword argument \var{verbose}. And like \function{testmod()}, -\function{testfile()} returns a 2-tuple of ints -\samp{(\var{failure_count}, \var{test_count})}, where -\var{failure_count} is the number of docstring examples that failed -and \var{test_count} is the total number of docstring examples tested. +keyword argument \var{verbose}. For more information on \function{testfile()}, see section~\ref{doctest-basic-api}.

1 0

python/dist/src/Doc/lib libdoctest.tex,1.45,1.46
by tim_one＠users.sourceforge.net Sept. 25, 2004

Sept. 25, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6112/Doc/lib Modified Files: libdoctest.tex Log Message: Typo. Index: libdoctest.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libdoctest.tex,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- libdoctest.tex 25 Sep 2004 00:10:53 -0000 1.45 +++ libdoctest.tex 25 Sep 2004 00:11:43 -0000 1.46 @@ -20,7 +20,7 @@ \item To perform regression testing by verifying that interactive examples from a test file or a test object work as expected. \item To write tutorial documentation for a package, liberally - illustrated with input-ouput examples. Depending on whether + illustrated with input-output examples. Depending on whether the examples or the expository text are emphasized, this has the flavor of "literate testing" or "executable documentation". \end{itemize}

1 0

python/dist/src/Doc/lib libdoctest.tex,1.44,1.45
by tim_one＠users.sourceforge.net Sept. 25, 2004

Sept. 25, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5908/Doc/lib Modified Files: libdoctest.tex Log Message: Since the LaTeX isn't doctest'ed, examples are always wrong <wink>. Index: libdoctest.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libdoctest.tex,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- libdoctest.tex 21 Sep 2004 03:00:51 -0000 1.44 +++ libdoctest.tex 25 Sep 2004 00:10:53 -0000 1.45 @@ -2,8 +2,8 @@ Test interactive Python examples} \declaremodule{standard}{doctest} -\moduleauthor{Tim Peters}{tim_one(a)users.sourceforge.net} -\sectionauthor{Tim Peters}{tim_one(a)users.sourceforge.net} +\moduleauthor{Tim Peters}{tim(a)python.org} +\sectionauthor{Tim Peters}{tim(a)python.org} \sectionauthor{Moshe Zadka}{moshez(a)debian.org} \sectionauthor{Edward Loper}{edloper(a)users.sourceforge.net} @@ -11,17 +11,21 @@ The \module{doctest} module searches for pieces of text that look like interactive Python sessions, and then executes those sessions to -verify that they work exactly as shown. There are two common ways to +verify that they work exactly as shown. There are several common ways to use doctest: -\begin{enumerate} +\begin{itemize} \item To check that a module's docstrings are up-to-date by verifying that all interactive examples still work as documented. \item To perform regression testing by verifying that interactive examples from a test file or a test object work as expected. -\end{enumerate} +\item To write tutorial documentation for a package, liberally + illustrated with input-ouput examples. Depending on whether + the examples or the expository text are emphasized, this has + the flavor of "literate testing" or "executable documentation". +\end{itemize} -Here's a complete but small example: +Here's a complete but small example module: \begin{verbatim} """ @@ -81,16 +85,13 @@ result = 1 factor = 2 while factor <= n: - try: - result *= factor - except OverflowError: - result *= long(factor) + result *= factor factor += 1 return result def _test(): import doctest - return doctest.testmod() + doctest.testmod() if __name__ == "__main__": _test() @@ -138,10 +139,12 @@ ... OverflowError: n too large ok +1 items had no tests: + __main__._test 2 items passed all tests: - 1 tests in example - 8 tests in example.factorial -9 tests in 2 items. + 1 tests in __main__ + 8 tests in __main__.factorial +9 tests in 3 items. 9 passed and 0 failed. Test passed. $ @@ -150,9 +153,10 @@ That's all you need to know to start making productive use of \module{doctest}! Jump in. The following sections provide full details. Note that there are many examples of doctests in -the standard Python test suite and libraries. +the standard Python test suite and libraries. Especially useful examples +can be found in the standard test file \file{Lib/test/test_doctest.py}. -\subsection{Simple Usage: Checking Examples in +\subsection{Simple Usage: Checking Examples in Docstrings\label{doctest-simple-testmod}} The simplest way to start using doctest (but not necessarily the way @@ -1262,7 +1266,7 @@ \class{DocTestFinder} defines the following method: -\begin{methoddesc}{find}{obj\optional{, name}\optional{, +\begin{methoddesc}{find}{obj\optional{, name}\optional{, module}\optional{, globs}\optional{, extraglobs}} Return a list of the \class{DocTest}s that are defined by \var{obj}'s docstring, or by any of its contained objects'

1 0

python/dist/src/Doc/tut tut.tex,1.250,1.251
by jlgijsbers＠users.sourceforge.net Sept. 24, 2004

Sept. 24, 2004

Update of /cvsroot/python/python/dist/src/Doc/tut In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28003 Modified Files: tut.tex Log Message: - Use itemize instead of plain-text '*' for marking up a list. - Add more ulink's to modules (this should probably become a standard macro). Index: tut.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/tut/tut.tex,v retrieving revision 1.250 retrieving revision 1.251 diff -u -d -r1.250 -r1.251 --- tut.tex 14 Sep 2004 06:32:20 -0000 1.250 +++ tut.tex 24 Sep 2004 23:25:25 -0000 1.251 @@ -4682,9 +4682,9 @@ \end{verbatim} In contrast to \module{timeit}'s fine level of granularity, the -\ulink{\module{profile}}{../lib/module-profile.html} and \module{pstats} -modules provide tools for identifying time critical sections in larger -blocks of code. +\ulink{\module{profile}}{../lib/module-profile.html} and +\ulink{\module{pstats}}{../lib/module-pstats.html} modules provide tools for +identifying time critical sections in larger blocks of code. \section{Quality Control\label{quality-control}} @@ -4737,32 +4737,30 @@ through the sophisticated and robust capabilities of its larger packages. For example: -* The \ulink{\module{xmlrpclib}}{../lib/module-xmlrpclib.html} and -\ulink{\module{SimpleXMLRPCServer}}{../lib/module-SimpleXMLRPCServer.html} -modules make implementing remote procedure calls into an almost trivial -task. Despite the names, no direct knowledge or handling of XML is needed. - -* The \ulink{\module{email}}{../lib/module-email.html} -package is a library for managing email messages, -including MIME and other RFC 2822-based message documents. Unlike -\module{smtplib} and \module{poplib} which actually send and receive -messages, the email package has a complete toolset for building or -decoding complex message structures (including attachments) -and for implementing internet encoding and header protocols. - -* The \ulink{\module{xml.dom}}{../lib/module-xml.dom.html} and -\ulink{\module{xml.sax}}{../lib/module-xml.sax.html} packages provide -robust support for parsing this popular data interchange format. Likewise, -the \module{csv} module supports direct reads and writes in a common -database format. Together, these modules and packages greatly simplify -data interchange between python applications and other tools. - -* Internationalization is supported by a number of modules including -\ulink{\module{gettext}}{../lib/module-gettext.html}, -\ulink{\module{locale}}{../lib/module-locale.html}, and the -\ulink{\module{codecs}}{../lib/module-codecs.html} package. - - +\begin{itemize} +\item The \ulink{\module{xmlrpclib}}{../lib/module-xmlrpclib.html} and + \ulink{\module{SimpleXMLRPCServer}}{../lib/module-SimpleXMLRPCServer.html} + modules make implementing remote procedure calls into an almost trivial task. + Despite the names, no direct knowledge or handling of XML is needed. +\item The \ulink{\module{email}}{../lib/module-email.html} package is a library + for managing email messages, including MIME and other RFC 2822-based message + documents. Unlike \ulink{\module{smptlib}}{../lib/module-smtplib.html} and + \ulink{\module{poplib}}{../lib/module-poplib.html} which actually send and + receive messages, the email package has a complete toolset for building or + decoding complex message structures (including attachments) and for + implementing internet encoding and header protocols. +\item The \ulink{\module{xml.dom}}{../lib/module-xml.dom.html} and + \ulink{\module{xml.sax}}{../lib/module-xml.sax.html} packages provide robust + support for parsing this popular data interchange format. Likewise, the + \ulink{\module{csv}}{../lib/module-csv.html} module supports direct reads and + writes in a common database format. Together, these modules and packages + greatly simplify data interchange between python applications and other + tools. +\item Internationalization is supported by a number of modules including + \ulink{\module{gettext}}{../lib/module-gettext.html}, + \ulink{\module{locale}}{../lib/module-locale.html}, and the + \ulink{\module{codecs}}{../lib/module-codecs.html} package. +\end{itemize} \chapter{Brief Tour of the Standard Library -- Part II\label{briefTourTwo}}

1 0

python/dist/src/Lib/test test_types.py,1.62,1.63
by tim_one＠users.sourceforge.net Sept. 24, 2004

Sept. 24, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25322/Lib/test Modified Files: test_types.py Log Message: Whitespace normalization. Index: test_types.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_types.py,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- test_types.py 24 Sep 2004 19:18:42 -0000 1.62 +++ test_types.py 24 Sep 2004 23:16:41 -0000 1.63 @@ -261,7 +261,7 @@ if str(buffer(buffer('asdf', 0, 2), 0, 5000)) != 'as': raise TestFailed, 'composing length-specified buffer failed' if str(buffer(buffer('asdf', 0, 2), 0, -1)) != 'as': - raise TestFailed, 'composing length-specified buffer failed' + raise TestFailed, 'composing length-specified buffer failed' if str(buffer(buffer('asdf', 0, 2), 1, 2)) != 's': raise TestFailed, 'composing length-specified buffer failed'

1 0

python/dist/src/Lib/test test_unpack.py,1.7,1.8
by jlgijsbers＠users.sourceforge.net Sept. 24, 2004

Sept. 24, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4712 Modified Files: test_unpack.py Log Message: Port test_unpack to doctest (patch #736962). Index: test_unpack.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_unpack.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- test_unpack.py 30 Jul 2002 23:27:12 -0000 1.7 +++ test_unpack.py 24 Sep 2004 21:36:52 -0000 1.8 @@ -1,144 +1,131 @@ -from test.test_support import TestFailed, verbose +doctests = """ -t = (1, 2, 3) -l = [4, 5, 6] +Unpack tuple -class Seq: - def __getitem__(self, i): - if i >= 0 and i < 3: return i - raise IndexError + >>> t = (1, 2, 3) + >>> a, b, c = t + >>> a == 1 and b == 2 and c == 3 + True -a = -1 -b = -1 -c = -1 +Unpack list -# unpack tuple -if verbose: - print 'unpack tuple' -a, b, c = t -if a != 1 or b != 2 or c != 3: - raise TestFailed + >>> l = [4, 5, 6] + >>> a, b, c = l + >>> a == 4 and b == 5 and c == 6 + True -# unpack list -if verbose: - print 'unpack list' -a, b, c = l -if a != 4 or b != 5 or c != 6: - raise TestFailed +Unpack implied tuple -# unpack implied tuple -if verbose: - print 'unpack implied tuple' -a, b, c = 7, 8, 9 -if a != 7 or b != 8 or c != 9: - raise TestFailed + >>> a, b, c = 7, 8, 9 + >>> a == 7 and b == 8 and c == 9 + True -# unpack string... fun! -if verbose: - print 'unpack string' -a, b, c = 'one' -if a != 'o' or b != 'n' or c != 'e': - raise TestFailed +Unpack string... fun! -# unpack generic sequence -if verbose: - print 'unpack sequence' -a, b, c = Seq() -if a != 0 or b != 1 or c != 2: - raise TestFailed + >>> a, b, c = 'one' + >>> a == 'o' and b == 'n' and c == 'e' + True -# single element unpacking, with extra syntax -if verbose: - print 'unpack single tuple/list' -st = (99,) -sl = [100] -a, = st -if a != 99: - raise TestFailed -b, = sl -if b != 100: - raise TestFailed +Unpack generic sequence -# now for some failures + >>> class Seq: + ... def __getitem__(self, i): + ... if i >= 0 and i < 3: return i + ... raise IndexError + ... + >>> a, b, c = Seq() + >>> a == 0 and b == 1 and c == 2 + True -# unpacking non-sequence -if verbose: - print 'unpack non-sequence' -try: - a, b, c = 7 - raise TestFailed -except TypeError: - pass +Single element unpacking, with extra syntax + >>> st = (99,) + >>> sl = [100] + >>> a, = st + >>> a + 99 + >>> b, = sl + >>> b + 100 -# unpacking tuple of wrong size -if verbose: - print 'unpack tuple wrong size' -try: - a, b = t - raise TestFailed -except ValueError: - pass +Now for some failures -# unpacking list of wrong size -if verbose: - print 'unpack list wrong size' -try: - a, b = l - raise TestFailed -except ValueError: - pass +Unpacking non-sequence + >>> a, b, c = 7 + Traceback (most recent call last): + ... + TypeError: unpack non-sequence -# unpacking sequence too short -if verbose: - print 'unpack sequence too short' -try: - a, b, c, d = Seq() - raise TestFailed -except ValueError: - pass +Unpacking tuple of wrong size + >>> a, b = t + Traceback (most recent call last): + ... + ValueError: too many values to unpack -# unpacking sequence too long -if verbose: - print 'unpack sequence too long' -try: - a, b = Seq() - raise TestFailed -except ValueError: - pass +Unpacking tuple of wrong size + >>> a, b = l + Traceback (most recent call last): + ... + ValueError: too many values to unpack -# unpacking a sequence where the test for too long raises a different -# kind of error -class BozoError(Exception): - pass +Unpacking sequence too short -class BadSeq: - def __getitem__(self, i): - if i >= 0 and i < 3: - return i - elif i == 3: - raise BozoError - else: - raise IndexError + >>> a, b, c, d = Seq() + Traceback (most recent call last): + ... + ValueError: need more than 3 values to unpack +Unpacking sequence too long -# trigger code while not expecting an IndexError -if verbose: - print 'unpack sequence too long, wrong error' -try: - a, b, c, d, e = BadSeq() - raise TestFailed -except BozoError: - pass + >>> a, b = Seq() + Traceback (most recent call last): + ... + ValueError: too many values to unpack -# trigger code while expecting an IndexError -if verbose: - print 'unpack sequence too short, wrong error' -try: - a, b, c = BadSeq() - raise TestFailed -except BozoError: - pass +Unpacking a sequence where the test for too long raises a different kind of +error + + >>> class BozoError(Exception): + ... pass + ... + >>> class BadSeq: + ... def __getitem__(self, i): + ... if i >= 0 and i < 3: + ... return i + ... elif i == 3: + ... raise BozoError + ... else: + ... raise IndexError + ... + +Trigger code while not expecting an IndexError (unpack sequence too long, wrong +error) + + >>> a, b, c, d, e = BadSeq() + Traceback (most recent call last): + ... + BozoError + +Trigger code while expecting an IndexError (unpack sequence too short, wrong +error) + + >>> a, b, c = BadSeq() + Traceback (most recent call last): + ... + BozoError + +""" + +__test__ = {'doctests' : doctests} + +def test_main(verbose=False): + import sys + from test import test_support + from test import test_unpack + test_support.run_doctest(test_unpack, verbose) + +if __name__ == "__main__": + test_main(verbose=True)

1 0

python/dist/src/Lib/test test_types.py,1.61,1.62
by nascheme＠users.sourceforge.net Sept. 24, 2004

Sept. 24, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12951/Lib/test Modified Files: test_types.py Log Message: Add yet more tests for buffer(). Index: test_types.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_types.py,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- test_types.py 24 Sep 2004 15:35:15 -0000 1.61 +++ test_types.py 24 Sep 2004 19:18:42 -0000 1.62 @@ -253,6 +253,17 @@ raise TestFailed, 'specifying buffer size failed' if str(buffer(a, 1, 2)) != 'sd': raise TestFailed, 'specifying buffer offset and size failed' +try: buffer(buffer('asdf', 1), -1) +except ValueError: pass +else: raise TestFailed, "buffer(buffer('asdf', 1), -1) should raise ValueError" +if str(buffer(buffer('asdf', 0, 2), 0)) != 'as': + raise TestFailed, 'composing length-specified buffer failed' +if str(buffer(buffer('asdf', 0, 2), 0, 5000)) != 'as': + raise TestFailed, 'composing length-specified buffer failed' +if str(buffer(buffer('asdf', 0, 2), 0, -1)) != 'as': + raise TestFailed, 'composing length-specified buffer failed' +if str(buffer(buffer('asdf', 0, 2), 1, 2)) != 's': + raise TestFailed, 'composing length-specified buffer failed' try: a[1] = 'g' except TypeError: pass

1 0

python/dist/src/Objects bufferobject.c,2.25,2.26
by nascheme＠users.sourceforge.net Sept. 24, 2004

Sept. 24, 2004

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12799/Objects Modified Files: bufferobject.c Log Message: Ensure negative offsets cannot be passed to buffer(). When composing buffers, compute the new buffer size based on the old buffer size. Fixes SF bug #1034242. Index: bufferobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/bufferobject.c,v retrieving revision 2.25 retrieving revision 2.26 diff -u -d -r2.25 -r2.26 --- bufferobject.c 24 Sep 2004 15:41:27 -0000 2.25 +++ bufferobject.c 24 Sep 2004 19:17:26 -0000 2.26 @@ -90,10 +90,23 @@ static PyObject * buffer_from_object(PyObject *base, int size, int offset, int readonly) { + if (offset < 0) { + PyErr_SetString(PyExc_ValueError, + "offset must be zero or positive"); + return NULL; + } if ( PyBuffer_Check(base) && (((PyBufferObject *)base)->b_base) ) { /* another buffer, refer to the base object */ - offset += ((PyBufferObject *)base)->b_offset; - base = ((PyBufferObject *)base)->b_base; + PyBufferObject *b = (PyBufferObject *)base; + if (b->b_size != Py_END_OF_BUFFER) { + int base_size = b->b_size - offset; + if (base_size < 0) + base_size = 0; + if (size == Py_END_OF_BUFFER || size > base_size) + size = base_size; + } + offset += b->b_offset; + base = b->b_base; } return buffer_from_memory(base, size, offset, NULL, readonly); }

1 0

python/dist/src/Objects bufferobject.c,2.24,2.25
by nascheme＠users.sourceforge.net Sept. 24, 2004

Sept. 24, 2004

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3359/Objects Modified Files: bufferobject.c Log Message: Fix buffer offset calculation (need to compute it before changing 'base'). Fixes SF bug #1033720. Move offset sanity checking to buffer_from_memory(). Index: bufferobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/bufferobject.c,v retrieving revision 2.24 retrieving revision 2.25 diff -u -d -r2.24 -r2.25 --- bufferobject.c 25 Mar 2004 16:16:28 -0000 2.24 +++ bufferobject.c 24 Sep 2004 15:41:27 -0000 2.25 @@ -66,6 +66,11 @@ "size must be zero or positive"); return NULL; } + if (offset < 0) { + PyErr_SetString(PyExc_ValueError, + "offset must be zero or positive"); + return NULL; + } b = PyObject_NEW(PyBufferObject, &PyBuffer_Type); if ( b == NULL ) @@ -85,20 +90,11 @@ static PyObject * buffer_from_object(PyObject *base, int size, int offset, int readonly) { - if ( offset < 0 ) { - PyErr_SetString(PyExc_ValueError, - "offset must be zero or positive"); - return NULL; - } - - /* if the base object is another buffer, then try to refer to the - * base object. - */ if ( PyBuffer_Check(base) && (((PyBufferObject *)base)->b_base) ) { + /* another buffer, refer to the base object */ + offset += ((PyBufferObject *)base)->b_offset; base = ((PyBufferObject *)base)->b_base; - offset = ((PyBufferObject *)base)->b_offset + offset; } - return buffer_from_memory(base, size, offset, NULL, readonly); }

1 0