import xmpp only when needed in helpers.py so decode_string is loaded before. see #4764
This commit is contained in:
parent
5026aa9655
commit
2327600745
|
@ -44,7 +44,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:
|
||||||
import winsound # windows-only built-in module for playing wav
|
import winsound # windows-only built-in module for playing wav
|
||||||
|
@ -1347,6 +1346,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:
|
||||||
|
|
Loading…
Reference in New Issue