Commit ee29c10c authored by Yann Leboulanger's avatar Yann Leboulanger

import xmpp only when needed in helpers.py so decode_string is loaded before. see #4764

parent d67d3628
...@@ -43,7 +43,6 @@ from encodings.punycode import punycode_encode ...@@ -43,7 +43,6 @@ from encodings.punycode import punycode_encode
from i18n import Q_ from i18n import Q_
from i18n import ngettext from i18n import ngettext
import xmpp
try: try:
# Python 2.5 # Python 2.5
...@@ -1272,6 +1271,7 @@ def prepare_and_validate_gpg_keyID(account, jid, keyID): ...@@ -1272,6 +1271,7 @@ def prepare_and_validate_gpg_keyID(account, jid, keyID):
return keyID return keyID
def update_optional_features(account = None): def update_optional_features(account = None):
import xmpp
if account: if account:
accounts = [account] accounts = [account]
else: else:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment