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

Clean up exception handling on py3

Browse source
This commit is contained in:
Daniel A. Wozniak 2018-08-29 14:45:17 -07:00
parent 5746fc80c2
commit d74fab7703
No known key found for this signature in database
GPG key ID: 166B9D2C06C82D61
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/modules/win_system.py
View file

@ -303,7 +303,7 @@ def shutdown(message=None, timeout=5, force_close=True, reboot=False, # pylint:
force_close, reboot)
return True
except pywintypes.error as exc:
(number, context, message) = exc
(number, context, message) = exc.args
log.error('Failed to shutdown the system')
log.error('nbr: {0}'.format(number))
log.error('ctx: {0}'.format(context))
@ -346,7 +346,7 @@ def shutdown_abort():
win32api.AbortSystemShutdown('127.0.0.1')
return True
except pywintypes.error as exc:
(number, context, message) = exc
(number, context, message) = exc.args
log.error('Failed to abort system shutdown')
log.error('nbr: {0}'.format(number))
log.error('ctx: {0}'.format(context))
@ -485,7 +485,7 @@ def set_computer_desc(desc=None):
try:
win32net.NetServerSetInfo(None, 101, system_info)
except win32net.error as exc:
(number, context, message) = exc
(number, context, message) = exc.args
log.error('Failed to update system')
log.error('nbr: {0}'.format(number))
log.error('ctx: {0}'.format(context))
@ -1016,7 +1016,7 @@ def set_system_date_time(years=None,
try:
date_time = win32api.GetLocalTime()
except win32api.error as exc:
(number, context, message) = exc
(number, context, message) = exc.args
log.error('Failed to get local time')
log.error('nbr: {0}'.format(number))
log.error('ctx: {0}'.format(context))

6
salt/modules/win_useradd.py
View file

@ -164,7 +164,6 @@ def add(name,
try:
win32net.NetUserAdd(None, 1, user_info)
except win32net.error as exc:
(number, context, message) = exc
log.error('Failed to create user {0}'.format(name))
log.error('nbr: {0}'.format(exc.winerror))
log.error('ctx: {0}'.format(exc.funcname))
@ -266,7 +265,6 @@ def update(name,
try:
user_info = win32net.NetUserGetInfo(None, name, 4)
except win32net.error as exc:
(number, context, message) = exc
log.error('Failed to update user {0}'.format(name))
log.error('nbr: {0}'.format(exc.winerror))
log.error('ctx: {0}'.format(exc.funcname))
@ -326,7 +324,6 @@ def update(name,
try:
win32net.NetUserSetInfo(None, name, 4, user_info)
except win32net.error as exc:
(number, context, message) = exc
log.error('Failed to update user {0}'.format(name))
log.error('nbr: {0}'.format(exc.winerror))
log.error('ctx: {0}'.format(exc.funcname))
@ -415,7 +412,7 @@ def delete(name,
sid = getUserSid(name)
win32profile.DeleteProfile(sid)
except pywintypes.error as exc:
(number, context, message) = exc
(number, context, message) = exc.args
if number == 2: # Profile Folder Not Found
pass
else:
@ -429,7 +426,6 @@ def delete(name,
try:
win32net.NetUserDel(None, name)
except win32net.error as exc:
(number, context, message) = exc
log.error('Failed to delete user {0}'.format(name))
log.error('nbr: {0}'.format(exc.winerror))
log.error('ctx: {0}'.format(exc.funcname))