From 24ff9ce515c98dbe0f12c4388364e5922d12e159 Mon Sep 17 00:00:00 2001 From: Michael Ziegler Date: Tue, 12 May 2009 00:16:03 +0200 Subject: [PATCH] bugfix: used syntax that is not available in python 2.4 --- pyweb/mumble/models.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pyweb/mumble/models.py b/pyweb/mumble/models.py index 3fa531f..4e5e0cc 100644 --- a/pyweb/mumble/models.py +++ b/pyweb/mumble/models.py @@ -172,11 +172,16 @@ class MumbleUser( models.Model ): # Update user's registration if self.password: + if self.owner: + email = self.owner.email + else: + email = settings.DEFAULT_FROM_EMAIL; + murmur.setRegistration( - dbus.Int32( self.mumbleid ), - dbus.String( self.name ), - dbus.String( self.owner.email if self.owner else settings.DEFAULT_FROM_EMAIL ), - dbus.String( self.password ) + dbus.Int32( self.mumbleid ), + dbus.String( self.name ), + dbus.String( email ), + dbus.String( self.password ) ); # Don't save the users' passwords, we don't need them anyway