diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-01-20 12:47:55 -0800 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-01-20 12:47:55 -0800 |
| commit | 86057ec7c868262763d1e31b3f3c94bd43eeafb3 (patch) | |
| tree | cdde5e4264549bd10b67e4da73322391b922e14e /python/pyspark/shell.py | |
| parent | 76ff962edcb7f41601c6c2d4fc6714bbc885faa7 (diff) | |
| parent | 9f54d7e1f5a5e6f80b3d710de67f800bef943d33 (diff) | |
| download | spark-86057ec7c868262763d1e31b3f3c94bd43eeafb3.tar.gz spark-86057ec7c868262763d1e31b3f3c94bd43eeafb3.tar.bz2 spark-86057ec7c868262763d1e31b3f3c94bd43eeafb3.zip | |
Merge branch 'master' into streaming
Conflicts:
core/src/main/scala/spark/api/python/PythonRDD.scala
Diffstat (limited to 'python/pyspark/shell.py')
| -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 7e6ad3aa76..f6328c561f 100644 --- a/python/pyspark/shell.py +++ b/python/pyspark/shell.py @@ -1,7 +1,7 @@ """ An interactive shell. -This fle is designed to be launched as a PYTHONSTARTUP script. +This file is designed to be launched as a PYTHONSTARTUP script. """ import os from pyspark.context import SparkContext @@ -14,4 +14,4 @@ print "Spark context avaiable as sc." # which allows us to execute the user's PYTHONSTARTUP file: _pythonstartup = os.environ.get('OLD_PYTHONSTARTUP') if _pythonstartup and os.path.isfile(_pythonstartup): - execfile(_pythonstartup) + execfile(_pythonstartup) |