update stage 3 blog for py3/dj1.9

Author: cewing

resources/session08/mysite_stage_3/myblog/admin.py

@@ -1,6 +1,8 @@
 from django.contrib import admin
-from myblog.models import Post, Category
+
+from myblog.models import Category
+from myblog.models import Post
 
 
-admin.site.register(Post)
 admin.site.register(Category)
+admin.site.register(Post)

resources/session08/mysite_stage_3/myblog/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class MyblogConfig(AppConfig):
+    name = 'myblog'

resources/session08/mysite_stage_3/myblog/migrations/0001_initial.py

@@ -1,12 +1,16 @@
 # -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2015-12-31 19:13
 from __future__ import unicode_literals
 
-from django.db import models, migrations
 from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
 
+    initial = True
+
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
@@ -15,16 +19,13 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Post',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('title', models.CharField(max_length=128)),
                 ('text', models.TextField(blank=True)),
                 ('created_date', models.DateTimeField(auto_now_add=True)),
                 ('modified_date', models.DateTimeField(auto_now=True)),
-                ('published_date', models.DateTimeField(null=True, blank=True)),
-                ('author', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+                ('published_date', models.DateTimeField(blank=True, null=True)),
+                ('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
-            options={
-            },
-            bases=(models.Model,),
         ),
     ]

resources/session08/mysite_stage_3/myblog/migrations/0002_category.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2015-12-31 21:40
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
@@ -14,13 +15,10 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Category',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', models.CharField(max_length=128)),
                 ('description', models.TextField(blank=True)),
-                ('posts', models.ManyToManyField(related_name='categories', null=True, to='myblog.Post', blank=True)),
+                ('posts', models.ManyToManyField(blank=True, related_name='categories', to='myblog.Post')),
             ],
-            options={
-            },
-            bases=(models.Model,),
         ),
     ]

resources/session08/mysite_stage_3/myblog/models.py

@@ -10,15 +10,18 @@ class Post(models.Model):
     modified_date = models.DateTimeField(auto_now=True)
     published_date = models.DateTimeField(blank=True, null=True)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.title
 
 
 class Category(models.Model):
     name = models.CharField(max_length=128)
     description = models.TextField(blank=True)
-    posts = models.ManyToManyField(Post, blank=True, null=True,
-                                   related_name='categories')
+    posts = models.ManyToManyField(
+        Post,
+        blank=True,
+        related_name='categories'
+    )
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name

resources/session08/mysite_stage_3/myblog/tests.py

@@ -1,29 +1,31 @@
 import datetime
-from django.test import TestCase
 from django.contrib.auth.models import User
+from django.test import TestCase
 from django.utils.timezone import utc
-from myblog.models import Post, Category
+
+from myblog.models import Category
+from myblog.models import Post
 
 
 class PostTestCase(TestCase):
-    fixtures = ['myblog_test_fixture.json', ]
+    fixtures = ['myblog_test_fixture.json']
 
     def setUp(self):
         self.user = User.objects.get(pk=1)
 
-    def test_unicode(self):
-        expected = u"This is a title"
+    def test_string_representation(self):
+        expected = "This is a title"
         p1 = Post(title=expected)
-        actual = unicode(p1)
+        actual = str(p1)
         self.assertEqual(expected, actual)
 
 
 class CategoryTestCase(TestCase):
 
-    def test_unicode(self):
+    def test_string_representation(self):
         expected = "A Category"
         c1 = Category(name=expected)
-        actual = unicode(c1)
+        actual = str(c1)
         self.assertEqual(expected, actual)
 
 
@@ -47,7 +49,9 @@ def setUp(self):
 
     def test_list_only_published(self):
         resp = self.client.get('/')
-        self.assertTrue("Recent Posts" in resp.content)
+        # the content of the rendered response is always a bytestring
+        resp_text = resp.content.decode(resp.charset)
+        self.assertTrue("Recent Posts" in resp_text)
         for count in range(1, 11):
             title = "Post %d Title" % count
             if count < 6:

resources/session08/mysite_stage_3/myblog/urls.py

@@ -1,12 +1,15 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
+from myblog.views import stub_view
+from myblog.views import list_view
+from myblog.views import detail_view
 
-urlpatterns = patterns(
-    'myblog.views',
+
+urlpatterns = [
     url(r'^$',
-        'list_view',
+        list_view,
         name="blog_index"),
     url(r'^posts/(?P<post_id>\d+)/$',
-        'detail_view',
-        name="blog_detail"),
-)
+        detail_view,
+        name='blog_detail'),
+]

resources/session08/mysite_stage_3/myblog/views.py

@@ -1,6 +1,7 @@
-from django.shortcuts import render
 from django.http import HttpResponse, HttpResponseRedirect, Http404
+from django.shortcuts import render
 from django.template import RequestContext, loader
+
 from myblog.models import Post
 
 

resources/session08/mysite_stage_3/mysite/settings.py

@@ -1,61 +1,79 @@
 """
 Django settings for mysite project.
 
+Generated by 'django-admin startproject' using Django 1.9.
+
 For more information on this file, see
-https://docs.djangoproject.com/en/1.7/topics/settings/
+https://docs.djangoproject.com/en/1.9/topics/settings/
 
 For the full list of settings and their values, see
-https://docs.djangoproject.com/en/1.7/ref/settings/
+https://docs.djangoproject.com/en/1.9/ref/settings/
 """
 
-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
-BASE_DIR = os.path.dirname(os.path.dirname(__file__))
+
+# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 
 # Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
+# See https://docs.djangoproject.com/en/1.9/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = 'e@3=0i!#n4l25r*ul*sbx6b$@gh7a6pjee6lr-slw9!ayj#*@f'
+SECRET_KEY = 'i=n^tc%@@gq#8ev6dlymy9+-%@^f!q54sjf0rvikt_k5bl(t1='
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-TEMPLATE_DEBUG = True
-
 ALLOWED_HOSTS = []
 
 
 # Application definition
 
-INSTALLED_APPS = (
+INSTALLED_APPS = [
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'myblog',
-)
+]
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE_CLASSES = [
+    'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-)
+]
 
 ROOT_URLCONF = 'mysite.urls'
 
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [os.path.join(BASE_DIR, 'mysite/templates')],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
 WSGI_APPLICATION = 'mysite.wsgi.application'
 
 
 # Database
-# https://docs.djangoproject.com/en/1.7/ref/settings/#databases
+# https://docs.djangoproject.com/en/1.9/ref/settings/#databases
 
 DATABASES = {
     'default': {
@@ -64,8 +82,28 @@
     }
 }
 
+
+# Password validation
+# https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators
+
+AUTH_PASSWORD_VALIDATORS = [
+    {
+        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+    },
+]
+
+
 # Internationalization
-# https://docs.djangoproject.com/en/1.7/topics/i18n/
+# https://docs.djangoproject.com/en/1.9/topics/i18n/
 
 LANGUAGE_CODE = 'en-us'
 
@@ -79,11 +117,9 @@
 
 
 # Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/1.7/howto/static-files/
+# https://docs.djangoproject.com/en/1.9/howto/static-files/
 
 STATIC_URL = '/static/'
 
-
-TEMPLATE_DIRS = (os.path.join(BASE_DIR, 'mysite/templates'), )
 LOGIN_URL = '/login/'
 LOGIN_REDIRECT_URL = '/'

resources/session08/mysite_stage_3/mysite/templates/base.html

@@ -9,9 +9,7 @@
     <div id="header">
       <ul id="control-bar">
       {% if user.is_authenticated %}
-        {% if user.is_staff %}
-          <li><a href="{% url 'admin:index' %}">admin</a></li>
-        {% endif %}
+        {% if user.is_staff %}<li><a href="{% url 'admin:index' %}">admin</a></li>{% endif %}
         <li><a href="{% url 'logout' %}">logout</a></li>
       {% else %}
         <li><a href="{% url 'login' %}">login</a></li>