Replace cgi.parse_qsl w/ six.moves.urllib.parse.parse_sqleliminate_cgi_parse_qsl_2eliminate_cgi_parse_qsl

because `cgi.parse_qsl` is deprecated, according to
https://docs.python.org/2/library/cgi.html#cgi.parse_qsl

3 files changed, 8 insertions, 9 deletions

diff --git a/paste/fixture.py b/paste/fixture.py
index f851eee..df1c75d 100644
--- a/paste/fixture.py
+++ b/paste/fixture.py
@@ -15,7 +15,6 @@ import sys
 import random
 import mimetypes
 import time
-import cgi
 import os
 import shutil
 import smtplib
@@ -230,7 +229,7 @@ class TestApp(object):
             if six.PY3:
                 params = params.encode('utf8')
         if upload_files:
-            params = cgi.parse_qsl(params, keep_blank_values=True)
+            params = urlparse.parse_qsl(params, keep_blank_values=True)
             content_type, params = self.encode_multipart(
                 params, upload_files)
             environ['CONTENT_TYPE'] = content_type
diff --git a/paste/request.py b/paste/request.py
index 2e7280b..f0d91c1 100644
--- a/paste/request.py
+++ b/paste/request.py
@@ -19,7 +19,7 @@ environment to solve common requirements.
 """
 import cgi
 from six.moves.urllib import parse as urlparse
-from six.moves.urllib.parse import quote
+from six.moves.urllib.parse import quote, parse_qsl
 try:
     # Python 3
     from http.cookies import SimpleCookie, CookieError
@@ -103,8 +103,8 @@ def parse_querystring(environ):
         parsed, check_source = environ['paste.parsed_querystring']
         if check_source == source:
             return parsed
-    parsed = cgi.parse_qsl(source, keep_blank_values=True,
-                           strict_parsing=False)
+    parsed = parse_qsl(source, keep_blank_values=True,
+                       strict_parsing=False)
     environ['paste.parsed_querystring'] = (parsed, source)
     return parsed
 
@@ -134,8 +134,8 @@ def parse_dict_querystring(environ):
         parsed, check_source = environ['paste.parsed_dict_querystring']
         if check_source == source:
             return parsed
-    parsed = cgi.parse_qsl(source, keep_blank_values=True,
-                           strict_parsing=False)
+    parsed = parse_qsl(source, keep_blank_values=True,
+                       strict_parsing=False)
     multi = MultiDict(parsed)
     environ['paste.parsed_dict_querystring'] = (multi, source)
     return multi
diff --git a/paste/url.py b/paste/url.py
index 7273d51..fb08d6d 100644
--- a/paste/url.py
+++ b/paste/url.py
@@ -4,7 +4,7 @@
 """
 This module implements a class for handling URLs.
 """
-from six.moves.urllib.parse import quote, unquote, urlencode
+from six.moves.urllib.parse import parse_qsl, quote, unquote, urlencode
 import cgi
 from paste import request
 import six
@@ -83,7 +83,7 @@ class URLResource(object):
             if querystring is None:
                 vars = request.parse_querystring(environ)
             else:
-                vars = cgi.parse_qsl(
+                vars = parse_qsl(
                     querystring,
                     keep_blank_values=True,
                     strict_parsing=False)