4 files changed, 42 insertions, 42 deletions

diff --git a/src/mailman/rest/domains.py b/src/mailman/rest/domains.py
index 2b335797e..62e05b82f 100644
--- a/src/mailman/rest/domains.py
+++ b/src/mailman/rest/domains.py
@@ -99,7 +99,7 @@ class ADomain(_DomainBase):
 class AllDomains(_DomainBase):
     """The domains."""
 
-    def on_post(self, context, response):
+    def on_post(self, request, response):
         """Create a new domain."""
         domain_manager = getUtility(IDomainManager)
         try:
@@ -109,7 +109,7 @@ class AllDomains(_DomainBase):
                                   owner=list_of_strings_validator,
                                   _optional=(
                                       'description', 'base_url', 'owner'))
-            values = validator(context)
+            values = validator(request)
             # For consistency, owners are passed in as multiple `owner` keys,
             # but .add() requires an `owners` keyword.  Match impedence.
             owners = values.pop('owner', None)
@@ -122,7 +122,7 @@ class AllDomains(_DomainBase):
             location = self.api.path_to('domains/{}'.format(domain.mail_host))
             created(response, location)
 
-    def on_get(self, context, response):
+    def on_get(self, request, response):
         """/domains"""
-        resource = self._make_collection(context)
+        resource = self._make_collection(request)
         okay(response, etag(resource))
diff --git a/src/mailman/rest/lists.py b/src/mailman/rest/lists.py
index 51da341d1..1e19babbb 100644
--- a/src/mailman/rest/lists.py
+++ b/src/mailman/rest/lists.py
@@ -209,13 +209,13 @@ class AList(_ListBase):
 class AllLists(_ListBase):
     """The mailing lists."""
 
-    def on_post(self, context, response):
+    def on_post(self, request, response):
         """Create a new mailing list."""
         try:
             validator = Validator(fqdn_listname=str,
                                   style_name=str,
                                   _optional=('style_name',))
-            mlist = create_list(**validator(context))
+            mlist = create_list(**validator(request))
         except ListAlreadyExistsError:
             bad_request(response, b'Mailing list exists')
         except BadDomainSpecificationError as error:
@@ -225,9 +225,9 @@ class AllLists(_ListBase):
             location = self.api.path_to('lists/{0}'.format(mlist.list_id))
             created(response, location)
 
-    def on_get(self, context, response):
+    def on_get(self, request, response):
         """/lists"""
-        resource = self._make_collection(context)
+        resource = self._make_collection(request)
         okay(response, etag(resource))
 
 
@@ -240,7 +240,7 @@ class MembersOfList(MemberCollection):
         self._mlist = mailing_list
         self._role = role
 
-    def _get_collection(self, context):
+    def _get_collection(self, request):
         """See `CollectionMixin`."""
         # Overrides _MemberBase._get_collection() because we only want to
         # return the members from the contexted roster.
@@ -256,12 +256,12 @@ class ListsForDomain(_ListBase):
     def __init__(self, domain):
         self._domain = domain
 
-    def on_get(self, context, response):
+    def on_get(self, request, response):
         """/domains/<domain>/lists"""
-        resource = self._make_collection(context)
+        resource = self._make_collection(request)
         okay(response, etag(resource))
 
-    def _get_collection(self, context):
+    def _get_collection(self, request):
         """See `CollectionMixin`."""
         return list(self._domain.mailing_lists)
 
@@ -290,14 +290,14 @@ class ListArchivers:
     def __init__(self, mlist):
         self._mlist = mlist
 
-    def on_get(self, context, response):
+    def on_get(self, request, response):
         """Get all the archiver statuses."""
         archiver_set = IListArchiverSet(self._mlist)
         resource = {archiver.name: archiver.is_enabled
                     for archiver in archiver_set.archivers}
         okay(response, etag(resource))
 
-    def patch_put(self, context, response, is_optional):
+    def patch_put(self, request, response, is_optional):
         archiver_set = IListArchiverSet(self._mlist)
         kws = {archiver.name: ArchiverGetterSetter(self._mlist)
                for archiver in archiver_set.archivers}
@@ -305,19 +305,19 @@ class ListArchivers:
             # For a PATCH, all attributes are optional.
             kws['_optional'] = kws.keys()
         try:
-            Validator(**kws).update(self._mlist, context)
+            Validator(**kws).update(self._mlist, request)
         except ValueError as error:
             bad_request(response, str(error))
         else:
             no_content(response)
 
-    def on_put(self, context, response):
+    def on_put(self, request, response):
         """Update all the archiver statuses."""
-        self.patch_put(context, response, is_optional=False)
+        self.patch_put(request, response, is_optional=False)
 
-    def on_patch(self, context, response):
+    def on_patch(self, request, response):
         """Patch some archiver statueses."""
-        self.patch_put(context, response, is_optional=True)
+        self.patch_put(request, response, is_optional=True)
 
 
 @public
@@ -327,20 +327,20 @@ class ListDigest:
     def __init__(self, mlist):
         self._mlist = mlist
 
-    def on_get(self, context, response):
+    def on_get(self, request, response):
         resource = dict(
             next_digest_number=self._mlist.next_digest_number,
             volume=self._mlist.volume,
             )
         okay(response, etag(resource))
 
-    def on_post(self, context, response):
+    def on_post(self, request, response):
         try:
             validator = Validator(
                 send=as_boolean,
                 bump=as_boolean,
                 _optional=('send', 'bump'))
-            values = validator(context)
+            values = validator(request)
         except ValueError as error:
             bad_request(response, str(error))
             return
diff --git a/src/mailman/rest/members.py b/src/mailman/rest/members.py
index 26c79aa0e..b6158dd3c 100644
--- a/src/mailman/rest/members.py
+++ b/src/mailman/rest/members.py
@@ -140,7 +140,7 @@ class AMember(_MemberBase):
             self._member, 'members/{}/all'.format(member_id))
         return child, []
 
-    def on_delete(self, context, response):
+    def on_delete(self, request, response):
         """Delete the member (i.e. unsubscribe)."""
         # Leaving a list is a bit different than deleting a moderator or
         # owner.  Handle the former case first.  For now too, we will not send
@@ -155,7 +155,7 @@ class AMember(_MemberBase):
             self._member.unsubscribe()
         no_content(response)
 
-    def on_patch(self, context, response):
+    def on_patch(self, request, response):
         """Patch the membership.
 
         This is how subscription changes are done.
@@ -169,7 +169,7 @@ class AMember(_MemberBase):
                 delivery_mode=enum_validator(DeliveryMode),
                 moderation_action=enum_validator(Action),
                 _optional=('address', 'delivery_mode', 'moderation_action'),
-                )(context)
+                )(request)
         except ValueError as error:
             bad_request(response, str(error))
             return
@@ -195,7 +195,7 @@ class AMember(_MemberBase):
 class AllMembers(_MemberBase):
     """The members."""
 
-    def on_post(self, context, response):
+    def on_post(self, request, response):
         """Create a new member."""
         try:
             validator = Validator(
@@ -209,7 +209,7 @@ class AllMembers(_MemberBase):
                 pre_approved=bool,
                 _optional=('delivery_mode', 'display_name', 'role',
                            'pre_verified', 'pre_confirmed', 'pre_approved'))
-            arguments = validator(context)
+            arguments = validator(request)
         except ValueError as error:
             bad_request(response, str(error))
             return
@@ -334,9 +334,9 @@ class AllMembers(_MemberBase):
         location = self.api.path_to('members/{}'.format(member_id))
         created(response, location)
 
-    def on_get(self, context, response):
+    def on_get(self, request, response):
         """/members"""
-        resource = self._make_collection(context)
+        resource = self._make_collection(request)
         okay(response, etag(resource))
 
 
@@ -348,7 +348,7 @@ class _FoundMembers(MemberCollection):
         self._members = members
         self.api = api
 
-    def _get_collection(self, context):
+    def _get_collection(self, request):
         """See `CollectionMixin`."""
         return self._members
 
@@ -357,13 +357,13 @@ class _FoundMembers(MemberCollection):
 class FindMembers(_MemberBase):
     """/members/find"""
 
-    def on_get(self, context, response):
-        return self._find(context, response)
+    def on_get(self, request, response):
+        return self._find(request, response)
 
-    def on_post(self, context, response):
-        return self._find(context, response)
+    def on_post(self, request, response):
+        return self._find(request, response)
 
-    def _find(self, context, response):
+    def _find(self, request, response):
         """Find a member"""
         service = getUtility(ISubscriptionService)
         validator = Validator(
@@ -375,7 +375,7 @@ class FindMembers(_MemberBase):
             count=int,
             _optional=('list_id', 'subscriber', 'role', 'page', 'count'))
         try:
-            data = validator(context)
+            data = validator(request)
         except ValueError as error:
             bad_request(response, str(error))
         else:
@@ -385,4 +385,4 @@ class FindMembers(_MemberBase):
             data.pop('count', None)
             members = service.find_members(**data)
             resource = _FoundMembers(members, self.api)
-            okay(response, etag(resource._make_collection(context)))
+            okay(response, etag(resource._make_collection(request)))
diff --git a/src/mailman/rest/root.py b/src/mailman/rest/root.py
index 6fad5bc7c..3c38ded5d 100644
--- a/src/mailman/rest/root.py
+++ b/src/mailman/rest/root.py
@@ -69,7 +69,7 @@ class Root:
 
 @public
 class Versions:
-    def on_get(self, context, response):
+    def on_get(self, request, response):
         """/<api>/system/versions"""
         resource = dict(
             mailman_version=system.mailman_version,
@@ -85,7 +85,7 @@ class SystemConfiguration:
     def __init__(self, section=None):
         self._section = section
 
-    def on_get(self, context, response):
+    def on_get(self, request, response):
         if self._section is None:
             resource = dict(
                 sections=sorted(section.name for section in config))
@@ -104,14 +104,14 @@ class SystemConfiguration:
 
 @public
 class Pipelines:
-    def on_get(self, context, response):
+    def on_get(self, request, response):
         resource = dict(pipelines=sorted(config.pipelines))
         okay(response, etag(resource))
 
 
 @public
 class Chains:
-    def on_get(self, context, response):
+    def on_get(self, request, response):
         resource = dict(chains=sorted(config.chains))
         okay(response, etag(resource))
 
@@ -128,7 +128,7 @@ class Reserved:
     def __init__(self, segments):
         self._resource_path = SLASH.join(segments)
 
-    def on_delete(self, context, response):
+    def on_delete(self, request, response):
         if self._resource_path != 'uids/orphans':
             not_found(response)
             return