Skip to content
Closed
Changes from all commits
Commits
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
20 changes: 14 additions & 6 deletions python/pyspark/shell.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@

This file is designed to be launched as a PYTHONSTARTUP script.
"""

import sys
if sys.version_info.major != 2:
print("Error: Default Python used is Python%s" % sys.version_info.major)
print("\tSet env variable PYSPARK_PYTHON to Python2 binary and re-run it.")
sys.exit(1)


import os
import platform
import pyspark
Expand All @@ -34,21 +42,21 @@

sc = SparkContext(os.environ.get("MASTER", "local[*]"), "PySparkShell", pyFiles=add_files)

print """Welcome to
print("""Welcome to
____ __
/ __/__ ___ _____/ /__
_\ \/ _ \/ _ `/ __/ '_/
/__ / .__/\_,_/_/ /_/\_\ version 1.0.0-SNAPSHOT
/_/
"""
print "Using Python version %s (%s, %s)" % (
""")
print("Using Python version %s (%s, %s)" % (
platform.python_version(),
platform.python_build()[0],
platform.python_build()[1])
print "Spark context available as sc."
platform.python_build()[1]))
print("Spark context available as sc.")

if add_files != None:
print "Adding files: [%s]" % ", ".join(add_files)
print("Adding files: [%s]" % ", ".join(add_files))

# The ./bin/pyspark script stores the old PYTHONSTARTUP value in OLD_PYTHONSTARTUP,
# which allows us to execute the user's PYTHONSTARTUP file:
Expand Down