deadcode 2.2.2__tar.gz → 2.3.1__tar.gz

{deadcode-2.2.2 → deadcode-2.3.1}/PKG-INFO

@@ -1,9 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: deadcode
-Version: 2.2.2
+Version: 2.3.1
 Summary: Find and remove dead code.
-Project-URL: Homepage, https://github.com/albertas/deadcode
-Project-URL: Documentation, https://deadcode.readthedocs.io/
+Project-URL: homepage, https://github.com/albertas/deadcode
+Project-URL: documentation, https://deadcode.readthedocs.io/
 Author-email: Albertas Gimbutas <albertasgim@gmail.com>
 License-File: LICENSE
 Classifier: Development Status :: 3 - Alpha
@@ -15,14 +15,28 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
-Requires-Dist: tomli==2.0.1
+Requires-Dist: tomli>=2.0.1
+Provides-Extra: test
+Requires-Dist: hatch; extra == 'test'
+Requires-Dist: mypy; extra == 'test'
+Requires-Dist: pip-audit; extra == 'test'
+Requires-Dist: pytest; extra == 'test'
+Requires-Dist: pytest-cov; extra == 'test'
+Requires-Dist: ruff; extra == 'test'
 Description-Content-Type: text/markdown
 
-# deadcode
-`deadcode` allows to detect and fix unused Python code. It implements `DCXXX`
-static code linting rules for detecting unused code such as
-variables, functions and classes.
+[![Deadcode Logo](https://raw.githubusercontent.com/albertas/deadcode/main/docs/_static/deadcode-logo-readme.png)](https://deadcode.readthedocs.io/en/stable/)
+
+<h2 align="center">Find and Fix Unused Python Code</h2>
+
+<p align="center">
+<a href="https://github.com/albertas/deadcode/blob/main/LICENSE"><img alt="License: AGPLv3" src="https://raw.githubusercontent.com/albertas/deadcode/main/docs/_static/AGPLv3-license.svg"></a>
+<a href="https://pypi.org/project/deadcode/"><img alt="PyPI" src="https://img.shields.io/pypi/v/deadcode"></a>
+<a href="https://pepy.tech/project/deadcode"><img alt="Downloads" src="https://static.pepy.tech/badge/deadcode"></a>
+</p>
+
 
 ## Installation
 ```shell
@@ -30,11 +44,27 @@ pip install deadcode
 ```
 
 ## Usage
+To see unused code findings:
 ```shell
 deadcode .
 ```
 
-Or with command line options:
+To see suggested fixes for all files:
+```shell
+deadcode . --fix --dry
+```
+
+To see suggested fixes only for `foo.py` file:
+```shell
+deadcode . --fix --dry foo.py
+```
+
+To fix:
+```shell
+deadcode . --fix
+```
+
+Tune out some of the false positives, e.g.:
 ```
 deadcode . --exclude=venv,tests --ignore-names=BaseTestCase,*Mixin --ignore-names-in-files=migrations
 ```
@@ -47,11 +77,12 @@ ignore-names = ["BaseTestCase", "*Mixin"]
 ignore-names-in-files = ["migrations"]
 ```
 
-### Command line options
+## Command line options
 
 | Option&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | Type | Meaning  |
 |-------------------------------------------|------|----------------------------------------------------------------------|
 |`--fix`                                    | -    | Automatically remove detected unused code expressions from the code base. |
+|`--dry`                                    | - or list | Show changes which would be made in files. Shows changes for provided filenames or shows all changes if no filename is specified. |
 |`--exclude`                                | list | Filenames (or path expressions), which will be completely skipped without being analysed. |
 |`--ignore-names`                           | list | Removes provided list of names from the output. Regexp expressions to match multiple names can also be provided, e.g. `*Mixin` will match all classes ending with `Mixin`. |
 |`--ignore-names-in-files`                  | list | Ignores unused names in files, which filenames match provided path expressions. |
@@ -77,27 +108,26 @@ definition - whole class or function definition expression including its name an
 ## Rules
 | Code   | Name               | Message        |
 |--------|--------------------|----------------|
-| DC001  | unused-variable    | Variable `{name}` is never used
-| DC002  | unused-function    | Function `{name}` is never used
-| DC003  | unused-class       | Class `{name}` is never used
-| DC004  | unused-method      | Method `{name}` is never used
-| DC005  | unused-attribute   | Attribute `{name}` is never used
-| DC006  | unused-name        | Name `{name}` is never used
-| DC007  | unused-import      | Import `{name}` is never used
-| DC008  | unused-property    | Property `{name}` is never used
-| DC009* | unreachable-code   | Unreachable `else` block
-| DC011  | empty-file         | Empty file
-| DC012* | commented-out-code | Commented out code
-| DC013* | ignore-expression  | *This error code can ony be used in `# noqa: DC013` comments (no errors will be reported for expression which begins in current line)*
-
-`*` - are not yet implemented rules.
+| DC01  | unused-variable      | Variable `{name}` is never used
+| DC02  | unused-function      | Function `{name}` is never used
+| DC03  | unused-class         | Class `{name}` is never used
+| DC04  | unused-method        | Method `{name}` is never used
+| DC05  | unused-attribute     | Attribute `{name}` is never used
+| DC06  | unused-name          | Name `{name}` is never used
+| DC07  | unused-import        | Import `{name}` is never used
+| DC08  | unused-property      | Property `{name}` is never used
+| DC09  | unreachable-if-block | Unreachable conditional statement block
+| DC11  | empty-file           | Empty Python file
+| DC12  | commented-out-code   | Commented out code
+| DC13  | unreachable-code     | Code after terminal statement, e.g. `return`, `raise`, `continue`, `break`
+| DC    | ignore-expression    | Do not show any findings for an expression, which starts on current line (this code can only be used in `# noqa: DC` comments)
 
 ## Ignoring checks with noqa comments
 Inline `# noqa` comments can be used to ignore `deadcode` checks.
-E.g. unused `Foo` class wont be detected/fixed because `# noqa: DC003` comment is used:
+E.g. unused `Foo` class wont be detected/fixed because `# noqa: DC03` comment is used:
 
 ```python
-class Foo:  # noqa: DC003
+class Foo:  # noqa: DC03
     pass
 ```
 
@@ -127,10 +157,10 @@ code base is implemented in.
 
 ## Feature requests
 - [x] Replace `.*` with only `*` in regexp matching.
-- [x] Add unused class method detection DC004 check.
+- [x] Add unused class method detection DC04 check.
 - [x] Add `--fix` option to automatically remove detected dead code occourencies
 - [x] Add a check for empty python files.
-- [x] Split error codes into DC001, DC002, DC003 for variables, functions, class.
+- [x] Split error codes into DC01, DC02, DC03 for variables, functions, class.
     - [x] Should have different codes for ignoring name and ignoring whole definition (reserved DCxx0 - ignore name, DCxx1 - ignore definition).
     - [ ] Allow to disable each check separately using:
         - [ ] inline comment.
@@ -144,8 +174,37 @@ code base is implemented in.
     - [ ] --ignore-definitions-if-decorated-with
     - [ ] --ignore-names-if-inherits-from
     - [ ] --ignore-names-if-decorated-with
+    - [ ] --ignore-bodies-of
+    - [ ] --ignore-bodies-if-decorated-with
+    - [ ] --ignore-bodies-if-inherits-from
+    - [ ] --ignore-definitions
+    - [ ] --ignore-definitions-if-inherits-from
+    - [ ] --ignore-definitions-if-decorated-with
+        - Question: would it be possible to ignore only certain types of checks for a body, e.g. only variable attributes of TypedDict and still check usage of methods and properties?
+        - What expression would allow this type of precission?
 - [ ] Distinguish between definitions with same name, but different files.
 - [ ] Repeated application of `deadcode` till the output stops changing.
-- [ ] Unreachable code detection and fixing.
-- [ ] `--fix --dry [filenames]` - only show whats about to change in the listed filenames.
+- [ ] Unreachable code detection and fixing: this should only be scoped for if statements and only limited to primitive variables.
+- [x] `--fix --dry [filenames]` - only show whats about to change in the listed filenames.
 - [ ] Benchmarking performance with larger projects (time, CPU and memory consumption) in order to optimize.
+- [ ] `--fix` could accept a list of filenames as well (only those files would be changed, but the summary could would be full).
+    (This might be confusing, because filenames, which have to be considered are provided without any flag, --fix is expected to not accept arguments)
+- [ ] pre-commit-hook.
+- [ ] language server.
+- [x] Use only two digits for error codes instead of 3. Two is plenty and it simplifies usage a bit
+- [ ] DC10: remove code after terminal statements like `raise`, `return`, `break`, `continue` and comes in the same scope.
+- [ ] Add `ignore` and `per-file-ignores` command line and pyproject.toml options, which allows to skip some rules.
+- [ ] Make sure that all rules are being skipped by `noqa` comment and all rules react to `noqa: rule_id` comments.
+- [ ] Include package names into code item scope (dot-separated path), e.g. "package1.package2.module.class.method.variable".
+- [ ] All options should be able to accept dot-separated path or a generic name, e.g. "marshmallow.Schema" vs "Schema",
+  documentation should cleary demonstrate the behaviour/example that "Schema" means "*.Schema".
+- [ ] Redefinition of an existing name makes previous name unreachable, unless it is assigned somehow.
+- [ ] Check if file is still valid/parsable after automatic fixing, if not: halt the change and report error.
+
+## Release notes
+- v2.3.1:
+    - Started analysing files in bytes instead of trying to convert them into UTF-8 encoded strings.
+    - Improved automatic removal of unused imports.
+- v2.3.0:
+    - Add `--dry` option.
+    - Update error codes to use DCXX format instead of DCXXX.

{deadcode-2.2.2 → deadcode-2.3.1}/README.md

@@ -1,7 +1,13 @@
-# deadcode
-`deadcode` allows to detect and fix unused Python code. It implements `DCXXX`
-static code linting rules for detecting unused code such as
-variables, functions and classes.
+[![Deadcode Logo](https://raw.githubusercontent.com/albertas/deadcode/main/docs/_static/deadcode-logo-readme.png)](https://deadcode.readthedocs.io/en/stable/)
+
+<h2 align="center">Find and Fix Unused Python Code</h2>
+
+<p align="center">
+<a href="https://github.com/albertas/deadcode/blob/main/LICENSE"><img alt="License: AGPLv3" src="https://raw.githubusercontent.com/albertas/deadcode/main/docs/_static/AGPLv3-license.svg"></a>
+<a href="https://pypi.org/project/deadcode/"><img alt="PyPI" src="https://img.shields.io/pypi/v/deadcode"></a>
+<a href="https://pepy.tech/project/deadcode"><img alt="Downloads" src="https://static.pepy.tech/badge/deadcode"></a>
+</p>
+
 
 ## Installation
 ```shell
@@ -9,11 +15,27 @@ pip install deadcode
 ```
 
 ## Usage
+To see unused code findings:
 ```shell
 deadcode .
 ```
 
-Or with command line options:
+To see suggested fixes for all files:
+```shell
+deadcode . --fix --dry
+```
+
+To see suggested fixes only for `foo.py` file:
+```shell
+deadcode . --fix --dry foo.py
+```
+
+To fix:
+```shell
+deadcode . --fix
+```
+
+Tune out some of the false positives, e.g.:
 ```
 deadcode . --exclude=venv,tests --ignore-names=BaseTestCase,*Mixin --ignore-names-in-files=migrations
 ```
@@ -26,11 +48,12 @@ ignore-names = ["BaseTestCase", "*Mixin"]
 ignore-names-in-files = ["migrations"]
 ```
 
-### Command line options
+## Command line options
 
 | Option&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | Type | Meaning  |
 |-------------------------------------------|------|----------------------------------------------------------------------|
 |`--fix`                                    | -    | Automatically remove detected unused code expressions from the code base. |
+|`--dry`                                    | - or list | Show changes which would be made in files. Shows changes for provided filenames or shows all changes if no filename is specified. |
 |`--exclude`                                | list | Filenames (or path expressions), which will be completely skipped without being analysed. |
 |`--ignore-names`                           | list | Removes provided list of names from the output. Regexp expressions to match multiple names can also be provided, e.g. `*Mixin` will match all classes ending with `Mixin`. |
 |`--ignore-names-in-files`                  | list | Ignores unused names in files, which filenames match provided path expressions. |
@@ -56,27 +79,26 @@ definition - whole class or function definition expression including its name an
 ## Rules
 | Code   | Name               | Message        |
 |--------|--------------------|----------------|
-| DC001  | unused-variable    | Variable `{name}` is never used
-| DC002  | unused-function    | Function `{name}` is never used
-| DC003  | unused-class       | Class `{name}` is never used
-| DC004  | unused-method      | Method `{name}` is never used
-| DC005  | unused-attribute   | Attribute `{name}` is never used
-| DC006  | unused-name        | Name `{name}` is never used
-| DC007  | unused-import      | Import `{name}` is never used
-| DC008  | unused-property    | Property `{name}` is never used
-| DC009* | unreachable-code   | Unreachable `else` block
-| DC011  | empty-file         | Empty file
-| DC012* | commented-out-code | Commented out code
-| DC013* | ignore-expression  | *This error code can ony be used in `# noqa: DC013` comments (no errors will be reported for expression which begins in current line)*
-
-`*` - are not yet implemented rules.
+| DC01  | unused-variable      | Variable `{name}` is never used
+| DC02  | unused-function      | Function `{name}` is never used
+| DC03  | unused-class         | Class `{name}` is never used
+| DC04  | unused-method        | Method `{name}` is never used
+| DC05  | unused-attribute     | Attribute `{name}` is never used
+| DC06  | unused-name          | Name `{name}` is never used
+| DC07  | unused-import        | Import `{name}` is never used
+| DC08  | unused-property      | Property `{name}` is never used
+| DC09  | unreachable-if-block | Unreachable conditional statement block
+| DC11  | empty-file           | Empty Python file
+| DC12  | commented-out-code   | Commented out code
+| DC13  | unreachable-code     | Code after terminal statement, e.g. `return`, `raise`, `continue`, `break`
+| DC    | ignore-expression    | Do not show any findings for an expression, which starts on current line (this code can only be used in `# noqa: DC` comments)
 
 ## Ignoring checks with noqa comments
 Inline `# noqa` comments can be used to ignore `deadcode` checks.
-E.g. unused `Foo` class wont be detected/fixed because `# noqa: DC003` comment is used:
+E.g. unused `Foo` class wont be detected/fixed because `# noqa: DC03` comment is used:
 
 ```python
-class Foo:  # noqa: DC003
+class Foo:  # noqa: DC03
     pass
 ```
 
@@ -106,10 +128,10 @@ code base is implemented in.
 
 ## Feature requests
 - [x] Replace `.*` with only `*` in regexp matching.
-- [x] Add unused class method detection DC004 check.
+- [x] Add unused class method detection DC04 check.
 - [x] Add `--fix` option to automatically remove detected dead code occourencies
 - [x] Add a check for empty python files.
-- [x] Split error codes into DC001, DC002, DC003 for variables, functions, class.
+- [x] Split error codes into DC01, DC02, DC03 for variables, functions, class.
     - [x] Should have different codes for ignoring name and ignoring whole definition (reserved DCxx0 - ignore name, DCxx1 - ignore definition).
     - [ ] Allow to disable each check separately using:
         - [ ] inline comment.
@@ -123,8 +145,37 @@ code base is implemented in.
     - [ ] --ignore-definitions-if-decorated-with
     - [ ] --ignore-names-if-inherits-from
     - [ ] --ignore-names-if-decorated-with
+    - [ ] --ignore-bodies-of
+    - [ ] --ignore-bodies-if-decorated-with
+    - [ ] --ignore-bodies-if-inherits-from
+    - [ ] --ignore-definitions
+    - [ ] --ignore-definitions-if-inherits-from
+    - [ ] --ignore-definitions-if-decorated-with
+        - Question: would it be possible to ignore only certain types of checks for a body, e.g. only variable attributes of TypedDict and still check usage of methods and properties?
+        - What expression would allow this type of precission?
 - [ ] Distinguish between definitions with same name, but different files.
 - [ ] Repeated application of `deadcode` till the output stops changing.
-- [ ] Unreachable code detection and fixing.
-- [ ] `--fix --dry [filenames]` - only show whats about to change in the listed filenames.
+- [ ] Unreachable code detection and fixing: this should only be scoped for if statements and only limited to primitive variables.
+- [x] `--fix --dry [filenames]` - only show whats about to change in the listed filenames.
 - [ ] Benchmarking performance with larger projects (time, CPU and memory consumption) in order to optimize.
+- [ ] `--fix` could accept a list of filenames as well (only those files would be changed, but the summary could would be full).
+    (This might be confusing, because filenames, which have to be considered are provided without any flag, --fix is expected to not accept arguments)
+- [ ] pre-commit-hook.
+- [ ] language server.
+- [x] Use only two digits for error codes instead of 3. Two is plenty and it simplifies usage a bit
+- [ ] DC10: remove code after terminal statements like `raise`, `return`, `break`, `continue` and comes in the same scope.
+- [ ] Add `ignore` and `per-file-ignores` command line and pyproject.toml options, which allows to skip some rules.
+- [ ] Make sure that all rules are being skipped by `noqa` comment and all rules react to `noqa: rule_id` comments.
+- [ ] Include package names into code item scope (dot-separated path), e.g. "package1.package2.module.class.method.variable".
+- [ ] All options should be able to accept dot-separated path or a generic name, e.g. "marshmallow.Schema" vs "Schema",
+  documentation should cleary demonstrate the behaviour/example that "Schema" means "*.Schema".
+- [ ] Redefinition of an existing name makes previous name unreachable, unless it is assigned somehow.
+- [ ] Check if file is still valid/parsable after automatic fixing, if not: halt the change and report error.
+
+## Release notes
+- v2.3.1:
+    - Started analysing files in bytes instead of trying to convert them into UTF-8 encoded strings.
+    - Improved automatic removal of unused imports.
+- v2.3.0:
+    - Add `--dry` option.
+    - Update error codes to use DCXX format instead of DCXXX.

{deadcode-2.2.2 → deadcode-2.3.1}/deadcode/actions/find_python_filenames.py

@@ -16,21 +16,21 @@ def find_python_filenames(args: Args) -> List[str]:
 
         if _match(path, args.exclude):
             if args.verbose:
-                logger.info(f"Ignoring: {path}")
+                logger.info(f'Ignoring: {path}')
             continue
 
-        if path.is_file() and path.suffix == ".py":
+        if path.is_file() and path.suffix == '.py':
             filenames.append(str(path))
         elif path.is_dir():
-            paths += list([str(p) for p in path.glob("*")])
+            paths += list([str(p) for p in path.glob('*')])
         elif not path.exists():
             # TODO: unify error logging and reporting
             # Maybe a cli flag could be added to stop on error
-            logger.error(f"Error: {path} could not be found.")
+            logger.error(f'Error: {path} could not be found.')
 
     if args.verbose:
-        sep = "\n  - "
-        logger.info(f"Files to be checked for dead code: {sep.join(filenames)}")
+        sep = '\n  - '
+        logger.info(f'Files to be checked for dead code: {sep.join(filenames)}')
     return filenames
 
 

deadcode-2.3.1/deadcode/actions/fix_or_show_unused_code.py

@@ -0,0 +1,66 @@
+from collections import defaultdict
+from difflib import diff_bytes, unified_diff
+from typing import Iterable
+import os
+
+from deadcode.actions.merge_overlaping_file_parts import merge_overlaping_file_parts
+from deadcode.actions.remove_file_parts_from_content import remove_file_parts_from_content
+from deadcode.data_types import Args
+from deadcode.visitor.code_item import CodeItem
+from deadcode.utils.flatten_lists import flatten_list
+from deadcode.utils.add_colors_to_diff import add_colors_to_diff
+from deadcode.visitor.ignore import _match
+
+
+def fix_or_show_unused_code(unused_items: Iterable[CodeItem], args: Args) -> str:
+    # Reading and writing should be patched in this file.
+
+    # Group unused_names by filenames
+    # For each filename find file parts, which have to be fixed.
+    # And fix those file parts.
+    #
+    # TODO: trailing commas, trailing white spaces and empty lines
+
+    filename_to_unused_items = defaultdict(list)
+    for unused_item in unused_items:
+        filename_to_unused_items[str(unused_item.filename)].append(unused_item)
+
+    result = []
+
+    for filename, file_unused_items in filename_to_unused_items.items():
+        file_parts = flatten_list([item.code_parts for item in file_unused_items])
+
+        unused_file_parts = merge_overlaping_file_parts(file_parts)
+
+        with open(filename, 'rb') as f:
+            file_content_lines = f.readlines()
+
+        updated_file_content_lines = remove_file_parts_from_content(file_content_lines, unused_file_parts)
+        updated_file_content = b''.join(updated_file_content_lines)
+        if updated_file_content.strip():
+            if args.dry and ('__all_files__' in args.dry or _match(filename, args.dry)):
+                with open(filename, 'rb') as f:
+                    filename_bytes = filename.encode()
+                    diff = diff_bytes(unified_diff, f.readlines(), updated_file_content_lines,
+                                      fromfile=filename_bytes, tofile=filename_bytes)
+                    # TODO: consider printing result instantly to save memory
+                    result_chunk = b''.join(diff)
+                    if args.no_color:
+                        result.append(result_chunk)
+                    else:
+                        result.append(add_colors_to_diff(result_chunk))
+
+            elif args.fix:
+                with open(filename, 'wb') as f:
+                    # TODO: is there a method writelines?
+                    f.write(updated_file_content)
+        else:
+            os.remove(filename)
+
+    if result:
+        return b'\n'.join(result).decode()
+    return ''
+
+    # TODO: update this one: solution is to use read and write operations.
+    #
+    # Solution is to open file for reading and then for writing.

{deadcode-2.2.2 → deadcode-2.3.1}/deadcode/actions/get_unused_names_error_message.py

@@ -11,25 +11,25 @@ def get_unused_names_error_message(unused_names: Iterable[CodeItem], args: Args)
         return None
 
     if args.quiet:
-        return ""
+        return ''
 
     if args.count:
-        return f"{len(unused_names)}"
+        return f'{len(unused_names)}'
 
     messages = []
     for item in unused_names:
-        message = f"{item.filename_with_position} \033[91m{item.error_code}\033[0m "
+        message = f'{item.filename_with_position} \033[91m{item.error_code}\033[0m '
         message += item.message or (
             f"{item.type_.replace('_', ' ').capitalize()} " f"`\033[1m{item.name}\033[0m` " f"is never used"
         )
         if args.no_color:
-            message = message.replace("\033[91m", "").replace("\033[1m", "").replace("\033[0m", "")
+            message = message.replace('\033[91m', '').replace('\033[1m', '').replace('\033[0m', '')
         messages.append(message)
 
     if args.fix:
         message = f"\nRemoved \033[1m{len(unused_names)}\033[0m unused code item{'s' if len(unused_names) > 1 else ''}!"
         if args.no_color:
-            message = message.replace("\x1b[1m", "").replace("\x1b[0m", "")
+            message = message.replace('\x1b[1m', '').replace('\x1b[0m', '')
         messages.append(message)
 
-    return "\n".join(messages)
+    return '\n'.join(messages)

{deadcode-2.2.2 → deadcode-2.3.1}/deadcode/actions/merge_overlaping_file_parts.py

@@ -10,9 +10,7 @@ def does_include(bigger_part: Part, smaller_part: Part) -> bool:
 
     ends_faster = (line_end_b < line_end_s) or ((line_end_b == line_end_b) and (col_end_b <= col_end_s))
 
-    if starts_later and ends_faster:
-        return True
-    return False
+    return bool(starts_later and ends_faster)
 
 
 def sort_parts(bigger_part: Part, smaller_part: Part) -> Tuple[Part, Part]:
@@ -34,10 +32,7 @@ def does_overlap(bigger_part: Part, smaller_part: Part) -> bool:
     line_start_s, line_end_s, col_start_s, col_end_s = smaller_part
 
     # ar pirmo pabaiga perlipa antro pradžia
-    if (line_end_b > line_start_s) or ((line_end_b == line_start_s) and (col_end_b > col_start_s)):
-        return True
-
-    return False
+    return bool((line_end_b > line_start_s) or ((line_end_b == line_start_s) and (col_end_b > col_start_s)))
 
 
 def merge_parts(p1: Part, p2: Part) -> Optional[Part]:

{deadcode-2.2.2 → deadcode-2.3.1}/deadcode/actions/parse_abstract_syntax_tree.py

@@ -9,5 +9,5 @@ def parse_abstract_syntax_tree(file_content: FileContent, args: Args, filename:
         return ast.parse(file_content, filename=filename, type_comments=True)
     except:  # noqa: E722
         if not args.count and not args.quiet:
-            print(f"Error: Failed to parse {filename} file, ignoring it.")
+            print(f'Error: Failed to parse {filename} file, ignoring it.')
         return ast.Module()