django 3.2: import url related functions from urllib (#64430)
This commit is contained in:
parent
8fdd44a639
commit
3f335c9bee
|
@ -1,8 +1,10 @@
|
|||
import urllib.parse
|
||||
|
||||
from django.conf import settings
|
||||
from django.contrib.auth import views as auth_views
|
||||
from django.http import HttpResponseRedirect
|
||||
from django.shortcuts import resolve_url
|
||||
from django.utils.six.moves.urllib import parse as urllib
|
||||
|
||||
|
||||
if 'mellon' in settings.INSTALLED_APPS:
|
||||
from mellon.utils import get_idps
|
||||
|
@ -17,7 +19,7 @@ def login(request, *args, **kwargs):
|
|||
if 'next' not in request.GET:
|
||||
return HttpResponseRedirect(resolve_url('mellon_login'))
|
||||
return HttpResponseRedirect(
|
||||
resolve_url('mellon_login') + '?next=' + urllib.quote(request.GET.get('next'))
|
||||
resolve_url('mellon_login') + '?next=' + urllib.parse.quote(request.GET.get('next'))
|
||||
)
|
||||
return auth_views.LoginView.as_view(*args, **kwargs)(request)
|
||||
|
||||
|
|
|
@ -4,6 +4,7 @@ import datetime
|
|||
import hashlib
|
||||
import logging
|
||||
import collections
|
||||
import urllib.parse
|
||||
|
||||
|
||||
from django.forms import (
|
||||
|
@ -24,7 +25,6 @@ from django.conf import settings
|
|||
from django.db.models.query import Q
|
||||
from django.contrib.auth.forms import PasswordResetForm, PasswordChangeForm
|
||||
from django.utils.encoding import force_text
|
||||
from django.utils.six.moves import urllib
|
||||
|
||||
from django_journal import journal as django_journal
|
||||
|
||||
|
|
|
@ -5,6 +5,7 @@ import random
|
|||
import hashlib
|
||||
import html
|
||||
import re
|
||||
import urllib.parse
|
||||
from collections import defaultdict
|
||||
import time
|
||||
|
||||
|
@ -35,7 +36,6 @@ from django.utils.html import strip_tags
|
|||
from django.utils.timezone import now, utc
|
||||
from django.forms import ValidationError
|
||||
from django.utils.encoding import force_text
|
||||
from django.utils.six.moves.urllib import parse as urlparse
|
||||
from django.utils.safestring import mark_safe
|
||||
|
||||
from django_journal import journal as django_journal
|
||||
|
@ -434,7 +434,7 @@ class Document(Model):
|
|||
return " ".join([username(sender) for sender in self.extra_senders.all()])
|
||||
|
||||
def url(self):
|
||||
return urlparse.urljoin(
|
||||
return urllib.parse.urljoin(
|
||||
app_settings.BASE_URL, reverse('inbox-message', kwargs=dict(mailbox_id=self.id))
|
||||
)
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
from __future__ import print_function
|
||||
import urllib.parse
|
||||
|
||||
from django.shortcuts import redirect
|
||||
from django.utils.six.moves import urllib
|
||||
from django.views.generic.edit import UpdateView, FormView
|
||||
from django.views.generic.base import TemplateResponseMixin, View
|
||||
from django.contrib import messages
|
||||
|
|
|
@ -2,7 +2,7 @@ import logging
|
|||
import json
|
||||
|
||||
from django.utils.http import urlencode
|
||||
from django.utils.six.moves.urllib.request import urlopen
|
||||
from urllib.request import urlopen
|
||||
|
||||
from django.conf import settings
|
||||
from django.utils.encoding import force_text
|
||||
|
|
|
@ -8,13 +8,13 @@ import email.header
|
|||
import logging
|
||||
import re
|
||||
import time
|
||||
from urllib.request import urlopen
|
||||
|
||||
from django.conf import settings
|
||||
from django.core.management.base import BaseCommand
|
||||
import django.contrib.auth.models as auth_models
|
||||
from django.core.files.base import ContentFile
|
||||
from django.core.exceptions import MultipleObjectsReturned
|
||||
from django.utils.six.moves.urllib.request import urlopen
|
||||
from django.utils.timezone import utc, make_aware
|
||||
from django.utils.encoding import force_text
|
||||
from django.template.defaultfilters import slugify
|
||||
|
|
Loading…
Reference in New Issue