tests: adapt import urlparse to run tests in python3 (#40012)
This commit is contained in:
parent
f128b00b61
commit
70140e7b38
|
@ -25,7 +25,8 @@ import os
|
||||||
import string
|
import string
|
||||||
import subprocess
|
import subprocess
|
||||||
import urllib2
|
import urllib2
|
||||||
import urlparse
|
|
||||||
|
from django.utils.six.moves.urllib import parse as urlparse
|
||||||
|
|
||||||
from . import settings
|
from . import settings
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,6 @@
|
||||||
import json
|
import json
|
||||||
import datetime
|
import datetime
|
||||||
import logging
|
import logging
|
||||||
import urlparse
|
|
||||||
from urllib import urlencode
|
from urllib import urlencode
|
||||||
import pprint
|
import pprint
|
||||||
import os
|
import os
|
||||||
|
@ -25,6 +24,8 @@ import os
|
||||||
import requests
|
import requests
|
||||||
from robobrowser.browser import RoboBrowser
|
from robobrowser.browser import RoboBrowser
|
||||||
|
|
||||||
|
from django.utils.six.moves.urllib import parse as urlparse
|
||||||
|
|
||||||
from hobo.multitenant.middleware import TenantMiddleware
|
from hobo.multitenant.middleware import TenantMiddleware
|
||||||
from tenant_schemas.utils import tenant_context
|
from tenant_schemas.utils import tenant_context
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,6 @@ import string
|
||||||
import sys
|
import sys
|
||||||
import time
|
import time
|
||||||
import os
|
import os
|
||||||
import urlparse
|
|
||||||
|
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.contrib.contenttypes.models import ContentType
|
from django.contrib.contenttypes.models import ContentType
|
||||||
|
@ -30,6 +29,7 @@ from django.core.management import call_command
|
||||||
from django.db import connection
|
from django.db import connection
|
||||||
from django.db.models import Max
|
from django.db.models import Max
|
||||||
from django.core.exceptions import ValidationError
|
from django.core.exceptions import ValidationError
|
||||||
|
from django.utils.six.moves.urllib import parse as urlparse
|
||||||
from django.utils.text import slugify
|
from django.utils.text import slugify
|
||||||
|
|
||||||
from hobo.agent.common.management.commands.hobo_deploy import (
|
from hobo.agent.common.management.commands.hobo_deploy import (
|
||||||
|
|
Loading…
Reference in New Issue