run django-upgrade for 2.2

della/gallery/models.py

@@ -8,4 +8,4 @@ class Image(TimeStampMixin):
     file = models.ImageField(upload_to='images/%Y/%m/%d')
     title = models.CharField(max_length=300)
     description = models.TextField(null=True)
-    added_by = models.ForeignKey(User)
+    added_by = models.ForeignKey(User, on_delete=models.CASCADE)

della/gallery/urls.py

@@ -1,9 +1,9 @@
-from django.conf.urls import url
+from django.urls import path
 
 from .views import ImageUploadView, ImageDetailView, ImageListView
 
 urlpatterns = [
-    url(r'^upload/$', ImageUploadView.as_view(), name='upload'),
-    url(r'^(?P<pk>\d+)/$', ImageDetailView.as_view(), name='image-detail'),
-    url(r'^$', ImageListView.as_view(), name='image-list')
+    path('upload/', ImageUploadView.as_view(), name='upload'),
+    path('<int:pk>/', ImageDetailView.as_view(), name='image-detail'),
+    path('', ImageListView.as_view(), name='image-list')
 ]

della/inbox/models.py

@@ -14,14 +14,14 @@ class Thread(TimeStampMixin):
     is_sneaky = models.BooleanField(default=False)
 
     participant_1 = models.ForeignKey(
-        User, related_name='participant_1_threads')
+        User, on_delete=models.CASCADE,  related_name='participant_1_threads')
     participant_2 = models.ForeignKey(
-        User, related_name='participant_2_threads')
-    santa = models.ForeignKey(User, null=True, related_name='santa_threads')
+        User, on_delete=models.CASCADE,  related_name='participant_2_threads')
+    santa = models.ForeignKey(User, on_delete=models.CASCADE,  null=True, related_name='santa_threads')
 
 
 class Message(TimeStampMixin):
     text = models.TextField()
 
-    sent_by = models.ForeignKey(User)
-    thread = models.ForeignKey(Thread, related_name='messages')
+    sent_by = models.ForeignKey(User, on_delete=models.CASCADE)
+    thread = models.ForeignKey(Thread, on_delete=models.CASCADE,  related_name='messages')

della/inbox/urls.py

@@ -1,14 +1,14 @@
-from django.conf.urls import url
+from django.urls import path, re_path
 
 from .views import (MessageCreateView, ThreadDetailView, ThreadListView,
                     SantaThreadDetailView, SanteeThreadDetailView)
 
 urlpatterns = [
-    url(r'^@(?P<recipient>[a-zA-Z0-9_]+)/$', ThreadDetailView.as_view(),
+    re_path(r'^@(?P<recipient>[a-zA-Z0-9_]+)/$', ThreadDetailView.as_view(),
         name='thread-detail'),
-    url(r'^(?P<pk>\d+)/new/$', MessageCreateView.as_view(),
+    path('<int:pk>/new/', MessageCreateView.as_view(),
         name='new-message'),
-    url(r'^santa/', SantaThreadDetailView.as_view(), name='santa-detail'),
-    url(r'^santee/', SanteeThreadDetailView.as_view(), name='santee-detail'),
-    url(r'^$', ThreadListView.as_view(), name='threads')
+    path('santa/', SantaThreadDetailView.as_view(), name='santa-detail'),
+    path('santee/', SanteeThreadDetailView.as_view(), name='santee-detail'),
+    path('', ThreadListView.as_view(), name='threads')
 ]

della/urls.py

@@ -13,22 +13,22 @@
     1. Import the include() function: from django.conf.urls import url, include
     2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
 """
-from django.conf.urls import url, include
+from django.urls import include, path
 from django.contrib import admin
 from django.conf import settings
 from django.conf.urls.static import static
 
 from .views import HomePageView
 
 urlpatterns = [
-    url(r'^gallery/', include(
+    path('gallery/', include(
         'della.gallery.urls', namespace='gallery')),
-    url(r'^messages/', include(
+    path('messages/', include(
         'della.inbox.urls', namespace='inbox')),
-    url(r'^', include(
+    path('', include(
         'della.user_manager.urls', namespace='user_manager')),
-    url(r'^$', HomePageView.as_view()),
-    url(r'^admin/', admin.site.urls),
+    path('', HomePageView.as_view()),
+    path('admin/', admin.site.urls),
 ]
 
 if settings.DEBUG:

della/user_manager/models.py

@@ -27,8 +27,8 @@ class UserProfile(TimeStampMixin):
     avatar = models.ImageField(
         upload_to=avatar_file_name, default='avatar.png')
 
-    user = models.OneToOneField(User)
-    santee = models.OneToOneField(User, related_name='santa', null=True)
+    user = models.OneToOneField(User, on_delete=models.CASCADE)
+    santee = models.OneToOneField(User, on_delete=models.CASCADE,  related_name='santa', null=True)
 
     def __str__(self):
         return self.user.username

della/user_manager/urls.py

@@ -1,23 +1,23 @@
-from django.conf.urls import url
+from django.urls import path, re_path
 from django.contrib.auth import views as auth_views
 
 from .views import (SignupView, UserProfileUpdateView, DrawNamesView,
                     UserProfileDetailView, ActivateView,
                     RequestActivationEmailView, MassEmailView)
 
 urlpatterns = [
-    url(r'^login/$', auth_views.login, name='login',
+    path('login/', auth_views.login, name='login',
         kwargs={'template_name': 'user_manager/login.html'}),
-    url(r'^logout/$', auth_views.logout, name='logout',
+    path('logout/', auth_views.logout, name='logout',
         kwargs={'next_page': '/'}),
-    url(r'^signup/$', SignupView.as_view(), name='signup'),
-    url(r'^account/$', UserProfileUpdateView.as_view(), name='account'),
-    url(r'^activate/(?P<username>[0-9A-Za-z_]+)-(?P<code>[0-9A-Za-z_:-]+)/$',
+    path('signup/', SignupView.as_view(), name='signup'),
+    path('account/', UserProfileUpdateView.as_view(), name='account'),
+    re_path(r'^activate/(?P<username>[0-9A-Za-z_]+)-(?P<code>[0-9A-Za-z_:-]+)/$',
         ActivateView.as_view(), name='activate-user'),
-    url(r'^activate/request/$', RequestActivationEmailView.as_view(),
+    path('activate/request/', RequestActivationEmailView.as_view(),
         name='activate-request'),
-    url(r'^draw-names/$', DrawNamesView.as_view(), name='draw-names'),
-    url(r'^mass-email/$', MassEmailView.as_view(), name='mass-email'),
-    url(r'^@(?P<username>[a-zA-Z0-9_]+)/$', UserProfileDetailView.as_view(),
+    path('draw-names/', DrawNamesView.as_view(), name='draw-names'),
+    path('mass-email/', MassEmailView.as_view(), name='mass-email'),
+    re_path(r'^@(?P<username>[a-zA-Z0-9_]+)/$', UserProfileDetailView.as_view(),
         name='user-detail'),
 ]