Re: [PATCH v2 3/6] test: Reformat Python test scripts

On 29/11/2021 06:06, Mark Greer wrote:
> Reformat the Python-based test scripts using the "Prettier"
> beautifiers (default options). This brings the code closer to
> conformance with the PEP 8 style guide.
> 
> Signed-off-by: Mark Greer <[email protected]>
> ---
>  test/bt-handover         | 249 ++++++++++++++++++--------------
>  test/handover-agent      | 284 +++++++++++++++++++++---------------
>  test/monitor-near        |  76 +++++-----
>  test/ndef-agent          | 112 +++++++--------
>  test/neard-ui.py         | 304 +++++++++++++++++++++------------------
>  test/neardutils.py       | 138 ++++++++++--------
>  test/phdc-simple-manager | 228 +++++++++++++++--------------
>  test/test-adapter        | 156 ++++++++++----------
>  test/test-device         | 218 ++++++++++++++++------------
>  test/test-tag            | 204 +++++++++++++-------------
>  10 files changed, 1076 insertions(+), 893 deletions(-)
> 
> diff --git a/test/bt-handover b/test/bt-handover
> index eebae9338e00..468e58cb18a8 100755
> --- a/test/bt-handover
> +++ b/test/bt-handover
> @@ -13,119 +13,152 @@ from dbus.lowlevel import MethodCallMessage, HANDLER_RESULT_NOT_YET_HANDLED
>  
>  mainloop = gobject.MainLoop()
>  
> -def device_added(path, interfaces):
> -        for iface, props in interfaces.items():
> -                if "org.neard.Device" in interfaces:
> -                        print("Pairing with %s" % (path))
> -                        device = dbus.Interface(bus.get_object("org.neard", path),
> -                                                        "org.neard.Device")
> -                        device.Push(({ "Type" : "Handover", "Carrier" : "bluetooth"}))
> -                        break
> -
> -def device_removed(path, interfaces):
> -        for iface in interfaces:
> -                if "org.neard.Device" in interfaces:
> -                        print("Lost device %s" % (path))
> -                        mainloop.quit()
> -                        break
> -
> -def remove_paired_devices(bt_adapter):
> -        manager = dbus.Interface(bus.get_object("org.bluez", "/"),
> -                                        "org.freedesktop.DBus.ObjectManager")
> -        objects = manager.GetManagedObjects()
>  
> -        all_adapters = (path for path, interfaces in objects.items() if
> -                                "org.bluez.Adapter1" in interfaces.keys()
> -                                and path.endswith(bt_adapter))
> -
> -        bluez_adapter = None
> -        for adapter in sorted(all_adapters):
> -                bluez_adapter = dbus.Interface(bus.get_object("org.bluez",
> -                                                        adapter),
> -                                                        "org.bluez.Adapter1")
> -                break
> -

Which tool did you use? The autopep8 produces different results, which
look more readable in argument alignment:

--- a/test/bt-handover

+++ b/test/bt-handover

@@ -18,9 +18,8 @@ def device_added(path, interfaces):

     for iface, props in interfaces.items():

         if "org.neard.Device" in interfaces:

             print("Pairing with %s" % (path))

-            device = dbus.Interface(

-                bus.get_object("org.neard", path), "org.neard.Device"

-            )

+            device = dbus.Interface(bus.get_object("org.neard", path),

+                                    "org.neard.Device")

             device.Push(({"Type": "Handover", "Carrier": "bluetooth"}))

             break



Or in array elements:

     tag = neardutils.find_tag(sys.argv[2])



     if sys.argv[3] in ["Text"]:

-        tag.Write(

-            (

-                {

-                    "Type": "Text",

+        tag.Write(({"Type": "Text",

                     "Encoding": sys.argv[4],

                     "Language": sys.argv[5],

-                    "Representation": sys.argv[6],

-                }

-            )

-        )

+                    "Representation": sys.argv[6]}))



     elif sys.argv[3] == "URI":

         write_uri(sys.argv[4:])



The only trouble with autopep8 is that it puts every, even simple, if
with parentheses:

-if sys.argv[1] == "write":

-    if len(sys.argv) < 5:

+if (sys.argv[1] == "write"):

+    if (len(sys.argv) < 5):

         usage()


However existing code already had such syntax in few places.

Best regards,
Krzysztof