Skip to content

Commit 8a3727a

Browse files
etingofetingof
committed
Fix Python 2.4-2.5 except statement
Older Pythons do not support 'except ... as...' syntax.
1 parent 43a181b commit 8a3727a

File tree

4 files changed

+40
-20
lines changed

4 files changed

+40
-20
lines changed

‎pysnmp/hlapi/asyncio/cmdgen.py‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
3232
# THE POSSIBILITY OF SUCH DAMAGE.
3333
#
34+
import sys
35+
3436
from pysnmp.smi.rfc1902 import *
3537
from pysnmp.hlapi.auth import *
3638
from pysnmp.hlapi.context import *
@@ -41,6 +43,7 @@
4143

4244
try:
4345
import asyncio
46+
4447
except ImportError:
4548
import trollius as asyncio
4649

@@ -137,8 +140,9 @@ def __cbFun(snmpEngine, sendRequestHandle,
137140
try:
138141
varBindsUnmade = vbProcessor.unmakeVarBinds(snmpEngine, varBinds,
139142
lookupMib)
140-
except Exception as e:
141-
future.set_exception(e)
143+
except Exception:
144+
ex = sys.exc_info()[1]
145+
future.set_exception(ex)
142146
else:
143147
future.set_result(
144148
(errorIndication, errorStatus, errorIndex, varBindsUnmade)
@@ -242,8 +246,9 @@ def __cbFun(snmpEngine, sendRequestHandle,
242246
try:
243247
varBindsUnmade = vbProcessor.unmakeVarBinds(snmpEngine, varBinds,
244248
lookupMib)
245-
except Exception as e:
246-
future.set_exception(e)
249+
except Exception:
250+
ex = sys.exc_info()[1]
251+
future.set_exception(ex)
247252
else:
248253
future.set_result(
249254
(errorIndication, errorStatus, errorIndex, varBindsUnmade)
@@ -353,8 +358,9 @@ def __cbFun(snmpEngine, sendRequestHandle,
353358
varBindTableRow,
354359
lookupMib)
355360
for varBindTableRow in varBindTable]
356-
except Exception as e:
357-
future.set_exception(e)
361+
except Exception:
362+
ex = sys.exc_info()[1]
363+
future.set_exception(ex)
358364
else:
359365
future.set_result(
360366
(errorIndication, errorStatus, errorIndex, varBindsUnmade)
@@ -493,8 +499,9 @@ def __cbFun(snmpEngine, sendRequestHandle,
493499
varBindTableRow,
494500
lookupMib)
495501
for varBindTableRow in varBindTable]
496-
except Exception as e:
497-
future.set_exception(e)
502+
except Exception:
503+
ex = sys.exc_info()[1]
504+
future.set_exception(ex)
498505
else:
499506
future.set_result(
500507
(errorIndication, errorStatus, errorIndex, varBindsUnmade)

‎pysnmp/hlapi/asyncio/ntforg.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
# Authors: Matt Hooks <[email protected]>
99
# Zachary Lorusso <[email protected]>
1010
#
11+
import sys
12+
1113
from pysnmp.smi.rfc1902 import *
1214
from pysnmp.hlapi.auth import *
1315
from pysnmp.hlapi.context import *
@@ -18,6 +20,7 @@
1820

1921
try:
2022
import asyncio
23+
2124
except ImportError:
2225
import trollius as asyncio
2326

@@ -127,8 +130,9 @@ def __cbFun(snmpEngine, sendRequestHandle,
127130
try:
128131
varBindsUnmade = vbProcessor.unmakeVarBinds(snmpEngine, varBinds,
129132
lookupMib)
130-
except Exception as e:
131-
future.set_exception(e)
133+
except Exception:
134+
ex = sys.exc_info()[1]
135+
future.set_exception(ex)
132136
else:
133137
future.set_result(
134138
(errorIndication, errorStatus, errorIndex, varBindsUnmade)

‎pysnmp/hlapi/twisted/cmdgen.py‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
# Copyright (c) 2005-2018, Ilya Etingof <[email protected]>
55
# License: http://snmplabs.com/pysnmp/license.html
66
#
7+
import sys
8+
79
from pysnmp.smi.rfc1902 import *
810
from pysnmp.hlapi.auth import *
911
from pysnmp.hlapi.context import *
@@ -120,8 +122,9 @@ def __cbFun(snmpEngine, sendRequestHandle,
120122
try:
121123
varBindsUnmade = vbProcessor.unmakeVarBinds(snmpEngine, varBinds, lookupMib)
122124

123-
except Exception as e:
124-
deferred.errback(Failure(e))
125+
except Exception:
126+
ex = sys.exc_info()[1]
127+
deferred.errback(Failure(ex))
125128

126129
else:
127130
deferred.callback((errorStatus, errorIndex, varBindsUnmade))
@@ -236,8 +239,9 @@ def __cbFun(snmpEngine, sendRequestHandle,
236239
try:
237240
varBindsUnmade = vbProcessor.unmakeVarBinds(snmpEngine, varBinds, lookupMib)
238241

239-
except Exception as e:
240-
deferred.errback(Failure(e))
242+
except Exception:
243+
ex = sys.exc_info()[1]
244+
deferred.errback(Failure(ex))
241245

242246
else:
243247
deferred.callback((errorStatus, errorIndex, varBindsUnmade))
@@ -366,8 +370,9 @@ def __cbFun(snmpEngine, sendRequestHandle,
366370
lookupMib)
367371
for varBindTableRow in varBindTable]
368372

369-
except Exception as e:
370-
deferred.errback(Failure(e))
373+
except Exception:
374+
ex = sys.exc_info()[1]
375+
deferred.errback(Failure(ex))
371376

372377
else:
373378
deferred.callback((errorStatus, errorIndex, varBindsUnmade))
@@ -524,8 +529,9 @@ def __cbFun(snmpEngine, sendRequestHandle,
524529
lookupMib)
525530
for varBindTableRow in varBindTable]
526531

527-
except Exception as e:
528-
deferred.errback(Failure(e))
532+
except Exception:
533+
ex = sys.exc_info()[1]
534+
deferred.errback(Failure(ex))
529535

530536
else:
531537
deferred.callback((errorStatus, errorIndex, varBindsUnmade))

‎pysnmp/hlapi/twisted/ntforg.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
# Copyright (c) 2005-2018, Ilya Etingof <[email protected]>
55
# License: http://snmplabs.com/pysnmp/license.html
66
#
7+
import sys
8+
79
from pysnmp.smi.rfc1902 import *
810
from pysnmp.hlapi.auth import *
911
from pysnmp.hlapi.context import *
@@ -128,8 +130,9 @@ def __cbFun(snmpEngine, sendRequestHandle,
128130
try:
129131
varBindsUnmade = vbProcessor.unmakeVarBinds(snmpEngine, varBinds, lookupMib)
130132

131-
except Exception as e:
132-
deferred.errback(Failure(e))
133+
except Exception:
134+
ex = sys.exc_info()[1]
135+
deferred.errback(Failure(ex))
133136

134137
else:
135138
deferred.callback((errorStatus, errorIndex, varBindsUnmade))

0 commit comments

Comments
 (0)