merge master into improve-health-2

This commit is contained in:
Stefan Wojcik 2016-12-10 13:53:13 -05:00
commit 94870d7377
2 changed files with 7 additions and 1 deletions

4
.gitignore vendored
View File

@ -14,4 +14,6 @@ env/
.project .project
.pydevproject .pydevproject
tests/test_bugfix.py tests/test_bugfix.py
htmlcov/ htmlcov/
venv
venv3

View File

@ -2,6 +2,10 @@
Helper functions, constants, and types to aid with Python v2.7 - v3.x and Helper functions, constants, and types to aid with Python v2.7 - v3.x and
PyMongo v2.7 - v3.x support. PyMongo v2.7 - v3.x support.
""" """
import sys
import warnings
import pymongo import pymongo
import six import six