summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2010-09-03 22:05:17 (GMT)
committerÉric Araujo <merwok@netwok.org>2010-09-03 22:05:17 (GMT)
commit8f94754d3ab6e9b27932a5f870f3500ca8e3ed84 (patch)
tree7dc9c3baed0d2fe81eec7f7eae0d24291fa7f960 /Modules
parent10c4c23a252294801e44de6d162e3f486baf1784 (diff)
downloadcpython-8f94754d3ab6e9b27932a5f870f3500ca8e3ed84.zip
cpython-8f94754d3ab6e9b27932a5f870f3500ca8e3ed84.tar.gz
cpython-8f94754d3ab6e9b27932a5f870f3500ca8e3ed84.tar.bz2
Merged revisions 84472 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84472 | eric.araujo | 2010-09-04 00:03:10 +0200 (sam., 04 sept. 2010) | 2 lines Fix invalid bytes for UTF-8 ........
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_heapqmodule.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/_heapqmodule.c b/Modules/_heapqmodule.c
index 366fb3d..fd0ecac 100644
--- a/Modules/_heapqmodule.c
+++ b/Modules/_heapqmodule.c
@@ -2,7 +2,7 @@
C implementation derived directly from heapq.py in Py2.3
which was written by Kevin O'Connor, augmented by Tim Peters,
-annotated by François Pinard, and converted to C by Raymond Hettinger.
+annotated by François Pinard, and converted to C by Raymond Hettinger.
*/