From 2ef4e329f7d02a3b3b76c769cea2ba568fde0999 Mon Sep 17 00:00:00 2001
From: Andy Kipp <anki-code@users.noreply.github.com>
Date: Sat, 29 Jun 2024 02:01:15 +0200
Subject: [PATCH] refactoring: move platform, winutils, macutils to platform
 submodule (#5549)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/xonsh/xonsh/issues/5538
## For community
⬇️ **Please click the 👍 reaction instead of leaving a `+1` or 👍
comment**

---------

Co-authored-by: a <1@1.1>
---
 pyproject.toml                              | 3 ++-
 tests/{ => platform}/test_platform.py       | 0
 xonsh/aliases.py                            | 2 +-
 xonsh/lazyimps.py                           | 4 ++--
 xonsh/{platform.py => platform/__init__.py} | 0
 xonsh/{ => platform}/macutils.py            | 0
 xonsh/{ => platform}/winutils.py            | 0
 7 files changed, 5 insertions(+), 4 deletions(-)
 rename tests/{ => platform}/test_platform.py (100%)
 rename xonsh/{platform.py => platform/__init__.py} (100%)
 rename xonsh/{ => platform}/macutils.py (100%)
 rename xonsh/{ => platform}/winutils.py (100%)

diff --git a/pyproject.toml b/pyproject.toml
index 6e0e13975..23afaed21 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -29,6 +29,7 @@ packages = [
     "xonsh.ply.ply",
     "xonsh.ptk_shell",
     "xonsh.procs",
+    "xonsh.platform",
     "xonsh.parsers",
     "xonsh.xoreutils",
     "xontrib",
@@ -252,7 +253,7 @@ convention = "numpy"
 "xonsh/xonfig.py" = ["E731"]
 "xontrib/vox.py" = ["F821"]
 "xonsh/inspectors.py" = ["E722"]
-"xonsh/platform.py" = ["F401"]
+"xonsh/platform/__init__.py" = ["F401"]
 "xonsh/parsers/*.py" = [
     "E741", #  E741 Ambiguous variable name
 ]
diff --git a/tests/test_platform.py b/tests/platform/test_platform.py
similarity index 100%
rename from tests/test_platform.py
rename to tests/platform/test_platform.py
diff --git a/xonsh/aliases.py b/xonsh/aliases.py
index a960b7ca5..416ca36ad 100644
--- a/xonsh/aliases.py
+++ b/xonsh/aliases.py
@@ -980,7 +980,7 @@ def make_default_aliases():
             default_aliases["deactivate"] = ["source-cmd", "deactivate.bat"]
         if shutil.which("sudo", path=XSH.env.get_detyped("PATH")):
             # XSH.commands_cache is not available during setup
-            import xonsh.winutils as winutils
+            import xonsh.platform.winutils as winutils
 
             def sudo(args):
                 if len(args) < 1:
diff --git a/xonsh/lazyimps.py b/xonsh/lazyimps.py
index ab3388f11..3ef390884 100644
--- a/xonsh/lazyimps.py
+++ b/xonsh/lazyimps.py
@@ -67,7 +67,7 @@ def msvcrt():
 @lazyobject
 def winutils():
     if ON_WINDOWS:
-        import xonsh.winutils as m
+        import xonsh.platform.winutils as m
     else:
         m = None
     return m
@@ -76,7 +76,7 @@ def winutils():
 @lazyobject
 def macutils():
     if ON_DARWIN:
-        import xonsh.macutils as m
+        import xonsh.platform.macutils as m
     else:
         m = None
     return m
diff --git a/xonsh/platform.py b/xonsh/platform/__init__.py
similarity index 100%
rename from xonsh/platform.py
rename to xonsh/platform/__init__.py
diff --git a/xonsh/macutils.py b/xonsh/platform/macutils.py
similarity index 100%
rename from xonsh/macutils.py
rename to xonsh/platform/macutils.py
diff --git a/xonsh/winutils.py b/xonsh/platform/winutils.py
similarity index 100%
rename from xonsh/winutils.py
rename to xonsh/platform/winutils.py