Stephan Groß 
							
						 
					 
					
						
						
						
						
							
						
						
							a101251a2a 
							
						 
					 
					
						
						
							
							Fix blank lines around docstrings  
						
						
						
					 
					
						2016-03-17 11:06:47 +00:00 
						 
				 
			
				
					
						
							
							
								Dan Lipsitt 
							
						 
					 
					
						
						
						
						
							
						
						
							fb94be18be 
							
						 
					 
					
						
						
							
							docstring typo fix: DateAndFiles -> DataAndFiles  
						
						
						
					 
					
						2015-12-16 10:42:10 -08:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							7351a3f6ca 
							
						 
					 
					
						
						
							
							Sort imports with isort  
						
						
						
					 
					
						2015-06-25 16:55:51 -04:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							83c9136c90 
							
						 
					 
					
						
						
							
							Cleanup import following PEP 8 style guide  
						
						
						
					 
					
						2015-06-25 16:10:17 -04:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							4ee4b4f2dc 
							
						 
					 
					
						
						
							
							Merge master  
						
						
						
					 
					
						2015-01-30 14:00:25 +00:00 
						 
				 
			
				
					
						
							
							
								Alexander Dutton 
							
						 
					 
					
						
						
						
						
							
						
						
							a1fa7218eb 
							
						 
					 
					
						
						
							
							Pass {} as data to DataAndFiles, as it ends up in a MergeDict  
						
						... 
						
						
						
						In the same vein as #2399 . 
						
					 
					
						2015-01-23 16:52:24 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							39f26c9eca 
							
						 
					 
					
						
						
							
							Merge master  
						
						
						
					 
					
						2015-01-23 14:28:59 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							f1ac9d3f9b 
							
						 
					 
					
						
						
							
							More graceful handling of malformed Content-Disposition  
						
						
						
					 
					
						2015-01-23 12:26:44 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							6065cdbd93 
							
						 
					 
					
						
						
							
							Merge master  
						
						
						
					 
					
						2015-01-19 15:16:57 +00:00 
						 
				 
			
				
					
						
							
							
								Ask Holme 
							
						 
					 
					
						
						
						
						
							
						
						
							d6bff10f98 
							
						 
					 
					
						
						
							
							Make FileUploadParser work with standard django API  
						
						... 
						
						
						
						Output from parsers ends up in a Django MergeDict and they exists elements to be dicts - not None 
						
					 
					
						2015-01-10 18:15:21 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							baaa356489 
							
						 
					 
					
						
						
							
							Merge master  
						
						
						
					 
					
						2014-12-12 15:37:43 +00:00 
						 
				 
			
				
					
						
							
							
								Tymur Maryokhin 
							
						 
					 
					
						
						
						
						
							
						
						
							95af92ca01 
							
						 
					 
					
						
						
							
							Removed custom urlparse compat  
						
						
						
					 
					
						2014-12-04 15:47:42 +01:00 
						 
				 
			
				
					
						
							
							
								Tymur Maryokhin 
							
						 
					 
					
						
						
						
						
							
						
						
							d54c67d79d 
							
						 
					 
					
						
						
							
							Removed custom StringIO, force_text, smart_text compat  
						
						
						
					 
					
						2014-12-04 03:11:42 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							3d6620c72a 
							
						 
					 
					
						
						
							
							Merge  
						
						
						
					 
					
						2014-12-03 23:24:06 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							0359e9250d 
							
						 
					 
					
						
						
							
							FileUploadParser. Raising StopFutureHandlers removes any handlers not yet run for the active set.  Closes   #2109 .  
						
						
						
					 
					
						2014-12-02 13:52:46 +00:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							7f9dc73672 
							
						 
					 
					
						
						
							
							Remove XML support from core  
						
						
						
					 
					
						2014-11-29 14:57:51 -04:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							731c8421af 
							
						 
					 
					
						
						
							
							Remove YAML support from core  
						
						
						
					 
					
						2014-11-29 14:43:05 -04:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							381771731f 
							
						 
					 
					
						
						
							
							Use six.text_type instead of str everywhere  
						
						
						
					 
					
						2014-10-01 13:09:14 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							5e39e159ee 
							
						 
					 
					
						
						
							
							UNICODE_JSON and COMPACT_JSON settings  
						
						
						
					 
					
						2014-09-12 11:38:22 +01:00 
						 
				 
			
				
					
						
							
							
								Jason Bittel 
							
						 
					 
					
						
						
						
						
							
						
						
							3f7fad2e5a 
							
						 
					 
					
						
						
							
							Refactor disposition unpacking for clarity  
						
						
						
					 
					
						2014-09-05 16:27:55 -07:00 
						 
				 
			
				
					
						
							
							
								Jason Bittel 
							
						 
					 
					
						
						
						
						
							
						
						
							c8e475023c 
							
						 
					 
					
						
						
							
							Fix encoded filename parsing to allow for lang  
						
						
						
					 
					
						2014-09-05 15:22:43 -07:00 
						 
				 
			
				
					
						
							
							
								Jason Bittel 
							
						 
					 
					
						
						
						
						
							
						
						
							bcd8a24db1 
							
						 
					 
					
						
						
							
							Refactor encoded filename feature per  #1531  
						
						
						
					 
					
						2014-09-05 14:56:54 -07:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vlastovskiy 
							
						 
					 
					
						
						
						
						
							
						
						
							bcca9ed0fd 
							
						 
					 
					
						
						
							
							Removed use encoding available only in py3  
						
						
						
					 
					
						2014-09-05 14:52:01 -07:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vlastovskiy 
							
						 
					 
					
						
						
						
						
							
						
						
							8a9f34b838 
							
						 
					 
					
						
						
							
							Added get filename as encoded  
						
						... 
						
						
						
						This filename described in RFC 6266 
						
					 
					
						2014-09-05 14:50:16 -07:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							63d02dbea8 
							
						 
					 
					
						
						
							
							Drop six from compat. 1.4.2 is now the lowest supported version.  
						
						
						
					 
					
						2014-08-19 17:06:55 +01:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vlastovskiy 
							
						 
					 
					
						
						
						
						
							
						
						
							3fe0383572 
							
						 
					 
					
						
						
							
							Fixed convert bytes to str  
						
						... 
						
						
						
						Use compact function for convert 
						
					 
					
						2014-04-14 13:21:24 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vlastovskiy 
							
						 
					 
					
						
						
						
						
							
						
						
							d474934d36 
							
						 
					 
					
						
						
							
							Fixed return type  
						
						... 
						
						
						
						From bytes to str 
						
					 
					
						2014-04-14 13:01:24 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vlastovskiy 
							
						 
					 
					
						
						
						
						
							
						
						
							4b3eb6e0b0 
							
						 
					 
					
						
						
							
							Fixed parse file name  
						
						
						
					 
					
						2014-04-14 12:21:38 +04:00 
						 
				 
			
				
					
						
							
							
								Rob Hudson 
							
						 
					 
					
						
						
						
						
							
						
						
							e33435d0da 
							
						 
					 
					
						
						
							
							Fixed exception handling with YAML and XML parsers.  
						
						
						
					 
					
						2013-10-31 15:03:50 -07:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							2247fd68e9 
							
						 
					 
					
						
						
							
							Fix multipart error when used via content-type overloading  
						
						
						
					 
					
						2013-08-29 21:24:29 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							18007d6846 
							
						 
					 
					
						
						
							
							Simplifying raw data renderering support  
						
						
						
					 
					
						2013-08-28 21:52:56 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							8d590ebfde 
							
						 
					 
					
						
						
							
							First hacky pass at displaying raw data  
						
						
						
					 
					
						2013-08-27 11:22:19 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							5fa100245c 
							
						 
					 
					
						
						
							
							Update parser docstrings.   Closes   #968 .  
						
						
						
					 
					
						2013-07-04 12:47:35 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							429e078eee 
							
						 
					 
					
						
						
							
							Allow None filename on uploaded files  
						
						
						
					 
					
						2013-05-08 20:07:51 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							3353889ae8 
							
						 
					 
					
						
						
							
							Docs for FileUploadParser  
						
						
						
					 
					
						2013-05-07 13:27:27 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Elovskikh 
							
						 
					 
					
						
						
						
						
							
						
						
							a514232815 
							
						 
					 
					
						
						
							
							Raise ParseError if can't handle the uploaded file  
						
						
						
					 
					
						2013-05-04 17:18:41 +06:00 
						 
				 
			
				
					
						
							
							
								Michael Elovskikh 
							
						 
					 
					
						
						
						
						
							
						
						
							e36e4f48ad 
							
						 
					 
					
						
						
							
							Codebase improvements on FileUploadParser  
						
						... 
						
						
						
						* Added docstrings.
* Added `FileUploadParser.get_filename` to make it easier to override.
* Added url kwargs filename detection step.
* Updated tests corresponding to these changes. 
						
					 
					
						2013-05-04 14:58:21 +06:00 
						 
				 
			
				
					
						
							
							
								Michael Elovskikh 
							
						 
					 
					
						
						
						
						
							
						
						
							0c85768435 
							
						 
					 
					
						
						
							
							Added FileUploadParser refs  #7  
						
						
						
					 
					
						2013-05-03 01:37:25 +06:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							569c3a28e6 
							
						 
					 
					
						
						
							
							Add forbid_dtd flag, since we don't need any DTDs.  
						
						
						
					 
					
						2013-02-22 19:41:09 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							dcee027fa9 
							
						 
					 
					
						
						
							
							defusedxml for security fix.  
						
						... 
						
						
						
						As per:
http://blog.python.org/2013/02/announcing-defusedxml-fixes-for-xml.html  
						
					 
					
						2013-02-22 13:17:22 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							7dc4bce4e2 
							
						 
					 
					
						
						
							
							Fix 2.6 compat  
						
						
						
					 
					
						2013-02-04 21:35:47 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							0a38bc9db8 
							
						 
					 
					
						
						
							
							Deal with parser encodings properly  
						
						
						
					 
					
						2013-02-04 21:16:34 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b052c92ac3 
							
						 
					 
					
						
						
							
							Cleanup imports  
						
						... 
						
						
						
						Mostly adding `from __future__ import unicode_literals` everywhere. 
						
					 
					
						2013-02-04 20:55:35 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							97f2b99495 
							
						 
					 
					
						
						
							
							Don't use deprecated xml style  
						
						
						
					 
					
						2013-02-04 19:51:50 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d9c7b1c585 
							
						 
					 
					
						
						
							
							Merge branch 'p3k' of  https://github.com/linovia/django-rest-framework  into working  
						
						... 
						
						
						
						Conflicts:
	rest_framework/authentication.py
	rest_framework/relations.py
	rest_framework/serializers.py
	rest_framework/settings.py
	rest_framework/tests/authentication.py
	rest_framework/tests/genericrelations.py
	rest_framework/tests/generics.py
	rest_framework/tests/relations_hyperlink.py
	rest_framework/tests/relations_nested.py
	rest_framework/tests/relations_pk.py
	rest_framework/tests/serializer.py 
						
					 
					
						2013-02-01 11:58:55 +00:00 
						 
				 
			
				
					
						
							
							
								Juan Riaza 
							
						 
					 
					
						
						
						
						
							
						
						
							a061e3d9e2 
							
						 
					 
					
						
						
							
							deprecate simplejson  
						
						
						
					 
					
						2013-01-05 13:40:02 +01:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							60250f22c8 
							
						 
					 
					
						
						
							
							Move the various compat things to the compat module.  
						
						
						
					 
					
						2013-01-03 11:41:07 +01:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							e348ee9255 
							
						 
					 
					
						
						
							
							52 tests passing. Refactored a few string / byte io.  
						
						
						
					 
					
						2012-11-23 01:12:33 +01:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							b3698acb6c 
							
						 
					 
					
						
						
							
							First passing test under p3k \o/  
						
						
						
					 
					
						2012-11-22 00:20:49 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							fb56f215ae 
							
						 
					 
					
						
						
							
							Added media_type to .parse() - Consistency with renderer API.  
						
						
						
					 
					
						2012-10-17 22:39:07 +01:00