From 262d9c248918d1e9a2e6ee8008aca94e2e23dd82 Mon Sep 17 00:00:00 2001
From: Joel Marcotte <joel.marcotte@gmail.com>
Date: Sat, 15 Dec 2012 16:52:28 -0500
Subject: [PATCH] Final commit to restore the fix

Signed-off-by: Joel Marcotte <skaner@gmail.com>
---
 rest_framework/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index da588082c..903c384e3 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -794,7 +794,7 @@ class ChoiceField(WritableField):
                     if value == smart_unicode(k2):
                         return True
             else:
-                if value == smart_unicode(k):
+                if value == smart_unicode(k) or value == k:
                     return True
         return False