mirror of
				https://github.com/encode/django-rest-framework.git
				synced 2025-10-31 07:57:55 +03:00 
			
		
		
		
	Merge branch 'master' of github.com:tomchristie/django-rest-framework
This commit is contained in:
		
						commit
						7bfa5a9141
					
				|  | @ -51,14 +51,13 @@ class Response(SimpleTemplateResponse): | ||||||
|     @property |     @property | ||||||
|     def rendered_content(self): |     def rendered_content(self): | ||||||
|         renderer = getattr(self, 'accepted_renderer', None) |         renderer = getattr(self, 'accepted_renderer', None) | ||||||
|         media_type = getattr(self, 'accepted_media_type', None) |  | ||||||
|         context = getattr(self, 'renderer_context', None) |         context = getattr(self, 'renderer_context', None) | ||||||
| 
 | 
 | ||||||
|         assert renderer, ".accepted_renderer not set on Response" |         assert renderer, ".accepted_renderer not set on Response" | ||||||
|         assert media_type, ".accepted_media_type not set on Response" |  | ||||||
|         assert context, ".renderer_context not set on Response" |         assert context, ".renderer_context not set on Response" | ||||||
|         context['response'] = self |         context['response'] = self | ||||||
| 
 | 
 | ||||||
|  |         media_type = renderer.media_type | ||||||
|         charset = renderer.charset |         charset = renderer.charset | ||||||
|         content_type = self.content_type |         content_type = self.content_type | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	Block a user