diff options
| author | Lance Stout <lancestout@gmail.com> | 2010-12-13 14:36:53 -0500 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2010-12-13 14:36:53 -0500 |
| commit | c16913c99929a6a5a57611ec8a1757e3e82d4a45 (patch) | |
| tree | d92b98975b3dc012c734997e6fddc0ac9e2b82d8 /sleekxmpp/xmlstream/xmlstream.py | |
| parent | 12b61365adbbc910841475ea3cf8204f26ccd9c7 (diff) | |
| parent | f4451fe6b72f7cfb9680ead7a608d5ca1bc7e753 (diff) | |
| download | slixmpp-c16913c99929a6a5a57611ec8a1757e3e82d4a45.tar.gz slixmpp-c16913c99929a6a5a57611ec8a1757e3e82d4a45.tar.bz2 slixmpp-c16913c99929a6a5a57611ec8a1757e3e82d4a45.tar.xz slixmpp-c16913c99929a6a5a57611ec8a1757e3e82d4a45.zip | |
Merge branch 'develop' into roster
Conflicts:
sleekxmpp/basexmpp.py
Diffstat (limited to 'sleekxmpp/xmlstream/xmlstream.py')
| -rw-r--r-- | sleekxmpp/xmlstream/xmlstream.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py index 9ae31a20..fc7aff34 100644 --- a/sleekxmpp/xmlstream/xmlstream.py +++ b/sleekxmpp/xmlstream/xmlstream.py @@ -192,7 +192,7 @@ class XMLStream(object): self.send_queue = queue.Queue() self.scheduler = Scheduler(self.event_queue, self.stop) - self.namespace_map = {} + self.namespace_map = {StanzaBase.xml_ns: 'xml'} self.__thread = {} self.__root_stanza = [] |