summaryrefslogtreecommitdiff
path: root/ironic_python_agent/agent.py
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-12-03 13:09:30 +0000
committerGerrit Code Review <review@openstack.org>2019-12-03 13:09:30 +0000
commit6032643a04cfc6867ad925845ddd2b3f7d99b4e9 (patch)
treef5128f53668379fdf780ae288c67ea125f3ac541 /ironic_python_agent/agent.py
parent4354bc04f95c03fc90d7b596422874e329996660 (diff)
parentca7a46b113c64edd87bfa7b9f56fdb97a0c96dd6 (diff)
downloadironic-python-agent-6032643a04cfc6867ad925845ddd2b3f7d99b4e9.tar.gz
Merge "Stop using six library"
Diffstat (limited to 'ironic_python_agent/agent.py')
-rw-r--r--ironic_python_agent/agent.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ironic_python_agent/agent.py b/ironic_python_agent/agent.py
index 25a08d59..13e78730 100644
--- a/ironic_python_agent/agent.py
+++ b/ironic_python_agent/agent.py
@@ -20,6 +20,7 @@ import select
import socket
import threading
import time
+from urllib import parse as urlparse
from wsgiref import simple_server
from ironic_lib import exception as lib_exc
@@ -29,7 +30,6 @@ from oslo_config import cfg
from oslo_log import log
from oslo_utils import netutils
import pkg_resources
-from six.moves.urllib import parse as urlparse
from stevedore import extension
from ironic_python_agent.api import app