Browse Source

altered "settings" import to fit the django way, which should be better portable

Natenom/support-murmur-13-1446181288462
Michael Ziegler 16 years ago
parent
commit
ca4ba79461
  1. 4
      pyweb/mumble/models.py
  2. 2
      pyweb/urls.py

4
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 )
);

2
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:

Loading…
Cancel
Save