Merge branch 'main' into feat/mkdocs-material

Author: auvipy

docs/api-guide/fields.md

@@ -417,7 +417,7 @@ Both the `allow_blank` and `allow_null` are valid options on `ChoiceField`, alth
 
 ## MultipleChoiceField
 
-A field that can accept a set of zero, one or many values, chosen from a limited set of choices. Takes a single mandatory argument. `to_internal_value` returns a `set` containing the selected values.
+A field that can accept a list of zero, one or many values, chosen from a limited set of choices. Takes a single mandatory argument. `to_internal_value` returns a `list` containing the selected values, deduplicated.
 
 **Signature:** `MultipleChoiceField(choices)`
 

docs/tutorial/1-serialization.md

@@ -15,7 +15,7 @@ Before we do anything else we'll create a new virtual environment, using [venv].
 
 ```bash
 python3 -m venv env
-source env/bin/activate
+source env/bin/activate   # On Windows use `env\Scripts\activate`
 ```
 
 Now that we're inside a virtual environment, we can install our package requirements.
@@ -217,6 +217,10 @@ Let's look at refactoring our serializer using the `ModelSerializer` class.
 Open the file `snippets/serializers.py` again, and replace the `SnippetSerializer` class with the following.
 
 ```python
+from rest_framework import serializers
+from snippets.models import Snippet
+
+
 class SnippetSerializer(serializers.ModelSerializer):
     class Meta:
         model = Snippet
@@ -362,9 +366,9 @@ Quit the server with CONTROL-C.
 
 In another terminal window, we can test the server.
 
-We can test our API using [curl][curl] or [httpie][httpie]. Httpie is a user friendly http client that's written in Python. Let's install that.
+We can test our API using [curl][curl] or [HTTPie][HTTPie]. HTTPie is a user-friendly http client that's written in Python. Let's install that.
 
-You can install httpie using pip:
+You can install HTTPie using pip:
 
 ```bash
 pip install httpie
@@ -436,5 +440,5 @@ We'll see how we can start to improve things in [part 2 of the tutorial][tut-2].
 [repo]: https://github.com/encode/rest-framework-tutorial
 [venv]: https://docs.python.org/3/library/venv.html
 [tut-2]: 2-requests-and-responses.md
-[httpie]: https://github.com/httpie/httpie#installation
+[HTTPie]: https://github.com/httpie/httpie#installation
 [curl]: https://curl.haxx.se/

rest_framework/fields.py

@@ -1523,17 +1523,22 @@ def to_internal_value(self, data):
         if not self.allow_empty and len(data) == 0:
             self.fail('empty')
 
-        return {
-            # Arguments for super() are needed because of scoping inside
-            # comprehensions.
-            super(MultipleChoiceField, self).to_internal_value(item)
-            for item in data
-        }
+        # Arguments for super() are needed because of scoping inside
+        # comprehensions.
+        return list(
+            dict.fromkeys(
+                super(MultipleChoiceField, self).to_internal_value(item)
+                for item in data
+            )
+        )
 
     def to_representation(self, value):
-        return {
-            self.choice_strings_to_values.get(str(item), item) for item in value
-        }
+        return list(
+            dict.fromkeys(
+                self.choice_strings_to_values.get(str(item), item)
+                for item in value
+            )
+        )
 
 
 class FilePathField(ChoiceField):

rest_framework/locale/ru_RU/LC_MESSAGES/django.mo

@@ -53,7 +53,7 @@ msgstr ""
 
 #: authentication.py:203
 msgid "Invalid token."
-msgstr ""
+msgstr "Недействительный токен."
 
 #: authtoken/apps.py:7
 msgid "Auth Token"

rest_framework/locale/ru_RU/LC_MESSAGES/django.po

@@ -24,6 +24,7 @@
     BuiltinSignatureError, DjangoImageField, SkipField, empty,
     is_simple_callable
 )
+from rest_framework.utils import json
 from tests.models import UUIDForeignKeyTarget
 
 utc = datetime.timezone.utc
@@ -2178,16 +2179,20 @@ class TestMultipleChoiceField(FieldValues):
     Valid and invalid values for `MultipleChoiceField`.
     """
     valid_inputs = {
-        (): set(),
-        ('aircon',): {'aircon'},
-        ('aircon', 'manual'): {'aircon', 'manual'},
+        (): list(),
+        ('aircon',): ['aircon'],
+        ('aircon', 'aircon'): ['aircon'],
+        ('aircon', 'manual'): ['aircon', 'manual'],
+        ('manual', 'aircon'): ['manual', 'aircon'],
     }
     invalid_inputs = {
         'abc': ['Expected a list of items but got type "str".'],
         ('aircon', 'incorrect'): ['"incorrect" is not a valid choice.']
     }
     outputs = [
-        (['aircon', 'manual', 'incorrect'], {'aircon', 'manual', 'incorrect'})
+        (['aircon', 'manual', 'incorrect'], ['aircon', 'manual', 'incorrect']),
+        (['manual', 'aircon', 'incorrect'], ['manual', 'aircon', 'incorrect']),
+        (['aircon', 'manual', 'aircon'], ['aircon', 'manual']),
     ]
     field = serializers.MultipleChoiceField(
         choices=[
@@ -2204,6 +2209,27 @@ def test_against_partial_and_full_updates(self):
         field.partial = True
         assert field.get_value(QueryDict('')) == rest_framework.fields.empty
 
+    def test_valid_inputs_is_json_serializable(self):
+        for input_value, _ in get_items(self.valid_inputs):
+            validated = self.field.run_validation(input_value)
+
+            try:
+                json.dumps(validated)
+            except TypeError as e:
+                pytest.fail(f'Validated output not JSON serializable: {repr(validated)}; Error: {e}')
+
+    def test_output_is_json_serializable(self):
+        for output_value, _ in get_items(self.outputs):
+            representation = self.field.to_representation(output_value)
+
+            try:
+                json.dumps(representation)
+            except TypeError as e:
+                pytest.fail(
+                    f'to_representation output not JSON serializable: '
+                    f'{repr(representation)}; Error: {e}'
+                )
+
 
 class TestEmptyMultipleChoiceField(FieldValues):
     """

tests/test_fields.py

@@ -199,14 +199,14 @@ def test_nested_serializer_with_list_json(self):
         serializer = self.Serializer(data=input_data)
 
         assert serializer.is_valid()
-        assert serializer.validated_data['nested']['example'] == {1, 2}
+        assert serializer.validated_data['nested']['example'] == [1, 2]
 
     def test_nested_serializer_with_list_multipart(self):
         input_data = QueryDict('nested.example=1&nested.example=2')
         serializer = self.Serializer(data=input_data)
 
         assert serializer.is_valid()
-        assert serializer.validated_data['nested']['example'] == {1, 2}
+        assert serializer.validated_data['nested']['example'] == [1, 2]
 
 
 class TestNotRequiredNestedSerializerWithMany: