[spark] branch master updated: [SPARK-28378][PYTHON] Remove usage of cgi.escape

[gu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gurwls223 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git


The following commit(s) were added to refs/heads/master by this push:
     new 707411f  [SPARK-28378][PYTHON] Remove usage of cgi.escape
707411f is described below

commit 707411f4793b7d45e19bc5f368e1ec9fc9827737
Author: Liang-Chi Hsieh <vi...@gmail.com>
AuthorDate: Sun Jul 14 15:26:00 2019 +0900

    [SPARK-28378][PYTHON] Remove usage of cgi.escape
    
    ## What changes were proposed in this pull request?
    
    `cgi.escape` is deprecated [1], and removed at 3.8 [2]. We better to replace it.
    
    [1] https://docs.python.org/3/library/cgi.html#cgi.escape.
    [2] https://docs.python.org/3.8/whatsnew/3.8.html#api-and-feature-removals
    
    ## How was this patch tested?
    
    Existing tests.
    
    Closes #25142 from viirya/remove-cgi-escape.
    
    Authored-by: Liang-Chi Hsieh <vi...@gmail.com>
    Signed-off-by: HyukjinKwon <gu...@apache.org>
---
 python/pyspark/sql/dataframe.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/python/pyspark/sql/dataframe.py b/python/pyspark/sql/dataframe.py
index f8be8ee..3984712 100644
--- a/python/pyspark/sql/dataframe.py
+++ b/python/pyspark/sql/dataframe.py
@@ -22,8 +22,10 @@ if sys.version >= '3':
     basestring = unicode = str
     long = int
     from functools import reduce
+    from html import escape as html_escape
 else:
     from itertools import imap as map
+    from cgi import escape as html_escape
 
 import warnings
 
@@ -375,7 +377,6 @@ class DataFrame(object):
         by 'spark.sql.repl.eagerEval.enabled', this only called by REPL you are
         using support eager evaluation with HTML.
         """
-        import cgi
         if not self._support_repr_html:
             self._support_repr_html = True
         if self.sql_ctx._conf.isReplEagerEvalEnabled():
@@ -390,11 +391,11 @@ class DataFrame(object):
 
             html = "<table border='1'>\n"
             # generate table head
-            html += "<tr><th>%s</th></tr>\n" % "</th><th>".join(map(lambda x: cgi.escape(x), head))
+            html += "<tr><th>%s</th></tr>\n" % "</th><th>".join(map(lambda x: html_escape(x), head))
             # generate table rows
             for row in row_data:
                 html += "<tr><td>%s</td></tr>\n" % "</td><td>".join(
-                    map(lambda x: cgi.escape(x), row))
+                    map(lambda x: html_escape(x), row))
             html += "</table>\n"
             if has_more_data:
                 html += "only showing top %d %s\n" % (


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org