About true and false

alneberg · alneberg · commit 5cb848303f68 · 2013-02-14T15:44:49.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -4,12 +4,12 @@ python:
     - 2.7
 script:
     - cd python2
-    - python contemplate_koans.py about_asserts about_dictionaries about_none about_lists about_list_assignments about_strings about_tuples  about_methods about_control_statements 
+    - python contemplate_koans.py about_asserts about_dictionaries about_none about_lists about_list_assignments about_strings about_tuples  about_methods about_control_statements about_true_and_false
 notifications:
   email: false
 
 # Some other koans (see runner/sensei.py or "ls koans" to see the light):
 #
 # 
 #  
-# about_true_and_false about_sets ...
+#  about_sets ...
diff --git a/python2/koans/about_true_and_false.py b/python2/koans/about_true_and_false.py
@@ -12,30 +12,30 @@ 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(1,))
+        self.assertEqual('true stuff', self.truth_value(1))
+        self.assertEqual('true stuff', self.truth_value(1,))
         self.assertEqual(
-            __,
+            'true stuff',
             self.truth_value("Python is named after Monty Python"))
-        self.assertEqual(__, self.truth_value(' '))
+        self.assertEqual('true stuff', self.truth_value(' '))

Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,12 @@ python:`
`4`	`4`	`- 2.7`
`5`	`5`	`script:`
`6`	`6`	`- cd python2`
`7`		`- - python contemplate_koans.py about_asserts about_dictionaries about_none about_lists about_list_assignments about_strings about_tuples about_methods about_control_statements`
	`7`	`+ - python contemplate_koans.py about_asserts about_dictionaries about_none about_lists about_list_assignments about_strings about_tuples about_methods about_control_statements about_true_and_false`
`8`	`8`	`notifications:`
`9`	`9`	`email: false`
`10`	`10`
`11`	`11`	`# Some other koans (see runner/sensei.py or "ls koans" to see the light):`
`12`	`12`	`#`
`13`	`13`	`#`
`14`	`14`	`#`
`15`		`-# about_true_and_false about_sets ...`
	`15`	`+# about_sets ...`