i18n: import _ instead of gettext

hgext/inotify/__init__.py

@@ -11,7 +11,7 b''
 
 # todo: socket permissions
 
-from mercurial.i18n import gettext as _
+from mercurial.i18n import _
 from mercurial import cmdutil, util
 import client, errno, os, server, socket
 from weakref import proxy

hgext/inotify/client.py

@@ -6,7 +6,7 b''
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
-from mercurial.i18n import gettext as _
+from mercurial.i18n import _
 from mercurial import ui
 import common
 import os, select, socket, stat, struct, sys

hgext/win32text.py

@@ -27,7 +27,7 b''
 # pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf
 # # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr
 
-from mercurial.i18n import gettext as _
+from mercurial.i18n import _
 from mercurial.node import bin, short
 from mercurial import util
 import re

mercurial/hgweb/hgwebdir_mod.py

@@ -7,7 +7,7 b''
 # of the GNU General Public License, incorporated herein by reference.
 
 import os
-from mercurial.i18n import gettext as _
+from mercurial.i18n import _
 from mercurial.repo import RepoError
 from mercurial import ui, hg, util, templater, templatefilters
 from common import ErrorResponse, get_mtime, staticfile, style_map, paritygen,\

mercurial/hgweb/server.py

@@ -11,7 +11,7 b' from mercurial import hg, util'
 from mercurial.repo import RepoError
 from hgweb_mod import hgweb
 from hgwebdir_mod import hgwebdir
-from mercurial.i18n import gettext as _
+from mercurial.i18n import _
 
 def _splitURI(uri):
     """ Return path and query splited from uri