Update the example project to the updated tutorial

Author: macro1

myblog/.coveragerc

@@ -1,3 +1,3 @@
 [run]
 include = ./*
-branch = 1
+branch = True

myblog/blog/migrations/0001_initial.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+from django.conf import settings
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Entry',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=500)),
+                ('body', models.TextField()),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('modified_at', models.DateTimeField(auto_now=True)),
+                ('author', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+    ]

myblog/blog/migrations/0002_auto_20141019_0232.py

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('blog', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Comment',
+            fields=[
+                ('id', models.AutoField(primary_key=True, auto_created=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100)),
+                ('email', models.EmailField(max_length=75)),
+                ('body', models.TextField()),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('modified_at', models.DateTimeField(auto_now=True)),
+                ('entry', models.ForeignKey(to='blog.Entry')),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+        migrations.AlterModelOptions(
+            name='entry',
+            options={'verbose_name_plural': 'entries'},
+        ),
+    ]

myblog/blog/migrations/0003_entry_slug.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('blog', '0002_auto_20141019_0232'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='entry',
+            name='slug',
+            field=models.SlugField(default=''),
+            preserve_default=True,
+        ),
+    ]

myblog/blog/migrations/__init__.py

@@ -10,12 +10,12 @@ class Entry(models.Model):
     body = models.TextField()
     created_at = models.DateTimeField(auto_now_add=True, editable=False)
     modified_at = models.DateTimeField(auto_now=True, editable=False)
-    slug = models.SlugField(editable=False)
+    slug = models.SlugField(default='', editable=False)
 
     class Meta:
         verbose_name_plural = "entries"
 
-    def __unicode__(self):
+    def __str__(self):
         return self.title
 
     def get_absolute_url(self):
@@ -24,11 +24,11 @@ def get_absolute_url(self):
                   'day': self.created_at.day,
                   'slug': self.slug,
                   'pk': self.pk}
-        return reverse('blog.views.entry_detail', kwargs=kwargs)
+        return reverse('entry_detail', kwargs=kwargs)
 
     def save(self, *args, **kwargs):
         self.slug = slugify(self.title)
-        super(Entry, self).save(*args, **kwargs)
+        super().save(*args, **kwargs)
 
 class Comment(models.Model):
     entry = models.ForeignKey(Entry)
@@ -38,14 +38,12 @@ class Comment(models.Model):
     created_at = models.DateTimeField(auto_now_add=True, editable=False)
     modified_at = models.DateTimeField(auto_now=True, editable=False)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.body
 
     def gravatar_url(self):
         # Get the md5 hash of the email address
-        md5 = hashlib.new('md5')
-        md5.update(unicode(self.email))
+        md5 = hashlib.md5(self.email.encode())
         digest = md5.hexdigest()
 
-        url = 'https://www.gravatar.com/avatar/{}'.format(digest)
-        return url
+        return 'http://www.gravatar.com/avatar/{}'.format(digest)

myblog/blog/models.py

@@ -2,7 +2,6 @@
 
 from ..models import Entry
 
-
 register = template.Library()
 
 

myblog/blog/templatetags/blog_tags.py

@@ -12,28 +12,28 @@
 
 class EntryModelTest(TestCase):
 
-    def test_unicode_representation(self):
+    def test_string_representation(self):
         entry = Entry(title="My entry title")
-        self.assertEqual(unicode(entry), entry.title)
+        self.assertEqual(str(entry), entry.title)
 
     def test_get_absolute_url(self):
         user = get_user_model().objects.create(username='some_user')
         entry = Entry.objects.create(title="My entry title", author=user)
         self.assertIsNotNone(entry.get_absolute_url())
 
     def test_verbose_name_plural(self):
-        self.assertEqual(unicode(Entry._meta.verbose_name_plural), "entries")
+        self.assertEqual(str(Entry._meta.verbose_name_plural), "entries")
 
 
 class CommentModelTest(TestCase):
 
-    def test_unicode_representation(self):
+    def test_string_representation(self):
         comment = Comment(body="My comment body")
-        self.assertEqual(unicode(comment), "My comment body")
+        self.assertEqual(str(comment), "My comment body")
 
     def test_gravatar_url(self):
         comment = Comment(body="My comment body", email="[email protected]")
-        expected = "https://www.gravatar.com/avatar/5658ffccee7f0ebfda2b226238b1eb6e"
+        expected = "http://www.gravatar.com/avatar/5658ffccee7f0ebfda2b226238b1eb6e"
         self.assertEqual(comment.gravatar_url(), expected)
 
 
@@ -202,8 +202,8 @@ def test_no_posts(self):
         self.assertIn("No recent entries", rendered)
 
     def test_many_posts(self):
-        for n in range(6):
+        for n in range(1, 6):
             Entry.objects.create(author=self.user, title="Post #{0}".format(n))
         rendered = self.TEMPLATE.render(Context({}))
-        self.assertIn("Post #4", rendered)
-        self.assertNotIn("Post #5", rendered)
+        self.assertIn("Post #5", rendered)
+        self.assertNotIn("Post #6", rendered)

myblog/blog/tests.py

@@ -1,6 +1,7 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
+from . import views
 
-urlpatterns = patterns('blog.views',
-    url(r'^(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/(?P<pk>\d+)-(?P<slug>[-\w]+)/$', 'entry_detail'),
-)
+urlpatterns = [
+    url(r'^(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/(?P<pk>\d+)-(?P<slug>[-\w]*)/$', views.EntryDetail.as_view(), name='entry_detail'),
+]

myblog/blog/urls.py

@@ -1,31 +1,23 @@
-from django.shortcuts import get_object_or_404
 from django.views.generic import CreateView
 
-from .forms import CommentForm
 from .models import Entry
+from .forms import CommentForm
 
 
 class EntryDetail(CreateView):
+    model = Entry
     template_name = 'blog/entry_detail.html'
     form_class = CommentForm
 
-    def get_entry(self):
-        return get_object_or_404(Entry, pk=self.kwargs['pk'])
-
-    def dispatch(self, *args, **kwargs):
-        self.entry = self.get_entry()
-        return super(EntryDetail, self).dispatch(*args, **kwargs)
-
     def get_form_kwargs(self):
-        kwargs = super(EntryDetail, self).get_form_kwargs()
-        kwargs['entry'] = self.entry
+        kwargs = super().get_form_kwargs()
+        kwargs['entry'] = self.get_object()
         return kwargs
 
     def get_context_data(self, **kwargs):
-        kwargs['entry'] = self.entry
-        return super(EntryDetail, self).get_context_data(**kwargs)
+        d = super().get_context_data(**kwargs)
+        d['entry'] = self.get_object()
+        return d
 
     def get_success_url(self):
-        return self.get_entry().get_absolute_url()
-
-entry_detail = EntryDetail.as_view()
+        return self.get_object().get_absolute_url()

myblog/blog/views.py

@@ -2,10 +2,10 @@
 Django settings for myblog project.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/1.6/topics/settings/
+https://docs.djangoproject.com/en/1.7/topics/settings/
 
 For the full list of settings and their values, see
-https://docs.djangoproject.com/en/1.6/ref/settings/
+https://docs.djangoproject.com/en/1.7/ref/settings/
 """
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
@@ -14,7 +14,7 @@
 
 
 # Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/
+# See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = 'vnsw3o0jb+lpdfo9@qg(_^44as8-*2lb_-q6x%vdpgfiw68ap^'
@@ -38,14 +38,14 @@
     'django.contrib.staticfiles',
 
     'blog',
-    'south',
 )
 
 MIDDLEWARE_CLASSES = (
     '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',
 )
@@ -56,7 +56,7 @@
 
 
 # Database
-# https://docs.djangoproject.com/en/1.6/ref/settings/#databases
+# https://docs.djangoproject.com/en/1.7/ref/settings/#databases
 
 DATABASES = {
     'default': {
@@ -66,7 +66,7 @@
 }
 
 # Internationalization
-# https://docs.djangoproject.com/en/1.6/topics/i18n/
+# https://docs.djangoproject.com/en/1.7/topics/i18n/
 
 LANGUAGE_CODE = 'en-us'
 
@@ -80,7 +80,7 @@
 
 
 # Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/1.6/howto/static-files/
+# https://docs.djangoproject.com/en/1.7/howto/static-files/
 
 STATIC_URL = '/static/'
 
@@ -89,7 +89,7 @@
 )
 
 # Template files
-# https://docs.djangoproject.com/en/1.6/topics/templates/
+# https://docs.djangoproject.com/en/1.7/topics/templates/
 
 TEMPLATE_DIRS = (
     os.path.join(BASE_DIR, 'templates'),

myblog/myblog/settings.py

@@ -1,11 +1,11 @@
-from django.conf.urls import patterns, include, url
-from myblog import views
-
+from django.conf.urls import include, url
 from django.contrib import admin
-admin.autodiscover()
 
-urlpatterns = patterns('',
-    url(r'^$', views.home),
-    url(r'^', include('blog.urls')),
+import blog.urls
+from . import views
+
+urlpatterns = [
+    url(r'^$', views.HomeView.as_view(), name='home'),
+    url(r'^', include(blog.urls)),
     url(r'^admin/', include(admin.site.urls)),
-)
+]

myblog/myblog/urls.py

@@ -6,5 +6,3 @@
 class HomeView(ListView):
     template_name = 'index.html'
     queryset = Entry.objects.order_by('-created_at')
-
-home = HomeView.as_view()

myblog/myblog/views.py

@@ -4,7 +4,7 @@
 It exposes the WSGI callable as a module-level variable named ``application``.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/1.6/howto/deployment/wsgi/
+https://docs.djangoproject.com/en/1.7/howto/deployment/wsgi/
 """
 
 import os

myblog/myblog/wsgi.py

@@ -1,4 +1,4 @@
-Django==1.6.2
 coverage==3.7.1
-django-webtest==1.7.5
-WebTest==2.0.9
+Django==1.7
+WebTest==2.0.16
+django-webtest==1.7.7