From df76a05c44a1f123edfa4e6a64e75bd8fcb9cd42 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Sun, 23 Nov 2014 23:42:19 +0000
Subject: [PATCH] Py3 compatibility fixes.

---
 salt/search/__init__.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/salt/search/__init__.py b/salt/search/__init__.py
index e56ce64de4..69875b37d5 100644
--- a/salt/search/__init__.py
+++ b/salt/search/__init__.py
@@ -2,15 +2,17 @@
 '''
 Set up the correct search system
 '''
-from __future__ import absolute_import
 
 # Import python libs
+from __future__ import absolute_import
 import os
 
 # Import salt libs
 import salt.minion
 import salt.loader
 import salt.utils
+
+# Import 3rd-party libs
 import salt.ext.six as six
 
 
@@ -76,7 +78,7 @@ def iter_roots(roots):
      'saltenv': <saltenv>,
      'cont': <contents>}
     '''
-    for saltenv, dirs in roots.items():
+    for saltenv, dirs in six.iteritems(roots):
         for dir_ in dirs:
             if not os.path.isdir(dir_):
                 continue