Issue 3047 - Change default search engines

mozharness/mozilla/l10n/multi_locale_build.py

Index: mozharness/mozilla/l10n/multi_locale_build.py
diff --git a/mozharness/mozilla/l10n/multi_locale_build.py b/mozharness/mozilla/l10n/multi_locale_build.py
index 51d3693e43534e6b1b0619180491e0c48ae11052..533742b78d0a2a5892f055210a4388677c32144b 100755
--- a/mozharness/mozilla/l10n/multi_locale_build.py
+++ b/mozharness/mozilla/l10n/multi_locale_build.py
@@ -19,6 +19,7 @@ from mozharness.base.errors import MakefileErrorList, SSHErrorList
 from mozharness.base.log import FATAL
 from mozharness.base.vcs.vcsbase import MercurialScript
 from mozharness.mozilla.l10n.locales import LocalesMixin
+from mozharness.abb.abb_transform_locales import abb_transform_locales_impl

[Felix Dahlke, 2015/09/17 09:52:35]

There is no need to suffix that function with "impl" within the
abb_transform_locales module (which should be renamed to `transform_locales` -
there is no need for the prefix, there are namespaces).

You could achieve the same effect here with:

`from mozharness.abb.transform_locales import transform_locales as
abb_transform_locales_impl`

Although I personally think of interfaces when hearing "impl" and would probably
go for "abb_to_transform_locales" or, more likely, just import
mozharness.abb.transform_locales and call the function fully qualified below.

[René Jeschke, 2015/09/17 10:39:49]

Done.

 
 
 # MultiLocaleBuild {{{1
@@ -102,7 +103,9 @@ class MultiLocaleBuild(LocalesMixin, MercurialScript):
                                               'upload-en-US',
                                               'backup-objdir',
                                               'restore-objdir',
-                                              'add-locales', 'package-multi',
+                                              'add-locales',
+                                              'abb-transform-locales',
+                                              'package-multi',
                                               'upload-multi', 'summary'],
                                  require_config_file=require_config_file)
 
@@ -246,6 +249,11 @@ class MultiLocaleBuild(LocalesMixin, MercurialScript):
         """
         return self.run_command(**kwargs)
 
+

[Felix Dahlke, 2015/09/17 09:52:35]

Nit: Even though PEP-8 suggests two blank lines between functions, it states
there should only be a single one between methods, as Mozilla does it here, too:
https://www.python.org/dev/peps/pep-0008/#blank-lines

[René Jeschke, 2015/09/17 10:39:49]

Done.

+    def abb_transform_locales(self):
+        dirs = self.query_abs_dirs()
+        abb_transform_locales_impl(dirs['abs_objdir'], self)
+
 # __main__ {{{1
 if __name__ == '__main__':
     pass