Merge pull request #34999 from cachedout/fixup_33875

Fixup #33875

salt/fileserver/__init__.py

@@ -204,7 +204,7 @@ def diff_mtime_map(map1, map2):
 
     # map1 and map2 are guaranteed to have same keys,
     # so compare mtimes
-    for filename, mtime in map1.iteritems():
+    for filename, mtime in six.iteritems(map1):
         if map2[filename] != mtime:
             return True
 

tests/unit/fileserver/map.py

@@ -3,7 +3,7 @@
     :codeauthor: :email:`Joao Mesquita <jmesquita@sangoma.com>`
 '''
 
-# Import pytohn libs
+# Import Python libs
 from __future__ import absolute_import
 
 # Import Salt Testing libs