Merge pull request #196 from datacamp/fix-less-exclamatory

remove exclamations from negative feedback

Author: machow

pythonwhat/test_funcs/test_comp.py

@@ -7,7 +7,7 @@
 MSG_NOT_CALLED = "FMT:The system wants to check the {ordinal} {typestr} you defined but hasn't found it."
 MSG_PREPEND = "FMT:Check your code in the {child[part]} of the {ordinal} {typestr}. "
 
-MSG_INCORRECT_ITER_VARS = "FMT:Have you used the correct iterator variables in the {parent[ordinal]} {parent[typestr]}? Make sure you use the correct names!"
+MSG_INCORRECT_ITER_VARS = "FMT:Have you used the correct iterator variables in the {parent[ordinal]} {parent[typestr]}? Be sure to use the correct names."
 MSG_INCORRECT_NUM_ITER_VARS = "FMT:Have you used {num_vars} iterator variables in the {parent[ordinal]} {parent[typestr]}?"
 MSG_INSUFFICIENT_IFS = "FMT:Have you used {sol_len} ifs inside the {parent[ordinal]} {parent[typestr]}?"
 

pythonwhat/test_funcs/test_function_definition.py

@@ -21,7 +21,7 @@
 # TODO some need to reference the eval rather than str
 MSG_RES_ERROR = "FMT:Calling `{argstr}` should result in `{str_sol}`, instead got an error."
 MSG_RES_INCORRECT = "FMT:Calling `{argstr}` should result in `{str_sol}`, instead got `{str_stu}`."
-MSG_ERR_NONE = "FMT:Calling `{argstr}` doesn't result in an error, but it should!"
+MSG_ERR_NONE = "FMT:Calling `{argstr}` doesn't result in an error, but it should."
 MSG_ERR_INCORRECT = "FMT:Calling `{argstr}` should result in a `{str_sol.__class__.__name__}`, instead got a `{str_stu.__class__.__name__}`."
 MSG_OUT_ERROR = "FMT:Calling `{argstr}` should output {str_sol}, instead got an error."
 MSG_OUT_INCORRECT = "FMT:Calling `{argstr}` should output `{str_sol}`, instead got {str_stu}."

pythonwhat/test_funcs/test_lambda_function.py

@@ -10,7 +10,7 @@
 
 MSG_RES_ERROR = "FMT:Calling it with arguments `{argstr}` should result in `{str_sol}`, instead got an error."
 MSG_RES_INCORRECT = "FMT:Calling it with arguments `{argstr}` should result in `{str_sol}`, instead got `{str_stu}`."
-MSG_ERR_WRONG = "FMT:Calling it with arguments `{argstr}` doesn't result in an error, but it should!"
+MSG_ERR_WRONG = "FMT:Calling it with arguments `{argstr}` doesn't result in an error, but it should."
 def test_lambda_function(index,
                          arg_names=True,
                          arg_defaults=True,

tests/test_test_comp.py

@@ -39,7 +39,7 @@ def test_fail_3(self):
         self.data["DC_CODE"] = "[a + str(b) for a,b in x.items()]"
         sct_payload = helper.run(self.data)
         self.assertFalse(sct_payload['correct'])
-        self.assertEqual(sct_payload['message'], "Have you used the correct iterator variables in the first list comprehension? Make sure you use the correct names!")
+        self.assertEqual(sct_payload['message'], "Have you used the correct iterator variables in the first list comprehension? Be sure to use the correct names.")
         helper.test_lines(self, sct_payload, 1, 1, 17, 19)
 
     def test_fail_4(self):
@@ -334,7 +334,7 @@ def test_fail_3(self):
         self.data["DC_CODE"] = "{ a:a for a in lst }"
         sct_payload = helper.run(self.data)
         self.assertFalse(sct_payload['correct'])
-        self.assertEqual("Have you used the correct iterator variables in the first dictionary comprehension? Make sure you use the correct names!", sct_payload['message'])
+        self.assertEqual("Have you used the correct iterator variables in the first dictionary comprehension? Be sure to use the correct names.", sct_payload['message'])
         helper.test_lines(self, sct_payload, 1, 1, 11, 11)
 
     def test_fail_4(self):
@@ -419,7 +419,7 @@ def test_fail_3(self):
         self.data["DC_CODE"] = "(a + str(b) for a,b in x.items())"
         sct_payload = helper.run(self.data)
         self.assertFalse(sct_payload['correct'])
-        self.assertEqual(sct_payload['message'], "Have you used the correct iterator variables in the first generator expression? Make sure you use the correct names!")
+        self.assertEqual(sct_payload['message'], "Have you used the correct iterator variables in the first generator expression? Be sure to use the correct names.")
         helper.test_lines(self, sct_payload, 1, 1, 17, 19)
 
     def test_fail_4(self):

tests/test_test_function_definition.py

@@ -464,7 +464,7 @@ def inc(num):
         '''
         sct_payload = helper.run(self.data)
         self.assertFalse(sct_payload['correct'])
-        self.assertEqual("Calling <code>inc(-1)</code> doesn't result in an error, but it should!", sct_payload['message'])
+        self.assertEqual("Calling <code>inc(-1)</code> doesn't result in an error, but it should.", sct_payload['message'])
 
     def test_fail_2(self):
         self.data["DC_CODE"] = '''

tests/test_test_lambda_function.py

@@ -68,7 +68,7 @@ def test_fail_8(self):
         self.data["DC_CODE"] = "echo_word = lambda word, echo = 1: word * int(echo)"
         sct_payload = helper.run(self.data)
         self.assertFalse(sct_payload['correct'])
-        self.assertEqual(sct_payload['message'], "Check your definition of the first lambda function. Calling it with arguments <code>('a', '2')</code> doesn't result in an error, but it should!")
+        self.assertEqual(sct_payload['message'], "Check your definition of the first lambda function. Calling it with arguments <code>('a', '2')</code> doesn't result in an error, but it should.")
         helper.test_lines(self, sct_payload, 1, 1, 13, 51)
 
     def test_pass(self):