aboutsummaryrefslogtreecommitdiff
path: root/python/pyspark/sql/types.py
diff options
context:
space:
mode:
authorXiangrui Meng <meng@databricks.com>2015-07-30 16:57:38 -0700
committerXiangrui Meng <meng@databricks.com>2015-07-30 16:57:38 -0700
commitca71cc8c8b2d64b7756ae697c06876cd18b536dc (patch)
tree8ba20cf207e0ac38f4b4a0f6a1596c6d401663e4 /python/pyspark/sql/types.py
parent1afdeb7b458f86e2641f062fb9ddc00e9c5c7531 (diff)
downloadspark-ca71cc8c8b2d64b7756ae697c06876cd18b536dc.tar.gz
spark-ca71cc8c8b2d64b7756ae697c06876cd18b536dc.tar.bz2
spark-ca71cc8c8b2d64b7756ae697c06876cd18b536dc.zip
[SPARK-9408] [PYSPARK] [MLLIB] Refactor linalg.py to /linalg
This is based on MechCoder 's PR https://github.com/apache/spark/pull/7731. Hopefully it could pass tests. MechCoder I tried to make minimal changes. If this passes Jenkins, we can merge this one first and then try to move `__init__.py` to `local.py` in a separate PR. Closes #7731 Author: Xiangrui Meng <meng@databricks.com> Closes #7746 from mengxr/SPARK-9408 and squashes the following commits: 0e05a3b [Xiangrui Meng] merge master 1135551 [Xiangrui Meng] add a comment for str(...) c48cae0 [Xiangrui Meng] update tests 173a805 [Xiangrui Meng] move linalg.py to linalg/__init__.py
Diffstat (limited to 'python/pyspark/sql/types.py')
-rw-r--r--python/pyspark/sql/types.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/python/pyspark/sql/types.py b/python/pyspark/sql/types.py
index 0976aea72c..6f74b7162f 100644
--- a/python/pyspark/sql/types.py
+++ b/python/pyspark/sql/types.py
@@ -648,7 +648,7 @@ class UserDefinedType(DataType):
@classmethod
def fromJson(cls, json):
- pyUDT = str(json["pyClass"])
+ pyUDT = str(json["pyClass"]) # convert unicode to str
split = pyUDT.rfind(".")
pyModule = pyUDT[:split]
pyClass = pyUDT[split+1:]