Merge pull request urllib3#714 from a-tal/master

shazow · shazow · commit 7d72ffc8c97e · 2015-10-05T11:56:12.000-07:00
allows user paths for ca_cert verify path
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -172,6 +172,9 @@ In chronological order:
 * Predrag Gruevski <https://github.com/obi1kenobi>
   * Made cert digest comparison use a constant-time algorithm.
 
+* Adam Talsma <https://github.com/a-tal>
+  * Bugfix to ca_cert file paths.
+
 * [Your name or handle] <[email or website]>
   * [Brief summary of your changes]
 
diff --git a/urllib3/connection.py b/urllib3/connection.py
@@ -1,4 +1,5 @@
 import datetime
+import os
 import sys
 import socket
 from socket import error as SocketError, timeout as SocketTimeout
@@ -205,10 +206,10 @@ def set_cert(self, key_file=None, cert_file=None,
         self.key_file = key_file
         self.cert_file = cert_file
         self.cert_reqs = cert_reqs
-        self.ca_certs = ca_certs
-        self.ca_cert_dir = ca_cert_dir
         self.assert_hostname = assert_hostname
         self.assert_fingerprint = assert_fingerprint
+        self.ca_certs = ca_certs and os.path.expanduser(ca_certs)
+        self.ca_cert_dir = ca_cert_dir and os.path.expanduser(ca_cert_dir)
 
     def connect(self):
         # Add certificate verification
