From efb3202ea05e359e90bf310980fc53a17a98d422 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 4 Nov 2019 15:56:31 +0200 Subject: [PATCH 1/2] Realized function --- GroupNumber/GetNumber.py | 15 ++++++++++++--- ParseRecordBook/Parser.py | 6 +++++- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/GroupNumber/GetNumber.py b/GroupNumber/GetNumber.py index 9af2b25..679930d 100644 --- a/GroupNumber/GetNumber.py +++ b/GroupNumber/GetNumber.py @@ -1,9 +1,18 @@ -def getNumber(row = 'No data'): +import re +def getNumber(text): """ Функція зчитує рядок та повертає номер групи :param test: str, str, KM-91 :return: str, str, 91 """ - print(row) - return None \ No newline at end of file + + group_number = re.findall('\d{2}', text) + + return group_number + +from ParseRecordBook.Parser import parseRecordBook, getemaildata + + + +print( getNumber( getemaildata() )) \ No newline at end of file diff --git a/ParseRecordBook/Parser.py b/ParseRecordBook/Parser.py index fd54fa5..13a7402 100644 --- a/ParseRecordBook/Parser.py +++ b/ParseRecordBook/Parser.py @@ -8,4 +8,8 @@ def parseRecordBook(test = 'No data'): """ print(test) - return None \ No newline at end of file + return None + + +def getemaildata(): + return 'KM - 87' \ No newline at end of file From 01ef7b0613870bfd538f027447d1dd5682d279ff Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 4 Nov 2019 16:00:38 +0200 Subject: [PATCH 2/2] Realized function --- GroupNumber/GetNumber.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/GroupNumber/GetNumber.py b/GroupNumber/GetNumber.py index 679930d..d0ca582 100644 --- a/GroupNumber/GetNumber.py +++ b/GroupNumber/GetNumber.py @@ -11,8 +11,4 @@ def getNumber(text): return group_number -from ParseRecordBook.Parser import parseRecordBook, getemaildata - - - -print( getNumber( getemaildata() )) \ No newline at end of file +print( getNumber()) \ No newline at end of file