From 9aa4f71e89de9e9189571c68ba1589024f77d71a Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Thu, 8 Oct 2015 02:17:47 +0000 Subject: Initial sorta-mostly-working with Django 1.8. Incredibly noisy due to incomprehensible advance depreciation warnings for Django 1.9. svn path=/branches/tk705/; revision=6100 --- rpki/rpkic.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'rpki/rpkic.py') diff --git a/rpki/rpkic.py b/rpki/rpkic.py index 0e485200..33f9e03e 100644 --- a/rpki/rpkic.py +++ b/rpki/rpkic.py @@ -130,6 +130,9 @@ class main(Cmd): os.environ.update(DJANGO_SETTINGS_MODULE = "rpki.django_settings.irdb") + import django + django.setup() + import rpki.irdb # pylint: disable=W0621 try: @@ -150,16 +153,6 @@ class main(Cmd): except rpki.config.ConfigParser.Error: pass - # Need to figure out whether we really want rpkic setting up - # databases or not. Defer until we've caught up to a current - # version of Django, are past the change from South to Django - # 1.7+'s migration scheme, and other potential complications. - - if False: - import django.core.management - django.core.management.call_command("syncdb", verbosity = 3, load_initial_data = False) - django.core.management.call_command("migrate", verbosity = 3) - self.zoo = rpki.irdb.Zookeeper(cfg = cfg, handle = self.handle, logstream = sys.stdout) -- cgit v1.2.3