testtools

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

  1. fix-python-3-compatability
  2. Merge into trunk
Proposed by Benji York
Status: Merged
Merged at revision: 255
Proposed branch: lp:~benji/testtools/fix-python-3-compatability
Merge into: lp:~testtools-committers/testtools/trunk
Diff against target: 13 lines (+2/-1)
1 file modified
testtools/testresult/real.py (+2/-1)
To merge this branch: bzr merge lp:~benji/testtools/fix-python-3-compatability
Reviewer Review Type Date Requested Status
testtools committers Pending
Review via email: mp+103152@code.launchpad.net

Commit message

restore Python 3 compatability

Description of the change

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

To post a comment you must log in.
lp:~benji/testtools/fix-python-3-compatability updated
256. By Benji York

use a better name

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'testtools/testresult/real.py'
2--- testtools/testresult/real.py 2012-04-19 12:08:12 +0000
3+++ testtools/testresult/real.py 2012-04-23 19:00:26 +0000
4@@ -483,7 +483,8 @@
5 self._global_tags, (new_tags, gone_tags))
6
7
8-def _merge_tags(existing, (new_tags, gone_tags)):
9+def _merge_tags(existing, changed):
10+ new_tags, gone_tags = changed
11 result_new = set(existing[0])
12 result_gone = set(existing[1])
13 result_new.update(new_tags)

Subscribers

People subscribed via source and target branches