From 35fd676eebd3ec69476b839cad4b51d9bce6e5fd Mon Sep 17 00:00:00 2001 From: Alex Bevilacqua Date: Mon, 3 Jun 2024 16:11:53 -0400 Subject: [PATCH 1/5] add DriverInfo to MongoClient creation --- flask_pymongo/__init__.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/flask_pymongo/__init__.py b/flask_pymongo/__init__.py index 5e0fc14..cc1fd21 100644 --- a/flask_pymongo/__init__.py +++ b/flask_pymongo/__init__.py @@ -34,9 +34,15 @@ from pymongo import uri_parser from werkzeug.wsgi import wrap_file import pymongo +# DriverInfo was added in PyMongo 3.7 +try: + from pymongo.driver_info import DriverInfo +except ImportError: + DriverInfo = None from flask_pymongo.helpers import BSONObjectIdConverter, JSONEncoder from flask_pymongo.wrappers import MongoClient +from flask_pymongo._version import __version__ DESCENDING = pymongo.DESCENDING @@ -109,6 +115,8 @@ def init_app(self, app, uri=None, *args, **kwargs): # Try to delay connecting, in case the app is loaded before forking, per # http://api.mongodb.com/python/current/faq.html#is-pymongo-fork-safe kwargs.setdefault("connect", False) + if DriverInfo is not None: + kwargs.setdefault("driver", DriverInfo("Flask-PyMongo", __version__)) self.cx = MongoClient(*args, **kwargs) if database_name: From ac56020f84c1655d5c46bae2986569b3b16f5578 Mon Sep 17 00:00:00 2001 From: Alex Bevilacqua Date: Thu, 13 Jun 2024 15:21:28 -0400 Subject: [PATCH 2/5] fix tox warning --- flask_pymongo/__init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/flask_pymongo/__init__.py b/flask_pymongo/__init__.py index cc1fd21..0cb708e 100644 --- a/flask_pymongo/__init__.py +++ b/flask_pymongo/__init__.py @@ -41,9 +41,8 @@ DriverInfo = None from flask_pymongo.helpers import BSONObjectIdConverter, JSONEncoder -from flask_pymongo.wrappers import MongoClient from flask_pymongo._version import __version__ - +from flask_pymongo.wrappers import MongoClient DESCENDING = pymongo.DESCENDING """Descending sort order.""" From 1b0612af2d3f171a2a720ca661c10e48b952957b Mon Sep 17 00:00:00 2001 From: Alex Bevilacqua Date: Thu, 13 Jun 2024 15:46:11 -0400 Subject: [PATCH 3/5] fix tox warning --- flask_pymongo/__init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/flask_pymongo/__init__.py b/flask_pymongo/__init__.py index 0cb708e..06dc22d 100644 --- a/flask_pymongo/__init__.py +++ b/flask_pymongo/__init__.py @@ -39,9 +39,8 @@ from pymongo.driver_info import DriverInfo except ImportError: DriverInfo = None - -from flask_pymongo.helpers import BSONObjectIdConverter, JSONEncoder from flask_pymongo._version import __version__ +from flask_pymongo.helpers import BSONObjectIdConverter, JSONEncoder from flask_pymongo.wrappers import MongoClient DESCENDING = pymongo.DESCENDING From 3a3629c49c7e5408293616df2337fb1df9ced3da Mon Sep 17 00:00:00 2001 From: Alex Bevilacqua Date: Thu, 13 Jun 2024 15:48:49 -0400 Subject: [PATCH 4/5] fix tox warning --- flask_pymongo/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flask_pymongo/__init__.py b/flask_pymongo/__init__.py index 06dc22d..a8fb8a1 100644 --- a/flask_pymongo/__init__.py +++ b/flask_pymongo/__init__.py @@ -39,7 +39,9 @@ from pymongo.driver_info import DriverInfo except ImportError: DriverInfo = None + from flask_pymongo._version import __version__ + from flask_pymongo.helpers import BSONObjectIdConverter, JSONEncoder from flask_pymongo.wrappers import MongoClient From af7a89ae05efe708d79d214c92f43b8b531aa14e Mon Sep 17 00:00:00 2001 From: Alex Bevilacqua Date: Thu, 13 Jun 2024 15:51:01 -0400 Subject: [PATCH 5/5] fix tox warning --- flask_pymongo/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/flask_pymongo/__init__.py b/flask_pymongo/__init__.py index a8fb8a1..974202d 100644 --- a/flask_pymongo/__init__.py +++ b/flask_pymongo/__init__.py @@ -41,7 +41,6 @@ DriverInfo = None from flask_pymongo._version import __version__ - from flask_pymongo.helpers import BSONObjectIdConverter, JSONEncoder from flask_pymongo.wrappers import MongoClient