django: proper settings import

firewall/fw.py

 from django.contrib import auth
 from django.contrib import auth
 from firewall import models
 from firewall import models
 import os
 import os
-from cloud.settings import firewall_settings as settings
+from django.conf.settings import firewall_settings as settings
 
 
 import subprocess
 import subprocess
 import re
 import re

firewall/models.py

@@ -7,7 +7,7 @@ from django.utils.translation import ugettext_lazy as _
 from firewall.fields import *
 from firewall.fields import *
 from south.modelsinspector import add_introspection_rules
 from south.modelsinspector import add_introspection_rules
 from django.core.validators import MinValueValidator, MaxValueValidator
 from django.core.validators import MinValueValidator, MaxValueValidator
-from cloud.settings import firewall_settings as settings
+from django.conf.settings import firewall_settings as settings
 from django.db.models.signals import post_save
 from django.db.models.signals import post_save
 import re
 import re
 import random
 import random

firewall/tasks.py

@@ -4,7 +4,7 @@ from django.core.cache import cache
 import os
 import os
 import time
 import time
 from firewall.fw import *
 from firewall.fw import *
-from cloud.settings import firewall_settings as settings
+from django.conf.settings import firewall_settings as settings
 
 
 @celery.task
 @celery.task
 def reload_dns_task(data):
 def reload_dns_task(data):

one/models.py

@@ -18,7 +18,7 @@ from firewall.models import Host, Rule, Vlan, Record
 from school.models import Person, Group
 from school.models import Person, Group
 from store.api import StoreApi
 from store.api import StoreApi
 from .util import keygen
 from .util import keygen
-from cloud.settings import CLOUD_URL
+from django.conf.settings import CLOUD_URL
 
 
 logger = logging.getLogger(__name__)
 logger = logging.getLogger(__name__)
 pwgen = User.objects.make_random_password
 pwgen = User.objects.make_random_password

one/views.py

@@ -20,7 +20,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.views.decorators.http import *
 from django.views.decorators.http import *
 from django.views.generic import *
 from django.views.generic import *
 from firewall.tasks import *
 from firewall.tasks import *
-from cloud.settings import store_settings
+from django.conf.settings import store_settings
 from one.models import *
 from one.models import *
 from school.models import *
 from school.models import *
 import django.contrib.auth as auth
 import django.contrib.auth as auth

store/api.py

 from django.db import models
 from django.db import models
 from django.http import Http404
 from django.http import Http404
 import json, requests, time
 import json, requests, time
-from cloud.settings import store_settings as settings
+from django.conf.settings import store_settings as settings
 
 
 # Create your models here.
 # Create your models here.
 #TODO Handle exceptions locally
 #TODO Handle exceptions locally