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.

Sign up for GitHub

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

Clean up exception handling on py3 #49434

Merged
merged 2 commits into from
Aug 30, 2018
Merged

Clean up exception handling on py3 #49434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d74fab7
Clean up exception handling on py3
dwoz Aug 29, 2018
9daa992
Fix group remove test logic
dwoz Aug 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions salt/modules/win_system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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))
Expand Down
6 changes: 1 addition & 5 deletions salt/modules/win_useradd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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:
Expand All @@ -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))
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/modules/test_useradd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,8 @@ def test_user_removegroup(self):
self._add_group()
self.run_function('user.addgroup', [self.user_name, self.group_name])
self.assertIn(self.group_name, self.run_function('user.list_groups', [self.user_name]))
self.run_function('user.removegroup', [self.group_name])
self.assertIn(self.group_name, self.run_function('user.list_groups', [self.user_name]))
self.run_function('user.removegroup', [self.user_name, self.group_name])
self.assertNotIn(self.group_name, self.run_function('user.list_groups', [self.user_name]))

def test_user_rename(self):
'''
Expand Down