openstack/deb-python-cinderclient
Code Issues Proposed changes

Merge "python3: align the order of parameters for urlencode()"

Browse Source
This commit is contained in:
Jenkins
2013-10-23 22:26:26 +00:00
committed by Gerrit Code Review
parent 6b998a9529 fcf8e1d0b9
commit bdac412d3e
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cinderclient/v1/volume_snapshots.py
View File

@@ -108,7 +108,13 @@ class SnapshotManager(base.ManagerWithFind):
if val:
qparams[opt] = val
query_string = "?%s" % urlencode(qparams) if qparams else ""
# Transform the dict to a sequence of two-element tuples in fixed
# order, then the encoded string will be consistent in Python 2&3.
if qparams:
new_qparams = sorted(qparams.items(), key=lambda x: x[0])
query_string = "?%s" % urlencode(new_qparams)
else:
query_string = ""
detail = ""
if detailed:

8
cinderclient/v2/volume_snapshots.py
View File

@@ -95,7 +95,13 @@ class SnapshotManager(base.ManagerWithFind):
if val:
qparams[opt] = val
query_string = "?%s" % urlencode(qparams) if qparams else ""
# Transform the dict to a sequence of two-element tuples in fixed
# order, then the encoded string will be consistent in Python 2&3.
if qparams:
new_qparams = sorted(qparams.items(), key=lambda x: x[0])
query_string = "?%s" % urlencode(new_qparams)
else:
query_string = ""
detail = ""
if detailed: