Browse Source

use spaces instead of commas to separate lists and include proper xmlns definitions

Natenom/support-murmur-13-1446181288462
Michael Ziegler 14 years ago
parent
commit
84ccb94516
  1. 4
      pyweb/mumble/mmobjects.py
  2. 10
      pyweb/mumble/models.py

4
pyweb/mumble/mmobjects.py

@ -167,7 +167,7 @@ class mmChannel( object ):
if isinstance( val, bool ):
me.set( key, unicode(val).lower() )
elif isinstance( val, list ) or isinstance( val, tuple ):
me.set( key, ','.join( ( unicode(elem) for elem in val ) ) )
me.set( key, ' '.join( ( unicode(elem) for elem in val ) ) )
elif isinstance( val, str ):
me.set( key, unicode(val, "utf8") )
else:
@ -305,7 +305,7 @@ class mmPlayer( object ):
if isinstance( val, bool ):
me.set( key, unicode(val).lower() )
elif isinstance( val, list ) or isinstance( val, tuple ):
me.set( key, ','.join( ( unicode(elem) for elem in val ) ) )
me.set( key, ' '.join( ( unicode(elem) for elem in val ) ) )
elif isinstance( val, str ):
me.set( key, unicode(val, "utf8") )
else:

10
pyweb/mumble/models.py

@ -557,8 +557,16 @@ class Mumble( models.Model ):
def asXml( self, authed=False ):
from xml.etree.cElementTree import Element
root = Element( "server", id=unicode(self.id), name=self.name )
root = Element( "server",
xmlns="http://mumble.sourceforge.net/Channel_Viewer_Protocol",
id=unicode(self.id), name=self.name
)
root.set( 'x-connecturl', self.connecturl )
root.set( 'xmlns:xsi', "http://www.w3.org/2001/XMLSchema-instance" )
root.set( 'xsi:schemaLocation',
"http://bitbucket.org/Svedrin/mumble-django/wiki/channel-viewer-protocol_murmur-%d-%d-%d.xsd" % self.version[:3]
)
self.rootchan.asXml( root, authed )
return root

Loading…
Cancel
Save