Merge pull request #135 from makermelissa/master

Explicitly close files after use

Author: makermelissa

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,12 +61,8 @@ def check_dt_compatible_value(self, value):
         otherwise False.
         """
         # Match a value like 'qcom,apq8016-sbc':
-        try:
-            with open("/proc/device-tree/compatible") as compatible:
-                if value in compatible.read():
-                    return True
-        except FileNotFoundError:
-            pass
+        if value in self.get_device_compatible():
+            return True
 
         return False
 
@@ -85,6 +81,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
 
@@ -100,6 +97,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
 
@@ -114,6 +112,7 @@ 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
 
@@ -129,21 +128,23 @@ def check_board_asset_tag_value(self):
         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 device model and return its value, if found,
+        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