Sourcery refactored master branch by sourcery-ai[bot] · Pull Request #1 · Roshanson/liblouis

sourcery-ai · 2022-07-18T09:10:57Z

Branch master refactored by Sourcery.

If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.

See our documentation here.

Run Sourcery locally

Reduce the feedback loop during development by using the Sourcery editor plugin:

Review changes via command line

To manually merge these changes, make sure you're on the master branch, then run:

git fetch origin sourcery/master
git merge --ff-only FETCH_HEAD
git reset HEAD^

Help us improve this pull request!

sourcery-ai · 2022-07-18T09:10:59Z

tools/lou_maketable.d/export_chunked_words.py

-            printerrln('WARNING: word is too long to be processed, may be translated incorrectly: %s' % text)
+            printerrln(
+                f'WARNING: word is too long to be processed, may be translated incorrectly: {text}'
+            )
+
            continue
        if not is_letter(text):
-            printerrln('WARNING: word has non-letters: %s' % text)
+            printerrln(f'WARNING: word has non-letters: {text}')
            continue
-        suggested_hyphen_string = suggest_chunks(text, braille)
-        if suggested_hyphen_string:
+        if suggested_hyphen_string := suggest_chunks(text, braille):


Function main refactored with the following changes:

Replace interpolated string formatting with f-string [×2] (replace-interpolation-with-fstring)

Use named expression to simplify assignment and conditional (use-named-expression)

sourcery-ai · 2022-07-18T09:11:00Z

tools/lou_maketable.d/make_suggestions.py

-                    comments = []
-                    comments.append("wrong braille\t\t" + actual_braille)
+                    comments = ["wrong braille\t\t" + actual_braille]
                    suggest_rows = []
-                    suggest_rules = []
                    non_letters = False
                    if not is_letter(text):
                        non_letters = True
                        comments.append("word has non-letters")
                    comments.append("applied rules")
                    applied_rules = [get_rule(x) for x in applied_rules if x is not None]
-                    for rule in applied_rules:
-                        comments.append("> " + "\t".join(rule))
-                    other_relevant_rules = set(find_relevant_rules(text)) - set(applied_rules)
-                    if other_relevant_rules:
+                    comments.extend("> " + "\t".join(rule) for rule in applied_rules)
+                    if other_relevant_rules := set(
+                        find_relevant_rules(text)
+                    ) - set(applied_rules):
                        comments.append("other relevant rules")
-                        for rule in other_relevant_rules:
-                            comments.append("> " + "\t".join(rule))
-                    suggest_rules.append({"opcode": "word", "text": text, "braille": braille})
+                        comments.extend("> " + "\t".join(rule) for rule in other_relevant_rules)
+                    suggest_rules = [{"opcode": "word", "text": text, "braille": braille}]


Function main refactored with the following changes:

Merge append into list declaration [×2] (merge-list-append)

Move assignment closer to its usage within a block (move-assign-in-block)

Replace a for append loop with list extend [×2] (for-append-to-extend)

Use named expression to simplify assignment and conditional (use-named-expression)

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2022-07-18T09:11:00Z

tools/lou_maketable.d/submit_rows.py

-        if not len(row) == 3:
-            printerrln('expected 3 columns, got %s: %s' % (len(row),row))
+        if len(row) != 3:
+            printerrln(f'expected 3 columns, got {len(row)}: {row}')
            exit(1)
-        if not row[0] == "":
+        if row[0] != "":
            printerrln("expected first column to be empty, got '%s'" % (row[0],))
            exit(1)
        maybe_chunked_text, braille = row[1:3]
        maybe_chunked_text = to_lowercase(maybe_chunked_text)
        text, chunked_text = read_text(maybe_chunked_text)
        braille = braille if braille != "" else None
-        if braille != None:
-            if '0' in to_dot_pattern(braille).split('-'):
-                printerrln('invalid braille: %s' % (braille,))
-                exit(1)
+        if braille != None and '0' in to_dot_pattern(braille).split('-'):
+            printerrln(f'invalid braille: {braille}')
+            exit(1)


Function Reader.__next__ refactored with the following changes:

Simplify logical expression using De Morgan identities [×2] (de-morgan)

Replace interpolated string formatting with f-string [×2] (replace-interpolation-with-fstring)

Merge nested if conditions (merge-nested-ifs)

sourcery-ai · 2022-07-18T09:11:00Z

tools/lou_maketable.d/submit_rules.py

    for line in fileinput.FileInput(args.CONTRACTION_TABLE, openhook=fileinput.hook_encoded("utf-8")):
        m = p.match(line)
-        exit_if_not(m and not m.group(1))
+        exit_if_not(m and not m[1])


Function main refactored with the following changes:

Replace m.group(x) with m[x] for re.Match objects (use-getitem-for-re-match-groups)

Replace interpolated string formatting with f-string [×3] (replace-interpolation-with-fstring)

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2022-07-18T09:11:00Z