use exception.args instead of exception.message

Author: cmeerw

test/test_cgi.py

@@ -1643,7 +1643,7 @@ def testexamine_url(self):
         def te(url, exception, raises=ValueError):
             with self.assertRaises(raises) as cm:
                 examine_url(url)
-            self.assertEqual(cm.exception.message, exception)
+            self.assertEqual(cm.exception.args, (exception,))
 
 
         action = actions.Action(self.client)
@@ -1786,8 +1786,8 @@ def testTemplateSubdirectory(self):
         # be determined.
         with self.assertRaises(NoTemplate) as cm:
             t.selectTemplate("user", "")
-        self.assertEqual(cm.exception.message,
-                         '''Template "user" doesn't exist''')
+        self.assertEqual(cm.exception.args,
+                         ('''Template "user" doesn't exist''',))
 
         # there is no html/subdir/user.item.{,xml,html} so it will
         # raise NoTemplate.

test/test_hyperdbvals.py

@@ -151,8 +151,8 @@ def testMultilink3(self):
 
         with self.assertRaises(hyperdb.HyperdbValueError) as cm:
             self._test('multilink3', '1', '1')
-        self.assertEqual(cm.exception.message,
-                         "property multilink3: '1' is not a test.")
+        self.assertEqual(cm.exception.args,
+                         ("property multilink3: '1' is not a test.",))
 
         self.assertEqual(self._test('multilink3', 'valid', '1'), ['1'])
 
@@ -161,21 +161,21 @@ def testMultilink3(self):
 
         with self.assertRaises(hyperdb.HyperdbValueError) as cm:
             self._test('multilink3', '+1', '1')
-        self.assertEqual(cm.exception.message,
-                         "property multilink3: '1' is not a test.")
+        self.assertEqual(cm.exception.args,
+                         ("property multilink3: '1' is not a test.",))
 
         self.assertEqual(self._test('multilink3', '+valid', '1'),
                          ['1', '2', '3'])
 
         with self.assertRaises(hyperdb.HyperdbValueError) as cm:
             self._test('multilink3', '+1,-2', '1')
-        self.assertEqual(cm.exception.message,
-                         "property multilink3: '1' is not a test.")
+        self.assertEqual(cm.exception.args,
+                         ("property multilink3: '1' is not a test.",))
 
         with self.assertRaises(hyperdb.HyperdbValueError) as cm:
             self._test('multilink3', '+valid,-2', '1')
-        self.assertEqual(cm.exception.message,
-                         "property multilink3: '2' is not a test.")
+        self.assertEqual(cm.exception.args,
+                         ("property multilink3: '2' is not a test.",))
 
         self.assertEqual(self._test('multilink3', '+valid,-2valid', '1'), ['1', '3'])
 
@@ -185,7 +185,7 @@ def testMultilink3(self):
 
         with self.assertRaises(hyperdb.HyperdbValueError) as cm:
             result = self._test('multilink3', '-valid', None)
-        self.assertEqual(cm.exception.message,
-                   "property multilink3: 'valid' is not currently an element")
+        self.assertEqual(cm.exception.args,
+                         ("property multilink3: 'valid' is not currently an element",))
 
 # vim: set filetype=python ts=4 sw=4 et si