[Reproducible-commits] [debbindiff] 01/01: Fallback on binary comparison when text encoding is unknown

[Jérémy Bobbio]

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

lunar pushed a commit to branch master
in repository debbindiff.

commit bcbe4e2366509f101c3e58c8b1041d205ced3f95
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Sat Nov 15 18:39:53 2014 +0100

    Fallback on binary comparison when text encoding is unknown
---
 debbindiff/comparators/text.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/debbindiff/comparators/text.py b/debbindiff/comparators/text.py
index c037f98..8b6064f 100644
--- a/debbindiff/comparators/text.py
+++ b/debbindiff/comparators/text.py
@@ -18,12 +18,17 @@
 # along with debbindiff.  If not, see <http://www.gnu.org/licenses/>.
 
 import codecs
+from debbindiff.comparators.binary import compare_binary_files
 from debbindiff.difference import Difference
 
 
 def compare_text_files(path1, path2, encoding, source=None):
-    lines1 = codecs.open(path1, 'r', encoding=encoding).readlines()
-    lines2 = codecs.open(path2, 'r', encoding=encoding).readlines()
+    try:
+        lines1 = codecs.open(path1, 'r', encoding=encoding).readlines()
+        lines2 = codecs.open(path2, 'r', encoding=encoding).readlines()
+    except LookupError, e:
+        # unknown encoding
+        return compare_binary_files(path1, path2, source)
     if lines1 == lines2:
         return []
     return [Difference(lines1, lines2, path1, path2, source)]

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