summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Etingof <etingof@gmail.com>2018-07-05 10:38:56 +0200
committerIlya Etingof <etingof@gmail.com>2018-07-05 10:38:56 +0200
commit23d1aa7bf5139d05c29ef27f6a5f68948c93a9df (patch)
tree01ee8e2059cc2a6d6b69801a35dfb11bd6772570
parent06eeaf6fbfee6c638f6cd455ef99c0cd909ce740 (diff)
downloadpysnmp-git-23d1aa7bf5139d05c29ef27f6a5f68948c93a9df.tar.gz
Fix var-bind initialization from ObjectIdentity at hlapi
-rw-r--r--CHANGES.txt3
-rw-r--r--pysnmp/hlapi/varbinds.py8
2 files changed, 6 insertions, 5 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index be7ab3a8..6e234b2f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,11 +1,12 @@
-Revision 4.4.5, released 2018-04-XX
+Revision 4.4.5, released 2018-07-XX
-----------------------------------
- Fixed broken InetAddressType rendering caused by a pyasn1 regression
- Fixed typo in RFC1158 module
- Fixed possible infinite loop in GETBULK response PDU builder
- Fixed memory leak in the T`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 ac9151a8..4d80a970 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[0], ObjectIdentity):
- varBind = ObjectType(*varBind)
+ elif isinstance(varBind, 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[0], ObjectIdentity):
- varBind = ObjectType(*varBind)
+ elif isinstance(varBind, ObjectIdentity):
+ varBind = ObjectType(varBind)
else:
varBind = ObjectType(ObjectIdentity(varBind[0]), varBind[1])
__varBinds.append(varBind.resolveWithMib(mibViewController))