+{% blocktrans count counter=form.errors.items|length %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}
+
+{% endif %}
+
+{% if form.non_field_errors %}
+{% for error in form.non_field_errors %}
+
+{% endblock %}
diff --git a/emailusernames/tests.py b/emailusernames/tests.py
new file mode 100644
index 0000000000..2d698214b9
--- /dev/null
+++ b/emailusernames/tests.py
@@ -0,0 +1,151 @@
+from django.contrib.auth import authenticate
+from django.contrib.auth.models import User
+from django.db import IntegrityError, connection
+from django.test import TestCase
+from emailusernames.utils import create_user, get_user, _email_to_username
+from emailusernames.models import _patched
+
+
+class CreateUserTests(TestCase):
+ """
+ Tests which create users.
+ """
+ def setUp(self):
+ self.email = 'user@example.com'
+ self.password = 'password'
+
+ def test_can_create_user(self):
+ user = create_user(self.email, self.password)
+ self.assertEqual(list(User.objects.all()), [user])
+
+ def test_can_create_user_with_long_email(self):
+ padding = 'a' * 30
+ create_user(padding + self.email, self.password)
+
+ def test_created_user_has_correct_details(self):
+ user = create_user(self.email, self.password)
+ self.assertEqual(user.email, self.email)
+
+ def test_can_create_user_with_explicit_id(self):
+ """Regression test for
+ https://github.com/dabapps/django-email-as-username/issues/52
+
+ """
+ User.objects.create(email=self.email, id=1)
+
+
+
+class ExistingUserTests(TestCase):
+ """
+ Tests which require an existing user.
+ """
+
+ def setUp(self):
+ self.email = 'user@example.com'
+ self.password = 'password'
+ self.user = create_user(self.email, self.password)
+
+ def test_user_can_authenticate(self):
+ auth = authenticate(email=self.email, password=self.password)
+ self.assertEqual(self.user, auth)
+
+ def test_user_can_authenticate_with_case_insensitive_match(self):
+ auth = authenticate(email=self.email.upper(), password=self.password)
+ self.assertEqual(self.user, auth)
+
+ def test_user_can_authenticate_with_username_parameter(self):
+ auth = authenticate(username=self.email, password=self.password)
+ self.assertEqual(self.user, auth)
+ # Invalid username should be ignored
+ auth = authenticate(email=self.email, password=self.password,
+ username='invalid')
+ self.assertEqual(self.user, auth)
+
+ def test_user_emails_are_unique(self):
+ with self.assertRaises(IntegrityError) as ctx:
+ create_user(self.email, self.password)
+ if hasattr(ctx.exception, 'message'):
+ self.assertEqual(ctx.exception.message, 'user email is not unique')
+ else:
+ self.assertEqual(str(ctx.exception), 'user email is not unique')
+
+ def test_user_emails_are_case_insensitive_unique(self):
+ with self.assertRaises(IntegrityError) as ctx:
+ create_user(self.email.upper(), self.password)
+ if hasattr(ctx.exception, 'message'):
+ self.assertEqual(ctx.exception.message, 'user email is not unique')
+ else:
+ self.assertEqual(str(ctx.exception), 'user email is not unique')
+
+ def test_user_unicode(self):
+ if isinstance(self.email, str):
+ self.assertEqual(str(self.user), self.email)
+ else:
+ raise AssertionError("Test email is not a str type")
+
+
+class MonkeyPatchTests(TestCase):
+ """
+ Tests for the User model monkey patching that enables email-as-username.
+
+ The monkey patch ensures:
+ - Usernames are stored as hashes in the database (to fit in 30 char limit)
+ - Usernames are displayed as emails in Python (for UX)
+ - Users can be looked up by email via get_user()
+ """
+
+ def setUp(self):
+ self.email = 'monkeypatch_test@example.com'
+ self.password = 'testpassword123'
+
+ def test_monkey_patch_is_applied(self):
+ """Verify that the monkey patch has been applied via AppConfig.ready()"""
+ self.assertTrue(_patched, "Monkey patch should be applied after Django setup")
+ self.assertEqual(User.__init__.__name__, 'user_init_patch')
+ self.assertEqual(User.save_base.__name__, 'user_save_patch')
+
+ def test_username_stored_as_hash_in_database(self):
+ """Verify that the username is stored as a hash, not the raw email"""
+ user = create_user(self.email, self.password)
+ expected_hash = _email_to_username(self.email)
+
+ # Query the database directly to see what's actually stored
+ with connection.cursor() as cursor:
+ cursor.execute('SELECT username FROM auth_user WHERE id = %s', [user.pk])
+ row = cursor.fetchone()
+
+ actual_username_in_db = row[0]
+ self.assertEqual(actual_username_in_db, expected_hash,
+ "Username in database should be the hash, not the raw email")
+ self.assertNotEqual(actual_username_in_db, self.email,
+ "Username in database should NOT be the raw email")
+
+ def test_username_displayed_as_email_in_python(self):
+ """Verify that user.username returns the email for display purposes"""
+ user = create_user(self.email, self.password)
+
+ # The username attribute should show the email (for admin "Welcome, username")
+ self.assertEqual(user.username, self.email,
+ "user.username should display as email after creation")
+
+ # Reload from database and verify it still shows as email
+ reloaded_user = User.objects.get(pk=user.pk)
+ self.assertEqual(reloaded_user.username, self.email,
+ "user.username should display as email after loading from DB")
+
+ def test_get_user_lookup_by_email_works(self):
+ """Verify that get_user() can find users by their email address"""
+ user = create_user(self.email, self.password)
+
+ # get_user internally converts email to hash for lookup
+ found_user = get_user(self.email)
+ self.assertEqual(found_user.pk, user.pk,
+ "get_user() should find the user by email")
+
+ def test_get_user_lookup_case_insensitive(self):
+ """Verify that get_user() lookup is case-insensitive"""
+ user = create_user(self.email, self.password)
+
+ found_user = get_user(self.email.upper())
+ self.assertEqual(found_user.pk, user.pk,
+ "get_user() should find the user with case-insensitive email")
diff --git a/emailusernames/utils.py b/emailusernames/utils.py
new file mode 100644
index 0000000000..eff5a87da7
--- /dev/null
+++ b/emailusernames/utils.py
@@ -0,0 +1,117 @@
+import base64
+import hashlib
+import os
+import re
+import sys
+
+from django.contrib.auth.models import User
+from django.db import IntegrityError
+
+
+# We need to convert emails to hashed versions when we store them in the
+# username field. We can't just store them directly, or we'd be limited
+# to Django's username <= 30 chars limit, which is really too small for
+# arbitrary emails.
+def _email_to_username(email):
+ # Emails should be case-insensitive unique
+ email = email.lower()
+ # Deal with internationalized email addresses
+ converted = email.encode('utf8', 'ignore')
+ return base64.urlsafe_b64encode(hashlib.sha256(converted).digest()).decode('ascii')[:30]
+
+
+def get_user(email, queryset=None):
+ """
+ Return the user with given email address.
+ Note that email address matches are case-insensitive.
+ """
+ if queryset is None:
+ queryset = User.objects
+ return queryset.get(username=_email_to_username(email))
+
+
+def user_exists(email, queryset=None):
+ """
+ Return True if a user with given email address exists.
+ Note that email address matches are case-insensitive.
+ """
+ try:
+ get_user(email, queryset)
+ except User.DoesNotExist:
+ return False
+ return True
+
+
+_DUPLICATE_USERNAME_ERRORS = (
+ 'column username is not unique',
+ 'UNIQUE constraint failed: auth_user.username',
+ 'duplicate key value violates unique constraint "auth_user_username_key"\n'
+)
+
+
+def create_user(email, password=None, is_staff=None, is_active=None):
+ """
+ Create a new user with the given email.
+ Use this instead of `User.objects.create_user`.
+ """
+ try:
+ user = User.objects.create_user(email, email, password)
+ except IntegrityError as err:
+ regexp = '|'.join(re.escape(e) for e in _DUPLICATE_USERNAME_ERRORS)
+ if re.match(regexp, str(err)):
+ raise IntegrityError('user email is not unique')
+ raise
+
+ if is_active is not None or is_staff is not None:
+ if is_active is not None:
+ user.is_active = is_active
+ if is_staff is not None:
+ user.is_staff = is_staff
+ user.save()
+ return user
+
+
+def create_superuser(email, password):
+ """
+ Create a new superuser with the given email.
+ Use this instead of `User.objects.create_superuser`.
+ """
+ return User.objects.create_superuser(email, email, password)
+
+
+def migrate_usernames(stream=None, quiet=False):
+ """
+ Migrate all existing users to django-email-as-username hashed usernames.
+ If any users cannot be migrated an exception will be raised and the
+ migration will not run.
+
+ @TODO: delete this function and associated management command after
+ """
+ stream = stream or (quiet and open(os.devnull, 'w') or sys.stdout)
+
+ # Check all users can be migrated before applying migration
+ emails = set()
+ errors = []
+ for user in User.objects.all():
+ if not user.email:
+ errors.append("Cannot convert user '%s' because email is not "
+ "set." % (user._username, ))
+ elif user.email.lower() in emails:
+ errors.append("Cannot convert user '%s' because email '%s' "
+ "already exists." % (user._username, user.email))
+ else:
+ emails.add(user.email.lower())
+
+ # Cannot migrate.
+ if errors:
+ [stream.write(error + '\n') for error in errors]
+ raise Exception('django-email-as-username migration failed.')
+
+ # Can migrate just fine.
+ total = User.objects.count()
+ for user in User.objects.all():
+ user.username = _email_to_username(user.email)
+ user.save()
+
+ stream.write("Successfully migrated usernames for all %d users\n"
+ % (total, ))
diff --git a/remote_config/cache.py b/remote_config/cache.py
index ae2758b0bc..0b6d6e1bda 100644
--- a/remote_config/cache.py
+++ b/remote_config/cache.py
@@ -44,7 +44,7 @@ def get_cache(self) -> dict[str, Any]:
if self._cache is None: # double-checked locking for minimal contention
try:
self._cache = self._build_cache()
- except OperationalError:
+ except (OperationalError, RuntimeError):
self._cache = {}
return self._cache
diff --git a/requirements.txt b/requirements.txt
index 1fd27bcf15..8fbbfd06fd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,89 +1,407 @@
-Appium-Python-Client==1.2.0
-Cerberus
-cryptography==42.0.7
-PyJWT==1.7.1 # pinned b/c current version 2.0.0 breaks simplejwt. waiting for 2.0.1
-babel
-django-admin-sortable==2.1.13
+#
+# This file is autogenerated by pip-compile with Python 3.9
+# by the following command:
+#
+# pip-compile --output-file=/tmp/requirements.txt ./requirements.txt
+#
+amqp==5.3.1
+ # via kombu
+appium-python-client==1.2.0
+ # via -r ./requirements.txt
+appnope==0.1.4
+ # via ipython
+apscheduler==3.6.3
+ # via -r ./requirements.txt
+attrs==25.1.0
+ # via pytest
+babel==2.17.0
+ # via -r ./requirements.txt
+backcall==0.2.0
+ # via ipython
+beautifulsoup4==4.13.3
+ # via bs4
+billiard<5.0,>=4.2.1
+ # via celery
bleach==1.4.2
+ # via -r ./requirements.txt
boto3==1.16.6
+ # via -r ./requirements.txt
+botocore==1.19.63
+ # via
+ # boto3
+ # s3transfer
bs4==0.0.1
+ # via -r ./requirements.txt
+cachetools==4.2.4
+ # via google-auth
celery[redis]==5.5.2
+ # via -r ./requirements.txt
+cerberus==1.3.7
+ # via -r ./requirements.txt
+certifi==2025.1.31
+ # via
+ # elastic-transport
+ # requests
+ # sentry-sdk
+charset-normalizer==3.4.1
+ # via requests
+click==8.1.8
+ # via
+ # celery
+ # click-didyoumean
+ # click-plugins
+ # click-repl
+click-didyoumean==0.3.1
+ # via celery
+click-plugins==1.1.1
+ # via celery
+click-repl==0.3.0
+ # via celery
convertdate==2.2.2
+ # via -r ./requirements.txt
cython==0.29.14
+ # via -r ./requirements.txt
dateutils==0.6.12
+ # via -r ./requirements.txt
datrie==0.8.2
+ # via -r ./requirements.txt
+decorator==5.1.1
+ # via ipython
deepdiff==3.3.0
-diff_match_patch==20200713
-django-anymail==7.2.*
-django-debug-toolbar==2.2 # not used in prod
+ # via -r ./requirements.txt
+diff-match-patch==20200713
+ # via -r ./requirements.txt
+dill==0.3.9
+ # via
+ # multiprocess
+ # pathos
+django==2.2.28
+ # via
+ # -r ./requirements.txt
+ # django-anymail
+ # django-debug-toolbar
+ # django-recaptcha
+ # django-redis
+ # django-structlog
+ # django-user-agents
+ # djangorestframework
+ # djangorestframework-simplejwt
+django-admin-sortable==2.3
+django-anymail==8.6
+ # via -r ./requirements.txt
+django-debug-toolbar==2.2
+ # via -r ./requirements.txt
+django-hosts==7.0.0
+django-ipware==7.0.1
+ # via django-structlog
+django-mobile==0.7.0
+ # via -r ./requirements.txt
django-recaptcha==2.0.6
-django-redis==4.11.*
+ # via -r ./requirements.txt
+django-redis==4.11.0
+ # via -r ./requirements.txt
django-structlog==1.6.2
+ # via -r ./requirements.txt
django-user-agents==0.4.0
+ # via -r ./requirements.txt
django-webpack-loader==1.4.1
-django==1.11.*
-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
-dnspython~=2.5.0
+ # via -r ./requirements.txt
+djangorestframework==3.13.1
+ # via
+ # -r ./requirements.txt
+ # djangorestframework-simplejwt
+djangorestframework-simplejwt==5.2.2
+ # via -r ./requirements.txt
+dnspython==2.5.0
+ # via -r ./requirements.txt
+docopt==0.4.0
+ # via mailchimp
+elastic-transport==8.17.0
+ # via elasticsearch
elasticsearch==8.8.2
+ # via
+ # -r ./requirements.txt
+ # elasticsearch-dsl
+elasticsearch-dsl @ git+https://github.com/Sefaria/elasticsearch-dsl-py@v8.0.0
+ # via -r ./requirements.txt
+geographiclib==2.0
+ # via geopy
geojson==2.5.0
+ # via -r ./requirements.txt
geopy==2.3.0
+ # via -r ./requirements.txt
gevent==20.12.0; sys_platform != 'darwin'
google-analytics-data==0.9.0
-git+https://github.com/Sefaria/LLM@v1.3.6#egg=sefaria_llm_interface&subdirectory=app/llm_interface
-git+https://github.com/Sefaria/elasticsearch-dsl-py@v8.0.0#egg=elasticsearch-dsl
-git+https://github.com/Sefaria/ne_span.git@v1.0.2
-langchain-openai==0.2.14
-langchain-anthropic==0.3.22
-langchain-core==0.3.83
-langchain-community==0.3.31
-langsmith==0.4.4
+google-api-core[grpc]==1.27.0
+ # via
+ # google-api-python-client
+ # google-cloud-core
+ # google-cloud-logging
google-api-python-client==1.12.5
-google-auth-oauthlib==0.4.2
+ # via -r ./requirements.txt
google-auth==1.24.0
+ # via
+ # -r ./requirements.txt
+ # google-api-core
+ # google-api-python-client
+ # google-auth-httplib2
+ # google-auth-oauthlib
+ # google-cloud-core
+ # google-cloud-storage
+google-auth-httplib2==0.1.0
+ # via google-api-python-client
+google-auth-oauthlib==0.4.2
+ # via -r ./requirements.txt
+google-cloud-core==1.7.3
+ # via
+ # google-cloud-logging
+ # google-cloud-storage
google-cloud-logging==1.15.1
+ # via -r ./requirements.txt
google-cloud-storage==1.32.0
-google-re2
+ # via -r ./requirements.txt
+google-crc32c==1.6.0
+ # via google-resumable-media
+google-re2==1.1.20240702
+ # via -r ./requirements.txt
+google-resumable-media==1.3.3
+ # via google-cloud-storage
+googleapis-common-protos==1.66.0
+ # via google-api-core
+grpcio==1.70.0
+ # via google-api-core
gunicorn==23.0.0
-setuptools==69.5.1
+ # via -r ./requirements.txt
html5lib==0.9999999
+ # via
+ # -r ./requirements.txt
+ # bleach
httplib2==0.18.1
-ipython==7.34.*
-jedi==0.18.1 # Ipython was previosuly pinned at 7.18 because Jedi 0.18 broke it. This is currently the latest version.
+ # via
+ # -r ./requirements.txt
+ # google-api-python-client
+ # google-auth-httplib2
+idna==3.10
+ # via requests
+importlib-metadata==8.6.1
+ # via jsonpickle
+iniconfig==2.0.0
+ # via pytest
+ipython==7.34.0
+ # via -r ./requirements.txt
+jedi==0.18.1
+ # via
+ # -r ./requirements.txt
+ # ipython
+jmespath==0.10.0
+ # via
+ # boto3
+ # botocore
jsonpickle==1.4.1
+ # via
+ # -r ./requirements.txt
+ # deepdiff
+kombu<5.6,>=5.5.2
+ # via celery
lxml==4.6.1
+ # via -r ./requirements.txt
mailchimp==2.0.9
+ # via -r ./requirements.txt
+matplotlib-inline==0.1.7
+ # via ipython
+multiprocess==0.70.17
+ # via pathos
+oauthlib==3.2.2
+ # via requests-oauthlib
p929==0.6.2
+ # via -r ./requirements.txt
+packaging==24.2
+ # via
+ # google-api-core
+ # pytest
+parso==0.8.4
+ # via jedi
pathos==0.2.6
+ # via -r ./requirements.txt
+pexpect==4.9.0
+ # via ipython
+pickleshare==0.7.5
+ # via ipython
pillow==10.0.1; sys_platform != 'linux'
pillow==8.0.1; sys_platform == 'linux'
-psycopg2==2.8.6 #for dev: psycopg2-binary==2.8.6
+ # via -r ./requirements.txt
+pluggy==1.5.0
+ # via pytest
+pox==0.3.5
+ # via pathos
+ppft==1.7.6.9
+ # via pathos
+prompt-toolkit==3.0.50
+ # via
+ # click-repl
+ # ipython
+protobuf==5.29.3
+ # via
+ # google-api-core
+ # googleapis-common-protos
+psycopg2-binary==2.8.6 #for dev: psycopg2-binary==2.8.6
+ptyprocess==0.7.0
+ # via pexpect
+py==1.11.0
+ # via pytest
py2-py3-django-email-as-username==1.7.1
+pyasn1==0.6.1
+ # via
+ # pyasn1-modules
+ # rsa
+pyasn1-modules==0.4.1
+ # via google-auth
+pygments==2.19.1
+ # via ipython
+pyjwt==1.7.1
+ # via
+ # -r ./requirements.txt
+ # djangorestframework-simplejwt
+pymeeus==0.5.12
+ # via convertdate
pymongo==4.15.*
+ # via -r ./requirements.txt
pytest~=7.4.4
-python-bidi
-pytz
+ # via
+ # -r ./requirements.txt
+ # pytest-django
+pytest-django==4.9.0
+ # via -r ./requirements.txt
+python-bidi==0.6.3
+ # via -r ./requirements.txt
+python-dateutil==2.9.0.post0
+ # via
+ # botocore
+ # dateutils
+ # elasticsearch-dsl
+python-ipware==3.0.0
+ # via django-ipware
+pytz==2025.1
+ # via
+ # -r ./requirements.txt
+ # apscheduler
+ # celery
+ # convertdate
+ # dateutils
+ # django
+ # djangorestframework
+ # google-api-core
pyyaml==6.0.1
+ # via -r ./requirements.txt
rauth==0.7.3
+ # via -r ./requirements.txt
regex==2024.9.11
-requests
+ # via -r ./requirements.txt
+requests==2.32.5
+ # via
+ # -r ./requirements.txt
+ # django-anymail
+ # google-api-core
+ # google-cloud-storage
+ # mailchimp
+ # rauth
+ # requests-oauthlib
+requests-oauthlib==2.0.0
+ # via google-auth-oauthlib
roman==3.3
+ # via -r ./requirements.txt
+rsa==4.9
+ # via google-auth
+s3transfer==0.3.7
+ # via boto3
+sefaria-llm-interface @ git+https://github.com/Sefaria/LLM@v1.3.6#subdirectory=app/llm_interface
+ # via -r ./requirements.txt
selenium==3.141.0
+ # via
+ # -r ./requirements.txt
+ # appium-python-client
sentry-sdk==2.54.0
+ # via -r ./requirements.txt
+six==1.17.0
+ # via
+ # apscheduler
+ # bleach
+ # google-api-core
+ # google-api-python-client
+ # google-auth
+ # google-auth-httplib2
+ # google-cloud-core
+ # google-resumable-media
+ # html5lib
+ # python-dateutil
+soupsieve==2.6
+ # via beautifulsoup4
+sqlparse==0.5.3
+ # via
+ # django
+ # django-debug-toolbar
+structlog==25.1.0
+ # via django-structlog
+tomli==2.2.1
+ # via pytest
tqdm==4.51.0
+ # via -r ./requirements.txt
+traitlets==5.14.3
+ # via
+ # ipython
+ # matplotlib-inline
+typing-extensions==4.12.2
+ # via
+ # beautifulsoup4
+ # kombu
+ # structlog
+tzdata==2025.2
+ # via
+ # celery
+ # kombu
+tzlocal==5.2
+ # via apscheduler
ua-parser==0.10.0
+ # via
+ # -r ./requirements.txt
+ # user-agents
undecorated==0.3.0
+ # via -r ./requirements.txt
unicodecsv==0.14.1
+ # via -r ./requirements.txt
unidecode==1.1.1
+ # via -r ./requirements.txt
+uritemplate==3.0.1
+ # via google-api-python-client
+urllib3==1.26.20
+ # via
+ # botocore
+ # elastic-transport
+ # requests
+ # selenium
+ # sentry-sdk
user-agents==2.2.0
-pytest-django==4.9.*
+ # via
+ # -r ./requirements.txt
+ # django-user-agents
+vine==5.1.0
+ # via
+ # amqp
+ # celery
+ # kombu
+wcwidth==0.2.13
+ # via prompt-toolkit
+zipp==3.21.0
+ # via importlib-metadata
+
+cryptography==42.0.7
+# Additional packages from master
redis==5.2.1
+git+https://github.com/Sefaria/ne_span.git@v1.0.2
+langchain-openai==0.2.14
+langchain-anthropic==0.3.22
+langchain-core==0.3.83
+langchain-community==0.3.31
+langsmith==0.4.4
+setuptools==69.5.1
Pympler==1.1
-
-
-#opentelemetry-distro
-#opentelemetry-exporter-otlp
-#opentelemetry-propagator-b3
-#opentelemetry-propagator-jaeger
diff --git a/sefaria/decorators.py b/sefaria/decorators.py
index c63d2d5fe2..668ec2aeec 100644
--- a/sefaria/decorators.py
+++ b/sefaria/decorators.py
@@ -12,7 +12,7 @@ def _wrapped_view(request, *args, **kwargs):
auth_header = request.META.get("HTTP_AUTHORIZATION")
if not auth_header or not auth_header.startswith("Basic "):
- return staff_member_required(view_func)(request, *args, **kwargs)
+ return staff_member_required(view_func, login_url='/login')(request, *args, **kwargs)
try:
encoded_credentials = auth_header.split(" ")[1]
diff --git a/sefaria/gauth/views.py b/sefaria/gauth/views.py
index 1f6ec6e839..7a05a2f3c1 100644
--- a/sefaria/gauth/views.py
+++ b/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
diff --git a/sefaria/helper/crm/dummy_crm.py b/sefaria/helper/crm/dummy_crm.py
index 50e7e4be86..b3560e0316 100644
--- a/sefaria/helper/crm/dummy_crm.py
+++ b/sefaria/helper/crm/dummy_crm.py
@@ -28,3 +28,6 @@ def subscribe_to_lists(self, email, first_name=None, last_name=None, educator=Fa
def find_crm_id(self, email=None):
CrmConnectionManager.find_crm_id(self, email=email)
return True
+
+ def get_available_lists(self) -> list[str]:
+ return ["Dummy List 1", "Dummy List 2"]
diff --git a/sefaria/system/cache.py b/sefaria/system/cache.py
index 23450df930..c7082b03b4 100644
--- a/sefaria/system/cache.py
+++ b/sefaria/system/cache.py
@@ -92,7 +92,7 @@ def wrapper(*args, **kwargs):
else:
#logger.debug(['_cach_key.......',_cache_key])
result = get_cache_elem(_cache_key, cache_type=cache_type)
- if decorate_data_with_key:
+ if decorate_data_with_key and result is not None:
result = result["data"]
if not result:
diff --git a/sefaria/system/decorators.py b/sefaria/system/decorators.py
index c6e902e694..eae3c51719 100644
--- a/sefaria/system/decorators.py
+++ b/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,8 +61,8 @@ 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',
- {"content": "There was an error processing your request: {}".format(str(e))})
+ return render(args[0], 'static/generic.html',
+ {"content": "There was an error processing your request: {}".format(str(e))})
return result
return wrapper
diff --git a/sefaria/urls_shared.py b/sefaria/urls_shared.py
index dcf190ea87..b0893ea501 100644
--- a/sefaria/urls_shared.py
+++ b/sefaria/urls_shared.py
@@ -1,4 +1,5 @@
-from django.conf.urls import url, include
+from django.urls import re_path
+from django.conf.urls import url
from django.contrib import admin
from sefaria.settings import ADMIN_PATH
import reader.views as reader_views
@@ -272,7 +273,7 @@
url(r'^admin/descriptions/authors/update', sefaria_views.update_authors_from_sheet),
url(r'^admin/descriptions/categories/update', sefaria_views.update_categories_from_sheet),
url(r'^admin/descriptions/texts/update', sefaria_views.update_texts_from_sheet),
- url(fr'^{ADMIN_PATH}/?', include(admin.site.urls)),
+ re_path(r'{ADMIN_PATH}/?', admin.site.urls),
url(r'^(?P