merge master into improve-health-2

2016-12-10 13:53:13 -05:00 · 2016-12-10 13:53:13 -05:00 · 94870d7377
commit 94870d7377
parent 30ebe7c11e 7b860f7739
2 changed files with 7 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -14,4 +14,6 @@ env/
 .project
 .pydevproject
 tests/test_bugfix.py
-htmlcov/
+htmlcov/
+venv
+venv3
--- a/mongoengine/python_support.py
+++ b/mongoengine/python_support.py
@ -2,6 +2,10 @@
 Helper functions, constants, and types to aid with Python v2.7 - v3.x and
 PyMongo v2.7 - v3.x support.
 """
+
+import sys
+import warnings
+
 import pymongo
 import six