Skip to content

Commit

Permalink
fix flake8 rule E275
Browse files Browse the repository at this point in the history
  • Loading branch information
skuschel committed Oct 27, 2022
1 parent 0bbd078 commit 80e7cd4
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions postpic/datareader/datareader.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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))

Expand Down
4 changes: 2 additions & 2 deletions postpic/datareader/epochsdf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.')
Expand Down Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions postpic/datareader/openPMDh5.py
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions postpic/datareader/vsimhdf5.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,15 @@ 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):
# x, y, z, px, py, pz same as in sdf. wweigt and ID not included.
axis = helper.axesidentify[axis]
try:
return np.float64(self["MagMultiField"][..., axis])
except(KeyError):
except KeyError:
return None

def grid(self, axis):
Expand Down
4 changes: 2 additions & 2 deletions postpic/particles/_routines.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
16 changes: 8 additions & 8 deletions postpic/particles/particles.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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):
Expand All @@ -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
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 80e7cd4

Please sign in to comment.