From 8ae052fbb07d7506492b430579308e4611e51754 Mon Sep 17 00:00:00 2001 From: Jochen Breuer Date: Sun, 22 Apr 2018 23:11:11 +0200 Subject: [PATCH] Fixed usage of ipaddress ipaddress is imported either directly or from salt.ext. If we use it, we shouldn't address it with salt.ext.ipaddress. --- salt/modules/network.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/modules/network.py b/salt/modules/network.py index f188fd7954..92893572a6 100644 --- a/salt/modules/network.py +++ b/salt/modules/network.py @@ -1140,7 +1140,7 @@ def convert_cidr(cidr): ret = {'network': None, 'netmask': None} cidr = calc_net(cidr) - network_info = salt.ext.ipaddress.ip_network(cidr) + network_info = ipaddress.ip_network(cidr) ret['network'] = six.text_type(network_info.network_address) ret['netmask'] = six.text_type(network_info.netmask) return ret -- 2.13.7