Skip to content

Commit

Permalink
Finetooth is the cutting edge
Browse files Browse the repository at this point in the history
Django 1.9β is out! We will comply with upstream's gifts: context
processors have been banished from the Django.core namespace,
TEMPLATE_DEBUG would live in TEMPLATES['OPTIONS']['debug'] except that
it's redundant if we were only going to assign DEBUG to it,
django.conf.urls.patterns is deprecated, and FinetoothUser inherits a
migration from AbstractUser.
  • Loading branch information
zackmdavis committed Oct 20, 2015
1 parent 2dc14f4 commit 2397430
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 12 deletions.
21 changes: 21 additions & 0 deletions core/migrations/0010_auto_20151020_0507.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9b1 on 2015-10-20 05:07
from __future__ import unicode_literals

import django.core.validators
from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('core', '0009_auto_20151020_0455'),
]

operations = [
migrations.AlterField(
model_name='finetoothuser',
name='username',
field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=30, unique=True, validators=[django.core.validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username. This value may contain only letters, numbers and @/./+/-/_ characters.')], verbose_name='username'),
),
]
2 changes: 1 addition & 1 deletion dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
bleach==1.4.1
Django==1.8
Django==1.9b1
django-debug-toolbar==1.3
django-extensions==1.5.5
ipython==3.1.0
Expand Down
12 changes: 5 additions & 7 deletions settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@
else:
SECRET_KEY = os.environ.get('SECRET_KEY')

TEMPLATE_DEBUG = DEBUG

ALLOWED_HOSTS = ['*']

INSTALLED_APPS = (
Expand Down Expand Up @@ -104,11 +102,11 @@
'OPTIONS': {
'context_processors': (
'django.contrib.auth.context_processors.auth',
'django.core.context_processors.debug',
'django.core.context_processors.i18n',
'django.core.context_processors.media',
'django.core.context_processors.static',
'django.core.context_processors.tz',
'django.template.context_processors.debug',
'django.template.context_processors.i18n',
'django.template.context_processors.media',
'django.template.context_processors.static',
'django.template.context_processors.tz',
'django.contrib.messages.context_processors.messages',
'core.context_processors.tag_cloud_context_processor',
('core.context_processors'
Expand Down
7 changes: 3 additions & 4 deletions urls.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
from django.conf.urls import patterns, include, url
from django.conf.urls import include, url
from django.contrib.auth.views import login

from core import views, feeds

urlpatterns = patterns(
'',
urlpatterns = [
url(r'^(?:page/(?P<page_number>\d+)/)?$', views.home, name='home'),
url(r'^valuation_(-?\d+)-([0-9a-f]{6})_(-?\d+)-([0-9a-f]{6}).css$',
views.serve_stylesheet, name='stylesheet'),
Expand Down Expand Up @@ -32,4 +31,4 @@
url(r'^user/(.+)/feeds/comments/rss/$', feeds.CommenterFeed(),
name='user_comments_rss'),
url(r'^tagged/([-\w\s]*)/feeds/rss/$', feeds.TagFeed(), name='tag_rss')
)
]

0 comments on commit 2397430

Please sign in to comment.