Skip to content

Commit 87e7d31

Browse files
committed
ruff: Fix N806 Variable in function should be lowercase.
Signed-off-by: Anders Kaseorg <[email protected]>
1 parent 5e708e3 commit 87e7d31

File tree

17 files changed

+92
-90
lines changed

17 files changed

+92
-90
lines changed

zulip/integrations/codebase/zulip_codebase_mirror

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -284,11 +284,11 @@ def run_mirror() -> None:
284284
since = default_since()
285285

286286
try:
287-
sleepInterval = 1
287+
sleep_interval = 1
288288
while True:
289289
events = make_api_call("activity")
290290
if events is not None:
291-
sleepInterval = 1
291+
sleep_interval = 1
292292
for event in events[::-1]:
293293
timestamp = event.get("event", {}).get("timestamp", "")
294294
event_date = dateutil.parser.parse(timestamp)
@@ -297,9 +297,9 @@ def run_mirror() -> None:
297297
since = event_date
298298
else:
299299
# back off a bit
300-
if sleepInterval < 22:
301-
sleepInterval += 4
302-
time.sleep(sleepInterval)
300+
if sleep_interval < 22:
301+
sleep_interval += 4
302+
time.sleep(sleep_interval)
303303

304304
except KeyboardInterrupt:
305305
open(config.RESUME_FILE, "w").write(since.strftime("%s"))

zulip/integrations/rss/rss-bot

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,9 @@ def unwrap_text(body: str) -> str:
166166

167167

168168
def elide_subject(subject: str) -> str:
169-
MAX_TOPIC_LENGTH = 60
170-
if len(subject) > MAX_TOPIC_LENGTH:
171-
subject = subject[: MAX_TOPIC_LENGTH - 3].rstrip() + "..."
169+
max_topic_length = 60
170+
if len(subject) > max_topic_length:
171+
subject = subject[: max_topic_length - 3].rstrip() + "..."
172172
return subject
173173

174174

zulip_bots/zulip_bots/bots/connect_four/connect_four.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def __init__(self) -> None:
5252
)
5353
move_regex = "(move ([1-7])$)|(([1-7])$)"
5454
model = ConnectFourModel
55-
gameMessageHandler = ConnectFourMessageHandler
55+
game_message_handler = ConnectFourMessageHandler
5656
rules = """Try to get four pieces in row, Diagonals count too!"""
5757

5858
super().__init__(
@@ -61,7 +61,7 @@ def __init__(self) -> None:
6161
move_help_message,
6262
move_regex,
6363
model,
64-
gameMessageHandler,
64+
game_message_handler,
6565
rules,
6666
max_players=2,
6767
)

zulip_bots/zulip_bots/bots/connect_four/test_connect_four.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -130,28 +130,28 @@ def test_connect_four_logic(self) -> None:
130130
def confirm_available_moves(
131131
good_moves: List[int], bad_moves: List[int], board: List[List[int]]
132132
) -> None:
133-
connectFourModel.update_board(board)
133+
connect_four_model.update_board(board)
134134

135135
for move in good_moves:
136-
self.assertTrue(connectFourModel.validate_move(move))
136+
self.assertTrue(connect_four_model.validate_move(move))
137137

138138
for move in bad_moves:
139-
self.assertFalse(connectFourModel.validate_move(move))
139+
self.assertFalse(connect_four_model.validate_move(move))
140140

141141
def confirm_move(
142142
column_number: int,
143143
token_number: int,
144144
initial_board: List[List[int]],
145145
final_board: List[List[int]],
146146
) -> None:
147-
connectFourModel.update_board(initial_board)
148-
test_board = connectFourModel.make_move("move " + str(column_number), token_number)
147+
connect_four_model.update_board(initial_board)
148+
test_board = connect_four_model.make_move("move " + str(column_number), token_number)
149149

150150
self.assertEqual(test_board, final_board)
151151

152152
def confirm_game_over(board: List[List[int]], result: str) -> None:
153-
connectFourModel.update_board(board)
154-
game_over = connectFourModel.determine_game_over(["first_player", "second_player"])
153+
connect_four_model.update_board(board)
154+
game_over = connect_four_model.determine_game_over(["first_player", "second_player"])
155155

156156
self.assertEqual(game_over, result)
157157

@@ -162,7 +162,7 @@ def confirm_win_states(array: List[List[List[List[int]]]]) -> None:
162162
for board in array[1]:
163163
confirm_game_over(board, "second_player")
164164

165-
connectFourModel = ConnectFourModel()
165+
connect_four_model = ConnectFourModel()
166166

167167
# Basic Board setups
168168
blank_board = [
@@ -433,14 +433,14 @@ def confirm_win_states(array: List[List[List[List[int]]]]) -> None:
433433
confirm_available_moves([0, 1, 2, 3, 4, 5], [6], diagonal_board)
434434

435435
# Test Available Move Logic
436-
connectFourModel.update_board(blank_board)
437-
self.assertEqual(connectFourModel.available_moves(), [0, 1, 2, 3, 4, 5, 6])
436+
connect_four_model.update_board(blank_board)
437+
self.assertEqual(connect_four_model.available_moves(), [0, 1, 2, 3, 4, 5, 6])
438438

439-
connectFourModel.update_board(single_column_board)
440-
self.assertEqual(connectFourModel.available_moves(), [3])
439+
connect_four_model.update_board(single_column_board)
440+
self.assertEqual(connect_four_model.available_moves(), [3])
441441

442-
connectFourModel.update_board(full_board)
443-
self.assertEqual(connectFourModel.available_moves(), [])
442+
connect_four_model.update_board(full_board)
443+
self.assertEqual(connect_four_model.available_moves(), [])
444444

445445
# Test Move Logic
446446
confirm_move(

zulip_bots/zulip_bots/bots/file_uploader/file_uploader.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ def usage(self) -> str:
1414
)
1515

1616
def handle_message(self, message: Dict[str, str], bot_handler: BotHandler) -> None:
17-
HELP_STR = (
17+
help_str = (
1818
"Use this bot with any of the following commands:"
1919
"\n* `@uploader <local_file_path>` : Upload a file, where `<local_file_path>` is the path to the file"
2020
"\n* `@uploader help` : Display help message"
2121
)
2222

2323
content = message["content"].strip()
2424
if content == "help":
25-
bot_handler.send_reply(message, HELP_STR)
25+
bot_handler.send_reply(message, help_str)
2626
return
2727

2828
path = Path(os.path.expanduser(content))

zulip_bots/zulip_bots/bots/game_handler_bot/game_handler_bot.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def __init__(self) -> None:
5050
move_help_message = "* To make your move during a game, type\n```move <column-number>```"
5151
move_regex = r"move (\d)$"
5252
model = MockModel
53-
gameMessageHandler = GameHandlerBotMessageHandler
53+
game_message_handler = GameHandlerBotMessageHandler
5454
rules = ""
5555

5656
super().__init__(
@@ -59,7 +59,7 @@ def __init__(self) -> None:
5959
move_help_message,
6060
move_regex,
6161
model,
62-
gameMessageHandler,
62+
game_message_handler,
6363
rules,
6464
max_players=2,
6565
supports_computer=True,

zulip_bots/zulip_bots/bots/game_of_fifteen/game_of_fifteen.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ def __init__(self) -> None:
130130
)
131131
move_regex = r"move [\d{1}\s]+$"
132132
model = GameOfFifteenModel
133-
gameMessageHandler = GameOfFifteenMessageHandler
133+
game_message_handler = GameOfFifteenMessageHandler
134134
rules = """Arrange the board’s tiles from smallest to largest, left to right,
135135
top to bottom, and tiles adjacent to :grey_question: can only be moved.
136136
Final configuration will have :grey_question: in top left."""
@@ -141,7 +141,7 @@ def __init__(self) -> None:
141141
move_help_message,
142142
move_regex,
143143
model,
144-
gameMessageHandler,
144+
game_message_handler,
145145
rules,
146146
min_players=1,
147147
max_players=1,

zulip_bots/zulip_bots/bots/game_of_fifteen/test_game_of_fifteen.py

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ def test_game_message_handler_responses(self) -> None:
5959
board = "\n\n:grey_question::one::two:\n\n:three::four::five:\n\n:six::seven::eight:"
6060
bot, bot_handler = self._get_handlers()
6161
self.assertEqual(bot.game_message_handler.parse_board(self.winning_board), board)
62-
self.assertEqual(bot.game_message_handler.alert_move_message("foo", "move 1"), "foo moved 1")
62+
self.assertEqual(
63+
bot.game_message_handler.alert_move_message("foo", "move 1"), "foo moved 1"
64+
)
6365
self.assertEqual(
6466
bot.game_message_handler.game_start_message(),
6567
"Welcome to Game of Fifteen!"
@@ -72,36 +74,36 @@ def test_game_of_fifteen_logic(self) -> None:
7274
def confirm_available_moves(
7375
good_moves: List[int], bad_moves: List[int], board: List[List[int]]
7476
) -> None:
75-
gameOfFifteenModel.update_board(board)
77+
game_of_fifteen_model.update_board(board)
7678
for move in good_moves:
77-
self.assertTrue(gameOfFifteenModel.validate_move(move))
79+
self.assertTrue(game_of_fifteen_model.validate_move(move))
7880

7981
for move in bad_moves:
80-
self.assertFalse(gameOfFifteenModel.validate_move(move))
82+
self.assertFalse(game_of_fifteen_model.validate_move(move))
8183

8284
def confirm_move(
8385
tile: str,
8486
token_number: int,
8587
initial_board: List[List[int]],
8688
final_board: List[List[int]],
8789
) -> None:
88-
gameOfFifteenModel.update_board(initial_board)
89-
test_board = gameOfFifteenModel.make_move("move " + tile, token_number)
90+
game_of_fifteen_model.update_board(initial_board)
91+
test_board = game_of_fifteen_model.make_move("move " + tile, token_number)
9092

9193
self.assertEqual(test_board, final_board)
9294

9395
def confirm_game_over(board: List[List[int]], result: str) -> None:
94-
gameOfFifteenModel.update_board(board)
95-
game_over = gameOfFifteenModel.determine_game_over(["first_player"])
96+
game_of_fifteen_model.update_board(board)
97+
game_over = game_of_fifteen_model.determine_game_over(["first_player"])
9698

9799
self.assertEqual(game_over, result)
98100

99101
def confirm_coordinates(board: List[List[int]], result: Dict[int, Tuple[int, int]]) -> None:
100-
gameOfFifteenModel.update_board(board)
101-
coordinates = gameOfFifteenModel.get_coordinates(board)
102+
game_of_fifteen_model.update_board(board)
103+
coordinates = game_of_fifteen_model.get_coordinates(board)
102104
self.assertEqual(coordinates, result)
103105

104-
gameOfFifteenModel = GameOfFifteenModel()
106+
game_of_fifteen_model = GameOfFifteenModel()
105107

106108
# Basic Board setups
107109
initial_board = [[8, 7, 6], [5, 4, 3], [2, 1, 0]]

zulip_bots/zulip_bots/bots/idonethis/idonethis.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,20 +115,20 @@ def entries_list(team_name: str) -> str:
115115

116116

117117
def create_entry(message: str) -> str:
118-
SINGLE_WORD_REGEX = re.compile("--team=([a-zA-Z0-9_]*)")
119-
MULTIWORD_REGEX = re.compile('"--team=([^"]*)"')
118+
single_word_regex = re.compile("--team=([a-zA-Z0-9_]*)")
119+
multiword_regex = re.compile('"--team=([^"]*)"')
120120

121121
team = ""
122122
new_message = ""
123-
single_word_match = SINGLE_WORD_REGEX.search(message)
124-
multiword_match = MULTIWORD_REGEX.search(message)
123+
single_word_match = single_word_regex.search(message)
124+
multiword_match = multiword_regex.search(message)
125125

126126
if multiword_match is not None:
127127
team = multiword_match.group(1)
128-
new_message = MULTIWORD_REGEX.sub("", message).strip()
128+
new_message = multiword_regex.sub("", message).strip()
129129
elif single_word_match is not None:
130130
team = single_word_match.group(1)
131-
new_message = SINGLE_WORD_REGEX.sub("", message).strip()
131+
new_message = single_word_regex.sub("", message).strip()
132132
elif default_team:
133133
team = default_team
134134
new_message = message

zulip_bots/zulip_bots/bots/idonethis/test_idonethis.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@ def test_show_team(self) -> None:
7474
{"api_key": "12345678", "default_team": "testing team 1"}
7575
), self.mock_http_conversation("test_show_team"), patch(
7676
"zulip_bots.bots.idonethis.idonethis.get_team_hash", return_value="31415926535"
77-
) as get_team_hashFunction:
77+
) as get_team_hash_function:
7878
self.verify_reply(
7979
"team info testing team 1",
8080
"Team Name: testing team 1\n"
8181
"ID: `31415926535`\n"
8282
"Created at: 2017-12-28T19:12:55.121+11:00",
8383
)
84-
get_team_hashFunction.assert_called_with("testing team 1")
84+
get_team_hash_function.assert_called_with("testing team 1")
8585

8686
def test_entries_list(self) -> None:
8787
with self.mock_config_info(

0 commit comments

Comments
 (0)