diff --git a/level_2/a_user_from_functions_to_class.py b/level_2/a_user_from_functions_to_class.py index 18a64ce..a3f1d29 100644 --- a/level_2/a_user_from_functions_to_class.py +++ b/level_2/a_user_from_functions_to_class.py @@ -6,13 +6,14 @@ """ -def make_username_capitalized(username: str): - return username.capitalize() - - -def generate_short_user_description(username: str, user_id: int, name: str): - return f'User with id {user_id} has {username} username and {name} name' +class User: + def __init__(self, username: str, user_id: int, name: str): + self.username = username + self.user_id = user_id + self.name = name + def generate_short_user_description(self): + return f'User with id {self.user_id} has {self.username} username and {self.name} name' -class User: - pass # код писать тут + def make_username_capitalized(self): + return self.username.capitalize() diff --git a/level_2/b_user_should_be_banned.py b/level_2/b_user_should_be_banned.py index 3ec9359..c34f1ba 100644 --- a/level_2/b_user_should_be_banned.py +++ b/level_2/b_user_should_be_banned.py @@ -11,4 +11,10 @@ class User: - pass # код писать тут + def __init__(self, name, surname, age): + self.name = name + self.surname = surname + self.age = age + + def should_be_banned(self): + return self.surname in SURNAMES_TO_BAN