diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2016-05-21 11:50:13 +0900 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2016-05-21 11:50:37 +0900 |
| commit | 20b3da5cf6aa4917301b2db2259bc78c3e20a122 (patch) | |
| tree | 46568610dbecd83923752a8bcae79183df6bdbb4 /sphinx/ext/autodoc.py | |
| parent | 0286c6810a16f12374af56c579c6911de097a6b6 (diff) | |
| download | sphinx-git-20b3da5cf6aa4917301b2db2259bc78c3e20a122.tar.gz | |
Fix #2470: ``typing`` backport package causes autodoc errors with python 2.7
Diffstat (limited to 'sphinx/ext/autodoc.py')
| -rw-r--r-- | sphinx/ext/autodoc.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py index e32511afa..6ae0966fb 100644 --- a/sphinx/ext/autodoc.py +++ b/sphinx/ext/autodoc.py @@ -35,7 +35,10 @@ from sphinx.util.inspect import getargspec, isdescriptor, safe_getmembers, \ from sphinx.util.docstrings import prepare_docstring try: - import typing + if sys.version_info >= (3,): + import typing + else: + typing = None except ImportError: typing = None |