summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZan Anderle <zan.anderle@gmail.com>2014-11-03 19:24:22 +0100
committerTim Graham <timograham@gmail.com>2014-11-03 15:00:49 -0500
commit1cf109515a08aecb34c48bedb1df8027f7fad701 (patch)
treed8bcdd849885604d22b22fbf053ea22ce62169fe
parent2d06e3155a13e3ca9e63b97c7c9499a1e1ffd654 (diff)
Changed docstrings in admindocs/utils to comply to PEP 257
-rw-r--r--django/contrib/admindocs/utils.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/django/contrib/admindocs/utils.py b/django/contrib/admindocs/utils.py
index 3178f47b31..779a8a446b 100644
--- a/django/contrib/admindocs/utils.py
+++ b/django/contrib/admindocs/utils.py
@@ -19,9 +19,9 @@ else:
def trim_docstring(docstring):
"""
- Uniformly trims leading/trailing whitespace from docstrings.
+ Uniformly trim leading/trailing whitespace from docstrings.
- Based on http://www.python.org/peps/pep-0257.html#handling-docstring-indentation
+ Based on https://www.python.org/dev/peps/pep-0257/#handling-docstring-indentation
"""
if not docstring or not docstring.strip():
return ''
@@ -34,7 +34,7 @@ def trim_docstring(docstring):
def parse_docstring(docstring):
"""
- Parse out the parts of a docstring. Returns (title, body, metadata).
+ Parse out the parts of a docstring. Return (title, body, metadata).
"""
docstring = trim_docstring(docstring)
parts = re.split(r'\n{2,}', docstring)