Merge ~kissiel/checkbox-support:parsers-migration into checkbox-support:master

[Maciej Kisielewski]

This MR has multiple goodies.

0. Parsers can now be invoked directly from checkbox support. The invocation is:
checkbox-support-parse <PARSER_NAME>
This enables us to get rid of the plainbox entry point, all of the logic related to "plainbox commands" from checkbox-ng, and parser abstract classes.

1. It refactors out some of the unnecessary abstractions in parser unit tests.

2. It removes _A LOT_ of imports from the times where python3 was considered the future.

3. It removes ugly header bits.

[Sylvain Pineau (sylvain-pineau)]

awesome work, and indeed the unit tests are faster to run!

The corresponding p-p-r and p-p-c commits will be a pleasure to review

review: Approve

diff --git a/checkbox_support/contrib/xrandr.py b/checkbox_support/contrib/xrandr.py
index 9a79f40..91fd173 100644
--- a/checkbox_support/contrib/xrandr.py
+++ b/checkbox_support/contrib/xrandr.py
@@ -1,6 +1,3 @@
-#!/usr/bin/python3
-# -*- coding: utf-8 -*-
-#
 # Python-XRandR provides a high level API for the XRandR extension of the
 # X.org server. XRandR allows to configure resolution, refresh rate, rotation
 # of the screen and multiple outputs of graphics cards.
@@ -36,11 +33,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301  USA
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 from ctypes import (
     POINTER,
     Structure,
diff --git a/checkbox_support/dbus/__init__.py b/checkbox_support/dbus/__init__.py
index 93f178d..8d2281a 100644
--- a/checkbox_support/dbus/__init__.py
+++ b/checkbox_support/dbus/__init__.py
@@ -1,13 +1,12 @@
 # This file is part of Checkbox.
 #
-# Copyright 2012 Canonical Ltd.
+# Copyright 2012-2022 Canonical Ltd.
 # Written by:
 #   Zygmunt Krynicki <[e-mail]>
 #
 # Checkbox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3,
 # as published by the Free Software Foundation.
-
 #
 # Checkbox is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,7 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
-#
 """
 checkbox_support.dbus
 =====================
@@ -24,11 +22,6 @@ checkbox_support.dbus
 Utility modules for working with various things accessible over dbus
 """
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import logging
 
 from dbus import SystemBus
diff --git a/checkbox_support/dbus/udisks2.py b/checkbox_support/dbus/udisks2.py
index 28e62a5..d156ded 100644
--- a/checkbox_support/dbus/udisks2.py
+++ b/checkbox_support/dbus/udisks2.py
@@ -13,7 +13,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
 """
 checkbox_support.dbus.udisks2
 =====================
diff --git a/checkbox_support/disk_support.py b/checkbox_support/disk_support.py
index 09d8525..bba496b 100644
--- a/checkbox_support/disk_support.py
+++ b/checkbox_support/disk_support.py
@@ -14,7 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
 """
 Support functions related to disk devices for Checkbox.
 """
diff --git a/checkbox_support/helpers/human_readable_bytes.py b/checkbox_support/helpers/human_readable_bytes.py
index 7b1d391..8bafdf2 100644
--- a/checkbox_support/helpers/human_readable_bytes.py
+++ b/checkbox_support/helpers/human_readable_bytes.py
@@ -15,7 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
-
 """
 checkbox_support.helpers.human_readable_bytes
 =============================================
diff --git a/checkbox_support/lib/bit.py b/checkbox_support/lib/bit.py
index 2cc3e6e..e0e9808 100644
--- a/checkbox_support/lib/bit.py
+++ b/checkbox_support/lib/bit.py
@@ -1,12 +1,10 @@
-#
 # This file is part of Checkbox.
 #
-# Copyright 2008 Canonical Ltd.
+# Copyright 2008-2022 Canonical Ltd.
 #
 # Checkbox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3,
 # as published by the Free Software Foundation.
-
 #
 # Checkbox is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,11 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 from struct import calcsize
 
 
diff --git a/checkbox_support/lib/conversion.py b/checkbox_support/lib/conversion.py
index b8ce871..d954c09 100644
--- a/checkbox_support/lib/conversion.py
+++ b/checkbox_support/lib/conversion.py
@@ -1,12 +1,10 @@
-#
 # This file is part of Checkbox.
 #
-# Copyright 2008 Canonical Ltd.
+# Copyright 2008-2022 Canonical Ltd.
 #
 # Checkbox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3,
 # as published by the Free Software Foundation.
-
 #
 # Checkbox is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,11 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import re
 from datetime import datetime, timedelta
 
diff --git a/checkbox_support/lib/dmi.py b/checkbox_support/lib/dmi.py
index 13593d2..f93e824 100644
--- a/checkbox_support/lib/dmi.py
+++ b/checkbox_support/lib/dmi.py
@@ -1,12 +1,10 @@
-#
 # This file is part of Checkbox.
 #
-# Copyright 2008 Canonical Ltd.
+# Copyright 2008-2022 Canonical Ltd.
 #
 # Checkbox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3,
 # as published by the Free Software Foundation.
-
 #
 # Checkbox is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,11 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import os
 
 from checkbox_support.lib.conversion import string_to_type
diff --git a/checkbox_support/lib/input.py b/checkbox_support/lib/input.py
index 263b1d5..62feb02 100644
--- a/checkbox_support/lib/input.py
+++ b/checkbox_support/lib/input.py
@@ -1,4 +1,3 @@
-#
 # This file is part of Checkbox.
 #
 # Copyright 2008 Canonical Ltd.
@@ -6,7 +5,6 @@
 # Checkbox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3,
 # as published by the Free Software Foundation.
-
 #
 # Checkbox is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/checkbox_support/lib/pci.py b/checkbox_support/lib/pci.py
index 94983c7..a0766dc 100644
--- a/checkbox_support/lib/pci.py
+++ b/checkbox_support/lib/pci.py
@@ -1,4 +1,3 @@
-#
 # This file is part of Checkbox.
 #
 # Copyright 2008 Canonical Ltd.
@@ -6,7 +5,6 @@
 # Checkbox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3,
 # as published by the Free Software Foundation.
-
 #
 # Checkbox is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,12 +15,6 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-
 # See http://pciids.sourceforge.net/pci.ids.bz2
 class Pci(object):
 
diff --git a/checkbox_support/lib/tz.py b/checkbox_support/lib/tz.py
index fd87409..c03d9ba 100644
--- a/checkbox_support/lib/tz.py
+++ b/checkbox_support/lib/tz.py
@@ -1,12 +1,10 @@
-#
 # This file is part of Checkbox.
 #
-# Copyright 2012 Canonical Ltd.
+# Copyright 2012-2022 Canonical Ltd.
 #
 # Checkbox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3,
 # as published by the Free Software Foundation.
-
 #
 # Checkbox is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,11 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 __all__ = ["tzutc"]
 
 from datetime import timedelta
diff --git a/checkbox_support/lib/usb.py b/checkbox_support/lib/usb.py
index 67e1626..2b63a81 100644
--- a/checkbox_support/lib/usb.py
+++ b/checkbox_support/lib/usb.py
@@ -1,12 +1,10 @@
-#
 # This file is part of Checkbox.
 #
-# Copyright 2008 Canonical Ltd.
+# Copyright 2008-2022 Canonical Ltd.
 #
 # Checkbox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3,
 # as published by the Free Software Foundation.
-
 #
 # Checkbox is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,11 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 
 # See http://www.linux-usb.org/usb.ids
 class Usb(object):
diff --git a/checkbox_support/parsers/__init__.py b/checkbox_support/parsers/__init__.py
index e5ec840..7797414 100644
--- a/checkbox_support/parsers/__init__.py
+++ b/checkbox_support/parsers/__init__.py
@@ -1,11 +1,111 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-# The version is an incrementing number, if the version changes it means
-# one of the parser components has changed and may produce different
-# results for a given parsable input.
-# This should be updated manually when a parser component changes, note
-# that this includes changes to any module under checkbox.parsers.
-__version__ = '3'
+# This file is part of Checkbox.
+#
+# Copyright 2022 Canonical Ltd.
+# Written by:
+#   Maciej Kisielewski <[e-mail]>
+#
+# Checkbox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3,
+# as published by the Free Software Foundation.
+#
+# Checkbox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
+"""
+This module provides an entry point to checkbox-support-parse.
+
+The commands turns an output of system commands and turns them into json.
+When a new parser is added, it should be added to AVAILABLE_PARSER mapping."
+"""
+
+import io
+import json
+import re
+import sys
+
+from argparse import ArgumentParser
+
+from checkbox_support.parsers import dkms_info
+from checkbox_support.parsers import dmidecode
+from checkbox_support.parsers import image_info
+from checkbox_support.parsers import kernel_cmdline
+from checkbox_support.parsers import modinfo
+from checkbox_support.parsers import modprobe
+from checkbox_support.parsers import pactl
+from checkbox_support.parsers import pci_config
+from checkbox_support.parsers import udevadm
+
+AVAILABLE_PARSERS = {
+    'bto': image_info.parse_bto_attachment_output,
+    'buildstamp': image_info.parse_buildstamp_attachment_output,
+    'dkms': dkms_info.parse_dkms_info,
+    'dmidecode': dmidecode.parse_dmidecode_output,
+    'kernelcmdline': kernel_cmdline.parse_kernel_cmdline,
+    'modinfo': modinfo.parse_modinfo_attachment_output,
+    'modprobe': modprobe.parse_modprobe_d_output,
+    'pactl-list': pactl.parse_pactl_output,
+    'pci-subsys-id': pci_config.parse_pci_subsys_id,
+    'recovery-info': image_info.parse_recovery_info_attachment_output,
+    'udevadm': udevadm.parse_udevadm_output,
+}
+PARSER_LIST = sorted(list(AVAILABLE_PARSERS.keys()))
+Pattern = type(re.compile(""))
+
+
+def main():
+    """Entry point to the program."""
+    arg_parser = ArgumentParser(
+        description="parse stdin with the specified parser")
+    arg_parser.add_argument(
+        "parser_name", metavar="PARSER-NAME",
+        choices=['?'] + PARSER_LIST,
+        help="Name of the parser to use")
+    args = arg_parser.parse_args()
+    if args.parser_name == '?':
+        print("The following parsers are available:")
+        print("\n".join(PARSER_LIST))
+        raise SystemExit()
+    parser = AVAILABLE_PARSERS[args.parser_name]
+    stdin = sys.stdin
+    with io.TextIOWrapper(sys.stdin.buffer, encoding='utf-8') as stdin:
+        try:
+            text = stdin.read()
+            print(run_parsing(parser, text))
+        except UnicodeDecodeError as exc:
+            msg = "Failed to decode input stream: {}".format(str(exc))
+            raise SystemExit(msg) from exc
+
+
+def run_parsing(parser_fn, text):
+    """Do the actual parsing."""
+    try:
+        ast = parser_fn(text)
+        return json.dumps(
+            ast, indent=4, sort_keys=True, default=_json_fallback)
+    except Exception as exc:
+        msg = "Failed to parse the text: {}".format(str(exc))
+        raise SystemExit(msg) from exc
+
+
+def _json_fallback(obj):
+    """
+    Helper method to convert arbitrary objects to their JSON
+    representation.
+
+    Anything that has a 'as_json' attribute will be converted to the result
+    of calling that method. For all other objects __dict__ is returned.
+    """
+    if isinstance(obj, Pattern):
+        return "<Pattern>"
+    if hasattr(obj, "as_json"):
+        return obj.as_json()
+    if hasattr(obj, "__dict__"):
+        return obj.__dict__
+    if hasattr(obj, "__slots__"):
+        return {slot: getattr(obj, slot) for slot in obj.__slots__}
+    raise NotImplementedError(
+        "unable to json-ify {!r}".format(obj.__class__))
diff --git a/checkbox_support/parsers/cpuinfo.py b/checkbox_support/parsers/cpuinfo.py
index 2e8aa81..5a2ce6b 100644
--- a/checkbox_support/parsers/cpuinfo.py
+++ b/checkbox_support/parsers/cpuinfo.py
@@ -1,12 +1,10 @@
-#
 # This file is part of Checkbox.
 #
-# Copyright 2011 Canonical Ltd.
+# Copyright 2011-2022 Canonical Ltd.
 #
 # Checkbox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3,
 # as published by the Free Software Foundation.
-
 #
 # Checkbox is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,11 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 from os import uname
 import re
 
diff --git a/checkbox_support/parsers/cputable.py b/checkbox_support/parsers/cputable.py
index e7e652e..767d236 100644
--- a/checkbox_support/parsers/cputable.py
+++ b/checkbox_support/parsers/cputable.py
@@ -1,12 +1,10 @@
-#
 # This file is part of Checkbox.
 #
-# Copyright 2011 Canonical Ltd.
+# Copyright 2011-2022 Canonical Ltd.
 #
 # Checkbox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3,
 # as published by the Free Software Foundation.
-
 #
 # Checkbox is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,11 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import re
 
 
diff --git a/checkbox_support/parsers/dkms_info.py b/checkbox_support/parsers/dkms_info.py
index 89ba549..b23cf23 100644
--- a/checkbox_support/parsers/dkms_info.py
+++ b/checkbox_support/parsers/dkms_info.py
@@ -1,6 +1,6 @@
 # This file is part of Checkbox.
 #
-# Copyright 2015 Canonical Ltd.
+# Copyright 2015-2022 Canonical Ltd.
 #
 # Checkbox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3,
@@ -14,11 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import io
 import json
 
diff --git a/checkbox_support/parsers/dmidecode.py b/checkbox_support/parsers/dmidecode.py
index 772a6df..5818be2 100644
--- a/checkbox_support/parsers/dmidecode.py
+++ b/checkbox_support/parsers/dmidecode.py
@@ -1,12 +1,10 @@
-#
 # This file is part of Checkbox.
 #
-# Copyright 2011 Canonical Ltd.
+# Copyright 2011-2022 Canonical Ltd.
 #
 # Checkbox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3,
 # as published by the Free Software Foundation.
-
 #
 # Checkbox is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,11 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import io
 import re
 from string import hexdigits
diff --git a/checkbox_support/parsers/efi.py b/checkbox_support/parsers/efi.py
index e452888..c77f2c2 100644
--- a/checkbox_support/parsers/efi.py
+++ b/checkbox_support/parsers/efi.py
@@ -1,12 +1,10 @@
-#
 # This file is part of Checkbox.
 #
-# Copyright 2011 Canonical Ltd.
+# Copyright 2011-2022 Canonical Ltd.
 #
 # Checkbox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3,
 # as published by the Free Software Foundation.
-
 #
 # Checkbox is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,11 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import re
 
 
diff --git a/checkbox_support/parsers/image_info.py b/checkbox_support/parsers/image_info.py
index 369792b..ff9d73c 100644
--- a/checkbox_support/parsers/image_info.py
+++ b/checkbox_support/parsers/image_info.py
@@ -1,6 +1,6 @@
 # This file is part of Checkbox.
 #
-# Copyright 2011-2015 Canonical Ltd.
+# Copyright 2011-2022 Canonical Ltd.
 #
 # Checkbox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3,
@@ -26,11 +26,6 @@ There are 3 possible attachments containing data relevant to OEM images::
 A class is provided to parse each of these.
 """
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import io
 from xml.dom import minidom
 from xml.parsers.expat import ExpatError
diff --git a/checkbox_support/parsers/lshwjson.py b/checkbox_support/parsers/lshwjson.py
index 9be6fb1..5a57f46 100644
--- a/checkbox_support/parsers/lshwjson.py
+++ b/checkbox_support/parsers/lshwjson.py
@@ -1,12 +1,10 @@
-#
 # This file is part of Checkbox.
 #
-# Copyright 2013 Canonical Ltd.
+# Copyright 2013-2022 Canonical Ltd.
 #
 # Checkbox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3,
 # as published by the Free Software Foundation.
-
 #
 # Checkbox is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,11 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import json
 import logging
 
diff --git a/checkbox_support/parsers/meminfo.py b/checkbox_support/parsers/meminfo.py
index 3264ddb..0e4dbc9 100644
--- a/checkbox_support/parsers/meminfo.py
+++ b/checkbox_support/parsers/meminfo.py
@@ -1,12 +1,10 @@
-#
 # This file is part of Checkbox.
 #
-# Copyright 2011 Canonical Ltd.
+# Copyright 2011-2022 Canonical Ltd.
 #
 # Checkbox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3,
 # as published by the Free Software Foundation.
-
 #
 # Checkbox is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,11 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import re
 
 
diff --git a/checkbox_support/parsers/modinfo.py b/checkbox_support/parsers/modinfo.py
index a26255a..dd217e9 100644
--- a/checkbox_support/parsers/modinfo.py
+++ b/checkbox_support/parsers/modinfo.py
@@ -1,6 +1,6 @@
 # This file is part of Checkbox.
 #
-# Copyright 2011-2015 Canonical Ltd.
+# Copyright 2011-2022 Canonical Ltd.
 #
 # Checkbox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3,
@@ -14,11 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import io
 
 
diff --git a/checkbox_support/parsers/modprobe.py b/checkbox_support/parsers/modprobe.py
index 832903c..9645017 100644
--- a/checkbox_support/parsers/modprobe.py
+++ b/checkbox_support/parsers/modprobe.py
@@ -1,6 +1,6 @@
 # This file is part of Checkbox.
 #
-# Copyright 2015 Canonical Ltd.
+# Copyright 2015-2022 Canonical Ltd.
 #
 # Checkbox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3,
@@ -14,11 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import io
 import re
 from collections import defaultdict
diff --git a/checkbox_support/parsers/pactl.py b/checkbox_support/parsers/pactl.py
index 741f59b..6c79430 100644
--- a/checkbox_support/parsers/pactl.py
+++ b/checkbox_support/parsers/pactl.py
@@ -1,6 +1,6 @@
 # This file is part of Checkbox.
 #
-# Copyright 2013-2019 Canonical Ltd.
+# Copyright 2013-2022 Canonical Ltd.
 # Written by:
 #   Zygmunt Krynicki <[e-mail]>
 #   Sylvain Pineau <[e-mail]>
@@ -8,7 +8,6 @@
 # Checkbox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3,
 # as published by the Free Software Foundation.
-
 #
 # Checkbox is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,11 +17,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 
 """
 :mod:`checkbox_support.parsers.pactl` -- `pactl list` parser
diff --git a/checkbox_support/parsers/pci_config.py b/checkbox_support/parsers/pci_config.py
index 14d3367..fe27f20 100644
--- a/checkbox_support/parsers/pci_config.py
+++ b/checkbox_support/parsers/pci_config.py
@@ -1,6 +1,6 @@
 # This file is part of Checkbox.
 #
-# Copyright 2015 Canonical Ltd.
+# Copyright 2015-2022 Canonical Ltd.
 #
 # Checkbox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3,
@@ -14,11 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import io
 import re
 
diff --git a/checkbox_support/parsers/tests/test_udevadm.py b/checkbox_support/parsers/tests/test_udevadm.py
index acb9880..d91ad69 100644
--- a/checkbox_support/parsers/tests/test_udevadm.py
+++ b/checkbox_support/parsers/tests/test_udevadm.py
@@ -1,12 +1,10 @@
-#
 # This file is part of Checkbox.
 #
-# Copyright 2012-2013 Canonical Ltd.
+# Copyright 2012-2022 Canonical Ltd.
 #
 # Checkbox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3,
 # as published by the Free Software Foundation.
-
 #
 # Checkbox is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,14 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 from io import StringIO
-from io import open
 from unittest import TestCase
+from textwrap import dedent
 
 from pkg_resources import resource_filename
 
@@ -31,22 +24,6 @@ from checkbox_support.parsers.udevadm import UdevadmParser, decode_id
 from checkbox_support.parsers.udevadm import parse_udevadm_output
 
 
-class DeviceResult(object):
-
-    def __init__(self):
-        self.devices = []
-
-    def addDevice(self, device):
-        self.devices.append(device)
-
-    def getDevice(self, category):
-        for device in self.devices:
-            if device.category == category:
-                return device
-
-        return None
-
-
 class UdevadmDataMixIn(object):
     """
     Mix in with a helper method to load sample udevadm data
@@ -70,16 +47,6 @@ class UdevadmDataMixIn(object):
 
 class TestUdevadmParser(TestCase, UdevadmDataMixIn):
 
-    def getParser(self, string):
-        stream = StringIO(string)
-        return UdevadmParser(stream)
-
-    def getResult(self, string):
-        parser = self.getParser(string)
-        result = DeviceResult()
-        parser.run(result)
-        return result
-
     def parse(self, name, with_lsblk=True, with_partitions=False):
         # Uncomment only for debugging purpose
         """
@@ -100,27 +67,29 @@ class TestUdevadmParser(TestCase, UdevadmDataMixIn):
         return len([d for d in devices if d.category == category])
 
     def test_openfirmware_network(self):
-        result = self.getResult("""
-P: /devices/soc.0/ffe64000.ethernet
-E: DEVPATH=/devices/soc.0/ffe64000.ethernet
-E: DRIVER=XXXXX
-E: MODALIAS=of:NethernetTXXXXXCXXXXX,XXXXX
-E: OF_COMPATIBLE_0=XXXXX,XXXXX
-E: OF_COMPATIBLE_N=1
-E: OF_NAME=ethernet
-E: OF_TYPE=XXXXX
-E: SUBSYSTEM=platform
-E: UDEV_LOG=3
-
-P: /devices/soc.0/ffe64000.ethernet/net/eth1
-E: DEVPATH=/devices/soc.0/ffe64000.ethernet/net/eth1
-E: IFINDEX=3
-E: INTERFACE=eth1
-E: SUBSYSTEM=net
-E: UDEV_LOG=3
-""")
-        device = result.getDevice("NETWORK")
-        self.assertTrue(device)
+        stream = StringIO(dedent("""
+            P: /devices/soc.0/ffe64000.ethernet
+            E: DEVPATH=/devices/soc.0/ffe64000.ethernet
+            E: DRIVER=XXXXX
+            E: MODALIAS=of:NethernetTXXXXXCXXXXX,XXXXX
+            E: OF_COMPATIBLE_0=XXXXX,XXXXX
+            E: OF_COMPATIBLE_N=1
+            E: OF_NAME=ethernet
+            E: OF_TYPE=XXXXX
+            E: SUBSYSTEM=platform
+            E: UDEV_LOG=3
+
+            P: /devices/soc.0/ffe64000.ethernet/net/eth1
+            E: DEVPATH=/devices/soc.0/ffe64000.ethernet/net/eth1
+            E: IFINDEX=3
+            E: INTERFACE=eth1
+            E: SUBSYSTEM=net
+            E: UDEV_LOG=3
+            """))
+        parser = UdevadmParser(stream)
+        devices = parser.run()
+        self.assertEqual(devices[0].category, "NETWORK")
+
 
     def test_DELL_INSPIRON3521_TOUCHSCREEN(self):
         """
diff --git a/checkbox_support/parsers/tests/test_version.py b/checkbox_support/parsers/tests/test_version.py
 deleted file mode 100644
index 2404430..0000000
--- a/checkbox_support/parsers/tests/test_version.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# This file is part of Checkbox.
-#
-# Copyright 2014 Canonical Ltd.
-#
-# Checkbox is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 3,
-# as published by the Free Software Foundation.
-
-#
-# Checkbox is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-from unittest import TestCase
-
-
-class TestSubmissionModuleVersion(TestCase):
-
-    def testVersion(self):
-        from checkbox_support import parsers
-        ver = getattr(parsers, "__version__")
-        self.assertTrue(ver)
diff --git a/checkbox_support/parsers/udevadm.py b/checkbox_support/parsers/udevadm.py
index 4c089b8..057369c 100644
--- a/checkbox_support/parsers/udevadm.py
+++ b/checkbox_support/parsers/udevadm.py
@@ -1201,7 +1201,7 @@ class UdevadmParser(object):
     def getAttributes(self, path):
         return {}
 
-    def run(self, result):
+    def run(self):
         # Some attribute lines have a space character after the
         # ':', others don't have it (see udevadm-info.c).
         line_pattern = re.compile(r"(?P<key>[A-Z]):\s*(?P<value>.*)")
@@ -1395,6 +1395,7 @@ class UdevadmParser(object):
                 # Remove Virtal CDROM devices
                 if not [k for k in device._environment if "ID_CDROM_" in k]:
                     self.devices.pop(device._raw_path, None)
+        return list(self.devices.values())
 
         [result.addDevice(device) for device in self.devices.values()]
 
@@ -1426,14 +1427,6 @@ def known_to_be_video_device(vendor_id, product_id, pci_class, pci_subclass):
         return product_id in [0x0152, 0x0412, 0x0402]
 
 
-class UdevResult(object):
-    def __init__(self):
-        self.devices = []
-
-    def addDevice(self, device):
-        self.devices.append(device)
-
-
 def parse_udevadm_output(output, lsblk=None, list_partitions=False, bits=None):
     """
     Parse output of `LANG=C udevadm info --export-db`
@@ -1448,7 +1441,4 @@ def parse_udevadm_output(output, lsblk=None, list_partitions=False, bits=None):
                 universal_newlines=True)
         except CalledProcessError:
             lsblk = ''
-    udev = UdevadmParser(output, lsblk, list_partitions, bits)
-    result = UdevResult()
-    udev.run(result)
-    return result.devices
+    return UdevadmParser(output, lsblk, list_partitions, bits).run()
diff --git a/checkbox_support/parsers/xinput.py b/checkbox_support/parsers/xinput.py
index d29af68..bc6d844 100644
--- a/checkbox_support/parsers/xinput.py
+++ b/checkbox_support/parsers/xinput.py
@@ -1,13 +1,10 @@
-# -*- coding: utf-8 -*-
-#
 # This file is part of Checkbox.
 #
-# Copyright 2012 Canonical Ltd.
+# Copyright 2012-2022 Canonical Ltd.
 #
 # Checkbox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3,
 # as published by the Free Software Foundation.
-
 #
 # Checkbox is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,11 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 from string import ascii_letters
 from string import ascii_uppercase
 import re
diff --git a/checkbox_support/scripts/audio_settings.py b/checkbox_support/scripts/audio_settings.py
index 1b3974c..cd76d08 100644
--- a/checkbox_support/scripts/audio_settings.py
+++ b/checkbox_support/scripts/audio_settings.py
@@ -1,4 +1,3 @@
-#
 # This file is part of Checkbox.
 #
 # Copyright 2013-2020 Canonical Ltd.
@@ -6,7 +5,6 @@
 # Checkbox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3,
 # as published by the Free Software Foundation.
-
 #
 # Checkbox is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,11 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 from argparse import ArgumentParser
 from subprocess import check_output, check_call, CalledProcessError
 from io import open
diff --git a/checkbox_support/scripts/gputest_benchmark.py b/checkbox_support/scripts/gputest_benchmark.py
index 46bd34e..7abb2a3 100644
--- a/checkbox_support/scripts/gputest_benchmark.py
+++ b/checkbox_support/scripts/gputest_benchmark.py
@@ -1,13 +1,12 @@
 # This file is part of Checkbox.
 #
-# Copyright 2013 Canonical Ltd.
+# Copyright 2013-2022 Canonical Ltd.
 # Written by:
 #   Sylvain Pineau <[e-mail]>
 #
 # Checkbox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3,
 # as published by the Free Software Foundation.
-
 #
 # Checkbox is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,11 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 from io import open
 from subprocess import check_output, CalledProcessError
 from tempfile import TemporaryDirectory
diff --git a/checkbox_support/tests/__init__.py b/checkbox_support/tests/__init__.py
index 2ade626..615bd52 100644
--- a/checkbox_support/tests/__init__.py
+++ b/checkbox_support/tests/__init__.py
@@ -29,6 +29,7 @@ from __future__ import unicode_literals
 
 from inspect import getabsfile
 from unittest.loader import defaultTestLoader
+from unittest import TestSuite
 import os
 
 import checkbox_support
@@ -42,7 +43,16 @@ def load_unit_tests():
     # python modules that start with the word 'test_' .
     start_dir = os.path.dirname(getabsfile(checkbox_support))
     top_level_dir = os.path.normpath(os.path.join(start_dir, '..'))
-    return defaultTestLoader.discover(start_dir, top_level_dir=top_level_dir)
+    test_suite = TestSuite()
+    for path in os.listdir(start_dir):
+        # skip tests that come from a vendorized code
+        if path in ('__pycache__', 'vendor'):
+            continue
+        path = os.path.join(start_dir, path)
+        if os.path.isdir(path):
+            test_suite.addTests(
+                defaultTestLoader.discover(path, top_level_dir=top_level_dir))
+    return test_suite
 
 
 def test_suite():
diff --git a/checkbox_support/udev.py b/checkbox_support/udev.py
index a47c5c1..897ec08 100644
--- a/checkbox_support/udev.py
+++ b/checkbox_support/udev.py
@@ -1,13 +1,12 @@
 # This file is part of Checkbox.
 #
-# Copyright 2012 Canonical Ltd.
+# Copyright 2012-2022 Canonical Ltd.
 # Written by:
 #   Zygmunt Krynicki <[e-mail]>
 #
 # Checkbox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3,
 # as published by the Free Software Foundation.
-
 #
 # Checkbox is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,11 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 """
 checkbox_support.udev
 =====================
diff --git a/setup.py b/setup.py
index 673f4f0..9d1f916 100755
--- a/setup.py
+++ b/setup.py
@@ -93,6 +93,7 @@ setup(
                 "checkbox_support.scripts.eddystone_scanner:main"),
             ("checkbox-support-lsusb="
                 "checkbox_support.scripts.lsusb:main"),
+            ("checkbox-support-parse=checkbox_support.parsers:main"),
         ],
     },
 )