aboutsummaryrefslogtreecommitdiff
path: root/python/pyspark/sql/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'python/pyspark/sql/__init__.py')
-rw-r--r--python/pyspark/sql/__init__.py15
1 files changed, 14 insertions, 1 deletions
diff --git a/python/pyspark/sql/__init__.py b/python/pyspark/sql/__init__.py
index 65abb24eed..6d54b9e49e 100644
--- a/python/pyspark/sql/__init__.py
+++ b/python/pyspark/sql/__init__.py
@@ -37,9 +37,22 @@ Important classes of Spark SQL and DataFrames:
- L{types}
List of data types available.
"""
+from __future__ import absolute_import
+
+# fix the module name conflict for Python 3+
+import sys
+from . import _types as types
+modname = __name__ + '.types'
+types.__name__ = modname
+# update the __module__ for all objects, make them picklable
+for v in types.__dict__.values():
+ if hasattr(v, "__module__") and v.__module__.endswith('._types'):
+ v.__module__ = modname
+sys.modules[modname] = types
+del modname, sys
-from pyspark.sql.context import SQLContext, HiveContext
from pyspark.sql.types import Row
+from pyspark.sql.context import SQLContext, HiveContext
from pyspark.sql.dataframe import DataFrame, GroupedData, Column, SchemaRDD, DataFrameNaFunctions
__all__ = [