aboutsummaryrefslogtreecommitdiff
path: root/python/pyspark/sql/types.py
diff options
context:
space:
mode:
authorXiangrui Meng <meng@databricks.com>2016-06-21 00:32:51 -0700
committerXiangrui Meng <meng@databricks.com>2016-06-21 00:32:51 -0700
commitce49bfc2550ba8f5a33235c7fc3b88201d63c276 (patch)
tree061b572eff6d769fd0b021f366f0a60bdf0ddf22 /python/pyspark/sql/types.py
parent843a1eba8ec9d5a7beac0c74b54d24cb3c41b45a (diff)
downloadspark-ce49bfc2550ba8f5a33235c7fc3b88201d63c276.tar.gz
spark-ce49bfc2550ba8f5a33235c7fc3b88201d63c276.tar.bz2
spark-ce49bfc2550ba8f5a33235c7fc3b88201d63c276.zip
Revert "[SPARK-16086] [SQL] fix Python UDF without arguments (for 1.6)"
This reverts commit a46553cbacf0e4012df89fe55385dec5beaa680a.
Diffstat (limited to 'python/pyspark/sql/types.py')
-rw-r--r--python/pyspark/sql/types.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/python/pyspark/sql/types.py b/python/pyspark/sql/types.py
index f0b56be8da..bb2b95404a 100644
--- a/python/pyspark/sql/types.py
+++ b/python/pyspark/sql/types.py
@@ -1401,7 +1401,11 @@ class Row(tuple):
if args and kwargs:
raise ValueError("Can not use both args "
"and kwargs to create Row")
- if kwargs:
+ if args:
+ # create row class or objects
+ return tuple.__new__(self, args)
+
+ elif kwargs:
# create row objects
names = sorted(kwargs.keys())
row = tuple.__new__(self, [kwargs[n] for n in names])
@@ -1409,8 +1413,7 @@ class Row(tuple):
return row
else:
- # create row class or objects
- return tuple.__new__(self, args)
+ raise ValueError("No args or kwargs")
def asDict(self, recursive=False):
"""