openstack/deb-python-keystoneclient
Code Issues Proposed changes

Merge "Fix python3 incompatible use of urlparse"

Browse Source
This commit is contained in:
Jenkins
2013-11-22 19:18:47 +00:00
committed by Gerrit Code Review
parent 41b5590924 43e278c8be
commit 31df452872
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
keystoneclient/generic/client.py
View File

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

2
keystoneclient/httpclient.py
View File

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

2
keystoneclient/tests/v2_0/fakes.py
View File

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

2
keystoneclient/tests/v3/utils.py
View File

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