diff --git a/TaskD01/run.py b/TaskD01/run.py index dcdff5a..d888048 100644 --- a/TaskD01/run.py +++ b/TaskD01/run.py @@ -1,12 +1,10 @@ import re def hamlet_reg(file_path): - licznik = 0 with open(file_path, 'r', encoding='utf-8') as file: for line in file: - licznik += 1 if (re.search("'.*Hamlet.*", line)): - print(f"{licznik}: {line.strip()}") + print(line.strip()) file_path = 'TaskD01\simple.in' hamlet_reg(file_path) \ No newline at end of file diff --git a/TaskD02/run.py b/TaskD02/run.py index 81a7766..7acd629 100644 --- a/TaskD02/run.py +++ b/TaskD02/run.py @@ -1,12 +1,10 @@ import re def pies_reg(file_path): - licznik = 0 with open(file_path, 'r', encoding='utf-8') as file: for line in file: - licznik += 1 if (re.search("(^|\s)pies($|\s)", line, re.IGNORECASE)): - print(f"{licznik}: {line.strip()}") + print(line.strip()) file_path = 'TaskD02\simple.in' diff --git a/TaskD03/run.py b/TaskD03/run.py index caddc75..11ef8b0 100644 --- a/TaskD03/run.py +++ b/TaskD03/run.py @@ -6,12 +6,10 @@ import re def data_reg(file_path): - licznik = 0 with open(file_path, 'r', encoding='utf-8') as file: for line in file: - licznik += 1 if (re.search(".*19\d{2} r\..*", line)): - print(f"{licznik}: {line.strip()}") + print(line.strip()) file_path = 'TaskD03\simple.in' diff --git a/TaskD04/run.py b/TaskD04/run.py index c4f3756..321077d 100644 --- a/TaskD04/run.py +++ b/TaskD04/run.py @@ -6,13 +6,11 @@ import re def liczby_reg(file_path): - licznik = 0 with open(file_path, 'r', encoding='utf-8') as file: for line in file: - licznik += 1 number = (re.findall(r'\d+', line)) if number: - print(f"{licznik}: {' '.join(number)}") + print(' '.join(number)) file_path = 'TaskD04\simple.in'