summaryrefslogtreecommitdiff
path: root/sphinx/quickstart.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-01-17 17:43:33 +0100
committerGeorg Brandl <georg@python.org>2010-01-17 17:43:33 +0100
commit3284511bd4b6d2ea1ebcef4d081915695f8b432d (patch)
treedeeed3a8cf5a8c36e44522669e61970cb44bcd69 /sphinx/quickstart.py
parent86bd92b483e75356f1334a5ee14d05a50608ceed (diff)
parentc362543fb9c5478ceee246abacb6f1f383e29449 (diff)
downloadsphinx-3284511bd4b6d2ea1ebcef4d081915695f8b432d.tar.gz
merge with trunk
Diffstat (limited to 'sphinx/quickstart.py')
-rw-r--r--sphinx/quickstart.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index bffa47ea..f3e5d7eb 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -15,7 +15,7 @@ from os import path
TERM_ENCODING = getattr(sys.stdin, 'encoding', None)
from sphinx import __version__
-from sphinx.util import make_filename
+from sphinx.util.os import make_filename
from sphinx.util.console import purple, bold, red, turquoise, \
nocolor, color_terminal
from sphinx.util import texescape