Django settings separed from conversejs settings &

Not adding the XML declaration line as it's optional on most bosh
servers and not accepted by some of them.

Author: seocam

conversejs/boshclient.py

@@ -15,7 +15,6 @@
 from xml.etree import ElementTree as ET
 
 from puresasl.client import SASLClient
-from .conf import get_conversejs_settings
 
 
 try:  # Python 2.7+
@@ -69,10 +68,6 @@ def __init__(self, jid, password, bosh_service):
 
         self.server_auth = []
 
-        converse_settings = get_conversejs_settings()
-        xml_encoding_line = converse_settings['CONVERSEJS_XML_ENCODING_LINE']
-        self.xml_encoding_line = True if xml_encoding_line.lower() == 'true' else False
-
     @property
     def connection(self):
         """Returns an stablished connection"""
@@ -134,8 +129,7 @@ def get_body(self, sid_request=False):
     def send_request(self, xml_stanza):
         ElementType = getattr(ET, '_Element', ET.Element)
         if isinstance(xml_stanza, ElementType):
-            xml_stanza = ET.tostring(xml_stanza) if not self.xml_encoding_line\
-                else ET.tostring(xml_stanza, encoding='utf8')
+            xml_stanza = ET.tostring(xml_stanza)
 
         self.log.debug('XML_STANZA: %s', xml_stanza)
         self.log.debug('Sending the request')

conversejs/conf.py

@@ -1,7 +1,17 @@
 from django.conf import settings
 
 
+# Django-conversejs settings
+CONVERSEJS_AUTO_REGISTER = getattr(settings, 'CONVERSEJS_AUTO_REGISTER', False)
+
+
 def get_conversejs_settings():
+    """This helper function returns all the configuration needed by
+    Converse.js frontend (javascript).
+
+    Configurations specific to django-conversejs should be added above.
+
+    """
     converse_settings = {
         'CONVERSEJS_AUTO_LIST_ROOMS': False,
         'CONVERSEJS_AUTO_SUBSCRIBE': False,
@@ -10,7 +20,6 @@ def get_conversejs_settings():
         'CONVERSEJS_PREBIND': True,
         'CONVERSEJS_SHOW_CONTROLBOX_BY_DEFAULT': False,
         'CONVERSEJS_XHR_USER_SEARCH': False,
-        'CONVERSEJS_XML_ENCODING_LINE': True,
         'CONVERSEJS_DEBUG': settings.DEBUG,
     }
 
@@ -23,3 +32,4 @@ def get_conversejs_settings():
         converse_settings[key] = conf
 
     return converse_settings
+

conversejs/utils.py

@@ -1,7 +1,7 @@
 
 import uuid
 
-from .conf import get_conversejs_settings
+from .conf import get_conversejs_settings, CONVERSEJS_AUTO_REGISTER
 from .models import XMPPAccount
 from .boshclient import BOSHClient
 from .register import register_account
@@ -18,7 +18,7 @@ def get_conversejs_context(context, xmpp_login=False):
     try:
         xmpp_account = XMPPAccount.objects.get(user=request.user.pk)
     except XMPPAccount.DoesNotExist:
-        jid_domain = getattr(settings, 'CONVERSEJS_AUTO_REGISTER', False)
+        jid_domain = CONVERSEJS_AUTO_REGISTER
         if not jid_domain:
             return context