Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #18457 -- Fixed encoding error in yaml deserializer

Thanks jpaugh64 for the report.
  • Loading branch information...
commit 1a10a06b9f510f796beb2ffef39c7885cba2ad67 1 parent e9497a3
@claudep claudep authored
Showing with 5 additions and 1 deletion.
  1. +5 −1 django/core/serializers/pyyaml.py
View
6 django/core/serializers/pyyaml.py
@@ -12,6 +12,8 @@
from django.core.serializers.base import DeserializationError
from django.core.serializers.python import Serializer as PythonSerializer
from django.core.serializers.python import Deserializer as PythonDeserializer
+from django.utils.encoding import smart_str
+
class DjangoSafeDumper(yaml.SafeDumper):
def represent_decimal(self, data):
@@ -48,8 +50,10 @@ def Deserializer(stream_or_string, **options):
"""
Deserialize a stream or string of YAML data.
"""
- if isinstance(stream_or_string, basestring):
+ if isinstance(stream_or_string, bytes):
stream = BytesIO(stream_or_string)
+ if isinstance(stream_or_string, unicode):
+ stream = BytesIO(smart_str(stream_or_string))
else:
stream = stream_or_string
try:

0 comments on commit 1a10a06

Please sign in to comment.
Something went wrong with that request. Please try again.