diff options
| author | Georg Brandl <georg@python.org> | 2014-02-02 08:05:59 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-02-02 08:05:59 +0100 |
| commit | 532e6db1f0d4f8ae9cc8a8d54cfa70ef3e98682a (patch) | |
| tree | 83f7335b6987875de37581ab440a9080dad7e886 /sphinx/util/docstrings.py | |
| parent | 30a55f86b29a482110e84805c4942ad88c18f986 (diff) | |
| parent | fb9dd2d0012e1229719685167bd6dc33e7b39005 (diff) | |
| download | sphinx-532e6db1f0d4f8ae9cc8a8d54cfa70ef3e98682a.tar.gz | |
merge with stable
Diffstat (limited to 'sphinx/util/docstrings.py')
| -rw-r--r-- | sphinx/util/docstrings.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sphinx/util/docstrings.py b/sphinx/util/docstrings.py index d45b938d..97303bd7 100644 --- a/sphinx/util/docstrings.py +++ b/sphinx/util/docstrings.py @@ -23,7 +23,7 @@ def prepare_docstring(s, ignore=1): """ lines = s.expandtabs().splitlines() # Find minimum indentation of any non-blank lines after ignored lines. - margin = sys.maxint + margin = sys.maxsize for line in lines[ignore:]: content = len(line.lstrip()) if content: @@ -33,7 +33,7 @@ def prepare_docstring(s, ignore=1): for i in range(ignore): if i < len(lines): lines[i] = lines[i].lstrip() - if margin < sys.maxint: + if margin < sys.maxsize: for i in range(ignore, len(lines)): lines[i] = lines[i][margin:] # Remove any leading blank lines. while lines and not lines[0]: |