From a1dcb8e3c1df29126fc4ffc9e6594c81fe40d825 Mon Sep 17 00:00:00 2001
From: Willian Galvani <williangalvani@gmail.com>
Date: Thu, 9 Apr 2020 13:16:43 -0300
Subject: [PATCH] Tools: use html.escape instead of cgi.escape

cgi.escape has been deprecated since Python 3.2
https://docs.python.org/3.5/library/cgi.html#cgi.escape
---
 Tools/autotest/param_metadata/htmlemit.py | 8 ++++----
 Tools/autotest/param_metadata/rstemit.py  | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Tools/autotest/param_metadata/htmlemit.py b/Tools/autotest/param_metadata/htmlemit.py
index f7284d060e..66639dcbc7 100644
--- a/Tools/autotest/param_metadata/htmlemit.py
+++ b/Tools/autotest/param_metadata/htmlemit.py
@@ -5,7 +5,7 @@ Emit docs in a form acceptable to the old Ardupilot wordpress docs site
 
 from param import known_param_fields, known_units
 from emit import Emit
-import cgi
+import html
 
 
 class HtmlEmit(Emit):
@@ -59,7 +59,7 @@ DO NOT EDIT
             t += '\n\n<h2>%s</h2>' % tag
             if d.get('User', None) == 'Advanced':
                 t += '<em>Note: This parameter is for advanced users</em><br>'
-            t += "\n\n<p>%s</p>\n" % cgi.escape(param.Description)
+            t += "\n\n<p>%s</p>\n" % html.escape(param.Description)
             t += "<ul>\n"
 
             for field in param.__dict__.keys():
@@ -77,8 +77,8 @@ DO NOT EDIT
                         abreviated_units = param.__dict__[field]
                         if abreviated_units != '':
                             units = known_units[abreviated_units]   # use the known_units dictionary to convert the abreviated unit into a full textual one
-                            t += "<li>%s: %s</li>\n" % (field, cgi.escape(units))
+                            t += "<li>%s: %s</li>\n" % (field, html.escape(units))
                     else:
-                        t += "<li>%s: %s</li>\n" % (field, cgi.escape(param.__dict__[field]))
+                        t += "<li>%s: %s</li>\n" % (field, html.escape(param.__dict__[field]))
             t += "</ul>\n"
         self.t += t
diff --git a/Tools/autotest/param_metadata/rstemit.py b/Tools/autotest/param_metadata/rstemit.py
index e54f1cf2f9..638abe25b7 100644
--- a/Tools/autotest/param_metadata/rstemit.py
+++ b/Tools/autotest/param_metadata/rstemit.py
@@ -3,7 +3,7 @@ from __future__ import print_function
 import re
 from param import known_param_fields, known_units
 from emit import Emit
-import cgi
+import html
 
 
 # Emit docs in a RST format
@@ -256,9 +256,9 @@ Complete Parameter List
                             # convert the abreviated unit into a full
                             # textual one:
                             units = known_units[abreviated_units]
-                            row.append(cgi.escape(units))
+                            row.append(html.escape(units))
                     else:
-                        row.append(cgi.escape(param.__dict__[field]))
+                        row.append(html.escape(param.__dict__[field]))
             if len(row):
                 ret += "\n\n" + self.tablify([row], headings=headings) + "\n\n"
         self.t += ret + "\n"