Merge branch 'trunk' into 9678-http-multipart-py37

This commit is contained in:
Glyph 2020-01-08 23:07:32 -08:00 committed by GitHub
commit 3353423763
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions

View File

@ -0,0 +1 @@

View File

@ -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