openstack/python-openstackclient
Code Issues Proposed changes

Merge "Fix error msg in sort_items"

Browse Source
This commit is contained in:
Jenkins 2015-03-02 17:16:04 +00:00 committed by Gerrit Code Review
commit 9ce112f1a1
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openstackclient/common/utils.py
View File

@ -200,8 +200,14 @@ def sort_items(items, sort_str):
reverse = False reverse = False
if ':' in sort_key: if ':' in sort_key:
sort_key, direction = sort_key.split(':', 1) sort_key, direction = sort_key.split(':', 1)
if not sort_key:
msg = "empty string is not a valid sort key"
raise exceptions.CommandError(msg)
if direction not in ['asc', 'desc']: if direction not in ['asc', 'desc']:
msg = "Specify sort direction by asc or desc" if not direction:
direction = "empty string"
msg = ("%s is not a valid sort direction for sort key %s, "
"use asc or desc instead" % (direction, sort_key))
raise exceptions.CommandError(msg) raise exceptions.CommandError(msg)
if direction == 'desc': if direction == 'desc':
reverse = True reverse = True