Fixed magic.py duplicates bug; fixed binvis python3 bug.

src/binwalk/core/magic.py

@@ -754,8 +754,8 @@ class Magic(object):
                 # If this offset has already been matched to a previous signature, ignore it unless
                 # self.show_invalid has been specified. Also ignore obviously invalid offsets (<1)
                 # as well as those outside the specified self.data range (dlen).
-                #if (offset not in matched_offsets or self.show_invalid) and offset >= 0 and offset < dlen:
-                if offset >= 0 and offset < dlen:
+                if (offset not in matched_offsets or self.show_invalid) and offset >= 0 and offset < dlen:
+                #if offset >= 0 and offset < dlen:
                     # Analyze the data at this offset using the current signature rule
                     tags = self._analyze(signature, offset)
 

src/binwalk/modules/binvis.py

@@ -98,7 +98,7 @@ class Plotter(Module):
 
         # If the number of data points exceeds the maximum number of allowed data points, use a
         # weighting system to eliminate data points that occur less freqently.
-        if sum(data_points.itervalues()) > self.max_points:
+        if sum(data_points.values()) > self.max_points:
 
             # First, generate a set of weight values 1 - 10
             for i in range(1, 11):