[Reproducible-commits] [debbindiff] 02/06: Specify string format arguments as logging function parameters
Chris Lamb
lamby at moszumanska.debian.org
Tue Feb 3 11:57:09 UTC 2015
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository debbindiff.
commit 0a5219ee490721442f6c35d21f9978bb05595156
Author: Chris Lamb <lamby at debian.org>
Date: Tue Feb 3 11:53:09 2015 +0000
Specify string format arguments as logging function parameters
---
debbindiff/changes.py | 7 +++----
debbindiff/comparators/__init__.py | 8 ++++----
debbindiff/comparators/changes.py | 2 +-
debbindiff/comparators/deb.py | 6 +++---
debbindiff/comparators/tar.py | 6 +++---
debbindiff/comparators/zip.py | 2 +-
debbindiff/presenters/html.py | 2 +-
7 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/debbindiff/changes.py b/debbindiff/changes.py
index d9f3577..629b337 100644
--- a/debbindiff/changes.py
+++ b/debbindiff/changes.py
@@ -298,7 +298,7 @@ class Changes(object):
* md5
* md5sum
"""
- logger.debug("validating %s checksums" % (check_hash))
+ logger.debug("validating %s checksums", check_hash)
for filename in self.get_files():
if check_hash == "sha1":
@@ -338,6 +338,5 @@ class Changes(object):
changed_files[field_name]
))
else:
- logger.debug("%s Checksum for file %s matches" % (
- field_name, filename
- ))
+ logger.debug("%s Checksum for file %s matches",
+ field_name, filename)
diff --git a/debbindiff/comparators/__init__.py b/debbindiff/comparators/__init__.py
index 7770a71..1228cb6 100644
--- a/debbindiff/comparators/__init__.py
+++ b/debbindiff/comparators/__init__.py
@@ -49,10 +49,10 @@ def guess_mime_type(path):
def compare_unknown(path1, path2, source=None):
- logger.debug("compare unknown path: %s and %s" % (path1, path2))
+ logger.debug("compare unknown path: %s and %s", path1, path2)
mime_type1 = guess_mime_type(path1)
mime_type2 = guess_mime_type(path2)
- logger.debug("mime_type1: %s | mime_type2: %s" % (mime_type1, mime_type2))
+ logger.debug("mime_type1: %s | mime_type2: %s", mime_type1, mime_type2)
if mime_type1.startswith('text/') and mime_type2.startswith('text/'):
encodings1 = re.findall(r'; charset=([^ ]+)', mime_type1)
encodings2 = re.findall(r'; charset=([^ ]+)', mime_type2)
@@ -92,10 +92,10 @@ SMALL_FILE_THRESHOLD = 65536 # 64 kiB
def compare_files(path1, path2, source=None):
if not os.path.isfile(path1):
- logger.critical("%s is not a file" % path1)
+ logger.critical("%s is not a file", path1)
sys.exit(2)
if not os.path.isfile(path2):
- logger.critical("%s is not a file" % path2)
+ logger.critical("%s is not a file", path2)
sys.exit(2)
# try comparing small files directly first
size1 = os.path.getsize(path1)
diff --git a/debbindiff/comparators/changes.py b/debbindiff/comparators/changes.py
index 2694482..ef9ca8c 100644
--- a/debbindiff/comparators/changes.py
+++ b/debbindiff/comparators/changes.py
@@ -76,7 +76,7 @@ def compare_changes_files(path1, path2, source=None):
d2 = files2[filename]
if d1['md5sum'] != d2['md5sum']:
logger.debug("%s mentioned in .changes have "
- "differences" % filename)
+ "differences", filename)
files_difference.add_details(
debbindiff.comparators.compare_files(
dot_changes1.get_path(filename),
diff --git a/debbindiff/comparators/deb.py b/debbindiff/comparators/deb.py
index 1ebf063..229c5ab 100644
--- a/debbindiff/comparators/deb.py
+++ b/debbindiff/comparators/deb.py
@@ -34,11 +34,11 @@ def compare_deb_files(path1, path2, source=None):
ar2 = ArFile(filename=path2)
with make_temp_directory() as temp_dir1:
with make_temp_directory() as temp_dir2:
- logger.debug('content1 %s' % (ar1.getnames(),))
- logger.debug('content2 %s' % (ar2.getnames(),))
+ logger.debug('content1 %s', ar1.getnames())
+ logger.debug('content2 %s', ar2.getnames())
for name in sorted(set(ar1.getnames())
.intersection(ar2.getnames())):
- logger.debug('extract member %s' % (name,))
+ logger.debug('extract member %s', name)
member1 = ar1.getmember(name)
member2 = ar2.getmember(name)
in_path1 = os.path.join(temp_dir1, name)
diff --git a/debbindiff/comparators/tar.py b/debbindiff/comparators/tar.py
index 718a35f..4a009b8 100644
--- a/debbindiff/comparators/tar.py
+++ b/debbindiff/comparators/tar.py
@@ -46,15 +46,15 @@ def compare_tar_files(path1, path2, source=None):
# look up differences in content
with make_temp_directory() as temp_dir1:
with make_temp_directory() as temp_dir2:
- logger.debug('content1 %s' % (tar1.getnames(),))
- logger.debug('content2 %s' % (tar2.getnames(),))
+ logger.debug('content1 %s', tar1.getnames())
+ logger.debug('content2 %s', tar2.getnames())
for name in sorted(set(tar1.getnames())
.intersection(tar2.getnames())):
member1 = tar1.getmember(name)
member2 = tar2.getmember(name)
if not member1.isfile() or not member2.isfile():
continue
- logger.debug('extract member %s' % (name,))
+ logger.debug('extract member %s', name)
tar1.extract(name, temp_dir1)
tar2.extract(name, temp_dir2)
in_path1 = os.path.join(temp_dir1, name)
diff --git a/debbindiff/comparators/zip.py b/debbindiff/comparators/zip.py
index 78da265..25268ab 100644
--- a/debbindiff/comparators/zip.py
+++ b/debbindiff/comparators/zip.py
@@ -50,7 +50,7 @@ def compare_zip_files(path1, path2, source=None):
# skip directories
if name.endswith('/'):
continue
- logger.debug('extract member %s' % (name,))
+ logger.debug('extract member %s', name)
zip1.extract(name, temp_dir1)
zip2.extract(name, temp_dir2)
in_path1 = os.path.join(temp_dir1, name)
diff --git a/debbindiff/presenters/html.py b/debbindiff/presenters/html.py
index 9be5dc2..e508edb 100644
--- a/debbindiff/presenters/html.py
+++ b/debbindiff/presenters/html.py
@@ -215,7 +215,7 @@ def create_diff(lines1, lines2):
def output_difference(difference, print_func):
- logger.debug('html output for %s' % (difference.source1,))
+ logger.debug('html output for %s', difference.source1)
print_func("<div class='difference'>")
try:
if difference.source1 == difference.source2:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/debbindiff.git
More information about the Reproducible-commits
mailing list