misc: get urllib from django.six (#36515)
This commit is contained in:
parent
a321f200be
commit
0e968f3b83
|
@ -1,7 +1,7 @@
|
|||
import base64
|
||||
import json
|
||||
import urllib
|
||||
|
||||
from django.utils.six.moves.urllib import parse as urllib
|
||||
from django.utils.six.moves.urllib import parse as urlparse
|
||||
from quixote import cleanup, get_session_manager
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import urllib
|
||||
from django.utils.six.moves.urllib import parse as urllib
|
||||
|
||||
from quixote import get_request, get_publisher, redirect
|
||||
from quixote.html import htmltext, TemplateIO
|
||||
|
|
|
@ -17,9 +17,9 @@
|
|||
import json
|
||||
import threading
|
||||
import time
|
||||
import urllib
|
||||
|
||||
from django.http import HttpResponseBadRequest, HttpResponseRedirect
|
||||
from django.utils.six.moves.urllib import parse as urllib
|
||||
|
||||
from quixote import get_publisher
|
||||
from quixote.errors import RequestError
|
||||
|
|
|
@ -14,8 +14,7 @@
|
|||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import urllib
|
||||
|
||||
from django.utils.six.moves.urllib import parse as urllib
|
||||
from quixote.html import htmltext, TemplateIO
|
||||
from quixote import get_request, get_response
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import urllib
|
||||
from django.utils.six.moves.urllib import parse as urllib
|
||||
|
||||
from quixote import get_publisher
|
||||
import quixote
|
||||
|
|
|
@ -17,9 +17,10 @@
|
|||
import base64
|
||||
import hashlib
|
||||
import sys
|
||||
import urllib
|
||||
import uuid
|
||||
|
||||
from django.utils.six.moves.urllib import parse as urllib
|
||||
|
||||
from quixote import redirect, get_session, get_publisher, get_request, get_session_manager
|
||||
from quixote.directory import Directory
|
||||
from quixote.html import htmltext, TemplateIO
|
||||
|
|
|
@ -20,6 +20,7 @@ import collections
|
|||
from django.utils.six.moves import builtins
|
||||
from django.utils.six.moves import configparser as ConfigParser
|
||||
from django.utils.six.moves import cPickle
|
||||
from django.utils.six.moves.urllib import parse as urllib
|
||||
import datetime
|
||||
from decimal import Decimal
|
||||
import imp
|
||||
|
@ -62,7 +63,6 @@ import logging
|
|||
import logging.handlers
|
||||
from . import logger
|
||||
from . import storage
|
||||
import urllib
|
||||
|
||||
class ImmediateRedirectException(Exception):
|
||||
def __init__(self, location):
|
||||
|
|
|
@ -15,7 +15,8 @@
|
|||
# along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import re
|
||||
import urllib
|
||||
|
||||
from django.utils.six.moves.urllib import parse as urllib
|
||||
|
||||
from . import errors, misc
|
||||
from . import get_cfg, get_logger
|
||||
|
|
|
@ -18,7 +18,8 @@ from importlib import import_module
|
|||
import json
|
||||
import os
|
||||
import re
|
||||
import urllib
|
||||
|
||||
from django.utils.six.moves.urllib import parse as urllib
|
||||
|
||||
from quixote import get_publisher, get_response, get_session, redirect, get_session_manager
|
||||
from quixote.directory import Directory
|
||||
|
|
Loading…
Reference in New Issue