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

ceilometer/alarm/notifier/rest.py

@@ -19,7 +19,7 @@
 
 import eventlet
 import requests
-import urlparse
+import six.moves.urllib.parse as urlparse
 
 from oslo.config import cfg
 

ceilometer/objectstore/swift.py

@@ -19,7 +19,7 @@
 """
 
 from __future__ import absolute_import
-import urlparse
+import six.moves.urllib.parse as urlparse
 
 from keystoneclient import exceptions
 from oslo.config import cfg

ceilometer/publisher/file.py

@@ -18,7 +18,7 @@
 
 import logging
 import logging.handlers
-import urlparse
+import six.moves.urllib.parse as urlparse
 
 from ceilometer.openstack.common.gettextutils import _  # noqa
 from ceilometer.openstack.common import log

ceilometer/publisher/rpc.py

@@ -21,7 +21,7 @@
 
 import itertools
 import operator
-import urlparse
+import six.moves.urllib.parse as urlparse
 
 from oslo.config import cfg
 

ceilometer/storage/__init__.py

@@ -18,7 +18,7 @@
 """Storage backend management
 """
 
-import urlparse
+import six.moves.urllib.parse as urlparse
 
 from oslo.config import cfg
 import six

ceilometer/storage/impl_hbase.py

@@ -25,7 +25,7 @@ import itertools
 import json
 import os
 import re
-import urlparse
+import six.moves.urllib.parse as urlparse
 
 import happybase
 

ceilometer/storage/sqlalchemy/models.py

@@ -19,7 +19,7 @@ SQLAlchemy models for Ceilometer data.
 """
 
 import json
-import urlparse
+import six.moves.urllib.parse as urlparse
 
 from oslo.config import cfg
 from sqlalchemy import Column, Integer, String, Table, ForeignKey, \

ceilometer/tests/alarm/test_notifier.py

@@ -15,7 +15,7 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-import urlparse
+import six.moves.urllib.parse as urlparse
 
 import mock
 import requests