summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Wiesmann <daniel.wiesmann@gmail.com>2015-03-20 17:12:44 +0000
committerTim Graham <timograham@gmail.com>2015-03-20 13:42:55 -0400
commit0d9b018e07c384314e142372153eb670c2e129f3 (patch)
tree757b560af7b0f7e8020d74b1f154008dd0543167
parent4a5d967dfeb930ae47bbd0d507c462ac132c284f (diff)
Fixed gis test failures when numpy isn't installed.
Thanks to Bas Peschier for pointing this out. Refs #23804.
-rw-r--r--django/contrib/gis/gdal/raster/band.py2
-rw-r--r--tests/gis_tests/gdal_tests/test_raster.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/django/contrib/gis/gdal/raster/band.py b/django/contrib/gis/gdal/raster/band.py
index 3f6c0a4140..b5aa5aa4df 100644
--- a/django/contrib/gis/gdal/raster/band.py
+++ b/django/contrib/gis/gdal/raster/band.py
@@ -121,7 +121,7 @@ class GDALBand(GDALBase):
access_flag = 1
# Instantiate ctypes array holding the input data
- if isinstance(data, (bytes, six.memoryview, numpy.ndarray)):
+ if isinstance(data, (bytes, six.memoryview)) or (numpy and isinstance(data, numpy.ndarray)):
data_array = ctypes_array.from_buffer_copy(data)
else:
data_array = ctypes_array(*data)
diff --git a/tests/gis_tests/gdal_tests/test_raster.py b/tests/gis_tests/gdal_tests/test_raster.py
index 301d1f7c99..1f4847959b 100644
--- a/tests/gis_tests/gdal_tests/test_raster.py
+++ b/tests/gis_tests/gdal_tests/test_raster.py
@@ -204,10 +204,10 @@ class GDALBandTests(unittest.TestCase):
if numpy:
numpy.testing.assert_equal(bandmem.data(), numpy.arange(100).reshape(10, 10))
else:
- self.assertEqual(bandmem.data(), range(100))
+ self.assertEqual(bandmem.data(), list(range(100)))
# Prepare data for setting values in subsequent tests
- block = range(100, 104)
+ block = list(range(100, 104))
packed_block = struct.pack('<' + 'B B B B', *block)
# Set data from list
@@ -267,4 +267,4 @@ class GDALBandTests(unittest.TestCase):
numpy.array(range(25)).reshape(5, 5)
)
else:
- self.assertEqual(bandmemjson.data(), range(25))
+ self.assertEqual(bandmemjson.data(), list(range(25)))