From cf323db503081dfd9087e0d9c1c3a49e058738fa Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.org>
Date: Thu, 11 Oct 2018 19:51:17 -0400
Subject: [PATCH] i got it dude

---
 responder/formats.py | 13 ++++++++-----
 responder/models.py  |  6 +-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/responder/formats.py b/responder/formats.py
index 5358020..26d7f8b 100644
--- a/responder/formats.py
+++ b/responder/formats.py
@@ -3,21 +3,24 @@ import json
 
 
 def format_form(r, encode=False):
-    return r._wz.form
+    if not encode:
+        return r._wz.form
 
 
 def format_yaml(r, encode=False):
     if encode:
-        return yaml.load(r.content)
-    else:
+        r.headers.update({"Content-Type": "application/x-yaml"})
         return yaml.dump(r.media)
+    else:
+        return yaml.load(r.content)
 
 
 def format_json(r, encode=False):
     if encode:
-        return json.loads(r.content)
-    else:
+        r.headers.update({"Content-Type": "application/json"})
         return json.dumps(r.media)
+    else:
+        return json.loads(r.content)
 
 
 def get_formats():
diff --git a/responder/models.py b/responder/models.py
index 2b29539..dfa1d32 100644
--- a/responder/models.py
+++ b/responder/models.py
@@ -99,11 +99,7 @@ class Response:
 
         for format in self.formats:
             if self.req.accepts(format):
-                return (
-                    self.formats[format](self),
-                    self.mimetype or "application/x-yaml",
-                    {"Content-Type": "application/x-yaml"},
-                )
+                return self.formats[format](self, encode=True), None, {}
 
         # Default to JSON anyway.
         else: