From ebda43ed6b1d6bd30737f5f5d7d7161d54ef938d Mon Sep 17 00:00:00 2001 From: mdecker Date: Wed, 16 Nov 2022 12:40:57 +0100 Subject: [PATCH] convert concatenated strings to fstrings --- printNumbers/parameters.py | 18 +++++++++--------- printNumbers/printNumbers.py | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/printNumbers/parameters.py b/printNumbers/parameters.py index aebe0c3..95f3f15 100755 --- a/printNumbers/parameters.py +++ b/printNumbers/parameters.py @@ -24,7 +24,7 @@ # CONST_VERSION = 'V1.0' -CONST_VERSION_STRING = '+ + PrintNumbers ' + CONST_VERSION + ' (Software Development in Science) + +' +CONST_VERSION_STRING = f'+ + PrintNumbers {CONST_VERSION} (Software Development in Science) + +' CONST_DEF_OPERAND_VAL = 10 CONST_MAX_OPERAND_VAL = 20 CONST_FUNC_CODE_FIBONACCI = 0 @@ -51,9 +51,9 @@ def operand(self): @operand.setter def operand(self, n): if n <= 0 or n > CONST_MAX_OPERAND_VAL: - print('Error: Operand out of range: 0 < <=', CONST_MAX_OPERAND_VAL) - print(' The default value ( n =', CONST_DEF_OPERAND_VAL, ') is used.') - print('') + print(f'Error: Operand out of range: 0 < <= {CONST_MAX_OPERAND_VAL}') + print(f' The default value ( n = {CONST_DEF_OPERAND_VAL} ) is used.') + print(f'') n = CONST_DEF_OPERAND_VAL self.__operand = n @@ -66,8 +66,8 @@ def functionIndex(self, value): self.__functionIndex = value def PrintParameters(self): - print('Following Parameters are in use:') - print('--------------------------------') - print('Function Code: ', self.functionIndex) - print('Operand value: ' + str(self.operand)) - print('') + print(f'Following Parameters are in use:') + print(f'--------------------------------') + print(f'Function Code: {self.functionIndex}') + print(f'Operand value: {self.operand}') + print(f'') diff --git a/printNumbers/printNumbers.py b/printNumbers/printNumbers.py index 9f9ef0e..aa3ca81 100755 --- a/printNumbers/printNumbers.py +++ b/printNumbers/printNumbers.py @@ -64,6 +64,6 @@ # Print results depending on the executed function. if params.functionIndex == CONST_FUNC_CODE_FIBONACCI: - print('fib(' + str(params.operand) + ') =', result) + print(f'fib({params.operand}) = {result}') elif params.functionIndex == CONST_FUNC_CODE_FACTORIAL: - print(str(params.operand) + '! =', str(result)) + print(f'{params.operand}! = {result}')