mirror of
				https://github.com/django/django.git
				synced 2025-10-29 16:46:11 +00:00 
			
		
		
		
	[1.10.x] Fixed #26923 -- Fixed template_tests with numpy < 1.9.0.
Backport of 8e5cbc884f from master
			
			
This commit is contained in:
		
				
					committed by
					
						 Tim Graham
						Tim Graham
					
				
			
			
				
	
			
			
			
						parent
						
							5cc6190788
						
					
				
				
					commit
					2d1aeccacc
				
			| @@ -10,6 +10,8 @@ try: | |||||||
|     VisibleDeprecationWarning = numpy.VisibleDeprecationWarning |     VisibleDeprecationWarning = numpy.VisibleDeprecationWarning | ||||||
| except ImportError: | except ImportError: | ||||||
|     numpy = False |     numpy = False | ||||||
|  | except AttributeError:  # numpy < 1.9.0, e.g. 1.8.2 in Debian 8 | ||||||
|  |     VisibleDeprecationWarning = DeprecationWarning | ||||||
|  |  | ||||||
|  |  | ||||||
| @skipIf(numpy is False, "Numpy must be installed to run these tests.") | @skipIf(numpy is False, "Numpy must be installed to run these tests.") | ||||||
| @@ -20,7 +22,7 @@ class NumpyTests(SimpleTestCase): | |||||||
|             "ignore", |             "ignore", | ||||||
|             "Using a non-integer number instead of an " |             "Using a non-integer number instead of an " | ||||||
|             "integer will result in an error in the future", |             "integer will result in an error in the future", | ||||||
|             numpy.VisibleDeprecationWarning |             VisibleDeprecationWarning | ||||||
|         ) |         ) | ||||||
|  |  | ||||||
|     @setup({'numpy-array-index01': '{{ var.1 }}'}) |     @setup({'numpy-array-index01': '{{ var.1 }}'}) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user