Refactoring Code

[yezz123]

Setup.py

• Use with when opening file to ensure closure

Util.py

• Remove unnecessary else after guard condition
• Replace if statement with if expression
• Remove unnecessary else after guard condition
• Replace unneeded comprehension with generator
• Inline variable that is immediately returned

Template.py

• Replace if statement with if expression, Simplify if expression by using or
• Replace list(), dict() or set() with comprehension
• Swap if/else branches, Merge else clause's nested if statement into elif

Runtime.py

• Remove unnecessary else after guard condition

PyParser.py

• Replace yield inside for loop with yield from
• Lift code into else after jump in control flow, Merge else clause's nested if statement into elif
• Replace if statement with if expression

Pygen.py

• Merge nested if conditions
• Simplify conditional into return statement (removes comment)
• Replace if statement with if expression, Simplify boolean if expression

Parsetree.py

• Replace unneeded comprehension with generator
• Merge else clause's nested if statement into elif
• Replace unneeded comprehension with generator

Lookup.py

• Swap if/else branches, Merge else clause's nested if statement into elif
• Swap if/else branches, Remove unnecessary else after guard condition

Lexer.py

• Replace if statement with if expression
• Merge nested if conditions
• Swap if/else branches, Remove unnecessary else after guard condition, Merge else clause's nested if statement into elif
• Swap if/else branches, Remove unnecessary else after guard condition

Exceptions.py

• Replace if statement with if expression, Use with when opening file to ensure closure

Ast.py

• Replace multiple comparisons of same variable with in operator

Pygmentplugin.py

• Replace if statement with if expression

[CaselIT]

Thanks for the effort,

this breaks compat with py2 because of the yield from as mentioned. I'm not sure if we want to that. (maybe we should?)

cc @zzzeek

[yezz123]

@CaselIT I Code this based on Python 3.X

[CaselIT]

@CaselIT I Code this based on Python 3.X

I just noticed that mako still supports 2.7.

It may be time to drop it, let's wait mike's opinion :)

[zzzeek]

it would have to be a new "minor" release number 1.2

[sqla-tester]

OK, this is sqla-tester setting up my work on behalf of CaselIT to try to get revision 7706cd6 of this pull request into gerrit so we can run tests and reviews and stuff

[sqla-tester]

New Gerrit review created for change 7706cd6: https://gerrit.sqlalchemy.org/c/sqlalchemy/mako/+/3064

[zzzeek]

these are good changes but i think there should first be a new mako 1.2 startup that is python 3 only, then these refactorings go in. anyone want to work on this?

[CaselIT]

will take a look

[CaselIT]

will take a look

@zzzeek added https://gerrit.sqlalchemy.org/c/sqlalchemy/mako/+/3078

we need to run black, but probably after this is merged. the above patch will probably cause some conflicts with this one

[sqla-tester]

OK, this is sqla-tester setting up my work on behalf of CaselIT to try to get revision d94a809 of this pull request into gerrit so we can run tests and reviews and stuff

[sqla-tester]

Failed to create a gerrit review, git squash against branch 'main' failed

[CaselIT]

I'll try to fix the conflicts later

[sqla-tester]

OK, this is sqla-tester setting up my work on behalf of CaselIT to try to get revision c6243b1 of this pull request into gerrit so we can run tests and reviews and stuff

[sqla-tester]

Patchset c6243b1 added to existing Gerrit review https://gerrit.sqlalchemy.org/c/sqlalchemy/mako/+/3140

[sqla-tester]

mike bayer (zzzeek) wrote:

a couple of changes including one type-related error that I think has to be restored. some bigger points:

1. do we want to just go straight to python 3.7?

2. do we have a ticket to fix the pkg_resources stuff?

View this in Gerrit at https://gerrit.sqlalchemy.org/c/sqlalchemy/mako/+/3140

• mako/ext/linguaplugin.py (line 27): if we use python 3.7 we can use nullcontext() here

  if fileobj is None:
  ctx = open(filename, "r")
  else:
  ctx = contextlib.nullcontext(fileobj)
  with ctx as file_:
  yield from self.process_file(file_)

https://docs.python.org/3/library/contextlib.html#contextlib.nullcontext

python 3.6 ends on december 23 this year

[CaselIT]

updated in gerrit

[CaselIT]

do we have a ticket to fix the pkg_resources stuff?

I've added it to #340

[sqla-tester]

Gerrit review https://gerrit.sqlalchemy.org/c/sqlalchemy/mako/+/3140 has been merged. Congratulations! :)

[CaselIT]

thanks!

[yezz123]

@CaselIT is this PR merged in another way ?

[CaselIT]

yes, it was merged by with a commit here c47d172

[CaselIT]

I don't understand why it changed the author :\ I must have messed something up. sorry :(

[yezz123]

@CaselIT No problem, its a great thing to help one of the most thing i use daily 🚀

[sqla-tester]

Federico Caselli (CaselIT) wrote:

leftover for branch name change. this was already merged

View this in Gerrit at https://gerrit.sqlalchemy.org/c/sqlalchemy/mako/+/3064

[sqla-tester]

Gerrit review https://gerrit.sqlalchemy.org/c/sqlalchemy/mako/+/3064 has been abandoned. That means that at least for the moment I need to close this pull request. Sorry it didn't work out :(