GNOME.org
 

[jhbuild/pre-3-cleanup] Remove _() and N_() from builtins

commit 08dcf5ab8db2386601c8cca86495b37617a29be7
Author: Christoph Reiter <reiter christoph gmail com>
Date:   Sat Sep 21 23:42:23 2019 +0200

    Remove _() and N_() from builtins
    
    Replace with explicit imports. Less magic.

 .flake8                             |  2 +-
 jhbuild/commands/__init__.py        |  2 +-
 jhbuild/commands/autobuild.py       |  1 +
 jhbuild/commands/base.py            |  2 +-
 jhbuild/commands/bootstrap.py       |  1 +
 jhbuild/commands/bot.py             |  1 +
 jhbuild/commands/checkbranches.py   |  2 +-
 jhbuild/commands/checkmodulesets.py |  1 +
 jhbuild/commands/clean.py           |  1 +
 jhbuild/commands/extdeps.py         |  1 +
 jhbuild/commands/goalreport.py      |  2 +-
 jhbuild/commands/gui.py             |  1 +
 jhbuild/commands/info.py            |  2 +-
 jhbuild/commands/make.py            |  1 +
 jhbuild/commands/rdepends.py        |  2 +-
 jhbuild/commands/sanitycheck.py     |  2 +-
 jhbuild/commands/snapshot.py        |  2 +-
 jhbuild/commands/sysdeps.py         |  1 +
 jhbuild/commands/tinderbox.py       |  1 +
 jhbuild/commands/twoninetynine.py   |  1 +
 jhbuild/commands/uninstall.py       |  1 +
 jhbuild/config.py                   |  2 +-
 jhbuild/frontends/autobuild.py      |  2 +-
 jhbuild/frontends/buildscript.py    |  2 +-
 jhbuild/frontends/gtkui.py          |  2 +-
 jhbuild/frontends/terminal.py       |  2 +-
 jhbuild/frontends/tinderbox.py      |  2 +-
 jhbuild/main.py                     |  6 ++----
 jhbuild/modtypes/__init__.py        |  2 +-
 jhbuild/modtypes/autotools.py       |  1 +
 jhbuild/modtypes/cmake.py           |  2 +-
 jhbuild/modtypes/distutils.py       |  1 +
 jhbuild/modtypes/linux.py           |  1 +
 jhbuild/modtypes/meson.py           |  2 +-
 jhbuild/modtypes/perl.py            |  1 +
 jhbuild/modtypes/tarball.py         |  1 +
 jhbuild/modtypes/waf.py             |  1 +
 jhbuild/moduleset.py                |  1 +
 jhbuild/utils/__init__.py           |  4 ++--
 jhbuild/utils/cmds.py               |  1 +
 jhbuild/utils/httpcache.py          |  2 ++
 jhbuild/utils/misc.py               | 19 ++++++++++++++++++-
 jhbuild/utils/packagedb.py          |  2 +-
 jhbuild/utils/systeminstall.py      |  1 +
 jhbuild/utils/trigger.py            |  2 +-
 jhbuild/utils/unpack.py             |  2 +-
 jhbuild/versioncontrol/__init__.py  |  2 +-
 jhbuild/versioncontrol/bzr.py       |  2 +-
 jhbuild/versioncontrol/cvs.py       |  2 +-
 jhbuild/versioncontrol/darcs.py     |  2 +-
 jhbuild/versioncontrol/fossil.py    |  2 +-
 jhbuild/versioncontrol/git.py       |  2 +-
 jhbuild/versioncontrol/hg.py        |  2 +-
 jhbuild/versioncontrol/mtn.py       |  2 +-
 jhbuild/versioncontrol/svn.py       |  2 +-
 jhbuild/versioncontrol/tarball.py   |  2 +-
 tests/mock.py                       |  1 +
 tests/test_main.py                  |  2 --
 58 files changed, 77 insertions(+), 40 deletions(-)
---
diff --git a/.flake8 b/.flake8
index 30c493f2..4c5ca664 100644
--- a/.flake8
+++ b/.flake8
@@ -1,4 +1,4 @@
 [flake8]
 
ignore=E122,E402,E126,E128,E401,W504,W503,E201,E302,E305,E251,E203,E124,E231,W293,E261,E221,E211,E502,E722,W391,E301,E202,E225,E227,W291,E303,E226,E131,E123,E241,W292
 max-line-length=160
-builtins=SRCDIR,_,N_,PKGDATADIR,DATADIR
\ No newline at end of file
+builtins=SRCDIR,PKGDATADIR,DATADIR
\ No newline at end of file
diff --git a/jhbuild/commands/__init__.py b/jhbuild/commands/__init__.py
index 953482c9..060e2517 100644
--- a/jhbuild/commands/__init__.py
+++ b/jhbuild/commands/__init__.py
@@ -31,7 +31,7 @@ import sys
 import os
 
 from jhbuild.errors import FatalError
-from jhbuild.utils import try_import_module, uprint, uencode
+from jhbuild.utils import try_import_module, uprint, uencode, N_, _
 
 
 class OptionParser(optparse.OptionParser):
diff --git a/jhbuild/commands/autobuild.py b/jhbuild/commands/autobuild.py
index 8ad6828f..8e8e2d75 100644
--- a/jhbuild/commands/autobuild.py
+++ b/jhbuild/commands/autobuild.py
@@ -21,6 +21,7 @@ from optparse import make_option
 
 from jhbuild.errors import UsageError, FatalError
 from jhbuild.commands.base import Command, register_command
+from jhbuild.utils import N_, _
 import jhbuild.frontends
 
 class cmd_autobuild(Command):
diff --git a/jhbuild/commands/base.py b/jhbuild/commands/base.py
index a9de1675..5e31631b 100644
--- a/jhbuild/commands/base.py
+++ b/jhbuild/commands/base.py
@@ -25,7 +25,7 @@ import jhbuild.moduleset
 import jhbuild.frontends
 from jhbuild.errors import UsageError, FatalError, CommandError
 from jhbuild.commands import Command, BuildCommand, register_command
-from jhbuild.utils import uprint
+from jhbuild.utils import uprint, N_, _
 
 
 class cmd_update(Command):
diff --git a/jhbuild/commands/bootstrap.py b/jhbuild/commands/bootstrap.py
index e67d6a6b..5162d9f1 100644
--- a/jhbuild/commands/bootstrap.py
+++ b/jhbuild/commands/bootstrap.py
@@ -19,6 +19,7 @@
 
 from jhbuild.commands import register_command
 from jhbuild.commands.base import cmd_build
+from jhbuild.utils import N_
 
 class cmd_bootstrap(cmd_build):
     doc = N_('Build support tools')
diff --git a/jhbuild/commands/bot.py b/jhbuild/commands/bot.py
index 0b8de052..da72155e 100644
--- a/jhbuild/commands/bot.py
+++ b/jhbuild/commands/bot.py
@@ -27,6 +27,7 @@ from optparse import make_option
 
 from jhbuild.commands import Command, register_command
 from jhbuild.errors import FatalError
+from jhbuild.utils import N_, _
 
 
 class cmd_bot(Command):
diff --git a/jhbuild/commands/checkbranches.py b/jhbuild/commands/checkbranches.py
index 366b071c..6304d926 100644
--- a/jhbuild/commands/checkbranches.py
+++ b/jhbuild/commands/checkbranches.py
@@ -22,7 +22,7 @@ from optparse import make_option
 import jhbuild.moduleset
 from jhbuild.commands import Command, register_command
 from jhbuild.utils.cmds import get_output
-from jhbuild.utils import uprint
+from jhbuild.utils import uprint, N_, _
 from jhbuild.errors import CommandError
 
 class cmd_checkbranches(Command):
diff --git a/jhbuild/commands/checkmodulesets.py b/jhbuild/commands/checkmodulesets.py
index 1b13472a..40070210 100644
--- a/jhbuild/commands/checkmodulesets.py
+++ b/jhbuild/commands/checkmodulesets.py
@@ -20,6 +20,7 @@
 import logging
 
 import jhbuild.moduleset
+from jhbuild.utils import N_, _
 from jhbuild.commands import Command, register_command
 
 class cmd_checkmodulesets(Command):
diff --git a/jhbuild/commands/clean.py b/jhbuild/commands/clean.py
index a7442959..46a5f80e 100644
--- a/jhbuild/commands/clean.py
+++ b/jhbuild/commands/clean.py
@@ -22,6 +22,7 @@ from optparse import make_option
 import jhbuild.moduleset
 import jhbuild.frontends
 from jhbuild.errors import FatalError
+from jhbuild.utils import _
 from jhbuild.commands import Command, register_command
 
 
diff --git a/jhbuild/commands/extdeps.py b/jhbuild/commands/extdeps.py
index cd13fb5a..4087c2f1 100644
--- a/jhbuild/commands/extdeps.py
+++ b/jhbuild/commands/extdeps.py
@@ -25,6 +25,7 @@ import socket
 import sys
 import time
 
+from jhbuild.utils import _
 from jhbuild.utils.compat import cmp
 
 try:
diff --git a/jhbuild/commands/goalreport.py b/jhbuild/commands/goalreport.py
index 21fe184b..b718adf6 100644
--- a/jhbuild/commands/goalreport.py
+++ b/jhbuild/commands/goalreport.py
@@ -43,7 +43,7 @@ except ImportError:
 
 import jhbuild.moduleset
 from jhbuild.commands import Command, register_command
-from jhbuild.utils import httpcache, cmds
+from jhbuild.utils import httpcache, cmds, _
 from jhbuild.modtypes import MetaModule
 
 try:
diff --git a/jhbuild/commands/gui.py b/jhbuild/commands/gui.py
index 543c1b43..b2bd9798 100644
--- a/jhbuild/commands/gui.py
+++ b/jhbuild/commands/gui.py
@@ -19,6 +19,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 from jhbuild.commands import Command, register_command
+from jhbuild.utils import N_
 import jhbuild.frontends
 
 class cmd_gui(Command):
diff --git a/jhbuild/commands/info.py b/jhbuild/commands/info.py
index 456f186c..9fd02b57 100644
--- a/jhbuild/commands/info.py
+++ b/jhbuild/commands/info.py
@@ -23,7 +23,7 @@ from optparse import make_option
 
 import jhbuild.moduleset
 import jhbuild.frontends
-from jhbuild.utils import uprint
+from jhbuild.utils import uprint, N_, _
 from jhbuild.errors import FatalError
 from jhbuild.commands import Command, register_command
 from jhbuild.modtypes import MetaModule
diff --git a/jhbuild/commands/make.py b/jhbuild/commands/make.py
index 44281cc3..29e823ac 100644
--- a/jhbuild/commands/make.py
+++ b/jhbuild/commands/make.py
@@ -25,6 +25,7 @@ from optparse import make_option
 import jhbuild.moduleset
 import jhbuild.frontends
 from jhbuild.commands import Command, register_command
+from jhbuild.utils import N_, _
 
 class cmd_make(Command):
     doc = N_('Compile and install the module for the current directory')
diff --git a/jhbuild/commands/rdepends.py b/jhbuild/commands/rdepends.py
index 4ecbeee0..f434231c 100644
--- a/jhbuild/commands/rdepends.py
+++ b/jhbuild/commands/rdepends.py
@@ -22,7 +22,7 @@ from optparse import make_option
 import jhbuild.moduleset
 from jhbuild.commands import Command, register_command
 from jhbuild.errors import FatalError
-from jhbuild.utils import uprint
+from jhbuild.utils import uprint, N_, _
 
 
 class cmd_rdepends(Command):
diff --git a/jhbuild/commands/sanitycheck.py b/jhbuild/commands/sanitycheck.py
index 94d0e01e..71c6f29e 100644
--- a/jhbuild/commands/sanitycheck.py
+++ b/jhbuild/commands/sanitycheck.py
@@ -21,7 +21,7 @@ import os
 
 from jhbuild.commands import Command, register_command
 from jhbuild.utils.cmds import get_output, check_version
-from jhbuild.utils import inpath, uprint
+from jhbuild.utils import inpath, uprint, N_, _
 from jhbuild.errors import UsageError, CommandError
 
 def get_aclocal_path():
diff --git a/jhbuild/commands/snapshot.py b/jhbuild/commands/snapshot.py
index 80396cbf..53b4d835 100644
--- a/jhbuild/commands/snapshot.py
+++ b/jhbuild/commands/snapshot.py
@@ -23,7 +23,7 @@ from __future__ import print_function
 
 import jhbuild.moduleset
 from jhbuild.commands import Command, register_command
-
+from jhbuild.utils import N_
 from jhbuild.utils.sxml import sxml, sxml_to_string
 
 
diff --git a/jhbuild/commands/sysdeps.py b/jhbuild/commands/sysdeps.py
index eef5a801..327d6db1 100644
--- a/jhbuild/commands/sysdeps.py
+++ b/jhbuild/commands/sysdeps.py
@@ -30,6 +30,7 @@ from jhbuild.commands.base import cmd_build
 from jhbuild.utils.systeminstall import SystemInstall
 from jhbuild.modtypes.systemmodule import SystemModule
 from jhbuild.versioncontrol.tarball import TarballBranch
+from jhbuild.utils import N_, _
 from jhbuild.utils import cmds
 
 class cmd_sysdeps(cmd_build):
diff --git a/jhbuild/commands/tinderbox.py b/jhbuild/commands/tinderbox.py
index 3aae113f..d2087d61 100644
--- a/jhbuild/commands/tinderbox.py
+++ b/jhbuild/commands/tinderbox.py
@@ -22,6 +22,7 @@ from optparse import make_option
 from jhbuild.errors import UsageError, FatalError
 from jhbuild.commands import Command, BuildCommand, register_command
 import jhbuild.frontends
+from jhbuild.utils import N_, _
 
 
 class cmd_tinderbox(BuildCommand):
diff --git a/jhbuild/commands/twoninetynine.py b/jhbuild/commands/twoninetynine.py
index c3ad4908..531297c4 100644
--- a/jhbuild/commands/twoninetynine.py
+++ b/jhbuild/commands/twoninetynine.py
@@ -22,6 +22,7 @@ from optparse import make_option
 import re
 
 from jhbuild.commands import Command, register_command
+from jhbuild.utils import _
 
 from goalreport import cmd_goalreport, ExcludedModuleException, \
          Check, ShellCheck, DeprecatedSymbolsCheck, FIND_C
diff --git a/jhbuild/commands/uninstall.py b/jhbuild/commands/uninstall.py
index 03f59311..688114bc 100644
--- a/jhbuild/commands/uninstall.py
+++ b/jhbuild/commands/uninstall.py
@@ -24,6 +24,7 @@ import jhbuild.frontends
 from jhbuild.errors import FatalError
 from jhbuild.commands import Command, register_command
 from jhbuild.modtypes.autotools import AutogenModule
+from jhbuild.utils import N_, _
 
 
 class cmd_uninstall(Command):
diff --git a/jhbuild/config.py b/jhbuild/config.py
index d52b4ebe..49183bad 100644
--- a/jhbuild/config.py
+++ b/jhbuild/config.py
@@ -30,7 +30,7 @@ import logging
 
 from jhbuild.environment import setup_env, setup_env_defaults, addpath
 from jhbuild.errors import FatalError
-from jhbuild.utils import sysid
+from jhbuild.utils import sysid, _
 from jhbuild.utils.compat import execfile
 
 if sys.platform.startswith('win'):
diff --git a/jhbuild/frontends/autobuild.py b/jhbuild/frontends/autobuild.py
index 12cbb59c..9979f809 100644
--- a/jhbuild/frontends/autobuild.py
+++ b/jhbuild/frontends/autobuild.py
@@ -26,7 +26,7 @@ import sys
 import locale
 import socket
 
-from jhbuild.utils import cmds
+from jhbuild.utils import cmds, _
 from jhbuild.utils.compat import text_type, string_types
 from jhbuild.errors import CommandError
 import buildscript
diff --git a/jhbuild/frontends/buildscript.py b/jhbuild/frontends/buildscript.py
index cc5be03d..2ae5b6d3 100644
--- a/jhbuild/frontends/buildscript.py
+++ b/jhbuild/frontends/buildscript.py
@@ -24,7 +24,7 @@ import subprocess
 import sys
 
 from jhbuild.utils import trigger
-from jhbuild.utils import cmds
+from jhbuild.utils import cmds, _
 from jhbuild.errors import FatalError, CommandError, SkipToPhase, SkipToEnd
 from jhbuild.utils.compat import string_types
 
diff --git a/jhbuild/frontends/gtkui.py b/jhbuild/frontends/gtkui.py
index b2c9a6c3..66b0e02d 100644
--- a/jhbuild/frontends/gtkui.py
+++ b/jhbuild/frontends/gtkui.py
@@ -40,7 +40,7 @@ import buildscript
 import jhbuild.moduleset
 from jhbuild.modtypes import MetaModule
 from jhbuild.errors import CommandError
-from jhbuild.utils import notify
+from jhbuild.utils import notify, _
 from jhbuild.utils.compat import string_types, cmp
 
 from terminal import t_bold, t_reset
diff --git a/jhbuild/frontends/terminal.py b/jhbuild/frontends/terminal.py
index 3ce8690d..68d296d0 100644
--- a/jhbuild/frontends/terminal.py
+++ b/jhbuild/frontends/terminal.py
@@ -30,7 +30,7 @@ from jhbuild.frontends import buildscript
 from jhbuild.utils import cmds
 from jhbuild.utils import trayicon
 from jhbuild.utils import notify
-from jhbuild.utils import uprint, uencode, udecode
+from jhbuild.utils import uprint, uencode, udecode, _
 from jhbuild.errors import CommandError, FatalError
 from jhbuild.utils.compat import input, string_types
 
diff --git a/jhbuild/frontends/tinderbox.py b/jhbuild/frontends/tinderbox.py
index 3e5b783f..93362cf4 100644
--- a/jhbuild/frontends/tinderbox.py
+++ b/jhbuild/frontends/tinderbox.py
@@ -26,7 +26,7 @@ import sys
 
 from jhbuild.main import _encoding
 from jhbuild.utils import cmds
-from jhbuild.utils import sysid
+from jhbuild.utils import sysid, _
 from jhbuild.errors import CommandError, FatalError
 from jhbuild.utils.compat import string_types, text_type
 import buildscript
diff --git a/jhbuild/main.py b/jhbuild/main.py
index 8c045d47..7d98f6d9 100644
--- a/jhbuild/main.py
+++ b/jhbuild/main.py
@@ -24,13 +24,11 @@ import optparse
 import logging
 
 import gettext
-import __builtin__
-__builtin__.__dict__['N_'] = lambda x: x
 
 import jhbuild.config
 import jhbuild.commands
 from jhbuild.errors import UsageError, FatalError
-from jhbuild.utils import uprint, _encoding
+from jhbuild.utils import uprint, _encoding, install_translation, _
 from jhbuild.moduleset import warn_local_modulesets
 
 
@@ -52,7 +50,7 @@ def main(args):
     localedir = os.path.join(DATADIR, 'locale')
     if not os.path.exists(localedir):
         localedir = None
-    gettext.install('jhbuild', localedir=localedir, unicode=True)
+    install_translation(gettext.translation('jhbuild', localedir=localedir, fallback=True))
 
     if 'JHBUILD_RUN_AS_ROOT' not in os.environ and hasattr(os, 'getuid') and os.getuid() == 0:
         sys.stderr.write(_('You should not run jhbuild as root.\n').encode(_encoding, 'replace'))
diff --git a/jhbuild/modtypes/__init__.py b/jhbuild/modtypes/__init__.py
index 9137efc1..235e7e78 100644
--- a/jhbuild/modtypes/__init__.py
+++ b/jhbuild/modtypes/__init__.py
@@ -36,7 +36,7 @@ import importlib
 from jhbuild.errors import FatalError, CommandError, BuildStateError, \
              SkipToEnd, UndefinedRepositoryError
 from jhbuild.utils.sxml import sxml
-from jhbuild.utils import inpath, try_import_module
+from jhbuild.utils import inpath, try_import_module, N_, _
 import jhbuild.utils.fileutils as fileutils
 
 _module_types = {}
diff --git a/jhbuild/modtypes/autotools.py b/jhbuild/modtypes/autotools.py
index 4159ca7f..f90b4a3d 100644
--- a/jhbuild/modtypes/autotools.py
+++ b/jhbuild/modtypes/autotools.py
@@ -28,6 +28,7 @@ from jhbuild.errors import FatalError, CommandError
 from jhbuild.modtypes import \
      DownloadableModule, register_module_type, MakeModule
 from jhbuild.versioncontrol.tarball import TarballBranch
+from jhbuild.utils import _
 
 __all__ = [ 'AutogenModule' ]
 
diff --git a/jhbuild/modtypes/cmake.py b/jhbuild/modtypes/cmake.py
index 69ff30a6..112bba20 100644
--- a/jhbuild/modtypes/cmake.py
+++ b/jhbuild/modtypes/cmake.py
@@ -26,7 +26,7 @@ from jhbuild.errors import CommandError
 from jhbuild.modtypes import \
      Package, DownloadableModule, register_module_type, MakeModule, NinjaModule
 from jhbuild.modtypes.autotools import collect_args
-from jhbuild.utils import inpath
+from jhbuild.utils import inpath, _
 
 __all__ = [ 'CMakeModule' ]
 
diff --git a/jhbuild/modtypes/distutils.py b/jhbuild/modtypes/distutils.py
index 77f934b8..4acaa090 100644
--- a/jhbuild/modtypes/distutils.py
+++ b/jhbuild/modtypes/distutils.py
@@ -21,6 +21,7 @@ __metaclass__ = type
 
 import os
 
+from jhbuild.utils import _
 from jhbuild.modtypes import \
      Package, DownloadableModule, register_module_type
 
diff --git a/jhbuild/modtypes/linux.py b/jhbuild/modtypes/linux.py
index c9247c57..32675d24 100644
--- a/jhbuild/modtypes/linux.py
+++ b/jhbuild/modtypes/linux.py
@@ -27,6 +27,7 @@ import errno
 from jhbuild.errors import FatalError, BuildStateError
 from jhbuild.modtypes import \
      register_module_type, MakeModule, get_branch
+from jhbuild.utils import _
 
 __all__ = [ 'LinuxModule' ]
 
diff --git a/jhbuild/modtypes/meson.py b/jhbuild/modtypes/meson.py
index d2b82138..a4159e35 100644
--- a/jhbuild/modtypes/meson.py
+++ b/jhbuild/modtypes/meson.py
@@ -26,7 +26,7 @@ from jhbuild.errors import CommandError
 from jhbuild.modtypes import \
      Package, DownloadableModule, register_module_type, NinjaModule
 from jhbuild.modtypes.autotools import collect_args
-from jhbuild.utils import inpath
+from jhbuild.utils import inpath, _
 
 __all__ = [ 'MesonModule' ]
 
diff --git a/jhbuild/modtypes/perl.py b/jhbuild/modtypes/perl.py
index 89e99b13..233ac492 100644
--- a/jhbuild/modtypes/perl.py
+++ b/jhbuild/modtypes/perl.py
@@ -21,6 +21,7 @@ __metaclass__ = type
 
 import os
 
+from jhbuild.utils import _
 from jhbuild.modtypes import \
      Package, DownloadableModule, register_module_type
 
diff --git a/jhbuild/modtypes/tarball.py b/jhbuild/modtypes/tarball.py
index 04fd97bb..27552e43 100644
--- a/jhbuild/modtypes/tarball.py
+++ b/jhbuild/modtypes/tarball.py
@@ -21,6 +21,7 @@ __metaclass__ = type
 
 import logging
 
+from jhbuild.utils import _
 from jhbuild.modtypes import register_module_type, get_dependencies, find_first_child_node_content
 
 def parse_tarball(node, config, uri, repositories, default_repo):
diff --git a/jhbuild/modtypes/waf.py b/jhbuild/modtypes/waf.py
index 27ea717c..459578a7 100644
--- a/jhbuild/modtypes/waf.py
+++ b/jhbuild/modtypes/waf.py
@@ -26,6 +26,7 @@ import os
 from jhbuild.errors import CommandError
 from jhbuild.modtypes import \
      Package, DownloadableModule, register_module_type
+from jhbuild.utils import _
 
 __all__ = [ 'WafModule' ]
 
diff --git a/jhbuild/moduleset.py b/jhbuild/moduleset.py
index d082c8bb..ff9b43c8 100644
--- a/jhbuild/moduleset.py
+++ b/jhbuild/moduleset.py
@@ -26,6 +26,7 @@ import logging
 import xml.dom.minidom
 import xml.parsers.expat
 
+from jhbuild.utils import _
 from jhbuild.errors import UsageError, FatalError, \
              CommandError, UndefinedRepositoryError
 from jhbuild import modtypes
diff --git a/jhbuild/utils/__init__.py b/jhbuild/utils/__init__.py
index cbb1fd68..e09400bc 100644
--- a/jhbuild/utils/__init__.py
+++ b/jhbuild/utils/__init__.py
@@ -17,6 +17,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-from .misc import inpath, try_import_module, uencode, udecode, uprint, _encoding
+from .misc import inpath, try_import_module, uencode, udecode, uprint, _encoding, N_, _, install_translation
 
-inpath, try_import_module, uencode, udecode, uprint, _encoding
\ No newline at end of file
+inpath, try_import_module, uencode, udecode, uprint, _encoding, N_, _, install_translation
\ No newline at end of file
diff --git a/jhbuild/utils/cmds.py b/jhbuild/utils/cmds.py
index 66676915..36f429fe 100644
--- a/jhbuild/utils/cmds.py
+++ b/jhbuild/utils/cmds.py
@@ -24,6 +24,7 @@ import subprocess
 import sys
 from signal import SIGINT
 from jhbuild.errors import CommandError
+from jhbuild.utils import _
 from jhbuild.utils.compat import string_types
 
 def get_output(cmd, cwd=None, extra_env=None, get_stderr = True):
diff --git a/jhbuild/utils/httpcache.py b/jhbuild/utils/httpcache.py
index 21308eb6..47c6d991 100644
--- a/jhbuild/utils/httpcache.py
+++ b/jhbuild/utils/httpcache.py
@@ -38,6 +38,8 @@ import StringIO
 import gzip
 import xml.dom.minidom
 
+from jhbuild.utils import _
+
 def _parse_isotime(string):
     if string[-1] != 'Z':
         return time.mktime(time.strptime(string, '%Y-%m-%dT%H:%M:%S'))
diff --git a/jhbuild/utils/misc.py b/jhbuild/utils/misc.py
index fbd1b439..f3330fe5 100644
--- a/jhbuild/utils/misc.py
+++ b/jhbuild/utils/misc.py
@@ -74,4 +74,21 @@ def uprint(*args):
     for s in args[:-1]:
         print(uencode(s), end=' ')
     s = args[-1]
-    print(uencode(s))
\ No newline at end of file
+    print(uencode(s))
+
+def N_(x):
+    return text_type(x)
+
+_ugettext = None
+
+def _(x):
+    x = text_type(x)
+    if _ugettext is not None:
+        return _ugettext(x)
+    return x
+
+
+def install_translation(translation):
+    global _ugettext
+
+    _ugettext = translation.ugettext
\ No newline at end of file
diff --git a/jhbuild/utils/packagedb.py b/jhbuild/utils/packagedb.py
index 6927ef17..538d1136 100644
--- a/jhbuild/utils/packagedb.py
+++ b/jhbuild/utils/packagedb.py
@@ -25,7 +25,7 @@ import hashlib
 
 import xml.etree.ElementTree as ET
 
-from jhbuild.utils import fileutils
+from jhbuild.utils import fileutils, _
 
 def _parse_isotime(string):
     if string[-1] != 'Z':
diff --git a/jhbuild/utils/systeminstall.py b/jhbuild/utils/systeminstall.py
index 93f92f14..e7b17982 100644
--- a/jhbuild/utils/systeminstall.py
+++ b/jhbuild/utils/systeminstall.py
@@ -31,6 +31,7 @@ from StringIO import StringIO
 import re
 
 import cmds
+from . import _
 
 def get_installed_pkgconfigs(config):
     """Returns a dictionary mapping pkg-config names to their current versions on the system."""
diff --git a/jhbuild/utils/trigger.py b/jhbuild/utils/trigger.py
index 85356725..60ffd0f9 100644
--- a/jhbuild/utils/trigger.py
+++ b/jhbuild/utils/trigger.py
@@ -20,7 +20,7 @@
 import os
 import re
 
-from jhbuild.utils import cmds
+from jhbuild.utils import cmds, _
 
 class Trigger(object):
     SUFFIX = '.trigger'
diff --git a/jhbuild/utils/unpack.py b/jhbuild/utils/unpack.py
index 887eb8d8..dea21d7c 100644
--- a/jhbuild/utils/unpack.py
+++ b/jhbuild/utils/unpack.py
@@ -24,7 +24,7 @@ import tempfile
 
 from jhbuild.utils.cmds import has_command
 from jhbuild.errors import CommandError
-from jhbuild.utils import fileutils
+from jhbuild.utils import fileutils, _
 
 
 def unpack_tar_file(localfile, target_directory):
diff --git a/jhbuild/versioncontrol/__init__.py b/jhbuild/versioncontrol/__init__.py
index 60fc6e69..b2911bd8 100644
--- a/jhbuild/versioncontrol/__init__.py
+++ b/jhbuild/versioncontrol/__init__.py
@@ -27,7 +27,7 @@ __all__ = [
 __metaclass__ = type
 
 from jhbuild.errors import FatalError
-from jhbuild.utils import try_import_module
+from jhbuild.utils import try_import_module, _
 import os
 
 class Repository:
diff --git a/jhbuild/versioncontrol/bzr.py b/jhbuild/versioncontrol/bzr.py
index 1a0c35ec..606fa3b4 100644
--- a/jhbuild/versioncontrol/bzr.py
+++ b/jhbuild/versioncontrol/bzr.py
@@ -27,7 +27,7 @@ import logging
 from jhbuild.errors import FatalError, CommandError
 from jhbuild.utils.cmds import get_output
 from jhbuild.versioncontrol import Repository, Branch, register_repo_type
-from jhbuild.utils import inpath
+from jhbuild.utils import inpath, _
 from jhbuild.utils.sxml import sxml
 
 # Make sure that the urlparse module considers bzr://, bzr+ssh://, sftp:// and lp:
diff --git a/jhbuild/versioncontrol/cvs.py b/jhbuild/versioncontrol/cvs.py
index 3193b8d8..91014e4f 100644
--- a/jhbuild/versioncontrol/cvs.py
+++ b/jhbuild/versioncontrol/cvs.py
@@ -30,7 +30,7 @@ import git
 
 from jhbuild.errors import BuildStateError, CommandError
 from jhbuild.versioncontrol import Repository, Branch, register_repo_type
-from jhbuild.utils import inpath
+from jhbuild.utils import inpath, _
 from jhbuild.utils.sxml import sxml
 
 
diff --git a/jhbuild/versioncontrol/darcs.py b/jhbuild/versioncontrol/darcs.py
index 711dc2bc..2fabc141 100644
--- a/jhbuild/versioncontrol/darcs.py
+++ b/jhbuild/versioncontrol/darcs.py
@@ -26,7 +26,7 @@ import hashlib
 
 from jhbuild.errors import FatalError, CommandError
 from jhbuild.versioncontrol import Repository, Branch, register_repo_type
-from jhbuild.utils import inpath
+from jhbuild.utils import inpath, _
 
 class DarcsRepository(Repository):
     """A class representing a Darcs repository.
diff --git a/jhbuild/versioncontrol/fossil.py b/jhbuild/versioncontrol/fossil.py
index b581e690..167b1dbc 100644
--- a/jhbuild/versioncontrol/fossil.py
+++ b/jhbuild/versioncontrol/fossil.py
@@ -27,7 +27,7 @@ from subprocess import Popen, PIPE
 
 from jhbuild.errors import FatalError, CommandError
 from jhbuild.versioncontrol import Repository, Branch, register_repo_type
-from jhbuild.utils import inpath
+from jhbuild.utils import inpath, _
 
 class FossilRepository(Repository):
     """A class representing a Fossil repository."""
diff --git a/jhbuild/versioncontrol/git.py b/jhbuild/versioncontrol/git.py
index c677105f..37b2577e 100644
--- a/jhbuild/versioncontrol/git.py
+++ b/jhbuild/versioncontrol/git.py
@@ -33,7 +33,7 @@ from jhbuild.errors import FatalError, CommandError
 from jhbuild.utils.cmds import get_output, check_version
 from jhbuild.versioncontrol import Repository, Branch, register_repo_type
 import jhbuild.versioncontrol.svn
-from jhbuild.utils import inpath
+from jhbuild.utils import inpath, _
 from jhbuild.utils.sxml import sxml
 
 # Make sure that the urlparse module considers git:// and git+ssh://
diff --git a/jhbuild/versioncontrol/hg.py b/jhbuild/versioncontrol/hg.py
index 52ba965e..7d9ba1a9 100644
--- a/jhbuild/versioncontrol/hg.py
+++ b/jhbuild/versioncontrol/hg.py
@@ -27,7 +27,7 @@ from subprocess import Popen, PIPE
 
 from jhbuild.errors import FatalError, CommandError
 from jhbuild.versioncontrol import Repository, Branch, register_repo_type
-from jhbuild.utils import inpath
+from jhbuild.utils import inpath, _
 
 class HgRepository(Repository):
     """A class representing a Mercurial repository.
diff --git a/jhbuild/versioncontrol/mtn.py b/jhbuild/versioncontrol/mtn.py
index a964954a..abf93f01 100644
--- a/jhbuild/versioncontrol/mtn.py
+++ b/jhbuild/versioncontrol/mtn.py
@@ -26,7 +26,7 @@ import os
 from jhbuild.errors import CommandError, FatalError
 from jhbuild.utils.cmds import get_output
 from jhbuild.versioncontrol import Repository, Branch, register_repo_type
-from jhbuild.utils import inpath
+from jhbuild.utils import inpath, _
 
 class MonotoneRepository(Repository):
     """A class representing a Monotone database."""
diff --git a/jhbuild/versioncontrol/svn.py b/jhbuild/versioncontrol/svn.py
index d6c56f75..27f32659 100644
--- a/jhbuild/versioncontrol/svn.py
+++ b/jhbuild/versioncontrol/svn.py
@@ -29,7 +29,7 @@ import subprocess
 from jhbuild.errors import CommandError, BuildStateError
 from jhbuild.utils.cmds import get_output, check_version
 from jhbuild.versioncontrol import Repository, Branch, register_repo_type
-from jhbuild.utils import inpath
+from jhbuild.utils import inpath, _
 from jhbuild.utils.sxml import sxml
 
 import bzr, git
diff --git a/jhbuild/versioncontrol/tarball.py b/jhbuild/versioncontrol/tarball.py
index cfce6a75..0b79da02 100644
--- a/jhbuild/versioncontrol/tarball.py
+++ b/jhbuild/versioncontrol/tarball.py
@@ -32,7 +32,7 @@ from jhbuild.versioncontrol import Repository, Branch, register_repo_type
 from jhbuild.utils.cmds import has_command, get_output
 from jhbuild.modtypes import get_branch
 from jhbuild.utils.unpack import unpack_archive
-from jhbuild.utils import httpcache
+from jhbuild.utils import httpcache, _
 from jhbuild.utils.sxml import sxml
 
 
diff --git a/tests/mock.py b/tests/mock.py
index 6d5dd215..cc4e16c8 100644
--- a/tests/mock.py
+++ b/tests/mock.py
@@ -26,6 +26,7 @@ import jhbuild.frontends.buildscript
 import jhbuild.versioncontrol
 import jhbuild.errors
 import jhbuild.config
+from jhbuild.utils import _
 
 class Config(jhbuild.config.Config):
     buildroot = tempfile.mkdtemp(prefix='jhbuild-tests-')
diff --git a/tests/test_main.py b/tests/test_main.py
index f7d99978..831d22a0 100644
--- a/tests/test_main.py
+++ b/tests/test_main.py
@@ -31,8 +31,6 @@ import tempfile
 import unittest
 
 import __builtin__
-__builtin__.__dict__['_'] = lambda x: x
-__builtin__.__dict__['N_'] = lambda x: x
 
 SRCDIR = os.path.join(os.path.dirname(__file__), '..')
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]