Author: Matti Picus <matti.pi...@gmail.com>
Branch:
Changeset: r96679:86a195a12002
Date: 2019-05-25 15:47 +0300
http://bitbucket.org/pypy/pypy/changeset/86a195a12002/
Log: unskip tests, fix a failure. Be careful when merging to py3.6!
diff --git a/lib-python/conftest.py b/lib-python/conftest.py
--- a/lib-python/conftest.py
+++ b/lib-python/conftest.py
@@ -401,7 +401,7 @@
RegrTest('test_source_encoding.py'),
RegrTest('test_spwd.py'),
RegrTest('test_sqlite.py', usemodules="thread _rawffi zlib"),
- RegrTest('test_ssl.py', usemodules='_ssl _socket select'),
+ RegrTest('test_ssl.py', usemodules='_socket select'),
RegrTest('test_startfile.py'),
RegrTest('test_stat.py'),
RegrTest('test_str.py', core=True),
diff --git a/lib_pypy/_cffi_ssl/_stdssl/__init__.py
b/lib_pypy/_cffi_ssl/_stdssl/__init__.py
--- a/lib_pypy/_cffi_ssl/_stdssl/__init__.py
+++ b/lib_pypy/_cffi_ssl/_stdssl/__init__.py
@@ -1025,7 +1025,7 @@
self._add_ca_certs(buf, len(buf), ca_file_type)
# load cafile or capath
- if cafile or capath:
+ if cafile is not None or capath is not None:
if cafile is None:
cafilebuf = ffi.NULL
else:
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
