From f3d34d41c5b3dbda82464e4714210017cab219ba Mon Sep 17 00:00:00 2001 From: Olaf Gladis Date: Sun, 9 Oct 2022 13:00:36 +0200 Subject: [PATCH 1/2] rm not needed parantheses and default values --- Level_06/progress.py | 2 +- Level_08/generatoren.py | 3 +-- Level_08/map.py | 2 +- Level_08/with.py | 2 +- Level_10/label.py | 1 - 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Level_06/progress.py b/Level_06/progress.py index 6243742..111d0e7 100755 --- a/Level_06/progress.py +++ b/Level_06/progress.py @@ -9,7 +9,7 @@ pass print("unbekannte Länge:") -for x in tqdm((x for x in range(25000000))): +for x in tqdm(x for x in range(25000000)): pass print("grafisch:") diff --git a/Level_08/generatoren.py b/Level_08/generatoren.py index c562d8e..69d74c7 100755 --- a/Level_08/generatoren.py +++ b/Level_08/generatoren.py @@ -2,8 +2,7 @@ # Generatoren und yield def gen(s): - for char in s: - yield char + yield from s # iterieren mit einer for-Schleife: for x in gen("abcdef"): diff --git a/Level_08/map.py b/Level_08/map.py index 2c0124e..c84dc2f 100755 --- a/Level_08/map.py +++ b/Level_08/map.py @@ -38,6 +38,6 @@ def even(n): # lambda print(list(filter(lambda x: x % 2 == 0, r))) -print(all((even(x) for x in even_numbers))) +print(all(even(x) for x in even_numbers)) # für mehr Spaß mit Generatoren: https://docs.python.org/3/library/itertools.html \ No newline at end of file diff --git a/Level_08/with.py b/Level_08/with.py index 3470d63..2525f3d 100755 --- a/Level_08/with.py +++ b/Level_08/with.py @@ -10,7 +10,7 @@ # Dateien öffnen -with open("../Level_04/loremipsum.txt", "r") as lorem: +with open("../Level_04/loremipsum.txt") as lorem: print(lorem.read()) # Exceptions ignorieren diff --git a/Level_10/label.py b/Level_10/label.py index fc6733a..d61ab02 100755 --- a/Level_10/label.py +++ b/Level_10/label.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -# coding: utf-8 # Level 9: Ein Label in einem Fenster. From ce1c14bbcaf0d650cbac4ce59b1c0ac4f145ee16 Mon Sep 17 00:00:00 2001 From: Olaf Gladis Date: Sun, 16 Oct 2022 08:17:59 +0200 Subject: [PATCH 2/2] revert yield from and add pep8 / black required new lines --- Level_08/generatoren.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Level_08/generatoren.py b/Level_08/generatoren.py index 69d74c7..cb4ad36 100755 --- a/Level_08/generatoren.py +++ b/Level_08/generatoren.py @@ -2,7 +2,9 @@ # Generatoren und yield def gen(s): - yield from s + for char in s: + yield char + # iterieren mit einer for-Schleife: for x in gen("abcdef"): @@ -23,14 +25,17 @@ def f(x): # IN: f(3) # OUT: 9 + def dec(func): def inner_func(*args): print(args) r = func(*args) print("Return: {}".format(r)) return r + return inner_func + @dec def f(x): return x**2