Merge lp:~brian.curtin/ubuntuone-dev-tools/py3-exception-message into lp:ubuntuone-dev-tools

[Brian Curtin]

- Remove usage of Exception.message as it was deprecated and removed from Python 3. Check the exception's "args" attribute for the message.

Python 2.6 deprecated and Python 3 removed the message attribute of Exception objects, so we need to test for inclusion in the string message via other means.

Exception objects store the message in the args attribute which is a tuple, so testing for our strings inside of the tuple will work. The change tests if any of the args find a match for our string.

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'ubuntuone/devtools/services/tests/test_squid.py'
--- ubuntuone/devtools/services/tests/test_squid.py	2012-08-21 20:10:20 +0000
+++ ubuntuone/devtools/services/tests/test_squid.py	2012-09-06 19:21:20 +0000
@@ -376,5 +376,5 @@
         self.patch(self.runner, '_is_squid_running', lambda: False)
         ex = self.assertRaises(squid.SquidLaunchError,
                                self.runner.start_service)
-        self.assertTrue(out in ex.message)
-        self.assertTrue(err in ex.message)
+        self.assertTrue(any([out in arg.encode("utf8") for arg in ex.args]))
+        self.assertTrue(any([err in arg.encode("utf8") for arg in ex.args]))