Launchpad itself

Merge lp:~henninge/launchpad/bug-591731-is-published-removal into lp:~launchpad/launchpad/recife

  1. bug-591731-is-published-removal
  2. Merge into recife
Proposed by Henning Eggers on 2010-06-09
Status: Merged
Approved by: Jeroen T. Vermeulen on 2010-06-09
Approved revision: no longer in the source branch.
Merged at revision: 9137
Proposed branch: lp:~henninge/launchpad/bug-591731-is-published-removal
Merge into: lp:~launchpad/launchpad/recife
Diff against target: 287 lines (+52/-51)
5 files modified
lib/lp/translations/interfaces/potmsgset.py (+2/-2)
lib/lp/translations/model/potmsgset.py (+5/-4)
lib/lp/translations/model/translationimportqueue.py (+1/-1)
lib/lp/translations/tests/test_pofile.py (+34/-34)
lib/lp/translations/tests/test_potmsgset.py (+10/-10)
To merge this branch: bzr merge lp:~henninge/launchpad/bug-591731-is-published-removal
Reviewer Review Type Date Requested Status
Jeroen T. Vermeulen (community) code 2010-06-09 Approve on 2010-06-09
Review via email: mp+27166@code.launchpad.net

Commit Message

Replaced all occurrences of is_imported, is_current and is_published with their modern counterparts.

Description of the Change

Replaced all occurrences of is_imported, is_current and is_published with their modern counterparts. Also fixed a test and formatting while driving by.

To post a comment you must log in.
Jeroen T. Vermeulen (jtv) wrote :

Looks good. One change discussed on IRC: instead of a variable called diverged_and_not_current_upstream, it may be easier to read to have one called diverged and another called current_upstream.

Thanks for the drive-by cleanups.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/translations/interfaces/potmsgset.py'
2--- lib/lp/translations/interfaces/potmsgset.py 2010-05-07 12:29:23 +0000
3+++ lib/lp/translations/interfaces/potmsgset.py 2010-06-09 15:06:31 +0000
4@@ -264,8 +264,8 @@
5 def resetCurrentTranslation(pofile, lock_timestamp):
6 """Reset the currently used translation.
7
8- This will set the "is_current" attribute to False and if the message
9- is diverge, will try to converge it.
10+ This will set the "is_current_ubuntu" attribute to False and if the
11+ message is diverged, will try to converge it.
12 :param pofile: a `POFile` to dismiss suggestions from.
13 :param lock_timestamp: the timestamp when we checked the values we
14 want to update.
15
16=== modified file 'lib/lp/translations/model/potmsgset.py'
17--- lib/lp/translations/model/potmsgset.py 2010-05-07 12:29:23 +0000
18+++ lib/lp/translations/model/potmsgset.py 2010-06-09 15:06:31 +0000
19@@ -960,13 +960,14 @@
20 pofile.potemplate, pofile.language)
21
22 if (current is not None):
23- # Check for transltion conflicts and update the required
24+ # Check for translation conflicts and update the required
25 # attributes.
26 self._maybeRaiseTranslationConflict(current, lock_timestamp)
27- current.is_current = False
28+ current.is_current_ubuntu = False
29 # Converge the current translation only if it is diverged and not
30- # imported.
31- if current.potemplate is not None and not current.is_imported:
32+ # current upstream.
33+ is_diverged = current.potemplate is not None
34+ if is_diverged and not current.is_current_upstream:
35 current.potemplate = None
36 pofile.date_changed = UTC_NOW
37
38
39=== modified file 'lib/lp/translations/model/translationimportqueue.py'
40--- lib/lp/translations/model/translationimportqueue.py 2010-05-07 12:29:23 +0000
41+++ lib/lp/translations/model/translationimportqueue.py 2010-06-09 15:06:31 +0000
42@@ -1019,7 +1019,7 @@
43
44 path = upload_files[tarinfo.name]
45 entry = approver.approve(self.addOrUpdateEntry(
46- path, file_content, is_published, importer,
47+ path, file_content, from_upstream, importer,
48 sourcepackagename=sourcepackagename,
49 distroseries=distroseries, productseries=productseries,
50 potemplate=potemplate))
51
52=== modified file 'lib/lp/translations/tests/test_pofile.py'
53--- lib/lp/translations/tests/test_pofile.py 2010-05-07 12:29:23 +0000
54+++ lib/lp/translations/tests/test_pofile.py 2010-06-09 15:06:31 +0000
55@@ -1027,8 +1027,8 @@
56
57 translated_potmsgsets = list(
58 self.devel_sr_pofile.getPOTMsgSetTranslated())
59- self.assertEquals(translated_potmsgsets,
60- [self.potmsgset1, self.potmsgset2])
61+ self.assertEquals(
62+ [self.potmsgset1, self.potmsgset2], translated_potmsgsets)
63
64 # Insert these two POTMsgSets into self.stable_potemplate in reverse
65 # order.
66@@ -1038,21 +1038,21 @@
67 # And they are returned in the new order as desired.
68 translated_potmsgsets = list(
69 self.stable_sr_pofile.getPOTMsgSetTranslated())
70- self.assertEquals(translated_potmsgsets,
71- [self.potmsgset2, self.potmsgset1])
72+ self.assertEquals(
73+ [self.potmsgset2, self.potmsgset1], translated_potmsgsets)
74
75 # Order is unchanged for the previous template.
76 translated_potmsgsets = list(
77 self.devel_sr_pofile.getPOTMsgSetTranslated())
78- self.assertEquals(translated_potmsgsets,
79- [self.potmsgset1, self.potmsgset2])
80+ self.assertEquals(
81+ [self.potmsgset1, self.potmsgset2], translated_potmsgsets)
82
83 def test_getPOTMsgSetUntranslated_ordering(self):
84 # Both POTMsgSets in devel_sr_pofile are untranslated.
85 untranslated_potmsgsets = list(
86 self.devel_sr_pofile.getPOTMsgSetUntranslated())
87- self.assertEquals(untranslated_potmsgsets,
88- [self.potmsgset1, self.potmsgset2])
89+ self.assertEquals(
90+ [self.potmsgset1, self.potmsgset2], untranslated_potmsgsets)
91
92 # Insert these two POTMsgSets into self.stable_potemplate in reverse
93 # order.
94@@ -1062,14 +1062,14 @@
95 # And they are returned in the new order as desired.
96 untranslated_potmsgsets = list(
97 self.stable_sr_pofile.getPOTMsgSetUntranslated())
98- self.assertEquals(untranslated_potmsgsets,
99- [self.potmsgset2, self.potmsgset1])
100+ self.assertEquals(
101+ [self.potmsgset2, self.potmsgset1], untranslated_potmsgsets)
102
103 # Order is unchanged for the previous template.
104 untranslated_potmsgsets = list(
105 self.devel_sr_pofile.getPOTMsgSetUntranslated())
106- self.assertEquals(untranslated_potmsgsets,
107- [self.potmsgset1, self.potmsgset2])
108+ self.assertEquals(
109+ [self.potmsgset1, self.potmsgset2], untranslated_potmsgsets)
110
111 def test_getPOTMsgSetChangedInUbuntu_ordering(self):
112 # Suggest a translation on both POTMsgSets in devel_sr_pofile,
113@@ -1097,8 +1097,8 @@
114
115 potmsgsets = list(
116 self.devel_sr_pofile.getPOTMsgSetChangedInUbuntu())
117- self.assertEquals(potmsgsets,
118- [self.potmsgset1, self.potmsgset2])
119+ self.assertEquals(
120+ [self.potmsgset1, self.potmsgset2], potmsgsets)
121
122 # Insert these two POTMsgSets into self.stable_potemplate in reverse
123 # order.
124@@ -1108,26 +1108,26 @@
125 # And they are returned in the new order as desired.
126 potmsgsets = list(
127 self.stable_sr_pofile.getPOTMsgSetChangedInUbuntu())
128- self.assertEquals(potmsgsets,
129- [self.potmsgset2, self.potmsgset1])
130+ self.assertEquals(
131+ [self.potmsgset2, self.potmsgset1], potmsgsets)
132
133 # Order is unchanged for the previous template.
134 potmsgsets = list(
135 self.devel_sr_pofile.getPOTMsgSetChangedInUbuntu())
136- self.assertEquals(potmsgsets,
137- [self.potmsgset1, self.potmsgset2])
138+ self.assertEquals(
139+ [self.potmsgset1, self.potmsgset2], potmsgsets)
140
141 def test_getPOTMsgSetWithErrors_ordering(self):
142 # Suggest a translation on both POTMsgSets in devel_sr_pofile,
143 # so they are returned with getPOTMsgSetWithNewSuggestions() call.
144- self.factory.makeSharedTranslationMessage(
145+ imported1 = self.factory.makeSharedTranslationMessage(
146 pofile=self.devel_sr_pofile,
147 potmsgset=self.potmsgset1,
148 translations=["Imported"],
149 is_current_upstream=True)
150 removeSecurityProxy(imported1).validation_status = (
151 TranslationValidationStatus.UNKNOWNERROR)
152- self.factory.makeSharedTranslationMessage(
153+ imported2 = self.factory.makeSharedTranslationMessage(
154 pofile=self.devel_sr_pofile,
155 potmsgset=self.potmsgset2,
156 translations=["Another imported"],
157@@ -1137,8 +1137,8 @@
158
159 potmsgsets = list(
160 self.devel_sr_pofile.getPOTMsgSetWithErrors())
161- self.assertEquals(potmsgsets,
162- [self.potmsgset1, self.potmsgset2])
163+ self.assertEquals(
164+ [self.potmsgset1, self.potmsgset2], potmsgsets)
165
166 # Insert these two POTMsgSets into self.stable_potemplate in reverse
167 # order.
168@@ -1148,21 +1148,21 @@
169 # And they are returned in the new order as desired.
170 potmsgsets = list(
171 self.stable_sr_pofile.getPOTMsgSetWithErrors())
172- self.assertEquals(potmsgsets,
173- [self.potmsgset2, self.potmsgset1])
174+ self.assertEquals(
175+ [self.potmsgset2, self.potmsgset1], potmsgsets)
176
177 # Order is unchanged for the previous template.
178 potmsgsets = list(
179 self.devel_sr_pofile.getPOTMsgSetWithErrors())
180- self.assertEquals(potmsgsets,
181- [self.potmsgset1, self.potmsgset2])
182+ self.assertEquals(
183+ [self.potmsgset1, self.potmsgset2], potmsgsets)
184
185 def test_getPOTMsgSets_ordering(self):
186 # Both POTMsgSets in devel_potemplate are untranslated.
187 potmsgsets = list(
188 self.devel_potemplate.getPOTMsgSets())
189- self.assertEquals(potmsgsets,
190- [self.potmsgset1, self.potmsgset2])
191+ self.assertEquals(
192+ [self.potmsgset1, self.potmsgset2], potmsgsets)
193
194 # Insert these two POTMsgSets into self.stable_potemplate in reverse
195 # order.
196@@ -1172,14 +1172,14 @@
197 # And they are returned in the new order as desired.
198 potmsgsets = list(
199 self.stable_potemplate.getPOTMsgSets())
200- self.assertEquals(potmsgsets,
201- [self.potmsgset2, self.potmsgset1])
202+ self.assertEquals(
203+ [self.potmsgset2, self.potmsgset1], potmsgsets)
204
205 # Order is unchanged for the previous template.
206 potmsgsets = list(
207 self.devel_potemplate.getPOTMsgSets())
208- self.assertEquals(potmsgsets,
209- [self.potmsgset1, self.potmsgset2])
210+ self.assertEquals(
211+ [self.potmsgset1, self.potmsgset2], potmsgsets)
212
213 def test_findPOTMsgSetsContaining_ordering(self):
214 # As per bug 388473 findPOTMsgSetsContaining still used the old
215@@ -1204,8 +1204,8 @@
216 self.devel_sr_pofile.findPOTMsgSetsContaining("translation"))
217
218 # Order ignores potmsgset.sequence.
219- self.assertEquals([self.potmsgset1, self.potmsgset2],
220- potmsgsets)
221+ self.assertEquals(
222+ [self.potmsgset1, self.potmsgset2], potmsgsets)
223
224
225 class TestPOFileSet(TestCaseWithFactory):
226
227=== modified file 'lib/lp/translations/tests/test_potmsgset.py'
228--- lib/lp/translations/tests/test_potmsgset.py 2010-05-07 12:29:23 +0000
229+++ lib/lp/translations/tests/test_potmsgset.py 2010-06-09 15:06:31 +0000
230@@ -945,33 +945,33 @@
231 translation = self.factory.makeTranslationMessage(
232 self.pofile, self.potmsgset, translations=[u'Shared translation'],
233 reviewer=self.factory.makePerson(),
234- is_imported=False, force_diverged=False,
235+ is_current_upstream=False, force_diverged=False,
236 date_updated=self.now())
237
238 self.potmsgset.resetCurrentTranslation(self.pofile, self.now())
239 current = self.potmsgset.getCurrentTranslationMessage(
240 self.potemplate, self.pofile.language)
241 self.assertTrue(current is None)
242- self.assertFalse(translation.is_current)
243- self.assertFalse(translation.is_imported)
244+ self.assertFalse(translation.is_current_ubuntu)
245+ self.assertFalse(translation.is_current_upstream)
246 self.assertTrue(translation.potemplate is None)
247
248 def test_resetCurrentTranslation_diverged_not_imported(self):
249 # Resettting a diverged current translation that was not imported, will
250- # change is_current to False and will make it shared.
251+ # change is_current_ubuntu to False and will make it shared.
252
253 translation = self.factory.makeTranslationMessage(
254 self.pofile, self.potmsgset, translations=[u'Diverged text'],
255 reviewer=self.factory.makePerson(),
256- is_imported=False, force_diverged=True,
257+ is_current_upstream=False, force_diverged=True,
258 date_updated=self.now())
259
260 self.potmsgset.resetCurrentTranslation(self.pofile, self.now())
261 current = self.potmsgset.getCurrentTranslationMessage(
262 self.potemplate, self.pofile.language)
263 self.assertTrue(current is None)
264- self.assertFalse(translation.is_current)
265- self.assertFalse(translation.is_imported)
266+ self.assertFalse(translation.is_current_ubuntu)
267+ self.assertFalse(translation.is_current_upstream)
268 self.assertTrue(translation.potemplate is None)
269
270 def test_resetCurrentTranslation_diverged_imported(self):
271@@ -982,15 +982,15 @@
272 translation = self.factory.makeTranslationMessage(
273 self.pofile, self.potmsgset, translations=[u'Imported diverged'],
274 reviewer=self.factory.makePerson(),
275- is_imported=True, force_diverged=True,
276+ is_current_upstream=True, force_diverged=True,
277 date_updated=self.now())
278
279 self.potmsgset.resetCurrentTranslation(self.pofile, self.now())
280 current = self.potmsgset.getCurrentTranslationMessage(
281 self.potemplate, self.pofile.language)
282 self.assertTrue(current is None)
283- self.assertFalse(translation.is_current)
284- self.assertTrue(translation.is_imported)
285+ self.assertFalse(translation.is_current_ubuntu)
286+ self.assertTrue(translation.is_current_upstream)
287 self.assertFalse(translation.potemplate is None)
288
289

Subscribers

People subscribed via source and target branches