replace `type(x) == y` checks by `isinstance(x, y)` and clean up resulting code #120

ghost · 2020-03-15T21:50:32Z

Especially, replace things like type(x) == type([]) by isinstance(x, list).

Also do x is None special casing.

Using the following py3 script:

import pathlib
import re
import sys

simple = {
    r"\[\]": r"list",
    r"\(\)": r"tuple",
    r"\(\d+,\)": r"tuple",
    r"\{\}": r"dict",
    r"\d+": r"int",
    r"''": r"str",
    r'""': r"str",
    r"long\(\d+\)": r"long",
}

others = {
    r"type\((.*?)\)\s*==\s*type\(\s*None\s*\)": r"\1 is None",
    r"type\((.*?)\)\s*!=\s*type\(\s*None\s*\)": r"\1 is not None",
    r"type\((.*?)\)\s*==\s*(type\(.*?\))": r"isinstance(\1, \2)",
    r"type\((.*?)\)\s*!=\s*(type\(.*?\))": r"not isinstance(\1, \2)",
}

def replace_in_all_files(root, pat, sub):
    for path in root.glob("**/*.py"):
        with path.open() as file:
            data = file.read()
        new_data = pat.sub(sub, data)
        if data != new_data:
            with path.open("w") as file:
                file.write(new_data)

root = pathlib.Path(sys.argv[1])

for str_pat, sub in simple.items():
    replace_in_all_files(
        root,
        re.compile(rf"type\((.*?)\)\s*==\s*type\(\s*{str_pat}\s*\)"),
        rf"isinstance(\1, {sub})",
    )
    replace_in_all_files(
        root,
        re.compile(rf"type\((.*?)\)\s*!=\s*type\(\s*{str_pat}\s*\)"),
        rf"not isinstance(\1, {sub})",
    )

for str_pat, sub in others.items():
    replace_in_all_files(root, re.compile(str_pat), sub)

Especially, replace things like `type(x) == type([])` by `isinstance(list)`. Also do `x is None` special casing. Using the following py3 script: import pathlib import re import sys simple = { r"\[\]": r"list", r"\(\)": r"tuple", r"\(\d+,\)": r"tuple", r"\{\}": r"dict", r"\d+": r"int", r"''": r"str", r'""': r"str", r"long\(\d+\)": r"long", } others = { r"type\((.*?)\)\s*==\s*type\(\s*None\s*\)": r"\1 is None", r"type\((.*?)\)\s*!=\s*type\(\s*None\s*\)": r"\1 is not None", r"type\((.*?)\)\s*==\s*(type\(.*?\))": r"isinstance(\1, \2)", r"type\((.*?)\)\s*!=\s*(type\(.*?\))": r"not isinstance(\1, \2)", } def replace_in_all_files(root, pat, sub): for path in root.glob("**/*.py"): with path.open() as file: data = file.read() new_data = pat.sub(sub, data) if data != new_data: with path.open("w") as file: file.write(new_data) root = pathlib.Path(sys.argv[1]) for str_pat, sub in simple.items(): replace_in_all_files( root, re.compile(rf"type\((.*?)\)\s*==\s*type\(\s*{str_pat}\s*\)"), rf"isinstance(\1, {sub})", ) replace_in_all_files( root, re.compile(rf"type\((.*?)\)\s*!=\s*type\(\s*{str_pat}\s*\)"), rf"not isinstance(\1, {sub})", ) for str_pat, sub in others.items(): replace_in_all_files(root, re.compile(str_pat), sub)

Hoikas

It looks like Cyan copy and pasted several anti-patterns that could be further cleaned up.

Python/GiraCave1.py

Python/bhroBahroYeeshaCave.py

Python/clftRS.py

Python/xTakableClothing.py

Hoikas

It looks like Cyan copy and pasted several anti-patterns that could be further cleaned up.

ghost · 2020-03-16T19:05:19Z

All comments addressed. Most of them were some easy regex but had to make sure they caught all your comments.

Hoikas · 2020-03-16T23:54:34Z

Python/clftYeeshaPage08.py

                return 0
        else:
-            PtDebugPrint("ERROR: clftYeeshaPage08: Error trying to access the Vault. Can't access YeeshaPageChanges chronicle." )
+            PtDebugPrint("ERROR: clftYeeshaPage08: Error trying to access the Chronicle psnlSDL. psnlSDL = %s" % ( psnlSDL))


ERROR: clftYeeshaPage08: Error trying to access the Chronicle psnlSDL. psnlSDL = None?

Or at least psnlSDL is falsey. It's like that on master. What do you think should happen here?

Hoikas · 2020-03-16T23:57:27Z

Python/ki/__init__.py

        else:
-            PtDebugPrint(u"xKI.GetYeeshaPageDefs(): Trying to access the Vault failed, can't access YeeshaPageChanges Chronicle.", level=kErrorLevel)
+            PtDebugPrint(u"xKI.GetYeeshaPageDefs(): Trying to access the Chronicle psnlSDL failed: psnlSDL = \"{}\".".format(psnlSDL), level=kErrorLevel)


xKI.GetYeeshaPageDefs(): Trying to access the Chronicle psnlSDL failed: psnlSDL = None?

Or at least psnlSDL is falsey. It's like that on master. What do you think should happen here?

Python/nb01RPSGame.py

Python/psnlBahroPoles.py

Python/xCheat.py

Python/xMusicBox.py

Python/xPotsSymbol.py

Python/xRandomBoolChange.py

Hoikas · 2020-03-17T00:11:27Z

Python/xYeeshaPages.py

            else:
-                PtDebugPrint("xYeeshaPages: Error trying to access the Vault. Can't access YeeshaPageChanges chronicle." )
+                PtDebugPrint("xYeeshaPages: Error trying to access the Chronicle psnlSDL. psnlSDL = %s" % ( psnlSDL))


xYeeshaPages: Error trying to access the Chronicle psnlSDL. psnlSDL = None?

Or at least psnlSDL is falsey. It's like that on master. What do you think should happen here?

Python/kemoJourneyClothGate.py

This also helps with 2to3.

Hoikas · 2020-03-26T01:34:01Z

💥 💥 💥

Hoikas reviewed Mar 16, 2020

View reviewed changes

Hoikas reviewed Mar 17, 2020

View reviewed changes

aqua-uru added 2 commits March 17, 2020 10:06

replace type and value check by "if x:"

1e707bb

remove vault None checks

49b84ec

ghost changed the title ~~replace type(x) == type(y) checks by isinstance~~ replace type(x) == type(y) checks by isinstance and releated Mar 17, 2020

ghost changed the title ~~replace type(x) == type(y) checks by isinstance and releated~~ replace type(x) == type(y) checks by isinstance and related Mar 17, 2020

ghost changed the title ~~replace type(x) == type(y) checks by isinstance and related~~ replace type(x) == y checks by isinstance(x, y) and clean up resulting code Mar 17, 2020

Hoikas reviewed Mar 17, 2020

View reviewed changes

Python/kemoJourneyClothGate.py Outdated Show resolved Hide resolved

Hoikas mentioned this pull request Mar 17, 2020

Fix ptVaultNode's richcompare function. H-uru/Plasma#642

Merged

aqua-uru added 4 commits March 17, 2020 22:17

replace plasma types in insinstance checks

b66e384

make some isinstance checks implicit

39f8de0

improve xPotsSymbol:OnFirstUpdate

c5ce19e

change types module checks to isinstance

090897f

This also helps with 2to3.

Hoikas merged commit 999582f into H-uru:master Mar 26, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

replace `type(x) == y` checks by `isinstance(x, y)` and clean up resulting code #120

replace `type(x) == y` checks by `isinstance(x, y)` and clean up resulting code #120

ghost commented Mar 15, 2020 •

edited by ghost

Loading

Hoikas left a comment

Hoikas left a comment

ghost commented Mar 16, 2020

Hoikas Mar 16, 2020

ghost Mar 17, 2020

Hoikas Mar 16, 2020

ghost Mar 17, 2020

Hoikas Mar 17, 2020

ghost Mar 17, 2020 •

edited by ghost

Loading

Hoikas commented Mar 26, 2020

replace type(x) == y checks by isinstance(x, y) and clean up resulting code #120

replace type(x) == y checks by isinstance(x, y) and clean up resulting code #120

Conversation

ghost commented Mar 15, 2020 • edited by ghost Loading

Hoikas left a comment

Choose a reason for hiding this comment

Hoikas left a comment

Choose a reason for hiding this comment

ghost commented Mar 16, 2020

Hoikas Mar 16, 2020

Choose a reason for hiding this comment

ghost Mar 17, 2020

Choose a reason for hiding this comment

Hoikas Mar 16, 2020

Choose a reason for hiding this comment

ghost Mar 17, 2020

Choose a reason for hiding this comment

Hoikas Mar 17, 2020

Choose a reason for hiding this comment

ghost Mar 17, 2020 • edited by ghost Loading

Choose a reason for hiding this comment

Hoikas commented Mar 26, 2020

replace `type(x) == y` checks by `isinstance(x, y)` and clean up resulting code #120

replace `type(x) == y` checks by `isinstance(x, y)` and clean up resulting code #120

ghost commented Mar 15, 2020 •

edited by ghost

Loading

ghost Mar 17, 2020 •

edited by ghost

Loading