summaryrefslogtreecommitdiff
path: root/tests/test_autodoc.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-03-01 08:18:23 +0100
committerGeorg Brandl <georg@python.org>2014-03-01 08:18:23 +0100
commit2f950d546d7304e7b9d6592d27b47f82b3a424ad (patch)
tree54b9419c78a5f725508241c48a1ca731ee9317fa /tests/test_autodoc.py
parent3c649bfde0126d72894989506c40bb8ae35d7d23 (diff)
parent4047fe8184c2984241b92754b6e6d6b639b8d09b (diff)
downloadsphinx-2f950d546d7304e7b9d6592d27b47f82b3a424ad.tar.gz
Update copyright year.
Diffstat (limited to 'tests/test_autodoc.py')
-rw-r--r--tests/test_autodoc.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/tests/test_autodoc.py b/tests/test_autodoc.py
index 4c39f957..30de8790 100644
--- a/tests/test_autodoc.py
+++ b/tests/test_autodoc.py
@@ -767,12 +767,8 @@ def _funky_classmethod(name, b, c, d, docstring=None):
some arguments."""
def template(cls, a, b, c, d=4, e=5, f=6):
return a, b, c, d, e, f
- if sys.version_info >= (2, 5):
- from functools import partial
- function = partial(template, b=b, c=c, d=d)
- else:
- def function(cls, a, e=5, f=6):
- return template(a, b, c, d, e, f)
+ from functools import partial
+ function = partial(template, b=b, c=c, d=d)
function.__name__ = name
function.__doc__ = docstring
return classmethod(function)
@@ -804,10 +800,9 @@ class Class(Base):
#: should be documented -- süß
attr = 'bar'
+ @property
def prop(self):
"""Property."""
- # stay 2.4 compatible (docstring!)
- prop = property(prop, doc="Property.")
docattr = 'baz'
"""should likewise be documented -- süß"""