Merge pull request #9 from strollby/fix/import-issues

Fix imports for backward compactibility

Author: mak626

mongoengine/__init__.py

@@ -21,17 +21,16 @@
 
 from mongoengine import document, errors, fields, signals
 
+
 # ---- private imports (for __all__ only) ----
-from mongoengine.synchronous import connection as _sync_connection
-from mongoengine.asynchronous import connection as _async_connection
-from mongoengine.synchronous import queryset as _sync_queryset
-from mongoengine.asynchronous import queryset as _async_queryset
+import mongoengine.base.queryset as _queryset_base
+import mongoengine.synchronous as _sync_modules
+import mongoengine.asynchronous as _async_modules
 
 # ---- public re-exports ----
-from mongoengine.synchronous.connection import *  # noqa: F401,F403
-from mongoengine.asynchronous.connection import *  # noqa: F401,F403
-from mongoengine.synchronous.queryset import *  # noqa: F401,F403
-from mongoengine.asynchronous.queryset import *  # noqa: F401,F403
+from mongoengine.base.queryset import *  # noqa: F401,F403
+from mongoengine.synchronous import *  # noqa: F401,F403
+from mongoengine.asynchronous import *  # noqa: F401,F403
 
 from mongoengine.document import *  # noqa: F401,F403
 from mongoengine.errors import *  # noqa: F401,F403
@@ -42,19 +41,17 @@
 __all__ = (
     list(document.__all__)
     + list(fields.__all__)
-    + list(_sync_connection.__all__)
-    + list(_async_connection.__all__)
-    + list(_sync_queryset.__all__)
-    + list(_async_queryset.__all__)
+    + list(_queryset_base.__all__)
+    + list(_sync_modules.__all__)
+    + list(_async_modules.__all__)
     + list(signals.__all__)
     + list(errors.__all__)
 )
 
 # ---- hide internals ----
-del _sync_connection
-del _async_connection
-del _sync_queryset
-del _async_queryset
+del _queryset_base
+del _sync_modules
+del _async_modules
 
 VERSION = (0, 30, 0)
 

mongoengine/asynchronous/__init__.py

@@ -1,6 +1,13 @@
-from .connection import *
-from .queryset import *
+import mongoengine.asynchronous.connection as _connection
 
-__all__ = [
-    list(connection.__all__) + list(queryset.__all__),
-]
+from .connection import *  # noqa: F401,F403
+from .queryset import (  # noqa: F401,F403
+    AsyncQuerySet,
+    AsyncQuerySetNoCache,
+    queryset as _queryset,
+)
+
+__all__ = list(_connection.__all__) + list(_queryset.__all__)
+
+del _queryset
+del _connection

mongoengine/asynchronous/connection.py

@@ -6,7 +6,14 @@
 from pymongo.errors import ConnectionFailure
 
 import mongoengine
-from mongoengine.common import _check_db_name, convert_read_preference
+from mongoengine.common import (
+    _check_db_name,
+    convert_read_preference,
+    DEFAULT_CONNECTION_NAME,
+    DEFAULT_DATABASE_NAME,
+    DEFAULT_HOST,
+    DEFAULT_PORT,
+)
 
 __all__ = [
     "async_connect",
@@ -15,15 +22,12 @@
     "async_get_connection",
     "async_get_db",
     "async_register_connection",
+    "DEFAULT_CONNECTION_NAME",
+    "DEFAULT_DATABASE_NAME",
 ]
 
 from mongoengine.registry import _CollectionRegistry
 
-DEFAULT_CONNECTION_NAME = "default"
-DEFAULT_DATABASE_NAME = "test"
-DEFAULT_HOST = "localhost"
-DEFAULT_PORT = 27017
-
 READ_PREFERENCE = ReadPreference.PRIMARY
 
 _connection_settings = {}

mongoengine/base/queryset/__init__.py

@@ -1,14 +1,18 @@
 from .constants import *
-from .visitor import *
-from .transform import *
 from .field_list import *
 from .manager import *
+from .transform import *
+from .visitor import *
 
 # Expose just the public subset of all imported objects and constants.
 __all__ = (
-    list(constants.__all__)
-    + list(visitor.__all__)
-    + list(transform.__all__)
-    + list(field_list.__all__)
-    + list(manager.__all__)
+    "Q",
+    "queryset_manager",
+    "QuerySetManager",
+    "QueryFieldList",
+    "DO_NOTHING",
+    "NULLIFY",
+    "CASCADE",
+    "DENY",
+    "PULL",
 )

mongoengine/common.py

@@ -7,6 +7,11 @@
     Nearest,
 )
 
+DEFAULT_CONNECTION_NAME = "default"
+DEFAULT_DATABASE_NAME = "test"
+DEFAULT_HOST = "localhost"
+DEFAULT_PORT = 27017
+
 _class_registry_cache = {}
 _field_list_cache = []
 

mongoengine/synchronous/__init__.py

@@ -1,6 +1,13 @@
-from .connection import *
-from .queryset import *
+import mongoengine.synchronous.connection as _connection
 
-__all__ = [
-    list(connection.__all__) + list(queryset.__all__),
-]
+from .connection import *  # noqa: F401,F403
+from .queryset import (  # noqa: F401,F403
+    QuerySet,
+    QuerySetNoCache,
+    queryset as _queryset,
+)
+
+__all__ = list(_connection.__all__) + list(_queryset.__all__)
+
+del _queryset
+del _connection

mongoengine/synchronous/connection.py

@@ -6,7 +6,14 @@
 from pymongo.errors import ConnectionFailure
 
 import mongoengine
-from mongoengine.common import _check_db_name, convert_read_preference
+from mongoengine.common import (
+    _check_db_name,
+    convert_read_preference,
+    DEFAULT_CONNECTION_NAME,
+    DEFAULT_DATABASE_NAME,
+    DEFAULT_HOST,
+    DEFAULT_PORT,
+)
 
 __all__ = [
     "connect",
@@ -15,14 +22,12 @@
     "get_connection",
     "get_db",
     "register_connection",
+    "DEFAULT_CONNECTION_NAME",
+    "DEFAULT_DATABASE_NAME",
 ]
 
 from mongoengine.registry import _CollectionRegistry
 
-DEFAULT_CONNECTION_NAME = "default"
-DEFAULT_DATABASE_NAME = "test"
-DEFAULT_HOST = "localhost"
-DEFAULT_PORT = 27017
 
 READ_PREFERENCE = ReadPreference.PRIMARY
 

tests/asynchronous/queryset/test_queryset.py

@@ -11,6 +11,7 @@
 from pymongo.results import UpdateResult
 
 from mongoengine import *
+from mongoengine.asynchronous.queryset import AsyncBaseQuerySet
 from mongoengine.base import LazyReference
 from mongoengine.base.queryset import (
     CASCADE,