summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-05-19 21:06:36 +0000
committerGeorg Brandl <georg@python.org>2010-05-19 21:06:36 +0000
commit07bc6eaaf4355d3f049ced069b8c8601f68fca1a (patch)
treef1b039bf39821a088eaed329dcf7b26ca72b2a63
parentfd02d50fcd3162be070fc7055048adc9210b983f (diff)
downloadcpython-07bc6eaaf4355d3f049ced069b8c8601f68fca1a.tar.gz
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. ........
-rw-r--r--Lib/functools.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/functools.py b/Lib/functools.py
index d75e44ae83..1a1f22ed00 100644
--- 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