From f2ee58b00c6247302377755a1d9c83b676a09ee5 Mon Sep 17 00:00:00 2001 From: Ricardo Ferreira Date: Tue, 10 Mar 2015 23:18:09 +0000 Subject: [PATCH] Syntax enhancements Did some syntax improvement by: -Removing extraneous parentheses. -Collapsing "if" statements. -Used set literal notation. -Fixed pep8 issue Change-Id: I321536058a76bf69af1d6b38d37f81a07a2f7108 Closes-Bug: #1397027 --- tests/functional/wsgi/v1/test_queues.py | 4 ++-- tests/functional/wsgi/v1_1/test_queues.py | 4 ++-- zaqar/bench/observer.py | 2 +- zaqar/bootstrap.py | 2 +- zaqar/openstack/common/cache/_backends/memory.py | 6 +++--- zaqar/openstack/common/config/generator.py | 5 ++--- zaqar/openstack/common/fileutils.py | 2 +- zaqar/storage/mongodb/claims.py | 6 +++--- zaqar/storage/mongodb/utils.py | 2 +- zaqar/storage/redis/utils.py | 2 +- zaqar/storage/sqlalchemy/claims.py | 2 +- zaqar/tests/functional/base.py | 3 +-- zaqar/tests/unit/storage/base.py | 6 +++--- zaqar/transport/auth.py | 2 +- zaqar/transport/wsgi/v1_0/messages.py | 2 +- zaqar/transport/wsgi/v1_0/stats.py | 2 +- zaqar/transport/wsgi/v1_1/messages.py | 2 +- zaqar/transport/wsgi/v1_1/stats.py | 2 +- zaqar/transport/wsgi/v2_0/messages.py | 2 +- zaqar/transport/wsgi/v2_0/stats.py | 2 +- 20 files changed, 29 insertions(+), 31 deletions(-) diff --git a/tests/functional/wsgi/v1/test_queues.py b/tests/functional/wsgi/v1/test_queues.py index c5193570a..d844ae35f 100644 --- a/tests/functional/wsgi/v1/test_queues.py +++ b/tests/functional/wsgi/v1/test_queues.py @@ -80,7 +80,7 @@ class TestInsertQueue(base.V1FunctionalTestBase): "v1") self.header = helpers.create_zaqar_headers(self.cfg) - self.headers_response_empty = set(['location']) + self.headers_response_empty = {'location'} self.client.set_base_url(self.base_url) self.header = helpers.create_zaqar_headers(self.cfg) @@ -420,7 +420,7 @@ class TestQueueNonExisting(base.V1FunctionalTestBase): self.client.set_base_url(self.queue_url) self.header = helpers.create_zaqar_headers(self.cfg) - self.headers_response_empty = set(['location']) + self.headers_response_empty = {'location'} self.header = helpers.create_zaqar_headers(self.cfg) def test_get_queue(self): diff --git a/tests/functional/wsgi/v1_1/test_queues.py b/tests/functional/wsgi/v1_1/test_queues.py index c01454185..fb94e7f1b 100644 --- a/tests/functional/wsgi/v1_1/test_queues.py +++ b/tests/functional/wsgi/v1_1/test_queues.py @@ -80,7 +80,7 @@ class TestInsertQueue(base.V1_1FunctionalTestBase): "v1.1") self.header = helpers.create_zaqar_headers(self.cfg) - self.headers_response_empty = set(['location']) + self.headers_response_empty = {'location'} self.client.set_base_url(self.base_url) self.client.headers = self.header @@ -331,7 +331,7 @@ class TestQueueNonExisting(base.V1_1FunctionalTestBase): self.client.set_base_url(self.queue_url) self.header = helpers.create_zaqar_headers(self.cfg) - self.headers_response_empty = set(['location']) + self.headers_response_empty = {'location'} self.header = helpers.create_zaqar_headers(self.cfg) def test_get_stats(self): diff --git a/zaqar/bench/observer.py b/zaqar/bench/observer.py index f4b5ef054..44f595517 100644 --- a/zaqar/bench/observer.py +++ b/zaqar/bench/observer.py @@ -122,7 +122,7 @@ def crunch(stats): total_succeeded += entry['total_succeeded'] total_elapsed += entry['total_elapsed'] - return (total_requests, total_succeeded, total_elapsed) + return total_requests, total_succeeded, total_elapsed def run(upstream_queue): diff --git a/zaqar/bootstrap.py b/zaqar/bootstrap.py index 848ecbb59..db264b340 100644 --- a/zaqar/bootstrap.py +++ b/zaqar/bootstrap.py @@ -53,7 +53,7 @@ _GENERAL_OPTIONS = ( 'catalogue/control plane data is kept.'), deprecated_opts=[cfg.DeprecatedOpt('sharding')]), cfg.BoolOpt('unreliable', default=None, - help=('Disable all reliability constrains.')), + help='Disable all reliability constrains.'), ) _DRIVER_OPTIONS = ( diff --git a/zaqar/openstack/common/cache/_backends/memory.py b/zaqar/openstack/common/cache/_backends/memory.py index 9632b80bc..eb454082d 100644 --- a/zaqar/openstack/common/cache/_backends/memory.py +++ b/zaqar/openstack/common/cache/_backends/memory.py @@ -52,7 +52,7 @@ class MemoryBackend(backends.BaseCache): try: timeout, value = self._cache[key] except KeyError: - return (0, default) + return 0, default if timeout and now >= timeout: @@ -72,9 +72,9 @@ class MemoryBackend(backends.BaseCache): except (KeyError, ValueError): pass - return (0, default) + return 0, default - return (timeout, value) + return timeout, value def _get(self, key, default=None): with lockutils.lock(key): diff --git a/zaqar/openstack/common/config/generator.py b/zaqar/openstack/common/config/generator.py index 22c410abd..acb9a62e3 100644 --- a/zaqar/openstack/common/config/generator.py +++ b/zaqar/openstack/common/config/generator.py @@ -236,9 +236,8 @@ def _sanitize_default(name, value): return value.replace(BASEDIR, '') elif value == _get_my_ip(): return '10.0.0.1' - elif value in (hostname, fqdn): - if 'host' in name: - return 'zaqar' + elif value in (hostname, fqdn) and 'host' in name: + return 'zaqar' elif value.endswith(hostname): return value.replace(hostname, 'zaqar') elif value.endswith(fqdn): diff --git a/zaqar/openstack/common/fileutils.py b/zaqar/openstack/common/fileutils.py index 51c6cf735..cd604baf0 100644 --- a/zaqar/openstack/common/fileutils.py +++ b/zaqar/openstack/common/fileutils.py @@ -63,7 +63,7 @@ def read_cached_file(filename, force_reload=False): cache_info['data'] = fap.read() cache_info['mtime'] = mtime reloaded = True - return (reloaded, cache_info['data']) + return reloaded, cache_info['data'] def delete_cached_file(filename): diff --git a/zaqar/storage/mongodb/claims.py b/zaqar/storage/mongodb/claims.py index e4c167e84..6fb5206f4 100644 --- a/zaqar/storage/mongodb/claims.py +++ b/zaqar/storage/mongodb/claims.py @@ -96,7 +96,7 @@ class ClaimController(storage.Claim): except StopIteration: raise errors.ClaimDoesNotExist(cid, queue, project) - return (claim_meta, msgs) + return claim_meta, msgs # NOTE(kgriffs): If we get an autoreconnect or any other connection error, # the worst that can happen is you get an orphaned claim, but it will @@ -154,7 +154,7 @@ class ClaimController(storage.Claim): ids = [msg['_id'] for msg in msgs] if len(ids) == 0: - return (None, messages) + return None, messages now = timeutils.utcnow_ts() @@ -196,7 +196,7 @@ class ClaimController(storage.Claim): # with the claim ID successfully. claim, messages = self.get(queue, oid, project=project) - return (str(oid), messages) + return str(oid), messages @utils.raises_conn_error @utils.retries_on_autoreconnect diff --git a/zaqar/storage/mongodb/utils.py b/zaqar/storage/mongodb/utils.py index 96c21ef32..8dd2fb54e 100644 --- a/zaqar/storage/mongodb/utils.py +++ b/zaqar/storage/mongodb/utils.py @@ -59,7 +59,7 @@ def cached_gen(iterable): cached_items.append(item) yield item - return (generator(iterable), cached_items) + return generator(iterable), cached_items def calculate_backoff(attempt, max_attempts, max_sleep, max_jitter=0): diff --git a/zaqar/storage/redis/utils.py b/zaqar/storage/redis/utils.py index 45081c45d..dbf02c49e 100644 --- a/zaqar/storage/redis/utils.py +++ b/zaqar/storage/redis/utils.py @@ -96,7 +96,7 @@ def descope_message_ids_set(msgset_key): tokens = msgset_key.split('.') - return (tokens[1] or None, tokens[0] or None) + return tokens[1] or None, tokens[0] or None # NOTE(prashanthr_): Aliasing the scope_message_ids_set function # to be used in the pools and claims controller as similar diff --git a/zaqar/storage/sqlalchemy/claims.py b/zaqar/storage/sqlalchemy/claims.py index bab1f07fb..a2c08e7c8 100644 --- a/zaqar/storage/sqlalchemy/claims.py +++ b/zaqar/storage/sqlalchemy/claims.py @@ -124,7 +124,7 @@ class ClaimController(storage.Claim): tables.Messages.c.cid == cid))) trans.execute(update) - return (utils.cid_encode(int(cid)), list(self.__get(cid, trans))) + return utils.cid_encode(int(cid)), list(self.__get(cid, trans)) def update(self, queue, claim_id, metadata, project=None): if project is None: diff --git a/zaqar/tests/functional/base.py b/zaqar/tests/functional/base.py index 3ceab96b8..f1a3c480d 100644 --- a/zaqar/tests/functional/base.py +++ b/zaqar/tests/functional/base.py @@ -97,8 +97,7 @@ class FunctionalTestBase(testing.TestBase): auth_token = helpers.get_keystone_token(self.cfg, self.client) self.headers["X-Auth-Token"] = auth_token - self.headers_response_with_body = set(['location', - 'content-type']) + self.headers_response_with_body = {'location', 'content-type'} self.client.set_headers(self.headers) diff --git a/zaqar/tests/unit/storage/base.py b/zaqar/tests/unit/storage/base.py index 48b09f34e..d46e81272 100644 --- a/zaqar/tests/unit/storage/base.py +++ b/zaqar/tests/unit/storage/base.py @@ -405,8 +405,8 @@ class MessageControllerTest(ControllerBaseTest): # Test Message Get message_out = self.controller.get(queue_name, message_id, project=self.project) - self.assertEqual(set(message_out), set(('id', 'body', 'ttl', 'age', - 'claim_id'))) + self.assertEqual(set(message_out), + {'id', 'body', 'ttl', 'age', 'claim_id'}) self.assertEqual(message_out['id'], message_id) self.assertEqual(message_out['body'], message['body']) self.assertEqual(message_out['ttl'], message['ttl']) @@ -462,7 +462,7 @@ class MessageControllerTest(ControllerBaseTest): for idx, message in enumerate(messages_out): self.assertEqual(set(message), - set(('id', 'body', 'ttl', 'age', 'claim_id'))) + {'id', 'body', 'ttl', 'age', 'claim_id'}) self.assertEqual(message['body'], idx) self.controller.bulk_delete(self.queue_name, ids, diff --git a/zaqar/transport/auth.py b/zaqar/transport/auth.py index 7f26cb1b4..42c101a82 100644 --- a/zaqar/transport/auth.py +++ b/zaqar/transport/auth.py @@ -38,7 +38,7 @@ class KeystoneAuth(object): options = [] keystone_opts = opts.list_auth_token_opts() for n in keystone_opts: - if (n[0] == cls.OPT_GROUP_NAME): + if n[0] == cls.OPT_GROUP_NAME: options = n[1] break diff --git a/zaqar/transport/wsgi/v1_0/messages.py b/zaqar/transport/wsgi/v1_0/messages.py index 52e4beb11..5a29e7b20 100644 --- a/zaqar/transport/wsgi/v1_0/messages.py +++ b/zaqar/transport/wsgi/v1_0/messages.py @@ -236,7 +236,7 @@ class CollectionResource(object): class ItemResource(object): - __slots__ = ('_message_controller') + __slots__ = '_message_controller' def __init__(self, message_controller): self._message_controller = message_controller diff --git a/zaqar/transport/wsgi/v1_0/stats.py b/zaqar/transport/wsgi/v1_0/stats.py index fc9f39bb1..20a2e5fb7 100644 --- a/zaqar/transport/wsgi/v1_0/stats.py +++ b/zaqar/transport/wsgi/v1_0/stats.py @@ -27,7 +27,7 @@ LOG = logging.getLogger(__name__) class Resource(object): - __slots__ = ('_queue_ctrl') + __slots__ = '_queue_ctrl' def __init__(self, queue_controller): self._queue_ctrl = queue_controller diff --git a/zaqar/transport/wsgi/v1_1/messages.py b/zaqar/transport/wsgi/v1_1/messages.py index b7ee49141..31ac126c4 100644 --- a/zaqar/transport/wsgi/v1_1/messages.py +++ b/zaqar/transport/wsgi/v1_1/messages.py @@ -297,7 +297,7 @@ class CollectionResource(object): class ItemResource(object): - __slots__ = ('_message_controller') + __slots__ = '_message_controller' def __init__(self, message_controller): self._message_controller = message_controller diff --git a/zaqar/transport/wsgi/v1_1/stats.py b/zaqar/transport/wsgi/v1_1/stats.py index 0e8c754c8..3fa8724e1 100644 --- a/zaqar/transport/wsgi/v1_1/stats.py +++ b/zaqar/transport/wsgi/v1_1/stats.py @@ -27,7 +27,7 @@ LOG = logging.getLogger(__name__) class Resource(object): - __slots__ = ('_queue_ctrl') + __slots__ = '_queue_ctrl' def __init__(self, queue_controller): self._queue_ctrl = queue_controller diff --git a/zaqar/transport/wsgi/v2_0/messages.py b/zaqar/transport/wsgi/v2_0/messages.py index b7ee49141..31ac126c4 100644 --- a/zaqar/transport/wsgi/v2_0/messages.py +++ b/zaqar/transport/wsgi/v2_0/messages.py @@ -297,7 +297,7 @@ class CollectionResource(object): class ItemResource(object): - __slots__ = ('_message_controller') + __slots__ = '_message_controller' def __init__(self, message_controller): self._message_controller = message_controller diff --git a/zaqar/transport/wsgi/v2_0/stats.py b/zaqar/transport/wsgi/v2_0/stats.py index 0e8c754c8..3fa8724e1 100644 --- a/zaqar/transport/wsgi/v2_0/stats.py +++ b/zaqar/transport/wsgi/v2_0/stats.py @@ -27,7 +27,7 @@ LOG = logging.getLogger(__name__) class Resource(object): - __slots__ = ('_queue_ctrl') + __slots__ = '_queue_ctrl' def __init__(self, queue_controller): self._queue_ctrl = queue_controller