Author: Matti Picus <[email protected]>
Branch: py3.6
Changeset: r96148:0aa14088b8a4
Date: 2019-02-24 16:41 +0200
http://bitbucket.org/pypy/pypy/changeset/0aa14088b8a4/
Log: merge default into branch
diff --git a/pypy/conftest.py b/pypy/conftest.py
--- a/pypy/conftest.py
+++ b/pypy/conftest.py
@@ -19,7 +19,7 @@
except ImportError:
pass
else:
- if __version__[:2] < '3.6':
+ if __version__[:3] < '3.6':
s = settings(deadline=None)
settings.register_profile('default', s)
else:
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
