Fixing for python2.5

closes #188

mongoengine/base/__init__.py

@@ -1,5 +1,5 @@
-from .common import *
-from .datastructures import *
-from .document import *
-from .fields import *
-from .metaclasses import *
+from mongoengine.base.common import *
+from mongoengine.base.datastructures import *
+from mongoengine.base.document import *
+from mongoengine.base.fields import *
+from mongoengine.base.metaclasses import *

mongoengine/base/document.py

@@ -12,9 +12,9 @@ from mongoengine.errors import (ValidationError, InvalidDocumentError,
 from mongoengine.python_support import (PY3, UNICODE_KWARGS, txt_type,
                                         to_str_keys_recursive)
 
-from .common import get_document, ALLOW_INHERITANCE
-from .datastructures import BaseDict, BaseList
-from .fields import ComplexBaseField
+from mongoengine.base.common import get_document, ALLOW_INHERITANCE
+from mongoengine.base.datastructures import BaseDict, BaseList
+from mongoengine.base.fields import ComplexBaseField
 
 __all__ = ('BaseDocument', 'NON_FIELD_ERRORS')
 

mongoengine/base/fields.py

@@ -7,8 +7,8 @@ from bson import DBRef, ObjectId
 from mongoengine.common import _import_class
 from mongoengine.errors import ValidationError
 
-from .common import ALLOW_INHERITANCE
-from .datastructures import BaseDict, BaseList
+from mongoengine.base.common import ALLOW_INHERITANCE
+from mongoengine.base.datastructures import BaseDict, BaseList
 
 __all__ = ("BaseField", "ComplexBaseField", "ObjectIdField")
 

mongoengine/base/metaclasses.py

@@ -9,8 +9,8 @@ from mongoengine.queryset import (DO_NOTHING, DoesNotExist,
                                   MultipleObjectsReturned,
                                   QuerySet, QuerySetManager)
 
-from .common import _document_registry, ALLOW_INHERITANCE
-from .fields import BaseField, ComplexBaseField, ObjectIdField
+from mongoengine.base.common import _document_registry, ALLOW_INHERITANCE
+from mongoengine.base.fields import BaseField, ComplexBaseField, ObjectIdField
 
 __all__ = ('DocumentMetaclass', 'TopLevelDocumentMetaclass')
 

mongoengine/errors.py

@@ -1,6 +1,6 @@
 from collections import defaultdict
 
-from .python_support import txt_type
+from mongoengine.python_support import txt_type
 
 
 __all__ = ('NotRegistered', 'InvalidDocumentError', 'ValidationError')

mongoengine/queryset/__init__.py

@@ -1,11 +1,11 @@
 from mongoengine.errors import (DoesNotExist, MultipleObjectsReturned,
                                 InvalidQueryError, OperationError,
                                 NotUniqueError)
-from .field_list import *
-from .manager import *
-from .queryset import *
-from .transform import *
-from .visitor 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 *
 
 __all__ = (field_list.__all__ + manager.__all__ + queryset.__all__ +
            transform.__all__ + visitor.__all__)

mongoengine/queryset/manager.py

@@ -1,5 +1,5 @@
 from functools import partial
-from .queryset import QuerySet
+from mongoengine.queryset.queryset import QuerySet
 
 __all__ = ('queryset_manager', 'QuerySetManager')
 

mongoengine/queryset/queryset.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import copy
 import itertools
 import operator
@@ -15,9 +17,9 @@ from mongoengine.common import _import_class
 from mongoengine.errors import (OperationError, NotUniqueError,
                                 InvalidQueryError)
 
-from . import transform
-from .field_list import QueryFieldList
-from .visitor import Q, QNode
+from mongoengine.queryset import transform
+from mongoengine.queryset.field_list import QueryFieldList
+from mongoengine.queryset.visitor import Q, QNode
 
 
 __all__ = ('QuerySet', 'DO_NOTHING', 'NULLIFY', 'CASCADE', 'DENY', 'PULL')

tests/__init__.py

@@ -1,2 +1,2 @@
-from .all_warnings import AllWarnings
-from .document import *
+from all_warnings import AllWarnings
+from document import *

tests/document/dynamic.py

@@ -137,13 +137,11 @@ class DynamicTest(unittest.TestCase):
         embedded_doc_1.validate()
 
         embedded_doc_2 = Embedded(content='this is not a url')
-        with self.assertRaises(ValidationError):
-            embedded_doc_2.validate()
+        self.assertRaises(ValidationError, embedded_doc_2.validate)
 
         doc.embedded_field_1 = embedded_doc_1
         doc.embedded_field_2 = embedded_doc_2
-        with self.assertRaises(ValidationError):
-            doc.validate()
+        self.assertRaises(ValidationError, doc.validate)
 
     def test_inheritance(self):
         """Ensure that dynamic document plays nice with inheritance"""