From 0824a73bd668a67bb86f42bc44db2e6cce6b3f36 Mon Sep 17 00:00:00 2001 From: Vitalij Chajka Date: Sun, 5 Nov 2023 18:10:50 +0200 Subject: [PATCH 1/4] Solution --- app/main.py | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/app/main.py b/app/main.py index f6bcaa1dd..016ba67cd 100644 --- a/app/main.py +++ b/app/main.py @@ -1,8 +1,25 @@ class Person: - # write your code here - pass + people = {} + + def __init__(self, name: str, age: int) -> None: + self.name = name + self.age = age + self.people[name] = self def create_person_list(people: list) -> list: - # write your code here - pass + person_list = [] + for person in people: + person_list.append(Person(person["name"], person["age"])) + for person in people: + if "wife" in person: + if person["wife"] is not None: + Person.people[person["name"]].wife = ( + Person.people[person["wife"]] + ) + if "husband" in person: + if person["husband"] is not None: + Person.people[person["name"]].husband = ( + Person.people[person["husband"]] + ) + return person_list From e3943b6d87c2459d589b468338433eb2943cdbd0 Mon Sep 17 00:00:00 2001 From: Vitalij Chajka Date: Sun, 5 Nov 2023 22:05:07 +0200 Subject: [PATCH 2/4] fix class method calling --- app/main.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/app/main.py b/app/main.py index 016ba67cd..dd3d60eb5 100644 --- a/app/main.py +++ b/app/main.py @@ -4,7 +4,7 @@ class Person: def __init__(self, name: str, age: int) -> None: self.name = name self.age = age - self.people[name] = self + Person.people[name] = self def create_person_list(people: list) -> list: @@ -12,14 +12,12 @@ def create_person_list(people: list) -> list: for person in people: person_list.append(Person(person["name"], person["age"])) for person in people: - if "wife" in person: - if person["wife"] is not None: - Person.people[person["name"]].wife = ( - Person.people[person["wife"]] - ) - if "husband" in person: - if person["husband"] is not None: - Person.people[person["name"]].husband = ( - Person.people[person["husband"]] - ) + if "wife" in person and person["wife"] is not None: + Person.people[person["name"]].wife = ( + Person.people[person["wife"]] + ) + if "husband" in person and person["husband"] is not None: + Person.people[person["name"]].husband = ( + Person.people[person["husband"]] + ) return person_list From b76ec87730a80a64c4e501337956b855011ae85b Mon Sep 17 00:00:00 2001 From: Vitalij Chajka Date: Mon, 6 Nov 2023 14:35:54 +0200 Subject: [PATCH 3/4] fix (use list comprehension and simply condition) --- app/main.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/main.py b/app/main.py index dd3d60eb5..adc9cf160 100644 --- a/app/main.py +++ b/app/main.py @@ -8,15 +8,13 @@ def __init__(self, name: str, age: int) -> None: def create_person_list(people: list) -> list: - person_list = [] + person_list = [Person(person["name"], person["age"]) for person in people] for person in people: - person_list.append(Person(person["name"], person["age"])) - for person in people: - if "wife" in person and person["wife"] is not None: + if person.get("wife") is not None: Person.people[person["name"]].wife = ( Person.people[person["wife"]] ) - if "husband" in person and person["husband"] is not None: + if person.get("husband") is not None: Person.people[person["name"]].husband = ( Person.people[person["husband"]] ) From 887fa212c10b3340ff11b06a3831c61f68650495 Mon Sep 17 00:00:00 2001 From: Vitalij Chajka Date: Tue, 7 Nov 2023 12:08:42 +0200 Subject: [PATCH 4/4] fix (if person.get('wife/husband'):) --- app/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/main.py b/app/main.py index adc9cf160..2771736d9 100644 --- a/app/main.py +++ b/app/main.py @@ -10,11 +10,11 @@ def __init__(self, name: str, age: int) -> None: def create_person_list(people: list) -> list: person_list = [Person(person["name"], person["age"]) for person in people] for person in people: - if person.get("wife") is not None: + if person.get("wife"): Person.people[person["name"]].wife = ( Person.people[person["wife"]] ) - if person.get("husband") is not None: + if person.get("husband"): Person.people[person["name"]].husband = ( Person.people[person["husband"]] )