From ca4ba79461f14861c86e5b621a1dac7f7124c605 Mon Sep 17 00:00:00 2001
From: Michael Ziegler <diese-addy@funzt-halt.net>
Date: Thu, 9 Apr 2009 15:41:06 +0200
Subject: [PATCH] altered "settings" import to fit the django way, which should
 be better portable

---
 pyweb/mumble/models.py | 4 ++--
 pyweb/urls.py          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyweb/mumble/models.py b/pyweb/mumble/models.py
index 58394c8..3d329fb 100644
--- a/pyweb/mumble/models.py
+++ b/pyweb/mumble/models.py
@@ -35,7 +35,7 @@ from django.db import models
 
 from mmobjects import mmServer, mmACL
 
-from pyweb.settings import DEFAULT_FROM_EMAIL
+from django.conf import settings
 
 import dbus
 import socket
@@ -174,7 +174,7 @@ class MumbleUser( models.Model ):
 			murmur.setRegistration(
 				dbus.Int32(  self.mumbleid    ),
 				dbus.String( self.name        ),
-				dbus.String( self.owner.email if self.owner else DEFAULT_FROM_EMAIL ),
+				dbus.String( self.owner.email if self.owner else settings.DEFAULT_FROM_EMAIL ),
 				dbus.String( self.password    )
 				);
 			
diff --git a/pyweb/urls.py b/pyweb/urls.py
index eb2dc8b..d1ae5e2 100644
--- a/pyweb/urls.py
+++ b/pyweb/urls.py
@@ -4,7 +4,7 @@ from django.conf.urls.defaults import *
 from django.contrib import admin
 admin.autodiscover()
 
-import settings
+from django.conf import settings
 
 urlpatterns = patterns('',
     # Example: