fix: Handle deprecated options with "=" before value

Author: peterdragun

esptool/cli_util.py

@@ -231,6 +231,8 @@ def __call__(self, esp: ESPLoader | None = None, *args, **kwargs):
     def _replace_deprecated_args(self, args: list[str]) -> list[str]:
         new_args = []
         for arg in args:
+            # In case of arguments with values we need to check the key without value
+            arg, value = arg.split("=", 1) if "=" in arg else (arg, None)
             if arg in self.DEPRECATED_OPTIONS.keys():
                 # Replace underscores with hyphens in option names
                 new_name = self.DEPRECATED_OPTIONS[arg]
@@ -240,6 +242,8 @@ def _replace_deprecated_args(self, args: list[str]) -> list[str]:
                         f"Use '{new_name}' instead."
                     )
                     arg = new_name
+            if value is not None:
+                arg += f"={value}"
             new_args.append(arg)
         return new_args
 

test/test_esptool.py

@@ -445,7 +445,8 @@ def test_short_flash(self):
     @pytest.mark.skipif(arg_chip != "esp32", reason="Don't need to test multiple times")
     def test_short_flash_deprecated(self):
         out = self.run_esptool(
-            "--before default_reset write_flash 0x0 images/one_kb.bin --flash_size keep"
+            "--before default_reset write_flash 0x0 images/one_kb.bin "
+            "--flash_size keep --flash_mode=keep"
         )
         assert (
             "Deprecated: Choice 'default_reset' for option '--before' is deprecated. "
@@ -455,6 +456,10 @@ def test_short_flash_deprecated(self):
             "Deprecated: Option '--flash_size' is deprecated. "
             "Use '--flash-size' instead." in out
         )
+        assert (
+            "Deprecated: Option '--flash_mode' is deprecated. "
+            "Use '--flash-mode' instead." in out
+        )
         assert (
             "Deprecated: Command 'write_flash' is deprecated. "
             "Use 'write-flash' instead." in out