diff options
Diffstat (limited to 'slixmpp/__init__.py')
| -rw-r--r-- | slixmpp/__init__.py | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/slixmpp/__init__.py b/slixmpp/__init__.py index 403c9299..5841cdf7 100644 --- a/slixmpp/__init__.py +++ b/slixmpp/__init__.py @@ -4,14 +4,17 @@ # This file is part of Slixmpp. # See the file LICENSE for copying permission. import logging -logging.getLogger(__name__).addHandler(logging.NullHandler()) +from os import getenv -# 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 |