Skip to content

Commit 68e0641

Browse files
committed
Fix incorrect/outdated type annotation
This type annotation caused some tests to freeze indefinitely when upgrading from Twisted 20 to 23.8. The correct location for `Failure` is in the module `twisted.python.failure`, but it may have been incidentally available also in `twisted.internet.defer.failure` in earlier versions.
1 parent 1420872 commit 68e0641

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

python/nav/mibs/mibretriever.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
from twisted.internet import defer, reactor
3838
from twisted.internet.defer import returnValue
3939
from twisted.internet.error import TimeoutError
40+
from twisted.python.failure import Failure
4041

4142
from nav.Snmp import safestring
4243
from nav.ipdevpoll import ContextLogger
@@ -428,7 +429,7 @@ def _result_formatter(result):
428429

429430
return formatted_result
430431

431-
def _snmp_timeout_handler(failure: defer.failure.Failure):
432+
def _snmp_timeout_handler(failure: Failure):
432433
"""Transforms SnmpTimeoutErrors into "regular" TimeoutErrors"""
433434
failure.trap(SnmpTimeoutError)
434435
raise TimeoutError(failure.value)

0 commit comments

Comments
 (0)