Fixing some minor codacy issues

Author: mikaem

.pylintrc

@@ -7,6 +7,7 @@ disable = locally-disabled,
     redefined-builtin,
     unused-argument,
     too-many-arguments,
+    too-many-return-statements,
     line-too-long,
     no-member,
     not-callable,

mpi4py_fft/distarray.py

@@ -323,7 +323,7 @@ def redistribute(self, axis=None, out=None):
         # axis of pencil (both axes are undivided) and return
         if axis is not None:
             if self.commsizes[self.rank+axis] == 1:
-                self._p0.axis = axis
+                self.pencil.axis = axis
                 return self
 
         if out is not None:
@@ -337,9 +337,9 @@ def redistribute(self, axis=None, out=None):
 
             # Check that arrays are compatible
             for i in range(len(self._p0.shape)):
-                if i != self._p0.axis and i != out._p0.axis:
-                    assert self._p0.subcomm[i] == out._p0.subcomm[i]
-                    assert self._p0.subshape[i] == out._p0.subshape[i]
+                if i not in (self.alignment, out.alignment):
+                    assert self.pencil.subcomm[i] == out.pencil.subcomm[i]
+                    assert self.pencil.subshape[i] == out.pencil.subshape[i]
 
         p1, transfer = self.get_pencil_and_transfer(axis)
         if out is None:

mpi4py_fft/fftw/factory.py

@@ -38,6 +38,8 @@ def get_fftw_lib(dtype):
             return fftwf_xfftn
         except ImportError: #pragma: no cover
             return None
+    else: #pragma: no cover
+        return None
 
 fftlib = {}
 for t in 'fdg':

mpi4py_fft/fftw/fftw_planxfftn.c

@@ -18,7 +18,7 @@ fftw_plan fftw_planxfftn(int      ndims,
                          unsigned flags)
 {
   fftw_iodim ranks[ndims], dims[ndims];
-  int i, j, axis;
+  int i, j;
   int strides_in[ndims], strides_out[ndims], markers[ndims];
   int *sizes = (kind[0] != C2R) ? sizes_in : sizes_out;
 
@@ -32,7 +32,7 @@ fftw_plan fftw_planxfftn(int      ndims,
   for (i = 0; i < ndims; i++)
     markers[i] = 0;
   for (i = 0; i < naxes; i++) {
-    axis = axes[i];
+    int axis = axes[i];
     ranks[i].n = sizes[axis];
     ranks[i].is = strides_in[axis];
     ranks[i].os = strides_out[axis];
@@ -75,4 +75,3 @@ fftw_plan fftw_planxfftn(int      ndims,
                               flags);
   }
 }
-

mpi4py_fft/io/h5py_file.py

@@ -39,11 +39,11 @@ def _check_domain(self, group, field):
         assert len(self.domain) == field.dimensions
         self.f.require_group(group)
         if not "shape" in self.f[group].attrs:
-            self.f[group].attrs.create("shape", field._p0.shape)
+            self.f[group].attrs.create("shape", field.pencil.shape)
         if not "rank" in self.f[group].attrs:
             self.f[group].attrs.create("rank", field.rank)
         assert field.rank == self.f[group].attrs["rank"]
-        assert np.all(field._p0.shape == self.f[group].attrs["shape"])
+        assert np.all(field.pencil.shape == self.f[group].attrs["shape"])
         if isinstance(self.domain[0], np.ndarray):
             self.f[group].require_group("mesh")
         else:

mpi4py_fft/libfft.py

@@ -387,9 +387,9 @@ def __init__(self, shape, axes=None, dtype=float, padding=False,
         self.fwd, self.bck = plan(self.shape, self.axes, self.dtype, transforms, kw)
         U, V = self.fwd.input_array, self.fwd.output_array
         self.M = 1
-        if not backend == 'fftw':
+        if backend != 'fftw':
             self.M = 1./np.prod(np.take(self.shape, self.axes))
-        elif backend == 'fftw':
+        else:
             self.M = self.fwd.get_normalization()
         if backend == 'scipy':
             self.real_transform = False # No rfftn/irfftn methods

mpi4py_fft/mpifft.py

@@ -208,7 +208,7 @@ def __init__(self, comm, shape=None, axes=None, dtype=float, grid=None,
 
         if shape is None:
             assert darray is not None
-            shape = darray._p0.shape
+            shape = darray.pencil.shape
 
         if axes is not None:
             axes = list(axes) if np.ndim(axes) else [axes]

setup.py

@@ -215,4 +215,4 @@ def version():
           install_requires=["mpi4py", "numpy"],
           setup_requires=["setuptools>=18.0", "cython>=0.25"],
           keywords=['Python', 'FFTW', 'FFT', 'DCT', 'DST', 'MPI']
-          )
+         )

tests/test_darray.py

@@ -57,7 +57,7 @@ def test_2Darray():
 
 def test_3Darray():
     N = (8, 8, 8)
-    for subcomm in ((0, 0, 1), (0, 1, 0),  (1, 0, 0), (0, 1, 1), (1, 0, 1), (1, 1, 0), None, Subcomm(comm, (0, 0, 1))):
+    for subcomm in ((0, 0, 1), (0, 1, 0), (1, 0, 0), (0, 1, 1), (1, 0, 1), (1, 1, 0), None, Subcomm(comm, (0, 0, 1))):
         for rank in (0, 1, 2):
             M = (3,)*rank + N
             alignment = None

tests/test_fftw.py

@@ -96,7 +96,7 @@ def test_fftw():
                             # r2r
                             input_array = fftw.aligned(shape, dtype=typecode)
                             output_array = fftw.aligned_like(input_array)
-                            oa = output_array if typecode=='d' else None
+                            oa = output_array if typecode =='d' else None
                             for type in (1, 2, 3, 4):
                                 dct = fftw.dctn(input_array, None, axes, type, threads, fflags, output_array=oa)
                                 B = dct(A).copy()

tests/test_io.py

@@ -133,7 +133,7 @@ def test_4D(backend, forward_output):
           np.arange(N[1], dtype=np.float)*2*np.pi/N[1],
           np.arange(N[2], dtype=np.float)*3*np.pi/N[2],
           np.arange(N[3], dtype=np.float)*4*np.pi/N[3]
-          )
+         )
     for i, domain in enumerate([None, d0, d1]):
         for rank in range(3):
             filename = "".join(('h5test4_{}{}{}'.format(ex[i == 0], ex[forward_output], rank),