Reset bundle path to use system settings/environment variables (#697)

Author: snowman2

pyproj/network.py

@@ -33,23 +33,29 @@ def set_ca_bundle_path(ca_bundle_path: Union[Path, str, bool, None] = None) -> N
         Default is None, which only uses the `certifi` package path as a fallback if
         the environment variables are not set. If a path is passed in, then
         that will be the path used. If it is set to True, then it will default
-        to using the path provied by the `certifi` package. If it is set to False,
-        then it will not set the path.
+        to using the path provied by the `certifi` package. If it is set to False
+        or an empty string then it will default to the system settings or environment
+        variables.
     """
-    if ca_bundle_path is False:
-        return
-
     env_var_names = (
         "PROJ_CURL_CA_BUNDLE",
         "CURL_CA_BUNDLE",
         "SSL_CERT_FILE",
     )
-    if isinstance(ca_bundle_path, (str, Path)):
+    if ca_bundle_path is False:
+        # need to reset CA Bundle path to use system settings
+        # or environment variables because it
+        # could have been changed by the user previously
+        ca_bundle_path = ""
+    elif isinstance(ca_bundle_path, (str, Path)):
         ca_bundle_path = str(ca_bundle_path)
     elif (ca_bundle_path is True) or not any(
         env_var_name in os.environ for env_var_name in env_var_names
     ):
         ca_bundle_path = certifi.where()
+    else:
+        # reset CA Bundle path to use system settings
+        # or environment variables
+        ca_bundle_path = ""
 
-    if isinstance(ca_bundle_path, str):
-        _set_ca_bundle_path(ca_bundle_path)
+    _set_ca_bundle_path(ca_bundle_path)

test/test_network.py

@@ -26,7 +26,7 @@ def test_ca_bundle_path__always_certifi(c_set_ca_bundle_path_mock, env_var):
 @patch("pyproj.network._set_ca_bundle_path")
 def test_ca_bundle_path__skip(c_set_ca_bundle_path_mock):
     set_ca_bundle_path(False)
-    c_set_ca_bundle_path_mock.assert_not_called()
+    c_set_ca_bundle_path_mock.assert_called_with("")
 
 
 @pytest.mark.parametrize(
@@ -36,7 +36,7 @@ def test_ca_bundle_path__skip(c_set_ca_bundle_path_mock):
 def test_ca_bundle_path__env_var_skip(c_set_ca_bundle_path_mock, env_var):
     with patch.dict("os.environ", {env_var: "/tmp/dummy/path/cacert.pem"}, clear=True):
         set_ca_bundle_path()
-    c_set_ca_bundle_path_mock.assert_not_called()
+    c_set_ca_bundle_path_mock.assert_called_with("")
 
 
 @pytest.mark.parametrize(