Merge branch 'trunk' into 9678-http-multipart-py37
This commit is contained in:
commit
3353423763
|
@ -0,0 +1 @@
|
|||
|
|
@ -15,7 +15,7 @@ from twisted.logger import (
|
|||
LogLevel, LogPublisher, LogBeginner,
|
||||
FileLogObserver, FilteringLogObserver, LogLevelFilterPredicate,
|
||||
)
|
||||
from twisted.test.proto_helpers import MemoryReactor
|
||||
from twisted.internet.testing import MemoryReactor
|
||||
|
||||
from ...runner import _runner
|
||||
from .._exit import ExitStatus
|
||||
|
|
Loading…
Reference in New Issue