From 9c8b6a048f7b4947ce9337a6d1204627274df7ad Mon Sep 17 00:00:00 2001 From: Michael Ziegler Date: Sun, 29 Nov 2009 14:53:32 +0100 Subject: [PATCH] change hardcoded indices to use the slice enum correctly --- pyweb/mumble/MumbleCtlIce.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pyweb/mumble/MumbleCtlIce.py b/pyweb/mumble/MumbleCtlIce.py index 8d687cc..268cf47 100644 --- a/pyweb/mumble/MumbleCtlIce.py +++ b/pyweb/mumble/MumbleCtlIce.py @@ -300,11 +300,13 @@ class MumbleCtlIce_120(MumbleCtlIce_118): return ret def registerPlayer(self, srvid, name, email, password): + # To get the real values of these ENUM entries, try + # Murmur.UserInfo.UserX.value from Murmur import UserInfo user = { - UserInfo(0): name.encode( "UTF-8" ), - UserInfo(1): email.encode( "UTF-8" ), - UserInfo(4): password.encode( "UTF-8" ), + UserInfo.UserName: name.encode( "UTF-8" ), + UserInfo.UserEmail: email.encode( "UTF-8" ), + UserInfo.UserPassword: password.encode( "UTF-8" ), }; return self._getIceServerObject(srvid).registerUser( user ); @@ -317,9 +319,9 @@ class MumbleCtlIce_120(MumbleCtlIce_118): def setRegistration(self, srvid, mumbleid, name, email, password): from Murmur import UserInfo user = { - UserInfo(0): name.encode( "UTF-8" ), - UserInfo(1): email.encode( "UTF-8" ), - UserInfo(4): password.encode( "UTF-8" ), + UserInfo.UserName: name.encode( "UTF-8" ), + UserInfo.UserEmail: email.encode( "UTF-8" ), + UserInfo.UserPassword: password.encode( "UTF-8" ), }; return self._getIceServerObject( srvid ).updateRegistration( mumbleid, user )