Issue 3047 - Change default search engines

mozharness/mozilla/l10n/multi_locale_build.py

 #!/usr/bin/env python
 # ***** BEGIN LICENSE BLOCK *****
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 # ***** END LICENSE BLOCK *****
 """multi_locale_build.py
 
 This should be a mostly generic multilocale build script.
 """
 
 from copy import deepcopy
 import os
 import sys
 
 sys.path.insert(1, os.path.dirname(os.path.dirname(sys.path[0])))
 
 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
 class MultiLocaleBuild(LocalesMixin, MercurialScript):
     """ This class targets Fennec multilocale builds.
         We were considering this for potential Firefox desktop multilocale.
         Now that we have a different approach for B2G multilocale,
         it's most likely misnamed. """
     config_options = [[
         ["--locale"],
@@ skipping 63 matching lines @@
 
     def __init__(self, require_config_file=True):
         LocalesMixin.__init__(self)
         MercurialScript.__init__(self, config_options=self.config_options,
                                  all_actions=['clobber', 'pull-build-source',
                                               'pull-locale-source',
                                               'build', 'package-en-US',
                                               '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)
 
     def clobber(self):
         c = self.config
         if c['work_dir'] != '.':
             path = os.path.join(c['base_work_dir'], c['work_dir'])
             if os.path.exists(path):
                 self.rmtree(path, error_level=FATAL)
         else:
@@ skipping 123 matching lines @@
         # TODO
         self.info("Not written yet.")
 
     def _process_command(self, **kwargs):
         """Stub wrapper function that allows us to call scratchbox in
            MaemoMultiLocaleBuild.
 
         """
         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