diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py index 8f30435e..baa2a350 100644 --- a/mongoengine/dereference.py +++ b/mongoengine/dereference.py @@ -1,10 +1,8 @@ from bson import DBRef, SON import six -from mongoengine.base.common import get_document -from mongoengine.base.datastructures import (BaseDict, BaseList, - EmbeddedDocumentList) -from mongoengine.base.metaclasses import TopLevelDocumentMetaclass +from mongoengine.base import (BaseDict, BaseList, EmbeddedDocumentList, + TopLevelDocumentMetaclass, get_document) from mongoengine.connection import get_db from mongoengine.document import Document, EmbeddedDocument from mongoengine.fields import DictField, ListField, MapField, ReferenceField diff --git a/mongoengine/document.py b/mongoengine/document.py index e62426b0..3ad5f655 100644 --- a/mongoengine/document.py +++ b/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.datastructures import (BaseDict, BaseList, - EmbeddedDocumentList) -from mongoengine.base.document import BaseDocument -from mongoengine.base.metaclasses import (DocumentMetaclass, - TopLevelDocumentMetaclass) +from mongoengine.base import (ALLOW_INHERITANCE, BaseDict, BaseDocument, + BaseList, DocumentMetaclass, + EmbeddedDocumentList, TopLevelDocumentMetaclass, + get_document) from mongoengine.common import _import_class from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db from mongoengine.context_managers import switch_collection, switch_db diff --git a/mongoengine/fields.py b/mongoengine/fields.py index e23e115a..3eb2e58a 100644 --- a/mongoengine/fields.py +++ b/mongoengine/fields.py @@ -25,10 +25,8 @@ try: except ImportError: Int64 = long -from mongoengine.base.common import get_document -from mongoengine.base.document import BaseDocument -from mongoengine.base.fields import (BaseField, ComplexBaseField, - GeoJsonBaseField, ObjectIdField) +from mongoengine.base import (BaseDocument, BaseField, ComplexBaseField, + GeoJsonBaseField, ObjectIdField, get_document) from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db from mongoengine.document import Document, EmbeddedDocument from mongoengine.errors import DoesNotExist, ValidationError diff --git a/mongoengine/queryset/__init__.py b/mongoengine/queryset/__init__.py index 483e847e..5219c39e 100644 --- a/mongoengine/queryset/__init__.py +++ b/mongoengine/queryset/__init__.py @@ -1,13 +1,11 @@ -from mongoengine.errors import (DoesNotExist, InvalidQueryError, - MultipleObjectsReturned, NotUniqueError, - OperationError) -from mongoengine.queryset.base import CASCADE, DENY, DO_NOTHING, NULLIFY, PULL -from mongoengine.queryset.field_list import QueryFieldList -from mongoengine.queryset.manager import QuerySetManager, queryset_manager -from mongoengine.queryset.queryset import QuerySet, QuerySetNoCache -from mongoengine.queryset.visitor import Q - +from mongoengine.errors import * +from mongoengine.queryset.field_list import * +from mongoengine.queryset.manager import * +from mongoengine.queryset.queryset import * +from mongoengine.queryset.transform import * +from mongoengine.queryset.visitor import * +# 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',