test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed gis test failures when numpy isn't installed. 

Thanks to Bas Peschier for pointing this out. Refs #23804.
This commit is contained in:
Daniel Wiesmann 2015-03-20 17:12:44 +00:00 committed by Tim Graham
parent 4a5d967dfe
commit 0d9b018e07
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/gis/gdal/raster/band.py
View File

@ -121,7 +121,7 @@ class GDALBand(GDALBase):
access_flag = 1 access_flag = 1
# Instantiate ctypes array holding the input data # 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) data_array = ctypes_array.from_buffer_copy(data)
else: else:
data_array = ctypes_array(*data) data_array = ctypes_array(*data)

6
tests/gis_tests/gdal_tests/test_raster.py
View File

@ -204,10 +204,10 @@ class GDALBandTests(unittest.TestCase):
if numpy: if numpy:
numpy.testing.assert_equal(bandmem.data(), numpy.arange(100).reshape(10, 10)) numpy.testing.assert_equal(bandmem.data(), numpy.arange(100).reshape(10, 10))
else: else:
self.assertEqual(bandmem.data(), range(100)) self.assertEqual(bandmem.data(), list(range(100)))
# Prepare data for setting values in subsequent tests # 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) packed_block = struct.pack('<' + 'B B B B', *block)
# Set data from list # Set data from list
@ -267,4 +267,4 @@ class GDALBandTests(unittest.TestCase):
numpy.array(range(25)).reshape(5, 5) numpy.array(range(25)).reshape(5, 5)
) )
else: else:
self.assertEqual(bandmemjson.data(), range(25)) self.assertEqual(bandmemjson.data(), list(range(25)))