[Python-checkins] cpython (merge 3.1 -> 3.2): Merge with 3.1.

[ezio.melotti]

http://hg.python.org/cpython/rev/0ea2c5866e7d
changeset:   69951:0ea2c5866e7d
branch:      3.2
parent:      69943:ae6cd69ce9f8
parent:      69950:e4acbe2c8164
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon May 09 04:00:06 2011 +0300
summary:
  Merge with 3.1.

files:
  Doc/library/stdtypes.rst |  9 +++++++++
  1 files changed, 9 insertions(+), 0 deletions(-)


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1047,6 +1047,15 @@
    *start* and *end* are interpreted as in slice notation.  Return ``-1`` if
    *sub* is not found.
 
+   .. note::
+
+      The :meth:`~str.find` method should be used only if you need to know the
+      position of *sub*.  To check if *sub* is a substring or not, use the
+      :keyword:`in` operator::
+
+         >>> 'Py' in 'Python'
+         True
+
 
 .. method:: str.format(*args, **kwargs)
 

-- 
Repository URL: http://hg.python.org/cpython