diff options
| author | shimizukawa <shimizukawa@gmail.com> | 2016-02-09 22:17:05 +0900 |
|---|---|---|
| committer | shimizukawa <shimizukawa@gmail.com> | 2016-02-09 23:19:49 +0900 |
| commit | 980653f277d85b3cf71fdcce432c0af7e065d240 (patch) | |
| tree | 4c0d15959da360a327b47d50b69d9c920e059c09 /sphinx/quickstart.py | |
| parent | a88212a214a9b0dc8014c54455b0e3e6403f4fdc (diff) | |
| parent | 906d1c905d1fe74a5efb7493eb42f974b97c150d (diff) | |
| download | sphinx-git-980653f277d85b3cf71fdcce432c0af7e065d240.tar.gz | |
Merge with stable
Conflicts:
sphinx/environment.py
sphinx/ext/autodoc.py
sphinx/writers/latex.py
Diffstat (limited to 'sphinx/quickstart.py')
| -rw-r--r-- | sphinx/quickstart.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py index 7d7271824..e3f226e19 100644 --- a/sphinx/quickstart.py +++ b/sphinx/quickstart.py @@ -9,6 +9,7 @@ :license: BSD, see LICENSE for details. """ from __future__ import print_function +from __future__ import absolute_import import re import os |