Linting pass

archey/entries/cpu.py

@@ -204,6 +204,6 @@ def pretty_value(self) -> [(str, str)]:
         if self.options.get("one_line"):
             # One-line output is enabled : Join the results !
             return [(self.name, ", ".join(entries))]
-        else:
-            # One-line output has been disabled, add one entry per item.
-            return [(self.name, entry) for entry in entries]
+
+        # One-line output has been disabled, add one entry per item.
+        return [(self.name, entry) for entry in entries]

archey/entries/custom.py

@@ -71,5 +71,5 @@ def pretty_value(self) -> [(str, str)]:
         # Join the results only if `one_line` option is enabled.
         if self.options.get("one_line", True):
             return [(self.name, ", ".join(self.value))]
-        else:
-            return [(self.name, element) for element in self.value]
+
+        return [(self.name, element) for element in self.value]

archey/entries/gpu.py

@@ -92,5 +92,5 @@ def pretty_value(self) -> [(str, str)]:
         # Join the results only if `one_line` option is enabled.
         if self.options.get("one_line"):
             return [(self.name, ", ".join(self.value))]
-        else:
-            return [(self.name, gpu_device) for gpu_device in self.value]
+
+        return [(self.name, gpu_device) for gpu_device in self.value]

archey/entry.py

@@ -55,6 +55,5 @@ def pretty_value(self) -> [(str, str)]:
             # Let's assume we can just use `__str__` on the object in value,
             # and create a single-line output with it.
             return [(self.name, str(self.value))]
-        else:
-            # If the value is "falsy" leave a generic "Not detected" message for this entry.
-            return [(self.name, self._default_strings.get("not_detected"))]
+        # If the value is "falsy" leave a generic "Not detected" message for this entry.
+        return [(self.name, self._default_strings.get("not_detected"))]

archey/test/entries/test_archey_cpu.py

@@ -1,7 +1,7 @@
 """Test module for Archey's CPU detection module"""
 
 import unittest
-from unittest.mock import MagicMock, call, mock_open, patch
+from unittest.mock import mock_open, patch
 
 from archey.configuration import DEFAULT_CONFIG
 from archey.entries.cpu import CPU

archey/test/entries/test_archey_custom.py

@@ -3,7 +3,7 @@
 import os
 import stat
 import unittest
-from unittest.mock import MagicMock, call, patch
+from unittest.mock import patch
 
 from archey.configuration import DEFAULT_CONFIG, Configuration
 from archey.entries.custom import Custom

archey/test/entries/test_archey_disk.py

@@ -1,7 +1,7 @@
 """Test module for Archey's disks usage detection module"""
 
 import unittest
-from unittest.mock import MagicMock, call, patch
+from unittest.mock import patch
 
 from archey.colors import Colors
 from archey.entries.disk import Disk
@@ -405,7 +405,8 @@ def test_disk_output_colors(self):
                     [
                         (
                             "Disk",
-                            f"{blocks_color_tuple[1]}{blocks_color_tuple[0]} KiB{Colors.CLEAR} / 100.0 KiB",
+                            f"{blocks_color_tuple[1]}{blocks_color_tuple[0]} KiB{Colors.CLEAR} "
+                            "/ 100.0 KiB",
                         )
                     ],
                 )

archey/test/entries/test_archey_distro.py

@@ -1,7 +1,7 @@
 """Test module for Archey's distribution detection module"""
 
 import unittest
-from unittest.mock import MagicMock, patch
+from unittest.mock import patch
 
 from archey.configuration import DEFAULT_CONFIG
 from archey.entries.distro import Distro

archey/test/entries/test_archey_gpu.py

@@ -1,7 +1,7 @@
 """Test module for Archey's GPU detection module"""
 
 import unittest
-from unittest.mock import MagicMock, call, patch
+from unittest.mock import patch
 
 from archey.configuration import DEFAULT_CONFIG
 from archey.entries.gpu import GPU

archey/test/entries/test_archey_kernel.py

@@ -1,7 +1,7 @@
 """Test module for Archey's kernel information detection module"""
 
 import unittest
-from unittest.mock import MagicMock, Mock, patch
+from unittest.mock import Mock, patch
 
 from archey.configuration import DEFAULT_CONFIG
 from archey.entries.kernel import Kernel

archey/test/entries/test_archey_lan_ip.py

@@ -1,7 +1,7 @@
 """Test module for Archey's LAN IP addresses detection module"""
 
 import unittest
-from unittest.mock import MagicMock, call, patch
+from unittest.mock import patch
 
 from netifaces import AF_INET, AF_INET6, AF_LINK
 

archey/test/entries/test_archey_load_average.py

@@ -1,7 +1,6 @@
 """Test module for Archey LoadAverage detection module"""
 
 import unittest
-from unittest.mock import MagicMock
 
 from archey.colors import Colors
 from archey.entries.load_average import LoadAverage

archey/test/entries/test_archey_model.py

@@ -2,7 +2,7 @@
 
 import unittest
 from subprocess import CalledProcessError
-from unittest.mock import MagicMock, mock_open, patch
+from unittest.mock import mock_open, patch
 
 from archey.configuration import DEFAULT_CONFIG
 from archey.entries.model import Model

archey/test/entries/test_archey_packages.py

@@ -2,7 +2,7 @@
 
 import unittest
 from unittest.mock import DEFAULT as DEFAULT_SENTINEL
-from unittest.mock import MagicMock, patch
+from unittest.mock import patch
 
 from archey.configuration import DEFAULT_CONFIG
 from archey.distributions import Distributions

archey/test/entries/test_archey_ram.py

@@ -1,7 +1,7 @@
 """Test module for Archey's RAM usage detection module"""
 
 import unittest
-from unittest.mock import MagicMock, mock_open, patch
+from unittest.mock import mock_open, patch
 
 from archey.colors import Colors
 from archey.configuration import DEFAULT_CONFIG

archey/test/entries/test_archey_shell.py

@@ -2,7 +2,7 @@
 
 import unittest
 from subprocess import CalledProcessError
-from unittest.mock import MagicMock, patch
+from unittest.mock import patch
 
 from archey.configuration import DEFAULT_CONFIG
 from archey.entries.shell import Shell

archey/test/entries/test_archey_temperature.py

@@ -4,7 +4,7 @@
 import tempfile
 import unittest
 from subprocess import CalledProcessError
-from unittest.mock import MagicMock, Mock, patch
+from unittest.mock import Mock, patch
 
 from archey.configuration import DEFAULT_CONFIG
 from archey.entries.temperature import Temperature

archey/test/entries/test_archey_terminal.py

@@ -1,7 +1,7 @@
 """Test module for Archey's terminal detection module"""
 
 import unittest
-from unittest.mock import MagicMock, patch
+from unittest.mock import patch
 
 from archey.configuration import DEFAULT_CONFIG
 from archey.entries.terminal import Terminal

archey/test/entries/test_archey_uptime.py

@@ -3,7 +3,7 @@
 import unittest
 from datetime import timedelta
 from itertools import product
-from unittest.mock import MagicMock, mock_open, patch
+from unittest.mock import mock_open, patch
 
 from archey.entries.uptime import Uptime
 from archey.exceptions import ArcheyException

archey/test/entries/test_archey_user.py

@@ -1,7 +1,7 @@
 """Test module for Archey's session user name detection module"""
 
 import unittest
-from unittest.mock import MagicMock, patch
+from unittest.mock import patch
 
 from archey.configuration import DEFAULT_CONFIG
 from archey.entries.user import User

archey/test/entries/test_archey_wan_ip.py

@@ -3,7 +3,7 @@
 import unittest
 from socket import timeout as SocketTimeoutError
 from subprocess import CalledProcessError, TimeoutExpired
-from unittest.mock import MagicMock, Mock, call, patch
+from unittest.mock import MagicMock, Mock, patch
 
 from archey.configuration import DEFAULT_CONFIG
 from archey.entries.wan_ip import WanIP

archey/test/entries/test_archey_window_manager.py

@@ -1,7 +1,7 @@
 """Test module for Archey's window manager detection module"""
 
 import unittest
-from unittest.mock import MagicMock, patch
+from unittest.mock import patch
 
 from archey.configuration import DEFAULT_CONFIG
 from archey.entries.window_manager import WindowManager