From 2327600745cf06c79a8a653a0714d1ab7a808b9c Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Mon, 15 Jun 2009 09:12:32 +0200
Subject: [PATCH] import xmpp only when needed in helpers.py so decode_string
 is loaded before. see #4764

---
 src/common/helpers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/helpers.py b/src/common/helpers.py
index fff0dde05..66a0e87f3 100644
--- a/src/common/helpers.py
+++ b/src/common/helpers.py
@@ -44,7 +44,6 @@ from encodings.punycode import punycode_encode
 
 from i18n import Q_
 from i18n import ngettext
-import xmpp
 
 try:
 	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
 
 def update_optional_features(account = None):
+	import xmpp
 	if account:
 		accounts = [account]
 	else: