RepoMirrors/selinux
1
0
Fork 0
mirror of https://github.com/SELinuxProject/selinux synced 2024-12-27 16:32:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

python/semanage: Use ipaddress module instead of IPy

Browse Source 
ipaddress python module was added to standard library in Python 3.3 -
https://docs.python.org/3/library/ipaddress.html

seobject.py was the only consumer of IPy module so this dependency is not needed
anymore.

Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
This commit is contained in:
Petr Lautrbach 2020-04-27 17:34:39 +02:00 committed by Nicolas Iooss
parent 4465a807c7
commit 79f69a3ca1
No known key found for this signature in database
GPG Key ID: C191415F340DAAA0
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
python/semanage/seobject.py
View File

@ -32,7 +32,7 @@ from semanage import *
PROGNAME = "policycoreutils"
import sepolicy
import setools
from IPy import IP
import ipaddress
try:
import gettext
@ -1858,15 +1858,12 @@ class nodeRecords(semanageRecords):
if addr == "":
raise ValueError(_("Node Address is required"))
# verify valid combination
# verify that (addr, mask) is either a IP address (without a mask) or a valid network mask
if len(mask) == 0 or mask[0] == "/":
i = IP(addr + mask)
newaddr = i.strNormal(0)
newmask = str(i.netmask())
if newmask == "0.0.0.0" and i.version() == 6:
newmask = "::"
protocol = "ipv%d" % i.version()
i = ipaddress.ip_network(addr + mask)
newaddr = str(i.network_address)
newmask = str(i.netmask)
protocol = "ipv%d" % i.version
try:
newprotocol = self.protocol.index(protocol)