diff --git a/.gitignore b/.gitignore index 9f24571..6934b57 100644 --- a/.gitignore +++ b/.gitignore @@ -68,7 +68,7 @@ target/ .pydevproject *.png *.swp - +.idea/ # there might be ipython notebooks .ipynb_checkpoints diff --git a/postpic/datareader/datareader.py b/postpic/datareader/datareader.py index 5dfb119..68c8b6c 100644 --- a/postpic/datareader/datareader.py +++ b/postpic/datareader/datareader.py @@ -220,7 +220,7 @@ def simgridpoints(self, axis): for key in self._simgridkeys(): try: return self.gridpoints(key, axis) - except(KeyError): + except KeyError: pass raise KeyError @@ -234,7 +234,7 @@ def simextent(self, axis): offset = self.gridoffset(key, axis) n = self.gridpoints(key, axis) return np.array([offset, offset + self.gridspacing(key, axis) * n]) - except(KeyError): + except KeyError: pass raise KeyError('Unable to resolve "simexent" for axis "{:}"'.format(axis)) diff --git a/postpic/datareader/epochsdf.py b/postpic/datareader/epochsdf.py index 6d492fc..472b9aa 100644 --- a/postpic/datareader/epochsdf.py +++ b/postpic/datareader/epochsdf.py @@ -74,7 +74,7 @@ def __init__(self, sdffile, **kwargs): import sdf try: sdfversion = sdf.__version__ - except(AttributeError): + except AttributeError: sdfversion = '0.0.0' if sdfversion < '2.2.0': raise ImportError('Upgrade sdf package to 2.2.0 or higher.') @@ -210,7 +210,7 @@ def getSpecies(self, species, attrib): 12: lambda s: self['Particles/Charge/' + s].data} try: ret = options[attribid](species) - except(IndexError): + except IndexError: raise KeyError('Attribute "{}" of species "{}" not found.'.format(attrib, species)) return ret diff --git a/postpic/datareader/openPMDh5.py b/postpic/datareader/openPMDh5.py index 655b893..d04c2b1 100644 --- a/postpic/datareader/openPMDh5.py +++ b/postpic/datareader/openPMDh5.py @@ -124,7 +124,7 @@ def simdimensions(self): try: gs = self.gridspacing(k, None) return len(gs) - except(KeyError): + except KeyError: pass raise KeyError('number of simdimensions could not be retrieved for {}'.format(self)) @@ -170,7 +170,7 @@ def getSpecies(self, species, attrib): if offsetkey is not None: data += self.data(offsetkey.format(species)) ret = np.asarray(data, dtype=np.float64) - except(IndexError): + except IndexError: raise KeyError return ret diff --git a/postpic/datareader/vsimhdf5.py b/postpic/datareader/vsimhdf5.py index 6eabed3..f9b7a8a 100644 --- a/postpic/datareader/vsimhdf5.py +++ b/postpic/datareader/vsimhdf5.py @@ -88,7 +88,7 @@ def dataE(self, axis, **kwargs): axis = helper.axesidentify[axis] try: return np.float64(self["ElecMultiField"][..., axis]) - except(KeyError): + except KeyError: return None def dataB(self, axis, **kwargs): @@ -96,7 +96,7 @@ def dataB(self, axis, **kwargs): axis = helper.axesidentify[axis] try: return np.float64(self["MagMultiField"][..., axis]) - except(KeyError): + except KeyError: return None def grid(self, axis): diff --git a/postpic/particles/_routines.py b/postpic/particles/_routines.py index 7ce8b5d..2b77f53 100644 --- a/postpic/particles/_routines.py +++ b/postpic/particles/_routines.py @@ -88,7 +88,7 @@ def histogramdd(data, **kwargs): if shape[0] > 3 and len(shape) == 2: # (N, D) array # data[:,i] will create a view consuming only microseconds data = [data[:, i] for i in range(shape[1])] - except(AttributeError): + except AttributeError: pass # upcast 1D if length 1 dimensions are omitted @@ -122,7 +122,7 @@ def histogramdd(data, **kwargs): if not np.isscalar(ranges[ax][i]): # if value can be accessed it must be a scalar value raise ValueError('range="{}" not properly formatted.'.format(kwrange)) - except(TypeError): + except TypeError: ranges[ax][i] = f(d) kwrange = ranges diff --git a/postpic/particles/particles.py b/postpic/particles/particles.py index f256535..c408cbc 100644 --- a/postpic/particles/particles.py +++ b/postpic/particles/particles.py @@ -79,7 +79,7 @@ def __init__(self, dumpreader, species): if species not in dumpreader.listSpecies(): # A better way would be to test if len(self) == 0, # but that may require heavy IO - raise(KeyError('species "{:}" does not exist in {:}'.format(species, dumpreader))) + raise KeyError('species "{:}" does not exist in {:}'.format(species, dumpreader)) self.species = species self._dumpreader = dumpreader self.compresslog = [] @@ -136,7 +136,7 @@ def _readatomic(self, key): elif key in ['mass', 'charge']: try: ret = self._dumpreader.getSpecies(self.species, key) - except(KeyError): + except KeyError: # in the special case of mass or charge try to deduce mass or charge # from the species name. self._idfy = identifyspecies(self.species) @@ -277,7 +277,7 @@ def __len__(self): # = number of particles # len(3) will yield a TypeError, len([3]) returns 1 ret = len(self._readatomic(key)) break - except(TypeError, KeyError): + except (TypeError, KeyError): pass return ret @@ -321,7 +321,7 @@ def _eval_single_sp(self, sp, _vars=None): for source in [np, scipy.constants]: try: _vars[name] = getattr(source, name) - except(AttributeError): + except AttributeError: pass if name not in _vars: raise KeyError('"{}" not found!'.format(name)) @@ -391,7 +391,7 @@ def dumpreader(self): dr0 = self._ssas[0].dumpreader if all([dr0 == ssa.dumpreader for ssa in self._ssas]): return dr0 - except(IndexError, KeyError): + except (IndexError, KeyError): return None def simextent(self, axis): @@ -411,7 +411,7 @@ def simgridpoints(self, axis): ''' try: ret = self._ssas[0].dumpreader.simgridpoints(axis) - except(AttributeError, KeyError): + except (AttributeError, KeyError): return None @property @@ -509,7 +509,7 @@ def add(self, dumpreader, species, ignore_missing_species=False): if ignore_missing_species: try: self._ssas.append(_SingleSpecies(dumpreader, species)) - except(KeyError): + except KeyError: pass else: self._ssas.append(_SingleSpecies(dumpreader, species)) @@ -649,7 +649,7 @@ def __call__(self, expr): return self.__call_sp(expr) try: bs = basestring # python2 - except(NameError): + except NameError: bs = str # python3 if isinstance(expr, bs): # create temporary ScalarProperty object