From 2e6335bf09de12ec58b270e18137a617288c0384 Mon Sep 17 00:00:00 2001
From: derrod <xlnedder@gmail.com>
Date: Fri, 31 Dec 2021 14:44:32 +0100
Subject: [PATCH] [cli/utils] Simplify imports

---
 legendary/cli.py             |  4 +---
 legendary/utils/crossover.py | 10 +++++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/legendary/cli.py b/legendary/cli.py
index 3c69107..0ca7edf 100644
--- a/legendary/cli.py
+++ b/legendary/cli.py
@@ -22,9 +22,7 @@ from legendary.core import LegendaryCore
 from legendary.models.exceptions import InvalidCredentialsError
 from legendary.models.game import SaveGameStatus, VerifyResult, Game
 from legendary.utils.cli import get_boolean_choice, get_int_choice, sdl_prompt, strtobool
-from legendary.utils.crossover import (
-    mac_find_crossover_apps, mac_get_crossover_bottles, mac_is_valid_bottle, mac_is_crossover_running
-)
+from legendary.utils.crossover import *
 from legendary.utils.custom_parser import AliasedSubParsersAction
 from legendary.utils.env import is_windows_mac_or_pyi
 from legendary.utils.eos import add_registry_entries, query_registry_entries, remove_registry_entries
diff --git a/legendary/utils/crossover.py b/legendary/utils/crossover.py
index d86ce06..71675b4 100644
--- a/legendary/utils/crossover.py
+++ b/legendary/utils/crossover.py
@@ -3,7 +3,7 @@ import plistlib
 import os
 import subprocess
 
-logger = logging.getLogger('CXHelpers')
+_logger = logging.getLogger('CXHelpers')
 
 
 def mac_get_crossover_version(app_path):
@@ -11,7 +11,7 @@ def mac_get_crossover_version(app_path):
         plist = plistlib.load(open(os.path.join(app_path, 'Contents', 'Info.plist'), 'rb'))
         return plist['CFBundleShortVersionString']
     except Exception as e:
-        logger.debug(f'Failed to load plist for "{app_path}" with {e!r}')
+        _logger.debug(f'Failed to load plist for "{app_path}" with {e!r}')
         return None
 
 
@@ -21,7 +21,7 @@ def mac_find_crossover_apps():
         out = subprocess.check_output(['mdfind', 'kMDItemCFBundleIdentifier="com.codeweavers.CrossOver"'])
         paths.extend(out.decode('utf-8', 'replace').strip().split('\n'))
     except Exception as e:
-        logger.warning(f'Trying to find CrossOver installs via mdfind failed: {e!r}')
+        _logger.warning(f'Trying to find CrossOver installs via mdfind failed: {e!r}')
 
     valid = [p for p in paths if os.path.exists(os.path.join(p, 'Contents', 'Info.plist'))]
     found_tuples = set()
@@ -30,7 +30,7 @@ def mac_find_crossover_apps():
         version = mac_get_crossover_version(path)
         if not version:
             continue
-        logger.debug(f'Found Crossover {version} at "{path}"')
+        _logger.debug(f'Found Crossover {version} at "{path}"')
         found_tuples.add((version, path))
 
     return sorted(found_tuples, reverse=True)
@@ -55,5 +55,5 @@ def mac_is_crossover_running():
         out = subprocess.check_output(['launchctl', 'list'])
         return b'com.codeweavers.CrossOver' in out
     except Exception as e:
-        logger.warning(f'Getting list of running application bundles failed: {e!r}')
+        _logger.warning(f'Getting list of running application bundles failed: {e!r}')
         return True  # assume the worst