diff options
author | Davies Liu <davies@databricks.com> | 2015-07-01 16:43:18 -0700 |
---|---|---|
committer | Davies Liu <davies@databricks.com> | 2015-07-01 16:43:18 -0700 |
commit | f958f27e2056f9e380373c2807d8bb5977ecf269 (patch) | |
tree | f2cc331beedc426b0574126473b6172a3d16ed6a /python/pyspark/sql/dataframe.py | |
parent | 1ce6428907b4ddcf52dbf0c86196d82ab7392442 (diff) | |
download | spark-f958f27e2056f9e380373c2807d8bb5977ecf269.tar.gz spark-f958f27e2056f9e380373c2807d8bb5977ecf269.tar.bz2 spark-f958f27e2056f9e380373c2807d8bb5977ecf269.zip |
[SPARK-8766] support non-ascii character in column names
Use UTF-8 to encode the name of column in Python 2, or it may failed to encode with default encoding ('ascii').
This PR also fix a bug when there is Java exception without error message.
Author: Davies Liu <davies@databricks.com>
Closes #7165 from davies/non_ascii and squashes the following commits:
02cb61a [Davies Liu] fix tests
3b09d31 [Davies Liu] add encoding in header
867754a [Davies Liu] support non-ascii character in column names
Diffstat (limited to 'python/pyspark/sql/dataframe.py')
-rw-r--r-- | python/pyspark/sql/dataframe.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/python/pyspark/sql/dataframe.py b/python/pyspark/sql/dataframe.py index 4b9efa0a21..273a40dd52 100644 --- a/python/pyspark/sql/dataframe.py +++ b/python/pyspark/sql/dataframe.py @@ -484,13 +484,12 @@ class DataFrame(object): return [(str(f.name), f.dataType.simpleString()) for f in self.schema.fields] @property - @ignore_unicode_prefix @since(1.3) def columns(self): """Returns all column names as a list. >>> df.columns - [u'age', u'name'] + ['age', 'name'] """ return [f.name for f in self.schema.fields] |