mirror of
https://github.com/ansible/awx.git
synced 2026-01-10 15:32:07 -03:30
remove dm.xmlsec.binding
python-saml uses dm.xmlsec.binding only supports python2 by moving to py3, we now use python3-saml (which uses python-xmlsec instead) see: https://github.com/onelogin/python-saml/issues/145#issuecomment-222021691
This commit is contained in:
parent
c6482137d1
commit
af4234556e
@ -1,30 +1,4 @@
|
||||
# Copyright (c) 2015 Ansible, Inc.
|
||||
# All Rights Reserved.
|
||||
|
||||
# Python
|
||||
import threading
|
||||
|
||||
# Monkeypatch xmlsec.initialize() to only run once (https://github.com/ansible/ansible-tower/issues/3241).
|
||||
xmlsec_init_lock = threading.Lock()
|
||||
xmlsec_initialized = False
|
||||
|
||||
|
||||
#
|
||||
# TODO: THIS DOES NOT WORK IN PY3
|
||||
#
|
||||
#import dm.xmlsec.binding # noqa
|
||||
#original_xmlsec_initialize = dm.xmlsec.binding.initialize
|
||||
#
|
||||
#
|
||||
#def xmlsec_initialize(*args, **kwargs):
|
||||
# global xmlsec_init_lock, xmlsec_initialized, original_xmlsec_initialize
|
||||
# with xmlsec_init_lock:
|
||||
# if not xmlsec_initialized:
|
||||
# original_xmlsec_initialize(*args, **kwargs)
|
||||
# xmlsec_initialized = True
|
||||
#
|
||||
#
|
||||
#dm.xmlsec.binding.initialize = xmlsec_initialize
|
||||
|
||||
|
||||
default_app_config = 'awx.sso.apps.SSOConfig'
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
Copyright (C) 2012-2013 by Dr. Dieter Maurer <dieter@handshake.de>
|
||||
D-66571 Bubach, Illtalstr. 25, Germany
|
||||
|
||||
All Rights Reserved
|
||||
|
||||
Permission to use, copy, modify, and distribute this software and its
|
||||
documentation for any purpose and without fee is hereby granted,
|
||||
provided that the above copyright notice, this permission
|
||||
notice and the warranties disclaimer below
|
||||
appear in all copies, modified copies and in
|
||||
supporting documentation.
|
||||
|
||||
Dieter Maurer DISCLAIMS ALL WARRANTIES WITH
|
||||
REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL Dieter Maurer
|
||||
BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
|
||||
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
|
||||
PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
||||
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
PERFORMANCE OF THIS SOFTWARE.
|
||||
@ -1,4 +1,3 @@
|
||||
git+https://github.com/ansible/ansiconv.git@tower_1.0.0#egg=ansiconv
|
||||
git+https://github.com/ansible/django-qsstats-magic.git@py3#egg=django-qsstats-magic
|
||||
git+https://github.com/ryanpetrello/dm.xmlsec.binding.git@master#egg=dm.xmlsec.binding
|
||||
git+https://github.com/ansible/django-jsonbfield@fix-sqlite_serialization#egg=jsonbfield
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user