From 853b69e6c464a39f7fd2d3971595e727183ce153 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Tue, 14 Aug 2012 05:20:08 +0000 Subject: [PATCH] Fix visual indentation for PEP8 conformance. Corrects misindented continuations (PEP8 E127, E128). The run_tests.sh script's PEP8 pass (with current 1.3.3) was reporting under- or over-indented visual continuations in a handful of files, all of which are fixed with this trivial patch. Change-Id: I19388dc0011546abe65b37d31df02debb3676003 --- quantum/openstack/common/notifier/api.py | 7 ++++--- quantum/openstack/common/policy.py | 2 +- quantum/openstack/common/timeutils.py | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/quantum/openstack/common/notifier/api.py b/quantum/openstack/common/notifier/api.py index cd3ce1e1b0..36934062c0 100644 --- a/quantum/openstack/common/notifier/api.py +++ b/quantum/openstack/common/notifier/api.py @@ -140,8 +140,9 @@ def notify(context, publisher_id, event_type, priority, payload): driver.notify(context, msg) except Exception, e: LOG.exception(_("Problem '%(e)s' attempting to " - "send to notification system. Payload=%(payload)s") % - locals()) + "send to notification system. " + "Payload=%(payload)s") % + locals()) _drivers = None @@ -170,7 +171,7 @@ def add_driver(notification_driver): except ImportError as e: LOG.exception(_("Failed to load notifier %s. " "These notifications will not be sent.") % - notification_driver) + notification_driver) else: # Driver is already loaded; just add the object. _drivers[notification_driver] = notification_driver diff --git a/quantum/openstack/common/policy.py b/quantum/openstack/common/policy.py index 910a8366e8..3eb5c526c6 100644 --- a/quantum/openstack/common/policy.py +++ b/quantum/openstack/common/policy.py @@ -173,7 +173,7 @@ class Brain(object): LOG.warning(_("Inheritance-based rules are deprecated; update " "_check_%s") % match_kind) func = (lambda brain, kind, value, target, cred: - old_func(value, target, cred)) + old_func(value, target, cred)) if not func: LOG.error(_("No handler for matches of kind %s") % match_kind) diff --git a/quantum/openstack/common/timeutils.py b/quantum/openstack/common/timeutils.py index ae300e456d..67327478a9 100644 --- a/quantum/openstack/common/timeutils.py +++ b/quantum/openstack/common/timeutils.py @@ -122,5 +122,6 @@ def marshall_now(now=None): def unmarshall_time(tyme): """Unmarshall a datetime dict.""" return datetime.datetime(day=tyme['day'], month=tyme['month'], - year=tyme['year'], hour=tyme['hour'], minute=tyme['minute'], - second=tyme['second'], microsecond=tyme['microsecond']) + year=tyme['year'], hour=tyme['hour'], + minute=tyme['minute'], second=tyme['second'], + microsecond=tyme['microsecond'])