diff options
| author | Tom Christie | 2013-06-13 00:10:23 -0700 |
|---|---|---|
| committer | Tom Christie | 2013-06-13 00:10:23 -0700 |
| commit | 170709442bb3f53bd2b49414cdff0495e7d6c9eb (patch) | |
| tree | 2168c40e527b3ff9cc54fbd14fdb823799bbf280 /rest_framework/generics.py | |
| parent | de00ec95c3007dd90b5b01f7486b430699ea63c1 (diff) | |
| parent | 2ed79b6dc626cb2fcc1bfc119ef5757c590bb983 (diff) | |
| download | django-rest-framework-170709442bb3f53bd2b49414cdff0495e7d6c9eb.tar.bz2 | |
Merge pull request #931 from mindlace-mp/writable-nested-modelserializer
Merged master into writable-nested-modelserializer.
Diffstat (limited to 'rest_framework/generics.py')
| -rw-r--r-- | rest_framework/generics.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 9ccc7898..99e9782e 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -212,7 +212,7 @@ class GenericAPIView(views.APIView): You may want to override this if you need to provide different serializations depending on the incoming request. - (Eg. admins get full serialization, others get basic serilization) + (Eg. admins get full serialization, others get basic serialization) """ serializer_class = self.serializer_class if serializer_class is not None: @@ -285,7 +285,7 @@ class GenericAPIView(views.APIView): ) filter_kwargs = {self.slug_field: slug} else: - raise exceptions.ConfigurationError( + raise ImproperlyConfigured( 'Expected view %s to be called with a URL keyword argument ' 'named "%s". Fix your URL conf, or set the `.lookup_field` ' 'attribute on the view correctly.' % |