Skip to content

Commit

Permalink
Fixed broken pyspark shell.
Browse files Browse the repository at this point in the history
Author: Reynold Xin <rxin@apache.org>

Closes apache#444 from rxin/pyspark and squashes the following commits:

fc11356 [Reynold Xin] Made the PySpark shell version checking compatible with Python 2.6.
571830b [Reynold Xin] Fixed broken pyspark shell.
  • Loading branch information
rxin committed Apr 18, 2014
1 parent 3c7a9ba commit 81a152c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions python/pyspark/shell.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"""

import sys
if sys.version_info.major != 2:
if sys.version_info[0] != 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)
Expand Down Expand Up @@ -53,7 +53,7 @@
platform.python_version(),
platform.python_build()[0],
platform.python_build()[1]))
print("Spark context available as sc.")
print("SparkContext available as sc.")

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

0 comments on commit 81a152c

Please sign in to comment.