diff options
| author | Monty Taylor <mordred@inaugust.com> | 2012-11-21 10:53:18 -0800 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2012-11-28 17:05:36 +0000 |
| commit | cf705c59615fb68cdbfe664e7827e4a275a4a282 (patch) | |
| tree | f7d8a2f674acb0d4df9339f77f3511a123f7a525 /openstack/common/rpc | |
| parent | f10b956dd5b88b048c582cadc3c22ec5360521c9 (diff) | |
| download | oslo-cf705c59615fb68cdbfe664e7827e4a275a4a282.tar.gz oslo-cf705c59615fb68cdbfe664e7827e4a275a4a282.tar.xz oslo-cf705c59615fb68cdbfe664e7827e4a275a4a282.zip | |
Make project pyflakes clean.
Added both a tox test-env for pyflakes and fixed the current pyflakes errors.
This did actually fix a couple of bugs.
The CI team has started using pyflakes on its projects and also has started
using oslo for things, so ignoring pyflakes warnings on the oslo code was
starting to get old. However, additionally, pyflakes is pretty solid, so we
should maybe consider gating on it across the board. (% locals() is the
biggest thing that we do that it doesn't like)
Change-Id: Iac1ca62db301892b7863711162fcbc74807eb24f
Diffstat (limited to 'openstack/common/rpc')
| -rw-r--r-- | openstack/common/rpc/amqp.py | 7 | ||||
| -rw-r--r-- | openstack/common/rpc/common.py | 4 | ||||
| -rw-r--r-- | openstack/common/rpc/matchmaker.py | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/openstack/common/rpc/amqp.py b/openstack/common/rpc/amqp.py index a3e567f..2ea506a 100644 --- a/openstack/common/rpc/amqp.py +++ b/openstack/common/rpc/amqp.py @@ -282,7 +282,7 @@ class ProxyCallback(object): ctxt.reply(rval, None, connection_pool=self.connection_pool) # This final None tells multicall that it is done. ctxt.reply(ending=True, connection_pool=self.connection_pool) - except Exception as e: + except Exception: LOG.exception('Exception during message handling') ctxt.reply(None, sys.exc_info(), connection_pool=self.connection_pool) @@ -407,8 +407,9 @@ def fanout_cast_to_server(conf, context, server_params, topic, msg, def notify(conf, context, topic, msg, connection_pool): """Sends a notification event on a topic.""" - event_type = msg.get('event_type') - LOG.debug(_('Sending %(event_type)s on %(topic)s'), locals()) + LOG.debug(_('Sending %(event_type)s on %(topic)s'), + dict(event_type=msg.get('event_type'), + topic=topic)) pack_context(msg, context) with ConnectionContext(conf, connection_pool) as conn: conn.notify_send(topic, msg) diff --git a/openstack/common/rpc/common.py b/openstack/common/rpc/common.py index a95fc66..c56c9a6 100644 --- a/openstack/common/rpc/common.py +++ b/openstack/common/rpc/common.py @@ -40,7 +40,7 @@ class RPCException(Exception): try: message = self.message % kwargs - except Exception as e: + except Exception: # kwargs doesn't match a variable in the message # log the issue and the kwargs LOG.exception(_('Exception in string format operation')) @@ -258,7 +258,7 @@ def deserialize_remote_exception(conf, data): # we cannot necessarily change an exception message so we must override # the __str__ method. failure.__class__ = new_ex_type - except TypeError as e: + except TypeError: # NOTE(ameade): If a core exception then just add the traceback to the # first exception argument. failure.args = (message,) + failure.args[1:] diff --git a/openstack/common/rpc/matchmaker.py b/openstack/common/rpc/matchmaker.py index 8ea78ba..c5cc64c 100644 --- a/openstack/common/rpc/matchmaker.py +++ b/openstack/common/rpc/matchmaker.py @@ -20,7 +20,7 @@ return keys for direct exchanges, per (approximate) AMQP parlance. import contextlib import itertools -import logging +import json from openstack.common import cfg from openstack.common import log as logging |