aboutsummaryrefslogtreecommitdiff
path: root/python/pyspark/sql/context.py
diff options
context:
space:
mode:
authorDavies Liu <davies@databricks.com>2015-09-08 20:56:22 -0700
committerXiangrui Meng <meng@databricks.com>2015-09-08 20:56:22 -0700
commit3a11e50e21ececbec9708eb487b08196f195cd87 (patch)
tree7928676aebbb4bd486accf446fc51d121f2fc516 /python/pyspark/sql/context.py
parenta1573489a37def97b7c26b798898ffbbdc4defa8 (diff)
downloadspark-3a11e50e21ececbec9708eb487b08196f195cd87.tar.gz
spark-3a11e50e21ececbec9708eb487b08196f195cd87.tar.bz2
spark-3a11e50e21ececbec9708eb487b08196f195cd87.zip
[SPARK-10373] [PYSPARK] move @since into pyspark from sql
cc mengxr Author: Davies Liu <davies@databricks.com> Closes #8657 from davies/move_since.
Diffstat (limited to 'python/pyspark/sql/context.py')
-rw-r--r--python/pyspark/sql/context.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/python/pyspark/sql/context.py b/python/pyspark/sql/context.py
index 0ef46c4464..89c8c6e0d9 100644
--- a/python/pyspark/sql/context.py
+++ b/python/pyspark/sql/context.py
@@ -26,9 +26,9 @@ else:
from py4j.protocol import Py4JError
+from pyspark import since
from pyspark.rdd import RDD, _prepare_for_python_RDD, ignore_unicode_prefix
from pyspark.serializers import AutoBatchedSerializer, PickleSerializer
-from pyspark.sql import since
from pyspark.sql.types import Row, StringType, StructType, _verify_type, \
_infer_schema, _has_nulltype, _merge_type, _create_converter
from pyspark.sql.dataframe import DataFrame