More python 2.7 pylint fixes...

opendatacube · Mar 30, 2017 · 90ab016 · 90ab016
1 parent 2b53d8d
commit 90ab016
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/datacube/drivers/s3/driver.py b/datacube/drivers/s3/driver.py
@@ -7,7 +7,6 @@
 from datacube.drivers.driver import Driver
 from datacube.drivers.s3.storage.s3aio.s3lio import S3LIO
 from pathlib import Path
-from collections import abc
 
 class S3Driver(Driver):
     '''S3 storage driver. A placeholder for now.
@@ -35,19 +34,19 @@ def _get_chunksizes(self, variable_param):
         :return tuple chunksizes: the validated chunksizes as a
         3-floats tuple.
         '''
-        if not 'chunksizes' in variable_param:
+        if 'chunksizes'not in variable_param:
             raise DatacubeException('Dataset does not contain chunking values, ' \
                                     +'cannot write to storage.')
         chunksizes = variable_param['chunksizes']
-        if not isinstance(chunksizes, abc.Iterable):
+        if not isinstance(chunksizes, (list, tuple, set)):
             raise DatacubeException('Dataset contains invalid chunking values, ' \
                                     +'cannot write to storage.')
         try:
             chunksizes = tuple(map(float, chunksizes))
         except ValueError:
             raise DatacubeException('Dataset contains invalid chunking values, ' \
                                     +'cannot write to storage.')
-        if not len(chunksizes) == 3:
+        if len(chunksizes) != 3:
             raise DatacubeException('Dataset contains invalid chunking values, ' \
                                     +'cannot write to storage.')
         return chunksizes