pylint: fix no-else-return cases

Fix all cases of R1705 no-else-return.

Part of #270

Author: DifferentialOrange

tarantool/connection.py

@@ -1207,26 +1207,26 @@ def check():  # Check that connection is alive
                 if exc.errno == errno.EBADF:
                     return errno.ECONNRESET
                 return exc.errno
+
+            if os.name == 'nt':
+                flag = socket.MSG_PEEK
+                self._socket.setblocking(False)
             else:
-                if os.name == 'nt':
-                    flag = socket.MSG_PEEK
-                    self._socket.setblocking(False)
-                else:
-                    flag = socket.MSG_DONTWAIT | socket.MSG_PEEK
-                retbytes = self._sys_recv(sock_fd, buf, 1, flag)
-
-                err = 0
-                if os.name!= 'nt':
-                    err = ctypes.get_errno()
-                else:
-                    err = ctypes.get_last_error()
-                    self._socket.setblocking(True)
-
-                if (retbytes < 0) and err in (errno.EAGAIN, errno.EWOULDBLOCK, WWSAEWOULDBLOCK):
-                    ctypes.set_errno(0)
-                    return errno.EAGAIN
-                else:
-                    return errno.ECONNRESET
+                flag = socket.MSG_DONTWAIT | socket.MSG_PEEK
+            retbytes = self._sys_recv(sock_fd, buf, 1, flag)
+
+            err = 0
+            if os.name!= 'nt':
+                err = ctypes.get_errno()
+            else:
+                err = ctypes.get_last_error()
+                self._socket.setblocking(True)
+
+            if (retbytes < 0) and err in (errno.EAGAIN, errno.EWOULDBLOCK, WWSAEWOULDBLOCK):
+                ctypes.set_errno(0)
+                return errno.EAGAIN
+
+            return errno.ECONNRESET
 
         last_errno = check()
         if self.connected and last_errno == errno.EAGAIN:
@@ -1561,7 +1561,7 @@ def _join_v17(self, server_uuid):
             yield resp
             if resp.code >= REQUEST_TYPE_ERROR:
                 return
-            elif resp.code == REQUEST_TYPE_OK:
+            if resp.code == REQUEST_TYPE_OK:
                 if state == JoinState.HANDSHAKE:
                     state = JoinState.INITIAL
                 elif state == JoinState.INITIAL:

tarantool/connection_pool.py

@@ -308,15 +308,15 @@ def getnext(self, mode):
 
         if mode == Mode.ANY:
             return self._getnext_by_mode(self.any_iter)
-        elif mode == Mode.RW:
+        if mode == Mode.RW:
             return self._getnext_by_mode(self.rw_iter,
                                          err_msg="Can't find healthy rw instance in pool")
-        elif mode == Mode.RO:
+        if mode == Mode.RO:
             return self._getnext_by_mode(self.ro_iter,
                                          err_msg="Can't find healthy ro instance in pool")
-        elif mode == Mode.PREFER_RO:
+        if mode == Mode.PREFER_RO:
             return self._getnext_by_mode(self.ro_iter, self.rw_iter)
-        elif mode == Mode.PREFER_RW:
+        if mode == Mode.PREFER_RW:
             return self._getnext_by_mode(self.rw_iter, self.ro_iter)
 
         raise ValueError(f"Unexpected mode {mode}")

tarantool/error.py

@@ -186,8 +186,8 @@ def os_strerror_patched(code):
         message = os_strerror_orig(code)
         if not message.startswith("Unknown"):
             return message
-        else:
-            return _code2str.get(code, f"Unknown error {code}")
+
+        return _code2str.get(code, f"Unknown error {code}")
 
     os.strerror = os_strerror_patched
     del os_strerror_patched

tarantool/mesh_connection.py

@@ -159,7 +159,8 @@ def format_error(address, err):
 
         # Looks okay.
         return result, None
-    elif isinstance(result['port'], str):
+
+    if isinstance(result['port'], str):
         # Looks like a unix address.
 
         # Expect no host.

tarantool/msgpack_ext/datetime.py

@@ -169,9 +169,9 @@ def decode(data, _):
         tz = tt_timezones.indexToTimezone[tzindex]
         return Datetime(timestamp=seconds, nsec=nsec, tz=tz,
                         timestamp_since_utc_epoch=True)
-    elif tzoffset != 0:
+    if tzoffset != 0:
         return Datetime(timestamp=seconds, nsec=nsec, tzoffset=tzoffset,
                         timestamp_since_utc_epoch=True)
-    else:
-        return Datetime(timestamp=seconds, nsec=nsec,
-                        timestamp_since_utc_epoch=True)
+
+    return Datetime(timestamp=seconds, nsec=nsec,
+                    timestamp_since_utc_epoch=True)

tarantool/msgpack_ext/types/datetime.py

@@ -480,10 +480,10 @@ def __sub__(self, other):
                 sec = self_dt.second - other_dt.second,
                 nsec = self_nsec - other_nsec,
             )
-        elif isinstance(other, Interval):
+        if isinstance(other, Interval):
             return self._interval_operation(other, sign=-1)
-        else:
-            raise TypeError(f"unsupported operand type(s) for -: '{type(self)}' and '{type(other)}'")
+
+        raise TypeError(f"unsupported operand type(s) for -: '{type(self)}' and '{type(other)}'")
 
     def __eq__(self, other):
         """
@@ -498,10 +498,9 @@ def __eq__(self, other):
 
         if isinstance(other, Datetime):
             return self._datetime == other._datetime
-        elif isinstance(other, pandas.Timestamp):
+        if isinstance(other, pandas.Timestamp):
             return self._datetime == other
-        else:
-            return False
+        return False
 
     def __str__(self):
         return self._datetime.__str__()

tarantool/utils.py

@@ -45,7 +45,7 @@ def wrap_key(*args, first=True, select=False):
     if len(args) == 1:
         if isinstance(args[0], (list, tuple)) and first:
             return wrap_key(*args[0], first=False, select=select)
-        elif args[0] is None and select:
+        if args[0] is None and select:
             return []
 
     return list(args)

test/suites/lib/tarantool_server.py

@@ -310,10 +310,10 @@ def wait_until_started(self):
                     if ans in ('running', 'hot_standby', 'orphan') or ans.startswith('replica'):
                         temp.disconnect()
                         return True
-                    elif ans in ('loading',):
+                    if ans in ('loading',):
                         continue
-                    else:
-                        raise ValueError(f"Strange output for `box.info.status`: {ans}")
+
+                    raise ValueError(f"Strange output for `box.info.status`: {ans}")
             except socket.error as exc:
                 if exc.errno == errno.ECONNREFUSED:
                     time.sleep(0.1)