From 3dd41df5a5727e1790c125cd4d2e2f3d7db081c3 Mon Sep 17 00:00:00 2001 From: Michael Ziegler Date: Mon, 21 Dec 2009 01:57:45 +0100 Subject: [PATCH] fix formats of the results of getRegistration(). --- pyweb/mumble/MumbleCtlDbus.py | 12 +++++++----- pyweb/mumble/MumbleCtlIce.py | 16 ++++++---------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/pyweb/mumble/MumbleCtlDbus.py b/pyweb/mumble/MumbleCtlDbus.py index 7ce7c00..982bb8e 100644 --- a/pyweb/mumble/MumbleCtlDbus.py +++ b/pyweb/mumble/MumbleCtlDbus.py @@ -198,11 +198,13 @@ class MumbleCtlDbus_118(MumbleCtlBase): self.meta.setSuperUserPassword(dbus.Int32(srvid), value) def getRegistration(self, srvid, mumbleid): - user = MumbleCtlDbus_118.convertDbusTypeToNative(self._getDbusServerObject(srvid).getRegistration(dbus.Int32(mumbleid))) - return { - 'name': user[1], - 'email': user[2], - }; + user = self._getDbusServerObject(srvid).getRegistration(dbus.Int32(mumbleid)) + return ObjectInfo( + userid = mumbleid, + name = unicode(user[1]), + email = unicode(user[2]), + pw = '', + ); def setRegistration(self, srvid, mumbleid, name, email, password): return MumbleCtlDbus_118.convertDbusTypeToNative( diff --git a/pyweb/mumble/MumbleCtlIce.py b/pyweb/mumble/MumbleCtlIce.py index e17f1c3..70584e9 100644 --- a/pyweb/mumble/MumbleCtlIce.py +++ b/pyweb/mumble/MumbleCtlIce.py @@ -359,16 +359,12 @@ class MumbleCtlIce_120(MumbleCtlIce_118): def getRegistration(self, srvid, mumbleid): from Murmur import UserInfo reg = self._getIceServerObject( srvid ).getRegistration( mumbleid ) - user = {}; - if UserInfo.UserName in reg: - user['name'] = reg[UserInfo.UserName]; - if UserInfo.UserEmail in reg: - user['email'] = reg[UserInfo.UserEmail]; - if UserInfo.UserComment in reg: - user['comment'] = reg[UserInfo.UserComment]; - if UserInfo.UserHash in reg: - user['hash'] = reg[UserInfo.UserHash]; - return ObjectInfo( **user ); + user = ObjectInfo( userid=mumbleid, name="", email="", comment="", hash="", pw="" ); + if UserInfo.UserName in reg: user.name = reg[UserInfo.UserName]; + if UserInfo.UserEmail in reg: user.email = reg[UserInfo.UserEmail]; + if UserInfo.UserComment in reg: user.comment = reg[UserInfo.UserComment]; + if UserInfo.UserHash in reg: user.hash = reg[UserInfo.UserHash]; + return user; @protectDjangoErrPage def setRegistration(self, srvid, mumbleid, name, email, password):