summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorAdam Johnson <me@adamj.eu>2021-11-22 10:47:38 +0000
committerCarlton Gibson <carlton.gibson@noumenal.es>2022-03-08 14:50:06 +0100
commita8c15481f4be93700f6e4a8f794de26744e6db20 (patch)
tree1fd9a909f28d32133b6f4b6d903411491385bb25 /django
parentd4fd31684ad5a7b9be8a9d26c5a8796f96c8d80b (diff)
Rewrote some references to "master".
Following d9a266d657f66b8c4fa068408002a4e3709ee669.
Diffstat (limited to 'django')
-rw-r--r--django/apps/registry.py4
-rw-r--r--django/test/client.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/django/apps/registry.py b/django/apps/registry.py
index c5ba3a307d..4abf828ca1 100644
--- a/django/apps/registry.py
+++ b/django/apps/registry.py
@@ -18,7 +18,7 @@ class Apps:
"""
def __init__(self, installed_apps=()):
- # installed_apps is set to None when creating the master registry
+ # installed_apps is set to None when creating the main registry
# because it cannot be populated at that point. Other registries must
# provide a list of installed apps and are populated immediately.
if installed_apps is None and hasattr(sys.modules[__name__], "apps"):
@@ -54,7 +54,7 @@ class Apps:
# `lazy_model_operation()` and `do_pending_operations()` methods.
self._pending_operations = defaultdict(list)
- # Populate apps and models, unless it's the master registry.
+ # Populate apps and models, unless it's the main registry.
if installed_apps is not None:
self.populate(installed_apps)
diff --git a/django/test/client.py b/django/test/client.py
index a38e7dae13..60f4c37c3f 100644
--- a/django/test/client.py
+++ b/django/test/client.py
@@ -785,7 +785,7 @@ class Client(ClientMixin, RequestFactory):
def request(self, **request):
"""
- The master request method. Compose the environment dictionary and pass
+ Make a generic request. Compose the environment dictionary and pass
to the handler, return the result of the handler. Assume defaults for
the query environment, which can be overridden using the arguments to
the request.
@@ -1041,7 +1041,7 @@ class AsyncClient(ClientMixin, AsyncRequestFactory):
async def request(self, **request):
"""
- The master request method. Compose the scope dictionary and pass to the
+ Make a generic request. Compose the scope dictionary and pass to the
handler, return the result of the handler. Assume defaults for the
query environment, which can be overridden using the arguments to the
request.