From 0aef422d9aab83a9ba7d54b8d0968d16b4a56250 Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Mon, 20 Dec 2010 11:46:47 +0000
Subject: [PATCH] Switch from "import settings" to "from django.conf import
 settings"

---
 hr/forms.py     | 2 +-
 hr/views.py     | 3 +--
 reddit/tasks.py | 2 +-
 sso/forms.py    | 6 +++---
 sso/views.py    | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/hr/forms.py b/hr/forms.py
index e346d77..51e5144 100644
--- a/hr/forms.py
+++ b/hr/forms.py
@@ -1,5 +1,5 @@
 from django import forms
-import settings
+from django.conf import settings
 
 from hr.app_defines import *
 from hr.models import Application, Audit
diff --git a/hr/views.py b/hr/views.py
index 6e45954..6100601 100644
--- a/hr/views.py
+++ b/hr/views.py
@@ -8,8 +8,7 @@ from django.contrib.auth.models import User, Group
 from django.contrib.auth.decorators import login_required
 from django.template import RequestContext
 from django.template.loader import render_to_string
-
-import settings
+from django.conf import settings
 
 from eve_api.models import EVEAccount, EVEPlayerCorporation, EVEPlayerCharacter
 from reddit.models import RedditAccount
diff --git a/reddit/tasks.py b/reddit/tasks.py
index 2b7645e..c806b0f 100644
--- a/reddit/tasks.py
+++ b/reddit/tasks.py
@@ -1,7 +1,7 @@
 from celery.decorators import task
 from reddit.models import RedditAccount
 from reddit.api import Inbox
-import settings
+from django.conf import settings
 
 @task(ignore_result=True)
 def send_reddit_message(to, subject, message):
diff --git a/sso/forms.py b/sso/forms.py
index cf97807..33157cb 100644
--- a/sso/forms.py
+++ b/sso/forms.py
@@ -2,13 +2,12 @@ import re
 
 from django import forms
 from django.contrib.auth.models import User
+from django.conf import settings
 
-import settings
 from eve_api.models import EVEAccount, EVEPlayerCharacter, EVEPlayerCorporation
 from sso.models import ServiceAccount, Service
 from reddit.models import RedditAccount
 from registration.forms import RegistrationForm
-from settings import BANNED_EMAIL_DOMAINS
 
 class RegistrationFormUniqueEmailBlocked(RegistrationForm):
     """
@@ -27,10 +26,11 @@ class RegistrationFormUniqueEmailBlocked(RegistrationForm):
         return self.cleaned_data['email']
 
         email_domain = self.cleaned_data['email'].split('@')[1]
-        if email_domain in BANNED_EMAIL_DOMAINS:
+        if email_domain in settings.BANNED_EMAIL_DOMAINS:
             raise forms.ValidationError("Your email provider (%s) is banned from registering, please use a different address.")
         return self.cleaned_data['email']
 
+
 class EveAPIForm(forms.Form):
     """ EVE API input form """
 
diff --git a/sso/views.py b/sso/views.py
index 8e99b3b..1a1337f 100644
--- a/sso/views.py
+++ b/sso/views.py
@@ -12,6 +12,7 @@ from django.contrib.auth.models import User
 from django.contrib.auth.decorators import login_required
 from django.template import RequestContext
 from django.core import serializers
+from django.conf import settings
 
 from eve_api.models import EVEAccount, EVEPlayerCharacter
 from eve_api.tasks import import_apikey, import_apikey_result
@@ -23,7 +24,6 @@ from sso.forms import EveAPIForm, UserServiceAccountForm, ServiceAccountResetFor
 
 from reddit.models import RedditAccount
 
-import settings
 
 def index(request):
     if request.user: