Skip to content

[SPARK-42266][PYTHON] Remove the parent directory in shell.py execution when IPython is used #40327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
HyukjinKwon wants to merge 1 commit into from
Closed

[SPARK-42266][PYTHON] Remove the parent directory in shell.py execution when IPython is used #40327

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions python/pyspark/shell.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@
"""

import atexit
import builtins
import os
import platform
import warnings
import sys

import pyspark
from pyspark.context import SparkContext
Expand All @@ -33,6 +35,16 @@
from pyspark.sql.utils import is_remote
from urllib.parse import urlparse

if getattr(builtins, "__IPYTHON__", False):
# (Only) during PYTHONSTARTUP execution, IPython temporarily adds the parent
# directory of the script into the Python path, which results in searching
# packages under `pyspark` directory.
# For example, `import pandas` attempts to import `pyspark.pandas`, see also SPARK-42266.
if "__file__" in globals():
parent_dir = os.path.abspath(os.path.dirname(__file__))
if parent_dir in sys.path:
sys.path.remove(parent_dir)


if is_remote():
try:
Expand Down