[Python-modules-commits] [websocket-client] 01/03: Use debian-global ca cert store, instead of local mozilla copy

[Thomas Goirand]

This is an automated email from the git hooks/post-receive script.

zigo pushed a commit to branch master
in repository websocket-client.

commit ae22a2564d2be8f1bea90a2c05e5dd05c8760597
Author: Thomas Goirand <thomas at goirand.fr>
Date:   Thu Sep 8 15:44:33 2016 +0000

    Use debian-global ca cert store, instead of local mozilla copy
---
 setup.py           | 1 -
 websocket/_http.py | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 13778d7..9b91574 100644
--- a/setup.py
+++ b/setup.py
@@ -41,7 +41,6 @@ setup(
     packages=["websocket", "websocket.tests"],
     package_data={
         'websocket.tests': ['data/*.txt'],
-        'websocket': ["cacert.pem"]
     },
     tests_require=tests_require,
     test_suite="websocket.tests.test_websocket",
diff --git a/websocket/_http.py b/websocket/_http.py
index 63f3f83..224ebe2 100644
--- a/websocket/_http.py
+++ b/websocket/_http.py
@@ -159,8 +159,7 @@ def _ssl_socket(sock, user_sslopt, hostname):
     sslopt = dict(cert_reqs=ssl.CERT_REQUIRED)
     sslopt.update(user_sslopt)
     
-    certPath = os.path.join(
-        os.path.dirname(__file__), "cacert.pem")
+    certPath = "/etc/ssl/certs/ca-certificates.crt"
     if os.path.isfile(certPath) and user_sslopt.get('ca_certs', None) == None:
         sslopt['ca_certs'] = certPath
     check_hostname = sslopt["cert_reqs"] != ssl.CERT_NONE and sslopt.pop('check_hostname', True)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/websocket-client.git