[Python-checkins] r68940 - in python/branches/py3k-issue1717/Lib: heapq.py xmlrpc/client.py

[mark.dickinson]

Author: mark.dickinson
Date: Sun Jan 25 21:43:48 2009
New Revision: 68940

Log:
Revert accidental modification of non-ASCII character in Lib/heapq.py
Remove mention of _cmp__ from comment in Lib/heapq.py
Remove __cmp__ method from Datetime class in Lib/xmlrpc/client.py


Modified:
   python/branches/py3k-issue1717/Lib/heapq.py
   python/branches/py3k-issue1717/Lib/xmlrpc/client.py

Modified: python/branches/py3k-issue1717/Lib/heapq.py
==============================================================================
--- python/branches/py3k-issue1717/Lib/heapq.py	(original)
+++ python/branches/py3k-issue1717/Lib/heapq.py	Sun Jan 25 21:43:48 2009
@@ -34,7 +34,7 @@
 
 __about__ = """Heap queues
 
-[explanation by Fran�ois Pinard]
+[explanation by François Pinard]
 
 Heaps are arrays for which a[k] <= a[2*k+1] and a[k] <= a[2*k+2] for
 all k, counting elements from 0.  For the sake of comparison,
@@ -262,7 +262,7 @@
 #
 # Cutting the # of comparisons is important, since these routines have no
 # way to extract "the priority" from an array element, so that intelligence
-# is likely to be hiding in custom _cmp__ methods, or in array elements
+# is likely to be hiding in custom comparison methods, or in array elements
 # storing (priority, record) tuples.  Comparisons are thus potentially
 # expensive.
 #

Modified: python/branches/py3k-issue1717/Lib/xmlrpc/client.py
==============================================================================
--- python/branches/py3k-issue1717/Lib/xmlrpc/client.py	(original)
+++ python/branches/py3k-issue1717/Lib/xmlrpc/client.py	Sun Jan 25 21:43:48 2009
@@ -349,10 +349,6 @@
     def timetuple(self):
         return time.strptime(self.value, "%Y%m%dT%H:%M:%S")
 
-    def __cmp__(self, other):
-        s, o = self.make_comparable(other)
-        return (s > o) - (s < o)
-
     ##
     # Get date/time value.
     #