|
 |
9bbebd |
From b2512e2a92a33360639a3459039cdf2e685655a8 Mon Sep 17 00:00:00 2001
|
|
|
9bbebd |
From: Petr Lautrbach <plautrba@redhat.com>
|
|
|
9bbebd |
Date: Mon, 3 Dec 2018 14:40:09 +0100
|
|
|
9bbebd |
Subject: [PATCH] python: Use ipaddress instead of IPy
|
|
|
9bbebd |
|
|
|
9bbebd |
ipaddress module was added in python 3.3 and this allows us to drop python3-IPy
|
|
|
9bbebd |
---
|
|
|
9bbebd |
python/semanage/seobject.py | 12 ++++++------
|
|
|
9bbebd |
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
9bbebd |
|
|
|
9bbebd |
diff --git a/python/semanage/seobject.py b/python/semanage/seobject.py
|
|
|
9bbebd |
index b90b1070..58497e3b 100644
|
|
|
9bbebd |
--- a/python/semanage/seobject.py
|
|
|
9bbebd |
+++ b/python/semanage/seobject.py
|
|
|
9bbebd |
@@ -32,7 +32,7 @@ from semanage import *
|
|
|
9bbebd |
PROGNAME = "selinux-python"
|
|
|
9bbebd |
import sepolicy
|
|
|
9bbebd |
import setools
|
|
|
9bbebd |
-from IPy import IP
|
|
|
9bbebd |
+import ipaddress
|
|
|
9bbebd |
|
|
|
9bbebd |
try:
|
|
|
9bbebd |
import gettext
|
|
|
9bbebd |
@@ -1851,13 +1851,13 @@ class nodeRecords(semanageRecords):
|
|
|
9bbebd |
|
|
|
9bbebd |
# verify valid comination
|
|
|
9bbebd |
if len(mask) == 0 or mask[0] == "/":
|
|
|
9bbebd |
- i = IP(addr + mask)
|
|
|
9bbebd |
- newaddr = i.strNormal(0)
|
|
|
9bbebd |
- newmask = str(i.netmask())
|
|
|
9bbebd |
- if newmask == "0.0.0.0" and i.version() == 6:
|
|
|
9bbebd |
+ i = ipaddress.ip_network(addr + mask)
|
|
|
9bbebd |
+ newaddr = str(i.network_address)
|
|
|
9bbebd |
+ newmask = str(i.netmask)
|
|
|
9bbebd |
+ if newmask == "0.0.0.0" and i.version == 6:
|
|
|
9bbebd |
newmask = "::"
|
|
|
9bbebd |
|
|
|
9bbebd |
- protocol = "ipv%d" % i.version()
|
|
|
9bbebd |
+ protocol = "ipv%d" % i.version
|
|
|
9bbebd |
|
|
|
9bbebd |
try:
|
|
|
9bbebd |
newprotocol = self.protocol.index(protocol)
|
|
|
9bbebd |
--
|
|
|
9bbebd |
2.21.0
|
|
|
9bbebd |
|