| 
							
							
								 Tim Graham | dbad65ded7 | [1.6.x] Fixed bad backport in last commit; refs #21118 | 2013-09-18 09:52:29 -04:00 |  | 
			
				
					| 
							
							
								 Tim Graham | 14e139ecdf | [1.6.x] Fixed #21118 -- Isolated a test that uses the database. Thanks rmboggs for the report.
Backport of 4f40b97d97from master | 2013-09-18 09:43:10 -04:00 |  | 
			
				
					| 
							
							
								 Aymeric Augustin | 115318051c | [1.6.x] Replaced "not PY3" by "PY2", new in six 1.4.0. Conflicts:
	django/db/backends/oracle/base.py
	django/db/backends/sqlite3/base.py
	django/db/models/base.py
Backport of 365c3e8bfrom master. | 2013-09-03 07:34:45 -05:00 |  | 
			
				
					| 
							
							
								 Marc Tamlyn | 09f8652765 | Use assertIsInstance in tests. Gives much nicer errors when it fails. | 2013-05-21 10:42:15 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Lindsley | e24d486fbc | Fixed #20212 - __reduce__ should only be defined for Py3+. | 2013-05-21 00:49:21 -07:00 |  | 
			
				
					| 
							
							
								 Alex Gaynor | 714161c864 | Fix != operations on lazy objects. | 2013-04-19 10:58:29 -07:00 |  | 
			
				
					| 
							
							
								 Preston Timmons | 612ef3e5c9 | Modified utils_tests for unittest2 discovery. | 2013-04-12 15:31:58 -06:00 |  |