From 69dce1b29332c7ef877bfda76e329b878401fc7d Mon Sep 17 00:00:00 2001
From: Andy Kipp <anki-code@users.noreply.github.com>
Date: Mon, 1 Jul 2024 13:44:38 +0200
Subject: [PATCH] refactoring: revert platform moving to backwards
 compatibility (#5564)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Consensus with #5549
cc #5538

## For community
⬇️ **Please click the 👍 reaction instead of leaving a `+1` or 👍
comment**

---------

Co-authored-by: a <1@1.1>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 pyproject.toml                              | 2 +-
 xonsh/aliases.py                            | 2 +-
 xonsh/lib/lazyimps.py                       | 4 ++--
 xonsh/{platform/__init__.py => platform.py} | 0
 xonsh/platforms/__init__.py                 | 1 +
 xonsh/{platform => platforms}/macutils.py   | 0
 xonsh/{platform => platforms}/winutils.py   | 0
 7 files changed, 5 insertions(+), 4 deletions(-)
 rename xonsh/{platform/__init__.py => platform.py} (100%)
 create mode 100644 xonsh/platforms/__init__.py
 rename xonsh/{platform => platforms}/macutils.py (100%)
 rename xonsh/{platform => platforms}/winutils.py (100%)

diff --git a/pyproject.toml b/pyproject.toml
index d6c9a91d3..75baf5bb5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -31,7 +31,7 @@ packages = [
     "xonsh.shells.ptk_shell",
     "xonsh.parsers.ply",
     "xonsh.procs",
-    "xonsh.platform",
+    "xonsh.platforms",
     "xonsh.parsers",
     "xonsh.xoreutils",
     "xontrib",
diff --git a/xonsh/aliases.py b/xonsh/aliases.py
index a4ed9f805..45ea0c91c 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.platform.winutils as winutils
+            import xonsh.platforms.winutils as winutils
 
             def sudo(args):
                 if len(args) < 1:
diff --git a/xonsh/lib/lazyimps.py b/xonsh/lib/lazyimps.py
index 9d0fa27d6..2bc355a52 100644
--- a/xonsh/lib/lazyimps.py
+++ b/xonsh/lib/lazyimps.py
@@ -67,7 +67,7 @@ def msvcrt():
 @lazyobject
 def winutils():
     if ON_WINDOWS:
-        import xonsh.platform.winutils as m
+        import xonsh.platforms.winutils as m
     else:
         m = None
     return m
@@ -76,7 +76,7 @@ def winutils():
 @lazyobject
 def macutils():
     if ON_DARWIN:
-        import xonsh.platform.macutils as m
+        import xonsh.platforms.macutils as m
     else:
         m = None
     return m
diff --git a/xonsh/platform/__init__.py b/xonsh/platform.py
similarity index 100%
rename from xonsh/platform/__init__.py
rename to xonsh/platform.py
diff --git a/xonsh/platforms/__init__.py b/xonsh/platforms/__init__.py
new file mode 100644
index 000000000..fe5c321ab
--- /dev/null
+++ b/xonsh/platforms/__init__.py
@@ -0,0 +1 @@
+"""Platform-dependent code."""
diff --git a/xonsh/platform/macutils.py b/xonsh/platforms/macutils.py
similarity index 100%
rename from xonsh/platform/macutils.py
rename to xonsh/platforms/macutils.py
diff --git a/xonsh/platform/winutils.py b/xonsh/platforms/winutils.py
similarity index 100%
rename from xonsh/platform/winutils.py
rename to xonsh/platforms/winutils.py