python3 fix: don't use itervalues

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fc4df2fb820c952fbc1cebbb8a643fd3f850a3f..989e9066b018c86cdce128121621deba89c0abb9 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## unreleased
+
+- Python 3 fixes.
+
 ## 1.0.0b1 - 2018-01-19
 - Various fixes for Python 3.
 - Allow the default state directory of /var/lib/suricata to be changed

diff --git a/suricata/update/main.py b/suricata/update/main.py
index b74a27e7855a8087c6d22cf0077312a11ba2ac2a..e4fff0a73d39614d369dc0eb56f2b577b397a620 100644 (file)
--- a/suricata/update/main.py
+++ b/suricata/update/main.py
@@ -795,7 +795,8 @@ def check_vars(suriconf, rulemap):
         # Can't continue without a valid Suricata configuration
         # object.
         return
-    for rule in rulemap.itervalues():
+    for rule_id in rulemap:
+        rule = rulemap[rule_id]
         disable = False
         for var in suricata.update.rule.parse_var_names(
                 rule["source_addr"]):