mirror of
https://github.com/saltstack/salt.git
synced 2025-04-16 09:40:20 +00:00
Revert changes to win_network.py salt util
This commit is contained in:
parent
56ac3a0fac
commit
81293265c1
1 changed files with 3 additions and 11 deletions
|
@ -52,17 +52,9 @@ if IS_WINDOWS:
|
|||
|
||||
import salt.utils.winapi
|
||||
else:
|
||||
try:
|
||||
# This uses .NET to get network settings and is faster than WMI
|
||||
import clr
|
||||
from System.Net import NetworkInformation
|
||||
except ImportError:
|
||||
# Just in case clr input fails for some reason
|
||||
import wmi
|
||||
|
||||
import salt.utils.winapi
|
||||
|
||||
USE_WMI = True
|
||||
# This uses .NET to get network settings and is faster than WMI
|
||||
import clr
|
||||
from System.Net import NetworkInformation
|
||||
|
||||
# TODO: Should we deprecate support for pythonnet 2.5.2, these enumerations can
|
||||
# TODO: be deleted
|
||||
|
|
Loading…
Add table
Reference in a new issue