|
 |
d888b65 |
--- configargparse.py 2014-08-25 12:43:53.000000000 +1200
|
|
|
d888b65 |
+++ configargparse.py26 2015-12-12 23:39:19.913399598 +1300
|
|
|
d888b65 |
@@ -1,5 +1,4 @@
|
|
|
d888b65 |
import argparse
|
|
|
d888b65 |
-from collections import OrderedDict
|
|
|
d888b65 |
import os
|
|
|
d888b65 |
import re
|
|
|
d888b65 |
import sys
|
|
|
d888b65 |
@@ -10,12 +9,17 @@
|
|
|
d888b65 |
else:
|
|
|
d888b65 |
from StringIO import StringIO
|
|
|
d888b65 |
|
|
|
d888b65 |
+if sys.version_info < (2, 7):
|
|
|
d888b65 |
+ from ordereddict import OrderedDict
|
|
|
d888b65 |
+else:
|
|
|
d888b65 |
+ from collections import OrderedDict
|
|
|
d888b65 |
+
|
|
|
d888b65 |
__version__ = "0.9.3"
|
|
|
d888b65 |
|
|
|
d888b65 |
|
|
|
d888b65 |
-ACTION_TYPES_THAT_DONT_NEED_A_VALUE = {argparse._StoreTrueAction,
|
|
|
d888b65 |
+ACTION_TYPES_THAT_DONT_NEED_A_VALUE = set([argparse._StoreTrueAction,
|
|
|
d888b65 |
argparse._StoreFalseAction, argparse._CountAction,
|
|
|
d888b65 |
- argparse._StoreConstAction, argparse._AppendConstAction}
|
|
|
d888b65 |
+ argparse._StoreConstAction, argparse._AppendConstAction])
|
|
|
d888b65 |
|
|
|
d888b65 |
|
|
|
d888b65 |
# global ArgumentParser instances
|
|
|
d888b65 |
@@ -124,10 +128,10 @@
|
|
|
d888b65 |
self._add_env_var_help = add_env_var_help
|
|
|
d888b65 |
|
|
|
d888b65 |
# extract kwargs that can be passed to the super constructor
|
|
|
d888b65 |
- kwargs_for_super = {k: v for k, v in locals().items() if k in [
|
|
|
d888b65 |
+ kwargs_for_super = dict([(k, v) for k, v in locals().items() if k in [
|
|
|
d888b65 |
"prog", "usage", "description", "epilog", "version", "parents",
|
|
|
d888b65 |
"formatter_class", "prefix_chars", "fromfile_prefix_chars",
|
|
|
d888b65 |
- "argument_default", "conflict_handler", "add_help" ]}
|
|
|
d888b65 |
+ "argument_default", "conflict_handler", "add_help" ]])
|
|
|
d888b65 |
if sys.version_info >= (3, 3) and "version" in kwargs_for_super:
|
|
|
d888b65 |
del kwargs_for_super["version"] # version arg deprecated in v3.3
|
|
|
d888b65 |
|
|
|
d888b65 |
@@ -218,8 +222,8 @@
|
|
|
d888b65 |
# add config file settings to the command line that aren't there already
|
|
|
d888b65 |
|
|
|
d888b65 |
# for each action, add its possible config keys to a dict
|
|
|
d888b65 |
- possible_config_keys = {config_key: action for action in self._actions
|
|
|
d888b65 |
- for config_key in self.get_possible_config_keys(action)}
|
|
|
d888b65 |
+ possible_config_keys = dict([(config_key, action) for action in self._actions
|
|
|
d888b65 |
+ for config_key in self.get_possible_config_keys(action)])
|
|
|
d888b65 |
|
|
|
d888b65 |
# parse each config file
|
|
|
d888b65 |
for stream in config_streams[::-1]:
|