Launchpad itself

Merge ~cjwatson/launchpad:rename-dummy-distro-series-language into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. rename-dummy-distro-series-language
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 19d842ffcb07f9bec772cd68271bb66aa87edd50
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:rename-dummy-distro-series-language
Merge into: launchpad:master
Diff against target: 245 lines (+30/-30)
11 files modified
lib/lp/registry/browser/distroseries.py (+1/-1)
lib/lp/registry/interfaces/distroseries.py (+2/-2)
lib/lp/registry/model/distroseries.py (+3/-3)
lib/lp/translations/browser/distroseries.py (+4/-4)
lib/lp/translations/browser/tests/test_breadcrumbs.py (+1/-1)
lib/lp/translations/browser/translations.py (+1/-1)
lib/lp/translations/configure.zcml (+2/-2)
lib/lp/translations/doc/canonical_url_examples.rst (+1/-1)
lib/lp/translations/doc/distroseries-language.rst (+8/-8)
lib/lp/translations/interfaces/distroserieslanguage.py (+2/-2)
lib/lp/translations/model/distroserieslanguage.py (+5/-5)
Reviewer Review Type Date Requested Status
Jürgen Gmach Approve
Review via email: mp+426836@code.launchpad.net

Commit message

Rename DummyDistroSeriesLanguage to EmptyDistroSeriesLanguage

Description of the change

This meets inclusive language guidelines, and I think it describes the purpose of the class slightly better.

To post a comment you must log in.
Revision history for this message
Jürgen Gmach (jugmac00) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/registry/browser/distroseries.py b/lib/lp/registry/browser/distroseries.py
2index b9e6028..ee34d1f 100644
3--- a/lib/lp/registry/browser/distroseries.py
4+++ b/lib/lp/registry/browser/distroseries.py
5@@ -182,7 +182,7 @@ class DistroSeriesNavigation(GetitemNavigation, BugTargetTraversalMixin,
6 # Unknown language code.
7 raise NotFoundError
8
9- distroserieslang = self.context.getDistroSeriesLanguageOrDummy(lang)
10+ distroserieslang = self.context.getDistroSeriesLanguageOrEmpty(lang)
11
12 # Check if user is able to view the translations for
13 # this distribution series language.
14diff --git a/lib/lp/registry/interfaces/distroseries.py b/lib/lp/registry/interfaces/distroseries.py
15index 66a5479..b6d99db 100644
16--- a/lib/lp/registry/interfaces/distroseries.py
17+++ b/lib/lp/registry/interfaces/distroseries.py
18@@ -665,9 +665,9 @@ class IDistroSeriesPublic(
19 distribution and the given language.
20 """
21
22- def getDistroSeriesLanguageOrDummy(language):
23+ def getDistroSeriesLanguageOrEmpty(language):
24 """Return the DistroSeriesLanguage for this distroseries and the
25- given language, or a DummyDistroSeriesLanguage.
26+ given language, or an EmptyDistroSeriesLanguage.
27 """
28
29 def createUploadedSourcePackageRelease(
30diff --git a/lib/lp/registry/model/distroseries.py b/lib/lp/registry/model/distroseries.py
31index aff2b47..19e60ec 100644
32--- a/lib/lp/registry/model/distroseries.py
33+++ b/lib/lp/registry/model/distroseries.py
34@@ -161,7 +161,7 @@ from lp.soyuz.model.sourcepackagerelease import SourcePackageRelease
35 from lp.translations.enums import LanguagePackType
36 from lp.translations.model.distroserieslanguage import (
37 DistroSeriesLanguage,
38- DummyDistroSeriesLanguage,
39+ EmptyDistroSeriesLanguage,
40 )
41 from lp.translations.model.hastranslationimports import (
42 HasTranslationImportsMixin,
43@@ -907,12 +907,12 @@ class DistroSeries(SQLBase, BugTargetBase, HasSpecificationsMixin,
44 return IStore(DistroSeriesLanguage).find(
45 DistroSeriesLanguage, distroseries=self, language=language).one()
46
47- def getDistroSeriesLanguageOrDummy(self, language):
48+ def getDistroSeriesLanguageOrEmpty(self, language):
49 """See `IDistroSeries`."""
50 drl = self.getDistroSeriesLanguage(language)
51 if drl is not None:
52 return drl
53- return DummyDistroSeriesLanguage(self, language)
54+ return EmptyDistroSeriesLanguage(self, language)
55
56 def updateStatistics(self, ztm):
57 """See `IDistroSeries`."""
58diff --git a/lib/lp/translations/browser/distroseries.py b/lib/lp/translations/browser/distroseries.py
59index 8191792..21bddf4 100644
60--- a/lib/lp/translations/browser/distroseries.py
61+++ b/lib/lp/translations/browser/distroseries.py
62@@ -222,8 +222,8 @@ class DistroSeriesView(LaunchpadView, TranslationsMixin):
63 """Produces a list containing a DistroSeriesLanguage object for
64 each language this distro has been translated into, and for each
65 of the user's preferred languages. Where the series has no
66- DistroSeriesLanguage for that language, we use a
67- DummyDistroSeriesLanguage.
68+ DistroSeriesLanguage for that language, we use an
69+ EmptyDistroSeriesLanguage.
70 """
71
72 # find the existing DRLanguages
73@@ -233,12 +233,12 @@ class DistroSeriesView(LaunchpadView, TranslationsMixin):
74 existing_languages = {drl.language for drl in distroserieslangs}
75
76 # find all the preferred languages which are not in the set of
77- # existing languages, and add a dummydistroserieslanguage for each
78+ # existing languages, and add an EmptyDistroSeriesLanguage for each
79 # of them
80 distroserieslangset = getUtility(IDistroSeriesLanguageSet)
81 for lang in self.translatable_languages:
82 if lang not in existing_languages:
83- distroserieslang = distroserieslangset.getDummy(
84+ distroserieslang = distroserieslangset.getEmpty(
85 self.context, lang)
86 distroserieslangs.append(distroserieslang)
87
88diff --git a/lib/lp/translations/browser/tests/test_breadcrumbs.py b/lib/lp/translations/browser/tests/test_breadcrumbs.py
89index 75be521..b368e22 100644
90--- a/lib/lp/translations/browser/tests/test_breadcrumbs.py
91+++ b/lib/lp/translations/browser/tests/test_breadcrumbs.py
92@@ -114,7 +114,7 @@ class TestSeriesLanguageBreadcrumbs(BaseBreadcrumbTestCase):
93 name="test", version="1.0", distribution=distribution)
94 naked_series = remove_security_proxy_and_shout_at_engineer(series)
95 naked_series.hide_all_translations = False
96- serieslanguage = getUtility(IDistroSeriesLanguageSet).getDummy(
97+ serieslanguage = getUtility(IDistroSeriesLanguageSet).getEmpty(
98 series, self.language)
99
100 self.assertBreadcrumbs(
101diff --git a/lib/lp/translations/browser/translations.py b/lib/lp/translations/browser/translations.py
102index 61b99b1..8109cd7 100644
103--- a/lib/lp/translations/browser/translations.py
104+++ b/lib/lp/translations/browser/translations.py
105@@ -70,7 +70,7 @@ class RosettaApplicationView(LaunchpadView, TranslationsMixin):
106 langs = []
107 series = self.ubuntu_translationseries
108 for language in self.languages:
109- langs.append(series.getDistroSeriesLanguageOrDummy(language))
110+ langs.append(series.getDistroSeriesLanguageOrEmpty(language))
111 return langs
112
113 def requestCountry(self):
114diff --git a/lib/lp/translations/configure.zcml b/lib/lp/translations/configure.zcml
115index 4999f12..421921d 100644
116--- a/lib/lp/translations/configure.zcml
117+++ b/lib/lp/translations/configure.zcml
118@@ -230,7 +230,7 @@
119 for="lp.registry.interfaces.product.IProduct zope.lifecycleevent.interfaces.IObjectModifiedEvent"
120 handler="lp.translations.subscribers.product_modified"/>
121
122- <!-- DistroSeriesLanguage and Dummy -->
123+ <!-- DistroSeriesLanguage and EmptyDistroSeriesLanguage -->
124
125 <adapter
126 provides="lp.services.webapp.interfaces.IBreadcrumb"
127@@ -244,7 +244,7 @@
128 interface="lp.translations.interfaces.distroserieslanguage.IDistroSeriesLanguage"/>
129 </class>
130 <class
131- class="lp.translations.model.distroserieslanguage.DummyDistroSeriesLanguage">
132+ class="lp.translations.model.distroserieslanguage.EmptyDistroSeriesLanguage">
133 <allow
134 interface="lp.translations.interfaces.distroserieslanguage.IDistroSeriesLanguage"/>
135 </class>
136diff --git a/lib/lp/translations/doc/canonical_url_examples.rst b/lib/lp/translations/doc/canonical_url_examples.rst
137index ced3e02..a17f48b 100644
138--- a/lib/lp/translations/doc/canonical_url_examples.rst
139+++ b/lib/lp/translations/doc/canonical_url_examples.rst
140@@ -149,7 +149,7 @@ DistroSeriesLanguage objects have their URLs on translations vhost.
141 ... IDistroSeriesLanguageSet)
142 >>> serbian = getUtility(ILanguageSet)['sr']
143
144- >>> boo_bah_serbian = getUtility(IDistroSeriesLanguageSet).getDummy(
145+ >>> boo_bah_serbian = getUtility(IDistroSeriesLanguageSet).getEmpty(
146 ... distroseries, serbian)
147 >>> print(canonical_url(boo_bah_serbian))
148 http://translations.launchpad.test/boo/bah/+lang/sr
149diff --git a/lib/lp/translations/doc/distroseries-language.rst b/lib/lp/translations/doc/distroseries-language.rst
150index acb90f1..82b6e2f 100644
151--- a/lib/lp/translations/doc/distroseries-language.rst
152+++ b/lib/lp/translations/doc/distroseries-language.rst
153@@ -100,23 +100,23 @@ hoary_spanish.pofiles is hiding as expected.
154 Spanish (es) translation of disabled-template in Ubuntu Hoary package
155 "evolution"
156
157-We also have DummyDistroSeriesLanguages.
158+We also have EmptyDistroSeriesLanguages.
159
160 >>> amharic = getUtility(ILanguageSet)['am']
161- >>> hoary_amharic = hoary.getDistroSeriesLanguageOrDummy(amharic)
162+ >>> hoary_amharic = hoary.getDistroSeriesLanguageOrEmpty(amharic)
163 >>> print(hoary_amharic.__class__)
164- <class '...DummyDistroSeriesLanguage'>
165+ <class '...EmptyDistroSeriesLanguage'>
166
167 English is not a translatable language because we store the source messages
168-as English. Thus English cannot be a DummyDistroSeriesLanguage.
169+as English. Thus English cannot be an EmptyDistroSeriesLanguage.
170
171 >>> english = getUtility(ILanguageSet)['en']
172- >>> hoary_english = hoary.getDistroSeriesLanguageOrDummy(english)
173+ >>> hoary_english = hoary.getDistroSeriesLanguageOrEmpty(english)
174 Traceback (most recent call last):
175 ...
176 AssertionError: English is not a translatable language.
177
178-A DummyDistroSeriesLanguage gives you the same set of templates to
179+An EmptyDistroSeriesLanguage gives you the same set of templates to
180 translate as a regular DistroSeriesLanguage would.
181
182 >>> print_augmented_pofiles(hoary_amharic, hoary_templates)
183@@ -126,11 +126,11 @@ translate as a regular DistroSeriesLanguage would.
184 pkgconf-mozilla (am) <class '...pofile.DummyPOFile'>
185 pmount (am) <class '...pofile.DummyPOFile'>
186
187-Now, we should test that a DummyDistroSeriesLanguage implements the full
188+Now, we should test that an EmptyDistroSeriesLanguage implements the full
189 interface of a normal DistroSeriesLanguage.
190
191 NB IF THIS FAILS then it means that the DistroSeriesLanguage object has
192-been extended, and the DummyDistroSeriesLanguage has not been similarly
193+been extended, and the EmptyDistroSeriesLanguage has not been similarly
194 extended.
195
196 >>> print(IDistroSeriesLanguage.providedBy(hoary_amharic))
197diff --git a/lib/lp/translations/interfaces/distroserieslanguage.py b/lib/lp/translations/interfaces/distroserieslanguage.py
198index a898a09..0dadcfe 100644
199--- a/lib/lp/translations/interfaces/distroserieslanguage.py
200+++ b/lib/lp/translations/interfaces/distroserieslanguage.py
201@@ -53,7 +53,7 @@ class IDistroSeriesLanguage(IRosettaStats):
202 class IDistroSeriesLanguageSet(Interface):
203 """The set of distroserieslanguages."""
204
205- def getDummy(distroseries, language):
206- """Return a new DummyDistroSeriesLanguage for the given
207+ def getEmpty(distroseries, language):
208+ """Return a new EmptyDistroSeriesLanguage for the given
209 distroseries and language.
210 """
211diff --git a/lib/lp/translations/model/distroserieslanguage.py b/lib/lp/translations/model/distroserieslanguage.py
212index c25bce0..994c8a4 100644
213--- a/lib/lp/translations/model/distroserieslanguage.py
214+++ b/lib/lp/translations/model/distroserieslanguage.py
215@@ -6,7 +6,7 @@
216 __all__ = [
217 'DistroSeriesLanguage',
218 'DistroSeriesLanguageSet',
219- 'DummyDistroSeriesLanguage',
220+ 'EmptyDistroSeriesLanguage',
221 ]
222
223 from datetime import datetime
224@@ -160,7 +160,7 @@ class DistroSeriesLanguage(StormBase, RosettaStats):
225
226
227 @implementer(IDistroSeriesLanguage)
228-class DummyDistroSeriesLanguage(RosettaStats):
229+class EmptyDistroSeriesLanguage(RosettaStats):
230 """See `IDistroSeriesLanguage`
231
232 Represents a DistroSeriesLanguage where we do not yet actually HAVE one
233@@ -240,9 +240,9 @@ class DummyDistroSeriesLanguage(RosettaStats):
234 class DistroSeriesLanguageSet:
235 """See `IDistroSeriesLanguageSet`.
236
237- Implements a means to get a DummyDistroSeriesLanguage.
238+ Implements a means to get an EmptyDistroSeriesLanguage.
239 """
240
241- def getDummy(self, distroseries, language):
242+ def getEmpty(self, distroseries, language):
243 """See IDistroSeriesLanguageSet."""
244- return DummyDistroSeriesLanguage(distroseries, language)
245+ return EmptyDistroSeriesLanguage(distroseries, language)

Subscribers

People subscribed via source and target branches

to status/vote changes: