5 files changed, 15 insertions, 10 deletions
diff --git a/pysnmp/carrier/twisted/base.py b/pysnmp/carrier/twisted/base.py
index d8b75bc7..91883d7d 100644
--- a/pysnmp/carrier/twisted/base.py
+++ b/pysnmp/carrier/twisted/base.py
@@ -17,7 +17,7 @@ from pysnmp.carrier.base import AbstractTransport
 
 
 class AbstractTwistedTransport(AbstractTransport):
-    protoTransportDispatcher = TwistedDispatcher
+    PROTO_TRANSPORT_DISPATCHER = TwistedDispatcher
 
     def __init__(self, sock=None, sockMap=None):
         self._writeQ = []
diff --git a/pysnmp/carrier/twisted/dgram/base.py b/pysnmp/carrier/twisted/dgram/base.py
index 4386b702..42eb7c04 100644
--- a/pysnmp/carrier/twisted/dgram/base.py
+++ b/pysnmp/carrier/twisted/dgram/base.py
@@ -26,20 +26,20 @@ class DgramTwistedTransport(DatagramProtocol, AbstractTwistedTransport):
             reactor.callLater(0, self._cbFun, self, transportAddress, datagram)
 
     def startProtocol(self):
-        debug.logger & debug.flagIO and debug.logger('startProtocol: invoked')
+        debug.logger & debug.FLAG_IO and debug.logger('startProtocol: invoked')
         while self._writeQ:
             outgoingMessage, transportAddress = self._writeQ.pop(0)
-            debug.logger & debug.flagIO and debug.logger('startProtocol: transportAddress %r outgoingMessage %s' % (transportAddress, debug.hexdump(outgoingMessage)))
+            debug.logger & debug.FLAG_IO and debug.logger('startProtocol: transportAddress %r outgoingMessage %s' % (transportAddress, debug.hexdump(outgoingMessage)))
             try:
                 self.transport.write(outgoingMessage, transportAddress)
             except Exception as exc:
                 raise error.CarrierError('Twisted exception: %s' % exc)
 
     def stopProtocol(self):
-        debug.logger & debug.flagIO and debug.logger('stopProtocol: invoked')
+        debug.logger & debug.FLAG_IO and debug.logger('stopProtocol: invoked')
 
     def sendMessage(self, outgoingMessage, transportAddress):
-        debug.logger & debug.flagIO and debug.logger('startProtocol: %s transportAddress %r outgoingMessage %s' % ((self.transport is None and "queuing" or "sending"), transportAddress, debug.hexdump(outgoingMessage)))
+        debug.logger & debug.FLAG_IO and debug.logger('startProtocol: %s transportAddress %r outgoingMessage %s' % ((self.transport is None and "queuing" or "sending"), transportAddress, debug.hexdump(outgoingMessage)))
         if self.transport is None:
             self._writeQ.append((outgoingMessage, transportAddress))
         else:
diff --git a/pysnmp/carrier/twisted/dgram/udp.py b/pysnmp/carrier/twisted/dgram/udp.py
index bdb93cdd..eb47bb24 100644
--- a/pysnmp/carrier/twisted/dgram/udp.py
+++ b/pysnmp/carrier/twisted/dgram/udp.py
@@ -10,7 +10,7 @@ from pysnmp.carrier.base import AbstractTransportAddress
 from pysnmp.carrier.twisted.dgram.base import DgramTwistedTransport
 from pysnmp.carrier import error
 
-domainName = snmpUDPDomain = (1, 3, 6, 1, 6, 1, 1)
+DOMAIN_NAME = SNMP_UDP_DOMAIN = (1, 3, 6, 1, 6, 1, 1)
 
 
 class UdpTransportAddress(tuple, AbstractTransportAddress):
@@ -18,7 +18,7 @@ class UdpTransportAddress(tuple, AbstractTransportAddress):
 
 
 class UdpTwistedTransport(DgramTwistedTransport):
-    addressType = UdpTransportAddress
+    ADDRESS_TYPE = UdpTransportAddress
     _lport = None
 
     # AbstractTwistedTransport API
diff --git a/pysnmp/carrier/twisted/dgram/unix.py b/pysnmp/carrier/twisted/dgram/unix.py
index fe9c459b..24fdc5c7 100644
--- a/pysnmp/carrier/twisted/dgram/unix.py
+++ b/pysnmp/carrier/twisted/dgram/unix.py
@@ -10,13 +10,15 @@ from pysnmp.carrier.base import AbstractTransportAddress
 from pysnmp.carrier.twisted.dgram.base import DgramTwistedTransport
 from pysnmp.carrier import error
 
-domainName = snmpLocalDomain = (1, 3, 6, 1, 2, 1, 100, 1, 13)
+DOMAIN_NAME = SNMP_LOCAL_DOMAIN = (1, 3, 6, 1, 2, 1, 100, 1, 13)
+
 
 class UnixTransportAddress(str, AbstractTransportAddress):
     pass
 
+
 class UnixTwistedTransport(DgramTwistedTransport):
-    addressType = UnixTransportAddress
+    ADDRESS_TYPE = UnixTransportAddress
     _lport = None
 
     # AbstractTwistedTransport API
@@ -43,4 +45,5 @@ class UnixTwistedTransport(DgramTwistedTransport):
                 d.addCallback(lambda x: None)
         DgramTwistedTransport.closeTransport(self)
 
+
 UnixTransport = UnixTwistedTransport
diff --git a/pysnmp/carrier/twisted/dispatch.py b/pysnmp/carrier/twisted/dispatch.py
index def16f6f..cacc20b4 100644
--- a/pysnmp/carrier/twisted/dispatch.py
+++ b/pysnmp/carrier/twisted/dispatch.py
@@ -34,9 +34,11 @@ class TwistedDispatcher(AbstractTransportDispatcher):
         if not reactor.running:
             try:
                 reactor.run()
+
             except KeyboardInterrupt:
                 raise
-            except:
+
+            except Exception:
                 raise PySnmpError('reactor error: %s' % ';'.join(traceback.format_exception(*sys.exc_info())))
 
     # jobstarted/jobfinished might be okay as-is