implemented global IS_PYMONGO_3
This commit is contained in:
		| @@ -17,12 +17,13 @@ from mongoengine import ( | ||||
|     connect, register_connection, | ||||
|     Document, DateTimeField | ||||
| ) | ||||
| from mongoengine.python_support import IS_PYMONGO_3 | ||||
| import mongoengine.connection | ||||
| from mongoengine.connection import get_db, get_connection, ConnectionError | ||||
|  | ||||
|  | ||||
| def get_tz_awareness(connection): | ||||
|     if pymongo.version_tuple[0] < 3: | ||||
|     if not IS_PYMONGO_3: | ||||
|         return connection.tz_aware | ||||
|     else: | ||||
|         return connection.codec_options.tz_aware | ||||
| @@ -76,7 +77,7 @@ class ConnectionTest(unittest.TestCase): | ||||
|         c.admin.authenticate("admin", "password") | ||||
|         c.mongoenginetest.add_user("username", "password") | ||||
|  | ||||
|         if pymongo.version_tuple[0] < 3: | ||||
|         if not IS_PYMONGO_3: | ||||
|             self.assertRaises(ConnectionError, connect, "testdb_uri_bad", host='mongodb://test:password@localhost') | ||||
|  | ||||
|         connect("testdb_uri", host='mongodb://username:password@localhost/mongoenginetest') | ||||
| @@ -103,7 +104,7 @@ class ConnectionTest(unittest.TestCase): | ||||
|         c.admin.authenticate("admin", "password") | ||||
|         c.mongoenginetest.add_user("username", "password") | ||||
|  | ||||
|         if pymongo.version_tuple[0] < 3: | ||||
|         if not IS_PYMONGO_3: | ||||
|             self.assertRaises(ConnectionError, connect, "testdb_uri_bad", host='mongodb://test:password@localhost') | ||||
|  | ||||
|         connect("mongoenginetest", host='mongodb://localhost/') | ||||
| @@ -202,7 +203,7 @@ class ConnectionTest(unittest.TestCase): | ||||
|         self.assertEqual(len(mongo_connections.items()), 2) | ||||
|         self.assertTrue('t1' in mongo_connections.keys()) | ||||
|         self.assertTrue('t2' in mongo_connections.keys()) | ||||
|         if pymongo.version_tuple[0] < 3: | ||||
|         if not IS_PYMONGO_3: | ||||
|             self.assertEqual(mongo_connections['t1'].host, 'localhost') | ||||
|             self.assertEqual(mongo_connections['t2'].host, '127.0.0.1') | ||||
|         else: | ||||
|   | ||||
		Reference in New Issue
	
	Block a user