From cc2632d6d5c0096e0b563fb15750562c281af1eb Mon Sep 17 00:00:00 2001 From: Ilya Etingof Date: Sun, 10 Feb 2019 16:57:15 +0100 Subject: Fix misnamed constants This is a follow up to 588b9b902d191d8010cb6b247fcb07887d59542c fixing a couple of improperly named constants. --- pysnmp/carrier/asyncio/dgram/udp6.py | 12 ++++++------ pysnmp/carrier/asyncore/dgram/udp6.py | 14 +++++++------- pysnmp/hlapi/v1arch/asyncore/cmdgen.py | 18 +++++++++--------- pysnmp/hlapi/v1arch/dispatch.py | 10 +++++----- pysnmp/hlapi/v3arch/twisted/transport.py | 5 +++-- 5 files changed, 30 insertions(+), 29 deletions(-) (limited to 'pysnmp') diff --git a/pysnmp/carrier/asyncio/dgram/udp6.py b/pysnmp/carrier/asyncio/dgram/udp6.py index f3708852..d9bd6bfe 100644 --- a/pysnmp/carrier/asyncio/dgram/udp6.py +++ b/pysnmp/carrier/asyncio/dgram/udp6.py @@ -22,13 +22,13 @@ class Udp6AsyncioTransport(DgramAsyncioProtocol): def normalizeAddress(self, transportAddress): if '%' in transportAddress[0]: # strip zone ID - return self.addressType((transportAddress[0].split('%')[0], - transportAddress[1], - 0, # flowinfo - 0)) # scopeid + return self.ADDRESS_TYPE((transportAddress[0].split('%')[0], + transportAddress[1], + 0, # flowinfo + 0)) # scopeid else: - return self.addressType((transportAddress[0], - transportAddress[1], 0, 0)) + return self.ADDRESS_TYPE((transportAddress[0], + transportAddress[1], 0, 0)) Udp6Transport = Udp6AsyncioTransport diff --git a/pysnmp/carrier/asyncore/dgram/udp6.py b/pysnmp/carrier/asyncore/dgram/udp6.py index ee99674d..26af0ba5 100644 --- a/pysnmp/carrier/asyncore/dgram/udp6.py +++ b/pysnmp/carrier/asyncore/dgram/udp6.py @@ -22,15 +22,15 @@ class Udp6SocketTransport(DgramSocketTransport): def normalizeAddress(self, transportAddress): if '%' in transportAddress[0]: # strip zone ID - ta = self.addressType((transportAddress[0].split('%')[0], - transportAddress[1], - 0, # flowinfo - 0)) # scopeid + ta = self.ADDRESS_TYPE((transportAddress[0].split('%')[0], + transportAddress[1], + 0, # flowinfo + 0)) # scopeid else: - ta = self.addressType((transportAddress[0], - transportAddress[1], 0, 0)) + ta = self.ADDRESS_TYPE((transportAddress[0], + transportAddress[1], 0, 0)) - if (isinstance(transportAddress, self.addressType) and + if (isinstance(transportAddress, self.ADDRESS_TYPE) and transportAddress.getLocalAddress()): return ta.setLocalAddress(transportAddress.getLocalAddress()) else: diff --git a/pysnmp/hlapi/v1arch/asyncore/cmdgen.py b/pysnmp/hlapi/v1arch/asyncore/cmdgen.py index a0eb1293..722f37df 100644 --- a/pysnmp/hlapi/v1arch/asyncore/cmdgen.py +++ b/pysnmp/hlapi/v1arch/asyncore/cmdgen.py @@ -14,7 +14,7 @@ from pysnmp import error __all__ = ['getCmd', 'nextCmd', 'setCmd', 'bulkCmd'] -vbProcessor = CommandGeneratorVarBinds() +VB_PROCESSOR = CommandGeneratorVarBinds() def getCmd(snmpDispatcher, authData, transportTarget, *varBinds, **options): @@ -128,7 +128,7 @@ def getCmd(snmpDispatcher, authData, transportTarget, *varBinds, **options): varBinds = pMod.apiPDU.getVarBinds(rspPdu) if lookupMib: - varBinds = vbProcessor.unmakeVarBinds(snmpDispatcher.cache, varBinds) + varBinds = VB_PROCESSOR.unmakeVarBinds(snmpDispatcher.cache, varBinds) nextStateHandle = pMod.getNextRequestID() @@ -149,7 +149,7 @@ def getCmd(snmpDispatcher, authData, transportTarget, *varBinds, **options): lookupMib, cbFun, cbCtx = [options.get(x) for x in ('lookupMib', 'cbFun', 'cbCtx')] if lookupMib: - varBinds = vbProcessor.makeVarBinds(snmpDispatcher.cache, varBinds) + varBinds = VB_PROCESSOR.makeVarBinds(snmpDispatcher.cache, varBinds) pMod = api.PROTOCOL_MODULES[authData.mpModel] @@ -272,7 +272,7 @@ def setCmd(snmpDispatcher, authData, transportTarget, varBinds = pMod.apiPDU.getVarBinds(rspPdu) if lookupMib: - varBinds = vbProcessor.unmakeVarBinds(snmpDispatcher.cache, varBinds) + varBinds = VB_PROCESSOR.unmakeVarBinds(snmpDispatcher.cache, varBinds) nextStateHandle = pMod.getNextRequestID() @@ -293,7 +293,7 @@ def setCmd(snmpDispatcher, authData, transportTarget, lookupMib, cbFun, cbCtx = [options.get(x) for x in ('lookupMib', 'cbFun', 'cbCtx')] if lookupMib: - varBinds = vbProcessor.makeVarBinds(snmpDispatcher.cache, varBinds) + varBinds = VB_PROCESSOR.makeVarBinds(snmpDispatcher.cache, varBinds) pMod = api.PROTOCOL_MODULES[authData.mpModel] @@ -415,7 +415,7 @@ def nextCmd(snmpDispatcher, authData, transportTarget, if options.get('lookupMib'): varBindTable = [ - vbProcessor.unmakeVarBinds(snmpDispatcher.cache, vbs) for vbs in varBindTable + VB_PROCESSOR.unmakeVarBinds(snmpDispatcher.cache, vbs) for vbs in varBindTable ] nextStateHandle = pMod.getNextRequestID() @@ -438,7 +438,7 @@ def nextCmd(snmpDispatcher, authData, transportTarget, lookupMib, cbFun, cbCtx = [options.get(x) for x in ('lookupMib', 'cbFun', 'cbCtx')] if lookupMib: - varBinds = vbProcessor.makeVarBinds(snmpDispatcher.cache, varBinds) + varBinds = VB_PROCESSOR.makeVarBinds(snmpDispatcher.cache, varBinds) pMod = api.PROTOCOL_MODULES[authData.mpModel] @@ -588,7 +588,7 @@ def bulkCmd(snmpDispatcher, authData, transportTarget, if options.get('lookupMib'): varBindTable = [ - vbProcessor.unmakeVarBinds(snmpDispatcher.cache, vbs) for vbs in varBindTable + VB_PROCESSOR.unmakeVarBinds(snmpDispatcher.cache, vbs) for vbs in varBindTable ] nextStateHandle = pMod.getNextRequestID() @@ -614,7 +614,7 @@ def bulkCmd(snmpDispatcher, authData, transportTarget, lookupMib, cbFun, cbCtx = [options.get(x) for x in ('lookupMib', 'cbFun', 'cbCtx')] if lookupMib: - varBinds = vbProcessor.makeVarBinds(snmpDispatcher.cache, varBinds) + varBinds = VB_PROCESSOR.makeVarBinds(snmpDispatcher.cache, varBinds) pMod = api.PROTOCOL_MODULES[authData.mpModel] diff --git a/pysnmp/hlapi/v1arch/dispatch.py b/pysnmp/hlapi/v1arch/dispatch.py index e52c999d..56300d1b 100644 --- a/pysnmp/hlapi/v1arch/dispatch.py +++ b/pysnmp/hlapi/v1arch/dispatch.py @@ -72,11 +72,11 @@ class AbstractSnmpDispatcher(object): def sendPdu(self, authData, transportTarget, reqPdu, cbFun=None, cbCtx=None): if (self._automaticDispatcher and - transportTarget.transportDomain not in self._configuredTransports): + transportTarget.TRANSPORT_DOMAIN not in self._configuredTransports): self.transportDispatcher.registerTransport( - transportTarget.transportDomain, transportTarget.protoTransport().openClientMode() + transportTarget.TRANSPORT_DOMAIN, transportTarget.PROTO_TRANSPORT().openClientMode() ) - self._configuredTransports.add(transportTarget.transportDomain) + self._configuredTransports.add(transportTarget.TRANSPORT_DOMAIN) pMod = api.PROTOCOL_MODULES[authData.mpModel] @@ -97,7 +97,7 @@ class AbstractSnmpDispatcher(object): ) self.transportDispatcher.sendMessage( - outgoingMsg, transportTarget.transportDomain, transportTarget.transportAddr + outgoingMsg, transportTarget.TRANSPORT_DOMAIN, transportTarget.transportAddr ) if (reqPdu.__class__ is getattr(pMod, 'SNMPv2TrapPDU', None) or @@ -165,5 +165,5 @@ class AbstractSnmpDispatcher(object): outgoingMsg = stateInfo['outgoingMsg'] self.transportDispatcher.sendMessage( - outgoingMsg, transportTarget.transportDomain, transportTarget.transportAddr + outgoingMsg, transportTarget.TRANSPORT_DOMAIN, transportTarget.transportAddr ) diff --git a/pysnmp/hlapi/v3arch/twisted/transport.py b/pysnmp/hlapi/v3arch/twisted/transport.py index dafc6387..db4a7b79 100644 --- a/pysnmp/hlapi/v3arch/twisted/transport.py +++ b/pysnmp/hlapi/v3arch/twisted/transport.py @@ -47,8 +47,9 @@ class UdpTransportTarget(AbstractTransportTarget): >>> """ - transportDomain = udp.DOMAIN_NAME - protoTransport = udp.UdpTwistedTransport + TRANSPORT_DOMAIN = udp.DOMAIN_NAME + PROTO_TRANSPORT = udp.UdpTwistedTransport + def _resolveAddr(self, transportAddr): try: return socket.getaddrinfo(transportAddr[0], -- cgit v1.2.1