Source code is checked with ruff (#17)

* Tests are checked with ruff

* Src is checked with ruff

* [CI] A stage "Lint with ruff" is added

Author: dmitry-lipetsk

.github/workflows/package-verification.yml

@@ -27,10 +27,13 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install flake8 flake8-pyproject
+        python -m pip install flake8 flake8-pyproject ruff
     - name: Lint with flake8
       run: |
         flake8 .
+    - name: Lint with ruff
+      run: |
+        ruff check .
 
   test:
     runs-on: ubuntu-latest

src/core/bugcheck_error.py

@@ -195,7 +195,7 @@ def UnexpectedSituation(bugcheckSrc: str, bugcheckPoint: str, explain: str):
             bugcheckSrc, bugcheckPoint
         )
 
-        if not (explain is None) and explain != "":
+        if explain is not None and explain != "":
             errMsg += " "
             errMsg += explain
 

src/core/controller_utils.py

@@ -545,7 +545,7 @@ def Helper__InsertFileIntoIndex(
         assert fileKey != ""
         assert fileData.IsAlive()
 
-        if not (fileKey in filesByStrKeyDictionary.keys()):
+        if fileKey not in filesByStrKeyDictionary.keys():
             filesByStrKeyDictionary[fileKey] = fileData
         else:
             indexItemData = filesByStrKeyDictionary[fileKey]
@@ -574,7 +574,7 @@ def Helper__DeleteFileIntoIndex(
         assert fileKey != ""
         assert fileData.IsAlive()
 
-        if not (fileKey in filesByStrKeyDictionary.keys()):
+        if fileKey not in filesByStrKeyDictionary.keys():
             BugCheckError.FileIsNotFoundInIndex(fileKey, fileData.m_Path)
 
         indexItemData = filesByStrKeyDictionary[fileKey]
@@ -586,14 +586,14 @@ def Helper__DeleteFileIntoIndex(
         if typeOfIndexItemData == fileData:
             assert indexItemData is fileData
 
-            if not (indexItemData is fileData):
+            if indexItemData is not fileData:
                 BugCheckError.FileIsNotFoundInIndex(fileKey, fileData.m_Path)
 
             filesByStrKeyDictionary.pop(fileKey)
-            assert not (fileKey in filesByStrKeyDictionary.keys())
+            assert fileKey not in filesByStrKeyDictionary.keys()
             return
 
-        if typeOfIndexItemData == list:
+        if typeOfIndexItemData is list:
             assert type(indexItemData) is list
             assert len(indexItemData) > 1
 
@@ -635,7 +635,7 @@ def Helper__InsertOptionIntoIndex(
         assert type(optionsByNameDictionary) is dict
         assert type(optionData) is PgCfgModel__OptionData
 
-        if not (optionData.m_Name in optionsByNameDictionary.keys()):
+        if optionData.m_Name not in optionsByNameDictionary.keys():
             optionsByNameDictionary[optionData.m_Name] = optionData
             return
 
@@ -666,7 +666,7 @@ def Helper__DeleteOptionFromIndex(
         assert type(optionsByNameDictionary) is dict
         assert type(optionData) is PgCfgModel__OptionData
 
-        if not (optionData.m_Name in optionsByNameDictionary.keys()):
+        if optionData.m_Name not in optionsByNameDictionary.keys():
             BugCheckError.OptionIsNotFoundInIndex(optionData.m_Name)
 
         data = optionsByNameDictionary[optionData.m_Name]
@@ -675,17 +675,17 @@ def Helper__DeleteOptionFromIndex(
 
         typeOfData = type(data)
 
-        if typeOfData == PgCfgModel__OptionData:
+        if typeOfData is PgCfgModel__OptionData:
             assert data is optionData
 
-            if not (data is optionData):
+            if data is not optionData:
                 BugCheckError.OptionIsNotFoundInIndex(optionData.m_Name)
 
             optionsByNameDictionary.pop(optionData.m_Name)
-            assert not (optionData.m_Name in optionsByNameDictionary.keys())
+            assert optionData.m_Name not in optionsByNameDictionary.keys()
             return
 
-        if typeOfData == list:
+        if typeOfData is list:
             assert type(data) is list
             assert len(data) > 1
 

src/core/helpers.py

@@ -33,11 +33,11 @@ def ExtractFirstOptionFromIndexItem(
 
         typeOfIndexItem = type(indexItem)
 
-        if typeOfIndexItem == OptionData:
+        if typeOfIndexItem is OptionData:
             assert indexItem.m_Name == optionName
             return indexItem
 
-        if typeOfIndexItem == list:
+        if typeOfIndexItem is list:
             assert len(indexItem) > 1
             assert indexItem[0] is not None
             assert type(indexItem[0]) is OptionData

src/core/option/handlers/prepare_set_value/option_handler_to_prepare_set_value__std__int.py

@@ -26,13 +26,13 @@ def PrepareSetValue(self, ctx: OptionHandlerCtxToPrepareSetValue) -> any:
 
         typeOfOptionValue = type(ctx.OptionValue)
 
-        if typeOfOptionValue == int:
+        if typeOfOptionValue is int:
             return ctx.OptionValue
 
         optionName = ctx.OptionName
         assert type(optionName) is str
 
-        if typeOfOptionValue == str:
+        if typeOfOptionValue is str:
             if not str(ctx.OptionValue).isnumeric():
                 RaiseError.CantConvertOptionValue(optionName, typeOfOptionValue, int)
 

src/core/option/handlers/prepare_set_value/option_handler_to_prepare_set_value__std__str.py

@@ -26,7 +26,7 @@ def PrepareSetValue(self, ctx: OptionHandlerCtxToPrepareSetValue) -> any:
 
         typeOfOptionValue = type(ctx.OptionValue)
 
-        if typeOfOptionValue != str:
+        if typeOfOptionValue is not str:
             optionName = ctx.OptionName
             assert type(optionName) is str
             RaiseError.BadOptionValueType(optionName, typeOfOptionValue, str)

src/core/option/handlers/prepare_set_value/option_handler_to_prepare_set_value__std__unique_str_list.py

@@ -32,12 +32,12 @@ def PrepareSetValue(self, ctx: OptionHandlerCtxToPrepareSetValue) -> any:
 
         typeOfOptionValue = type(ctx.OptionValue)
 
-        if typeOfOptionValue == str:
+        if typeOfOptionValue is str:
             result = ReadUtils.Unpack_StrList2(ctx.OptionValue)
             assert result is not None
             assert type(result) is list
             return result
-        elif typeOfOptionValue == list:
+        elif typeOfOptionValue is list:
             result: typing.List[str] = list()
             index: typing.Set[str] = set()
 

src/core/option/handlers/prepare_set_value_item/option_handler_to_prepare_set_value_item__std__str.py

@@ -26,7 +26,7 @@ def PrepareSetValueItem(self, ctx: OptionHandlerCtxToPrepareSetValueItem) -> any
 
         typeOfOptionValue = type(ctx.OptionValueItem)
 
-        if typeOfOptionValue != str:
+        if typeOfOptionValue is not str:
             optionName = ctx.OptionName
             assert type(optionName) is str
             RaiseError.BadOptionValueItemType(optionName, typeOfOptionValue, str)

src/core/option/handlers/write/option_handler_to_write__std__generic.py

@@ -36,13 +36,13 @@ def OptionValueToString(self, ctx: OptionHandlerCtxToWrite) -> str:
 
         typeOfOptionValue = type(ctx.OptionValue)
 
-        if typeOfOptionValue == int:
+        if typeOfOptionValue is int:
             return __class__.sm_Handler_For_Int.OptionValueToString(ctx)
 
-        if typeOfOptionValue == str:
+        if typeOfOptionValue is str:
             return __class__.sm_Handler_For_Str.OptionValueToString(ctx)
 
-        if typeOfOptionValue == bool:
+        if typeOfOptionValue is bool:
             return __class__.sm_Handler_For_Bool.OptionValueToString(ctx)
 
         BugCheckError.UnknownOptionValueType(ctx.OptionName, typeOfOptionValue)