7123 - Fixes Pytest DeprecationWarning

sitescripts/formmail/test/test_formmail.py

 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-present eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ skipping 83 matching lines @@
 
 @pytest.mark.parametrize('key,message', [
     ('url', 'No URL configured for form handler: test'),
     ('fields', 'No fields configured for form handler: test'),
     ('template', 'No template configured for form handler: test'),
 ])
 def test_config_errors(key, message, form_config):
     del form_config[key]
     with pytest.raises(Exception) as error:
         formmail.make_handler('test', form_config)[1]
-    assert error.value.message == message
+    assert str(error.value) == message
 
 
 @pytest.mark.parametrize('field,message', [
     (('new_field', 'foo'), 'Unexpected field/fields: new_field'),
     (('mandatory', ''), 'No mandatory entered'),
     (('non_mandatory_email', 'asfaf'), 'Invalid email'),
     (('email', 'asfaf'), 'You failed the email validation'),
     (('email', ''), 'You failed the email test'),
 ])
 def test_http_errs(field, message, response_for, form_data, sm_mock):
@@ skipping 30 matching lines @@
         row = reader.next()
         # rows should not be equal because the time field
         # is added by the logging function.
         assert row != reader.next()
 
 
 def test_config_field_errors(form_config):
     form_config['fields'] = {}
     with pytest.raises(Exception) as error:
         formmail.make_handler('test', form_config)[1]
-    assert error.value.message == 'No fields configured for form handler: test'
+    assert str(error.value) == 'No fields configured for form handler: test'
 
 
 def test_config_template_errors(form_config):
     form_config['template'].value = 'no'
     with pytest.raises(Exception) as error:
         formmail.make_handler('test', form_config)[1]
-    assert error.value.message == 'Template not found at: no'
+    assert str(error.value) == 'Template not found at: no'
 
 
 def test_config_parse(form_config):
     assert form_config['url'].value == 'test/apply/submit'
     assert form_config['fields']['email'].value == 'mandatory, email'
 
 
 def test_sendmail_fail(log_path, response_for, form_data, sm_mock):
     sm_mock.side_effect = Exception('Sendmail Fail')
     with pytest.raises(HTTPError):
@@ skipping 17 matching lines @@
     # this should append the second form to the error log file
     with pytest.raises(Exception):
         formmail.log_formdata(form_data, log_path)
     with pytest.raises(Exception):
         formmail.log_formdata(form_data, log_path)
 
     with open(log_path + '_error') as error_log:
         reader = DictReader(error_log)
         assert reader.next() == form_data
         assert reader.next() == form_data