saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixup #33875

Browse source
This commit is contained in:
Mike Place 2016-07-27 13:17:57 -06:00 • committed by rallytime
parent 56b1f6c651
commit f9fd6ddd8a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/fileserver/__init__.py
View file

@ -202,7 +202,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

2
tests/unit/fileserver/map.py
View file

@ -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