From 2eeea685a8292f40967652d4e005c9547a6e7ecc Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Tue, 18 May 2010 23:37:50 +0000 Subject: [PATCH] Merged revisions 68750,68811,68945,69157 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r68750 | benjamin.peterson | 2009-01-18 22:47:04 +0000 (So, 18 Jan 2009) | 1 line fix encoding cookie case ........ r68811 | benjamin.peterson | 2009-01-20 18:58:27 +0000 (Di, 20 Jan 2009) | 1 line fix url ........ r68945 | tarek.ziade | 2009-01-25 22:11:04 +0000 (So, 25 Jan 2009) | 1 line added missing module docstring ........ r69157 | benjamin.peterson | 2009-01-31 23:43:25 +0000 (Sa, 31 Jan 2009) | 1 line add explanatory comment ........ --- Lib/distutils/command/install_lib.py | 4 ++++ Lib/heapq.py | 2 +- Objects/stringlib/fastsearch.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Lib/distutils/command/install_lib.py b/Lib/distutils/command/install_lib.py index 7e0c7088883..fb15530ead4 100644 --- a/Lib/distutils/command/install_lib.py +++ b/Lib/distutils/command/install_lib.py @@ -1,4 +1,8 @@ # This module should be kept compatible with Python 2.1. +"""distutils.command.install_lib + +Implements the Distutils 'install_lib' command +(install all Python modules).""" __revision__ = "$Id$" diff --git a/Lib/heapq.py b/Lib/heapq.py index b36aabda6e4..48f804a773a 100644 --- a/Lib/heapq.py +++ b/Lib/heapq.py @@ -1,4 +1,4 @@ -# -*- coding: Latin-1 -*- +# -*- coding: latin-1 -*- """Heap queue algorithm (a.k.a. priority queue). diff --git a/Objects/stringlib/fastsearch.h b/Objects/stringlib/fastsearch.h index 8f79c360d34..23bccfb01d0 100644 --- a/Objects/stringlib/fastsearch.h +++ b/Objects/stringlib/fastsearch.h @@ -5,7 +5,7 @@ /* fast search/count implementation, based on a mix between boyer- moore and horspool, with a few more bells and whistles on the top. - for some more background, see: http://effbot.org/stringlib */ + for some more background, see: http://effbot.org/stringlib.htm */ /* note: fastsearch may access s[n], which isn't a problem when using Python's ordinary string types, but may cause problems if you're