Merge pull request #24 from fenelon/master

Fix #23 fixes ValueError for hashes being deleted while running

Author: misterion

CHANGES

@@ -1,5 +1,10 @@
 ChangeLog for RMA
 --------------------
+- 0.1.14
+
+   * Fix fails with ValueError if a key containing Hash was removed.
+     Closes issue #23.
+
 - 0.1.13
 
    * Fix fails with TypeError if a key containing integer was removed.

rma/__pkginfo__.py

@@ -1,4 +1,4 @@
-num_version = (0, 1, 13)
+num_version = (0, 1, 14)
 version = '.'.join([str(num) for num in num_version])
 
 classifiers = [

rma/rule/Hash.py

@@ -57,7 +57,9 @@ def __init__(self, all_obj, total):
         self.fieldUsedBytes = sum(obj.fieldUsedBytes for obj in g1)
         self.fieldAlignedBytes = sum(obj.fieldAlignedBytes for obj in g2)
 
-        if total > 1:
+        if total == 0:
+            self.fieldAvgCount = 0
+        elif total > 1:
             self.fieldAvgCount = statistics.mean(obj.count for obj in g3)
         else:
             self.fieldAvgCount = min((obj.count for obj in g3))
@@ -101,7 +103,7 @@ def analyze(self, keys, total=0):
                 agg.fieldAvgCount,
                 agg.fieldUsedBytes,
                 agg.fieldAlignedBytes,
-                agg.fieldAlignedBytes / agg.fieldUsedBytes,
+                agg.fieldAlignedBytes / (agg.fieldUsedBytes if agg.fieldUsedBytes > 0 else 1),
                 agg.valueUsedBytes,
                 agg.valueAlignedBytes,
                 agg.valueAlignedBytes / (agg.valueUsedBytes if agg.valueUsedBytes > 0 else 1),

rma/rule/KeyString.py

@@ -49,6 +49,9 @@ def analyze(self, keys, total=0):
                     progress_iterator((StringEntry(value=x["name"]) for x in data), progress), 3)
 
             total_elements = len(data)
+            if total_elements == 0:
+                continue
+
             aligned = sum(obj.aligned for obj in aligned_iter)
             used_bytes_generator = (obj.useful_bytes for obj in used_bytes_iter)
             useful_iter, min_iter, max_iter, mean_iter = tee(used_bytes_generator, 4)