diff --git a/mininet/cli.py b/mininet/cli.py index 74a13c827e56b8772c70554da00681ff377145bd..133d4dcea8c7577e08454e151abc2ae4727c72a4 100644 --- a/mininet/cli.py +++ b/mininet/cli.py @@ -38,7 +38,7 @@ from subprocess import call from cmd import Cmd -from mininet.log import info, warn, cliinfo +from mininet.log import info, cliinfo class CLI( Cmd ): "Simple command-line interface to talk to nodes." diff --git a/mininet/log.py b/mininet/log.py index 5352345454d00b7cb62a4de57e9348dc3e99b63d..46334bf589bb757ddcb3713cfcafb5122b11233e 100644 --- a/mininet/log.py +++ b/mininet/log.py @@ -126,6 +126,10 @@ def setLogLevel( self, levelname=None ): self.setLevel( level ) self.handlers[ 0 ].setLevel( level ) + # pylint: disable-msg=E0202 + # "An attribute inherited from mininet.log hide this method" + # Not sure why this is occurring - this function definitely gets called. + # See /usr/lib/python2.5/logging/__init__.py; modified from warning() def cliinfo( self, msg, *args, **kwargs ): """Log 'msg % args' with severity 'CLIINFO'. @@ -138,8 +142,9 @@ def cliinfo( self, msg, *args, **kwargs ): if self.manager.disable >= CLIINFO: return if self.isEnabledFor( CLIINFO ): - apply( self._log, ( CLIINFO, msg, args ), kwargs ) + self._log( CLIINFO, msg, args, kwargs ) + # pylint: enable-msg=E0202 lg = MininetLogger()