summaryrefslogtreecommitdiff
path: root/pysnmp/debug.py
diff options
context:
space:
mode:
authorIlya Etingof <etingof@gmail.com>2019-02-26 08:56:24 +0100
committerGitHub <noreply@github.com>2019-02-26 08:56:24 +0100
commit3f2f132a9fdf7a48ec6131d5498145dded3cfcad (patch)
tree63e6170b35f6b392bf2e3d3feb6996b886e4d36f /pysnmp/debug.py
parent2ad26f8bfef0e39b3789d9e6d4fcbf76820c9867 (diff)
downloadpysnmp-git-3f2f132a9fdf7a48ec6131d5498145dded3cfcad.tar.gz
PEP-8 long lines and dunders (#245)
This patch massively reformats the whole codebase mainly wrapping long lines and eliminating dundered private attributes.
Diffstat (limited to 'pysnmp/debug.py')
-rw-r--r--pysnmp/debug.py43
1 files changed, 29 insertions, 14 deletions
diff --git a/pysnmp/debug.py b/pysnmp/debug.py
index f6e69c79..e0e53607 100644
--- a/pysnmp/debug.py
+++ b/pysnmp/debug.py
@@ -43,14 +43,20 @@ class Printer(object):
def __init__(self, logger=None, handler=None, formatter=None):
if logger is None:
logger = logging.getLogger('pysnmp')
+
logger.setLevel(logging.DEBUG)
+
if handler is None:
handler = logging.StreamHandler()
+
if formatter is None:
formatter = logging.Formatter('%(asctime)s %(name)s: %(message)s')
+
handler.setFormatter(formatter)
handler.setLevel(logging.DEBUG)
+
logger.addHandler(handler)
+
self.__logger = logger
def __call__(self, msg):
@@ -64,7 +70,7 @@ if hasattr(logging, 'NullHandler'):
NullHandler = logging.NullHandler
else:
- # Python 2.6 and older
+ # Python 2.6
class NullHandler(logging.Handler):
def emit(self, record):
pass
@@ -75,33 +81,42 @@ class Debug(object):
def __init__(self, *flags, **options):
self._flags = FLAG_NONE
+
if options.get('printer') is not None:
self._printer = options.get('printer')
+
elif self.DEFAULT_PRINTER is not None:
self._printer = self.DEFAULT_PRINTER
+
else:
if 'loggerName' in options:
# route our logs to parent logger
self._printer = Printer(
logger=logging.getLogger(options['loggerName']),
- handler=NullHandler()
- )
+ handler=NullHandler())
+
else:
self._printer = Printer()
+
self('running pysnmp version %s' % __version__)
- for f in flags:
- inverse = f and f[0] in ('!', '~')
- if inverse:
- f = f[1:]
+
+ for flag in flags:
+ negate = flag and flag[0] in ('!', '~')
+ if negate:
+ flag = flag[1:]
+
try:
- if inverse:
- self._flags &= ~FLAG_MAP[f]
+ if negate:
+ self._flags &= ~FLAG_MAP[flag]
+
else:
- self._flags |= FLAG_MAP[f]
+ self._flags |= FLAG_MAP[flag]
+
except KeyError:
- raise error.PySnmpError('bad debug flag %s' % f)
+ raise error.PySnmpError('bad debug flag %s' % flag)
- self('debug category \'%s\' %s' % (f, inverse and 'disabled' or 'enabled'))
+ self('debug category "%s" '
+ '%s' % (flag, negate and 'disabled' or 'enabled'))
def __str__(self):
return 'logger %s, flags %x' % (self._printer, self._flags)
@@ -128,5 +143,5 @@ def setLogger(l):
def hexdump(octets):
return ' '.join(
- ['%s%.2X' % (n % 16 == 0 and ('\n%.5d: ' % n) or '', x)
- for n, x in zip(range(len(octets)), octs2ints(octets))])
+ '%s%.2X' % (n % 16 == 0 and ('\n%.5d: ' % n) or '', x)
+ for n, x in zip(range(len(octets)), octs2ints(octets)))