diff --git a/voussoir/argparse_multi.sublime-snippet b/voussoir/argparse_multi.sublime-snippet
deleted file mode 100644
index 4e2cbfc..0000000
--- a/voussoir/argparse_multi.sublime-snippet
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
- argparse_multi
- source.python
-
diff --git a/voussoir/argparse_subparser.sublime-snippet b/voussoir/argparse_subparser.sublime-snippet
index ef99b13..f6e6344 100644
--- a/voussoir/argparse_subparser.sublime-snippet
+++ b/voussoir/argparse_subparser.sublime-snippet
@@ -3,8 +3,8 @@
p_$1 = subparsers.add_parser('$1')
p_$1.add_argument('required_positional')
p_$1.add_argument('optional_positional', nargs='?', default=None)
-p_$1.add_argument('-k', '--kwarg', dest='kwarg', default=None)
-p_$1.add_argument('-b', '--boolkwarg', dest='boolkwarg', action='store_true')
+p_$1.add_argument('--kwarg', default=None)
+p_$1.add_argument('--boolkwarg', action='store_true')
p_$1.set_defaults(func=$1_argparse)
]]>
subparser
diff --git a/voussoir/betterhelp_multi.sublime-snippet b/voussoir/betterhelp_multi.sublime-snippet
deleted file mode 100644
index 7a9684e..0000000
--- a/voussoir/betterhelp_multi.sublime-snippet
+++ /dev/null
@@ -1,32 +0,0 @@
-
- $1.py --help
-'''
-
-SUB_DOCSTRINGS = dict(
-$2='''
-$2:
- Command description.
-'''.strip(),
-)
-
-DOCSTRING = betterhelp.add_previews(DOCSTRING, SUB_DOCSTRINGS)
-
-return betterhelp.subparser_main(argv, parser, DOCSTRING, SUB_DOCSTRINGS)
-
-]]>
-betterhelp_multi
-
-
-
- source.python
-
diff --git a/voussoir/betterhelp_single.sublime-snippet b/voussoir/betterhelp_single.sublime-snippet
deleted file mode 100644
index 549650d..0000000
--- a/voussoir/betterhelp_single.sublime-snippet
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-betterhelp_single
-
-
-
- source.python
-
diff --git a/voussoir/boilerplate_multi.sublime-snippet b/voussoir/boilerplate_multi.sublime-snippet
new file mode 100644
index 0000000..e9e97f3
--- /dev/null
+++ b/voussoir/boilerplate_multi.sublime-snippet
@@ -0,0 +1,57 @@
+
+ $1.py --help
+'''
+
+SUB_DOCSTRINGS = dict(
+$2='''
+$2:
+ Command description.
+'''.strip(),
+)
+
+import argparse
+import sys
+
+from voussoirkit import betterhelp
+from voussoirkit import operatornotify
+from voussoirkit import vlogging
+
+log = vlogging.getLogger(__name__, '$1')
+
+def $2_argparse(args):
+ return 0
+
+__doc__ = betterhelp.add_previews(__doc__, SUB_DOCSTRINGS)
+def main(argv):
+ argv = vlogging.set_level_by_argv(log, argv)
+ (opnot_context, argv) = operatornotify.main_log_context(argv, subject='$1 warnings')
+
+ parser = argparse.ArgumentParser(description=__doc__)
+ subparsers = parser.add_subparsers()
+
+ p_$2 = subparsers.add_parser('$2')
+ p_$2.add_argument('required_positional')
+ p_$2.add_argument('optional_positional', nargs='?', default=None)
+ p_$2.add_argument('--kwarg', default=None)
+ p_$2.add_argument('--boolkwarg', action='store_true')
+ p_$2.set_defaults(func=$2_argparse)
+
+ with opnot_context:
+ return betterhelp.subparser_main(argv, parser, __doc__, SUB_DOCSTRINGS)
+
+if __name__ == '__main__':
+ raise SystemExit(main(sys.argv[1:]))
+
+]]>
+ boilerplate_multi
+ source.python
+ boilerplate multi
+
diff --git a/voussoir/argparse.sublime-snippet b/voussoir/boilerplate_single.sublime-snippet
similarity index 54%
rename from voussoir/argparse.sublime-snippet
rename to voussoir/boilerplate_single.sublime-snippet
index dbd5d1c..3e19e90 100644
--- a/voussoir/argparse.sublime-snippet
+++ b/voussoir/boilerplate_single.sublime-snippet
@@ -1,33 +1,41 @@
- argparse
+ boilerplate
source.python
+ boilerplate single
diff --git a/voussoir/helptext.sublime-snippet b/voussoir/helptext.sublime-snippet
deleted file mode 100644
index 7934f28..0000000
--- a/voussoir/helptext.sublime-snippet
+++ /dev/null
@@ -1,42 +0,0 @@
-
- ____my__program____.py --help
-'''.lstrip()
-
-SUB_DOCSTRINGS = dict(
-____my__command____='''
-____my__command____:
- ____my__command____description
-
- > ____my__program____.py ____my__command____
-
- flags:
- --____my__flag____:
-'''.strip(),
-)
-
-DOCSTRING = betterhelp.add_previews(DOCSTRING, SUB_DOCSTRINGS)
-
-def main(argv):
- return betterhelp.subparser_main(
- argv,
- parser,
- main_docstring=DOCSTRING,
- sub_docstrings=SUB_DOCSTRINGS,
- )
-
-]]>
-helptext
-
-
-
-
-
diff --git a/voussoir/vlogging.sublime-snippet b/voussoir/vlogging.sublime-snippet
index 6b81f7a..e484ac6 100644
--- a/voussoir/vlogging.sublime-snippet
+++ b/voussoir/vlogging.sublime-snippet
@@ -4,7 +4,7 @@ from voussoirkit import vlogging
log = vlogging.getLogger(__name__, '$1')
-def main(argv):
+ # Put this at the top of main
argv = vlogging.set_level_by_argv(log, argv)
]]>