Mailman 3 July 2013 - Python-checkins

cpython: Fix use of uninitialized scalar variable, see 3f994367a979
by christian.heimes July 30, 2013

July 30, 2013

http://hg.python.org/cpython/rev/fca77bc5bdb8 changeset: 84924:fca77bc5bdb8 user: Christian Heimes <christian(a)cheimes.de> date: Wed Jul 31 01:33:50 2013 +0200 summary: Fix use of uninitialized scalar variable, see 3f994367a979 CID 1058763 files: Modules/_io/iobase.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c --- a/Modules/_io/iobase.c +++ b/Modules/_io/iobase.c @@ -210,8 +210,10 @@ /* If `closed` doesn't exist or can't be evaluated as bool, then the object is probably in an unusable state, so ignore. */ res = PyObject_GetAttr(self, _PyIO_str_closed); - if (res == NULL) + if (res == NULL) { PyErr_Clear(); + closed = -1; + } else { closed = PyObject_IsTrue(res); Py_DECREF(res); -- Repository URL: http://hg.python.org/cpython

1 0

devguide: Issue #18481: document new C coverage make targets
by christian.heimes July 30, 2013

July 30, 2013

http://hg.python.org/devguide/rev/116b05b98bea changeset: 633:116b05b98bea user: Christian Heimes <christian(a)cheimes.de> date: Wed Jul 31 01:17:03 2013 +0200 summary: Issue #18481: document new C coverage make targets files: coverage.rst | 31 +++++++++++++++++++++++++++++++ experts.rst | 2 +- 2 files changed, 32 insertions(+), 1 deletions(-) diff --git a/coverage.rst b/coverage.rst --- a/coverage.rst +++ b/coverage.rst @@ -227,3 +227,34 @@ worked on (i.e., the in-development version). .. _issue tracker: http://bugs.python.org + + +Measuring coverage of C code with gcov and lcov +""""""""""""""""""""""""""""""""""""""""""""""" + +It's also possible to measure the function, line and branch coverage of +Python's C code. Right now only GCC with `gcov`_ is supported. In order to +create an instrumented build of Python with gcov, run:: + + make coverage + +Then run some code and gather coverage data with the ``gcov`` command. In +order to create a HTML report you can install `lcov`_. The command:: + + make coverage-lcov + +assembles coverage data, removes 3rd party and system libaries and finally +creates a report. You can skip both steps and just run:: + + make coverage-report + +if you like to generate a coverage report for Python's stdlib tests. It takes +about 20 to 30 minutes on a modern computer. + +.. note:: + + Multiple test jobs may not work properly. C coverage reporting has only + been tested with a single test process. + +.. _gcov: http://gcc.gnu.org/onlinedocs/gcc/Gcov.html +.. _lcov: http://ltp.sourceforge.net/coverage/lcov.php diff --git a/experts.rst b/experts.rst --- a/experts.rst +++ b/experts.rst @@ -324,7 +324,7 @@ georg.brandl str.format eric.smith testing michael.foord, pitrou, ezio.melotti -test coverage ncoghlan, giampaolo.rodola +test coverage ncoghlan, giampaolo.rodola, christian.heimes threads pitrou time and dates lemburg, belopolsky unicode lemburg, ezio.melotti, haypo, benjamin.peterson, pitrou -- Repository URL: http://hg.python.org/devguide

1 0

cpython: Issue #18481: Add C coverage reporting with gcov and lcov. A new make target
by christian.heimes July 30, 2013

July 30, 2013

http://hg.python.org/cpython/rev/85ec2b5bfcd2 changeset: 84923:85ec2b5bfcd2 user: Christian Heimes <christian(a)cheimes.de> date: Wed Jul 31 00:55:18 2013 +0200 summary: Issue #18481: Add C coverage reporting with gcov and lcov. A new make target "coverage-report" creates an instrumented Python build, runs unit tests and creates a HTML. The report can be updated with "make coverage-lcov". files: .hgignore | 5 +++ Makefile.pre.in | 47 ++++++++++++++++++++++++++++++++++++- Misc/NEWS | 4 +++ 3 files changed, 55 insertions(+), 1 deletions(-) diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -36,6 +36,7 @@ Modules/config.c Modules/ld_so_aix$ Parser/pgen$ +^lcov-report/ ^core ^python-gdb.py ^python.exe-gdb.py @@ -91,3 +92,7 @@ .coverage coverage/ htmlcov/ +*.gcda +*.gcno +*.gcov +coverage.info diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -211,6 +211,12 @@ PROFILE_TASK= $(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck #PROFILE_TASK= $(srcdir)/Lib/test/regrtest.py +# report files for gcov / lcov coverage report +COVERAGE_INFO= $(abs_builddir)/coverage.info +COVERAGE_REPORT=$(abs_builddir)/lcov-report +COVERAGE_REPORT_OPTIONS=--no-branch-coverage --title "CPython lcov report" + + # === Definitions added by makesetup === @@ -463,11 +469,48 @@ build_all_use_profile: $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-use -fprofile-correction" +# Compile and run with gcov +.PHONY=coverage coverage-lcov coverage-report coverage: @echo "Building with support for coverage checking:" - $(MAKE) clean + $(MAKE) clean profile-removal $(MAKE) all CFLAGS="$(CFLAGS) -O0 -pg -fprofile-arcs -ftest-coverage" LIBS="$(LIBS) -lgcov" +coverage-lcov: + @echo "Creating Coverage HTML report with LCOV:" + @rm -f $(COVERAGE_INFO) + @rm -rf $(COVERAGE_REPORT) + @lcov --capture --directory $(abs_builddir) \ + --base-directory $(realpath $(abs_builddir)) \ + --path $(realpath $(abs_srcdir)) \ + --output-file $(COVERAGE_INFO) + : # remove 3rd party modules and system headers + @lcov --remove $(COVERAGE_INFO) \ + '*/Modules/_ctypes/libffi*/*' \ + '*/Modules/_sha3/keccak/*' \ + '*/Modules/_decimal/libmpdec/*' \ + '*/Modules/expat/*' \ + '*/Modules/zlib/*' \ + '*/Include/*' \ + '/usr/include/*' \ + '/usr/local/include/*' \ + --output-file $(COVERAGE_INFO) + @genhtml $(COVERAGE_INFO) --output-directory $(COVERAGE_REPORT) \ + $(COVERAGE_REPORT_OPTIONS) + @echo + @echo "lcov report at $(COVERAGE_REPORT)/index.html" + @echo + +coverage-report: + : # force rebuilding of parser and importlib + @touch $(GRAMMAR_INPUT) + @touch $(srcdir)/Lib/importlib/_bootstrap.py + : # build with coverage info + $(MAKE) coverage + : # run tests, ignore failures + $(TESTRUNNER) $(TESTOPTS) || true + : # build lcov report + $(MAKE) coverage-lcov # Build the interpreter $(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) @@ -1396,6 +1439,8 @@ profile-removal: find . -name '*.gc??' -exec rm -f {} ';' + rm -f $(COVERAGE_INFO) + rm -rf $(COVERAGE_REPORT) clobber: clean profile-removal -rm -f $(BUILDPYTHON) $(PGEN) $(LIBRARY) $(LDLIBRARY) $(DLLLIBRARY) \ diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -725,6 +725,10 @@ Build ----- +- Issue #18481: Add C coverage reporting with gcov and lcov. A new make target + "coverage-report" creates an instrumented Python build, runs unit tests + and creates a HTML. The report can be updated with "make coverage-lcov". + - Issue #17845: Clarified the message printed when some module are not built. - Issue #18256: Compilation fix for recent AIX releases. Patch by -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Issue #15494: merge from 3.3
by ned.deily July 30, 2013

July 30, 2013

http://hg.python.org/cpython/rev/4df2e094f83e changeset: 84922:4df2e094f83e parent: 84920:c7d9a2159c6c parent: 84921:e6f2f3eda290 user: Ned Deily <nad(a)acm.org> date: Tue Jul 30 14:32:52 2013 -0700 summary: Issue #15494: merge from 3.3 files: Makefile.pre.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1012,7 +1012,7 @@ tkinter/test/test_ttk site-packages test \ test/capath test/data \ test/cjkencodings test/decimaltestdata test/xmltestdata \ - test/subprocessdata test/sndhdrdata \ + test/subprocessdata test/sndhdrdata test/support \ test/tracedmodules test/encoded_modules \ test/namespace_pkgs \ test/namespace_pkgs/both_portions \ -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Issue #15494: Install new test/support directory.
by ned.deily July 30, 2013

July 30, 2013

http://hg.python.org/cpython/rev/e6f2f3eda290 changeset: 84921:e6f2f3eda290 branch: 3.3 parent: 84919:81bc2d64c006 user: Ned Deily <nad(a)acm.org> date: Tue Jul 30 14:30:15 2013 -0700 summary: Issue #15494: Install new test/support directory. files: Makefile.pre.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1012,7 +1012,7 @@ tkinter/test/test_ttk site-packages test \ test/capath test/data \ test/cjkencodings test/decimaltestdata test/xmltestdata \ - test/subprocessdata test/sndhdrdata \ + test/subprocessdata test/sndhdrdata test/support \ test/tracedmodules test/encoded_modules \ test/namespace_pkgs \ test/namespace_pkgs/both_portions \ -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Merge: #16273: Fix tutorial discussion of seek/tell (opaque text-mode values).
by r.david.murray July 30, 2013

July 30, 2013

http://hg.python.org/cpython/rev/c7d9a2159c6c changeset: 84920:c7d9a2159c6c parent: 84918:c4f377d710da parent: 84919:81bc2d64c006 user: R David Murray <rdmurray(a)bitdance.com> date: Tue Jul 30 15:53:30 2013 -0400 summary: Merge: #16273: Fix tutorial discussion of seek/tell (opaque text-mode values). files: Doc/tutorial/inputoutput.rst | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst --- a/Doc/tutorial/inputoutput.rst +++ b/Doc/tutorial/inputoutput.rst @@ -322,9 +322,11 @@ >>> f.write(s) 18 -``f.tell()`` returns an integer giving the file object's current position in the -file, measured in bytes from the beginning of the file. To change the file -object's position, use ``f.seek(offset, from_what)``. The position is computed +``f.tell()`` returns an integer giving the file object's current position in the file +represented as number of bytes from the beginning of the file when in `binary mode` and +an opaque number when in `text mode`. + +To change the file object's position, use ``f.seek(offset, from_what)``. The position is computed from adding *offset* to a reference point; the reference point is selected by the *from_what* argument. A *from_what* value of 0 measures from the beginning of the file, 1 uses the current file position, and 2 uses the end of the file as @@ -345,7 +347,10 @@ In text files (those opened without a ``b`` in the mode string), only seeks relative to the beginning of the file are allowed (the exception being seeking -to the very file end with ``seek(0, 2)``). +to the very file end with ``seek(0, 2)``) and the only valid *offset* values are +those returned from the ``f.tell()``, or zero. Any other *offset* value produces +undefined behaviour. + When you're done with a file, call ``f.close()`` to close it and free up any system resources taken up by the open file. After calling ``f.close()``, -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): #16273: Fix tutorial discussion of seek/tell (opaque text-mode values).
by r.david.murray July 30, 2013

July 30, 2013

http://hg.python.org/cpython/rev/81bc2d64c006 changeset: 84919:81bc2d64c006 branch: 3.3 parent: 84917:0e1f0faacb0d user: R David Murray <rdmurray(a)bitdance.com> date: Tue Jul 30 15:51:57 2013 -0400 summary: #16273: Fix tutorial discussion of seek/tell (opaque text-mode values). Patch by Sijin Joseph. files: Doc/tutorial/inputoutput.rst | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst --- a/Doc/tutorial/inputoutput.rst +++ b/Doc/tutorial/inputoutput.rst @@ -322,9 +322,11 @@ >>> f.write(s) 18 -``f.tell()`` returns an integer giving the file object's current position in the -file, measured in bytes from the beginning of the file. To change the file -object's position, use ``f.seek(offset, from_what)``. The position is computed +``f.tell()`` returns an integer giving the file object's current position in the file +represented as number of bytes from the beginning of the file when in `binary mode` and +an opaque number when in `text mode`. + +To change the file object's position, use ``f.seek(offset, from_what)``. The position is computed from adding *offset* to a reference point; the reference point is selected by the *from_what* argument. A *from_what* value of 0 measures from the beginning of the file, 1 uses the current file position, and 2 uses the end of the file as @@ -345,7 +347,10 @@ In text files (those opened without a ``b`` in the mode string), only seeks relative to the beginning of the file are allowed (the exception being seeking -to the very file end with ``seek(0, 2)``). +to the very file end with ``seek(0, 2)``) and the only valid *offset* values are +those returned from the ``f.tell()``, or zero. Any other *offset* value produces +undefined behaviour. + When you're done with a file, call ``f.close()`` to close it and free up any system resources taken up by the open file. After calling ``f.close()``, -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Merge: #18601: fix error made when difflib example was converted to use 'with'.
by r.david.murray July 30, 2013

July 30, 2013

http://hg.python.org/cpython/rev/c4f377d710da changeset: 84918:c4f377d710da parent: 84916:2b3b873e2b19 parent: 84917:0e1f0faacb0d user: R David Murray <rdmurray(a)bitdance.com> date: Tue Jul 30 15:37:43 2013 -0400 summary: Merge: #18601: fix error made when difflib example was converted to use 'with'. files: Doc/library/difflib.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/difflib.rst b/Doc/library/difflib.rst --- a/Doc/library/difflib.rst +++ b/Doc/library/difflib.rst @@ -752,7 +752,7 @@ # we're passing these as arguments to the diff function fromdate = time.ctime(os.stat(fromfile).st_mtime) todate = time.ctime(os.stat(tofile).st_mtime) - with open(fromlines) as fromf, open(tofile) as tof: + with open(fromfile) as fromf, open(tofile) as tof: fromlines, tolines = list(fromf), list(tof) if options.u: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): #18601: fix error made when difflib example was converted to use 'with'.
by r.david.murray July 30, 2013

July 30, 2013

http://hg.python.org/cpython/rev/0e1f0faacb0d changeset: 84917:0e1f0faacb0d branch: 3.3 parent: 84914:7b86be4e822c user: R David Murray <rdmurray(a)bitdance.com> date: Tue Jul 30 15:37:11 2013 -0400 summary: #18601: fix error made when difflib example was converted to use 'with'. files: Doc/library/difflib.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/difflib.rst b/Doc/library/difflib.rst --- a/Doc/library/difflib.rst +++ b/Doc/library/difflib.rst @@ -752,7 +752,7 @@ # we're passing these as arguments to the diff function fromdate = time.ctime(os.stat(fromfile).st_mtime) todate = time.ctime(os.stat(tofile).st_mtime) - with open(fromlines) as fromf, open(tofile) as tof: + with open(fromfile) as fromf, open(tofile) as tof: fromlines, tolines = list(fromf), list(tof) if options.u: -- Repository URL: http://hg.python.org/cpython

1 0

cpython: fixed examples to work with changed attribute names
by ethan.furman July 30, 2013

July 30, 2013

http://hg.python.org/cpython/rev/2b3b873e2b19 changeset: 84916:2b3b873e2b19 user: Ethan Furman <ethan(a)stoneleaf.us> date: Tue Jul 30 12:24:25 2013 -0700 summary: fixed examples to work with changed attribute names files: Doc/library/enum.rst | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Doc/library/enum.rst b/Doc/library/enum.rst --- a/Doc/library/enum.rst +++ b/Doc/library/enum.rst @@ -483,7 +483,7 @@ ... def __new__(cls): ... value = len(cls.__members__) + 1 ... obj = object.__new__(cls) - ... obj._value = value + ... obj._value_ = value ... return obj ... >>> class Color(AutoNumber): @@ -505,19 +505,19 @@ >>> class OrderedEnum(Enum): ... def __ge__(self, other): ... if self.__class__ is other.__class__: - ... return self._value >= other._value + ... return self.value >= other.value ... return NotImplemented ... def __gt__(self, other): ... if self.__class__ is other.__class__: - ... return self._value > other._value + ... return self.value > other.value ... return NotImplemented ... def __le__(self, other): ... if self.__class__ is other.__class__: - ... return self._value <= other._value + ... return self.value <= other.value ... return NotImplemented ... def __lt__(self, other): ... if self.__class__ is other.__class__: - ... return self._value < other._value + ... return self.value < other.value ... return NotImplemented ... >>> class Grade(OrderedEnum): -- Repository URL: http://hg.python.org/cpython

1 0