Skip to content

Commit 214cd50

Browse files
committed
PEP8-ify, run the black formatter, and organize imports
1 parent 3618d1a commit 214cd50

File tree

5 files changed

+40
-30
lines changed

5 files changed

+40
-30
lines changed

hello/forms.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
from django import forms
2+
23
from .models import LogMessage
34

5+
46
class LogMessageForm(forms.ModelForm):
57
class Meta:
68
model = LogMessage
7-
fields = ('message',) # NOTE: the trailing comma is required
9+
fields = ("message",) # NOTE: the trailing comma is required

hello/models.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
from django.db import models
22

3+
34
class LogMessage(models.Model):
45
message = models.CharField(max_length=300)
5-
log_date = models.DateTimeField('date logged')
6+
log_date = models.DateTimeField("date logged")
67

78
def __unicode__(self):
89
"""Returns a string representation of a message."""

hello/urls.py

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
from django.urls import path
2-
from .models import LogMessage
2+
33
from . import views
4+
from .models import LogMessage
45

56
urlpatterns = [
6-
path('',
7+
path(
8+
"",
79
views.HomeListView.as_view(
8-
queryset=LogMessage.objects.order_by('-log_date')[:5], # :5 limits the results to the five most recent
9-
context_object_name='message_list',
10-
template_name='hello/home.html',),
11-
name="home"),
12-
path('hello/<name>', views.hello_there, name="hello_there"),
13-
path('about/', views.about, name="about"),
14-
path('contact/', views.contact, name="contact"),
15-
path('log/', views.log_message, name="log"),
10+
queryset=LogMessage.objects.order_by("-log_date")[
11+
:5 # :5 limits the results to the five most recent
12+
],
13+
context_object_name="message_list",
14+
template_name="hello/home.html",
15+
),
16+
name="home",
17+
),
18+
path("hello/<name>", views.hello_there, name="hello_there"),
19+
path("about/", views.about, name="about"),
20+
path("contact/", views.contact, name="contact"),
21+
path("log/", views.log_message, name="log"),
1622
]

hello/views.py

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
from django.http import HttpResponse
21
from datetime import datetime
3-
from django.shortcuts import render
4-
from django.shortcuts import redirect
2+
3+
from django.http import HttpResponse
4+
from django.shortcuts import redirect, render
55
from django.views.generic import ListView
6+
67
from .forms import LogMessageForm
78
from .models import LogMessage
89

@@ -11,30 +12,31 @@
1112
# def home(request):
1213
# return render(request, 'hello/home.html')
1314

15+
1416
class HomeListView(ListView):
1517
"""Renders the home page, with a list of all polls."""
18+
1619
model = LogMessage
1720

1821
def get_context_data(self, **kwargs):
1922
context = super(HomeListView, self).get_context_data(**kwargs)
2023
return context
2124

25+
2226
def about(request):
23-
return render(request, 'hello/about.html')
27+
return render(request, "hello/about.html")
28+
2429

2530
def contact(request):
26-
return render(request, 'hello/contact.html')
27-
31+
return render(request, "hello/contact.html")
32+
33+
2834
def hello_there(request, name):
2935
return render(
30-
request,
31-
'hello/hello_there.html',
32-
{
33-
'name': name,
34-
'date': datetime.now()
35-
}
36+
request, "hello/hello_there.html", {"name": name, "date": datetime.now()}
3637
)
3738

39+
3840
def log_message(request):
3941
if request.method == "POST":
4042
form = LogMessageForm(request.POST)
@@ -43,7 +45,7 @@ def log_message(request):
4345
message = form.save(commit=False)
4446
message.log_date = datetime.now()
4547
message.save()
46-
return redirect('home')
48+
return redirect("home")
4749
else:
4850
form = LogMessageForm()
49-
return render(request, 'hello/log_message.html', {'form': form})
51+
return render(request, "hello/log_message.html", {"form": form})

web_project/urls.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@
1515
"""
1616

1717
from django.contrib import admin
18-
from django.urls import path
19-
from django.urls import include
2018
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
19+
from django.urls import include, path
2120

2221
urlpatterns = [
23-
path('', include('hello.urls')),
24-
path('admin/', admin.site.urls), # Activates the admin interface
22+
path("", include("hello.urls")),
23+
path("admin/", admin.site.urls), # Activates the admin interface
2524
]
2625

2726
urlpatterns += staticfiles_urlpatterns()

0 commit comments

Comments
 (0)