Author: Matti Picus <[email protected]>
Branch: py3.6
Changeset: r98241:d91c0d495118
Date: 2019-12-06 16:34 +0200
http://bitbucket.org/pypy/pypy/changeset/d91c0d495118/

Log:    merge default into py3.6

diff --git a/pypy/module/thread/test/test_thread.py 
b/pypy/module/thread/test/test_thread.py
--- a/pypy/module/thread/test/test_thread.py
+++ b/pypy/module/thread/test/test_thread.py
@@ -1,5 +1,6 @@
 import thread, time
 from pypy.module.thread.test.support import GenericTestThread
+import pytest
 
 class AppTestThread(GenericTestThread):
 
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to