fix tests

Author: blink1073

flask_pymongo/__init__.py

@@ -42,7 +42,7 @@
     DriverInfo = None
 
 from flask_pymongo._version import __version__
-from flask_pymongo.helpers import BSONObjectIdConverter, JSONEncoder
+from flask_pymongo.helpers import BSONObjectIdConverter, BSONProvider
 from flask_pymongo.wrappers import MongoClient
 
 DESCENDING = pymongo.DESCENDING
@@ -69,7 +69,7 @@ class PyMongo(object):
     def __init__(self, app=None, uri=None, json_options=None, *args, **kwargs):
         self.cx = None
         self.db = None
-        self._json_encoder = partial(JSONEncoder, json_options=json_options)
+        self._json_provider = BSONProvider(json_options, app)
 
         if app is not None:
             self.init_app(app, uri, *args, **kwargs)
@@ -123,7 +123,7 @@ def init_app(self, app, uri=None, *args, **kwargs):
             self.db = self.cx[database_name]
 
         app.url_map.converters["ObjectId"] = BSONObjectIdConverter
-        app.json_encoder = self._json_encoder
+        app.json = self._json_provider
 
     # view helpers
     def send_file(self, filename, base="fs", version=-1, cache_for=31536000):

flask_pymongo/helpers.py

@@ -24,14 +24,13 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 
-__all__ = ("BSONObjectIdConverter", "JSONEncoder")
+__all__ = ("BSONObjectIdConverter", "BSONProvider")
 
-from bson import json_util, SON
+from bson import json_util
 from bson.errors import InvalidId
 from bson.objectid import ObjectId
 from flask import abort
-from json import JSONEncoder
-from six import iteritems, string_types
+from flask.json.provider import JSONProvider
 from werkzeug.routing import BaseConverter
 import pymongo
 
@@ -84,7 +83,7 @@ def to_url(self, value):
         return str(value)
 
 
-class JSONEncoder(JSONEncoder):
+class BSONProvider(JSONProvider):
 
     """A JSON encoder that uses :mod:`bson.json_util` for MongoDB documents.
 
@@ -121,35 +120,22 @@ def json_route(cart_id):
 
     """
 
-    def __init__(self, json_options, *args, **kwargs):
+    def __init__(self, json_options, app):
         if json_options is None:
             json_options = DEFAULT_JSON_OPTIONS
         if json_options is not None:
             self._default_kwargs = {"json_options": json_options}
         else:
             self._default_kwargs = {}
 
-        super(JSONEncoder, self).__init__(*args, **kwargs)
+        super().__init__(app)
 
-    def default(self, obj):
+    def dumps(self, obj):
         """Serialize MongoDB object types using :mod:`bson.json_util`.
+        """
+        return json_util.dumps(obj)
 
-        Falls back to Flask's default JSON serialization for all other types.
-
-        This may raise ``TypeError`` for object types not recognized.
-
-        .. versionadded:: 2.4.0
-
+    def loads(self, str_obj):
+        """Deserialize MongoDB object types using :mod:`bson.json_util`.
         """
-        if hasattr(obj, "iteritems") or hasattr(obj, "items"):
-            return SON((k, self.default(v)) for k, v in iteritems(obj))
-        elif hasattr(obj, "__iter__") and not isinstance(obj, string_types):
-            return [self.default(v) for v in obj]
-        else:
-            try:
-                return json_util.default(obj, **self._default_kwargs)
-            except TypeError:
-                # PyMongo couldn't convert into a serializable object, and
-                # the Flask default JSONEncoder won't; so we return the
-                # object itself and let stdlib json handle it if possible
-                return obj
+        return json_util.loads(str_obj)

flask_pymongo/tests/test_config.py

@@ -44,7 +44,7 @@ def test_config_with_uri_in_flask_conf_var(self):
 
         _wait_until_connected(mongo)
         assert mongo.db.name == self.dbname
-        assert ("localhost", self.port) == mongo.cx.address
+        assert ("localhost", self.port) == mongo.cx.address or ("127.0.0.1", self.port) == mongo.cx.address
 
     def test_config_with_uri_passed_directly(self):
         uri = "mongodb://localhost:{}/{}".format(self.port, self.dbname)
@@ -53,7 +53,7 @@ def test_config_with_uri_passed_directly(self):
 
         _wait_until_connected(mongo)
         assert mongo.db.name == self.dbname
-        assert ("localhost", self.port) == mongo.cx.address
+        assert ("localhost", self.port) == mongo.cx.address or ("127.0.0.1", self.port) == mongo.cx.address
 
     def test_it_fails_with_no_uri(self):
         self.app.config.pop("MONGO_URI", None)

setup.py

@@ -30,7 +30,7 @@
     platforms="any",
     packages=find_packages(),
     install_requires=[
-        "Flask>=1.0",
+        "Flask>=3.0",
         "PyMongo>=3.11",
         "six",
     ],