aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/modelresource.py
diff options
context:
space:
mode:
authortom christie tom@tomchristie.com2011-02-15 08:19:57 +0000
committertom christie tom@tomchristie.com2011-02-15 08:19:57 +0000
commitb749b950a1b4bede76b7e3900a6385779904902d (patch)
treecc61f2f271bf5203ede652c1f15b0c9a50dc2f3b /djangorestframework/modelresource.py
parent027ffed21064b1ec304a1ea559104382313d76f4 (diff)
downloaddjango-rest-framework-b749b950a1b4bede76b7e3900a6385779904902d.tar.bz2
Added credits, fixed multipart forms and unicode output as per paul's bug reports.
Diffstat (limited to 'djangorestframework/modelresource.py')
-rw-r--r--djangorestframework/modelresource.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/djangorestframework/modelresource.py b/djangorestframework/modelresource.py
index a9605d4a..2b0e719c 100644
--- a/djangorestframework/modelresource.py
+++ b/djangorestframework/modelresource.py
@@ -121,7 +121,7 @@ class ModelResource(Resource):
if inspect.ismethod(f) and len(inspect.getargspec(f)[0]) == 1:
ret = _any(f())
else:
- ret = str(thing) # TRC TODO: Change this back!
+ ret = unicode(thing) # TRC TODO: Change this back!
return ret