Revision 0c09b1c0

b/snf-cyclades-app/synnefo/db/migrations/0035_default_backend.py
4 4
from south.v2 import DataMigration
5 5
from django.db import models
6 6

  
7
from synnefo import settings
7
from django.conf import settings
8 8

  
9 9
class Migration(DataMigration):
10 10

  
b/snf-cyclades-app/synnefo/db/migrations/0037_network_migration.py
3 3
from south.db import db
4 4
from south.v2 import DataMigration
5 5
from django.db import models
6
from synnefo import settings
6
from django.conf import settings
7 7

  
8 8
class Migration(DataMigration):
9 9

  
b/snf-cyclades-app/synnefo/db/models.py
38 38
from contextlib import contextmanager
39 39
from hashlib import sha1
40 40
from snf_django.lib.api import faults
41
from synnefo import settings as snf_settings
41
from django.conf import settings as snf_settings
42 42
from aes_encrypt import encrypt_db_charfield, decrypt_db_charfield
43 43

  
44 44
from synnefo.db.managers import ForUpdateManager, ProtectedDeleteManager
b/snf-cyclades-app/synnefo/db/tests.py
33 33

  
34 34
from django.test import TestCase
35 35

  
36
from synnefo import settings
36
from django.conf import settings
37 37
# Import pool tests
38 38
from synnefo.db.pools.tests import *
39 39

  
b/snf-cyclades-app/synnefo/logic/dispatcher.py
43 43
import os
44 44
path = os.path.normpath(os.path.join(os.getcwd(), '..'))
45 45
sys.path.append(path)
46
from synnefo import settings
46
from django.conf import settings
47 47
setup_environ(settings)
48 48

  
49 49
from django.db import close_connection
b/snf-cyclades-app/synnefo/logic/management/commands/backend-update-status.py
32 32
from django.core.management.base import BaseCommand
33 33
from synnefo.management.common import get_backend
34 34

  
35
from synnefo import settings
35
from django.conf import settings
36 36
import datetime
37 37

  
38 38
from synnefo.db.models import Backend
b/snf-cyclades-app/synnefo/logic/reconciliation.py
57 57

  
58 58

  
59 59
from django.core.management import setup_environ
60
try:
61
    from synnefo import settings
62
except ImportError:
63
    raise Exception("Cannot import settings, make sure PYTHONPATH contains "
64
                    "the parent directory of the Synnefo Django project.")
65
setup_environ(settings)
66

  
60
from django.conf import settings
67 61

  
68 62
import logging
69 63
import itertools
b/snf-cyclades-app/synnefo/logic/servers.py
7 7
from django.utils import simplejson as json
8 8

  
9 9
from snf_django.lib.api import faults
10
from synnefo import settings
10
from django.conf import settings
11 11
from synnefo import quotas
12 12
from synnefo.api import util
13 13
from synnefo.logic import backend

Also available in: Unified diff