From 90ab016077d5692cac878b65f22ee1ff2fb03cbf Mon Sep 17 00:00:00 2001 From: Ronnie Taib Date: Thu, 30 Mar 2017 21:58:25 +1100 Subject: [PATCH] More python 2.7 pylint fixes... --- datacube/drivers/s3/driver.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/datacube/drivers/s3/driver.py b/datacube/drivers/s3/driver.py index efaa0dd427..ecb90ec087 100644 --- 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,11 +34,11 @@ 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: @@ -47,7 +46,7 @@ def _get_chunksizes(self, variable_param): 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