[E721] mix

Author: dmitry-lipetsk

src/exceptions.py

@@ -27,10 +27,10 @@ def __init__(
         error: typing.Optional[T_ERR_DATA] = None,
     ):
         assert message is None or type(message) is str
-        assert command is None or type(command) in [str, list]  # noqa: E721
+        assert command is None or type(command) in [str, list]
         assert exit_code is None or type(exit_code) is int
-        assert out is None or type(out) in [str, bytes]  # noqa: E721
-        assert error is None or type(error) in [str, bytes]  # noqa: E721
+        assert out is None or type(out) in [str, bytes]
+        assert error is None or type(error) in [str, bytes]
 
         super().__init__(message)
 
@@ -71,7 +71,7 @@ def description(self) -> typing.Optional[str]:
 
     @property
     def command(self) -> typing.Optional[T_CMD]:
-        assert self._command is None or type(self._command) in [str, list]  # noqa: E721
+        assert self._command is None or type(self._command) in [str, list]
         return self._command
 
     @property
@@ -81,12 +81,12 @@ def exit_code(self) -> typing.Optional[int]:
 
     @property
     def out(self) -> typing.Optional[T_OUT_DATA]:
-        assert self._out is None or type(self._out) in [str, bytes]  # noqa: E721
+        assert self._out is None or type(self._out) in [str, bytes]
         return self._out
 
     @property
     def error(self) -> typing.Optional[T_ERR_DATA]:
-        assert self._error is None or type(self._error) in [str, bytes]  # noqa: E721
+        assert self._error is None or type(self._error) in [str, bytes]
         return self._error
 
     def __repr__(self) -> str:

src/helpers.py

@@ -43,7 +43,7 @@ def PrepareProcessInput(input, encoding):
         if not input:
             return None
 
-        if type(input) == str:  # noqa: E721
+        if type(input) is str:
             if encoding is None:
                 return input.encode(__class__.GetDefaultEncoding())
 

src/local_ops.py

@@ -66,14 +66,14 @@ def get_single_instance() -> OsOperations:
         assert __class__.sm_single_instance_guard is not None
 
         if __class__.sm_single_instance is not None:
-            assert type(__class__.sm_single_instance) == __class__  # noqa: E721
+            assert type(__class__.sm_single_instance) is __class__
             return __class__.sm_single_instance
 
         with __class__.sm_single_instance_guard:
             if __class__.sm_single_instance is None:
                 __class__.sm_single_instance = __class__()
         assert __class__.sm_single_instance is not None
-        assert type(__class__.sm_single_instance) == __class__  # noqa: E721
+        assert type(__class__.sm_single_instance) is __class__
         return __class__.sm_single_instance
 
     def get_platform(self) -> str:
@@ -164,7 +164,7 @@ def _run_command__generic(
         if not get_process:
             input_prepared = Helpers.PrepareProcessInput(input, encoding)  # throw
 
-        assert input_prepared is None or (type(input_prepared) == bytes)  # noqa: E721
+        assert input_prepared is None or type(input_prepared) is bytes
 
         extParams: typing.Dict[str, str] = dict()
 
@@ -334,7 +334,7 @@ def rmdirs(self, path, ignore_errors=True, attempts=3, delay=1):
         assert type(path) is str
         assert type(ignore_errors) is bool
         assert type(attempts) is int
-        assert type(delay) == int or type(delay) == float  # noqa: E721
+        assert type(delay) is int or type(delay) is float
         assert attempts > 0
         assert delay >= 0
 
@@ -576,7 +576,7 @@ def remove_file(self, filename):
     def kill(self, pid: int, signal: typing.Union[int, os_signal.Signals]):
         # Kill the process
         assert type(pid) is int
-        assert type(signal) == int or type(signal) == os_signal.Signals  # noqa: E721 E501
+        assert type(signal) is int or type(signal) is os_signal.Signals
         os.kill(pid, signal)
 
     def get_pid(self):

src/os_ops.py

@@ -134,7 +134,7 @@ def remove_file(self, filename):
     def kill(self, pid: int, signal: typing.Union[int, os_signal.Signals]):
         # Kill the process
         assert type(pid) is int
-        assert type(signal) == int or type(signal) == os_signal.Signals  # noqa: E721 E501
+        assert type(signal) is int or type(signal) is os_signal.Signals
         raise NotImplementedError()
 
     def get_pid(self):

src/raise_error.py

@@ -40,7 +40,7 @@ def _TranslateDataIntoString(data):
         if data is None:
             return ""
 
-        if type(data) == bytes:  # noqa: E721
+        if type(data) is bytes:
             return __class__._TranslateDataIntoString__FromBinary(data)
 
         return str(data)

src/remote_ops.py

@@ -121,7 +121,7 @@ def exec_command(
         if not get_process:
             input_prepared = Helpers.PrepareProcessInput(input, encoding)  # throw
 
-        assert input_prepared is None or (type(input_prepared) == bytes)  # noqa: E721
+        assert input_prepared is None or type(input_prepared) is bytes
 
         cmds = []
 
@@ -664,7 +664,7 @@ def remove_file(self, filename):
     def kill(self, pid: int, signal: typing.Union[int, os_signal.Signals]):
         # Kill the process
         assert type(pid) is int
-        assert type(signal) == int or type(signal) == os_signal.Signals  # noqa: E721 E501
+        assert type(signal) is int or type(signal) is os_signal.Signals
         assert int(signal) == signal
         cmd = "kill -{} {}".format(int(signal), pid)
         return self.exec_command(cmd, encoding=get_default_encoding())
@@ -792,9 +792,9 @@ def _build_cmdline(cmd, exec_env: typing.Dict = None) -> str:
 
     @staticmethod
     def _ensure_cmdline(cmd) -> typing.List[str]:
-        if type(cmd) == str:  # noqa: E721
+        if type(cmd) is str:
             cmd_s = cmd
-        elif type(cmd) == list:  # noqa: E721
+        elif type(cmd) is list:
             cmd_s = subprocess.list2cmdline(cmd)
         else:
             raise ValueError("Invalid 'cmd' argument type - {0}".format(type(cmd).__name__))

tests/test_os_ops_common.py

@@ -61,7 +61,7 @@ def test_create_clone(self, os_ops: OsOperations):
         clone = os_ops.create_clone()
         assert clone is not None
         assert clone is not os_ops
-        assert type(clone) == type(os_ops)  # noqa: E721
+        assert type(clone) is type(os_ops)
 
     def test_exec_command_success(self, os_ops: OsOperations):
         """
@@ -759,11 +759,11 @@ def __init__(self, sign, source, cp_rw, cp_truncate, cp_binary, cp_data, result)
     )
     def write_data001(self, request):
         assert isinstance(request, pytest.FixtureRequest)
-        assert type(request.param) == __class__.tagWriteData001  # noqa: E721
+        assert type(request.param) is __class__.tagWriteData001
         return request.param
 
     def test_write(self, write_data001: tagWriteData001, os_ops: OsOperations):
-        assert type(write_data001) == __class__.tagWriteData001  # noqa: E721
+        assert type(write_data001) is __class__.tagWriteData001
         assert isinstance(os_ops, OsOperations)
 
         mode = "w+b" if write_data001.call_param__binary else "w+"
@@ -847,7 +847,7 @@ def test_is_port_free__false(self, os_ops: OsOperations):
 
         def LOCAL_server(s: socket.socket):
             assert s is not None
-            assert type(s) == socket.socket  # noqa: E721
+            assert type(s) is socket.socket
 
             try:
                 while True:
@@ -873,7 +873,7 @@ def LOCAL_server(s: socket.socket):
 
                 s.listen(10)
 
-                assert type(th) == threading.Thread  # noqa: E721
+                assert type(th) is threading.Thread
                 th.start()
 
                 try:
@@ -964,7 +964,7 @@ def data001(self, request: pytest.FixtureRequest) -> tagData_OS_OPS__NUMS:
         return request.param
 
     def test_mkdir__mt(self, data001: tagData_OS_OPS__NUMS):
-        assert type(data001) == __class__.tagData_OS_OPS__NUMS   # noqa: E721
+        assert type(data001) is __class__.tagData_OS_OPS__NUMS
 
         N_WORKERS = 4
         N_NUMBERS = data001.nums
@@ -1261,7 +1261,7 @@ def test_kill(
         )
 
         assert proc is not None
-        assert type(proc) == subprocess.Popen  # noqa: E721
+        assert type(proc) is subprocess.Popen
         proc_pid = proc.pid
         assert type(proc_pid) is int
         logging.info("Test process pid is {}".format(proc_pid))
@@ -1332,7 +1332,7 @@ def test_kill__unk_pid(
         )
 
         assert proc is not None
-        assert type(proc) == subprocess.Popen  # noqa: E721
+        assert type(proc) is subprocess.Popen
         proc_pid = proc.pid
         assert type(proc_pid) is int
         logging.info("Test process pid is {}".format(proc_pid))
@@ -1387,10 +1387,10 @@ def test_kill__unk_pid(
         logging.info("Our exception has type [{}]".format(type(x.value).__name__))
 
         if type(os_ops).__name__ == "LocalOsOperations":
-            assert type(x.value) == ProcessLookupError  # noqa: E721
+            assert type(x.value) is ProcessLookupError
             assert "No such process" in str(x.value)
         elif type(os_ops).__name__ == "RemoteOsOperations":
-            assert type(x.value) == ExecUtilException  # noqa: E721
+            assert type(x.value) is ExecUtilException
             assert "No such process" in str(x.value)
         else:
             RuntimeError("Unknown os_ops type: {}".format(type(os_ops).__name__))

tests/test_os_ops_remote.py

@@ -32,8 +32,8 @@ def test_rmdirs__try_to_delete_file(self, os_ops: OsOperations):
             os_ops.rmdirs(path, ignore_errors=False)
 
         assert os.path.exists(path)
-        assert type(x.value) == ExecUtilException   # noqa: E721
-        assert type(x.value.description) == str   # noqa: E721
+        assert type(x.value) is ExecUtilException
+        assert type(x.value.description) is str
         assert x.value.description == "Utility exited with non-zero code (20). Error: `cannot remove '" + path + "': it is not a directory`"
         assert x.value.message.startswith(x.value.description)
         assert type(x.value.error) is str