minimize cyclic import warnings

remaining ones are wrongly attributed to mongoengine.common which only does inline imports

mongoengine/dereference.py

@@ -1,10 +1,8 @@
 from bson import DBRef, SON
 import six
 
-from mongoengine.base.common import get_document
+from mongoengine.base import (BaseDict, BaseList, EmbeddedDocumentList,
-from mongoengine.base.datastructures import (BaseDict, BaseList,
+                              TopLevelDocumentMetaclass, get_document)
-                                             EmbeddedDocumentList)
-from mongoengine.base.metaclasses import TopLevelDocumentMetaclass
 from mongoengine.connection import get_db
 from mongoengine.document import Document, EmbeddedDocument
 from mongoengine.fields import DictField, ListField, MapField, ReferenceField

mongoengine/document.py

@@ -7,12 +7,10 @@ from pymongo.read_preferences import ReadPreference
 import six
 
 from mongoengine import signals
-from mongoengine.base.common import ALLOW_INHERITANCE, get_document
+from mongoengine.base import (ALLOW_INHERITANCE, BaseDict, BaseDocument,
-from mongoengine.base.datastructures import (BaseDict, BaseList,
+                              BaseList, DocumentMetaclass,
-                                             EmbeddedDocumentList)
+                              EmbeddedDocumentList, TopLevelDocumentMetaclass,
-from mongoengine.base.document import BaseDocument
+                              get_document)
-from mongoengine.base.metaclasses import (DocumentMetaclass,
-                                          TopLevelDocumentMetaclass)
 from mongoengine.common import _import_class
 from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
 from mongoengine.context_managers import switch_collection, switch_db

mongoengine/fields.py

@@ -25,10 +25,8 @@ try:
 except ImportError:
     Int64 = long
 
-from mongoengine.base.common import get_document
+from mongoengine.base import (BaseDocument, BaseField, ComplexBaseField,
-from mongoengine.base.document import BaseDocument
+                              GeoJsonBaseField, ObjectIdField, get_document)
-from mongoengine.base.fields import (BaseField, ComplexBaseField,
-                                     GeoJsonBaseField, ObjectIdField)
 from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
 from mongoengine.document import Document, EmbeddedDocument
 from mongoengine.errors import DoesNotExist, ValidationError

mongoengine/queryset/__init__.py

@@ -1,13 +1,11 @@
-from mongoengine.errors import (DoesNotExist, InvalidQueryError,
+from mongoengine.errors import *
-                                MultipleObjectsReturned, NotUniqueError,
+from mongoengine.queryset.field_list import *
-                                OperationError)
+from mongoengine.queryset.manager import *
-from mongoengine.queryset.base import CASCADE, DENY, DO_NOTHING, NULLIFY, PULL
+from mongoengine.queryset.queryset import *
-from mongoengine.queryset.field_list import QueryFieldList
+from mongoengine.queryset.transform import *
-from mongoengine.queryset.manager import QuerySetManager, queryset_manager
+from mongoengine.queryset.visitor import *
-from mongoengine.queryset.queryset import QuerySet, QuerySetNoCache
-from mongoengine.queryset.visitor import Q
-
 
+# Expose just the public subset of all imported objects and constants.
 __all__ = (
     'QuerySet', 'QuerySetNoCache', 'Q', 'queryset_manager', 'QuerySetManager',
     'QueryFieldList', 'DO_NOTHING', 'NULLIFY', 'CASCADE', 'DENY', 'PULL',