Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Michael Floering committed 2016-01-22 18:40:53 -06:00
commit 018e1f68de
21 files changed
+151 -85

No files matched your search

+1 -1
View File
@@ -4,7 +4,7 @@ NOTE: the CLI interface may change before reaching v1.0.
"""
from textwrap import dedent, wrap
#noinspection PyCompatibility
# noinspection PyCompatibility
from argparse import (RawDescriptionHelpFormatter, FileType,
OPTIONAL, ZERO_OR_MORE, SUPPRESS)