openstack/swift
Code Issues Proposed changes

Merge "py3: port proxy account controller"

Browse Source
This commit is contained in:
Zuul 2019-03-05 01:01:14 +00:00 committed by Gerrit Code Review
commit d2d6d59d5c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
swift/proxy/controllers/account.py
View File

@ -55,7 +55,7 @@ class AccountController(Controller):
length_limit = self.get_name_length_limit() length_limit = self.get_name_length_limit()
if len(self.account_name) > length_limit: if len(self.account_name) > length_limit:
resp = HTTPBadRequest(request=req) resp = HTTPBadRequest(request=req)
resp.body = 'Account name length of %d longer than %d' % \ resp.body = b'Account name length of %d longer than %d' % \
(len(self.account_name), length_limit) (len(self.account_name), length_limit)
# Don't cache this. We know the account doesn't exist because # Don't cache this. We know the account doesn't exist because
# the name is bad; we don't need to cache that because it's # the name is bad; we don't need to cache that because it's
@ -119,7 +119,7 @@ class AccountController(Controller):
length_limit = self.get_name_length_limit() length_limit = self.get_name_length_limit()
if len(self.account_name) > length_limit: if len(self.account_name) > length_limit:
resp = HTTPBadRequest(request=req) resp = HTTPBadRequest(request=req)
resp.body = 'Account name length of %d longer than %d' % \ resp.body = b'Account name length of %d longer than %d' % \
(len(self.account_name), length_limit) (len(self.account_name), length_limit)
return resp return resp
account_partition, accounts = \ account_partition, accounts = \
@ -138,7 +138,7 @@ class AccountController(Controller):
length_limit = self.get_name_length_limit() length_limit = self.get_name_length_limit()
if len(self.account_name) > length_limit: if len(self.account_name) > length_limit:
resp = HTTPBadRequest(request=req) resp = HTTPBadRequest(request=req)
resp.body = 'Account name length of %d longer than %d' % \ resp.body = b'Account name length of %d longer than %d' % \
(len(self.account_name), length_limit) (len(self.account_name), length_limit)
return resp return resp
error_response = check_metadata(req, 'account') error_response = check_metadata(req, 'account')

1
tox.ini
View File

@ -87,6 +87,7 @@ commands =
test/unit/obj/test_replicator.py \ test/unit/obj/test_replicator.py \
test/unit/obj/test_server.py \ test/unit/obj/test_server.py \
test/unit/obj/test_updater.py \ test/unit/obj/test_updater.py \
test/unit/proxy/controllers/test_account.py \
test/unit/proxy/controllers/test_base.py \ test/unit/proxy/controllers/test_base.py \
test/unit/proxy/controllers/test_container.py \ test/unit/proxy/controllers/test_container.py \
test/unit/proxy/controllers/test_info.py \ test/unit/proxy/controllers/test_info.py \