From d5f2152dcfc4039de8324bdf75f6a2cd844dbdd0 Mon Sep 17 00:00:00 2001 From: Yaguang Tang Date: Sat, 30 Jun 2012 02:13:05 +0800 Subject: fix bug lp:1019348,update openstack-common to support pep8 1.3. also,this patch turns off pep8 E125 check. Change-Id: I22d2a94d89530586d614af39af17ae542c5e0cbf --- openstack/common/notifier/api.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'openstack/common/notifier/api.py') diff --git a/openstack/common/notifier/api.py b/openstack/common/notifier/api.py index f01d11e..e699620 100644 --- a/openstack/common/notifier/api.py +++ b/openstack/common/notifier/api.py @@ -37,7 +37,7 @@ notifier_opts = [ cfg.StrOpt('default_publisher_id', default='$host', help='Default publisher_id for outgoing notifications'), - ] +] CONF = cfg.CONF CONF.register_opts(notifier_opts) @@ -122,21 +122,21 @@ def notify(context, publisher_id, event_type, priority, payload): """ if priority not in log_levels: raise BadPriorityException( - _('%s not in valid priorities') % priority) + _('%s not in valid priorities') % priority) # Ensure everything is JSON serializable. payload = jsonutils.to_primitive(payload, convert_instances=True) driver = importutils.import_module(CONF.notification_driver) msg = dict(message_id=str(uuid.uuid4()), - publisher_id=publisher_id, - event_type=event_type, - priority=priority, - payload=payload, - timestamp=str(timeutils.utcnow())) + publisher_id=publisher_id, + event_type=event_type, + priority=priority, + payload=payload, + timestamp=str(timeutils.utcnow())) try: driver.notify(context, msg) except Exception, e: LOG.exception(_("Problem '%(e)s' attempting to " "send to notification system. Payload=%(payload)s") % - locals()) + locals()) -- cgit