Merge lp:~ciri-2/mailman/language into lp:mailman

Proposed by Barry Warsaw on 2014-04-17
Status: Merged
Approved by: Barry Warsaw on 2014-04-17
Approved revision: 7247
Merged at revision: 7247
Proposed branch: lp:~ciri-2/mailman/language
Merge into: lp:mailman
Diff against target: 25 lines (+4/-4)
1 file modified
src/mailman/model/docs/languages.rst (+4/-4)
To merge this branch: bzr merge lp:~ciri-2/mailman/language
Reviewer Review Type Date Requested Status
Barry Warsaw Approve on 2014-04-17
Review via email: mp+216334@code.launchpad.net
To post a comment you must log in.
Barry Warsaw (barry) wrote :

Looks great, thanks for tracking this down!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/mailman/model/docs/languages.rst'
2--- src/mailman/model/docs/languages.rst 2012-03-04 18:53:22 +0000
3+++ src/mailman/model/docs/languages.rst 2014-04-17 14:28:31 +0000
4@@ -15,6 +15,10 @@
5 >>> verifyObject(ILanguageManager, mgr)
6 True
7
8+ # Make a copy of the language manager's dictionary, so we can restore it
9+ # after the test. Currently the test layer doesn't manage this.
10+ >>> saved = mgr._languages.copy()
11+
12 # The language manager component comes pre-populated; clear it out.
13 >>> mgr.clear()
14
15@@ -103,10 +107,6 @@
16 >>> 'en' in mgr
17 True
18
19- # Make a copy of the language manager's dictionary, so we can restore it
20- # after the test. Currently the test layer doesn't manage this.
21- >>> saved = mgr._languages.copy()
22-
23 >>> mgr.clear()
24 >>> 'en' in mgr
25 False