• Bug#1087666: chirp: please last remaining usage of python3-six

    From Alexandre Detiste@1:229/2 to All on Sat Nov 16 23:40:01 2024
    XPost: linux.debian.bugs.dist
    From: [email protected]

    Source: chirp
    Version: 1:20241108-1
    Severity: normal

    Dear Maintainers,

    Usage of six now mostly gone and "tools/check_commit.sh"
    will ensure it's not comming back.

    Can you please patch-out the single last use
    and forward the patch to upstream ?

    I find their website full of annoying blinking ads hard to navigate.

    Greetings

    Alexandre





    diff --git a/debian/control b/debian/control
    index 9c06173..179e79e 100644
    --- a/debian/control
    +++ b/debian/control
    @@ -11,7 +11,6 @@ Build-Depends:
    python3,
    python3-requests,
    python3-serial,
    - python3-six,
    python3-yattag,
    wxpython-tools,
    python3-setuptools,
    @@ -29,7 +28,6 @@ Multi-Arch: foreign
    Depends:
    python3-requests,
    python3-serial,
    - python3-six,
    python3-yattag,
    python3-suds,
    wxpython-tools,
    diff --git a/tests/unit/test_bitwise.py b/tests/unit/test_bitwise.py
    index 3ace170..4ba467f 100644
    --- a/tests/unit/test_bitwise.py
    +++ b/tests/unit/test_bitwise.py
    @@ -18,7 +18,6 @@ from builtins import bytes
    import unittest
    from unittest import mock

    -import six

    from chirp import bitwise
    from chirp import memmap
    @@ -256,10 +255,7 @@ class TestBitwiseCharTypes(BaseTest):
    data = memmap.MemoryMapBytes(bytes(b"\xFFoobar1"))
    obj = bitwise.parse("struct {char foo[7];} bar;", data)

    - if six.PY3:
    - expected = '\xffoobar1'
    - else:
    - expected = '\\xffoobar1'
    + expected =