Merge remote-tracking branch 'upstream/master'

Author: fharding1

.github/workflows/build.yml

@@ -35,7 +35,7 @@ jobs:
         source actions-ci/install.sh
     - name: Pip install pylint, black, & Sphinx
       run: |
-        pip install --force-reinstall pylint black==19.10b0 Sphinx sphinx-rtd-theme
+        pip install --force-reinstall pylint black Sphinx sphinx-rtd-theme
     - name: Library version
       run: git describe --dirty --always --tags
     - name: Check formatting

README.rst

@@ -6,7 +6,7 @@ Introduction
     :alt: Documentation Status
 
 .. image:: https://img.shields.io/discord/327254708534116352.svg
-    :target: https://discord.gg/nBQh6qu
+    :target: https://adafru.it/discord
     :alt: Discord
 
 .. image:: https://github.com/adafruit/Adafruit_Python_PlatformDetect/workflows/Build%20CI/badge.svg

adafruit_platformdetect/__init__.py

@@ -48,11 +48,11 @@ def get_cpuinfo_field(self, field):
 
         with open("/proc/cpuinfo", "r") as infile:
             cpuinfo = infile.read().split("\n")
+            infile.close()
             for line in cpuinfo:
                 match = re.search(pattern, line, flags=re.IGNORECASE)
                 if match:
                     return match.group(1)
-
         return None
 
     def check_dt_compatible_value(self, value):
@@ -61,11 +61,9 @@ def check_dt_compatible_value(self, value):
         otherwise False.
         """
         # Match a value like 'qcom,apq8016-sbc':
-        try:
-            if value in open("/proc/device-tree/compatible").read():
-                return True
-        except FileNotFoundError:
-            pass
+        dt_compatible = self.get_device_compatible()
+        if dt_compatible and value in dt_compatible:
+            return True
 
         return False
 
@@ -84,6 +82,7 @@ def get_armbian_release_field(self, field):
                     match = re.search(pattern, line)
                     if match:
                         field_value = match.group(1)
+                release_file.close()
         except FileNotFoundError:
             pass
 
@@ -99,6 +98,7 @@ def get_device_model(self):
         try:
             with open("/proc/device-tree/model", "r") as model_file:
                 model = model_file.read()
+                model_file.close()
         except FileNotFoundError:
             pass
 
@@ -113,22 +113,40 @@ def get_device_compatible(self):
         try:
             with open("/proc/device-tree/compatible", "r") as model_file:
                 model = model_file.read()
+                model_file.close()
         except FileNotFoundError:
             pass
 
         return model
 
     def check_board_asset_tag_value(self):
         """
-        Search /proc/device-tree/model for the device model and return its value, if found,
+        Search /sys/devices/virtual/dmi/id for the device model and return its value, if found,
         otherwise None.
         """
         tag = None
 
         try:
             with open("/sys/devices/virtual/dmi/id/board_asset_tag", "r") as tag_file:
                 tag = tag_file.read().strip()
+                tag_file.close()
         except FileNotFoundError:
             pass
 
         return tag
+
+    def check_board_name_value(self):
+        """
+        Search /sys/devices/virtual/dmi/id for the board name and return its value, if found,
+        otherwise None. Debian/ubuntu based
+        """
+        board_name = None
+
+        try:
+            with open("/sys/devices/virtual/dmi/id/board_name", "r") as board_name_file:
+                board_name = board_name_file.read().strip()
+                board_name.close()
+        except FileNotFoundError:
+            pass
+
+        return board_name