summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2020-12-07 23:00:29 -0600
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2020-12-07 23:00:29 -0600
commit334cc509f08b125f9db76914efb9c7b2adfffeba (patch)
tree5ed8b17bf2c4e71191b10bf212275ae7af2255c8
parent85db708181d28fa73fe03409728ba41041b8d227 (diff)
downloadnetconfapk-334cc509f08b125f9db76914efb9c7b2adfffeba.tar.gz
netconfapk-334cc509f08b125f9db76914efb9c7b2adfffeba.tar.bz2
netconfapk-334cc509f08b125f9db76914efb9c7b2adfffeba.tar.xz
netconfapk-334cc509f08b125f9db76914efb9c7b2adfffeba.zip
Fix QName import stuff
-rw-r--r--ncserver/base/modman.py5
-rw-r--r--ncserver/module/ip.py5
-rw-r--r--ncserver/module/openrc.py4
-rw-r--r--ncserver/module/system.py5
4 files changed, 3 insertions, 16 deletions
diff --git a/ncserver/base/modman.py b/ncserver/base/modman.py
index 5033afa..742a890 100644
--- a/ncserver/base/modman.py
+++ b/ncserver/base/modman.py
@@ -13,7 +13,7 @@ SPDX-License-Identifier: NCSA
import hashlib
from logging import getLogger
-from lxml import etree
+from lxml.etree import QName # pylint: disable=E0611
from netconf import error, nsmap_add, util
from taillight import Signal
@@ -25,9 +25,6 @@ MODULE_SET_CHANGE_SIGNAL = Signal(('base/ModuleManager', 'module_set_changed'))
yang-library-change notification should be fired, when this is supported."""
-QName = etree.QName # pylint: disable=I1101
-
-
def _import_compatible(existing, improps):
"""Determine if an imported module is compatible with the existing
module that has the same name/revision.
diff --git a/ncserver/module/ip.py b/ncserver/module/ip.py
index 25975a4..e6a2de1 100644
--- a/ncserver/module/ip.py
+++ b/ncserver/module/ip.py
@@ -12,16 +12,13 @@ SPDX-License-Identifier: NCSA
import logging
-from lxml import etree
+from lxml.etree import QName # pylint: disable=E0611
from netconf import util
from ncserver.base.modman import MODMAN
from ncserver.base.util import _
-QName = etree.QName # pylint: disable=I1101
-
-
LOGGER = logging.getLogger(__name__)
"""The object used for logging informational messages."""
diff --git a/ncserver/module/openrc.py b/ncserver/module/openrc.py
index c4e45fa..bbff980 100644
--- a/ncserver/module/openrc.py
+++ b/ncserver/module/openrc.py
@@ -16,16 +16,12 @@ import os
import pathlib
import subprocess
-from lxml import etree
from netconf import error, util
from ncserver.base.service import Service, ServiceStatus
from ncserver.base.util import _, yang_dt_for_timestamp
-QName = etree.QName # pylint: disable=I1101
-
-
LOGGER = logging.getLogger(__name__)
"""The object used for logging informational messages."""
diff --git a/ncserver/module/system.py b/ncserver/module/system.py
index d295aaa..b40d3f0 100644
--- a/ncserver/module/system.py
+++ b/ncserver/module/system.py
@@ -19,7 +19,7 @@ import subprocess
from datetime import datetime
from socket import gethostname, sethostname
-from lxml import etree
+from lxml.etree import QName # pylint: disable=E0611
from netconf import error, util
from ncserver.base.log import HOSTNAME_CHANGED, log_config_change, log_operation
@@ -28,9 +28,6 @@ from ncserver.base.util import _, ensure_leaf, handle_list_operation, \
from ncserver.util import maybe_raise_on_invalid_node, system_boot_time
-QName = etree.QName # pylint: disable=I1101
-
-
LOGGER = logging.getLogger(__name__)
"""The object used for logging informational messages."""