flake8: fix style

This patch includes fixes for all remaining cases of
- E101 indentation contains mixed spaces and tabs,
- E121 continuation line under-indented for hanging
indent,
- E122 continuation line missing indentation or
outdented,
- E123 closing bracket does not match indentation of
opening bracket's line,
- E124 closing bracket does not match visual
indentation,
- E126 continuation line over-indented for hanging
indent,
- E127 continuation line over-indented for visual indent,
- E128 continuation line under-indented for visual indent,
- E131 continuation line unaligned for hanging indent,
- E201 whitespace after '(',
- E202 whitespace before '(',
- E203 Whitespace before ':',
- E221 multiple spaces before operator,
- E225 missing whitespace around operator,
- E226 missing whitespace around arithmetic operator,
- E227 missing whitespace around bitwise or shift,
operator,
- E231 missing whitespace after ',', ';', or ':',
- E241 multiple spaces after ',',
- E251 unexpected spaces around keyword / parameter
equals,
- E252 missing whitespace around parameter equals,
- E261 at least two spaces before inline comment,
- E275 missing whitespace after keyword,
- E301 expected 1 blank line,
- E302 expected 2 blank lines,
- E303 too many blank lines,
- E305 expected 2 blank lines after class or function definition,
- E306 expected 1 blank line before a nested definition,
- E502 the backslash is redundant between brackets,
- W191 indentation contains tabs,
- W293 blank line contains whitespace,
- W504 line break after binary operator.

Part of #270

Author: DifferentialOrange

setup.py

@@ -13,6 +13,7 @@
 cmdclass = {}
 command_options = {}
 
+
 class BuildPyCommand(build_py):
     """
     Build the package
@@ -38,6 +39,7 @@ def run(self):
 
         return super().run()
 
+
 cmdclass["build_py"] = BuildPyCommand
 
 # Build Sphinx documentation (html)
@@ -68,6 +70,7 @@ def read(*parts):
     with codecs.open(filename, encoding='utf-8') as file:
         return file.read()
 
+
 def get_dependencies(filename):
     """
     Get package dependencies from the `requirements.txt`.

tarantool/connection.py

@@ -161,6 +161,7 @@ class PoolUnit():
     :type: :obj:`bool`
     """
 
+
 # Based on https://realpython.com/python-interface/
 class StrategyInterface(metaclass=abc.ABCMeta):
     """
@@ -169,13 +170,13 @@ class StrategyInterface(metaclass=abc.ABCMeta):
 
     @classmethod
     def __subclasshook__(cls, subclass):
-        return (hasattr(subclass, '__init__') and
-                callable(subclass.__init__) and
-                hasattr(subclass, 'update') and
-                callable(subclass.update) and
-                hasattr(subclass, 'getnext') and
-                callable(subclass.getnext) or
-                NotImplemented)
+        return (hasattr(subclass, '__init__')
+                and callable(subclass.__init__)
+                and hasattr(subclass, 'update')
+                and callable(subclass.update)
+                and hasattr(subclass, 'getnext')
+                and callable(subclass.getnext)
+                or NotImplemented)
 
     @abc.abstractmethod
     def __init__(self, pool):
@@ -204,6 +205,7 @@ def getnext(self, mode):
 
         raise NotImplementedError
 
+
 class RoundRobinStrategy(StrategyInterface):
     """
     Simple round-robin pool servers rotation.
@@ -500,7 +502,7 @@ def __init__(self,
                     socket_timeout=socket_timeout,
                     reconnect_max_attempts=reconnect_max_attempts,
                     reconnect_delay=reconnect_delay,
-                    connect_now=False, # Connect in ConnectionPool.connect()
+                    connect_now=False,  # Connect in ConnectionPool.connect()
                     encoding=encoding,
                     call_16=call_16,
                     connection_timeout=connection_timeout,
@@ -650,7 +652,7 @@ def _request_process_loop(self, key, unit, last_refresh):
                 method = getattr(Connection, task.method_name)
                 try:
                     resp = method(unit.conn, *task.args, **task.kwargs)
-                except Exception as exc: # pylint: disable=broad-exception-caught,broad-except
+                except Exception as exc:  # pylint: disable=broad-exception-caught,broad-except
                     unit.output_queue.put(exc)
                 else:
                     unit.output_queue.put(resp)
@@ -918,7 +920,7 @@ def upsert(self, space_name, tuple_value, op_list, *, index=0, mode=Mode.RW,
         """
 
         return self._send(mode, 'upsert', space_name, tuple_value,
-            op_list, index=index, on_push=on_push, on_push_ctx=on_push_ctx)
+                          op_list, index=index, on_push=on_push, on_push_ctx=on_push_ctx)
 
     def update(self, space_name, key, op_list, *, index=0, mode=Mode.RW,
                on_push=None, on_push_ctx=None):
@@ -955,7 +957,7 @@ def update(self, space_name, key, op_list, *, index=0, mode=Mode.RW,
         """
 
         return self._send(mode, 'update', space_name, key,
-            op_list, index=index, on_push=on_push, on_push_ctx=on_push_ctx)
+                          op_list, index=index, on_push=on_push, on_push_ctx=on_push_ctx)
 
     def ping(self, notime=False, *, mode=None):
         """

tarantool/connection_pool.py

@@ -34,14 +34,14 @@ def __init__(self, response):
             raise RuntimeError('Unable to decode response to object due to unknown type')
 
 
-class CrudResult(CrudResponse): # pylint: disable=too-few-public-methods
+class CrudResult(CrudResponse):  # pylint: disable=too-few-public-methods
     """
     Contains result's fields from result variable
     of crud module operation.
     """
 
 
-class CrudError(CrudResponse): # pylint: disable=too-few-public-methods
+class CrudError(CrudResponse):  # pylint: disable=too-few-public-methods
     """
     Contains error's fields from error variable
     of crud module operation.

tarantool/crud.py

@@ -17,7 +17,7 @@
     NotSupportedError,
 )
 
-Warning = Warning # pylint: disable=redefined-builtin,self-assigning-variable
+Warning = Warning  # pylint: disable=redefined-builtin,self-assigning-variable
 
 # pylint: disable=invalid-name
 paramstyle = 'named'

tarantool/dbapi.py

@@ -111,18 +111,21 @@ class ConfigurationError(Error):
     Error of initialization with a user-provided configuration.
     """
 
+
 class MsgpackError(Error):
     """
     Error with encoding or decoding of `MP_EXT`_ types.
 
     .. _MP_EXT: https://www.tarantool.io/en/doc/latest/dev_guide/internals/msgpack_extensions/
     """
 
+
 class MsgpackWarning(UserWarning):
     """
     Warning with encoding or decoding of `MP_EXT`_ types.
     """
 
+
 # Monkey patch os.strerror for win32
 if sys.platform == "win32":
     # Windows Sockets Error Codes (not all, but related on network errors)
@@ -267,6 +270,7 @@ class NetworkWarning(UserWarning):
     Warning related to network.
     """
 
+
 class SslError(DatabaseError):
     """
     Error related to SSL.
@@ -298,17 +302,20 @@ class ClusterDiscoveryWarning(UserWarning):
     Warning related to cluster discovery.
     """
 
+
 class ClusterConnectWarning(UserWarning):
     """
     Warning related to cluster pool connection.
     """
 
+
 class PoolTolopogyWarning(UserWarning):
     """
     Warning related to unsatisfying `box.info.ro`_ state of
     pool instances.
     """
 
+
 class PoolTolopogyError(DatabaseError):
     """
     Exception raised due to unsatisfying `box.info.ro`_ state of
@@ -317,6 +324,7 @@ class PoolTolopogyError(DatabaseError):
     .. _box.info.ro: https://www.tarantool.io/en/doc/latest/reference/reference_lua/box_info/
     """
 
+
 class CrudModuleError(DatabaseError):
     """
     Exception raised for errors that are related to

tarantool/error.py

@@ -155,7 +155,7 @@ def format_error(address, err):
                                 'port must be an int for an inet result')
         if result['port'] < 1 or result['port'] > 65535:
             return format_error(result, 'port must be in range [1, 65535] '
-                                         'for an inet result')
+                                        'for an inet result')
 
         # Looks okay.
         return result, None

tarantool/mesh_connection.py

@@ -53,10 +53,10 @@
 
 BYTEORDER = 'little'
 
-SECONDS_SIZE_BYTES  = 8
-NSEC_SIZE_BYTES     = 4
+SECONDS_SIZE_BYTES = 8
+NSEC_SIZE_BYTES = 4
 TZOFFSET_SIZE_BYTES = 2
-TZINDEX_SIZE_BYTES  = 2
+TZINDEX_SIZE_BYTES = 2
 
 
 def get_int_as_bytes(data, size):
@@ -77,6 +77,7 @@ def get_int_as_bytes(data, size):
 
     return data.to_bytes(size, byteorder=BYTEORDER, signed=True)
 
+
 def encode(obj, _):
     """
     Encode a datetime object.
@@ -133,6 +134,7 @@ def get_bytes_as_int(data, cursor, size):
     part = data[cursor:cursor + size]
     return int.from_bytes(part, BYTEORDER, signed=True), cursor + size
 
+
 def decode(data, _):
     """
     Decode a datetime object.
@@ -151,11 +153,11 @@ def decode(data, _):
     seconds, cursor = get_bytes_as_int(data, cursor, SECONDS_SIZE_BYTES)
 
     data_len = len(data)
-    if data_len == (SECONDS_SIZE_BYTES + NSEC_SIZE_BYTES + \
-                    TZOFFSET_SIZE_BYTES + TZINDEX_SIZE_BYTES):
-        nsec, cursor     = get_bytes_as_int(data, cursor, NSEC_SIZE_BYTES)
+    if data_len == (SECONDS_SIZE_BYTES + NSEC_SIZE_BYTES
+                    + TZOFFSET_SIZE_BYTES + TZINDEX_SIZE_BYTES):
+        nsec, cursor = get_bytes_as_int(data, cursor, NSEC_SIZE_BYTES)
         tzoffset, cursor = get_bytes_as_int(data, cursor, TZOFFSET_SIZE_BYTES)
-        tzindex, cursor  = get_bytes_as_int(data, cursor, TZINDEX_SIZE_BYTES)
+        tzindex, cursor = get_bytes_as_int(data, cursor, TZINDEX_SIZE_BYTES)
     elif data_len == SECONDS_SIZE_BYTES:
         nsec = 0
         tzoffset = 0

tarantool/msgpack_ext/datetime.py

@@ -65,6 +65,7 @@
 
 TARANTOOL_DECIMAL_MAX_DIGITS = 38
 
+
 def get_mp_sign(sign):
     """
     Parse decimal sign to a nibble.
@@ -88,6 +89,7 @@ def get_mp_sign(sign):
 
     raise RuntimeError
 
+
 def add_mp_digit(digit, bytes_reverted, digit_count):
     """
     Append decimal digit to a binary data array.
@@ -109,6 +111,7 @@ def add_mp_digit(digit, bytes_reverted, digit_count):
     else:
         bytes_reverted.append(digit)
 
+
 def check_valid_tarantool_decimal(str_repr, scale, first_digit_ind):
     """
     Decimal numbers have 38 digits of precision, that is, the total
@@ -183,21 +186,21 @@ def check_valid_tarantool_decimal(str_repr, scale, first_digit_ind):
         return True
 
     if (digit_count - scale) > TARANTOOL_DECIMAL_MAX_DIGITS:
-        raise MsgpackError('Decimal cannot be encoded: Tarantool decimal ' + \
+        raise MsgpackError('Decimal cannot be encoded: Tarantool decimal '
                            'supports a maximum of 38 digits.')
 
     starts_with_zero = str_repr[first_digit_ind] == '0'
 
-    if (    (digit_count > TARANTOOL_DECIMAL_MAX_DIGITS + 1) or \
-            (digit_count == TARANTOOL_DECIMAL_MAX_DIGITS + 1 \
-            and not starts_with_zero)):
-        warn('Decimal encoded with loss of precision: ' + \
+    if (digit_count > TARANTOOL_DECIMAL_MAX_DIGITS + 1) or \
+            (digit_count == TARANTOOL_DECIMAL_MAX_DIGITS + 1 and not starts_with_zero):
+        warn('Decimal encoded with loss of precision: '
              'Tarantool decimal supports a maximum of 38 digits.',
              MsgpackWarning)
         return False
 
     return True
 
+
 def strip_decimal_str(str_repr, scale, first_digit_ind):
     """
     Strip decimal digits after the decimal point if decimal cannot be
@@ -225,6 +228,7 @@ def strip_decimal_str(str_repr, scale, first_digit_ind):
     # Do not strips zeroes before the decimal point
     return str_repr
 
+
 def encode(obj, _):
     """
     Encode a decimal object.
@@ -308,6 +312,7 @@ def get_str_sign(nibble):
 
     raise MsgpackError('Unexpected MP_DECIMAL sign nibble')
 
+
 def add_str_digit(digit, digits_reverted, scale):
     """
     Append decimal digit to a binary data array.
@@ -334,6 +339,7 @@ def add_str_digit(digit, digits_reverted, scale):
 
     digits_reverted.append(str(digit))
 
+
 def decode(data, _):
     """
     Decode a decimal object.

tarantool/msgpack_ext/decimal.py

@@ -16,6 +16,7 @@
 `error`_ type id.
 """
 
+
 def encode(obj, packer):
     """
     Encode an error object.
@@ -33,6 +34,7 @@ def encode(obj, packer):
     err_map = encode_box_error(obj)
     return packer.pack(err_map)
 
+
 def decode(data, unpacker):
     """
     Decode an error object.

tarantool/msgpack_ext/error.py

@@ -51,6 +51,7 @@
 `datetime.interval`_ type id.
 """
 
+
 def encode(obj, _):
     """
     Encode an interval object.
@@ -79,6 +80,7 @@ def encode(obj, _):
 
     return buf
 
+
 def decode(data, unpacker):
     """
     Decode an interval object.

tarantool/msgpack_ext/interval.py

@@ -19,13 +19,14 @@
 import tarantool.msgpack_ext.interval as ext_interval
 
 encoders = [
-    {'type': Decimal,  'ext': ext_decimal },
-    {'type': UUID,     'ext': ext_uuid    },
-    {'type': BoxError, 'ext': ext_error   },
+    {'type': Decimal, 'ext': ext_decimal},
+    {'type': UUID, 'ext': ext_uuid},
+    {'type': BoxError, 'ext': ext_error},
     {'type': Datetime, 'ext': ext_datetime},
     {'type': Interval, 'ext': ext_interval},
 ]
 
+
 def default(obj, packer=None):
     """
     :class:`msgpack.Packer` encoder.