Merge branch 'allow-disabling-defusedxml' into 'master'
Do not use defusedxml by default if available See merge request poezio/slixmpp!190
This commit is contained in:
commit
e8679fe32b
1 changed files with 10 additions and 6 deletions
|
@ -4,14 +4,18 @@
|
|||
# This file is part of Slixmpp.
|
||||
# See the file LICENSE for copying permission.
|
||||
import logging
|
||||
from os import getenv
|
||||
logging.getLogger(__name__).addHandler(logging.NullHandler())
|
||||
|
||||
# Use defusedxml if available
|
||||
try:
|
||||
import defusedxml
|
||||
defusedxml.defuse_stdlib()
|
||||
except ImportError:
|
||||
pass
|
||||
# Use defusedxml if wanted
|
||||
# Since enabling it can have adverse consequences for the programs using
|
||||
# slixmpp, do not enable it by default.
|
||||
if getenv('SLIXMPP_ENABLE_DEFUSEDXML', default='false').lower() == 'true':
|
||||
try:
|
||||
import defusedxml
|
||||
defusedxml.defuse_stdlib()
|
||||
except ImportError:
|
||||
pass
|
||||
|
||||
from slixmpp.stanza import Message, Presence, Iq
|
||||
from slixmpp.jid import JID, InvalidJID
|
||||
|
|
Loading…
Reference in a new issue