openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Python3: use six.moves.urllib.parse.quote instead of urllib.quote"

Browse Source
This commit is contained in:
Jenkins
2014-02-11 08:03:27 +00:00
committed by Gerrit Code Review
parent 820a68a44a 88ae6c20c5
commit 8657da11af
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
keystoneclient/middleware/s3_token.py
View File

@@ -34,11 +34,11 @@ This WSGI component:
"""
import logging
import urllib
import webob
import requests
import six
from six.moves import urllib
from keystoneclient.openstack.common import jsonutils
@@ -78,7 +78,7 @@ def split_path(path, minsegs=1, maxsegs=None, rest_with_last=False):
count = len(segs)
if (segs[0] or count < minsegs or count > maxsegs or
'' in segs[1:minsegs]):
raise ValueError('Invalid path: %s' % urllib.quote(path))
raise ValueError('Invalid path: %s' % urllib.parse.quote(path))
else:
minsegs += 1
maxsegs += 1
@@ -87,7 +87,7 @@ def split_path(path, minsegs=1, maxsegs=None, rest_with_last=False):
if (segs[0] or count < minsegs or count > maxsegs + 1 or
'' in segs[1:minsegs] or
(count == maxsegs + 1 and segs[maxsegs])):
raise ValueError('Invalid path: %s' % urllib.quote(path))
raise ValueError('Invalid path: %s' % urllib.parse.quote(path))
segs = segs[1:maxsegs]
segs.extend([None] * (maxsegs - 1 - len(segs)))
return segs