2
2
3
3
import netaddr
4
4
import requests
5
- from netaddr import iprange_to_cidrs , IPNetwork
6
5
7
6
8
7
def generate_ip_range (ip_range ):
@@ -16,11 +15,11 @@ def generate_ip_range(ip_range):
16
15
an array with CIDRs
17
16
"""
18
17
if "/" in ip_range :
19
- return [ip .format () for ip in [cidr for cidr in IPNetwork (ip_range )]]
18
+ return [ip .format () for ip in [cidr for cidr in netaddr . IPNetwork (ip_range )]]
20
19
else :
21
20
ips = []
22
21
for generator_ip_range in [
23
- cidr .iter_hosts () for cidr in iprange_to_cidrs (* ip_range .rsplit ("-" ))
22
+ cidr .iter_hosts () for cidr in netaddr . iprange_to_cidrs (* ip_range .rsplit ("-" ))
24
23
]:
25
24
for ip in generator_ip_range :
26
25
ips .append (ip .format ())
@@ -68,7 +67,7 @@ def is_ipv4_range(ip_range):
68
67
"/" in ip_range
69
68
and "." in ip_range
70
69
and "-" not in ip_range
71
- and netaddr .IPNetwork (ip_range )
70
+ and bool ( netaddr .IPNetwork (ip_range ) )
72
71
)
73
72
except Exception :
74
73
return False
@@ -80,7 +79,7 @@ def is_ipv4_cidr(ip_range):
80
79
"/" not in ip_range
81
80
and "." in ip_range
82
81
and "-" in ip_range
83
- and iprange_to_cidrs (* ip_range .split ("-" ))
82
+ and bool ( netaddr . iprange_to_cidrs (* ip_range .split ("-" ) ))
84
83
)
85
84
except Exception :
86
85
return False
@@ -96,7 +95,7 @@ def is_single_ipv6(ip):
96
95
Returns:
97
96
True if it's IPv6 otherwise False
98
97
"""
99
- return netaddr .valid_ipv6 (str ( ip ) )
98
+ return netaddr .valid_ipv6 (ip )
100
99
101
100
102
101
def is_ipv6_range (ip_range ):
@@ -105,7 +104,7 @@ def is_ipv6_range(ip_range):
105
104
"/" not in ip_range
106
105
and ":" in ip_range
107
106
and "-" in ip_range
108
- and iprange_to_cidrs (* ip_range .split ("-" ))
107
+ and bool ( netaddr . iprange_to_cidrs (* ip_range .split ("-" ) ))
109
108
)
110
109
except Exception :
111
110
return False
@@ -117,7 +116,7 @@ def is_ipv6_cidr(ip_range):
117
116
"/" in ip_range
118
117
and ":" in ip_range
119
118
and "-" not in ip_range
120
- and netaddr .IPNetwork (ip_range )
119
+ and bool ( netaddr .IPNetwork (ip_range ) )
121
120
)
122
121
except Exception :
123
122
return False
0 commit comments