Merge upstream QMK Firmware at '0.12.52~1'

lib/python/qmk/os_helpers/__init__.py

@@ -3,10 +3,9 @@
 from enum import Enum
 import re
 import shutil
-import subprocess
+from subprocess import DEVNULL
 
 from milc import cli
-from qmk.commands import run
 from qmk import submodules
 from qmk.constants import QMK_FIRMWARE
 
@@ -142,7 +141,7 @@ def is_executable(command):
 
     # Make sure the command can be executed
     version_arg = ESSENTIAL_BINARIES[command].get('version_arg', '--version')
-    check = run([command, version_arg], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, timeout=5, universal_newlines=True)
+    check = cli.run([command, version_arg], combined_output=True, stdin=DEVNULL, timeout=5)
 
     ESSENTIAL_BINARIES[command]['output'] = check.stdout
 

lib/python/qmk/os_helpers/linux/__init__.py

@@ -5,7 +5,6 @@ import shutil
 
 from milc import cli
 from qmk.constants import QMK_FIRMWARE
-from qmk.commands import run
 from qmk.os_helpers import CheckStatus
 
 
@@ -48,6 +47,10 @@ def check_udev_rules():
             _udev_rule("03eb", "2ff3"),  # ATmega16U4
             _udev_rule("03eb", "2ff4"),  # ATmega32U4
             _udev_rule("03eb", "2ff9"),  # AT90USB64
+<<<<<<< HEAD
+=======
+            _udev_rule("03eb", "2ffa"),  # AT90USB162
+>>>>>>> 0.12.52~1
             _udev_rule("03eb", "2ffb")  # AT90USB128
         },
         'kiibohd': {_udev_rule("1c11", "b007")},
@@ -94,7 +97,11 @@ def check_udev_rules():
 
         # Collect all rules from the config files
         for rule_file in udev_rules:
+<<<<<<< HEAD
             for line in rule_file.read_text().split('\n'):
+=======
+            for line in rule_file.read_text(encoding='utf-8').split('\n'):
+>>>>>>> 0.12.52~1
                 line = line.strip()
                 if not line.startswith("#") and len(line):
                     current_rules.add(line)
@@ -131,7 +138,11 @@ def check_modem_manager():
 
     """
     if check_systemd():
+<<<<<<< HEAD
         mm_check = run(["systemctl", "--quiet", "is-active", "ModemManager.service"], timeout=10)
+=======
+        mm_check = cli.run(["systemctl", "--quiet", "is-active", "ModemManager.service"], timeout=10)
+>>>>>>> 0.12.52~1
         if mm_check.returncode == 0:
             return True
     else: