[misc] 05/05: Avoid unnecesary % interpolation - we are doing a format(..) anyway

[Chris Lamb]

This is an automated email from the git hooks/post-receive script.

lamby pushed a commit to branch master
in repository misc.

commit 1bce5364fde97508d180e23a93c68c4c40de17da
Author: Chris Lamb <lamby at debian.org>
Date:   Sun Aug 28 00:57:59 2016 +0100

    Avoid unnecesary % interpolation - we are doing a format(..) anyway
---
 reports/bin/generate-draft | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/reports/bin/generate-draft b/reports/bin/generate-draft
index 579c631..476bb97 100755
--- a/reports/bin/generate-draft
+++ b/reports/bin/generate-draft
@@ -53,7 +53,7 @@ def sibling_repo_gitdir(path):
 
 def ensure_dir(path):
     if not os.path.isdir(path):
-        raise ValueError("not a directory: %s" % path)
+        raise ValueError("not a directory: {}".format(path))
 
 def get_data(week, max_age=3600):
     filename = '/tmp/generate-draft-{}.pickle'.format(week)
@@ -140,12 +140,12 @@ def bugs(week_start, week_end, extra="true"):
         AND
             {extra}
         AND
-            CAST(arrival AS DATE) BETWEEN to_timestamp({week_start}) AND to_timestamp({week_end})
+            CAST(arrival AS DATE) BETWEEN to_timestamp(@{week_start}) AND to_timestamp(@{week_end})
     """.format(**{
         'fields': ', '.join(fields),
         'extra': extra,
-        'week_start': '@%s' % week_start,
-        'week_end': '@%s ' % week_end,
+        'week_start': week_start,
+        'week_end': week_end,
     })
 
     result = {}
@@ -172,14 +172,14 @@ def get_uploads(week_start, week_end):
         WHERE
             source IN ({sources})
         AND
-            CAST(date AS date) BETWEEN to_timestamp({week_start}) AND to_timestamp({week_end})
+            CAST(date AS date) BETWEEN to_timestamp(@{week_start}) AND to_timestamp(@{week_end})
         ORDER BY
             date
     """.format(**{
         'fields': ', '.join(fields),
         'sources': ', '.join("'{}'".format(x) for x in PROJECTS),
-        'week_start': '@%s' % week_start,
-        'week_end': '@%s' % week_end,
+        'week_start': week_start,
+        'week_end': week_end,
     }), fields)
 
     result = {}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/misc.git