From d50bb7a66f1ab53b925ca312763a3ae49d32e039 Mon Sep 17 00:00:00 2001
From: Hidden Z <hiddenz@mail.i2p>
Date: Wed, 3 Nov 2010 19:26:58 +0000
Subject: [PATCH] web: avoid importing or accessing modules using "web.*"

---
 web/extsources/models.py |  2 +-
 web/jump/urls.py         |  2 +-
 web/jump/views.py        |  6 +++---
 web/lib/validation.py    |  2 +-
 web/other/views.py       |  2 +-
 web/postkey/urls.py      |  2 +-
 web/postkey/views.py     | 10 +++++-----
 web/settings.py          |  6 +++---
 web/urls.py              |  8 +++-----
 9 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/web/extsources/models.py b/web/extsources/models.py
index c998c8d..0ac8c56 100644
--- a/web/extsources/models.py
+++ b/web/extsources/models.py
@@ -1,6 +1,6 @@
 from django.db import models
 
-from web.lib.validation import validate_i2purl
+from lib.validation import validate_i2purl
 
 class ExternalSource(models.Model):
 	name = models.CharField(max_length=128, unique=True)
diff --git a/web/jump/urls.py b/web/jump/urls.py
index b2c33e6..fb9c5dc 100644
--- a/web/jump/urls.py
+++ b/web/jump/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls.defaults import *
 
-urlpatterns = patterns('web.jump.views',
+urlpatterns = patterns('jump.views',
 		(r'^([^$/]+)', 'jumper'),
 
 )
diff --git a/web/jump/views.py b/web/jump/views.py
index f160659..eceee32 100644
--- a/web/jump/views.py
+++ b/web/jump/views.py
@@ -3,9 +3,9 @@ import re
 from django.shortcuts import render_to_response
 from django.core.exceptions import ValidationError
 
-from web.postkey.models import i2phost
-from web.lib.validation import validate_hostname
-from web import settings
+from postkey.models import i2phost
+from lib.validation import validate_hostname
+import settings
 
 def jumper(request, host):
 	"""Actually do jumps."""
diff --git a/web/lib/validation.py b/web/lib/validation.py
index 656c2fe..ff5bb4c 100644
--- a/web/lib/validation.py
+++ b/web/lib/validation.py
@@ -4,7 +4,7 @@ import re
 
 from django.core.exceptions import ValidationError
 
-from web.postkey.models import i2phost
+from postkey.models import i2phost
 
 
 def validate_hostname(data):
diff --git a/web/other/views.py b/web/other/views.py
index 538b82f..fa3409f 100644
--- a/web/other/views.py
+++ b/web/other/views.py
@@ -1,5 +1,5 @@
 from django.shortcuts import render_to_response
-from web import settings
+import settings
 
 def index(request):
 	return render_to_response('index.html', {
diff --git a/web/postkey/urls.py b/web/postkey/urls.py
index 23ec512..719becc 100644
--- a/web/postkey/urls.py
+++ b/web/postkey/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls.defaults import *
 
-urlpatterns = patterns('web.postkey.views',
+urlpatterns = patterns('postkey.views',
 		(r'^$', 'addkey'),
 		(r'^success/', 'success'),
 )
diff --git a/web/postkey/views.py b/web/postkey/views.py
index a29e4f1..f4ed5fd 100644
--- a/web/postkey/views.py
+++ b/web/postkey/views.py
@@ -5,11 +5,11 @@ from django.forms import ModelForm
 from django.shortcuts import render_to_response
 from django.template import RequestContext
 
-from web import settings
-from web.postkey.models import i2phost
-from web.lib.utils import get_logger
-from web.lib.validation import validate_hostname
-from web.lib.validation import validate_b64hash
+import settings
+from postkey.models import i2phost
+from lib.utils import get_logger
+from lib.validation import validate_hostname
+from lib.validation import validate_b64hash
 
 class AddForm(ModelForm):
 	"""
diff --git a/web/settings.py b/web/settings.py
index d9e29b1..095527a 100644
--- a/web/settings.py
+++ b/web/settings.py
@@ -78,7 +78,7 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.messages.middleware.MessageMiddleware',
 )
 
-ROOT_URLCONF = 'web.urls'
+ROOT_URLCONF = 'urls'
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
@@ -93,8 +93,8 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.messages',
-    'web.postkey',
-    'web.extsources',
+    'postkey',
+    'extsources',
     # Uncomment the next line to enable the admin:
     'django.contrib.admin',
 )
diff --git a/web/urls.py b/web/urls.py
index 857de1a..fbfeafb 100644
--- a/web/urls.py
+++ b/web/urls.py
@@ -4,14 +4,12 @@ from django.conf.urls.defaults import *
 from django.contrib import admin
 admin.autodiscover()
 
-from web.other.views import *
+from other.views import *
 
 urlpatterns = patterns('',
 		url(r'^$', index, name='index'),
-		(r'^postkey/', include('web.postkey.urls')),
-		(r'^jump/', include('web.jump.urls')),
-    # Example:
-    # (r'^web/', include('web.foo.urls')),
+		(r'^postkey/', include('postkey.urls')),
+		(r'^jump/', include('jump.urls')),
 
     # Uncomment the admin/doc line below and add 'django.contrib.admindocs' 
     # to INSTALLED_APPS to enable admin documentation: