summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
Diffstat (limited to 'django')
-rw-r--r--django/core/serializers/pyyaml.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/django/core/serializers/pyyaml.py b/django/core/serializers/pyyaml.py
index fdc245756f..935d3cec49 100644
--- a/django/core/serializers/pyyaml.py
+++ b/django/core/serializers/pyyaml.py
@@ -34,9 +34,6 @@ DjangoSafeDumper.add_representer(decimal.Decimal, DjangoSafeDumper.represent_dec
DjangoSafeDumper.add_representer(
collections.OrderedDict, DjangoSafeDumper.represent_ordered_dict
)
-# Workaround to represent dictionaries in insertion order.
-# See https://github.com/yaml/pyyaml/pull/143.
-DjangoSafeDumper.add_representer(dict, DjangoSafeDumper.represent_ordered_dict)
class Serializer(PythonSerializer):
@@ -59,7 +56,13 @@ class Serializer(PythonSerializer):
def end_serialization(self):
self.options.setdefault("allow_unicode", True)
- yaml.dump(self.objects, self.stream, Dumper=DjangoSafeDumper, **self.options)
+ yaml.dump(
+ self.objects,
+ self.stream,
+ Dumper=DjangoSafeDumper,
+ sort_keys=False,
+ **self.options,
+ )
def getvalue(self):
# Grandparent super