Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions koans/about_control_statements.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ def test_if_then_else_statements(self):
result = 'true value'
else:
result = 'false value'
self.assertEqual(__, result)
self.assertEqual('true value', result)

def test_if_then_statements(self):
result = 'default value'
if True:
result = 'true value'
self.assertEqual(__, result)
self.assertEqual('true value', result)

def test_if_then_elif_else_statements(self):
if False:
Expand All @@ -25,15 +25,15 @@ def test_if_then_elif_else_statements(self):
result = 'true value'
else:
result = 'default value'
self.assertEqual(__, result)
self.assertEqual('true value', result)

def test_while_statement(self):
i = 1
result = 1
while i <= 10:
result = result * i
i += 1
self.assertEqual(__, result)
self.assertEqual(3628800, result)

def test_break_statement(self):
i = 1
Expand All @@ -42,7 +42,7 @@ def test_break_statement(self):
if i > 10: break
result = result * i
i += 1
self.assertEqual(__, result)
self.assertEqual(3628800, result)

def test_continue_statement(self):
i = 0
Expand All @@ -51,14 +51,14 @@ def test_continue_statement(self):
i += 1
if (i % 2) == 0: continue
result.append(i)
self.assertEqual(__, result)
self.assertEqual([1, 3, 5, 7, 9], result)

def test_for_statement(self):
phrase = ["fish", "and", "chips"]
result = []
for item in phrase:
result.append(item.upper())
self.assertEqual([__, __, __], result)
self.assertEqual(['FISH', 'AND', 'CHIPS'], result)

def test_for_statement_with_tuples(self):
round_table = [
Expand All @@ -71,7 +71,7 @@ def test_for_statement_with_tuples(self):
for knight, answer in round_table:
result.append("Contestant: '" + knight + "' Answer: '" + answer + "'")

text = __
text = "Contestant: 'Robin' Answer: 'Blue! I mean Green!'"

self.assertRegex(result[2], text)

Expand Down
2 changes: 1 addition & 1 deletion koans/about_sets.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ def test_sets_make_keep_lists_unique(self):

there_can_only_be_only_one = set(highlanders)

self.assertEqual(__, there_can_only_be_only_one)
self.assertEqual({"MacLeod", "Ramirez", "Matunas", "Malcolm"}, there_can_only_be_only_one)

def test_empty_sets_have_different_syntax_to_populated_sets(self):
self.assertEqual(__, {1, 2, 3})
Expand Down
30 changes: 15 additions & 15 deletions koans/about_true_and_false.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,32 @@ def truth_value(self, condition):
return 'false stuff'

def test_true_is_treated_as_true(self):
self.assertEqual(__, self.truth_value(True))
self.assertEqual('true stuff', self.truth_value(True))

def test_false_is_treated_as_false(self):
self.assertEqual(__, self.truth_value(False))
self.assertEqual('false stuff', self.truth_value(False))

def test_none_is_treated_as_false(self):
self.assertEqual(__, self.truth_value(None))
self.assertEqual('false stuff', self.truth_value(None))

def test_zero_is_treated_as_false(self):
self.assertEqual(__, self.truth_value(0))
self.assertEqual('false stuff', self.truth_value(0))

def test_empty_collections_are_treated_as_false(self):
self.assertEqual(__, self.truth_value([]))
self.assertEqual(__, self.truth_value(()))
self.assertEqual(__, self.truth_value({}))
self.assertEqual(__, self.truth_value(set()))
self.assertEqual('false stuff', self.truth_value([]))
self.assertEqual('false stuff', self.truth_value(()))
self.assertEqual('false stuff', self.truth_value({}))
self.assertEqual('false stuff', self.truth_value(set()))

def test_blank_strings_are_treated_as_false(self):
self.assertEqual(__, self.truth_value(""))
self.assertEqual('false stuff', self.truth_value(""))

def test_everything_else_is_treated_as_true(self):
self.assertEqual(__, self.truth_value(1))
self.assertEqual(__, self.truth_value([0]))
self.assertEqual(__, self.truth_value((0,)))
self.assertEqual('true stuff', self.truth_value(1))
self.assertEqual('true stuff', self.truth_value([0]))
self.assertEqual('true stuff', self.truth_value((0,)))
self.assertEqual(
__,
'true stuff',
self.truth_value("Python is named after Monty Python"))
self.assertEqual(__, self.truth_value(' '))
self.assertEqual(__, self.truth_value('0'))
self.assertEqual('true stuff', self.truth_value(' '))
self.assertEqual('true stuff', self.truth_value('0'))