diff --git a/containers/slides/examples/phone-for.py b/containers/slides/examples/phone-for.py index 69667a1e..9210c0dc 100644 --- a/containers/slides/examples/phone-for.py +++ b/containers/slides/examples/phone-for.py @@ -1,17 +1,24 @@ phonebook = {"adam": "0701234567", "bertil": "0721234567"} phonebook["cesar"] = "0731234567" phonebook["david"] = "0741234567" +phonebook["adam"] = "0751234567" +phonebook["johan"] = "0701234567" +phonebook["ivar"] = "0701234567" +phonebook["helge"] = "076124567" +# print the phonebook nicely aligned i = 1 -for name in phonebook: - print(f"{name:10s}", end="") - if i % 5 == 0: +for name1 in phonebook: + print(f"{name1:10s}", end="") + if i % 3 == 0: print("") + i += 1 print("") +# ask the user for look-ups while True: - name = input("Who's phone number? ") - if name == "": + name2 = input("Who's phone number? ") + if name2 == "": break - print(f"{name} has phone number {phonebook[name]}.") + print(f"{name2} has phone number {phonebook[name2.lower()]}.") diff --git a/containers/slides/examples/phone.py b/containers/slides/examples/phone.py index 644807b5..2122bff3 100644 --- a/containers/slides/examples/phone.py +++ b/containers/slides/examples/phone.py @@ -1,4 +1,13 @@ phone = {"adam": "0701234567", "bertil": "0721234567"} -name = input("Who's phone number?") -print(f"{name} has phone number {phone[name]}.") +while True: + name = input("Who's phone number?").lower() + if name == "": + break + try: + print(f"{name} has phone number {phone[name]}.") + except KeyError as err: + print(f"Sorry, {name} is not in the phone book.") + except Exception as err: + print(f"Unexpected error: {err}") + diff --git a/containers/slides/examples/pile.py b/containers/slides/examples/pile.py index 1f979622..a6ed2aee 100644 --- a/containers/slides/examples/pile.py +++ b/containers/slides/examples/pile.py @@ -1,6 +1,9 @@ pile = [] -pile.append(1) -pile.append(2) -pile.append(3) +pile.append("Bertil") +pile.append("Adam") +pile.append("Cesar") + while pile: print(pile.pop()) + +print("Done!") diff --git a/containers/slides/examples/queue.py b/containers/slides/examples/queue.py index 155c8de5..46bc0ac5 100644 --- a/containers/slides/examples/queue.py +++ b/containers/slides/examples/queue.py @@ -1,8 +1,11 @@ import collections q = collections.deque() +q.append(0) q.append(1) q.append(2) q.append(3) +q.append(4) + while q: print(q.popleft()) diff --git a/containers/slides/examples/sets.py b/containers/slides/examples/sets.py index 14d09c3a..5e897d23 100644 --- a/containers/slides/examples/sets.py +++ b/containers/slides/examples/sets.py @@ -1,5 +1,6 @@ ns = {1, 2, 2, 3, 3, 3} ms = {1, 1, 2, 3, 3, 3, 3} + if ns == ms: print("Would be weird otherwise.") else: