Merge branch 'release/0.2.4'

Author: dpryan79

.travis.yml

@@ -1,8 +1,6 @@
 language: python
 python:
   - "2.7"
-  - "3.3"
-  - "3.4"
   - "3.5"
   - "3.6"
 install:
@@ -11,4 +9,4 @@ install:
 
 script:
  - py.test
- - flake8 . --ignore=E501,E722,E741 --exclude=docs/conf.py
+ - flake8 . --ignore=E501,E722,E741,W605 --exclude=docs/conf.py

docs/changelog.rst

@@ -2,6 +2,11 @@
 Change log
 **********
 
+0.2.4
+#####
+
+ * Various bug fixes and documentation updates.
+
 0.2.3
 #####
 

docs/misc.rst

@@ -20,6 +20,11 @@ The short synopsis is below:
             overflow: visible !important;
         }
 
+Alternatively, you can create a `docutil.conf` file with the following contents::
+
+    [writers]
+    option-limit=1
+
 
 Linking to action groups
 ------------------------

docs/usage.rst

@@ -98,3 +98,5 @@ Other useful directives
 :noepilog: Do not parse the epilogue, which can be useful if it contains text that could be incorrectly parse as reStructuredText.
 
 :nodescription: Do not parse the description, which can be useful if it contains text that could be incorrectly parse as reStructuredText.
+
+:passparser: This can be used if you don't have a function that returns an argument parser, but rather adds commands to it (`:func:` is then that function).

setup.py

@@ -28,11 +28,9 @@ def getVersion():
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.2',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Topic :: Documentation :: Sphinx',
         'Topic :: Software Development :: Documentation'
     ],

sphinxarg/__init__.py

@@ -1 +1 @@
-__version__ = '0.2.3'
+__version__ = '0.2.4'

sphinxarg/ext.py

@@ -45,7 +45,7 @@ def map_nested_definitions(nested_content):
                         for _ in subitem[idx]:
                             if isinstance(_, nodes.definition_list):
                                 subContent.append(_)
-                        definitions[term] = (classifier, subitem[idx].astext(), subContent)
+                        definitions[term] = (classifier, subitem[idx], subContent)
 
     return definitions
 
@@ -60,11 +60,18 @@ def renderList(l, markDownHelp, settings=None):
         from sphinxarg.markdown import parseMarkDownBlock
         return parseMarkDownBlock('\n\n'.join(l) + '\n')
     else:
-        if settings is None:
-            settings = OptionParser(components=(Parser,)).get_default_values()
-        document = new_document(None, settings)
-        Parser().parse('\n\n'.join(l) + '\n', document)
-        return document.children
+        all_children = []
+        for element in l:
+            if isinstance(element, str):
+                if settings is None:
+                    settings = OptionParser(components=(Parser,)).get_default_values()
+                document = new_document(None, settings)
+                Parser().parse(element + '\n', document)
+                all_children += document.children
+            elif isinstance(element, nodes.definition):
+                all_children += element
+
+        return all_children
 
 
 def print_action_groups(data, nested_content, markDownHelp=False, settings=None):