openstack/swift
Code Issues Proposed changes

Fix warning pep8 E128 warning of hacking 0.10

Browse Source 
Fix the warning E128: "continuation line under-indented for visual
indent" of pep8.

Change-Id: Ie6c6ae341fe3d6281f2095c1d756d552fa5937f9
This commit is contained in:
Victor Stinner 2015-07-30 00:28:44 +02:00
parent a0db56dcde
commit d719064e78
13 changed files with 95 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/swift-dispersion-populate
View File

@ -76,8 +76,9 @@ def report(success):
return return
next_report = time() + 5 next_report = time() + 5
eta, eta_unit = compute_eta(begun, created, need_to_create) eta, eta_unit = compute_eta(begun, created, need_to_create)
print '\r\x1B[KCreating %s: %d of %d, %d%s left, %d retries' % (item_type, print ('\r\x1B[KCreating %s: %d of %d, %d%s left, %d retries'
created, need_to_create, round(eta), eta_unit, retries_done), % (item_type, created, need_to_create, round(eta), eta_unit,
retries_done)),
stdout.flush() stdout.flush()

19
test/functional/tests.py
View File

@ -1170,27 +1170,28 @@ class TestFile(Base):
for prefix in ('', '/'): for prefix in ('', '/'):
# invalid source container # invalid source container
file_item = self.env.container.file(Utils.create_name()) file_item = self.env.container.file(Utils.create_name())
copy_from = ('%s%s/%s'
% (prefix, Utils.create_name(), source_filename))
self.assertRaises(ResponseError, file_item.write, self.assertRaises(ResponseError, file_item.write,
hdrs={'X-Copy-From': '%s%s/%s' % hdrs={'X-Copy-From': copy_from})
(prefix,
Utils.create_name(), source_filename)})
self.assert_status(404) self.assert_status(404)
# invalid source object # invalid source object
copy_from = ('%s%s/%s'
% (prefix, self.env.container.name,
Utils.create_name()))
file_item = self.env.container.file(Utils.create_name()) file_item = self.env.container.file(Utils.create_name())
self.assertRaises(ResponseError, file_item.write, self.assertRaises(ResponseError, file_item.write,
hdrs={'X-Copy-From': '%s%s/%s' % hdrs={'X-Copy-From': copy_from})
(prefix,
self.env.container.name, Utils.create_name())})
self.assert_status(404) self.assert_status(404)
# invalid destination container # invalid destination container
dest_cont = self.env.account.container(Utils.create_name()) dest_cont = self.env.account.container(Utils.create_name())
file_item = dest_cont.file(Utils.create_name()) file_item = dest_cont.file(Utils.create_name())
copy_from = ('%s%s/%s'
% (prefix, self.env.container.name, source_filename))
self.assertRaises(ResponseError, file_item.write, self.assertRaises(ResponseError, file_item.write,
hdrs={'X-Copy-From': '%s%s/%s' % hdrs={'X-Copy-From': copy_from})
(prefix,
self.env.container.name, source_filename)})
self.assert_status(404) self.assert_status(404)
def testCopyFromAccountHeader404s(self): def testCopyFromAccountHeader404s(self):

3
test/unit/common/middleware/test_list_endpoints.py
View File

@ -105,7 +105,8 @@ class TestListEndpoints(unittest.TestCase):
def FakeGetInfo(self, env, app, swift_source=None): def FakeGetInfo(self, env, app, swift_source=None):
info = {'status': 0, 'sync_key': None, 'meta': {}, info = {'status': 0, 'sync_key': None, 'meta': {},
'cors': {'allow_origin': None, 'expose_headers': None, 'cors': {'allow_origin': None, 'expose_headers': None,
'max_age': None}, 'sysmeta': {}, 'read_acl': None, 'max_age': None},
'sysmeta': {}, 'read_acl': None,
'object_count': None, 'write_acl': None, 'versions': None, 'object_count': None, 'write_acl': None, 'versions': None,
'bytes': None} 'bytes': None}
info['storage_policy'] = self.policy_to_test info['storage_policy'] = self.policy_to_test

7
test/unit/common/middleware/test_tempurl.py
View File

@ -920,10 +920,11 @@ class TestTempURL(unittest.TestCase):
self.assertTrue('swift.auth_scheme' not in environ) self.assertTrue('swift.auth_scheme' not in environ)
# Rejected by TempURL # Rejected by TempURL
req = self._make_request('/v1/a/c/o', keys=['abc'], environ = {'REQUEST_METHOD': 'PUT',
environ={'REQUEST_METHOD': 'PUT',
'QUERY_STRING': 'QUERY_STRING':
'temp_url_sig=dummy&temp_url_expires=1234'}) 'temp_url_sig=dummy&temp_url_expires=1234'}
req = self._make_request('/v1/a/c/o', keys=['abc'],
environ=environ)
resp = req.get_response(self.tempurl) resp = req.get_response(self.tempurl)
self.assertEquals(resp.status_int, 401) self.assertEquals(resp.status_int, 401)
self.assertTrue('Temp URL invalid' in resp.body) self.assertTrue('Temp URL invalid' in resp.body)

16
test/unit/container/test_server.py
View File

@ -319,13 +319,13 @@ class TestContainerController(unittest.TestCase):
def test_PUT(self): def test_PUT(self):
req = Request.blank( req = Request.blank(
'/sda1/p/a/c', environ={'REQUEST_METHOD': 'PUT', '/sda1/p/a/c',
'HTTP_X_TIMESTAMP': '1'}) environ={'REQUEST_METHOD': 'PUT', 'HTTP_X_TIMESTAMP': '1'})
resp = req.get_response(self.controller) resp = req.get_response(self.controller)
self.assertEquals(resp.status_int, 201) self.assertEquals(resp.status_int, 201)
req = Request.blank( req = Request.blank(
'/sda1/p/a/c', environ={'REQUEST_METHOD': 'PUT', '/sda1/p/a/c',
'HTTP_X_TIMESTAMP': '2'}) environ={'REQUEST_METHOD': 'PUT', 'HTTP_X_TIMESTAMP': '2'})
resp = req.get_response(self.controller) resp = req.get_response(self.controller)
self.assertEquals(resp.status_int, 202) self.assertEquals(resp.status_int, 202)
@ -359,14 +359,14 @@ class TestContainerController(unittest.TestCase):
with mock.patch("swift.container.server.ContainerBroker", with mock.patch("swift.container.server.ContainerBroker",
InterceptedCoBr): InterceptedCoBr):
req = Request.blank( req = Request.blank(
'/sda1/p/a/c', environ={'REQUEST_METHOD': 'PUT', '/sda1/p/a/c',
'HTTP_X_TIMESTAMP': '1'}) environ={'REQUEST_METHOD': 'PUT', 'HTTP_X_TIMESTAMP': '1'})
resp = req.get_response(self.controller) resp = req.get_response(self.controller)
self.assertEqual(resp.status_int, 201) self.assertEqual(resp.status_int, 201)
state[0] = "race" state[0] = "race"
req = Request.blank( req = Request.blank(
'/sda1/p/a/c', environ={'REQUEST_METHOD': 'PUT', '/sda1/p/a/c',
'HTTP_X_TIMESTAMP': '1'}) environ={'REQUEST_METHOD': 'PUT', 'HTTP_X_TIMESTAMP': '1'})
resp = req.get_response(self.controller) resp = req.get_response(self.controller)
self.assertEqual(resp.status_int, 202) self.assertEqual(resp.status_int, 202)

6
test/unit/container/test_sync.py
View File

@ -861,7 +861,8 @@ class TestContainerSync(unittest.TestCase):
def fake_get_object(acct, con, obj, headers, acceptable_statuses): def fake_get_object(acct, con, obj, headers, acceptable_statuses):
self.assertEqual(headers['X-Backend-Storage-Policy-Index'], self.assertEqual(headers['X-Backend-Storage-Policy-Index'],
'0') '0')
return (200, {'other-header': 'other header value', return (200,
{'other-header': 'other header value',
'etag': '"etagvalue"', 'x-timestamp': '1.2', 'etag': '"etagvalue"', 'x-timestamp': '1.2',
'content-type': 'text/plain; swift_bytes=123'}, 'content-type': 'text/plain; swift_bytes=123'},
iter('contents')) iter('contents'))
@ -881,7 +882,8 @@ class TestContainerSync(unittest.TestCase):
self.assertEquals(headers['X-Newest'], True) self.assertEquals(headers['X-Newest'], True)
self.assertEquals(headers['X-Backend-Storage-Policy-Index'], self.assertEquals(headers['X-Backend-Storage-Policy-Index'],
'0') '0')
return (200, {'date': 'date value', return (200,
{'date': 'date value',
'last-modified': 'last modified value', 'last-modified': 'last modified value',
'x-timestamp': '1.2', 'x-timestamp': '1.2',
'other-header': 'other header value', 'other-header': 'other header value',

3
test/unit/proxy/test_server.py
View File

@ -7114,7 +7114,8 @@ class TestContainerController(unittest.TestCase):
'Content-Type': 'text/plain'}) 'Content-Type': 'text/plain'})
self.assertEqual(controller._convert_policy_to_index(req), None) self.assertEqual(controller._convert_policy_to_index(req), None)
# negative test # negative test
req = Request.blank('/a/c', headers={'Content-Length': '0', req = Request.blank('/a/c',
headers={'Content-Length': '0',
'Content-Type': 'text/plain', 'Content-Type': 'text/plain',
'X-Storage-Policy': 'nada'}) 'X-Storage-Policy': 'nada'})
self.assertRaises(HTTPException, controller._convert_policy_to_index, self.assertRaises(HTTPException, controller._convert_policy_to_index,