py3: make i18n use encoding.environ

mercurial/i18n.py

@@ -1,103 +1,104 b''
 # i18n.py - internationalization support for mercurial
 #
 # Copyright 2005, 2006 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 from __future__ import absolute_import
 
 import gettext as gettextmod
 import locale
 import os
 import sys
 
 from . import encoding
 
 # modelled after templater.templatepath:
 if getattr(sys, 'frozen', None) is not None:
     module = sys.executable
 else:
     module = __file__
 
 try:
     unicode
 except NameError:
     unicode = str
 
 _languages = None
 if (os.name == 'nt'
-    and 'LANGUAGE' not in os.environ
-    and 'LC_ALL' not in os.environ
-    and 'LC_MESSAGES' not in os.environ
-    and 'LANG' not in os.environ):
+    and 'LANGUAGE' not in encoding.environ
+    and 'LC_ALL' not in encoding.environ
+    and 'LC_MESSAGES' not in encoding.environ
+    and 'LANG' not in encoding.environ):
     # Try to detect UI language by "User Interface Language Management" API
     # if no locale variables are set. Note that locale.getdefaultlocale()
     # uses GetLocaleInfo(), which may be different from UI language.
     # (See http://msdn.microsoft.com/en-us/library/dd374098(v=VS.85).aspx )
     try:
         import ctypes
         langid = ctypes.windll.kernel32.GetUserDefaultUILanguage()
         _languages = [locale.windows_locale[langid]]
     except (ImportError, AttributeError, KeyError):
         # ctypes not found or unknown langid
         pass
 
 _ugettext = None
 
 def setdatapath(datapath):
     localedir = os.path.join(datapath, 'locale')
     t = gettextmod.translation('hg', localedir, _languages, fallback=True)
     global _ugettext
     try:
         _ugettext = t.ugettext
     except AttributeError:
         _ugettext = t.gettext
 
 _msgcache = {}
 
 def gettext(message):
     """Translate message.
 
     The message is looked up in the catalog to get a Unicode string,
     which is encoded in the local encoding before being returned.
 
     Important: message is restricted to characters in the encoding
     given by sys.getdefaultencoding() which is most likely 'ascii'.
     """
     # If message is None, t.ugettext will return u'None' as the
     # translation whereas our callers expect us to return None.
     if message is None or not _ugettext:
         return message
 
     if message not in _msgcache:
         if type(message) is unicode:
             # goofy unicode docstrings in test
             paragraphs = message.split(u'\n\n')
         else:
             paragraphs = [p.decode("ascii") for p in message.split('\n\n')]
         # Be careful not to translate the empty string -- it holds the
         # meta data of the .po file.
         u = u'\n\n'.join([p and _ugettext(p) or u'' for p in paragraphs])
         try:
             # encoding.tolocal cannot be used since it will first try to
             # decode the Unicode string. Calling u.decode(enc) really
             # means u.encode(sys.getdefaultencoding()).decode(enc). Since
             # the Python encoding defaults to 'ascii', this fails if the
             # translated string use non-ASCII characters.
             _msgcache[message] = u.encode(encoding.encoding, "replace")
         except LookupError:
             # An unknown encoding results in a LookupError.
             _msgcache[message] = message
     return _msgcache[message]
 
 def _plain():
-    if 'HGPLAIN' not in os.environ and 'HGPLAINEXCEPT' not in os.environ:
+    if ('HGPLAIN' not in encoding.environ
+        and 'HGPLAINEXCEPT' not in encoding.environ):
         return False
-    exceptions = os.environ.get('HGPLAINEXCEPT', '').strip().split(',')
+    exceptions = encoding.environ.get('HGPLAINEXCEPT', '').strip().split(',')
     return 'i18n' not in exceptions
 
 if _plain():
     _ = lambda message: message
 else:
     _ = gettext

tests/test-check-py3-compat.t

@@ -1,182 +1,178 b''
 #require test-repo
 
   $ . "$TESTDIR/helpers-testrepo.sh"
   $ cd "$TESTDIR"/..
 
   $ hg files 'set:(**.py)' | sed 's|\\|/|g' | xargs python contrib/check-py3-compat.py
   hgext/fsmonitor/pywatchman/__init__.py not using absolute_import
   hgext/fsmonitor/pywatchman/__init__.py requires print_function
   hgext/fsmonitor/pywatchman/capabilities.py not using absolute_import
   hgext/fsmonitor/pywatchman/pybser.py not using absolute_import
   i18n/check-translation.py not using absolute_import
   setup.py not using absolute_import
   tests/test-demandimport.py not using absolute_import
 
 #if py3exe
   $ hg files 'set:(**.py) - grep(pygments)' | sed 's|\\|/|g' \
   > | xargs $PYTHON3 contrib/check-py3-compat.py \
   > | sed 's/[0-9][0-9]*)$/*)/'
   doc/hgmanpage.py: invalid syntax: invalid syntax (<unknown>, line *)
-  hgext/acl.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/automv.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/blackbox.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/bugzilla.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/censor.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/chgserver.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/children.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/churn.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/clonebundles.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/color.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/convert/bzr.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/convert/common.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/convert/convcmd.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/convert/cvs.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/convert/cvsps.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/convert/darcs.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/convert/filemap.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/convert/git.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/convert/gnuarch.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/convert/hg.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/convert/monotone.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/convert/p4.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/convert/subversion.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
+  hgext/acl.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/automv.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/blackbox.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/bugzilla.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/censor.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/chgserver.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/children.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/churn.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/clonebundles.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/color.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/convert/bzr.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *)
+  hgext/convert/common.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/convert/convcmd.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/convert/cvs.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/convert/cvsps.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/convert/darcs.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/convert/filemap.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *)
+  hgext/convert/git.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/convert/gnuarch.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/convert/hg.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/convert/monotone.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/convert/p4.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/convert/subversion.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   hgext/convert/transport.py: error importing module: <ImportError> No module named 'svn.client' (line *)
-  hgext/eol.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/extdiff.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/factotum.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/fetch.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/fsmonitor/state.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/fsmonitor/watchmanclient.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/gpg.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/graphlog.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/hgk.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/histedit.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/journal.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/keyword.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/largefiles/basestore.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/largefiles/lfcommands.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/largefiles/lfutil.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/largefiles/localstore.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/largefiles/overrides.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/largefiles/proto.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/largefiles/remotestore.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/largefiles/reposetup.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/largefiles/storefactory.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/largefiles/uisetup.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
+  hgext/eol.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/extdiff.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/factotum.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/fetch.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/fsmonitor/state.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/fsmonitor/watchmanclient.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/gpg.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/graphlog.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/hgk.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/histedit.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/journal.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/keyword.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/largefiles/basestore.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/largefiles/lfcommands.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/largefiles/lfutil.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/largefiles/localstore.py: error importing module: <SystemError> Parent module 'hgext.largefiles' not loaded, cannot perform relative import (line *)
+  hgext/largefiles/overrides.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/largefiles/proto.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/largefiles/remotestore.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/largefiles/reposetup.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/largefiles/storefactory.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/largefiles/uisetup.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   hgext/largefiles/wirestore.py: error importing module: <SystemError> Parent module 'hgext.largefiles' not loaded, cannot perform relative import (line *)
-  hgext/mq.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/notify.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/pager.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/patchbomb.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/purge.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/rebase.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/record.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/relink.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/schemes.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/share.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/shelve.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/strip.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/transplant.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/win32mbcs.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  hgext/win32text.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/archival.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/bookmarks.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/branchmap.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/bundle2.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/bundlerepo.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/byterange.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/changegroup.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/changelog.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/cmdutil.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/commands.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/commandserver.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/config.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/context.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/copies.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/crecord.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/dagparser.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/dagutil.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/destutil.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/dirstate.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/discovery.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/dispatch.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
+  hgext/mq.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/notify.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/pager.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/patchbomb.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/purge.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/rebase.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/record.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/relink.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/schemes.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/share.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/shelve.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/strip.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/transplant.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  hgext/win32text.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/archival.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/bookmarks.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/branchmap.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/bundle2.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/bundlerepo.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/byterange.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/changegroup.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/changelog.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/cmdutil.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/commands.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/commandserver.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/config.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/context.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/copies.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/crecord.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/destutil.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/dirstate.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/discovery.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/dispatch.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/encoding.py: error importing module: <TypeError> bytes expected, not str (line *)
-  mercurial/exchange.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/extensions.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/fancyopts.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/filelog.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/filemerge.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/fileset.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/formatter.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/graphmod.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/hbisect.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/help.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/hg.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
+  mercurial/exchange.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/extensions.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/filelog.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/filemerge.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/fileset.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/formatter.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/graphmod.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/help.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/hg.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/hgweb/common.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *)
   mercurial/hgweb/hgweb_mod.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *)
   mercurial/hgweb/hgwebdir_mod.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *)
   mercurial/hgweb/protocol.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *)
   mercurial/hgweb/request.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *)
   mercurial/hgweb/server.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *)
   mercurial/hgweb/webcommands.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *)
   mercurial/hgweb/webutil.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *)
   mercurial/hgweb/wsgicgi.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *)
-  mercurial/hook.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/httpconnection.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
-  mercurial/httppeer.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
+  mercurial/hook.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/httpconnection.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/httppeer.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
+  mercurial/i18n.py: error importing module: <TypeError> bytes expected, not str (line *)
   mercurial/keepalive.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/localrepo.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/lock.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/mail.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/manifest.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/match.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/mdiff.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/merge.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/minirst.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/namespaces.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/obsolete.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/patch.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/pathutil.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/peer.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/profiling.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/pushkey.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/pvec.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/registrar.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/repair.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/repoview.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/revlog.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/revset.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/scmutil.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/scmwindows.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/similar.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/simplemerge.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/sshpeer.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/sshserver.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/sslutil.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/statichttprepo.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/store.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/streamclone.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/subrepo.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/tagmerge.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/tags.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/templatefilters.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/templatekw.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/templater.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/transaction.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/ui.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/unionrepo.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/url.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
-  mercurial/util.py: error importing module: <TypeError> encode() argument 1 must be str, not bytes (line *)
+  mercurial/util.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
   mercurial/verify.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
   mercurial/win32.py: error importing module: <ImportError> No module named 'msvcrt' (line *)
   mercurial/windows.py: error importing module: <ImportError> No module named 'msvcrt' (line *)
   mercurial/wireproto.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
 
 #endif
 
 #if py3exe py3pygments
   $ hg files 'set:(**.py) and grep(pygments)' | sed 's|\\|/|g' \
   > | xargs $PYTHON3 contrib/check-py3-compat.py \
   > | sed 's/[0-9][0-9]*)$/*)/'
-  hgext/highlight/highlight.py: error importing: <TypeError> str expected, not bytes (error at i18n.py:*)
+  hgext/highlight/highlight.py: error importing: <TypeError> __slots__ items must be strings, not 'bytes' (error at util.py:*)
 #endif