From: Georg Brandl <georg@python.org>
Date: Mon, 8 Oct 2007 14:08:36 +0000 (+0000)
Subject: #1228: new comparison behavior.
X-Git-Tag: v3.0a2~350
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f2c39a7751b648b982373cb097371d69762beff;p=thirdparty%2FPython%2Fcpython.git

#1228: new comparison behavior.
---

diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst
index 55b3a3aa8516..54d1922b717a 100644
--- a/Doc/tutorial/datastructures.rst
+++ b/Doc/tutorial/datastructures.rst
@@ -560,15 +560,8 @@ sequences of the same type::
    (1, 2, 3)             == (1.0, 2.0, 3.0)
    (1, 2, ('aa', 'ab'))   < (1, 2, ('abc', 'a'), 4)
 
-Note that comparing objects of different types is legal.  The outcome is
-deterministic but arbitrary: the types are ordered by their name. Thus, a list
-is always smaller than a string, a string is always smaller than a tuple, etc.
-[#]_ Mixed numeric types are compared according to their numeric value, so 0
-equals 0.0, etc.
-
-
-.. rubric:: Footnotes
-
-.. [#] The rules for comparing objects of different types should not be relied upon;
-   they may change in a future version of the language.
-
+Note that comparing objects of different types with ``<`` or ``>`` is legal
+provided that the objects have appropriate comparison methods.  For example,
+mixed numeric types are compared according to their numeric value, so 0 equals
+0.0, etc.  Otherwise, rather than providing an arbitrary ordering, the
+interpreter will raise a :exc:`TypeError` exception.