drop python<=3.7 support #1587

kloczek · 2024-06-12T21:35:38Z

According to https://endoflife.date/python python 3.7 has been EOSed 27 Jun 2023.
Filter all code over pyupgracde --py38-plus.

According to https://endoflife.date/python python 3.7 has been EOSed 27 Jun 2023. Filter all code over `pyupgracde --py38-plus`. Signed-off-by: Tomasz Kłoczko <kloczek@github.com>

Signed-off-by: Tomasz Kłoczko <kloczek@github.com>

Mostly removes unused imports Signed-off-by: Tomasz Kłoczko <kloczek@github.com>

LeonarddeR

Could you please ensure that f-strings are used where appropriate?

LeonarddeR · 2024-08-05T17:35:49Z

tools/lou_maketable.d/make_suggestions.py

@@ -25,7 +25,7 @@ def update_counters(total, init=False):
    if not init:
        sys.stderr.write("\033[1A\033[K")
        sys.stderr.write("\033[1A\033[K")
-    sys.stderr.write(("%d words processed\n" % total))
+    sys.stderr.write("%d words processed\n" % total)


Suggested change

sys.stderr.write("%d words processed\n" % total)

sys.stderr.write(f"{total} words processed\n")

LeonarddeR · 2024-08-05T17:37:31Z

tools/lou_maketable.d/make_suggestions.py

@@ -79,7 +79,7 @@ def main():
                    for rule in suggest_rules:
                        println("%(opcode)s\t%(text)s\t%(braille)s" % rule)
                else:
-                    println("# >>>\t%s\t%s" % (text, braille or ""))
+                    println("# >>>\t{}\t{}".format(text, braille or ""))


Suggested change

println("# >>>\t{}\t{}".format(text, braille or ""))

println(f"# >>>\t{text}\t{braille or ""}")

LeonarddeR · 2024-08-05T17:38:41Z

tools/lou_maketable.d/submit_rows.py

@@ -34,18 +34,18 @@ def __next__(self):
        if not row or row[0].startswith("#"):
            return next(self)
        if not len(row) == 3:
-            printerrln('expected 3 columns, got %s: %s' % (len(row),row))
+            printerrln('expected 3 columns, got {}: {}'.format(len(row),row))


Suggested change

printerrln('expected 3 columns, got {}: {}'.format(len(row),row))

```suggestion

printerrln(f'expected 3 columns, got {len(row)}: {row}')

LeonarddeR · 2024-08-05T17:39:52Z

tools/lou_maketable.d/submit_rows.py

            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,))
+                printerrln('invalid braille: {}'.format(braille))


printerrln(f'invalid braille: {braille}')

LeonarddeR · 2024-08-05T17:40:29Z

tools/lou_maketable.d/submit_rules.py

@@ -45,7 +45,7 @@ def main():
    for line in fileinput.FileInput(args.FILE, openhook=fileinput.hook_encoded("utf-8")):
        m = p.match(line)
        if not m:
-            printerrln("%s: rule is not valid" % (line,))
+            printerrln("{}: rule is not valid".format(line))


Suggested change

printerrln("{}: rule is not valid".format(line))

printerrln(f"{line}: rule is not valid")

LeonarddeR · 2024-08-05T17:41:19Z

tools/lou_maketable.d/submit_rules.py

@@ -62,16 +62,16 @@ def main():
            rule = list(rule)
            if add_or_delete == '-':
                if not rule:
-                    printerrln("%s%s %s %s: rule can not be deleted because not in %s" % (nocross,opcode,text,braille,args.CONTRACTION_TABLE))
+                    printerrln("{}{} {} {}: rule can not be deleted because not in {}".format(nocross,opcode,text,braille,args.CONTRACTION_TABLE))


Please use f-string formatting

LeonarddeR · 2024-08-05T17:41:32Z

tools/lou_maketable.d/submit_rules.py

                    exit(1)
            else:
                if rule:
-                    printerrln("%s%s %s %s: rule can not be added because already in %s" % (nocross,opcode,text,braille,args.CONTRACTION_TABLE))
+                    printerrln("{}{} {} {}: rule can not be added because already in {}".format(nocross,opcode,text,braille,args.CONTRACTION_TABLE))


please use an f-string

LeonarddeR · 2024-08-05T17:41:44Z

tools/lou_maketable.d/submit_rules.py

                    exit(1)
                rule = {"opcode": opcode, "nocross": nocross, "text": text, "braille": braille, "comment": comment}
                rules.append(rule)
    opcode_order = {"word": 1, "always": 2, "begword": 3, "endword": 4, "midword": 5, "begmidword": 6, "midendword": 7, "prfword": 8, "sufword": 9}
    for rule in sorted(rules, key=lambda rule: (rule["text"], rule["nocross"], opcode_order[rule["opcode"]])):
-        println(u"{nocross:<9}{opcode:<10} {text:<10} {braille:<30} {comment}".format(**rule))
+        println("{nocross:<9}{opcode:<10} {text:<10} {braille:<30} {comment}".format(**rule))


Please use an f-string

LeonarddeR · 2024-08-05T17:42:06Z

tools/lou_maketable.d/utils.py

@@ -39,10 +39,10 @@ def exit_if_not(expression):
 liblouis.toLowercase.restype = c_wchar

 def println(line=""):
-    sys.stdout.write(("%s\n" % line))
+    sys.stdout.write("%s\n" % line)


Please use an f-string

LeonarddeR · 2024-08-05T17:42:15Z

tools/lou_maketable.d/utils.py


 def printerrln(line=""):
-    sys.stderr.write(("%s\n" % line))
+    sys.stderr.write("%s\n" % line)


idem as above

egli · 2024-08-19T13:42:15Z

@LeonarddeR what do you think? Why do we have to drop the backwards compatibility?

LeonarddeR · 2024-08-19T15:55:42Z

It is not strictly necessary to do so, but Python <3.7 is out of support so it doesn't make much sense to keep it. On the other hand, if it works, don't break it.

bertfrees · 2024-08-19T16:04:53Z

if it works, don't break it

I'm also for that principle. You never know who is using Liblouis and how (and for what reason they might be stuck with an old Python).

egli · 2024-08-20T06:57:36Z

OK, then we can just drop the python_requires=">=3.8" part.

Do the other changes make sense (or even work) if you have python 3.7?

egli · 2024-08-30T14:06:19Z

Do the other changes make sense (or even work) if you have python 3.7?

@LeonarddeR any idea?

LeonarddeR · 2024-08-30T14:08:22Z

As far as I can see, all the changes proposed in here do work with python 3.7.

egli · 2024-08-30T14:33:14Z

As far as I can see, all the changes proposed in here do work with python 3.7.

OK, thanks

kloczek added 3 commits June 12, 2024 21:33

drop python<=3.7 support

13e9542

According to https://endoflife.date/python python 3.7 has been EOSed 27 Jun 2023. Filter all code over `pyupgracde --py38-plus`. Signed-off-by: Tomasz Kłoczko <kloczek@github.com>

Add python_requires=">=3.8"

8a58004

Signed-off-by: Tomasz Kłoczko <kloczek@github.com>

filter all python code over ruff

84857a2

Mostly removes unused imports Signed-off-by: Tomasz Kłoczko <kloczek@github.com>

egli added this to the 3.31 milestone Jun 13, 2024

egli added python An issue concerning the Python bindings cleanup Cleanup (possibly removing features) to make the code more maintainable labels Jun 13, 2024

LeonarddeR suggested changes Aug 5, 2024

View reviewed changes

egli added the needs news Update to NEWS file needed label Aug 19, 2024

egli removed this from the 3.31 milestone Aug 30, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

drop python<=3.7 support #1587

drop python<=3.7 support #1587

	sys.stderr.write("%d words processed\n" % total)
	sys.stderr.write(f"{total} words processed\n")

	println("# >>>\t{}\t{}".format(text, braille or ""))
	println(f"# >>>\t{text}\t{braille or ""}")

	printerrln('expected 3 columns, got {}: {}'.format(len(row),row))
	```suggestion
	printerrln(f'expected 3 columns, got {len(row)}: {row}')

	printerrln("{}: rule is not valid".format(line))
	printerrln(f"{line}: rule is not valid")

drop python<=3.7 support #1587

Are you sure you want to change the base?

drop python<=3.7 support #1587

Conversation

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment