Browse Source

Revert "web: avoid importing or accessing modules using "web.*""

This reverts commit d50bb7a66f.

Conflicts:

	web/settings.py

Do imports from pyi2phosts.*
pull/1/head
Hidden Z 14 years ago
parent
commit
f63768095d
  1. 2
      web/extsources/models.py
  2. 2
      web/jump/urls.py
  3. 6
      web/jump/views.py
  4. 2
      web/lib/validation.py
  5. 2
      web/other/views.py
  6. 2
      web/postkey/urls.py
  7. 10
      web/postkey/views.py
  8. 2
      web/settings.py
  9. 8
      web/urls.py

2
web/extsources/models.py

@ -1,6 +1,6 @@
from django.db import models from django.db import models
from lib.validation import validate_i2purl from pyi2phosts.lib.validation import validate_i2purl
class ExternalSource(models.Model): class ExternalSource(models.Model):
name = models.CharField(max_length=128, unique=True) name = models.CharField(max_length=128, unique=True)

2
web/jump/urls.py

@ -1,6 +1,6 @@
from django.conf.urls.defaults import * from django.conf.urls.defaults import *
urlpatterns = patterns('jump.views', urlpatterns = patterns('pyi2phosts.jump.views',
(r'^([^$/]+)', 'jumper'), (r'^([^$/]+)', 'jumper'),
) )

6
web/jump/views.py

@ -3,9 +3,9 @@ import re
from django.shortcuts import render_to_response from django.shortcuts import render_to_response
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from postkey.models import i2phost from pyi2phosts.postkey.models import i2phost
from lib.validation import validate_hostname from pyi2phosts.lib.validation import validate_hostname
import settings from web import settings
def jumper(request, host): def jumper(request, host):
"""Actually do jumps.""" """Actually do jumps."""

2
web/lib/validation.py

@ -4,7 +4,7 @@ import re
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from postkey.models import i2phost from pyi2phosts.postkey.models import i2phost
def validate_hostname(data): def validate_hostname(data):

2
web/other/views.py

@ -1,5 +1,5 @@
from django.shortcuts import render_to_response from django.shortcuts import render_to_response
import settings from web import settings
def index(request): def index(request):
return render_to_response('index.html', { return render_to_response('index.html', {

2
web/postkey/urls.py

@ -1,6 +1,6 @@
from django.conf.urls.defaults import * from django.conf.urls.defaults import *
urlpatterns = patterns('postkey.views', urlpatterns = patterns('pyi2phosts.postkey.views',
(r'^$', 'addkey'), (r'^$', 'addkey'),
(r'^success/', 'success'), (r'^success/', 'success'),
) )

10
web/postkey/views.py

@ -5,11 +5,11 @@ from django.forms import ModelForm
from django.shortcuts import render_to_response from django.shortcuts import render_to_response
from django.template import RequestContext from django.template import RequestContext
import settings from web import settings
from postkey.models import i2phost from pyi2phosts.postkey.models import i2phost
from lib.utils import get_logger from pyi2phosts.lib.utils import get_logger
from lib.validation import validate_hostname from pyi2phosts.lib.validation import validate_hostname
from lib.validation import validate_b64hash from pyi2phosts.lib.validation import validate_b64hash
class AddForm(ModelForm): class AddForm(ModelForm):
""" """

2
web/settings.py

@ -78,7 +78,7 @@ MIDDLEWARE_CLASSES = (
'django.contrib.messages.middleware.MessageMiddleware', 'django.contrib.messages.middleware.MessageMiddleware',
) )
ROOT_URLCONF = 'urls' ROOT_URLCONF = 'pyi2phosts.urls'
TEMPLATE_DIRS = ( TEMPLATE_DIRS = (
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".

8
web/urls.py

@ -4,12 +4,14 @@ from django.conf.urls.defaults import *
from django.contrib import admin from django.contrib import admin
admin.autodiscover() admin.autodiscover()
from other.views import * from pyi2phosts.other.views import *
urlpatterns = patterns('', urlpatterns = patterns('',
url(r'^$', index, name='index'), url(r'^$', index, name='index'),
(r'^postkey/', include('postkey.urls')), (r'^postkey/', include('pyi2phosts.postkey.urls')),
(r'^jump/', include('jump.urls')), (r'^jump/', include('pyi2phosts.jump.urls')),
# Example:
# (r'^pyi2phosts.', include('pyi2phosts.foo.urls')),
# Uncomment the admin/doc line below and add 'django.contrib.admindocs' # Uncomment the admin/doc line below and add 'django.contrib.admindocs'
# to INSTALLED_APPS to enable admin documentation: # to INSTALLED_APPS to enable admin documentation:

Loading…
Cancel
Save