Fixed #15197 -- Fixed yaml serialization into HttpResponse

Thanks fourga38 for the report and hirokiky at gmail.com for the
initial patch.

2 files changed, 4 insertions, 4 deletions

diff --git a/django/core/serializers/json.py b/django/core/serializers/json.py
index 937d839239..941b9e0ba8 100644
--- a/django/core/serializers/json.py
+++ b/django/core/serializers/json.py
@@ -52,9 +52,8 @@ class Serializer(PythonSerializer):
         self._current = None
 
     def getvalue(self):
-        # overwrite PythonSerializer.getvalue() with base Serializer.getvalue()
-        if callable(getattr(self.stream, 'getvalue', None)):
-            return self.stream.getvalue()
+        # Grand-parent super
+        return super(PythonSerializer, self).getvalue()
 
 
 def Deserializer(stream_or_string, **options):
diff --git a/django/core/serializers/pyyaml.py b/django/core/serializers/pyyaml.py
index b639ad2dae..73e92d557f 100644
--- a/django/core/serializers/pyyaml.py
+++ b/django/core/serializers/pyyaml.py
@@ -44,7 +44,8 @@ class Serializer(PythonSerializer):
         yaml.dump(self.objects, self.stream, Dumper=DjangoSafeDumper, **self.options)
 
     def getvalue(self):
-        return self.stream.getvalue()
+        # Grand-parent super
+        return super(PythonSerializer, self).getvalue()
 
 def Deserializer(stream_or_string, **options):
     """