Merge lp:~benji/testtools/fix-python-3-compatability into lp:~testtools-committers/testtools/trunk

[Benji York]

restore Python 3 compatability

Restore Python 3 compatibility by avoiding the use of a beautiful Python feature that was removed in Python 3.

[lp:~benji/testtools/fix-python-3-compatability]

256. By Benji York on 2012-04-23

use a better name

=== modified file 'testtools/testresult/real.py'
--- testtools/testresult/real.py	2012-04-19 12:08:12 +0000
+++ testtools/testresult/real.py	2012-04-23 19:00:26 +0000
@@ -483,7 +483,8 @@
                 self._global_tags, (new_tags, gone_tags))
 
 
-def _merge_tags(existing, (new_tags, gone_tags)):
+def _merge_tags(existing, changed):
+    new_tags, gone_tags = changed
     result_new = set(existing[0])
     result_gone = set(existing[1])
     result_new.update(new_tags)