From c4fe5a920b3a123d86b82da5b86e118435b07050 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 1 Jul 2011 16:05:22 +0100
Subject: Urg, force update after hg-git ickyness

---
 djangorestframework/serializer.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'djangorestframework/serializer.py')

diff --git a/djangorestframework/serializer.py b/djangorestframework/serializer.py
index da8036e9..82aeb53f 100644
--- a/djangorestframework/serializer.py
+++ b/djangorestframework/serializer.py
@@ -4,7 +4,7 @@ Customizable serialization.
 from django.db import models
 from django.db.models.query import QuerySet
 from django.db.models.fields.related import RelatedField
-from django.utils.encoding import smart_unicode, is_protected_type
+from django.utils.encoding import smart_unicode, is_protected_type, smart_str
 
 import decimal
 import inspect
@@ -177,7 +177,7 @@ class Serializer(object):
         Keys serialize to their string value,
         unless they exist in the `rename` dict.
         """
-        return getattr(self.rename, key, key)
+        return getattr(self.rename, smart_str(key), smart_str(key))
 
 
     def serialize_val(self, key, obj):
@@ -228,12 +228,12 @@ class Serializer(object):
 
         # serialize each required field 
         for fname in fields:
-            if hasattr(self, fname):
+            if hasattr(self, smart_str(fname)):
                 # check for a method 'fname' on self first
                 meth = getattr(self, fname)
                 if inspect.ismethod(meth) and len(inspect.getargspec(meth)[0]) == 2:
                     obj = meth(instance)
-            elif hasattr(instance, fname):
+            elif hasattr(instance, smart_str(fname)):
                 # now check for an attribute 'fname' on the instance
                 obj = getattr(instance, fname)
             elif fname in instance:
-- 
cgit v1.2.3