From 173a8052ec03eb43784a4e9d6e78048b15dd159d Mon Sep 17 00:00:00 2001 From: Xiangrui Meng Date: Tue, 28 Jul 2015 23:10:13 -0700 Subject: [PATCH 1/3] move linalg.py to linalg/__init__.py --- python/pyspark/mllib/{linalg.py => linalg/__init__.py} | 0 python/pyspark/sql/types.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename python/pyspark/mllib/{linalg.py => linalg/__init__.py} (100%) diff --git a/python/pyspark/mllib/linalg.py b/python/pyspark/mllib/linalg/__init__.py similarity index 100% rename from python/pyspark/mllib/linalg.py rename to python/pyspark/mllib/linalg/__init__.py diff --git a/python/pyspark/sql/types.py b/python/pyspark/sql/types.py index 10ad89ea14a8d..36c44d1908a20 100644 --- a/python/pyspark/sql/types.py +++ b/python/pyspark/sql/types.py @@ -629,7 +629,7 @@ def jsonValue(self): @classmethod def fromJson(cls, json): - pyUDT = json["pyClass"] + pyUDT = str(json["pyClass"]) split = pyUDT.rfind(".") pyModule = pyUDT[:split] pyClass = pyUDT[split+1:] From c48cae040236329d7fcab2fadc79d46670faa4a3 Mon Sep 17 00:00:00 2001 From: Xiangrui Meng Date: Tue, 28 Jul 2015 23:58:52 -0700 Subject: [PATCH 2/3] update tests --- dev/sparktestsupport/modules.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/sparktestsupport/modules.py b/dev/sparktestsupport/modules.py index 3073d489bad4a..d2171c6984dac 100644 --- a/dev/sparktestsupport/modules.py +++ b/dev/sparktestsupport/modules.py @@ -313,7 +313,7 @@ def contains_file(self, filename): "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", From 1135551cd59787be37c278be596fd831387d698e Mon Sep 17 00:00:00 2001 From: Xiangrui Meng Date: Wed, 29 Jul 2015 16:07:30 -0700 Subject: [PATCH 3/3] add a comment for str(...) --- python/pyspark/sql/types.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/pyspark/sql/types.py b/python/pyspark/sql/types.py index 36c44d1908a20..778b3f41f7f29 100644 --- a/python/pyspark/sql/types.py +++ b/python/pyspark/sql/types.py @@ -629,7 +629,7 @@ def jsonValue(self): @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:]