From 7bd093d864e534d7bc704a1d06994e934a810dc7 Mon Sep 17 00:00:00 2001 From: Roberto Date: Wed, 4 Dec 2019 15:47:02 +0200 Subject: [PATCH 1/2] saparate function for letters counter --- capitals.py | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/capitals.py b/capitals.py index 89d5328..aa27b31 100644 --- a/capitals.py +++ b/capitals.py @@ -1,15 +1,23 @@ -def letters_count(): - print('Please write your text') - input_text = input() - count_lower = 0 +def count_letters(string): count_upper = 0 + count_lower = 0 - for i in input_text: + for i in string: if (i.islower()): count_lower = count_lower + 1 elif (i.isupper()): count_upper = count_upper + 1 - print('There are {} uppercase letters'.format(count_upper)) - print('There are {} lowercase letters'.format.(count_lower)) -letters_count() + return (count_upper, count_lower) + +def main(): + print('Please write your text') + input_text = input() + + results = count_letters(input_text) + + print('There are {} uppercase letters'.format(results[0])) + print('There are {} lowercase letters'.format(results[1])) + +if __name__ == "__main__": + main() \ No newline at end of file From cee86548a9f5ecda420eeeb6f917b7d47795b984 Mon Sep 17 00:00:00 2001 From: Roberto Date: Wed, 4 Dec 2019 15:47:22 +0200 Subject: [PATCH 2/2] add tests for capitals.py --- test_capitals.py | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 test_capitals.py diff --git a/test_capitals.py b/test_capitals.py new file mode 100644 index 0000000..7eec38f --- /dev/null +++ b/test_capitals.py @@ -0,0 +1,5 @@ +from capitals import count_letters + +assert count_letters('nfWEHI') == (4, 2), 'should be 4 uppercase letter and 2 lower case' +assert count_letters('WOIJgeiegrh') == (4, 7), 'should be 4 uppercase letter and 7 lower case' +assert count_letters('gh89FJKB') != (0, 0), 'should be wrong' \ No newline at end of file