merge heads

This commit is contained in:
Ned Deily
2015-12-06 00:00:57 -05:00

View File

@@ -462,7 +462,7 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
test_times = []
test_support.use_resources = use_resources
save_modules = set(sys.modules.keys())
save_modules = set(sys.modules)
def accumulate_result(test, result):
ok, test_time = result