[INTERNAL] Bans raw \n usages from core by relying on os.linesep

archey/entries/packages.py

@@ -8,17 +8,17 @@ from archey.entry import Entry
 
 
 PACKAGES_TOOLS = (
-    {'cmd': ['apk', 'list', '--installed']},
+    {'cmd': ('apk', 'list', '--installed')},
     # As of 2020, `apt` is _very_ slow compared to `dpkg` on Debian-based distributions.
     # Additional note : `apt`'s CLI is currently not "stable" in Debian terms.
-    #{'cmd': ['apt', 'list', '-qq', '--installed']},
-    {'cmd': ['dnf', 'list', 'installed'], 'skew': 1},
-    {'cmd': ['dpkg', '--get-selections']},
-    {'cmd': ['emerge', '-ep', 'world'], 'skew': 5},
-    {'cmd': ['pacman', '-Q']},
-    {'cmd': ['rpm', '-qa']},
-    {'cmd': ['yum', 'list', 'installed'], 'skew': 2},
-    {'cmd': ['zypper', 'search', '-i'], 'skew': 5}
+    #{'cmd': ('apt', 'list', '-qq', '--installed')},
+    {'cmd': ('dnf', 'list', 'installed'), 'skew': 1},
+    {'cmd': ('dpkg', '--get-selections')},
+    {'cmd': ('emerge', '-ep', 'world'), 'skew': 5},
+    {'cmd': ('pacman', '-Q')},
+    {'cmd': ('rpm', '-qa')},
+    {'cmd': ('yum', 'list', 'installed'), 'skew': 2},
+    {'cmd': ('zypper', 'search', '-i'), 'skew': 5}
 )
 
 
@@ -43,7 +43,7 @@ class Packages(Entry):
             except (FileNotFoundError, CalledProcessError):
                 continue
 
-            self.value = results.count('\n')
+            self.value = results.count(os.linesep)
 
             # If any, deduct output skew present due to the packages tool.
             if 'skew' in packages_tool:

archey/output.py

@@ -176,7 +176,9 @@ class Output:
             )
         except UnicodeError:
             print(
-                'Your locale or TTY does not seem to support UTF8 encoding.\n'
-                'Please disable Unicode within your configuration file.',
+                """\
+Your locale or TTY does not seem to support UTF-8 encoding.
+Please disable Unicode within your configuration file.\
+""",
                 file=sys.stderr
             )

archey/test/test_archey_packages.py

@@ -1,5 +1,6 @@
 """Test module for Archey's installed system packages detection module"""
 
+import os
 import unittest
 from unittest.mock import MagicMock, patch
 
@@ -11,6 +12,9 @@ class TestPackagesEntry(unittest.TestCase):
     Here, we mock the `check_output` calls and check afterwards
       that the outputs are correct.
     Sorry for the code style, mocking this class is pretty boring.
+
+    Note: Due to the presence of trailing spaces, we may have to manually
+            "inject" the OS line separator in some mocked outputs.
     """
     @patch(
         'archey.entries.packages.check_output',
@@ -93,13 +97,13 @@ These are the packages that would be merged, in order:
 
 Calculating dependencies  ... done!
 [ebuild     U  ] sys-libs/glibc-2.25-r10 [2.25-r9]
-[ebuild   R    ] sys-apps/busybox-1.28.0 \n\
+[ebuild   R    ] sys-apps/busybox-1.28.0 {linesep}\
 [ebuild  N     ] sys-libs/libcap-2.24-r2  \
-USE="pam -static-libs" ABI_X86="(64) -32 (-x32)" \n\
+USE="pam -static-libs" ABI_X86="(64) -32 (-x32)" {linesep}\
 [ebuild     U  ] app-misc/pax-utils-1.2.2-r2 [1.1.7]
-[ebuild   R    ] x11-misc/shared-mime-info-1.9 \n\
+[ebuild   R    ] x11-misc/shared-mime-info-1.9 {linesep}\
 
-"""])
+""".format(linesep=os.linesep)])
     def test_match_with_emerge(self, _):
         """Simple test for the Emerge packages manager"""
         self.assertEqual(Packages().value, 5)
@@ -155,10 +159,10 @@ MySQL-client-3.23.57-1
 Loaded plugins: fastestmirror, langpacks
 Installed Packages
 GConf2.x86_64                   3.2.6-8.el7         @base/$releasever
-GeoIP.x86_64                    1.5.0-11.el7        @base            \n\
-ModemManager.x86_64             1.6.0-2.el7         @base            \n\
-ModemManager-glib.x86_64        1.6.0-2.el7         @base            \n\
-"""])
+GeoIP.x86_64                    1.5.0-11.el7        @base            {linesep}\
+ModemManager.x86_64             1.6.0-2.el7         @base            {linesep}\
+ModemManager-glib.x86_64        1.6.0-2.el7         @base            {linesep}\
+""".format(linesep=os.linesep)])
     def test_match_with_yum(self, _):
         """Simple test for the Yum packages manager"""
         self.assertEqual(Packages().value, 4)
@@ -178,14 +182,14 @@ ModemManager-glib.x86_64        1.6.0-2.el7         @base            \n\
 Loading repository data...
 Reading installed packages...
 
-S  | Name          | Summary                             | Type       \n\
+S  | Name          | Summary                             | Type       {linesep}\
 ---+---------------+-------------------------------------+------------
-i+ | 5201          | Recommended update for xdg-utils    | patch      \n\
-i  | GeoIP-data    | Free GeoLite country-data for GeoIP | package    \n\
-i  | make          | GNU make                            | package    \n\
+i+ | 5201          | Recommended update for xdg-utils    | patch      {linesep}\
+i  | GeoIP-data    | Free GeoLite country-data for GeoIP | package    {linesep}\
+i  | make          | GNU make                            | package    {linesep}\
 i  | GNOME Nibbles | Guide a worm around a maze          | application
-i  | at            | A Job Manager                       | package    \n\
-"""])
+i  | at            | A Job Manager                       | package    {linesep}\
+""".format(linesep=os.linesep)])
     def test_match_with_zypper(self, _):
         """Simple test for the Zypper packages manager"""
         self.assertEqual(Packages().value, 5)