diff options
| author | Rob Austein <sra@hactrn.net> | 2014-10-05 17:42:22 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2014-10-05 17:42:22 +0000 |
| commit | 7d250756df425252344d29c54256ca141b915ed3 (patch) | |
| tree | 767e199979f05abf950b918f49c06fe7e14d8697 /rpki/rpkic.py | |
| parent | 4598ade64714fcbba5b8785ba84533522254708b (diff) | |
| parent | d4f19b6a2957b11d286b1306cc1b209ee18e200c (diff) | |
Pull from trunk.
svn path=/branches/tk705/; revision=5988
Diffstat (limited to 'rpki/rpkic.py')
| -rw-r--r-- | rpki/rpkic.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/rpki/rpkic.py b/rpki/rpkic.py index fdde6056..8529026b 100644 --- a/rpki/rpkic.py +++ b/rpki/rpkic.py @@ -143,6 +143,7 @@ class main(Cmd): os.environ.update(DJANGO_SETTINGS_MODULE = "rpki.django_settings") else: + import django from django.conf import settings settings.configure( DATABASES = { "default" : { @@ -153,8 +154,13 @@ class main(Cmd): "HOST" : "", "PORT" : "", "OPTIONS" : { "init_command": "SET storage_engine=INNODB" }}}, - INSTALLED_APPS = ["rpki.irdb"]) + INSTALLED_APPS = ("rpki.irdb",), + MIDDLEWARE_CLASSES = (), # API change, feh + ) + if django.VERSION >= (1, 7): # API change, feh + from django.apps import apps + apps.populate(settings.INSTALLED_APPS) import rpki.irdb # pylint: disable=W0621 |