aboutsummaryrefslogtreecommitdiff
path: root/python/pyspark/sql/functions.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/functions.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/functions.py')
-rw-r--r--python/pyspark/sql/functions.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/python/pyspark/sql/functions.py b/python/pyspark/sql/functions.py
index 4b74a50152..26b8662718 100644
--- a/python/pyspark/sql/functions.py
+++ b/python/pyspark/sql/functions.py
@@ -24,10 +24,9 @@ import sys
if sys.version < "3":
from itertools import imap as map
-from pyspark import SparkContext
+from pyspark import since, SparkContext
from pyspark.rdd import _prepare_for_python_RDD, ignore_unicode_prefix
from pyspark.serializers import PickleSerializer, AutoBatchedSerializer
-from pyspark.sql import since
from pyspark.sql.types import StringType
from pyspark.sql.column import Column, _to_java_column, _to_seq