Remove WAGTAILADMIN_GLOBAL_PAGE_EDIT_LOCK setting

wagtail/locks.py

@@ -1,5 +1,3 @@
-from warnings import warn
-
 from django.conf import settings
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
@@ -7,7 +5,6 @@ from django.utils.text import capfirst
 from django.utils.translation import gettext as _
 
 from wagtail.admin.utils import get_latest_str, get_user_display_name
-from wagtail.utils.deprecation import RemovedInWagtail60Warning
 from wagtail.utils.timestamps import render_timestamp
 
 
@@ -82,16 +79,6 @@ class BasicLock(BaseLock):
 
     def for_user(self, user):
         global_edit_lock = getattr(settings, "WAGTAILADMIN_GLOBAL_EDIT_LOCK", None)
-        if global_edit_lock is None and hasattr(
-            settings, "WAGTAILADMIN_GLOBAL_PAGE_EDIT_LOCK"
-        ):
-            warn(
-                "settings.WAGTAILADMIN_GLOBAL_PAGE_EDIT_LOCK has been renamed to "
-                "settings.WAGTAILADMIN_GLOBAL_EDIT_LOCK",
-                category=RemovedInWagtail60Warning,
-            )
-            global_edit_lock = settings.WAGTAILADMIN_GLOBAL_PAGE_EDIT_LOCK
-
         return global_edit_lock or user.pk != self.object.locked_by_id
 
     def get_message(self, user):

wagtail/tests/test_page_model.py

@@ -68,7 +68,6 @@ from wagtail.test.testapp.models import (
     TaggedPage,
 )
 from wagtail.test.utils import WagtailTestUtils
-from wagtail.utils.deprecation import RemovedInWagtail60Warning
 
 
 def get_ct(model):
@@ -3829,46 +3828,6 @@ class TestGetLock(TestCase):
             f"<b>'Christmas' was locked</b> by <b>you</b> on <b>{expected_date_string}</b>.",
         )
 
-    @override_settings(WAGTAILADMIN_GLOBAL_PAGE_EDIT_LOCK=True)
-    def test_when_locked_globally_with_old_setting_name(self):
-        moderator = get_user_model().objects.get(email="eventmoderator@example.com")
-
-        christmas_event = EventPage.objects.get(url_path="/home/events/christmas/")
-        christmas_event.locked = True
-        christmas_event.locked_by = moderator
-        if settings.USE_TZ:
-            christmas_event.locked_at = datetime.datetime(
-                2022, 7, 29, 12, 19, 0, tzinfo=datetime.timezone.utc
-            )
-        else:
-            christmas_event.locked_at = datetime.datetime(2022, 7, 29, 12, 19, 0)
-
-        lock = christmas_event.get_lock()
-        self.assertIsInstance(lock, BasicLock)
-
-        with self.assertWarnsMessage(
-            RemovedInWagtail60Warning,
-            "settings.WAGTAILADMIN_GLOBAL_PAGE_EDIT_LOCK has been renamed to "
-            "settings.WAGTAILADMIN_GLOBAL_EDIT_LOCK",
-        ):
-            self.assertTrue(lock.for_user(christmas_event.owner))
-            self.assertTrue(lock.for_user(moderator))
-
-        if settings.USE_TZ:
-            # the default timezone is "Asia/Tokyo", so we expect UTC +9
-            expected_date_string = "July 29, 2022, 9:19 p.m."
-        else:
-            expected_date_string = "July 29, 2022, 12:19 p.m."
-
-        self.assertEqual(
-            lock.get_message(christmas_event.owner),
-            f"<b>'Christmas' was locked</b> by <b>{str(moderator)}</b> on <b>{expected_date_string}</b>.",
-        )
-        self.assertEqual(
-            lock.get_message(moderator),
-            f"<b>'Christmas' was locked</b> by <b>you</b> on <b>{expected_date_string}</b>.",
-        )
-
     def test_when_locked_by_workflow(self):
         moderator = get_user_model().objects.get(email="eventmoderator@example.com")