LADI
/
py-twisted
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'trunk' into 9681-conch-rsa-iqmp

This commit is contained in:
Glyph 2019-08-04 22:30:41 -07:00 committed by GitHub
parent 924517fdc8 2f16887c73
commit 6d92107a8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/twisted/newsfragments/9677.misc Normal file
View File

0
src/twisted/newsfragments/9684.misc Normal file
View File

2
src/twisted/test/iosim.py
View File

@ -23,8 +23,8 @@ from twisted.internet.error import ConnectionRefusedError
from twisted.python.failure import Failure
from twisted.internet import error
from twisted.internet import interfaces
from twisted.internet.testing import MemoryReactorClock
from .proto_helpers import MemoryReactorClock
class TLSNegotiation:

22
src/twisted/trial/runner.py
View File

@ -551,17 +551,17 @@ class TestLoader(object):
warnings.warn("trial only supports doctesting modules")
return
extraArgs = {}
if sys.version_info > (2, 4):
# Work around Python issue2604: DocTestCase.tearDown clobbers globs
def saveGlobals(test):
"""
Save C{test.globs} and replace it with a copy so that if
necessary, the original will be available for the next test
run.
"""
test._savedGlobals = getattr(test, '_savedGlobals', test.globs)
test.globs = test._savedGlobals.copy()
extraArgs['setUp'] = saveGlobals
# Work around Python issue2604: DocTestCase.tearDown clobbers globs
def saveGlobals(test):
"""
Save C{test.globs} and replace it with a copy so that if
necessary, the original will be available for the next test
run.
"""
test._savedGlobals = getattr(test, '_savedGlobals', test.globs)
test.globs = test._savedGlobals.copy()
extraArgs['setUp'] = saveGlobals
return doctest.DocTestSuite(module, **extraArgs)
def loadAnything(self, thing, recurse=False, parent=None, qualName=None):