diff options
| author | Ilya Etingof <etingof@gmail.com> | 2018-07-05 13:39:18 +0200 |
|---|---|---|
| committer | Ilya Etingof <etingof@gmail.com> | 2018-07-05 13:40:32 +0200 |
| commit | 212e1b54c3d356e6da8a470187fa185be8aa172e (patch) | |
| tree | 90e86028186b7fc459bf0e7da8b9288d43a86056 | |
| parent | dc34f140e3d444dd66935c12cf37d84569314ab9 (diff) | |
| download | pysnmp-git-212e1b54c3d356e6da8a470187fa185be8aa172e.tar.gz | |
Revert "Fix var-bind initialization from ObjectIdentity at hlapi"
This reverts commit 23d1aa7bf5139d05c29ef27f6a5f68948c93a9df.
| -rw-r--r-- | CHANGES.txt | 2 | ||||
| -rw-r--r-- | pysnmp/hlapi/varbinds.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 675b6647..48b2b170 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -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 ----------------------------------- diff --git a/pysnmp/hlapi/varbinds.py b/pysnmp/hlapi/varbinds.py index 4d80a970..ac9151a8 100644 --- a/pysnmp/hlapi/varbinds.py +++ b/pysnmp/hlapi/varbinds.py @@ -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)) |