diff options
| author | Ilya Etingof <etingof@gmail.com> | 2017-10-18 11:45:02 +0200 |
|---|---|---|
| committer | Ilya Etingof <etingof@gmail.com> | 2017-10-18 11:45:02 +0200 |
| commit | 1065d25a16a6fa8dcb7ce98155f2d1babcff6ed5 (patch) | |
| tree | 600de9ca4c2a3ba84338e9a8ac36af03556d51f6 /pysnmp/proto | |
| parent | 2d75ac5da1c88a7e209c76cf43526732f4546cd4 (diff) | |
| download | pysnmp-git-1065d25a16a6fa8dcb7ce98155f2d1babcff6ed5.tar.gz | |
make sure to pass an initializer to ASN.1 Null()
This is a prerequisite for pyasn1 0.4.x
Diffstat (limited to 'pysnmp/proto')
| -rw-r--r-- | pysnmp/proto/api/v1.py | 4 | ||||
| -rw-r--r-- | pysnmp/proto/proxy/rfc2576.py | 4 | ||||
| -rw-r--r-- | pysnmp/proto/rfc1905.py | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/pysnmp/proto/api/v1.py b/pysnmp/proto/api/v1.py index a66355ef..6b812bd9 100644 --- a/pysnmp/proto/api/v1.py +++ b/pysnmp/proto/api/v1.py @@ -122,8 +122,7 @@ class PDUAPI(object): def setVarBinds(pdu, varBinds): varBindList = pdu.setComponentByPosition(3).getComponentByPosition(3) varBindList.clear() - idx = 0 - for varBind in varBinds: + for idx, varBind in enumerate(varBinds): if isinstance(varBind, VarBind): varBindList.setComponentByPosition(idx, varBind) else: @@ -131,7 +130,6 @@ class PDUAPI(object): apiVarBind.setOIDVal( varBindList.getComponentByPosition(idx), varBind ) - idx += 1 def getResponse(self, reqPDU): rspPDU = GetResponsePDU() diff --git a/pysnmp/proto/proxy/rfc2576.py b/pysnmp/proto/proxy/rfc2576.py index b576feba..f2963784 100644 --- a/pysnmp/proto/proxy/rfc2576.py +++ b/pysnmp/proto/proxy/rfc2576.py @@ -285,8 +285,8 @@ def v2ToV1(v2Pdu, origV1Pdu=None): v1.apiPDU.setErrorIndex(v1Pdu, 0) # Translate Var-Binds - if pduType in rfc3411.responseClassPDUs and \ - v1.apiPDU.getErrorStatus(v1Pdu): + if (pduType in rfc3411.responseClassPDUs and + v1.apiPDU.getErrorStatus(v1Pdu)): v1VarBinds = v1.apiPDU.getVarBinds(origV1Pdu) else: for oid, v2Val in v2VarBinds: diff --git a/pysnmp/proto/rfc1905.py b/pysnmp/proto/rfc1905.py index f2866343..8ba2172a 100644 --- a/pysnmp/proto/rfc1905.py +++ b/pysnmp/proto/rfc1905.py @@ -19,7 +19,7 @@ max_bindings = rfc1902.Integer(2147483647) # Take SNMP exception values out of BindValue structure for convenience UnSpecified = univ.Null -unSpecified = UnSpecified() +unSpecified = UnSpecified('') class NoSuchObject(univ.Null): |