Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed unknown 'exceptions' under Python3 (#49152) #49162

Merged
merged 4 commits into from Aug 17, 2018
Merged

Fixed unknown 'exceptions' under Python3 (#49152) #49162

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
20f134e
Fixed unknown 'exceptions' under Python3 (#49152)
erwindon Aug 16, 2018
ec1f013
Improved solution as per @dwoz's suggestion
erwindon Aug 17, 2018
4335c5c
Must have 2 lines between imports and code
erwindon Aug 17, 2018
ca5df04
Merge branch '2017.7' into wheel_error_error
Aug 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 3 additions & 6 deletions salt/utils/error.py
View file
Open in desktop
Expand Up @@ -5,16 +5,13 @@
'''
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=''):
'''
Expand Down