mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Improved solution as per @dwoz's suggestion
This commit is contained in:
parent
20f134edea
commit
ec1f013573
1 changed files with 2 additions and 10 deletions
|
@ -5,20 +5,12 @@ Utilities to enable exception reraising across the master commands
|
|||
'''
|
||||
from __future__ import absolute_import
|
||||
|
||||
import sys
|
||||
# True if we are running on Python 3.
|
||||
PY3 = sys.version_info[0] == 3
|
||||
|
||||
if PY3:
|
||||
import builtins
|
||||
exceptions = builtins
|
||||
else:
|
||||
import exceptions
|
||||
|
||||
# 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=''):
|
||||
'''
|
||||
|
|
Loading…
Add table
Reference in a new issue