diff --git a/mininet/cli.py b/mininet/cli.py index a8c93be..3635b7f 100644 --- a/mininet/cli.py +++ b/mininet/cli.py @@ -68,6 +68,7 @@ class CLI( Cmd ): self.run() readlineInited = False + @classmethod def initReadline( cls ): "Set up history if readline is available" @@ -101,10 +102,12 @@ class CLI( Cmd ): break except KeyboardInterrupt: # Output a message - unless it's also interrupted + # pylint: disable=broad-except try: output( '\nInterrupt\n' ) - except: + except Exception: pass + # pylint: enable=broad-except def emptyline( self ): "Don't repeat last command when you hit return." diff --git a/mininet/term.py b/mininet/term.py index 69a3efe..04d9871 100644 --- a/mininet/term.py +++ b/mininet/term.py @@ -54,7 +54,8 @@ def makeTerm( node, title='Node', term='xterm', display=None, cmd='bash'): display, tunnel = tunnelX11( node, display ) if display is None: return [] - term = node.popen( cmds[ term ] + [ display, '-e', 'env TERM=ansi %s' % cmd ] ) + term = node.popen( cmds[ term ] + + [ display, '-e', 'env TERM=ansi %s' % cmd ] ) return [ tunnel, term ] if tunnel else [ term ] def runX11( node, cmd ):