Merge pull request #114 from dflook/lint

Address linter warnings

Author: dflook

.github/workflows/release_test.yaml

@@ -155,6 +155,7 @@ jobs:
             pyminify setup.py src test --in-place
 
   test_typing:
+    name: Test Typing
     runs-on: ubuntu-latest
     needs: [package_python3]
     strategy:
@@ -187,7 +188,7 @@ jobs:
 
       - name: Test typing
         run: |
-          pip3.13 install mypy types-setuptools
+          pip3.13 install mypy!=1.12.0 types-setuptools
           mypy --strict typing_test/test_typing.py
 
           if mypy --strict typing_test/test_badtyping.py; then

corpus_test/generate_report.py

@@ -165,8 +165,8 @@ def format_difference(compare: Iterable[Result], base: Iterable[Result]) -> str:
     :param base: The results to compare against
     """
 
-    compare_set = set(result.corpus_entry for result in compare)
-    base_set = set(result.corpus_entry for result in base)
+    compare_set = {result.corpus_entry for result in compare}
+    base_set = {result.corpus_entry for result in base}
 
     s = str(len(compare_set))
 
@@ -293,6 +293,22 @@ def report_slowest(results_dir: str, python_versions: str, minifier_sha: str) ->
         for entry in sorted(summary.entries.values(), key=lambda entry: entry.time, reverse=True)[:10]:
             yield f'| {entry.corpus_entry} | {entry.original_size} | {entry.minified_size} | {entry.time:.3f} |'
 
+def format_size_change_detail(summary, base_summary) -> str:
+    mean_percent_of_original_change = summary.mean_percent_of_original - base_summary.mean_percent_of_original
+
+    s = f'{summary.mean_percent_of_original:.3f}% ({mean_percent_of_original_change:+.3f}%'
+
+    got_bigger_count = len(list(summary.compare_size_increase(base_summary)))
+    got_smaller_count = len(list(summary.compare_size_decrease(base_summary)))
+
+    if got_bigger_count > 0:
+        s += f', {got_bigger_count} :chart_with_upwards_trend:'
+    if got_smaller_count > 0:
+        s += f', {got_smaller_count} :chart_with_downwards_trend:'
+
+    s += ')'
+
+    return s
 
 def report(results_dir: str, minifier_ref: str, minifier_sha: str, base_ref: str, base_sha: str) -> Iterable[str]:
     """
@@ -336,28 +352,11 @@ def report(results_dir: str, minifier_ref: str, minifier_sha: str, base_ref: str
 
         mean_time_change = summary.mean_time - base_summary.mean_time
 
-        def format_size_change_detail() -> str:
-            mean_percent_of_original_change = summary.mean_percent_of_original - base_summary.mean_percent_of_original
-
-            s = f'{summary.mean_percent_of_original:.3f}% ({mean_percent_of_original_change:+.3f}%'
-
-            got_bigger_count = len(list(summary.compare_size_increase(base_summary)))
-            got_smaller_count = len(list(summary.compare_size_decrease(base_summary)))
-
-            if got_bigger_count > 0:
-                s += f', {got_bigger_count} :chart_with_upwards_trend:'
-            if got_smaller_count > 0:
-                s += f', {got_smaller_count} :chart_with_downwards_trend:'
-
-            s += ')'
-
-            return s
-
         yield (
                 f'| {python_version} ' +
                 f'| {summary.valid_count} ' +
                 f'| {summary.mean_time:.3f} ({mean_time_change:+.3f}) ' +
-                f'| {format_size_change_detail()} ' +
+                f'| {format_size_change_detail(summary, base_summary)} ' +
                 f'| {format_difference(summary.larger_than_original(), base_summary.larger_than_original())} ' +
                 f'| {format_difference(summary.recursion_error(), base_summary.recursion_error())} ' +
                 f'| {format_difference(summary.unstable_minification(), base_summary.unstable_minification())} ' +

corpus_test/generate_results.py

@@ -11,10 +11,10 @@
 from result import Result, ResultWriter
 
 try:
-    RE = RecursionError
+    RError = RecursionError
 except NameError:
     # Python 2
-    class RE(Exception):
+    class RError(Exception):
         pass
 
 
@@ -46,7 +46,7 @@ def minify_corpus_entry(corpus_path, corpus_entry):
 
         result.outcome = 'Minified'
 
-    except RE:
+    except RError:
         # Source is too deep
         result.outcome = 'RecursionError'
 
@@ -60,7 +60,7 @@ def minify_corpus_entry(corpus_path, corpus_entry):
         result.time = end_time - start_time
         result.outcome = 'UnstableMinification'
 
-    except AssertionError as assertion_error:
+    except AssertionError:
         result.outcome = 'Exception: AssertionError'
 
     except Exception as exception:
@@ -113,7 +113,7 @@ def corpus_test(corpus_path, results_path, sha, regenerate_results):
             if entry in result_writer:
                 continue
 
-            logging.debug('Corpus entry [' + entry + ']')
+            logging.debug('Corpus entry [%s]', entry)
 
             result = minify_corpus_entry(corpus_path, entry)
             result_writer.write(result)

corpus_test/result.py

@@ -79,7 +79,7 @@ def __init__(self, results_path):
     def __enter__(self):
         self.results = open(self._results_path, 'r')
         header = self.results.readline()
-        assert header == 'corpus_entry,original_size,minified_size,time,result\n' or header == ''
+        assert header in ['corpus_entry,original_size,minified_size,time,result\n', '']
         return self
 
     def __exit__(self, exc_type, exc_val, exc_tb):
@@ -99,12 +99,12 @@ def __next__(self):
 
         if line == '':
             raise StopIteration
-        else:
-            result_line = line.split(',')
-            return Result(
-                result_line[0],
-                int(result_line[1]),
-                int(result_line[2]),
-                float(result_line[3]),
-                result_line[4].rstrip()
-            )
+
+        result_line = line.split(',')
+        return Result(
+            result_line[0],
+            int(result_line[1]),
+            int(result_line[2]),
+            float(result_line[3]),
+            result_line[4].rstrip()
+        )

hypo_test/expressions.py

@@ -119,7 +119,7 @@ def name(draw) -> SearchStrategy:
     assume(' ' not in normalised)
     try:
         ast.parse(normalised, mode='eval')
-    except:
+    except Exception:
         assume(False)
     return normalised
 
@@ -212,14 +212,6 @@ def Attribute(draw, expression) -> ast.Attribute:
     attr = draw(text(alphabet=string.ascii_letters, min_size=1, max_size=3).filter(lambda n: n not in keyword.kwlist))
     return ast.Attribute(value, attr, ast.Load())
 
-
-@composite
-def Subscript(draw, expression) -> ast.Subscript:
-    value = draw(expression)
-    attr = draw(text(alphabet=string.ascii_letters, min_size=1, max_size=3))
-    return ast.Subscript(value, attr, ast.Load())
-
-
 @composite
 def Yield(draw, expression) -> ast.Yield:
     return ast.Yield(draw(expression))
@@ -296,7 +288,7 @@ def arg(draw, allow_annotation=True) -> ast.arg:
 @composite
 def arguments(draw, for_lambda=False) -> ast.arguments:
 
-    allow_annotation = False if for_lambda else True
+    allow_annotation = not for_lambda
 
     args = draw(lists(arg(allow_annotation), max_size=2))
     posonlyargs = draw(lists(arg(allow_annotation), max_size=2))

src/python_minifier/__main__.py

@@ -7,6 +7,7 @@
 from python_minifier import minify
 from python_minifier.transforms.remove_annotations_options import RemoveAnnotationsOptions
 
+
 if sys.version_info >= (3, 8):
     from importlib import metadata
 
@@ -270,9 +271,9 @@ def error(os_error):
 
     for path_arg in args.path:
         if os.path.isdir(path_arg):
-            for root, dirs, files in os.walk(path_arg, onerror=error, followlinks=True):
+            for root, _dirs, files in os.walk(path_arg, onerror=error, followlinks=True):
                 for file in files:
-                    if file.endswith('.py') or file.endswith('.pyw'):
+                    if file.endswith(('.py', '.pyw')):
                         yield os.path.join(root, file)
         else:
             yield path_arg

src/python_minifier/ast_compat.py

@@ -8,6 +8,7 @@
 
 from ast import *
 
+
 # Ideally we don't import anything else
 
 if 'TypeAlias' in globals():

src/python_minifier/ast_printer.py

@@ -14,6 +14,7 @@
 
 from python_minifier.util import is_ast_node
 
+
 INDENT = '    '
 
 # The field name that can be omitted for each node

src/python_minifier/expression_printer.py

@@ -629,7 +629,8 @@ def visit_arguments(self, node):
     def visit_arg(self, node):
         if isinstance(node, ast.Name):
             # Python 2 uses Name nodes
-            return self.visit_Name(node)
+            self.visit_Name(node)
+            return
 
         self.printer.identifier(node.arg)
 

src/python_minifier/f_string.py

@@ -36,7 +36,7 @@ def is_correct_ast(self, code):
             c = ast.parse(code, 'FString candidate', mode='eval')
             compare_ast(self.node, c.body)
             return True
-        except Exception as e:
+        except Exception:
             return False
 
     def complete_debug_specifier(self, partial_specifier_candidates, value_node):
@@ -79,12 +79,12 @@ def candidates(self):
                             # Maybe!
                             try:
                                 debug_specifier_candidates = [x + '{' + v.s for x in candidates]
-                            except Exception as e:
+                            except Exception:
                                 continue
 
                     try:
                         candidates = [x + self.str_for(v.s, quote) for x in candidates]
-                    except Exception as e:
+                    except Exception:
                         continue
                 elif isinstance(v, ast.FormattedValue):
                     try:
@@ -93,15 +93,14 @@ def candidates(self):
                             x + y for x in candidates for y in FormattedValue(v, nested_allowed, self.pep701).get_candidates()
                         ] + completed
                         debug_specifier_candidates = []
-                    except Exception as e:
+                    except Exception:
                         continue
                 else:
                     raise RuntimeError('Unexpected JoinedStr value')
 
                 actual_candidates += ['f' + quote + x + quote for x in candidates]
 
-        actual_candidates = filter(self.is_correct_ast, actual_candidates)
-        return actual_candidates
+        return filter(self.is_correct_ast, actual_candidates)
 
     def str_for(self, s, quote):
         return s.replace('{', '{{').replace('}', '}}')