Misc. code cleaning - increasing pylint score

lib/ClusterShell/CLI/Display.py

@@ -76,6 +76,8 @@ def __init__(self, options, config=None, color=None):
         """
         if options.diff:
             self._print_buffer = self._print_diff
+        else:
+            self._print_buffer = self._print_content
         self._display = self._print_buffer
         self._diffref = None
         # diff implies at least -b
@@ -192,7 +194,7 @@ def print_gather_keys(self, keys, obj):
         object settings (used by clubak)."""
         return self._display(self.__class__._KeySet(keys), obj)
 
-    def _print_buffer(self, nodeset, content):
+    def _print_content(self, nodeset, content):
         """Display a dshbak-like header block and content."""
         self.out.write("%s\n%s\n" % (self.format_header(nodeset), content))
 

lib/ClusterShell/Gateway.py

@@ -38,12 +38,9 @@
 replies on stdout.
 """
 
+import logging
 import os
 import sys
-import fcntl
-import time
-
-import logging
 
 from ClusterShell.Event import EventHandler
 from ClusterShell.Task import task_self, _getshorthostname
@@ -80,15 +77,20 @@ def ev_timer(self, timer):
         logger = self.logger
         # check for grooming opportunities
         for msg_elem, nodes in self.worker.iter_errors():
-            logger.debug("iter(stderr): %s: %d bytes" % (nodes, len(msg_elem.message())))
-            self.gwchan.send(StdErrMessage(nodes, msg_elem.message(), self.srcwkr))
+            logger.debug("iter(stderr): %s: %d bytes" % \
+                (nodes, len(msg_elem.message())))
+            self.gwchan.send(StdErrMessage(nodes, msg_elem.message(), \
+                                           self.srcwkr))
         for msg_elem, nodes in self.worker.iter_buffers():
-            logger.debug("iter(stdout): %s: %d bytes" % (nodes, len(msg_elem.message())))
-            self.gwchan.send(StdOutMessage(nodes, msg_elem.message(), self.srcwkr))
+            logger.debug("iter(stdout): %s: %d bytes" % \
+                (nodes, len(msg_elem.message())))
+            self.gwchan.send(StdOutMessage(nodes, msg_elem.message(), \
+                                           self.srcwkr))
         self.worker.flush_buffers()
 
     def ev_error(self, worker):
-        self.logger.debug("WorkerTreeResponder: ev_error %s" % worker.current_errmsg)
+        self.logger.debug("WorkerTreeResponder: ev_error %s" % \
+            worker.current_errmsg)
 
     def ev_close(self, worker):
         self.logger.debug("WorkerTreeResponder: ev_close")
@@ -138,14 +140,14 @@ def close(self):
     def recv(self, msg):
         """handle incoming message"""
         try:
-            self.logger.debug('handling incoming message: %s' % str(msg))
+            self.logger.debug('handling incoming message: %s', str(msg))
             if msg.ident == EndMessage.ident:
                 self.logger.debug('recv: got EndMessage')
                 self.worker.abort()
             else:
                 self.current_state(msg)
         except Exception, ex:
-            self.logger.exception('on recv(): %s' % str(ex))
+            self.logger.exception('on recv(): %s', str(ex))
             self.send(ErrorMessage(str(ex)))
 
     def _state_cfg(self, msg):
@@ -159,7 +161,7 @@ def _state_cfg(self, msg):
             self.current_state = self.states['CTL']
             self.logger.debug('entering control state')
         else:
-            logging.error('unexpected message: %s' % str(msg))
+            logging.error('unexpected message: %s', str(msg))
 
     def _state_ctl(self, msg):
         """receive control message with actions to perform"""
@@ -172,7 +174,8 @@ def _state_ctl(self, msg):
                 stderr = data['stderr']
 
                 #self.propagation.invoke_gateway = data['invoke_gateway']
-                self.logger.debug('decoded gw invoke (%s)' % data['invoke_gateway'])
+                self.logger.debug('decoded gw invoke (%s)', \
+                                  data['invoke_gateway'])
 
                 taskinfo = data['taskinfo']
                 task = task_self()
@@ -184,10 +187,11 @@ def _state_ctl(self, msg):
                 self.logger.debug('assigning task infos (%s)' % \
                     str(data['taskinfo']))
 
-                self.logger.debug('inherited fanout value=%d' % task.info("fanout"))
+                self.logger.debug('inherited fanout value=%d', \
+                                  task.info("fanout"))
 
                 #self.current_state = self.states['GTR']
-                self.logger.debug('launching execution/entering gathering state')
+                self.logger.debug('launching execution/enter gathering state')
 
                 responder = WorkerTreeResponder(task, self, msg.srcid)
 
@@ -201,14 +205,13 @@ def _state_ctl(self, msg):
                 task.schedule(self.propagation)
                 self.logger.debug("WorkerTree scheduled")
         else:
-            logging.error('unexpected message: %s' % str(msg))
+            logging.error('unexpected message: %s', str(msg))
 
     def _state_gtr(self, msg):
         """gather outputs"""
         # FIXME
         self.logger.debug('GatewayChannel._state_gtr')
         self.logger.debug('incoming output msg: %s' % str(msg))
-        pass
 
     def _ack(self, msg):
         """acknowledge a received message"""
@@ -250,13 +253,13 @@ def gateway_main():
     try:
         task.resume()
         logger.debug('Task performed')
-    except EngineAbortException, e:
+    except EngineAbortException, exc:
         pass
-    except IOError, e:
-        logger.debug('Broken pipe (%s)' % e)
+    except IOError, exc:
+        logger.debug('Broken pipe (%s)' % exc)
         raise
-    except Exception, e:
-        logger.exception('Gateway failure: %s' % e)
+    except Exception, exc:
+        logger.exception('Gateway failure: %s' % exc)
     logger.debug('The End')
 
 if __name__ == '__main__':

lib/ClusterShell/Propagation.py

@@ -47,7 +47,7 @@
 from ClusterShell.Communication import ControlMessage, StdOutMessage
 from ClusterShell.Communication import StdErrMessage, RetcodeMessage
 from ClusterShell.Communication import RoutedMessageBase, EndMessage
-from ClusterShell.Communication import ConfigurationMessage
+from ClusterShell.Communication import ConfigurationMessage, TimeoutMessage
 
 from ClusterShell.Topology import TopologyParser
 
@@ -331,12 +331,14 @@ def _state_control(self, msg):
                     metaworker._on_node_timeout(node)
         else:
             self.logger.debug("PropChannel: _state_gather unhandled msg %s" % msg)
+        """
         return
         if self.ptree.upchannel is not None:
             self.logger.debug("_state_gather ->upchan %s" % msg)
             self.ptree.upchannel.send(msg) # send to according event handler passed by shell()
         else:
             assert False
+        """
 
     def ev_close(self, worker):
         worker.flush_buffers()

lib/ClusterShell/RangeSet.py

@@ -261,7 +261,7 @@ def __setstate__(self, dic):
                     setattr(self, '_ranges', [(slice(start, stop, step), pad) \
                         for (start, stop, step), pad in self_ranges])
             # convert to v3
-            for sli, pad in self._ranges:
+            for sli, pad in getattr(self, '_ranges'):
                 self.add_range(sli.start, sli.stop, sli.step, pad)
             delattr(self, '_ranges')
             delattr(self, '_length')

lib/ClusterShell/Topology.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright CEA/DAM/DIF (2010, 2011)
+# Copyright CEA/DAM/DIF (2010, 2011, 2012)
 #  Contributor: Henri DOREAU <henri.doreau@gmail.com>
 #  Contributor: Stephane THIELL <stephane.thiell@cea.fr>
 #
@@ -49,8 +49,6 @@
 ...
 """
 
-import sys
-import signal
 import ConfigParser
 
 from ClusterShell.NodeSet import NodeSet

lib/ClusterShell/Worker/Pdsh.py

@@ -268,8 +268,8 @@ def _parse_line(self, line, stderr):
                 elif self.mode == 'pdcp':
                     self._on_node_rc(words[1][:-1], errno.ENOENT)
 
-            except Exception, e:
-                print >> sys.stderr, e
+            except Exception, exc:
+                print >> sys.stderr, exc
                 raise EngineClientError()
         else:
             # split pdsh reply "nodename: msg"