Merge ~jocave/plainbox-provider-checkbox:dmi-sys-deguac into plainbox-provider-checkbox:master

[Jonathan Cave]

Continued effort to de-🥑 the provider, dmi-sysfs-resource.

[Sheila Miguez (codersquid)]

lgtm

review: Approve

diff --git a/bin/dmi-sysfs-resource b/bin/dmi_sysfs_resource.py
similarity index 86%
rename from bin/dmi-sysfs-resource
rename to bin/dmi_sysfs_resource.py
index 6741030..a098976 100755
--- a/bin/dmi-sysfs-resource
+++ b/bin/dmi_sysfs_resource.py
@@ -1,46 +1,43 @@
 #!/usr/bin/env python3
-# Copyright 2015 Canonical Ltd.
+# Copyright 2015-2020 Canonical Ltd.
 # All rights reserved.
 #
 # Written by:
 #   Zygmunt Krynicki <[e-mail]>
+#   Jonathan Cave <[e-mail]>
 
 """Collect information about all sysfs attributes related to DMI."""
 
 import os
 
-import guacamole
+"""
+Collect information about all sysfs attributes related to DMI.
 
+This program reads all the readable files in /sys/class/dmi/id/ and
+presents them a single RFC822 record.
 
-class dmi_sysfs_resource(guacamole.Command):
+@EPILOG@
 
-    """
-    Collect information about all sysfs attributes related to DMI.
+Unreadable files (typically due to permissions) are silently skipped.
+Please run this program as root if you wish to access various serial
+numbers.
+"""
 
-    This program reads all the readable files in /sys/class/dmi/id/ and
-    presents them a single RFC822 record.
 
-    @EPILOG@
-
-    Unreadable files (typically due to permissions) are silently skipped.
-    Please run this program as root if you wish to access various serial
-    numbers.
-    """
-
-    def invoked(self, ctx):
-        sysfs_root = '/sys/class/dmi/id/'
-        if not os.path.isdir(sysfs_root):
-            return
-        for dmi_attr in sorted(os.listdir(sysfs_root)):
-            dmi_filename = os.path.join(sysfs_root, dmi_attr)
-            if not os.path.isfile(dmi_filename):
-                continue
-            if not os.access(dmi_filename, os.R_OK):
-                continue
-            with open(dmi_filename, 'rt', encoding='utf-8') as stream:
-                dmi_data = stream.read().strip()
-            print("{}: {}".format(dmi_attr, dmi_data))
+def main():
+    sysfs_root = '/sys/class/dmi/id/'
+    if not os.path.isdir(sysfs_root):
+        return
+    for dmi_attr in sorted(os.listdir(sysfs_root)):
+        dmi_filename = os.path.join(sysfs_root, dmi_attr)
+        if not os.path.isfile(dmi_filename):
+            continue
+        if not os.access(dmi_filename, os.R_OK):
+            continue
+        with open(dmi_filename, 'rt', encoding='utf-8') as stream:
+            dmi_data = stream.read().strip()
+        print("{}: {}".format(dmi_attr, dmi_data))
 
 
 if __name__ == "__main__":
-    dmi_sysfs_resource().main()
+    main()
diff --git a/units/tpm/sysfs.pxu b/units/tpm/sysfs.pxu
index fdbf390..a0c75dd 100644
--- a/units/tpm/sysfs.pxu
+++ b/units/tpm/sysfs.pxu
@@ -76,6 +76,6 @@ _description:
  This job collects all the available DMI information from /sys/class/dmi/id/*.
  The main purpose of including this job is to allow the provider to include
  vendor-specific quirks by looking at the sysfs_dmi.bios_vendor attribute.
-command: dmi-sysfs-resource
+command: dmi_sysfs_resource.py
 estimated_duration: 1s
 flags: preserve-locale