From ef62a5baaf1ea2b180f417683036a3043d2cd2bb Mon Sep 17 00:00:00 2001 From: Fibonacci Date: Sun, 19 Nov 2023 13:34:02 +0200 Subject: [PATCH 1/7] solution --- app/main.py | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/app/main.py b/app/main.py index f6bcaa1dd..47e8af946 100644 --- a/app/main.py +++ b/app/main.py @@ -1,8 +1,30 @@ + class Person: - # write your code here - pass + people = {} # Атрибут класса для хранения экземпляров Person по их имени + def __init__(self, name, age): + self.name = name + self.age = age + + Person.people[name] = self + +def create_person_list(people): + + person_list = [] + + for person_info in people: + name = person_info["name"] + age = person_info["age"] + + person_instance = Person(name, age) + person_list.append(person_instance) + for dct in people: + obj = Person.people[dct.get("name")] + if "wife" in dct: + if dct["wife"]: + obj.wife = Person.people[dct.get("wife")] + else: + if dct["husband"]: + obj.husband = Person.people[dct.get("husband")] -def create_person_list(people: list) -> list: - # write your code here - pass + return person_list From 2171ae93f4e237f3e27ba00b52395566775727c5 Mon Sep 17 00:00:00 2001 From: Fibonacci Date: Sun, 19 Nov 2023 13:42:59 +0200 Subject: [PATCH 2/7] solution --- app/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/main.py b/app/main.py index 47e8af946..3de05438a 100644 --- a/app/main.py +++ b/app/main.py @@ -1,13 +1,13 @@ class Person: - people = {} # Атрибут класса для хранения экземпляров Person по их имени - def __init__(self, name, age): + people = {} + def __init__(self, name: str, age: int) -> None: self.name = name self.age = age Person.people[name] = self -def create_person_list(people): +def create_person_list(people) -> list: person_list = [] From 7c4b21d179638413c72c7e8eedf8ff5cb443919c Mon Sep 17 00:00:00 2001 From: Fibonacci Date: Thu, 7 Dec 2023 09:46:46 +0200 Subject: [PATCH 3/7] solution --- app/main.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/main.py b/app/main.py index 3de05438a..7863c125f 100644 --- a/app/main.py +++ b/app/main.py @@ -1,30 +1,32 @@ class Person: people = {} + def __init__(self, name: str, age: int) -> None: self.name = name self.age = age Person.people[name] = self -def create_person_list(people) -> list: + +def create_person_list(people: list) -> list: person_list = [] for person_info in people: + name = person_info["name"] age = person_info["age"] - person_instance = Person(name, age) person_list.append(person_instance) for dct in people: - obj = Person.people[dct.get("name")] - if "wife" in dct: - if dct["wife"]: + obj = Person.people[dct.get("name")] + if "wife" in dct: + if dct["wife"]: obj.wife = Person.people[dct.get("wife")] - else: - if dct["husband"]: + else: + if dct["husband"]: obj.husband = Person.people[dct.get("husband")] return person_list From 081548df689bd90c2fa76d7b389714692e0c5ca5 Mon Sep 17 00:00:00 2001 From: Fibonacci Date: Fri, 8 Dec 2023 16:35:29 +0200 Subject: [PATCH 4/7] solution --- app/main.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/app/main.py b/app/main.py index 7863c125f..d91f99193 100644 --- a/app/main.py +++ b/app/main.py @@ -20,13 +20,12 @@ def create_person_list(people: list) -> list: person_instance = Person(name, age) person_list.append(person_instance) - for dct in people: - obj = Person.people[dct.get("name")] - if "wife" in dct: - if dct["wife"]: - obj.wife = Person.people[dct.get("wife")] - else: - if dct["husband"]: - obj.husband = Person.people[dct.get("husband")] + for person_data in people: + obj = Person.people.get(person_data.get("name")) + if obj: + if person_data.get("wife"): + obj.wife = Person.people.get(person_data.get("wife")) + elif person_data.get("husband"): + obj.husband = Person.people.get(person_data.get("husband")) return person_list From 30b6942a14545817d85ec9db947437fe29cc750c Mon Sep 17 00:00:00 2001 From: Fibonacci Date: Fri, 8 Dec 2023 16:38:46 +0200 Subject: [PATCH 5/7] solution --- app/main.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/app/main.py b/app/main.py index d91f99193..0f87e2341 100644 --- a/app/main.py +++ b/app/main.py @@ -11,14 +11,7 @@ def __init__(self, name: str, age: int) -> None: def create_person_list(people: list) -> list: - person_list = [] - - for person_info in people: - - name = person_info["name"] - age = person_info["age"] - person_instance = Person(name, age) - person_list.append(person_instance) + person_list = [Person(person_info["name"], person_info["age"]) for person_info in people] for person_data in people: obj = Person.people.get(person_data.get("name")) From b3721c8c52add78c184b45dc839f8faa5dbfd776 Mon Sep 17 00:00:00 2001 From: Fibonacci Date: Fri, 8 Dec 2023 16:40:49 +0200 Subject: [PATCH 6/7] solution --- app/main.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/main.py b/app/main.py index 0f87e2341..6ded98b23 100644 --- a/app/main.py +++ b/app/main.py @@ -11,7 +11,10 @@ def __init__(self, name: str, age: int) -> None: def create_person_list(people: list) -> list: - person_list = [Person(person_info["name"], person_info["age"]) for person_info in people] + person_list = [ + Person(person_info["name"], + person_info["age"]) for person_info in people + ] for person_data in people: obj = Person.people.get(person_data.get("name")) From 568e2a2796ef73963eb6b4857417ac9d0255b69f Mon Sep 17 00:00:00 2001 From: Fibonacci Date: Sat, 9 Dec 2023 15:15:08 +0200 Subject: [PATCH 7/7] completed --- app/main.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/app/main.py b/app/main.py index 6ded98b23..75dd6b4da 100644 --- a/app/main.py +++ b/app/main.py @@ -11,17 +11,15 @@ def __init__(self, name: str, age: int) -> None: def create_person_list(people: list) -> list: - person_list = [ - Person(person_info["name"], - person_info["age"]) for person_info in people - ] + person_list = [Person(person_info["name"], person_info["age"]) + for person_info in people] for person_data in people: - obj = Person.people.get(person_data.get("name")) - if obj: + person = Person.people.get(person_data.get("name")) + if person: if person_data.get("wife"): - obj.wife = Person.people.get(person_data.get("wife")) + person.wife = Person.people.get(person_data.get("wife")) elif person_data.get("husband"): - obj.husband = Person.people.get(person_data.get("husband")) + person.husband = Person.people.get(person_data.get("husband")) return person_list