fix: remove arg --redirect-errors

espressif · Sep 6, 2023 · d481637 · d481637
1 parent df48429
commit d481637
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 39 deletions.
diff --git a/espefuse/__init__.py b/espefuse/__init__.py
@@ -212,13 +212,6 @@ def main(custom_commandline=None, esp=None):
         action="store_true",
     )
 
-    init_parser.add_argument(
-        "--redirect-errors",
-        help="Redirect errors to stderr instead of stdout",
-        action="store_true",
-        default=os.environ.get("REDIRECT_ERRORS", REDIRECT_ERRORS),
-    )
-
     common_args, remaining_args = init_parser.parse_known_args(custom_commandline)
     debug_mode = common_args.debug or ("dump" in remaining_args)
     just_print_help = [
@@ -270,8 +263,6 @@ def main(custom_commandline=None, esp=None):
     try:
         for rem_args in grouped_remaining_args:
             args, unused_args = parser.parse_known_args(rem_args, namespace=common_args)
-            globals()["redirect_errors"] = args.redirect_errors
-
             if args.operation is None:
                 parser.print_help()
                 parser.exit(1)
@@ -306,7 +297,7 @@ def _main():
     except esptool.FatalError as e:
         print(
             "\nA fatal error occurred: %s" % e,
-            file=sys.stderr if globals()["redirect_errors"] else sys.stdout,
+            file=sys.stderr if REDIRECT_ERRORS else sys.stdout,
         )
         sys.exit(2)
 

diff --git a/espsecure/__init__.py b/espsecure/__init__.py
@@ -1429,13 +1429,6 @@ def main(custom_commandline=None):
         prog="espsecure",
     )
 
-    parser.add_argument(
-        "--redirect-errors",
-        help="Redirect errors to stderr instead of stdout",
-        action="store_true",
-        default=os.environ.get("REDIRECT_ERRORS", REDIRECT_ERRORS),
-    )
-
     subparsers = parser.add_subparsers(
         dest="operation", help="Run espsecure.py {command} -h for additional help"
     )
@@ -1798,7 +1791,6 @@ def main(custom_commandline=None):
     )
 
     args = parser.parse_args(custom_commandline)
-    globals()["redirect_errors"] = args.redirect_errors
     print("espsecure.py v%s" % esptool.__version__)
     if args.operation is None:
         parser.print_help()
@@ -1821,7 +1813,7 @@ def _main():
     except esptool.FatalError as e:
         print(
             "\nA fatal error occurred: %s" % e,
-            file=sys.stderr if globals()["redirect_errors"] else sys.stdout,
+            file=sys.stderr if REDIRECT_ERRORS else sys.stdout,
         )
         sys.exit(2)
     except ValueError as e:
@@ -1831,7 +1823,7 @@ def _main():
                     "Note: This error originates from the cryptography module. "
                     "It is likely not a problem with espsecure, "
                     "please make sure you are using a compatible OpenSSL backend.",
-                    file=sys.stderr if globals()["redirect_errors"] else sys.stdout,
+                    file=sys.stderr if REDIRECT_ERRORS else sys.stdout,
                 )
         finally:
             raise

diff --git a/esptool/__init__.py b/esptool/__init__.py
@@ -173,13 +173,6 @@ def main(argv=None, esp=None):
         default=os.environ.get("ESPTOOL_CONNECT_ATTEMPTS", DEFAULT_CONNECT_ATTEMPTS),
     )
 
-    parser.add_argument(
-        "--redirect-errors",
-        help="Redirect errors to stderr instead of stdout",
-        action="store_true",
-        default=os.environ.get("REDIRECT_ERRORS", REDIRECT_ERRORS),
-    )
-
     subparsers = parser.add_subparsers(
         dest="operation", help="Run esptool.py {command} -h for additional help"
     )
@@ -645,7 +638,6 @@ def add_spi_flash_subparsers(parent, allow_keep, auto_detect):
     argv = expand_file_arguments(argv or sys.argv[1:])
 
     args = parser.parse_args(argv)
-    globals()["redirect_errors"] = args.redirect_errors
     print("esptool.py v%s" % __version__)
     load_config_file(verbose=True)
 
@@ -1087,11 +1079,11 @@ def _main():
     except FatalError as e:
         print(
             f"\nA fatal error occurred: {e}",
-            file=sys.stderr if globals()["redirect_errors"] else sys.stdout,
+            file=sys.stderr if REDIRECT_ERRORS else sys.stdout,
         )
         sys.exit(2)
     except serial.serialutil.SerialException as e:
-        file = sys.stderr if globals()["redirect_errors"] else sys.stdout
+        file = sys.stderr if REDIRECT_ERRORS else sys.stdout
         print(f"\nA serial exception error occurred: {e}", file=file)
         print(
             "Note: This error originates from pySerial. "
@@ -1106,7 +1098,7 @@ def _main():
         )
         sys.exit(1)
     except StopIteration:
-        file = sys.stderr if globals()["redirect_errors"] else sys.stdout
+        file = sys.stderr if REDIRECT_ERRORS else sys.stdout
         print(traceback.format_exc(), file=file)
         print("A fatal error occurred: The chip stopped responding.", file=file)
         sys.exit(2)

diff --git a/flasher_stub/wrap_stub.py b/flasher_stub/wrap_stub.py
@@ -54,7 +54,7 @@ def wrap_stub(elf_file):
             stub.get("data_start", 0),
             stub["entry"],
         ),
-        file=sys.stderr if globals()["redirect_errors"] else sys.stdout,
+        file=sys.stderr if REDIRECT_ERRORS else sys.stdout,
     )
 
     return stub
@@ -80,14 +80,7 @@ def stub_name(filename):
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
     parser.add_argument("elf_files", nargs="+", help="Stub ELF files to convert")
-    parser.add_argument(
-        "--redirect-errors",
-        help="Redirect errors to stderr instead of stdout",
-        action="store_true",
-        default=os.environ.get("REDIRECT_ERRORS", REDIRECT_ERRORS),
-    )
     args = parser.parse_args()
-    globals()["redirect_errors"] = args.redirect_errors
 
     stubs = dict(
         (stub_name(elf_file), wrap_stub(elf_file)) for elf_file in args.elf_files