summaryrefslogtreecommitdiff
path: root/pysnmp/carrier
diff options
context:
space:
mode:
authorelie <elie>2014-06-17 15:19:53 +0000
committerelie <elie>2014-06-17 15:19:53 +0000
commit0f3b10f3aa04bc45f601f9c5e221855e803f29da (patch)
tree947005a1e0694ee6611725b2324e27b8a6e19f4d /pysnmp/carrier
parent483c99653c66d6c05f7ac9d56f68d0c608468455 (diff)
downloadpysnmp-git-0f3b10f3aa04bc45f601f9c5e221855e803f29da.tar.gz
pylint'ed
Diffstat (limited to 'pysnmp/carrier')
-rw-r--r--pysnmp/carrier/asyncore/dgram/udp6.py2
-rw-r--r--pysnmp/carrier/asyncore/dgram/unix.py2
-rw-r--r--pysnmp/carrier/base.py6
-rw-r--r--pysnmp/carrier/twisted/base.py1
4 files changed, 5 insertions, 6 deletions
diff --git a/pysnmp/carrier/asyncore/dgram/udp6.py b/pysnmp/carrier/asyncore/dgram/udp6.py
index 7bba2397..c34037d0 100644
--- a/pysnmp/carrier/asyncore/dgram/udp6.py
+++ b/pysnmp/carrier/asyncore/dgram/udp6.py
@@ -1,7 +1,7 @@
# Implements asyncore-based UDP6 transport domain
try:
from socket import AF_INET6
-except:
+except ImportError:
AF_INET6 = None
from pysnmp.carrier.asynsock.dgram.base import DgramSocketTransport
diff --git a/pysnmp/carrier/asyncore/dgram/unix.py b/pysnmp/carrier/asyncore/dgram/unix.py
index 50d08aa6..d488f2d0 100644
--- a/pysnmp/carrier/asyncore/dgram/unix.py
+++ b/pysnmp/carrier/asyncore/dgram/unix.py
@@ -36,7 +36,7 @@ class UnixSocketTransport(DgramSocketTransport):
DgramSocketTransport.closeTransport(self)
try:
os.remove(self.__iface)
- except:
+ except OSError:
pass
UnixTransport = UnixSocketTransport
diff --git a/pysnmp/carrier/base.py b/pysnmp/carrier/base.py
index d3d9a6e4..448b74d4 100644
--- a/pysnmp/carrier/base.py
+++ b/pysnmp/carrier/base.py
@@ -60,7 +60,7 @@ class AbstractTransportDispatcher:
def registerRoutingCbFun(self, routingCbFun):
if self.__routingCbFun:
- raise error.CarrierError(
+ raise error.CarrierError(
'Data routing callback already registered'
)
self.__routingCbFun = routingCbFun
@@ -71,7 +71,7 @@ class AbstractTransportDispatcher:
def registerRecvCbFun(self, recvCb, recvId=None):
if recvId in self.__recvCallables:
- raise error.CarrierError(
+ raise error.CarrierError(
'Receive callback %r already registered' % (recvId is None and '<default>' or recvId,)
)
self.__recvCallables[recvId] = recvCb
@@ -189,7 +189,7 @@ class AbstractTransport:
def registerCbFun(self, cbFun):
if self._cbFun:
raise error.CarrierError(
- 'Callback function %s already registered at %s' % (self.__cbFun, self)
+ 'Callback function %s already registered at %s' % (self._cbFun, self)
)
self._cbFun = cbFun
diff --git a/pysnmp/carrier/twisted/base.py b/pysnmp/carrier/twisted/base.py
index c0afeaa9..b3024468 100644
--- a/pysnmp/carrier/twisted/base.py
+++ b/pysnmp/carrier/twisted/base.py
@@ -12,6 +12,5 @@ from pysnmp.carrier.base import AbstractTransport
class AbstractTwistedTransport(AbstractTransport):
protoTransportDispatcher = TwistedDispatcher
- """Base Twisted Transport, to be used with TwistedDispatcher"""
def __init__(self):
self._writeQ = []