Merged revisions 80068 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80068 | georg.brandl | 2010-04-14 10:56:01 +0200 (Mi, 14 Apr 2010) | 1 line

  #5341: fix typo and adapt docstring syntax.
........

diff --git a/Lib/functools.py b/Lib/functools.py
index d75e44ae83adb49615dd0c6e83b81e00d08cbbc9..1a1f22ed0030869855e063befc17fc70556566e4 100644 (file)
--- a/Lib/functools.py
+++ b/Lib/functools.py
@@ -51,7 +51,7 @@ def wraps(wrapped,
                    assigned=assigned, updated=updated)
 
 def total_ordering(cls):
-    'Class decorator that fills-in missing ordering methods'
+    """Class decorator that fills in missing ordering methods"""
     convert = {
         '__lt__': [('__gt__', lambda self, other: other < self),
                    ('__le__', lambda self, other: not other < self),
@@ -78,7 +78,7 @@ def total_ordering(cls):
     return cls
 
 def cmp_to_key(mycmp):
-    'Convert a cmp= function into a key= function'
+    """Convert a cmp= function into a key= function"""
     class K(object):
         def __init__(self, obj, *args):
             self.obj = obj