summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphaƫl Hertzog <hertzog@debian.org>2016-07-21 18:59:55 +0200
committerTim Graham <timograham@gmail.com>2016-07-21 13:01:10 -0400
commit2d1aeccacc7402d3af5e8d5b49f8782b0698c81f (patch)
tree3460b527a27c1a0fa54e713c0ad68e265b74e3bc
parent5cc619078860c13ae910b26cd2ab5c11508c023f (diff)
[1.10.x] Fixed #26923 -- Fixed template_tests with numpy < 1.9.0.
Backport of 8e5cbc884f77c85b0edbc6206810643abaf589c9 from master
-rw-r--r--tests/template_tests/syntax_tests/test_numpy.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/template_tests/syntax_tests/test_numpy.py b/tests/template_tests/syntax_tests/test_numpy.py
index 16b4d74334..7a6caf6528 100644
--- a/tests/template_tests/syntax_tests/test_numpy.py
+++ b/tests/template_tests/syntax_tests/test_numpy.py
@@ -10,6 +10,8 @@ try:
VisibleDeprecationWarning = numpy.VisibleDeprecationWarning
except ImportError:
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.")
@@ -20,7 +22,7 @@ class NumpyTests(SimpleTestCase):
"ignore",
"Using a non-integer number instead of an "
"integer will result in an error in the future",
- numpy.VisibleDeprecationWarning
+ VisibleDeprecationWarning
)
@setup({'numpy-array-index01': '{{ var.1 }}'})