Skip to content

Commit

Permalink
import core.conf.settings everywhere
Browse files Browse the repository at this point in the history
  • Loading branch information
nitely committed Sep 24, 2017
1 parent d05f6bc commit d622029
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion spirit/comment/tags.py
Expand Up @@ -4,8 +4,8 @@

from django.utils.translation import ugettext_lazy as _
from django.utils.html import mark_safe
from django.conf import settings

from ..core.conf import settings
from ..core.tags.registry import register
from .poll.utils.render import render_polls
from .forms import CommentForm
Expand Down
2 changes: 1 addition & 1 deletion spirit/comment/urls.py
Expand Up @@ -3,8 +3,8 @@
from __future__ import unicode_literals

from django.conf.urls import url, include
from django.conf import settings

from ..core.conf import settings
import spirit.comment.bookmark.urls
import spirit.comment.flag.urls
import spirit.comment.history.urls
Expand Down
1 change: 0 additions & 1 deletion spirit/comment/views.py
Expand Up @@ -2,7 +2,6 @@

from __future__ import unicode_literals

from django.conf import settings
from django.contrib.auth.decorators import login_required
from django.shortcuts import render, redirect, get_object_or_404
from django.views.decorators.http import require_POST
Expand Down
4 changes: 2 additions & 2 deletions spirit/core/tags/settings.py
Expand Up @@ -2,14 +2,14 @@

from __future__ import unicode_literals

from django.conf import settings as django_settings
from ..conf import settings as st_settings

from .registry import register


@register.simple_tag(takes_context=True)
def load_settings(context, *settings):
context['st_settings'] = {
setting: getattr(django_settings, setting)
setting: getattr(st_settings, setting)
for setting in settings}
return ''
1 change: 0 additions & 1 deletion spirit/topic/views.py
Expand Up @@ -5,7 +5,6 @@
from django.contrib.auth.decorators import login_required
from django.shortcuts import render, redirect, get_object_or_404
from django.http import HttpResponsePermanentRedirect
from django.conf import settings

from djconfig import config

Expand Down

0 comments on commit d622029

Please sign in to comment.