From e0b6dec95982a01967bbacd76f2c25073490d472 Mon Sep 17 00:00:00 2001
From: Pablo Galindo <pablogsal@gmail.com>
Date: Wed, 9 Oct 2024 20:11:10 +0100
Subject: [PATCH 1/2] gh-125140: Remove the current directory from sys.path
 when using pyrepl

Signed-off-by: Pablo Galindo <pablogsal@gmail.com>
---
 Lib/site.py                                           | 11 ++++++++---
 .../2024-10-09-20-08-13.gh-issue-125140.YgNWRB.rst    |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Security/2024-10-09-20-08-13.gh-issue-125140.YgNWRB.rst

diff --git a/Lib/site.py b/Lib/site.py
index b3194d79fb5ab8..07a6361fad44e5 100644
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -503,9 +503,14 @@ def register_readline():
         if PYTHON_BASIC_REPL:
             CAN_USE_PYREPL = False
         else:
-            import _pyrepl.readline
-            import _pyrepl.unix_console
-            from _pyrepl.main import CAN_USE_PYREPL
+            original_path = sys.path
+            sys.path = [p for p in original_path if p != '']
+            try:
+                import _pyrepl.readline
+                import _pyrepl.unix_console
+                from _pyrepl.main import CAN_USE_PYREPL
+            finally:
+                sys.path = original_path
     except ImportError:
         return
 
diff --git a/Misc/NEWS.d/next/Security/2024-10-09-20-08-13.gh-issue-125140.YgNWRB.rst b/Misc/NEWS.d/next/Security/2024-10-09-20-08-13.gh-issue-125140.YgNWRB.rst
new file mode 100644
index 00000000000000..8352fb18fd3660
--- /dev/null
+++ b/Misc/NEWS.d/next/Security/2024-10-09-20-08-13.gh-issue-125140.YgNWRB.rst
@@ -0,0 +1 @@
+Remove the current directory from sys.path when using pyrepl

From b58cdf9d62f370fc265937ab3f006626050c5295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Langa?= <lukasz@langa.pl>
Date: Thu, 10 Oct 2024 00:02:49 +0200
Subject: [PATCH 2/2] Update
 Misc/NEWS.d/next/Security/2024-10-09-20-08-13.gh-issue-125140.YgNWRB.rst

Co-authored-by: Peter Bierma <zintensitydev@gmail.com>
---
 .../Security/2024-10-09-20-08-13.gh-issue-125140.YgNWRB.rst     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Misc/NEWS.d/next/Security/2024-10-09-20-08-13.gh-issue-125140.YgNWRB.rst b/Misc/NEWS.d/next/Security/2024-10-09-20-08-13.gh-issue-125140.YgNWRB.rst
index 8352fb18fd3660..f4a49302372647 100644
--- a/Misc/NEWS.d/next/Security/2024-10-09-20-08-13.gh-issue-125140.YgNWRB.rst
+++ b/Misc/NEWS.d/next/Security/2024-10-09-20-08-13.gh-issue-125140.YgNWRB.rst
@@ -1 +1 @@
-Remove the current directory from sys.path when using pyrepl
+Remove the current directory from ``sys.path`` when using PyREPL.