From 205df48fae3fee6d4e6cd0062a46b5fc6582661d Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Wed, 10 Aug 2016 11:36:17 +0100
Subject: [PATCH] Ensure None template comparisons don't match string None

---
 rest_framework/templatetags/rest_framework.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py
index a3fa98bd5..3bb85e472 100644
--- a/rest_framework/templatetags/rest_framework.py
+++ b/rest_framework/templatetags/rest_framework.py
@@ -91,12 +91,17 @@ def add_query_param(request, key, val):
 
 @register.filter
 def as_string(value):
-    return "%s" % value
+    if value is None:
+        return ''
+    return '%s' % value
 
 
 @register.filter
 def as_list_of_strings(value):
-    return ["%s" % item for item in value]
+    return [
+        '' if (item is None) else ('%s' % item)
+        for item in value
+    ]
 
 
 @register.filter