[Python-checkins] r81308 - in python/branches/release26-maint: Lib/distutils/command/install_lib.py Lib/heapq.py Objects/stringlib/fastsearch.h

[georg.brandl]

Author: georg.brandl
Date: Wed May 19 01:37:50 2010
New Revision: 81308

Log:
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
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/distutils/command/install_lib.py
   python/branches/release26-maint/Lib/heapq.py
   python/branches/release26-maint/Objects/stringlib/fastsearch.h

Modified: python/branches/release26-maint/Lib/distutils/command/install_lib.py
==============================================================================
--- python/branches/release26-maint/Lib/distutils/command/install_lib.py	(original)
+++ python/branches/release26-maint/Lib/distutils/command/install_lib.py	Wed May 19 01:37:50 2010
@@ -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$"
 

Modified: python/branches/release26-maint/Lib/heapq.py
==============================================================================
--- python/branches/release26-maint/Lib/heapq.py	(original)
+++ python/branches/release26-maint/Lib/heapq.py	Wed May 19 01:37:50 2010
@@ -1,4 +1,4 @@
-# -*- coding: Latin-1 -*-
+# -*- coding: latin-1 -*-
 
 """Heap queue algorithm (a.k.a. priority queue).
 

Modified: python/branches/release26-maint/Objects/stringlib/fastsearch.h
==============================================================================
--- python/branches/release26-maint/Objects/stringlib/fastsearch.h	(original)
+++ python/branches/release26-maint/Objects/stringlib/fastsearch.h	Wed May 19 01:37:50 2010
@@ -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