aboutsummaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
Diffstat (limited to 'python')
-rw-r--r--python/pyspark/mllib/linalg/__init__.py (renamed from python/pyspark/mllib/linalg.py)0
-rw-r--r--python/pyspark/sql/types.py2
2 files changed, 1 insertions, 1 deletions
diff --git a/python/pyspark/mllib/linalg.py b/python/pyspark/mllib/linalg/__init__.py
index 334dc8e38b..334dc8e38b 100644
--- a/python/pyspark/mllib/linalg.py
+++ b/python/pyspark/mllib/linalg/__init__.py
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:]