From 43bcfec7ed9e5b3147b3e61eb5ec760403c6c319 Mon Sep 17 00:00:00 2001
From: Hidden Z <hiddenz@mail.i2p>
Date: Fri, 27 Sep 2013 18:19:49 +0000
Subject: [PATCH] Fix settings import

According to django 1.5 documentation, settings should be imported as
>>> from django.conf import settings
---
 pyi2phosts/jump/views.py    | 2 +-
 pyi2phosts/latest/views.py  | 3 ++-
 pyi2phosts/lib/generic.py   | 3 +--
 pyi2phosts/lib/rss.py       | 4 ++--
 pyi2phosts/postkey/views.py | 2 +-
 pyi2phosts/urls.py          | 3 ++-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pyi2phosts/jump/views.py b/pyi2phosts/jump/views.py
index 181e75d..9272613 100644
--- a/pyi2phosts/jump/views.py
+++ b/pyi2phosts/jump/views.py
@@ -3,10 +3,10 @@ import re
 from django.shortcuts import render_to_response
 from django.shortcuts import redirect
 from django.core.exceptions import ValidationError
+from django.conf import settings
 
 from pyi2phosts.postkey.models import i2phost
 from pyi2phosts.lib.validation import validate_hostname
-import settings
 
 def jumper(request, host):
 	"""Actually do jumps."""
diff --git a/pyi2phosts/latest/views.py b/pyi2phosts/latest/views.py
index 01de056..8871c9b 100644
--- a/pyi2phosts/latest/views.py
+++ b/pyi2phosts/latest/views.py
@@ -1,6 +1,7 @@
 import datetime
 
-import settings
+from django.conf import settings
+
 from pyi2phosts.postkey.models import i2phost
 from pyi2phosts.lib.generic import HostsListsView
 
diff --git a/pyi2phosts/lib/generic.py b/pyi2phosts/lib/generic.py
index 92a0572..244996e 100755
--- a/pyi2phosts/lib/generic.py
+++ b/pyi2phosts/lib/generic.py
@@ -1,14 +1,13 @@
 from django.views.generic.base import TemplateView
 from django.views.generic.list import ListView
 from django.core.paginator import Paginator
+from django.conf import settings
 
 from pyi2phosts.lib.utils import get_b32
 from pyi2phosts.extsources.models import ExternalSource
 from pyi2phosts.postkey.models import i2phost
 from pyi2phosts.postkey.templatetags import paginator
 
-import settings
-
 class LocalTemplateView(TemplateView):
 	""" Renders some template with passing some local config variables """
 
diff --git a/pyi2phosts/lib/rss.py b/pyi2phosts/lib/rss.py
index ba17f13..5f7c6bf 100755
--- a/pyi2phosts/lib/rss.py
+++ b/pyi2phosts/lib/rss.py
@@ -1,9 +1,9 @@
 from django.contrib.syndication.views import Feed
+from django.conf import settings
+
 from pyi2phosts.postkey.models import i2phost
 from pyi2phosts.latest.views import get_latest
 
-import settings
-
 class AliveHostsFeed(Feed):
 	""" Generate RSS feed with all alive hosts """
 
diff --git a/pyi2phosts/postkey/views.py b/pyi2phosts/postkey/views.py
index 3d2f74d..b61d6e3 100644
--- a/pyi2phosts/postkey/views.py
+++ b/pyi2phosts/postkey/views.py
@@ -8,9 +8,9 @@ from django import forms
 from django.shortcuts import render_to_response
 from django.shortcuts import redirect
 from django.template import RequestContext
+from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 
-import settings
 from pyi2phosts.postkey.models import i2phost
 from pyi2phosts.lib.utils import get_logger
 from pyi2phosts.lib.validation import validate_hostname
diff --git a/pyi2phosts/urls.py b/pyi2phosts/urls.py
index 39045f6..ff7aeaa 100644
--- a/pyi2phosts/urls.py
+++ b/pyi2phosts/urls.py
@@ -4,11 +4,12 @@ from django.conf.urls.defaults import *
 from django.contrib import admin
 admin.autodiscover()
 
+from django.conf import settings
+
 from pyi2phosts.lib.rss import AliveHostsFeed
 from pyi2phosts.lib.generic import LocalTemplateView
 from pyi2phosts.lib.generic import FaqView
 from pyi2phosts.lib.generic import HostsListsView
-import settings
 
 
 urlpatterns = patterns('',