Merge "Do not force DeprecationWarning to be displayed"

This commit is contained in:
Jenkins 2016-07-14 17:19:07 +00:00 committed by Gerrit Code Review
commit 2e389ce44b

View File

@ -74,7 +74,6 @@ try:
except ImportError: except ImportError:
pass pass
warnings.simplefilter("default", DeprecationWarning)
if sys.version_info < (2, 7, 0): if sys.version_info < (2, 7, 0):
warnings.warn("Support for python 2.6 is deprecated and will be removed.") warnings.warn("Support for python 2.6 is deprecated and will be removed.")