summaryrefslogtreecommitdiffstats
path: root/forum/importers/stackexchange/management
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2010-05-09 15:18:10 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2010-05-09 15:18:10 -0400
commit56af1f30e5fc9bcab600d57506dc06db167730b1 (patch)
tree2231a41a02c547bb63417aa5747daa084f0e1cfd /forum/importers/stackexchange/management
parent5ec0ae6635bc9ece491c23b18507f2a558ce14e5 (diff)
downloadaskbot-56af1f30e5fc9bcab600d57506dc06db167730b1.tar.gz
askbot-56af1f30e5fc9bcab600d57506dc06db167730b1.tar.bz2
askbot-56af1f30e5fc9bcab600d57506dc06db167730b1.zip
finished moving settings to livesettings, available at url /settings
Diffstat (limited to 'forum/importers/stackexchange/management')
-rw-r--r--forum/importers/stackexchange/management/commands/load_stackexchange.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/forum/importers/stackexchange/management/commands/load_stackexchange.py b/forum/importers/stackexchange/management/commands/load_stackexchange.py
index ee22e33a..308ac0bb 100644
--- a/forum/importers/stackexchange/management/commands/load_stackexchange.py
+++ b/forum/importers/stackexchange/management/commands/load_stackexchange.py
@@ -11,7 +11,7 @@ import forum.models as askbot
import forum.importers.stackexchange.models as se
from forum.forms import EditUserEmailFeedsForm
from forum.utils.html import sanitize_html
-from django.conf import settings
+from forum.conf import settings as forum_settings
from django.contrib.auth.models import Message as DjangoMessage
from django.utils.translation import ugettext as _
#from markdown2 import Markdown
@@ -209,7 +209,7 @@ class X(object):#
@classmethod
def get_email(cls, email):#todo: fix fringe case - user did not give email!
if email is None:
- return settings.ANONYMOUS_USER_EMAIL
+ return forum_settings.ANONYMOUS_USER_EMAIL
else:
assert(email != '')
return email