[Reproducible-commits] [diffoscope] 02/11: Remove Python 2 specific code from diffoscope.comparators.__init__

[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 diffoscope.

commit 5aee5b316d363c92898b82f72aded6d25d226c59
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Tue Sep 22 23:30:55 2015 +0200

    Remove Python 2 specific code from diffoscope.comparators.__init__
---
 diffoscope/comparators/__init__.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/diffoscope/comparators/__init__.py b/diffoscope/comparators/__init__.py
index 29292b0..46d1481 100644
--- a/diffoscope/comparators/__init__.py
+++ b/diffoscope/comparators/__init__.py
@@ -51,9 +51,7 @@ from diffoscope.comparators.ppu import DotPpuFile
 try:
     from diffoscope.comparators.rpm import RpmFile
 except ImportError as ex:
-    if hasattr(ex, 'message') and ex.message != 'No module named rpm': # Python 2
-        raise
-    if hasattr(ex, 'msg') and ex.msg != "No module named 'rpm'": # Python 3
+    if hasattr(ex, 'msg') and ex.msg != "No module named 'rpm'":
         raise
     from diffoscope.comparators.rpm_fallback import RpmFile
 from diffoscope.comparators.sqlite import Sqlite3Database

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