From: Jason Ish <ish@unx.ca>
Date: Wed, 21 Mar 2018 22:41:58 +0000 (-0600)
Subject: python3 fix: don't use itervalues
X-Git-Tag: 1.0.0rc1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57cc34ecd4d7ae806e8a6643b8a8f9b61630d05b;p=thirdparty%2Fsuricata-update.git

python3 fix: don't use itervalues
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fc4df2..989e906 100644
--- 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 b74a27e..e4fff0a 100644
--- 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"]):