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

openstack_dashboard/api/glance.py

@@ -23,9 +23,9 @@ from __future__ import absolute_import
 import itertools
 import logging
 import thread
-import urlparse
 
 from django.conf import settings
+import six.moves.urllib.parse as urlparse
 
 import glanceclient as glance_client
 

openstack_dashboard/api/keystone.py

@@ -20,10 +20,10 @@
 #    under the License.
 
 import logging
-import urlparse
 
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
+import six.moves.urllib.parse as urlparse
 
 from keystoneclient import exceptions as keystone_exceptions
 

openstack_dashboard/dashboards/project/stacks/mappings.py

@@ -15,10 +15,10 @@
 import json
 import logging
 import re
-import urlparse
 
 from django.core.urlresolvers import reverse
 from django.template.defaultfilters import register  # noqa
+import six.moves.urllib.parse as urlparse
 
 from openstack_dashboard.api import swift
 

requirements.txt

@@ -18,6 +18,7 @@ python-swiftclient>=1.6
 python-ceilometerclient>=1.0.6
 python-troveclient>=1.0.3
 pytz>=2010h
+six>=1.4.1
 # Horizon Utility Requirements
 # for SECURE_KEY generation
 lockfile>=0.8