diff --git a/awx/main/utils/formatters.py b/awx/main/utils/formatters.py index 9d1a431b0b..6009c03157 100644 --- a/awx/main/utils/formatters.py +++ b/awx/main/utils/formatters.py @@ -7,7 +7,6 @@ import time import logging import traceback import socket -import sys from datetime import datetime @@ -26,7 +25,30 @@ class TimeFormatter(logging.Formatter): class LogstashFormatterBase(logging.Formatter): """Base class taken from python-logstash=0.4.6 modified here since that version - License in docs/licenses/ + + For compliance purposes, this was the license at the point of divergence: + + The MIT License (MIT) + + Copyright (c) 2013, Volodymyr Klochan + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. """ def __init__(self, message_type='Logstash', fqdn=False): diff --git a/docs/licenses/python-logstash.txt b/docs/licenses/python-logstash.txt deleted file mode 100644 index 00339c895c..0000000000 --- a/docs/licenses/python-logstash.txt +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2013, Volodymyr Klochan - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 12472b93af..2b384178a0 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -80,7 +80,6 @@ pyrad==2.1 # via django-radius pysocks==1.6.8 # via twilio python-dateutil==2.7.2 python-ldap==3.1.0 # via django-auth-ldap -django-cors-headers==2.4.0 python-memcached==1.59 python-radius==1.0 python3-openid==3.1.0 # via social-auth-core