diff options
| author | Georg Brandl <georg@python.org> | 2014-01-22 18:13:49 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-01-22 18:13:49 +0100 |
| commit | 1eb23c62ceff142a3e517904e1b795cf22a57196 (patch) | |
| tree | b0b6fc2d8bc99bb63e544f843cc9763a9798ed4f /sphinx/setup_command.py | |
| parent | cf25b060e7357ddf850503feae11ddb27b87d769 (diff) | |
| parent | 216c664187b19e0244f1a8f57a28bb9e91a49364 (diff) | |
| download | sphinx-git-1eb23c62ceff142a3e517904e1b795cf22a57196.tar.gz | |
merge with stable
Diffstat (limited to 'sphinx/setup_command.py')
| -rw-r--r-- | sphinx/setup_command.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sphinx/setup_command.py b/sphinx/setup_command.py index 02449137e..88cbc5a0d 100644 --- a/sphinx/setup_command.py +++ b/sphinx/setup_command.py @@ -18,6 +18,7 @@ import os import types from StringIO import StringIO from distutils.cmd import Command +from distutils.errors import DistutilsOptionError from sphinx.application import Sphinx from sphinx.util.console import darkred, nocolor, color_terminal |