openstack/swift
Code Issues Proposed changes

Merge "set query_string 'qs' in direct_get_account and direct_get_container, but didn't pass it to http_connect"

Browse Source
This commit is contained in:
Jenkins 2012-02-28 19:15:19 +00:00 committed by Gerrit Code Review
commit 85ee3aa9d5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swift/common/direct_client.py
View File

@ -66,7 +66,7 @@ def direct_get_account(node, part, account, marker=None, limit=None,
qs += '&delimiter=%s' % quote(delimiter)
with Timeout(conn_timeout):
conn = http_connect(node['ip'], node['port'], node['device'], part,
'GET', path, query_string='format=json')
'GET', path, query_string=qs)
with Timeout(response_timeout):
resp = conn.getresponse()
if resp.status < 200 or resp.status >= 300:
@ -154,7 +154,7 @@ def direct_get_container(node, part, account, container, marker=None,
qs += '&delimiter=%s' % quote(delimiter)
with Timeout(conn_timeout):
conn = http_connect(node['ip'], node['port'], node['device'], part,
'GET', path, query_string='format=json')
'GET', path, query_string=qs)
with Timeout(response_timeout):
resp = conn.getresponse()
if resp.status < 200 or resp.status >= 300: