From fbc95067c81f6188e379c9255582400e7de95c5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Schmidts?= <francois@schmidts.fr>
Date: Tue, 27 Apr 2021 22:23:34 +0200
Subject: [PATCH 1/2] Remove unecessary file close

---
 adafruit_platformdetect/__init__.py | 39 ++++++-----------------------
 1 file changed, 8 insertions(+), 31 deletions(-)

diff --git a/adafruit_platformdetect/__init__.py b/adafruit_platformdetect/__init__.py
index b57395b4..8557aec3 100644
--- a/adafruit_platformdetect/__init__.py
+++ b/adafruit_platformdetect/__init__.py
@@ -48,12 +48,10 @@ 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
+        for line in cpuinfo:
+            match = re.search(pattern, line, flags=re.IGNORECASE)
+            if match:
+                return match.group(1)
 
     def check_dt_compatible_value(self, value):
         """
@@ -82,7 +80,6 @@ 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
 
@@ -93,60 +90,40 @@ def get_device_model(self):
         Search /proc/device-tree/model for the device model and return its value, if found,
         otherwise None.
         """
-        model = None
-
         try:
             with open("/proc/device-tree/model", "r") as model_file:
-                model = model_file.read()
-                model_file.close()
+                return model_file.read()
         except FileNotFoundError:
             pass
 
-        return model
-
     def get_device_compatible(self):
         """
         Search /proc/device-tree/compatible for the compatible chip name.
         """
-        model = None
-
         try:
             with open("/proc/device-tree/compatible", "r") as model_file:
-                model = model_file.read()
-                model_file.close()
+                return model_file.read()
         except FileNotFoundError:
             pass
 
-        return model
-
     def check_board_asset_tag_value(self):
         """
         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()
+                return tag_file.read().strip()
         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()
+                return board_name_file.read().strip()
         except FileNotFoundError:
             pass
-
-        return board_name

From 3c9133d44d88ba71f6275768e5856ee617ce0413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Schmidts?= <francois@schmidts.fr>
Date: Wed, 28 Apr 2021 09:44:29 +0200
Subject: [PATCH 2/2] Fixing pylint warning about missing return statements

---
 adafruit_platformdetect/__init__.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/adafruit_platformdetect/__init__.py b/adafruit_platformdetect/__init__.py
index 8557aec3..b889d899 100644
--- a/adafruit_platformdetect/__init__.py
+++ b/adafruit_platformdetect/__init__.py
@@ -52,6 +52,7 @@ def get_cpuinfo_field(self, field):
             match = re.search(pattern, line, flags=re.IGNORECASE)
             if match:
                 return match.group(1)
+        return None
 
     def check_dt_compatible_value(self, value):
         """
@@ -95,6 +96,7 @@ def get_device_model(self):
                 return model_file.read()
         except FileNotFoundError:
             pass
+        return None
 
     def get_device_compatible(self):
         """
@@ -105,6 +107,7 @@ def get_device_compatible(self):
                 return model_file.read()
         except FileNotFoundError:
             pass
+        return None
 
     def check_board_asset_tag_value(self):
         """
@@ -116,6 +119,7 @@ def check_board_asset_tag_value(self):
                 return tag_file.read().strip()
         except FileNotFoundError:
             pass
+        return None
 
     def check_board_name_value(self):
         """
@@ -127,3 +131,4 @@ def check_board_name_value(self):
                 return board_name_file.read().strip()
         except FileNotFoundError:
             pass
+        return None