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/notifier | |
| 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/notifier')
| -rw-r--r-- | openstack/common/notifier/api.py | 7 | ||||
| -rw-r--r-- | openstack/common/notifier/rpc_notifier.py | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/openstack/common/notifier/api.py b/openstack/common/notifier/api.py index 470eacb..5714306 100644 --- a/openstack/common/notifier/api.py +++ b/openstack/common/notifier/api.py @@ -137,10 +137,11 @@ def notify(context, publisher_id, event_type, priority, payload): for driver in _get_drivers(): try: driver.notify(context, msg) - except Exception, e: + except Exception as e: LOG.exception(_("Problem '%(e)s' attempting to " "send to notification system. " - "Payload=%(payload)s") % locals()) + "Payload=%(payload)s") + % dict(e=e, payload=payload)) _drivers = None @@ -166,7 +167,7 @@ def add_driver(notification_driver): try: driver = importutils.import_module(notification_driver) _drivers[notification_driver] = driver - except ImportError as e: + except ImportError: LOG.exception(_("Failed to load notifier %s. " "These notifications will not be sent.") % notification_driver) diff --git a/openstack/common/notifier/rpc_notifier.py b/openstack/common/notifier/rpc_notifier.py index 604af86..7e25f47 100644 --- a/openstack/common/notifier/rpc_notifier.py +++ b/openstack/common/notifier/rpc_notifier.py @@ -41,6 +41,6 @@ def notify(context, message): topic = '%s.%s' % (topic, priority) try: rpc.notify(context, topic, message) - except Exception, e: + except Exception: LOG.exception(_("Could not send notification to %(topic)s. " "Payload=%(message)s"), locals()) |