aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLudwig Kraatz2012-11-08 15:42:09 +0100
committerLudwig Kraatz2012-11-08 15:42:09 +0100
commit607cf823313d4a3bdb0da4caddf19739a5f133b2 (patch)
tree3c1cbd6e0ff311d051166d377b91b0234fc1a122
parente9dfebc9c6c44bebc317611b84696582f502d1ac (diff)
downloaddjango-rest-framework-607cf823313d4a3bdb0da4caddf19739a5f133b2.tar.bz2
revert merge
-rw-r--r--rest_framework/serializers.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 522878e4..4f68ada6 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -480,7 +480,6 @@ class HyperlinkedModelSerializer(ModelSerializer):
"""
_options_class = HyperlinkedModelSerializerOptions
_default_view_name = '%(model_name)s-detail'
- _default_view_namespace = None # default: no namespace is prepend to view_name
url = HyperlinkedIdentityField()
@@ -498,14 +497,7 @@ class HyperlinkedModelSerializer(ModelSerializer):
'app_label': model_meta.app_label,
'model_name': model_meta.object_name.lower()
}
- view_name = self._default_view_name % format_kwargs
- if self._default_view_namespace:
- return "%(namespace)s:%(view)s" % {
- 'view': view_name,
- 'namespace': self._default_view_namespace
- }
- else:
- return view_name
+ return self._default_view_name % format_kwargs
def get_pk_field(self, model_field):
return None