python3: get urllib/urlparse from six (#40911)
This commit is contained in:
parent
b3517e49df
commit
46478781cf
|
@ -5,13 +5,13 @@ import datetime
|
|||
import isodate
|
||||
import requests
|
||||
import threading
|
||||
import urlparse
|
||||
|
||||
import pytest
|
||||
import httmock
|
||||
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.utils.http import urlencode
|
||||
from django.utils.six.moves.urllib import parse as urlparse
|
||||
from django.utils.timezone import now
|
||||
|
||||
from zoo.zoo_data.models import Entity, Relation, Log, Job
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
import urlparse
|
||||
import copy
|
||||
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.core.management import call_command
|
||||
from django.utils.six.moves.urllib import parse as urlparse
|
||||
|
||||
from zoo.zoo_nanterre.models import Duplicate
|
||||
from zoo.zoo_data.models import Log, Entity
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
import urlparse
|
||||
import datetime
|
||||
import decimal
|
||||
import xml.etree.ElementTree as ET
|
||||
|
||||
from django.conf import settings
|
||||
from django.utils import six, timezone
|
||||
from django.utils.six.moves.urllib import parse as urlparse
|
||||
|
||||
import requests
|
||||
|
||||
|
|
Loading…
Reference in New Issue