diff mbox series

[2/2] refactor: apply black formatting to python files

Message ID 20231023185515.20200-2-jan.feemers@gmx.de
State Accepted
Headers show
Series [1/2] feat: add path option for python swupdate client | expand

Commit Message

Jan Feemers Oct. 23, 2023, 6:55 p.m. UTC 
ran the cmd: `black swupdateclient`

Signed-off-by: Jan Feemers <jan.feemers@gmx.de>
---
 tools/python/swupdateclient/setup.py          | 14 ++---
 .../swupdateclient/swupdateclient/main.py     | 54 ++++++++++++-------
 2 files changed, 43 insertions(+), 25 deletions(-)

--
2.25.1

Comments

Stefano Babic Oct. 24, 2023, 11:12 a.m. UTC | #1 
On 23.10.23 20:55, Jan Feemers wrote:
> ran the cmd: `black swupdateclient`
> 
> Signed-off-by: Jan Feemers <jan.feemers@gmx.de>
> ---
>   tools/python/swupdateclient/setup.py          | 14 ++---
>   .../swupdateclient/swupdateclient/main.py     | 54 ++++++++++++-------
>   2 files changed, 43 insertions(+), 25 deletions(-)
> 
> diff --git a/tools/python/swupdateclient/setup.py b/tools/python/swupdateclient/setup.py
> index be05d0b..60d7dc4 100644
> --- a/tools/python/swupdateclient/setup.py
> +++ b/tools/python/swupdateclient/setup.py
> @@ -4,14 +4,14 @@
>   from setuptools import setup, find_packages
> 
>   setup(
> -    name='swupdateclient',
> -    version='0.1',
> +    name="swupdateclient",
> +    version="0.1",
>       packages=find_packages(),
> -    url='https://github.com/sbabic/swupdate/tree/master/tools/python/swupdateclient',
> -    license='GPL-2.0-only',
> -    author='Stefano Babic',
> -    author_email='stefano.babic@swupdate.org',
> -    description='Python Client to update SWUpdate based devices',
> +    url="https://github.com/sbabic/swupdate/tree/master/tools/python/swupdateclient",
> +    license="GPL-2.0-only",
> +    author="Stefano Babic",
> +    author_email="stefano.babic@swupdate.org",
> +    description="Python Client to update SWUpdate based devices",
>       entry_points={
>           "console_scripts": [
>               "swupdateclient=swupdateclient.main:main",
> diff --git a/tools/python/swupdateclient/swupdateclient/main.py b/tools/python/swupdateclient/swupdateclient/main.py
> index a6ab768..c4ec4de 100644
> --- a/tools/python/swupdateclient/swupdateclient/main.py
> +++ b/tools/python/swupdateclient/swupdateclient/main.py
> @@ -46,10 +46,12 @@ class ColorFormatter(logging.Formatter):
>       }
> 
>       def format(self, record):
> -        return logging.Formatter(colored(
> -            "%(levelname)s:%(name)s:%(message)s",
> -            self.COLORS[record.levelno],
> -            attrs=self.ATTRIBUTES[record.levelno])
> +        return logging.Formatter(
> +            colored(
> +                "%(levelname)s:%(name)s:%(message)s",
> +                self.COLORS[record.levelno],
> +                attrs=self.ATTRIBUTES[record.levelno],
> +            )
>           ).format(record)
> 
> 
> @@ -59,7 +61,15 @@ class SWUpdater:
>       url_upload = "http://{}:{}{}/upload"
>       url_status = "ws://{}:{}{}/ws"
> 
> -    def __init__(self, path_image, host_name, port=8080, path="", logger=None, log_level=logging.DEBUG):
> +    def __init__(
> +        self,
> +        path_image,
> +        host_name,
> +        port=8080,
> +        path="",
> +        logger=None,
> +        log_level=logging.DEBUG,
> +    ):
>           self._image = path_image
>           self._host_name = host_name
>           self._port = port
> @@ -99,9 +109,7 @@ class SWUpdater:
>                       if data["type"] != "message":
>                           continue
> 
> -                    self._logger.log(
> -                        LOGGING_MAPPING[data["level"]],
> -                        data["text"])
> +                    self._logger.log(LOGGING_MAPPING[data["level"]], data["text"])
> 
>                       if "SWUPDATE successful" in data["text"]:
>                           return True
> @@ -130,8 +138,8 @@ class SWUpdater:
> 
>               if response.status_code != 200:
>                   self._logger.error(
> -                    "Cannot upload software image: %s",
> -                    response.status_code)
> +                    "Cannot upload software image: %s", response.status_code
> +                )
>                   return False
> 
>               self._logger.info(
> @@ -168,7 +176,7 @@ class SWUpdater:
>           return asyncio.run(self.start_tasks(timeout))
> 
> 
> -def client (args: List[str]) -> None:
> +def client(args: List[str]) -> None:
>       parser = argparse.ArgumentParser()
>       parser.add_argument("swu_file", help="Path to swu image")
>       parser.add_argument("host_name", help="Host name")
> @@ -178,7 +186,7 @@ def client (args: List[str]) -> None:
>           help="Name of the webserver-path (e.g. /PATH)",
>           type=str,
>           default="",
> -        nargs="?"
> +        nargs="?",
>       )
>       parser.add_argument(
>           "--timeout",
> @@ -188,13 +196,20 @@ def client (args: List[str]) -> None:
>           nargs="?",
>       )
>       parser.add_argument(
> -        "--log-level", help="change log level (error, info, warning, debug)",
> -        type=str, metavar="[LEVEL]",
> -        choices=["error", "info", "warning", "debug"], default="debug"
> +        "--log-level",
> +        help="change log level (error, info, warning, debug)",
> +        type=str,
> +        metavar="[LEVEL]",
> +        choices=["error", "info", "warning", "debug"],
> +        default="debug",
>       )
>       parser.add_argument(
> -        "--color", help="colorize messages (auto, always or never)", type=str,
> -        metavar="[WHEN]", choices=["auto", "always", "never"], default="auto"
> +        "--color",
> +        help="colorize messages (auto, always or never)",
> +        type=str,
> +        metavar="[WHEN]",
> +        choices=["auto", "always", "never"],
> +        default="auto",
>       )
> 
>       args = parser.parse_args()
> @@ -210,11 +225,14 @@ def client (args: List[str]) -> None:
>           args.host_name,
>           args.port,
>           args.route,
> -        log_level=args.log_level.upper())
> +        log_level=args.log_level.upper(),
> +    )
>       updater.update(timeout=args.timeout)
> 
> +
>   def main():
>       client(sys.argv[1:])
> 
> +
>   if __name__ == "__main__":
>       main()
> --
> 2.25.1
> 

Applied to -master, thanks !

Best regards,
Stefano Babic
diff mbox series

Patch

diff --git a/tools/python/swupdateclient/setup.py b/tools/python/swupdateclient/setup.py
index be05d0b..60d7dc4 100644
--- a/tools/python/swupdateclient/setup.py
+++ b/tools/python/swupdateclient/setup.py
@@ -4,14 +4,14 @@ 
 from setuptools import setup, find_packages

 setup(
-    name='swupdateclient',
-    version='0.1',
+    name="swupdateclient",
+    version="0.1",
     packages=find_packages(),
-    url='https://github.com/sbabic/swupdate/tree/master/tools/python/swupdateclient',
-    license='GPL-2.0-only',
-    author='Stefano Babic',
-    author_email='stefano.babic@swupdate.org',
-    description='Python Client to update SWUpdate based devices',
+    url="https://github.com/sbabic/swupdate/tree/master/tools/python/swupdateclient",
+    license="GPL-2.0-only",
+    author="Stefano Babic",
+    author_email="stefano.babic@swupdate.org",
+    description="Python Client to update SWUpdate based devices",
     entry_points={
         "console_scripts": [
             "swupdateclient=swupdateclient.main:main",
diff --git a/tools/python/swupdateclient/swupdateclient/main.py b/tools/python/swupdateclient/swupdateclient/main.py
index a6ab768..c4ec4de 100644
--- a/tools/python/swupdateclient/swupdateclient/main.py
+++ b/tools/python/swupdateclient/swupdateclient/main.py
@@ -46,10 +46,12 @@  class ColorFormatter(logging.Formatter):
     }

     def format(self, record):
-        return logging.Formatter(colored(
-            "%(levelname)s:%(name)s:%(message)s",
-            self.COLORS[record.levelno],
-            attrs=self.ATTRIBUTES[record.levelno])
+        return logging.Formatter(
+            colored(
+                "%(levelname)s:%(name)s:%(message)s",
+                self.COLORS[record.levelno],
+                attrs=self.ATTRIBUTES[record.levelno],
+            )
         ).format(record)


@@ -59,7 +61,15 @@  class SWUpdater:
     url_upload = "http://{}:{}{}/upload"
     url_status = "ws://{}:{}{}/ws"

-    def __init__(self, path_image, host_name, port=8080, path="", logger=None, log_level=logging.DEBUG):
+    def __init__(
+        self,
+        path_image,
+        host_name,
+        port=8080,
+        path="",
+        logger=None,
+        log_level=logging.DEBUG,
+    ):
         self._image = path_image
         self._host_name = host_name
         self._port = port
@@ -99,9 +109,7 @@  class SWUpdater:
                     if data["type"] != "message":
                         continue

-                    self._logger.log(
-                        LOGGING_MAPPING[data["level"]],
-                        data["text"])
+                    self._logger.log(LOGGING_MAPPING[data["level"]], data["text"])

                     if "SWUPDATE successful" in data["text"]:
                         return True
@@ -130,8 +138,8 @@  class SWUpdater:

             if response.status_code != 200:
                 self._logger.error(
-                    "Cannot upload software image: %s",
-                    response.status_code)
+                    "Cannot upload software image: %s", response.status_code
+                )
                 return False

             self._logger.info(
@@ -168,7 +176,7 @@  class SWUpdater:
         return asyncio.run(self.start_tasks(timeout))


-def client (args: List[str]) -> None:
+def client(args: List[str]) -> None:
     parser = argparse.ArgumentParser()
     parser.add_argument("swu_file", help="Path to swu image")
     parser.add_argument("host_name", help="Host name")
@@ -178,7 +186,7 @@  def client (args: List[str]) -> None:
         help="Name of the webserver-path (e.g. /PATH)",
         type=str,
         default="",
-        nargs="?"
+        nargs="?",
     )
     parser.add_argument(
         "--timeout",
@@ -188,13 +196,20 @@  def client (args: List[str]) -> None:
         nargs="?",
     )
     parser.add_argument(
-        "--log-level", help="change log level (error, info, warning, debug)",
-        type=str, metavar="[LEVEL]",
-        choices=["error", "info", "warning", "debug"], default="debug"
+        "--log-level",
+        help="change log level (error, info, warning, debug)",
+        type=str,
+        metavar="[LEVEL]",
+        choices=["error", "info", "warning", "debug"],
+        default="debug",
     )
     parser.add_argument(
-        "--color", help="colorize messages (auto, always or never)", type=str,
-        metavar="[WHEN]", choices=["auto", "always", "never"], default="auto"
+        "--color",
+        help="colorize messages (auto, always or never)",
+        type=str,
+        metavar="[WHEN]",
+        choices=["auto", "always", "never"],
+        default="auto",
     )

     args = parser.parse_args()
@@ -210,11 +225,14 @@  def client (args: List[str]) -> None:
         args.host_name,
         args.port,
         args.route,
-        log_level=args.log_level.upper())
+        log_level=args.log_level.upper(),
+    )
     updater.update(timeout=args.timeout)

+
 def main():
     client(sys.argv[1:])

+
 if __name__ == "__main__":
     main()