python3: get urllib/urlparse/htmlparser from six (#39092)

welco/kb/search_indexes.py

@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from HTMLParser import HTMLParser
-
 from django.utils.html import strip_tags
+from django.utils.six.moves.html_parser import HTMLParser
 
 from haystack import indexes
 

welco/sources/mail/maarch.py

@@ -14,10 +14,10 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import urlparse
 import base64
 
 from dateutil.parser import parse as parse_datetime
+from django.utils.six.moves.urllib import parse as urlparse
 
 import requests
 from requests.adapters import HTTPAdapter

welco/utils.py

@@ -22,13 +22,13 @@ import json
 import random
 import re
 import requests
-import urllib
-import urlparse
 
 from django.conf import settings
 from django.core.cache import cache
 from django.http import HttpResponse, HttpResponseBadRequest
-from django.utils.http import urlencode
+from django.utils.http import urlencode, quote
+from django.utils.six.moves.urllib import parse as urlparse
+
 
 def sign_url(url, key, algo='sha256', timestamp=None, nonce=None):
     parsed = urlparse.urlparse(url)
@@ -44,12 +44,12 @@ def sign_query(query, key, algo='sha256', timestamp=None, nonce=None):
     new_query = query
     if new_query:
         new_query += '&'
-    new_query += urllib.urlencode((
+    new_query += urlencode((
         ('algo', algo),
         ('timestamp', timestamp),
         ('nonce', nonce)))
     signature = base64.b64encode(sign_string(new_query, key, algo=algo))
-    new_query += '&signature=' + urllib.quote(signature)
+    new_query += '&signature=' + quote(signature)
     return new_query
 
 def sign_string(s, key, algo='sha256', timedelta=30):
@@ -134,7 +134,7 @@ def push_wcs_formdata(request, formdef_reference, context=None):
     if request.session.get('mellon_session'):
         mellon = request.session['mellon_session']
         nameid = mellon['name_id_content']
-        url += '&NameID=' + urllib.quote(nameid)
+        url += '&NameID=' + quote(nameid)
 
     url = sign_url(url, wcs_site.get('secret'))
 
@@ -153,17 +153,12 @@ def get_wcs_data(endpoint, params=None):
         wcs_site_url += '/'
     url = wcs_site_url + endpoint
 
-    if params:
+    if not params:
-        params = params.copy()
-        for param, value in params.items():
-            if isinstance(value, unicode):
-                params[param] = value.encode('utf-8')
-    else:
         params = {}
 
     params['orig'] = wcs_site.get('orig')
     if params:
-        url += '?' + urllib.urlencode(params.items())
+        url += '?' + urlencode(params.items())
     url = sign_url(url, wcs_site.get('secret'))
 
     response = requests.get(url)

welco/views.py

@@ -15,7 +15,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import json
-import urllib
 
 from django.conf import settings
 from django.contrib.auth import logout as auth_logout
@@ -29,6 +28,7 @@ from django.shortcuts import resolve_url
 from django import template
 from django.template import RequestContext
 from django.utils.encoding import force_text
+from django.utils.http import quote
 from django.utils.translation import ugettext_lazy as _
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import TemplateView
@@ -52,7 +52,7 @@ def login(request, *args, **kwargs):
         if not 'next' in request.GET:
             return HttpResponseRedirect(resolve_url('mellon_login'))
         return HttpResponseRedirect(resolve_url('mellon_login') + '?next='
-                                    + urllib.quote(request.GET.get('next')))
+                                    + quote(request.GET.get('next')))
     return auth_views.login(request, *args, **kwargs)
 
 def logout(request, next_page=None):