Skip to content

Commit

Permalink
Python 3 compat
Browse files Browse the repository at this point in the history
  • Loading branch information
basepi committed Jun 9, 2015
1 parent 94d6ef1 commit 52a694b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion salt/modules/dockerio.py
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,7 @@ def create_container(image,
}
__salt__['mine.send']('docker.get_containers', host=True)
return callback(status, id_=container, comment=comment, out=out)
except Exception, e:
except Exception as e:
_invalid(status, id_=image, out=traceback.format_exc())
raise e
__salt__['mine.send']('docker.get_containers', host=True)
Expand Down
2 changes: 1 addition & 1 deletion salt/modules/pacman.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ def list_upgrades(refresh=False):
out = call['stdout']

output = iter(out.splitlines())
output.next() # Skip informational output line
next(output) # Skip informational output line
for line in output:
comps = line.split(' ')
if len(comps) < 2:
Expand Down

0 comments on commit 52a694b

Please sign in to comment.