Clean Code: Apply flake8-simplify to Python

Also flake8-comprehensions which was added to the CI

For flake8-simplify, there are a few false-positives,
e.g. https://github.com/MartinThoma/flake8-simplify/issues/115
This commit is contained in:
Martin Thoma
2022-03-18 22:27:31 +01:00
parent d43ec589c8
commit 3b2739b8a2
28 changed files with 168 additions and 214 deletions

View File

@@ -28,32 +28,26 @@ class Space(Enum):
def line_170(board, g, h, j, k):
if g == OccupiedBy.Player:
if board[Space.MID_CENTER] == g:
if (
board[Space.TOP_RIGHT] == g
and board[Space.BOTTOM_LEFT] is OccupiedBy.EMPTY
): # Line 171
return Space.BOTTOM_LEFT # Line 187
elif (
board[Space.BOTTOM_RIGHT] == g
and board[Space.TOP_LEFT] is OccupiedBy.EMPTY
): # Line 172
return Space.TOP_LEFT # Line 181
elif (
board[Space.BOTTOM_LEFT] == g
and board[Space.TOP_RIGHT] is OccupiedBy.EMPTY
): # Line 173
return Space.TOP_RIGHT # Line 183
elif (
board[Space.BOTTOM_RIGHT] is OccupiedBy.PLAYER
and board[Space.TOP_RIGHT] is OccupiedBy.EMPTY
): # Line 174
return Space.TOP_RIGHT # Line 189
elif g is OccupiedBy.COMPUTER:
g = OccupiedBy.PLAYER
h = OccupiedBy.COMPUTER
return line_118(board, g, h, j, k)
if g == OccupiedBy.Player and board[Space.MID_CENTER] == g:
if (
board[Space.TOP_RIGHT] == g and board[Space.BOTTOM_LEFT] is OccupiedBy.EMPTY
): # Line 171
return Space.BOTTOM_LEFT # Line 187
elif (
board[Space.BOTTOM_RIGHT] == g and board[Space.TOP_LEFT] is OccupiedBy.EMPTY
): # Line 172
return Space.TOP_LEFT # Line 181
elif (
board[Space.BOTTOM_LEFT] == g and board[Space.TOP_RIGHT] is OccupiedBy.EMPTY
) or (
board[Space.BOTTOM_RIGHT] is OccupiedBy.PLAYER
and board[Space.TOP_RIGHT] is OccupiedBy.EMPTY
): # Line 173 and 174
return Space.TOP_RIGHT # Line 183 and Line 189
elif g is OccupiedBy.COMPUTER:
g = OccupiedBy.PLAYER
h = OccupiedBy.COMPUTER
return line_118(board, g, h, j, k)
def line_150(board, g, h, j, k):