diff --git a/awx/__init__.py b/awx/__init__.py index 17964ad1a7..339260e6c5 100644 --- a/awx/__init__.py +++ b/awx/__init__.py @@ -5,6 +5,7 @@ __version__ = '1.2.2-0' import os import sys +import warnings __all__ = ['__version__'] @@ -39,6 +40,11 @@ def manage(): local_site_packages = os.path.join(os.path.dirname(__file__), 'lib', 'site-packages') sys.path.insert(0, local_site_packages) + # Hide DeprecationWarnings when running in production. Need to first load + # settings to apply our filter after Django's own warnings filter. + from django.conf import settings + if not settings.DEBUG: + warnings.simplefilter('ignore', DeprecationWarning) # Monkeypatch Django find_commands to also work with .pyc files. import django.core.management django.core.management.find_commands = find_commands diff --git a/awx/wsgi.py b/awx/wsgi.py index 7fe5f5a387..51e568373c 100644 --- a/awx/wsgi.py +++ b/awx/wsgi.py @@ -12,6 +12,7 @@ https://docs.djangoproject.com/en/dev/howto/deployment/wsgi/ import os import sys +import warnings from awx import MODE from distutils.sysconfig import get_python_lib @@ -23,6 +24,12 @@ local_site_packages = os.path.join(os.path.dirname(__file__), 'lib', 'site-packages') sys.path.insert(0, local_site_packages) +# Hide DeprecationWarnings when running in production. Need to first load +# settings to apply our filter after Django's own warnings filter. +from django.conf import settings +if not settings.DEBUG: + warnings.simplefilter('ignore', DeprecationWarning) + # Return the default Django WSGI application. from django.core.wsgi import get_wsgi_application application = get_wsgi_application()