From 1380813fea63570f518f04e472c596877ed85c60 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Tue, 8 Dec 2020 22:26:13 -0600 Subject: ncserver: Small style fixes --- ncserver/module/nms_ifupdownng.py | 1 + ncserver/module/system.py | 5 +++-- ncserver/server.py | 8 +++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ncserver/module/nms_ifupdownng.py b/ncserver/module/nms_ifupdownng.py index 0c03fd9..1142f31 100644 --- a/ncserver/module/nms_ifupdownng.py +++ b/ncserver/module/nms_ifupdownng.py @@ -587,6 +587,7 @@ def rollback(): @contextmanager def transaction(): + """Context manager for NMSA transactions.""" begin_transaction() try: yield None diff --git a/ncserver/module/system.py b/ncserver/module/system.py index b40d3f0..ef14641 100644 --- a/ncserver/module/system.py +++ b/ncserver/module/system.py @@ -22,7 +22,8 @@ from socket import gethostname, sethostname 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 +from ncserver.base.log import HOSTNAME_CHANGED, log_config_change, \ + log_operation from ncserver.base.util import _, ensure_leaf, handle_list_operation, \ node_operation, yang_dt_for_timestamp from ncserver.util import maybe_raise_on_invalid_node, system_boot_time @@ -134,7 +135,7 @@ class NTPServer: # pylint: disable=R0902 host=self.host, nondef_args=nondef_args ) - def __str__(self): + def __str__(self): # pylint: disable=R0912 """Return the configuration line for this server.""" line = self.mode + ' ' diff --git a/ncserver/server.py b/ncserver/server.py index bbccec7..120e185 100644 --- a/ncserver/server.py +++ b/ncserver/server.py @@ -32,6 +32,7 @@ QName = etree.QName # pylint: disable=I1101 def log_read(session, rpc): """Log a configuration read.""" + # pylint: disable=I1101 LOG_CONFIG.debug( '%s on session %d is requesting configuration: %s', user_for_session(session), session.session_id, etree.tostring(rpc) @@ -40,6 +41,7 @@ def log_read(session, rpc): def log_write(session, rpc): """Log a configuration write attempt.""" + # pylint: disable=I1101 LOG_CONFIG.debug( '%s on session %d is editing configuration: %s', user_for_session(session), session.session_id, etree.tostring(rpc) @@ -117,7 +119,7 @@ class Server: """Close all connections.""" self.server.close() - def nc_append_capabilities(self, capabilities): + def nc_append_capabilities(self, capabilities): # pylint: disable=R0201 """List all capabilities of this NETCONF server.""" our_capabs = [ # Write directly to the `running` datastore. @@ -130,7 +132,7 @@ class Server: for capab in our_capabs: util.subelm(capabilities, 'capability').text = capab - def _rpc_wrapper(self, session, rpc, *params): + def _rpc_wrapper(self, session, rpc, *params): # pylint: disable=R0201 """Handle module RPCs.""" name = QName(rpc[0].tag).localname LOG_OPERATIONAL.info( @@ -176,7 +178,7 @@ class Server: return util.filter_results(rpc, root, filter_or_none, self.debug) - # pylint: disable=R0913 + # pylint: disable=R0913,R0201 def rpc_edit_config(self, session, rpc, target, config, default_or_none): """Handle the RPC.""" if len(target) != 1: -- cgit v1.2.3-60-g2f50