aboutsummaryrefslogtreecommitdiff
path: root/rpki/django_settings/common.py
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2015-10-08 02:17:47 +0000
committerRob Austein <sra@hactrn.net>2015-10-08 02:17:47 +0000
commit9aa4f71e89de9e9189571c68ba1589024f77d71a (patch)
tree3be02352f5ca4b3816b44246c294ddfa7c176e05 /rpki/django_settings/common.py
parent3284d6687e0712cb78536be126d461833899e618 (diff)
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
Diffstat (limited to 'rpki/django_settings/common.py')
-rw-r--r--rpki/django_settings/common.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/rpki/django_settings/common.py b/rpki/django_settings/common.py
index 330ab165..a1d54c71 100644
--- a/rpki/django_settings/common.py
+++ b/rpki/django_settings/common.py
@@ -56,11 +56,10 @@ if os.getenv("RPKI_DJANGO_DEBUG") == "yes":
# fragile, tedious to use, and generally more complex than we need,
# because any given program is only going to be using one database.
-# Figure out which apps we're running. Modules that import this add
-# others. "south" will go away when we upgrade to Django 1.7+, at
-# which point we may leave this entirely for the importing modules.
-INSTALLED_APPS = ["south"]
+# Apps are also handled by the modules that import this one, now that
+# we don't require South.
+
# That would be it if we just need the ORM, but Django throws a hissy
# fit if SECRET_KEY isn't set, whether we use it for anything or not.