replace the x- prefix with x_ to get valid object attribute names

pyweb/mumble/mmobjects.py

@@ -177,7 +177,7 @@ class mmChannel( object ):
         chandata = self.channel_obj.__dict__.copy()
         chandata['users']        = [ pl.asDict( authed ) for pl in self.players  ]
         chandata['channels']     = [ sc.asDict( authed ) for sc in self.subchans ]
-        chandata['x-connecturl'] = self.connecturl
+        chandata['x_connecturl'] = self.connecturl
         return chandata
 
     def asXml( self, parentnode, authed=False ):
@@ -185,7 +185,7 @@ class mmChannel( object ):
         me = SubElement( parentnode, "channel" )
         xmlpopulate( me, self.channel_obj )
 
-        me.set( "x-connecturl", self.connecturl )
+        me.set( "x_connecturl", self.connecturl )
 
         for sc in self.subchans:
             sc.asXml(me, authed)
@@ -306,12 +306,12 @@ class mmPlayer( object ):
         pldata = self.player_obj.__dict__.copy()
 
         if authed:
-            pldata["x-addrstring"] = self.ipaddress
+            pldata["x_addrstring"] = self.ipaddress
         else:
             del pldata["address"]
 
         if self.mumbleuser and self.mumbleuser.hasTexture():
-            pldata['x-texture'] = "http://" + Site.objects.get_current().domain + self.mumbleuser.textureUrl
+            pldata['x_texture'] = "http://" + Site.objects.get_current().domain + self.mumbleuser.textureUrl
 
         return pldata
 
@@ -321,12 +321,12 @@ class mmPlayer( object ):
         xmlpopulate( me, self.player_obj )
 
         if authed:
-            me.set( "x-addrstring", self.ipaddress )
+            me.set( "x_addrstring", self.ipaddress )
         else:
             me.set( "address", "" )
 
         if self.mumbleuser and self.mumbleuser.hasTexture():
-            me.set( 'x-texture', "http://" + Site.objects.get_current().domain + self.mumbleuser.textureUrl )
+            me.set( 'x_texture', "http://" + Site.objects.get_current().domain + self.mumbleuser.textureUrl )
 
     def asMvXml( self, parentnode ):
         """ Return an XML node for this player suitable for MumbleViewer-ng. """

pyweb/mumble/models.py

@@ -554,8 +554,8 @@ class Mumble( models.Model ):
         return { 'name':   self.name,
              'id':     self.id,
              'root':   self.rootchan.asDict( authed ),
-             'x-connecturl': self.connecturl,
-             'x-uptime': self.uptime,
+             'x_connecturl': self.connecturl,
+             'x_uptime': self.uptime,
             }
 
     def asXml( self, authed=False ):
@@ -564,8 +564,8 @@ class Mumble( models.Model ):
             xmlns="http://mumble.sourceforge.net/Channel_Viewer_Protocol",
             id=unicode(self.id), name=self.name
             )
-        root.set( 'x-connecturl', self.connecturl )
-        root.set( 'x-uptime', unicode(self.uptime) )
+        root.set( 'x_connecturl', self.connecturl )
+        root.set( 'x_uptime', unicode(self.uptime) )
         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]