Upgrade Django from 1.11 to 2.2

requirements.txt

@@ -20,11 +20,11 @@ django-redis==4.11.*
 django-structlog==1.6.2
 django-user-agents==0.4.0
 django-webpack-loader==1.4.1
-django==1.11.*
+django==2.2.*
 django_mobile==0.7.0
 djangorestframework @ https://github.com/encode/django-rest-framework/archive/3.11.1.tar.gz
 djangorestframework_simplejwt==3.3.0
-django-hosts==7.0.0
+django-hosts==4.0  # Django 2.2 compatible
 dnspython~=2.5.0
 elasticsearch==8.8.2
 geojson==2.5.0

sefaria/gauth/views.py

@@ -3,7 +3,7 @@
 import json
 
 from django.contrib.auth.decorators import login_required
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import HttpResponseBadRequest
 from django.shortcuts import redirect
 

sefaria/system/decorators.py

@@ -2,8 +2,7 @@
 from typing import Any
 
 from django.http import HttpResponse, Http404
-from django.template import RequestContext
-from django.shortcuts import render_to_response
+from django.shortcuts import render
 
 from sefaria.client.util import jsonResponse
 import sefaria.system.exceptions as exps
@@ -62,7 +61,7 @@ def wrapper(*args, **kwargs):
             raise
         except Exception as e:
             logger.exception("An exception occurred processing request for '{}' while running {}. Caught as HTTP".format(args[0].path, func.__name__))
-            return render_to_response(args[0], 'static/generic.html',
+            return render(args[0], 'static/generic.html',
                              {"content": "There was an error processing your request: {}".format(str(e))})
         return result
     return wrapper

sefaria/urls_library.py

@@ -1,4 +1,4 @@
-from django.conf.urls import url
+from django.urls import re_path
 from django.conf.urls import handler404, handler500
 from django.contrib import admin
 from rest_framework_simplejwt.views import TokenObtainPairView, TokenRefreshView
@@ -13,75 +13,75 @@
 handler404 = 'reader.views.custom_page_not_found'
 
 urlpatterns = [
-    url(r'^$', reader_views.home, name="home"),
-    url(r'^texts/?$', reader_views.texts_list, name="table_of_contents"),
-    url(r'^texts/notes/?$', reader_views.notes),
-    url(r'^texts/recent/?$', reader_views.old_recent_redirect),
-    url(r'^texts/(?P<cats>.+)?$', reader_views.texts_category_list),
-    url(r'^calendars/?$', reader_views.calendars),
-    url(r'^translations/(?P<slug>[^.]+)$', reader_views.translations_page),
-    url(r'^modtools/?$', reader_views.modtools),
-    url(r'^modtools/upload_text$', sefaria_views.modtools_upload_workflowy),
-    url(r'^modtools/links$', sefaria_views.links_upload_api),
-    url(r'^modtools/links/(?P<tref1>.+)/(?P<tref2>.+)$', sefaria_views.get_csv_links_by_refs_api),
-    url(r'^modtools/index_links/(?P<tref1>.+)/(?P<tref2>.+)$',
+    re_path(r'^$', reader_views.home, name="home"),
+    re_path(r'^texts/?$', reader_views.texts_list, name="table_of_contents"),
+    re_path(r'^texts/notes/?$', reader_views.notes),
+    re_path(r'^texts/recent/?$', reader_views.old_recent_redirect),
+    re_path(r'^texts/(?P<cats>.+)?$', reader_views.texts_category_list),
+    re_path(r'^calendars/?$', reader_views.calendars),
+    re_path(r'^translations/(?P<slug>[^.]+)$', reader_views.translations_page),
+    re_path(r'^modtools/?$', reader_views.modtools),
+    re_path(r'^modtools/upload_text$', sefaria_views.modtools_upload_workflowy),
+    re_path(r'^modtools/links$', sefaria_views.links_upload_api),
+    re_path(r'^modtools/links/(?P<tref1>.+)/(?P<tref2>.+)$', sefaria_views.get_csv_links_by_refs_api),
+    re_path(r'^modtools/index_links/(?P<tref1>.+)/(?P<tref2>.+)$',
         partial(sefaria_views.get_csv_links_by_refs_api, by_segment=True)),
-    url(r'^torahtracker/?$', reader_views.user_stats),
-    url(r'^explore(-(?P<topCat>[\w-]+)-and-(?P<bottomCat>[\w-]+))?(/(?P<book1>[A-Za-z-,\']+))?(/(?P<book2>[A-Za-z-,\']+))?(/(?P<lang>\w\w)/?)?/?$',
+    re_path(r'^torahtracker/?$', reader_views.user_stats),
+    re_path(r'^explore(-(?P<topCat>[\w-]+)-and-(?P<bottomCat>[\w-]+))?(/(?P<book1>[A-Za-z-,\']+))?(/(?P<book2>[A-Za-z-,\']+))?(/(?P<lang>\w\w)/?)?/?$',
         reader_views.explore),
 
-    url(r'^visualize/library/(?P<lang>[enh]*)/?(?P<cats>.*)/?$', reader_views.visualize_library),
-    url(r'^visualize/library/?(?P<cats>.*)/?$', reader_views.visualize_library),
-    url(r'^visualize/toc$', reader_views.visualize_toc),
-    url(r'^visualize/parasha-colors$', reader_views.visualize_parasha_colors),
-    url(r'^visualize/links-through-rashi$', reader_views.visualize_links_through_rashi),
-    url(r'^visualize/talmudic-relationships$', reader_views.talmudic_relationships),
-    url(r'^visualize/sefer-hachinukh-mitzvot$', reader_views.sefer_hachinukh_mitzvot),
-    url(r'^visualize/timeline$', reader_views.visualize_timeline),
-    url(r'^visualize/unique-words-by-commentator', reader_views.unique_words_viz),
-
-    url(r'^settings/account?$', reader_views.account_settings),
-    url(r'^settings/account/user$', reader_views.account_user_update),
-    url(r'^settings/profile/?$', reader_views.settings_profile_redirect),
-
-    url(r'^community/?$', reader_views.community_to_voices_redirect),
-
-    url(r'^parashat-hashavua$', reader_views.parashat_hashavua_redirect),
-    url(r'^todays-daf-yomi$', reader_views.daf_yomi_redirect),
-
-    url(r'^add/textinfo/(?P<new_title>.+)$', reader_views.edit_text_info),
-    url(r'^add/new/?$', reader_views.edit_text),
-    url(r'^add/(?P<ref>.+)$', reader_views.edit_text),
-    url(r'^translate/(?P<ref>.+)$', reader_views.edit_text),
-    url(r'^edit/terms/(?P<term>.+)$', reader_views.terms_editor),
-    url(r'^add/terms/(?P<term>.+)$', reader_views.terms_editor),
-    url(r'^edit/(?P<ref>.+)/(?P<lang>\w\w)/(?P<version>.+)$', reader_views.edit_text),
-    url(r'^edit/(?P<ref>.+)$', reader_views.edit_text),
-
-    url(r'^dashboard/?$', reader_views.dashboard),
-
-    url(r'^activity/?$', reader_views.global_activity),
-    url(r'^activity/leaderboard?$', reader_views.leaderboard),
-    url(r'^activity/(?P<page>\d+)$', reader_views.global_activity),
-    url(r'^activity/(?P<slug>[^/]+)/(?P<page>\d+)?$', reader_views.user_activity),
-    url(r'^activity/(?P<tref>[^/]+)/(?P<lang>.{2})/(?P<version>.+)/(?P<page>\d+)$', reader_views.segment_history),
-    url(r'^activity/(?P<tref>[^/]+)/(?P<lang>.{2})/(?P<version>.+)$', reader_views.segment_history),
-
-    url(r'^random/link$', reader_views.random_redirect),
-    url(r'^random/?$', reader_views.random_text_page),
-
-    url(r'^compare/?((?P<comp_ref>[^/]+)/)?((?P<lang>en|he)/)?((?P<v1>[^/]+)/)?(?P<v2>[^/]+)?$', sefaria_views.compare),
-
-    url(r'^garden/(?P<key>.+)$', reader_views.custom_visual_garden_page),
-    url(r'^garden/sheets/(?P<key>.+)$', reader_views.sheet_tag_visual_garden_page),
-    url(r'^garden/search/(?P<q>.+)$', reader_views.search_query_visual_garden_page),
-    url(r'^vgarden/custom/(?P<key>.*)$', reader_views.custom_visual_garden_page),
-
-    url(r'^download/version/(?P<title>.+) - (?P<lang>[he][en]) - (?P<versionTitle>.+)\.(?P<format>plain\.txt)',
+    re_path(r'^visualize/library/(?P<lang>[enh]*)/?(?P<cats>.*)/?$', reader_views.visualize_library),
+    re_path(r'^visualize/library/?(?P<cats>.*)/?$', reader_views.visualize_library),
+    re_path(r'^visualize/toc$', reader_views.visualize_toc),
+    re_path(r'^visualize/parasha-colors$', reader_views.visualize_parasha_colors),
+    re_path(r'^visualize/links-through-rashi$', reader_views.visualize_links_through_rashi),
+    re_path(r'^visualize/talmudic-relationships$', reader_views.talmudic_relationships),
+    re_path(r'^visualize/sefer-hachinukh-mitzvot$', reader_views.sefer_hachinukh_mitzvot),
+    re_path(r'^visualize/timeline$', reader_views.visualize_timeline),
+    re_path(r'^visualize/unique-words-by-commentator', reader_views.unique_words_viz),
+
+    re_path(r'^settings/account?$', reader_views.account_settings),
+    re_path(r'^settings/account/user$', reader_views.account_user_update),
+    re_path(r'^settings/profile/?$', reader_views.settings_profile_redirect),
+
+    re_path(r'^community/?$', reader_views.community_to_voices_redirect),
+
+    re_path(r'^parashat-hashavua$', reader_views.parashat_hashavua_redirect),
+    re_path(r'^todays-daf-yomi$', reader_views.daf_yomi_redirect),
+
+    re_path(r'^add/textinfo/(?P<new_title>.+)$', reader_views.edit_text_info),
+    re_path(r'^add/new/?$', reader_views.edit_text),
+    re_path(r'^add/(?P<ref>.+)$', reader_views.edit_text),
+    re_path(r'^translate/(?P<ref>.+)$', reader_views.edit_text),
+    re_path(r'^edit/terms/(?P<term>.+)$', reader_views.terms_editor),
+    re_path(r'^add/terms/(?P<term>.+)$', reader_views.terms_editor),
+    re_path(r'^edit/(?P<ref>.+)/(?P<lang>\w\w)/(?P<version>.+)$', reader_views.edit_text),
+    re_path(r'^edit/(?P<ref>.+)$', reader_views.edit_text),
+
+    re_path(r'^dashboard/?$', reader_views.dashboard),
+
+    re_path(r'^activity/?$', reader_views.global_activity),
+    re_path(r'^activity/leaderboard?$', reader_views.leaderboard),
+    re_path(r'^activity/(?P<page>\d+)$', reader_views.global_activity),
+    re_path(r'^activity/(?P<slug>[^/]+)/(?P<page>\d+)?$', reader_views.user_activity),
+    re_path(r'^activity/(?P<tref>[^/]+)/(?P<lang>.{2})/(?P<version>.+)/(?P<page>\d+)$', reader_views.segment_history),
+    re_path(r'^activity/(?P<tref>[^/]+)/(?P<lang>.{2})/(?P<version>.+)$', reader_views.segment_history),
+
+    re_path(r'^random/link$', reader_views.random_redirect),
+    re_path(r'^random/?$', reader_views.random_text_page),
+
+    re_path(r'^compare/?((?P<comp_ref>[^/]+)/)?((?P<lang>en|he)/)?((?P<v1>[^/]+)/)?(?P<v2>[^/]+)?$', sefaria_views.compare),
+
+    re_path(r'^garden/(?P<key>.+)$', reader_views.custom_visual_garden_page),
+    re_path(r'^garden/sheets/(?P<key>.+)$', reader_views.sheet_tag_visual_garden_page),
+    re_path(r'^garden/search/(?P<q>.+)$', reader_views.search_query_visual_garden_page),
+    re_path(r'^vgarden/custom/(?P<key>.*)$', reader_views.custom_visual_garden_page),
+
+    re_path(r'^download/version/(?P<title>.+) - (?P<lang>[he][en]) - (?P<versionTitle>.+)\.(?P<format>plain\.txt)',
         sefaria_views.text_download_api),
-    url(r'^download/version/(?P<title>.+) - (?P<lang>[he][en]) - (?P<versionTitle>.+)\.(?P<format>json|csv|txt)',
+    re_path(r'^download/version/(?P<title>.+) - (?P<lang>[he][en]) - (?P<versionTitle>.+)\.(?P<format>json|csv|txt)',
         sefaria_views.text_download_api),
-    url(r'^download/bulk/versions/', sefaria_views.bulk_download_versions_api),
+    re_path(r'^download/bulk/versions/', sefaria_views.bulk_download_versions_api),
 
 ]