Fix python3 incompatible use of urlparse

Use six to make it work. While we're not yet able to gate
keystoneclient on py33, we still need keystoneclient to work when
keystoneclient is included in other libraries' test suites. This was
discovered while working on python3 for python-tuskarclient.

Note that together with I65c28896d1551fd537dd7774e87bc479a477a7ab
keystoneclient can be used safely in python-tuskarclient's py33 tests.

Closes-bug: #1239802

Change-Id: Ie6d31dc5fae7e63bb31a5192fa6765fe35dd026a

keystoneclient/generic/client.py

@@ -16,7 +16,7 @@
 #    under the License.
 
 import logging
-import urlparse
+from six.moves.urllib import parse as urlparse
 
 from keystoneclient import exceptions
 from keystoneclient import httpclient

keystoneclient/httpclient.py

@@ -23,7 +23,7 @@ OpenStack Client interface. Handles the REST calls and responses.
 
 import copy
 import logging
-import urlparse
+from six.moves.urllib import parse as urlparse
 
 import requests
 import six

keystoneclient/tests/v2_0/fakes.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import urlparse
+from six.moves.urllib import parse as urlparse
 
 from keystoneclient.tests import fakes
 from keystoneclient.tests.v2_0 import utils

keystoneclient/tests/v3/utils.py

@@ -12,10 +12,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import urlparse
 import uuid
 
 import httpretty
+from six.moves.urllib import parse as urlparse
 
 from keystoneclient.openstack.common import jsonutils
 from keystoneclient.tests import utils