haraldwolff
/
pysnmp-sky
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Fix var-bind initialization from ObjectIdentity at hlapi" 

This reverts commit 23d1aa7bf5.
add-hlapi-unit-tests
Ilya Etingof 2018-07-05 13:39:18 +02:00
parent dc34f140e3
commit 212e1b54c3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -1,4 +1,5 @@
Revision 5.0.0, released 2018-07-??
-----------------------------------
@ -31,7 +32,6 @@ Revision 4.4.5, released 2018-07-XX
- Fixed typo in RFC1158 module
- Fixed possible infinite loop in GETBULK response PDU builder
- Fixed memory leak in the `config.delContext()` VACM management harness
- Fixed var-binds initialization from `ObjectIdentity` object at `hlapi`
Revision 4.4.4, released 2018-01-03
-----------------------------------

8
pysnmp/hlapi/varbinds.py
View File

@ -29,8 +29,8 @@ class CommandGeneratorVarBinds(AbstractVarBinds):
for varBind in varBinds:
if isinstance(varBind, ObjectType):
pass
elif isinstance(varBind, ObjectIdentity):
varBind = ObjectType(varBind)
elif isinstance(varBind[0], ObjectIdentity):
varBind = ObjectType(*varBind)
elif isinstance(varBind[0][0], tuple): # legacy
varBind = ObjectType(ObjectIdentity(varBind[0][0][0], varBind[0][0][1], *varBind[0][1:]), varBind[1])
else:
@ -57,8 +57,8 @@ class NotificationOriginatorVarBinds(AbstractVarBinds):
for varBind in varBinds:
if isinstance(varBind, ObjectType):
pass
elif isinstance(varBind, ObjectIdentity):
varBind = ObjectType(varBind)
elif isinstance(varBind[0], ObjectIdentity):
varBind = ObjectType(*varBind)
else:
varBind = ObjectType(ObjectIdentity(varBind[0]), varBind[1])
__varBinds.append(varBind.resolveWithMib(mibViewController))