diff options
| author | Reynold Xin <rxin@apache.org> | 2014-04-18 10:10:13 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@apache.org> | 2014-04-18 10:10:13 -0700 |
| commit | 81a152c54bff21854de731476f62c8fd50dd29f7 (patch) | |
| tree | 4ce8ca28c0a29f8fa742529240d07dd60ce334b9 /python/pyspark | |
| parent | 3c7a9bae965bac68aba66e8ea28bb4d750e66baa (diff) | |
| download | spark-81a152c54bff21854de731476f62c8fd50dd29f7.tar.gz spark-81a152c54bff21854de731476f62c8fd50dd29f7.tar.bz2 spark-81a152c54bff21854de731476f62c8fd50dd29f7.zip | |
Fixed broken pyspark shell.
Author: Reynold Xin <rxin@apache.org>
Closes #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.
Diffstat (limited to 'python/pyspark')
| -rw-r--r-- | python/pyspark/shell.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/python/pyspark/shell.py b/python/pyspark/shell.py index e8ba050655..d172d588bf 100644 --- a/python/pyspark/shell.py +++ b/python/pyspark/shell.py @@ -22,7 +22,7 @@ This file is designed to be launched as a PYTHONSTARTUP script. """ 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) @@ -53,7 +53,7 @@ print("Using Python version %s (%s, %s)" % ( 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)) |