From 56338191e08991a0634208cc06f743447c0bb961 Mon Sep 17 00:00:00 2001 From: Shane Harvey Date: Mon, 21 Apr 2025 12:21:18 -0700 Subject: [PATCH 1/2] PYTHON-5314 Fix default imports --- pymongo/__init__.py | 9 ++++++++- test/test_default_exports.py | 6 ++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pymongo/__init__.py b/pymongo/__init__.py index 9a35750811..6cc4f5bec2 100644 --- a/pymongo/__init__.py +++ b/pymongo/__init__.py @@ -106,7 +106,14 @@ from pymongo.write_concern import WriteConcern # Public module compatibility imports -import pymongo.uri_parser # noqa: F401 # isort: skip +# isort: off +import pymongo.uri_parser # noqa: F401 +import pymongo.change_stream # noqa: F401 +import pymongo.client_session # noqa: F401 +import pymongo.collection # noqa: F401 +import pymongo.command_cursor # noqa: F401 +import pymongo.database # noqa: F401 +# isort: on version = __version__ """Current version of PyMongo.""" diff --git a/test/test_default_exports.py b/test/test_default_exports.py index 5f3e749d36..adc3882a36 100644 --- a/test/test_default_exports.py +++ b/test/test_default_exports.py @@ -215,6 +215,12 @@ def test_pymongo_submodule_attributes(self): self.assertTrue(hasattr(pymongo, "uri_parser")) self.assertTrue(pymongo.uri_parser) self.assertTrue(pymongo.uri_parser.parse_uri) + self.assertTrue(pymongo.change_stream) + self.assertTrue(pymongo.client_session) + self.assertTrue(pymongo.collection) + self.assertTrue(pymongo.cursor) + self.assertTrue(pymongo.command_cursor) + self.assertTrue(pymongo.database) def test_gridfs_imports(self): import gridfs From 5e39dffb366bbb4b89e64ae48c97a04c1ee07753 Mon Sep 17 00:00:00 2001 From: Shane Harvey Date: Mon, 21 Apr 2025 12:32:14 -0700 Subject: [PATCH 2/2] PYTHON-5314 Fix ruff --- pymongo/__init__.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pymongo/__init__.py b/pymongo/__init__.py index 6cc4f5bec2..95eabef242 100644 --- a/pymongo/__init__.py +++ b/pymongo/__init__.py @@ -107,12 +107,12 @@ # Public module compatibility imports # isort: off -import pymongo.uri_parser # noqa: F401 -import pymongo.change_stream # noqa: F401 -import pymongo.client_session # noqa: F401 -import pymongo.collection # noqa: F401 -import pymongo.command_cursor # noqa: F401 -import pymongo.database # noqa: F401 +from pymongo import uri_parser # noqa: F401 +from pymongo import change_stream # noqa: F401 +from pymongo import client_session # noqa: F401 +from pymongo import collection # noqa: F401 +from pymongo import command_cursor # noqa: F401 +from pymongo import database # noqa: F401 # isort: on version = __version__