[Reproducible-commits] [debbindiff] 01/02: Specify correct parameter name for text comparator

Reiner Herrmann deki-guest at moszumanska.debian.org
Mon May 11 18:16:28 UTC 2015


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

deki-guest pushed a commit to branch master
in repository debbindiff.

commit ce2cad9c21abf1303b71414570dab75378ebac23
Author: Reiner Herrmann <reiner at reiner-h.de>
Date:   Mon May 11 20:12:35 2015 +0200

    Specify correct parameter name for text comparator
    
    And also add default value to encoding parameter, if
    none was specified.
    
    Closes: #784891
---
 debbindiff/comparators/__init__.py | 2 +-
 debbindiff/comparators/text.py     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debbindiff/comparators/__init__.py b/debbindiff/comparators/__init__.py
index cd9e09f..2e48ce2 100644
--- a/debbindiff/comparators/__init__.py
+++ b/debbindiff/comparators/__init__.py
@@ -125,7 +125,7 @@ def compare_files(path1, path2, source=None):
     for mime_type_regex, filename_regex, comparator in COMPARATORS:
         if filename_regex and re.search(filename_regex, path1) \
            and re.search(filename_regex, path2):
-            return comparator(path1, path2, source)
+            return comparator(path1, path2, source=source)
         if mime_type_regex:
             match1 = re.search(mime_type_regex, mime_type1)
             match2 = re.search(mime_type_regex, mime_type2)
diff --git a/debbindiff/comparators/text.py b/debbindiff/comparators/text.py
index 985deb4..ca73ba2 100644
--- a/debbindiff/comparators/text.py
+++ b/debbindiff/comparators/text.py
@@ -22,7 +22,7 @@ from debbindiff.comparators.binary import compare_binary_files
 from debbindiff.difference import Difference
 
 
-def compare_text_files(path1, path2, encoding, source=None):
+def compare_text_files(path1, path2, encoding=None, source=None):
     if encoding is None:
         encoding = 'utf-8'
     try:

-- 
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