Edit2 #16

DianaRatnikova · 2023-05-27T13:41:06Z

No description provided.

Melevir

Не сдавай такой большой кучей: ошибок много и каждую ошибку ты повторяешь по много раз, получается. Давай этот пр смерджи и приноси по очереди исправления для каждого уровня.

Melevir · 2023-05-28T07:07:57Z

level_1/3.py

@@ -1,10 +1,10 @@
-from constants import ___
+from constants import none_type


Да не надо использовать этот none_type! Просто пиши None в аннотации и всё

Melevir · 2023-05-28T07:09:54Z

level_2/10.py



-def is_point_in_square(point: ___, left_upper_corner: ___, right_bottom_corner: ___) -> ___:
+def is_point_in_square(point: tuple[int], left_upper_corner: tuple[int], right_bottom_corner: tuple[int]) -> bool:


tuple[int] – это тупл из одного инта, вот такой: (1, ).
Тупл из двух интов – это tuple[int, int]

Melevir · 2023-05-28T07:10:42Z

level_2/3.py



-def get_transaction_amount(transaction_id: ___, transactions_amounts_map: ___) -> ___:
+def get_transaction_amount(transaction_id:int,  transactions_amounts_map: dict{int, decimal.decimal}) -> dict{int, decimal.decimal}|none_type:


Тут у dict должны быть квадратные скобки, а не фигурные

Melevir · 2023-05-28T07:11:02Z

level_2/4.py



-def ban_users(users_ids: ___) -> ___:
+def ban_users(users_ids: set) -> int:


Тут бы уточнить аннотацию

Melevir · 2023-05-28T07:11:28Z

level_2/6.py



-def is_name_male(name: ___, name_gender_map: ___) -> ___:
+def is_name_male(name: StopIteration, name_gender_map: dict{str, bool}) -> bool:


Первая аннотация неправильная, во второй неверные скобки

Melevir · 2023-05-28T07:13:41Z

level_2/8.py



-def calculate_total_spent_for_users(users_ids: ___, users_ids_to_users_map: ___) -> ___:
+def calculate_total_spent_for_users(users_ids: set[int], users_ids_to_users_map: dict[int, set(str, int, list[int])]) -> int:


Опять неправильные скобки и тип значений в словаре не тот

Melevir · 2023-05-28T07:14:14Z

level_2/9.py



-def parse_receipt(raw_receipt: ___) -> ___:
+def parse_receipt(raw_receipt: str) -> tuple(int, datetime.datetime(), list[tuple[str, int, float]]):


Не те скобки и неправильный тип даты

Melevir · 2023-05-28T07:14:37Z

level_3/1.py



-def get_transaction_amount(transaction_id: ___, transactions_amounts_map: ___) -> ___:
+def get_transaction_amount(transaction_id: int, transactions_amounts_map: Mapping[int, decimal.Decimal]) -> decimal.Decimal|None:


Вокруг вертикальной черты тоже принято пробелы ставить

Melevir · 2023-05-28T07:15:08Z

level_3/2.py



-def calculate_total_spent_for_user(user: ___) -> ___:
+def calculate_total_spent_for_user(user: TypedDict) -> int:


Неправильно. Почитай про тайпдикты сперва

Melevir · 2023-05-28T07:15:34Z

level_3/3.py



-def create_user(user_name: ___, user_age: ___, after_created: ___) -> ___:
+def create_user(user_name: str, user_age: int, after_created: None) -> None:


Неправильная аннотация последнего аргумента

DianaRatnikova · 2023-05-30T21:57:30Z

Попробую смерджить и пуллреквестнуть исправления

DianaRatnikova added 4 commits May 19, 2023 01:36

Pull request for level 1

b4ab387

Исправила None в level1

b461c94

Level2 is done

a7cb339

Level3 is done

338df8a

Melevir reviewed May 28, 2023

View reviewed changes

Added Typedict, corrected brackets

3f7db4a

		@@ -1,10 +1,10 @@
		from constants import ___
		from constants import none_type



		def is_point_in_square(point: ___, left_upper_corner: ___, right_bottom_corner: ___) -> ___:
		def is_point_in_square(point: tuple[int], left_upper_corner: tuple[int], right_bottom_corner: tuple[int]) -> bool:



		def get_transaction_amount(transaction_id: ___, transactions_amounts_map: ___) -> ___:
		def get_transaction_amount(transaction_id:int, transactions_amounts_map: dict{int, decimal.decimal}) -> dict{int, decimal.decimal}\|none_type:



		def ban_users(users_ids: ___) -> ___:
		def ban_users(users_ids: set) -> int:



		def is_name_male(name: ___, name_gender_map: ___) -> ___:
		def is_name_male(name: StopIteration, name_gender_map: dict{str, bool}) -> bool:



		def calculate_total_spent_for_users(users_ids: ___, users_ids_to_users_map: ___) -> ___:
		def calculate_total_spent_for_users(users_ids: set[int], users_ids_to_users_map: dict[int, set(str, int, list[int])]) -> int:



		def parse_receipt(raw_receipt: ___) -> ___:
		def parse_receipt(raw_receipt: str) -> tuple(int, datetime.datetime(), list[tuple[str, int, float]]):



		def calculate_total_spent_for_user(user: ___) -> ___:
		def calculate_total_spent_for_user(user: TypedDict) -> int:



		def create_user(user_name: ___, user_age: ___, after_created: ___) -> ___:
		def create_user(user_name: str, user_age: int, after_created: None) -> None:

Edit2 #16

Are you sure you want to change the base?

Edit2 #16

Uh oh!

Conversation

DianaRatnikova commented May 27, 2023

Uh oh!

Melevir left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DianaRatnikova commented May 30, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants