aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/modelresource.py
diff options
context:
space:
mode:
authorTom Christie2011-04-28 19:54:30 +0100
committerTom Christie2011-04-28 19:54:30 +0100
commit93aa065fa92f64472a3ee80564020a81776be742 (patch)
treed1bfa96d3027545006b7a0f542a32f53a946153b /djangorestframework/modelresource.py
parentad552107ff9b6f844982bd3c562d69f890febf1f (diff)
downloaddjango-rest-framework-93aa065fa92f64472a3ee80564020a81776be742.tar.bz2
emitters -> renderers
Diffstat (limited to 'djangorestframework/modelresource.py')
-rw-r--r--djangorestframework/modelresource.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/djangorestframework/modelresource.py b/djangorestframework/modelresource.py
index 79505c6c..c61cc375 100644
--- a/djangorestframework/modelresource.py
+++ b/djangorestframework/modelresource.py
@@ -49,7 +49,7 @@ class ModelResource(Resource):
#def get_form(self, content=None):
- # """Return a form that may be used in validation and/or rendering an html emitter"""
+ # """Return a form that may be used in validation and/or rendering an html renderer"""
# if self.form:
# return super(self.__class__, self).get_form(content)
#
@@ -121,8 +121,8 @@ class ModelResource(Resource):
elif inspect.isfunction(thing):
if not inspect.getargspec(thing)[0]:
ret = _any(thing())
- elif hasattr(thing, '__emittable__'):
- f = thing.__emittable__
+ elif hasattr(thing, '__rendertable__'):
+ f = thing.__rendertable__
if inspect.ismethod(f) and len(inspect.getargspec(f)[0]) == 1:
ret = _any(f())
else: