aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev/sparktestsupport/modules.py2
-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
3 files changed, 2 insertions, 2 deletions
diff --git a/dev/sparktestsupport/modules.py b/dev/sparktestsupport/modules.py
index 030d982e99..44600cb952 100644
--- a/dev/sparktestsupport/modules.py
+++ b/dev/sparktestsupport/modules.py
@@ -323,7 +323,7 @@ pyspark_mllib = Module(
"pyspark.mllib.evaluation",
"pyspark.mllib.feature",
"pyspark.mllib.fpm",
- "pyspark.mllib.linalg",
+ "pyspark.mllib.linalg.__init__",
"pyspark.mllib.random",
"pyspark.mllib.recommendation",
"pyspark.mllib.regression",
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:]