Code cleanup.

[python_utils.git] / config.py

diff --git a/config.py b/config.py
index b6262adf29b4f64816a793cfe7a692cd85d45d14..dc0042d5b664228a67a04925435b2e9f83729386 100644 (file)
--- a/config.py
+++ b/config.py
@@ -96,11 +96,13 @@ args = argparse.ArgumentParser(
 # than once.
 config_parse_called = False
 
+
 # A global configuration dictionary that will contain parsed arguments.
 # It is also this variable that modules use to access parsed arguments.
 # This is the data that is most interesting to our callers; it will hold
 # the configuration result.
-config: Dict[str, Any] = {}
+config = {}
+# It would be really nice if this shit worked from interactive python
 
 
 def add_commandline_args(title: str, description: str = ""):
@@ -131,6 +133,16 @@ group.add_argument(
     default=None,
     help='Populate config file compatible with --config_loadfile to save global config for later use.',
 )
+group.add_argument(
+    '--config_rejects_unrecognized_arguments',
+    default=False,
+    action='store_true',
+    help=(
+        'If present, config will raise an exception if it doesn\'t recognize an argument.  The ' +
+        'default behavior is to ignore this so as to allow interoperability with programs that ' +
+        'want to use their own argparse calls to parse their own, separate commandline args.'
+    )
+)
 
 
 def is_flag_already_in_argv(var: str):
@@ -247,6 +259,12 @@ def parse(entry_module: Optional[str]) -> Dict[str, Any]:
     # future argument parsers.  For example, unittest_main in python
     # has some of its own flags.  If we didn't recognize it, maybe
     # someone else will.
+    if len(unknown) > 0:
+        if config['config_rejects_unrecognized_arguments']:
+            raise Exception(
+                f'Encountered unrecognized config argument(s) {unknown} with --config_rejects_unrecognized_arguments enabled; halting.'
+            )
+        saved_messages.append(f'Config encountered unrecognized commandline arguments: {unknown}')
     sys.argv = sys.argv[:1] + unknown
 
     # Check for savefile and populate it if requested.