summaryrefslogtreecommitdiff
path: root/sphinx/util/docstrings.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-01-26 11:51:09 +0100
committerGeorg Brandl <georg@python.org>2014-01-26 11:51:09 +0100
commit4b0d09374e4c781cd991a0a1ff19547025e009b7 (patch)
tree031a6bce3bb6ad109935c01f226b89bdc425e60b /sphinx/util/docstrings.py
parentf5bf48f8160352370a0620fc78f9a98984b03c39 (diff)
parent17415fdff3b2232b2b84cef56c959b8ff51963a6 (diff)
downloadsphinx-4b0d09374e4c781cd991a0a1ff19547025e009b7.tar.gz
merge with stable
Diffstat (limited to 'sphinx/util/docstrings.py')
-rw-r--r--sphinx/util/docstrings.py4
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]: