Merge "Use six.moves.urllib.parse instead of urlparse"

This commit is contained in:
Jenkins 2014-02-24 03:10:56 +00:00 committed by Gerrit Code Review
commit 8dd2070fd0
6 changed files with 8 additions and 7 deletions

View File

@ -20,12 +20,12 @@ import hashlib
import hmac
import os
import socket
import urlparse
import eventlet
import httplib2
from neutronclient.v2_0 import client
from oslo.config import cfg
import six.moves.urllib.parse as urlparse
import webob
from neutron.agent.common import config as agent_conf

View File

@ -18,11 +18,12 @@
import httplib
import socket
import urlparse
import eventlet
import httplib2
from oslo.config import cfg
import six.moves.urllib.parse as urlparse
import webob
from neutron.agent.linux import daemon

View File

@ -13,10 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import urlparse
from oslo.config import cfg
import routes as routes_mapper
import six.moves.urllib.parse as urlparse
import webob
import webob.dec
import webob.exc

View File

@ -25,9 +25,9 @@ import eventlet
import httplib
import logging
import time
import urlparse
import six
import six.moves.urllib.parse as urlparse
from neutron.openstack.common import excutils
from neutron.plugins.nicira.api_client.common import (

View File

@ -15,7 +15,8 @@
# under the License.
import json
import urlparse
import six.moves.urllib.parse as urlparse
from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils

View File

@ -16,10 +16,10 @@
# under the License.
import os
import urlparse
import mock
from oslo.config import cfg
import six.moves.urllib.parse as urlparse
import webob
from webob import exc
import webtest