innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[1.8.x] Fixed #26923 -- Fixed template_tests with numpy < 1.9.0. 

Backport of 8e5cbc884f from master
This commit is contained in:
Raphaël Hertzog 2016-07-21 18:59:55 +02:00 committed by Tim Graham
parent 9f8ef7724d
commit 6cf35c666c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/template_tests/syntax_tests/test_numpy.py
View File

@ -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 }}'})