Import ordering

Author: NoahStapp

motor/core.pyi

@@ -40,8 +40,8 @@ from bson.raw_bson import RawBSONDocument
 from pymongo import IndexModel, ReadPreference, WriteConcern
 from pymongo.change_stream import ChangeStream
 from pymongo.client_options import ClientOptions
-from pymongo.client_session import ClientSession, SessionOptions, TransactionOptions
-from pymongo.collection import Collection, ReturnDocument  # noqa: F401
+from pymongo.client_session import _T, ClientSession, SessionOptions, TransactionOptions
+from pymongo.collection import Collection, ReturnDocument, _WriteOp  # noqa: F401
 from pymongo.command_cursor import CommandCursor, RawBatchCommandCursor
 from pymongo.cursor import Cursor, RawBatchCursor
 from pymongo.cursor_shared import _Hint, _Sort
@@ -59,8 +59,6 @@ from pymongo.results import (
     InsertOneResult,
     UpdateResult,
 )
-from pymongo.synchronous.client_session import _T
-from pymongo.synchronous.collection import _WriteOp
 from pymongo.topology_description import TopologyDescription
 from pymongo.typings import (
     _Address,

synchro/__init__.py

@@ -69,14 +69,15 @@
     pass
 from pymongo import client_session, synchronous
 from pymongo.auth import *
-from pymongo.client_session import TransactionOptions
+from pymongo.client_session import TransactionOptions, _TxnState
 from pymongo.collation import *
 from pymongo.common import *
 from pymongo.common import _MAX_END_SESSIONS, _UUID_REPRESENTATIONS
 from pymongo.compression_support import _have_snappy, _have_zlib, _have_zstd
 from pymongo.cursor import *
 from pymongo.cursor_shared import _QUERY_OPTIONS
 from pymongo.encryption import *
+from pymongo.encryption import _Encrypter
 from pymongo.encryption_options import *
 from pymongo.encryption_options import _HAVE_PYMONGOCRYPT
 from pymongo.errors import *
@@ -89,29 +90,27 @@
     _gen_find_command,
     _maybe_add_read_preference,
 )
+from pymongo.monitor import *
 from pymongo.monitoring import *
 from pymongo.monitoring import _LISTENERS, _Listeners
 from pymongo.ocsp_cache import _OCSPCache
 from pymongo.operations import *
+from pymongo.periodic_executor import *
+from pymongo.periodic_executor import _EXECUTORS
+from pymongo.pool import *
+from pymongo.pool import Connection, Pool, _PoolClosedError
 from pymongo.read_concern import *
 from pymongo.read_preferences import *
 from pymongo.read_preferences import _ServerMode
 from pymongo.results import *
 from pymongo.results import _WriteResult
 from pymongo.saslprep import *
+from pymongo.server import *
 from pymongo.server_selectors import *
+from pymongo.settings import *
 from pymongo.srv_resolver import _resolve, _SrvResolver
 from pymongo.ssl_support import *
-from pymongo.synchronous.client_session import _TxnState
-from pymongo.synchronous.encryption import _Encrypter
-from pymongo.synchronous.monitor import *
-from pymongo.synchronous.periodic_executor import *
-from pymongo.synchronous.periodic_executor import _EXECUTORS
-from pymongo.synchronous.pool import *
-from pymongo.synchronous.pool import Connection, Pool, _PoolClosedError
-from pymongo.synchronous.server import *
-from pymongo.synchronous.settings import *
-from pymongo.synchronous.topology import *
+from pymongo.topology import *
 from pymongo.topology_description import *
 from pymongo.uri_parser import *
 from pymongo.uri_parser import _have_dnspython