From d5308797d85814b89d30af90c0d7f5bdbcebcc62 Mon Sep 17 00:00:00 2001 From: Thomas NOEL Date: Wed, 6 Jun 2018 14:18:37 +0200 Subject: [PATCH] logs: use , instead of % (#24245) --- wcs/wf/wscall.py | 8 +++----- wcs/workflows.py | 6 ++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/wcs/wf/wscall.py b/wcs/wf/wscall.py index 111474c4..eee12165 100644 --- a/wcs/wf/wscall.py +++ b/wcs/wf/wscall.py @@ -395,7 +395,7 @@ class WebserviceCallStatusItem(WorkflowStatusItem): self.parent.parent.get_status(action) except KeyError: try: - raise IndexError('reference to invalid status %s in workflow %s, status %s' % ( + raise IndexError('reference to invalid status %r in workflow %r, status %r' % ( action, self.parent.parent.name, self.parent.name)) except IndexError as e: get_publisher().notify_of_exception(sys.exc_info(), context='[WSCALL]') @@ -416,10 +416,8 @@ class WebserviceCallStatusItem(WorkflowStatusItem): target = self.parent.parent.get_status(value) except KeyError: get_publisher().get_app_logger().error( - 'reference to invalid status in workflow %s, status %s, item %s' % ( - self.parent.parent.name, - self.parent.name, - self.description)) + 'reference to invalid status in workflow %s, status %s, item %s', + self.parent.parent.name, self.parent.name, self.description) continue targets.append(target) return targets diff --git a/wcs/workflows.py b/wcs/workflows.py index 266932bf..20913368 100644 --- a/wcs/workflows.py +++ b/wcs/workflows.py @@ -1727,10 +1727,8 @@ class WorkflowStatusItem(XmlSerialisable): targets = [x for x in self.parent.parent.possible_status if x.id == self.status] if not targets: get_publisher().get_app_logger().error( - 'reference to invalid status in workflow %s, status %s, item %s' % ( - self.parent.parent.name, - self.parent.name, - self.description)) + 'reference to invalid status in workflow %s, status %s, item %s', + self.parent.parent.name, self.parent.name, self.description) return targets def get_jump_label(self): -- 2.17.1