Browse Source

Use unicode() in the DBus ctls to fix encoding issues. gnaah.

Natenom/support-murmur-13-1446181288462
Michael Ziegler 15 years ago
parent
commit
05a33ab290
  1. 9
      pyweb/mumble/MumbleCtlDbus.py

9
pyweb/mumble/MumbleCtlDbus.py

@ -125,9 +125,10 @@ class MumbleCtlDbus_118(MumbleCtlBase):
ret = {}; ret = {};
for channel in chans: for channel in chans:
print channel;
ret[ channel[0] ] = ObjectInfo( ret[ channel[0] ] = ObjectInfo(
id = int(channel[0]), id = int(channel[0]),
name = str(channel[1]),
name = unicode(channel[1]),
parent = int(channel[2]), parent = int(channel[2]),
links = [ int(lnk) for lnk in channel[3] ], links = [ int(lnk) for lnk in channel[3] ],
); );
@ -149,7 +150,7 @@ class MumbleCtlDbus_118(MumbleCtlBase):
selfDeaf = bool( playerObj[5] ), selfDeaf = bool( playerObj[5] ),
channel = int( playerObj[6] ), channel = int( playerObj[6] ),
userid = int( playerObj[7] ), userid = int( playerObj[7] ),
name = str( playerObj[8] ),
name = unicode( playerObj[8] ),
onlinesecs = int( playerObj[9] ), onlinesecs = int( playerObj[9] ),
bytespersec = int( playerObj[10] ) bytespersec = int( playerObj[10] )
); );
@ -178,7 +179,7 @@ class MumbleCtlDbus_118(MumbleCtlBase):
applySubs = bool(rule[1]), applySubs = bool(rule[1]),
inherited = bool(rule[2]), inherited = bool(rule[2]),
userid = int(rule[3]), userid = int(rule[3]),
group = str(rule[4]),
group = unicode(rule[4]),
allow = int(rule[5]), allow = int(rule[5]),
deny = int(rule[6]), deny = int(rule[6]),
) )
@ -186,7 +187,7 @@ class MumbleCtlDbus_118(MumbleCtlBase):
]; ];
groups = [ ObjectInfo( groups = [ ObjectInfo(
name = str(group[0]),
name = unicode(group[0]),
inherited = bool(group[1]), inherited = bool(group[1]),
inherit = bool(group[2]), inherit = bool(group[2]),
inheritable = bool(group[3]), inheritable = bool(group[3]),

Loading…
Cancel
Save