Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73c41a9a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "pdl: refactor “isinstance(…) or isinstance(…)”" am: b9bddcaf am:... 

Merge "pdl: refactor “isinstance(…) or isinstance(…)”" am: b9bddcaf am: bb808b04 am: ce3d83aa am: d2786547 am: b52e9596

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2153558



Change-Id: I9f7e98f014128f1960232ad95a97e67b285a2ba5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4886df8b b52e9596

tools/pdl/scripts/generate_python_backend.py

+1 −1
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ class FieldParser: 
            self.parse_typedef_field_(field)



        # Payload and body fields.

        elif (isinstance(field, ast.PayloadField) or isinstance(field, ast.BodyField)):

        elif isinstance(field, (ast.PayloadField, ast.BodyField)):

            self.parse_payload_field_(field)



        # Checksum fields.

tools/pdl/scripts/pdl/ast.py

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ class File: 
def convert_(obj: object) -> object:

    if obj is None:

        return None

    if isinstance(obj, int) or isinstance(obj, str):

    if isinstance(obj, (int, str)):

        return obj

    if isinstance(obj, list):

        return [convert_(elt) for elt in obj]