diff options
author | elie <elie> | 2012-06-25 23:29:43 +0000 |
---|---|---|
committer | elie <elie> | 2012-06-25 23:29:43 +0000 |
commit | 91d3d54b53ec6c2089b03b279f39fd2505b2897b (patch) | |
tree | bf3d9069a943bb7920150e3f9116a14868f61a54 /pysnmp/carrier/base.py | |
parent | 1d9f36d99d4bff37affe20fd9c04d1a0abdd5c78 (diff) | |
download | pysnmp-git-91d3d54b53ec6c2089b03b279f39fd2505b2897b.tar.gz |
minor cosmetic changes
Diffstat (limited to 'pysnmp/carrier/base.py')
-rw-r--r-- | pysnmp/carrier/base.py | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/pysnmp/carrier/base.py b/pysnmp/carrier/base.py index 20954792..4aa01052 100644 --- a/pysnmp/carrier/base.py +++ b/pysnmp/carrier/base.py @@ -1,4 +1,4 @@ -"""Abstract I/O dispatcher. Defines standard dispatcher API""" +# Abstract I/O dispatcher. Defines standard dispatcher API from pysnmp.carrier import error class TimerCallable: @@ -38,20 +38,22 @@ class AbstractTransportDispatcher: raise error.CarrierError( 'Unregistered transport %s' % (incomingTransport,) ) - if self.__recvCbFun is None: + + if self.__recvCbFun: + self.__recvCbFun( + self, transportDomain, transportAddress, incomingMessage + ) + else: raise error.CarrierError( 'Receive callback not registered -- loosing incoming event' ) - self.__recvCbFun( - self, transportDomain, transportAddress, incomingMessage - ) # Dispatcher API - + def registerRecvCbFun(self, recvCbFun): - if self.__recvCbFun is not None: + if self.__recvCbFun: raise error.CarrierError( - 'Receive callback already registered: %s' % self.__recvCbFun + 'Receive callback already registered' ) self.__recvCbFun = recvCbFun @@ -64,10 +66,10 @@ class AbstractTransportDispatcher: self.__timerCallables.append(TimerCallable(timerCbFun, tickInterval)) def unregisterTimerCbFun(self, timerCbFun=None): - if timerCbFun is None: - self.__timerCallables = [] - else: + if timerCbFun: self.__timerCallables.remove(timerCbFun) + else: + self.__timerCallables = [] def registerTransport(self, tDomain, transport): if tDomain in self.__transports: |