parse_doc_options is back.

keleshev · Apr 15, 2012 · b607d98 · b607d98
1 parent 7b13247
commit b607d98
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/docopt.py b/docopt.py
@@ -110,8 +110,12 @@ def argument_eval(s):
         return s
 
 
+def parse_doc_options(doc):
+    return [Option(parse='-' + s) for s in re.split('^ *-|\n *-', doc)[1:]]
+
+
 def docopt(doc, args=sys.argv[1:], help=True, version=None):
-    docopts = [Option(parse='-' + s) for s in re.split('^ *-|\n *-', doc)[1:]]
+    docopts = parse_doc_options(doc)
     try:
         getopts, args = gnu_getopt(args,
                             ''.join([d.short for d in docopts if d.short]),

diff --git a/test_docopt.py b/test_docopt.py
@@ -1,5 +1,5 @@
 from docopt import (Option, Namespace, docopt, parse, Argument, VerticalBar,
-                    Parens, Brackets, pattern, OneOrMore)
+                    Parens, Brackets, pattern, OneOrMore, parse_doc_options)
 
 
 def test_option():
@@ -43,6 +43,15 @@ def test_docopt():
     assert docopt('-v  Be verbose.', ['-v']) == (Namespace(v=True), [])
 
 
+def test_parse_doc_options():
+    doc = """-h, --help  Print help message.
+    -o FILE     Output file.
+    --verbose   Verbose mode."""
+    assert parse_doc_options(doc) == [Option('h', 'help'),
+                                      Option('o:'),
+                                      Option(None, 'verbose')]
+
+
 def test_parse():
 
     o = [Option('h'),