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

Merge pull request #49162 from erwindon/wheel_error_error

Browse source 
Fixed unknown 'exceptions' under Python3 (#49152)
This commit is contained in:
Daniel Wozniak 2018-08-17 10:37:17 -07:00 • committed by GitHub
commit 7486fd5447
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/utils/error.py
View file

@ -5,16 +5,13 @@ Utilities to enable exception reraising across the master commands
'''
from __future__ import absolute_import
# Import python libs
try:
import exceptions
except ImportError:
pass
# Import salt libs
import salt.exceptions
import salt.utils.event
# Import 3rd-party libs
from salt.ext.six.moves import builtins as exceptions
def raise_error(name=None, args=None, message=''):
'''