[Reproducible-commits] [diffoscope] 05/21: Simplify dict comparison by using viewkeys()

Jérémy Bobbio lunar at moszumanska.debian.org
Mon Sep 21 17:39:27 UTC 2015


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

lunar pushed a commit to branch master
in repository diffoscope.

commit ed82eb612d0d334c463b261bcc9f4bd209796d9d
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Fri Sep 18 16:08:56 2015 +0200

    Simplify dict comparison by using viewkeys()
    
    The dict method viewkeys(), better known as keys() in Python 3, actually
    behave like a set. This is great because we want sets to compute intersections
    and differences. So let's just use that instead of extracting the key and
    putting them in a set.
---
 diffoscope/comparators/utils.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/diffoscope/comparators/utils.py b/diffoscope/comparators/utils.py
index cf5dd02..d339aed 100644
--- a/diffoscope/comparators/utils.py
+++ b/diffoscope/comparators/utils.py
@@ -179,16 +179,16 @@ class Container(object):
     def comparisons(self, other):
         my_members = self.get_members()
         other_members = other.get_members()
-        for name in sorted(set(my_members.iterkeys()).intersection(set(other_members.iterkeys()))):
+        for name in sorted(my_members.viewkeys() & other_members.viewkeys()):
             yield my_members.pop(name), other_members.pop(name), NO_COMMENT
         for my_name, other_name, score in diffoscope.comparators.perform_fuzzy_matching(my_members, other_members):
             comment = 'Files similar despite different names (difference score: %d)' % score
             yield my_members.pop(my_name), other_members.pop(other_name), comment
         if Config.general.new_file:
-            for my_name in set(my_members.iterkeys()) - set(other_members.iterkeys()):
+            for my_name in my_members.viewkeys() - other_members.viewkeys():
                 my_file = my_members[my_name]
                 yield my_file, NonExistingFile('/dev/null', my_file), NO_COMMENT
-            for other_name in set(other_members.iterkeys()) - set(my_members.iterkeys()):
+            for other_name in other_members.viewkeys() - my_members.viewkeys():
                 other_file = other_members[other_name]
                 yield NonExistingFile('/dev/null', other_file), other_file, NO_COMMENT
 

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



More information about the Reproducible-commits mailing list