From d9b3a9fb60ecff7b250a5db3cfecdc406bfc15d5 Mon Sep 17 00:00:00 2001 From: Gilb's Date: Fri, 18 Mar 2016 19:51:09 +0100 Subject: [PATCH] Use six integer types instead of explicit types, since six is now a dependency of the project. --- mongoengine/fields.py | 1 - tests/fields/fields.py | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mongoengine/fields.py b/mongoengine/fields.py index 206edcff..c807809a 100644 --- a/mongoengine/fields.py +++ b/mongoengine/fields.py @@ -20,7 +20,6 @@ else: import pymongo import gridfs from bson import Binary, DBRef, SON, ObjectId - try: from bson.int64 import Int64 except ImportError: diff --git a/tests/fields/fields.py b/tests/fields/fields.py index c09cbf29..9af87f7f 100644 --- a/tests/fields/fields.py +++ b/tests/fields/fields.py @@ -12,6 +12,7 @@ import uuid import math import itertools import re +import six try: import dateutil @@ -3620,7 +3621,7 @@ class FieldTest(unittest.TestCase): doc = TestLongFieldConsideredAsInt64(some_long=42).save() db = get_db() self.assertTrue(isinstance(db.test_long_field_considered_as_int64.find()[0]['some_long'], Int64)) - self.assertTrue(isinstance(doc.some_long, (int, long,))) + self.assertTrue(isinstance(doc.some_long, six.integer_types)) class EmbeddedDocumentListFieldTestCase(unittest.TestCase):