PYTHON-2808 Use Invoke-WebRequest instead certifi to workaround FLE test issue (mongodb#714)

Author: ShaneHarvey

.evergreen/run-tests.sh

@@ -107,6 +107,8 @@ if [ -n "$TEST_ENCRYPTION" ]; then
 
     if [ "Windows_NT" = "$OS" ]; then # Magic variable in cygwin
         $PYTHON -m pip install -U setuptools
+        # PYTHON-2808 Ensure this machine has the CA cert for google KMS.
+        powershell.exe "Invoke-WebRequest -URI https://oauth2.googleapis.com/" > /dev/null || true
     fi
 
     if [ -z "$LIBMONGOCRYPT_URL" ]; then
@@ -149,10 +151,6 @@ if [ -n "$TEST_ENCRYPTION" ]; then
     . $DRIVERS_TOOLS/.evergreen/csfle/set-temp-creds.sh
 
     # Start the mock KMS servers.
-    if [ "$OS" = "Windows_NT" ]; then
-        # Remove after BUILD-13574.
-        python -m pip install certifi
-    fi
     pushd ${DRIVERS_TOOLS}/.evergreen/csfle
     python -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/expired.pem --port 8000 &
     python -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/wrong-host.pem --port 8001 &

bson/codec_options.py

@@ -172,7 +172,7 @@ def __eq__(self, other):
      'unicode_decode_error_handler', 'tzinfo', 'type_registry'))
 
 
-class CodecOptions(_options_base):
+class JSCodecOptions(_options_base):
     """Encapsulates options used encoding and / or decoding BSON.
 
     The `document_class` option is used to define a custom type for use

bson/json_util.py

@@ -229,7 +229,7 @@ class JSONOptions(CodecOptions):
       - `tz_aware`: If ``True``, MongoDB Extended JSON's *Strict mode* type
         `Date` will be decoded to timezone aware instances of
         :class:`datetime.datetime`. Otherwise they will be naive. Defaults
-        to ``True``.
+        to ``False``.
       - `tzinfo`: A :class:`datetime.tzinfo` subclass that specifies the
         timezone from which :class:`~datetime.datetime` objects should be
         decoded. Defaults to :const:`~bson.tz_util.utc`.
@@ -249,7 +249,7 @@ def __new__(cls, strict_number_long=False,
                 datetime_representation=DatetimeRepresentation.LEGACY,
                 strict_uuid=False, json_mode=JSONMode.LEGACY,
                 *args, **kwargs):
-        kwargs["tz_aware"] = kwargs.get("tz_aware", True)
+        kwargs["tz_aware"] = kwargs.get("tz_aware", False)
         if kwargs["tz_aware"]:
             kwargs["tzinfo"] = kwargs.get("tzinfo", utc)
         if datetime_representation not in (DatetimeRepresentation.LEGACY,

test/test_encryption.py

@@ -55,8 +55,7 @@
 from test import (unittest,
                   client_context,
                   IntegrationTest,
-                  PyMongoTestCase,
-                  SystemCertsPatcher)
+                  PyMongoTestCase)
 from test.utils import (TestCreator,
                         camel_to_snake_args,
                         OvertCommandListener,
@@ -66,26 +65,6 @@
                         wait_until)
 from test.utils_spec_runner import SpecRunner
 
-try:
-    import certifi
-    HAVE_CERTIFI = True
-except ImportError:
-    HAVE_CERTIFI = False
-
-patcher = None
-
-
-def setUpModule():
-    if sys.platform == 'win32' and HAVE_CERTIFI:
-        # Remove after BUILD-13574.
-        global patcher
-        patcher = SystemCertsPatcher(certifi.where())
-
-
-def tearDownModule():
-    if patcher:
-        patcher.disable()
-
 
 def get_client_opts(client):
     return client._MongoClient__options