Merged in techtonik/sphinx (pull request #222)

Make 'python -m sphinx.quickstart' possible

1 files changed, 11 insertions, 0 deletions

diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index 2e1993b4..e181d3ab 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -16,6 +16,16 @@ from io import open
 
 TERM_ENCODING = getattr(sys.stdin, 'encoding', None)
 
+#try to import readline, unix specific enhancement
+try:
+    import readline
+    if 'libedit' in readline.__doc__:
+        readline.parse_and_bind("bind ^I rl_complete")
+    else:
+        readline.parse_and_bind("tab: complete")
+except ImportError:
+    pass
+
 from docutils.utils import column_width
 
 from sphinx import __version__
@@ -922,6 +932,7 @@ class ValidationError(Exception):
     """Raised for validation errors."""
 
 def is_path(x):
+    x = path.expanduser(x)
     if path.exists(x) and not path.isdir(x):
         raise ValidationError("Please enter a valid path name.")
     return x