Skip to content

Commit c27c417

Browse files
author
Alexey Chernykh
committed
for_challenges.py, string_challenges.py fixed
1 parent 85ef5fb commit c27c417

File tree

3 files changed

+43
-23
lines changed

3 files changed

+43
-23
lines changed

.idea/workspace.xml

Lines changed: 38 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

for_challenges.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,7 @@
2626
names = ['Оля', 'Петя', 'Вася', 'Маша']
2727

2828
def gender(male_female):
29-
if male_female:
30-
return 'мужской'
31-
else:
32-
return 'женский'
33-
29+
return 'мужской' if male_female else 'женский'
3430

3531
for name in names:
3632
print(f'{name}: {gender(is_male[name])}')
@@ -67,4 +63,4 @@ def gender(male_female):
6763
]
6864

6965
for group, names in enumerate(groups, start=1):
70-
print(f'Группа {group}: {", ".join(groups[group-1])}')
66+
print(f'Группа {group}: {", ".join(groups[names])}')

string_challenges.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
# Вывести количество букв "а" в слове
77
word = 'Архангельск'
8-
print(word.count('а'))
8+
print(word.lower().count('а'))
99

1010

1111
# Вывести количество гласных букв в слове
1212
word = 'Архангельск'
13-
vowel_letters = 'а, е, ё, и, о, у, ы, э, ю, я'
13+
vowel_letters = 'аеёиоуыэюя'
1414
count_vowel_letters = 0
1515
for letters in word.lower():
1616
if letters in vowel_letters:
@@ -24,8 +24,7 @@
2424

2525
# Вывести первую букву каждого слова на отдельной строке
2626
sentence = 'Мы приехали в гости'
27-
list_sentence = sentence.split()
28-
for letter in list_sentence:
27+
for letter in sentence.split():
2928
print(letter[0])
3029

3130
# Вывести усреднённую длину слова в предложении

0 commit comments

Comments
 (0)