diff options
Diffstat (limited to 'rpki')
| -rw-r--r-- | rpki/gui/script_util.py | 6 | ||||
| -rw-r--r-- | rpki/irdbd.py | 11 | ||||
| -rw-r--r-- | rpki/rpkic.py | 7 |
3 files changed, 23 insertions, 1 deletions
diff --git a/rpki/gui/script_util.py b/rpki/gui/script_util.py index c3a864fd..fb15403d 100644 --- a/rpki/gui/script_util.py +++ b/rpki/gui/script_util.py @@ -16,6 +16,8 @@ This module contains utility functions for use in standalone scripts. """ +import django + from django.conf import settings from rpki import config @@ -40,4 +42,8 @@ def setup(): 'PASSWORD': cfg.get('sql-password'), } }, + MIDDLEWARE_CLASSES = (), ) + if django.VERSION >= (1, 7): + from django.apps import apps + apps.populate(settings.INSTALLED_APPS) diff --git a/rpki/irdbd.py b/rpki/irdbd.py index d53ae67c..ae08b6fb 100644 --- a/rpki/irdbd.py +++ b/rpki/irdbd.py @@ -186,6 +186,9 @@ class main(object): def main(self): global rpki # pylint: disable=W0602 + + import django + from django.conf import settings startup_msg = self.cfg.get("startup-message", "") @@ -211,7 +214,13 @@ class main(object): "PASSWORD" : self.cfg.get("sql-password"), "HOST" : "", "PORT" : "" }}, - 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 diff --git a/rpki/rpkic.py b/rpki/rpkic.py index d7b76c51..8ce28b59 100644 --- a/rpki/rpkic.py +++ b/rpki/rpkic.py @@ -132,6 +132,8 @@ class main(Cmd): self.histfile = cfg.get("history_file", os.path.expanduser("~/.rpkic_history")) self.autosync = cfg.getboolean("autosync", True, section = "rpkic") + import django + from django.conf import settings settings.configure( @@ -144,8 +146,13 @@ class main(Cmd): "PORT" : "", "OPTIONS" : { "init_command": "SET storage_engine=INNODB" }}}, 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 try: |