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

Merge pull request #40123 from twangboy/win_fix_network

Browse source 
Adds support for inet_pton in Windows to network util
This commit is contained in:
Erik Johnson 2017-03-20 11:25:46 -05:00 • committed by GitHub
commit 28e4fc17b6
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/utils/network.py
View file

@ -25,6 +25,10 @@ except ImportError:
import salt.utils
from salt._compat import subprocess, ipaddress
# inet_pton does not exist in Windows, this is a workaround
if salt.utils.is_windows():
from salt.ext import win_inet_pton # pylint: disable=unused-import
log = logging.getLogger(__name__)
# pylint: disable=C0103