PEP-8 long lines and dunders (#245)

This patch massively reformats the whole codebase mainly wrapping
long lines and eliminating dundered private attributes.

1 files changed, 34 insertions, 20 deletions

diff --git a/pysnmp/carrier/base.py b/pysnmp/carrier/base.py
index 12dfc86b..518f304b 100644
--- a/pysnmp/carrier/base.py
+++ b/pysnmp/carrier/base.py
@@ -53,6 +53,7 @@ class AbstractTransportDispatcher(object):
     def _cbFun(self, incomingTransport, transportAddress, incomingMessage):
         if incomingTransport in self.__transportDomainMap:
             transportDomain = self.__transportDomainMap[incomingTransport]
+
         else:
             raise error.CarrierError(
                 'Unregistered transport %s' % (incomingTransport,)
@@ -62,6 +63,7 @@ class AbstractTransportDispatcher(object):
             recvId = self.__routingCbFun(
                 transportDomain, transportAddress, incomingMessage
             )
+
         else:
             recvId = None
 
@@ -69,6 +71,7 @@ class AbstractTransportDispatcher(object):
             self.__recvCallables[recvId](
                 self, transportDomain, transportAddress, incomingMessage
             )
+
         else:
             raise error.CarrierError(
                 'No callback for "%r" found - loosing incoming event' % (recvId,)
@@ -81,6 +84,7 @@ class AbstractTransportDispatcher(object):
             raise error.CarrierError(
                 'Data routing callback already registered'
             )
+
         self.__routingCbFun = routingCbFun
 
     def unregisterRoutingCbFun(self):
@@ -92,6 +96,7 @@ class AbstractTransportDispatcher(object):
             raise error.CarrierError(
                 'Receive callback %r already registered' % (recvId is None and '<default>' or recvId,)
             )
+
         self.__recvCallables[recvId] = recvCb
 
     def unregisterRecvCbFun(self, recvId=None):
@@ -101,38 +106,44 @@ class AbstractTransportDispatcher(object):
     def registerTimerCbFun(self, timerCbFun, tickInterval=None):
         if not tickInterval:
             tickInterval = self.__timerResolution
+
         self.__timerCallables.append(TimerCallable(timerCbFun, tickInterval))
 
     def unregisterTimerCbFun(self, timerCbFun=None):
         if timerCbFun:
             self.__timerCallables.remove(timerCbFun)
+
         else:
             self.__timerCallables = []
 
-    def registerTransport(self, tDomain, transport):
-        if tDomain in self.__transports:
+    def registerTransport(self, transportDomain, transport):
+        if transportDomain in self.__transports:
             raise error.CarrierError(
-                'Transport %s already registered' % (tDomain,)
+                'Transport %s already registered' % (transportDomain,)
             )
+
         transport.registerCbFun(self._cbFun)
-        self.__transports[tDomain] = transport
-        self.__transportDomainMap[transport] = tDomain
 
-    def unregisterTransport(self, tDomain):
-        if tDomain not in self.__transports:
+        self.__transports[transportDomain] = transport
+        self.__transportDomainMap[transport] = transportDomain
+
+    def unregisterTransport(self, transportDomain):
+        if transportDomain not in self.__transports:
             raise error.CarrierError(
-                'Transport %s not registered' % (tDomain,)
+                'Transport %s not registered' % (transportDomain,)
             )
-        self.__transports[tDomain].unregisterCbFun()
-        del self.__transportDomainMap[self.__transports[tDomain]]
-        del self.__transports[tDomain]
+
+        self.__transports[transportDomain].unregisterCbFun()
+
+        del self.__transportDomainMap[self.__transports[transportDomain]]
+        del self.__transports[transportDomain]
 
     def getTransport(self, transportDomain):
         if transportDomain in self.__transports:
             return self.__transports[transportDomain]
+
         raise error.CarrierError(
-            'Transport %s not registered' % (transportDomain,)
-        )
+            'Transport %s not registered' % (transportDomain,))
 
     def sendMessage(self, outgoingMessage, transportDomain,
                     transportAddress):
@@ -140,10 +151,10 @@ class AbstractTransportDispatcher(object):
             self.__transports[transportDomain].sendMessage(
                 outgoingMessage, transportAddress
             )
+
         else:
-            raise error.CarrierError(
-                'No suitable transport domain for %s' % (transportDomain,)
-            )
+            raise error.CarrierError('No suitable transport domain for '
+                                     '%s' % (transportDomain,))
 
     def getTimerResolution(self):
         return self.__timerResolution
@@ -151,6 +162,7 @@ class AbstractTransportDispatcher(object):
     def setTimerResolution(self, timerResolution):
         if timerResolution < 0.01 or timerResolution > 10:
             raise error.CarrierError('Impossible timer resolution')
+
         self.__timerResolution = timerResolution
         self.__timerDelta = timerResolution * 0.05
 
@@ -173,6 +185,7 @@ class AbstractTransportDispatcher(object):
     def jobStarted(self, jobId, count=1):
         if jobId in self.__jobs:
             self.__jobs[jobId] += count
+
         else:
             self.__jobs[jobId] = count
 
@@ -191,6 +204,7 @@ class AbstractTransportDispatcher(object):
         for tDomain in list(self.__transports):
             self.__transports[tDomain].closeTransport()
             self.unregisterTransport(tDomain)
+
         self.__transports.clear()
         self.unregisterRecvCbFun()
         self.unregisterTimerCbFun()
@@ -207,7 +221,8 @@ class AbstractTransportAddress(object):
         return self._localAddress
 
     def clone(self, localAddress=None):
-        return self.__class__(self).setLocalAddress(localAddress is None and self.getLocalAddress() or localAddress)
+        return self.__class__(self).setLocalAddress(
+            localAddress is None and self.getLocalAddress() or localAddress)
 
 
 class AbstractTransport(object):
@@ -221,9 +236,8 @@ class AbstractTransport(object):
 
     def registerCbFun(self, cbFun):
         if self._cbFun:
-            raise error.CarrierError(
-                'Callback function %s already registered at %s' % (self._cbFun, self)
-            )
+            raise error.CarrierError('Callback function %s already registered '
+                                     'at %s' % (self._cbFun, self))
         self._cbFun = cbFun
 
     def unregisterCbFun(self):