diff options
author | Georg Brandl <georg@python.org> | 2008-12-07 15:17:53 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2008-12-07 15:17:53 (GMT) |
commit | 2080ea5f4b7ab8bd9ab0385c7ac925731d78405e (patch) | |
tree | 7d1b7492a9d6c2f206b5dde7caf8143ed696004e | |
parent | c7d2b21cec5797cec93267a414f5756c271b6e63 (diff) | |
download | cpython-2080ea5f4b7ab8bd9ab0385c7ac925731d78405e.zip cpython-2080ea5f4b7ab8bd9ab0385c7ac925731d78405e.tar.gz cpython-2080ea5f4b7ab8bd9ab0385c7ac925731d78405e.tar.bz2 |
Forward-port r67624 and r67627.
-rw-r--r-- | Doc/library/functions.rst | 7 | ||||
-rw-r--r-- | Doc/tutorial/datastructures.rst | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst index 364d9de..2fcf027 100644 --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -137,13 +137,6 @@ are always available. They are listed here in alphabetical order. type hierarchy in :ref:`types`. -.. function:: cmp(x, y) - - Compare the two objects *x* and *y* and return an integer according to the - outcome. The return value is negative if ``x < y``, zero if ``x == y`` and - strictly positive if ``x > y``. - - .. function:: compile(source, filename, mode[, flags[, dont_inherit]]) Compile the *source* into a code or AST object. Code objects can be executed diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst index e8509eb..84e731d 100644 --- a/Doc/tutorial/datastructures.rst +++ b/Doc/tutorial/datastructures.rst @@ -376,7 +376,7 @@ Here is a brief demonstration:: >>> basket = {'apple', 'orange', 'apple', 'pear', 'orange', 'banana'} >>> print(basket) - {'orange', 'bananna', 'pear', 'apple'} + {'orange', 'banana', 'pear', 'apple'} >>> fruit = ['apple', 'orange', 'apple', 'pear', 'orange', 'banana'] >>> fruit = set(basket) # create a set without duplicates >>> fruit |