Patchwork [05,of,10] py3: use unicode literals in util.py

login
register
mail settings
Submitter Pulkit Goyal
Date Aug. 2, 2016, 8:27 p.m.
Message ID <4547ab529d26196dc409.1470169647@pulkit-goyal>
Download mbox | patch
Permalink /patch/16044/
State Changes Requested
Headers show

Comments

Pulkit Goyal - Aug. 2, 2016, 8:27 p.m.
# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1470167415 -19800
#      Wed Aug 03 01:20:15 2016 +0530
# Node ID 4547ab529d26196dc40909693b5e9673763e9058
# Parent  bed55202ebb207a4a7a532135c808e2b62ec6ac8
py3: use unicode literals in util.py
Yuya Nishihara - Aug. 3, 2016, 1:52 p.m.
On Wed, 03 Aug 2016 01:57:27 +0530, Pulkit Goyal wrote:
> # HG changeset patch
> # User Pulkit Goyal <7895pulkit@gmail.com>
> # Date 1470167415 -19800
> #      Wed Aug 03 01:20:15 2016 +0530
> # Node ID 4547ab529d26196dc40909693b5e9673763e9058
> # Parent  bed55202ebb207a4a7a532135c808e2b62ec6ac8
> py3: use unicode literals in util.py

> @@ -2294,7 +2294,7 @@
>      """
>      return _booleans.get(s.lower(), None)
>  
> -_hexdig = '0123456789ABCDEFabcdef'
> +_hexdig = u'0123456789ABCDEFabcdef'
>  _hextochr = dict((a + b, chr(int(a + b, 16)))
>                   for a in _hexdig for b in _hexdig)

Maybe keys of _hextochr dict should be bytes?

Patch

diff -r bed55202ebb2 -r 4547ab529d26 mercurial/util.py
--- a/mercurial/util.py	Wed Aug 03 00:55:29 2016 +0530
+++ b/mercurial/util.py	Wed Aug 03 01:20:15 2016 +0530
@@ -46,18 +46,18 @@ 
 )
 
 for attr in (
-    'empty',
-    'httplib',
-    'httpserver',
-    'pickle',
-    'queue',
-    'urlerr',
-    'urlparse',
+    u'empty',
+    u'httplib',
+    u'httpserver',
+    u'pickle',
+    u'queue',
+    u'urlerr',
+    u'urlparse',
     # we do import urlreq, but we do it outside the loop
     #'urlreq',
-    'stringio',
-    'socketserver',
-    'xmlrpclib',
+    u'stringio',
+    u'socketserver',
+    u'xmlrpclib',
 ):
     globals()[attr] = getattr(pycompat, attr)
 
@@ -561,7 +561,7 @@ 
     Holds a reference to nodes on either side as well as a key-value
     pair for the dictionary entry.
     """
-    __slots__ = ('next', 'prev', 'key', 'value')
+    __slots__ = (u'next', u'prev', u'key', u'value')
 
     def __init__(self):
         self.next = None
@@ -925,10 +925,10 @@ 
     """
     return (safehasattr(sys, "frozen") or # new py2exe
             safehasattr(sys, "importers") or # old py2exe
-            imp.is_frozen("__main__")) # tools/freeze
+            imp.is_frozen(u"__main__")) # tools/freeze
 
 # the location of data files matching the source code
-if mainfrozen() and getattr(sys, 'frozen', None) != 'macosx_app':
+if mainfrozen() and getattr(sys, 'frozen', None) != u'macosx_app':
     # executable version (py2exe) doesn't support __file__
     datapath = os.path.dirname(sys.executable)
 else:
@@ -2294,7 +2294,7 @@ 
     """
     return _booleans.get(s.lower(), None)
 
-_hexdig = '0123456789ABCDEFabcdef'
+_hexdig = u'0123456789ABCDEFabcdef'
 _hextochr = dict((a + b, chr(int(a + b, 16)))
                  for a in _hexdig for b in _hexdig)
 
diff -r bed55202ebb2 -r 4547ab529d26 tests/test-check-py3-compat.t
--- a/tests/test-check-py3-compat.t	Wed Aug 03 00:55:29 2016 +0530
+++ b/tests/test-check-py3-compat.t	Wed Aug 03 01:20:15 2016 +0530
@@ -15,96 +15,96 @@ 
 #if py3exe
   $ hg files 'set:(**.py)' | sed 's|\\|/|g' | xargs $PYTHON3 contrib/check-py3-compat.py
   doc/hgmanpage.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
-  hgext/acl.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
+  hgext/acl.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
   hgext/automv.py: error importing module: <SyntaxError> invalid syntax (commands.py, line *) (line *) (glob)
-  hgext/blackbox.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/bugzilla.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/censor.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/chgserver.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/children.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/churn.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/clonebundles.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
+  hgext/blackbox.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/bugzilla.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/censor.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/chgserver.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/children.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/churn.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/clonebundles.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
   hgext/color.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
   hgext/convert/bzr.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) (glob)
-  hgext/convert/common.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/convert/convcmd.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/convert/cvs.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/convert/cvsps.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/convert/darcs.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
+  hgext/convert/common.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/convert/convcmd.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/convert/cvs.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/convert/cvsps.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/convert/darcs.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
   hgext/convert/filemap.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) (glob)
-  hgext/convert/git.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/convert/gnuarch.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/convert/hg.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/convert/monotone.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/convert/p4.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/convert/subversion.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
+  hgext/convert/git.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/convert/gnuarch.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/convert/hg.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/convert/monotone.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/convert/p4.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/convert/subversion.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
   hgext/convert/transport.py: error importing module: <ImportError> No module named 'svn.client' (line *) (glob)
-  hgext/eol.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
+  hgext/eol.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
   hgext/extdiff.py: error importing module: <SyntaxError> invalid syntax (archival.py, line *) (line *) (glob)
-  hgext/factotum.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/fetch.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/fsmonitor/state.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/fsmonitor/watchmanclient.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/gpg.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/graphlog.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/hgk.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/highlight/highlight.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
+  hgext/factotum.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/fetch.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/fsmonitor/state.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/fsmonitor/watchmanclient.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/gpg.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/graphlog.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/hgk.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/highlight/highlight.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
   hgext/histedit.py: error importing module: <SyntaxError> invalid syntax (bundle2.py, line *) (line *) (glob)
-  hgext/journal.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/keyword.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/largefiles/basestore.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/largefiles/lfcommands.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/largefiles/lfutil.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
+  hgext/journal.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/keyword.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/largefiles/basestore.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/largefiles/lfcommands.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/largefiles/lfutil.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
   hgext/largefiles/localstore.py: error importing module: <SystemError> Parent module 'hgext.largefiles' not loaded, cannot perform relative import (line *) (glob)
   hgext/largefiles/overrides.py: error importing module: <SyntaxError> invalid syntax (archival.py, line *) (line *) (glob)
   hgext/largefiles/proto.py: error importing: <SyntaxError> invalid syntax (bundle2.py, line *) (error at httppeer.py:*) (glob)
-  hgext/largefiles/remotestore.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/largefiles/reposetup.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/largefiles/storefactory.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/largefiles/uisetup.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
+  hgext/largefiles/remotestore.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/largefiles/reposetup.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/largefiles/storefactory.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/largefiles/uisetup.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
   hgext/largefiles/wirestore.py: error importing module: <SystemError> Parent module 'hgext.largefiles' not loaded, cannot perform relative import (line *) (glob)
-  hgext/mq.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/notify.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/pager.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/patchbomb.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/purge.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/rebase.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/record.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/relink.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/schemes.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  hgext/share.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
+  hgext/mq.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/notify.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/pager.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/patchbomb.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/purge.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/rebase.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/record.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/relink.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/schemes.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  hgext/share.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
   hgext/shelve.py: error importing module: <SyntaxError> invalid syntax (bundle2.py, line 992) (line *) (glob)
-  hgext/strip.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
+  hgext/strip.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
   hgext/transplant.py: error importing: <SyntaxError> invalid syntax (bundle2.py, line 992) (error at bundlerepo.py:*) (glob)
-  hgext/win32text.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
+  hgext/win32text.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
   mercurial/archival.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
-  mercurial/bookmarks.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/branchmap.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
+  mercurial/bookmarks.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  mercurial/branchmap.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
   mercurial/bundle2.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
   mercurial/bundlerepo.py: error importing module: <SyntaxError> invalid syntax (bundle2.py, line *) (line *) (glob)
-  mercurial/byterange.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/changegroup.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/changelog.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/cmdutil.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
+  mercurial/byterange.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  mercurial/changegroup.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  mercurial/changelog.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  mercurial/cmdutil.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
   mercurial/commands.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
-  mercurial/commandserver.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/config.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/context.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/copies.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/crecord.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/destutil.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/dirstate.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/discovery.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/dispatch.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/exchange.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/extensions.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/filelog.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/filemerge.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/fileset.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/formatter.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/graphmod.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/help.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/hg.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
+  mercurial/commandserver.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  mercurial/config.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  mercurial/context.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  mercurial/copies.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  mercurial/crecord.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  mercurial/destutil.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  mercurial/dirstate.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  mercurial/discovery.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  mercurial/dispatch.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  mercurial/exchange.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  mercurial/extensions.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  mercurial/filelog.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  mercurial/filemerge.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  mercurial/fileset.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  mercurial/formatter.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  mercurial/graphmod.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  mercurial/help.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  mercurial/hg.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
   mercurial/hgweb/common.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) (glob)
   mercurial/hgweb/hgweb_mod.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) (glob)
   mercurial/hgweb/hgwebdir_mod.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) (glob)
@@ -114,53 +114,53 @@ 
   mercurial/hgweb/webcommands.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) (glob)
   mercurial/hgweb/webutil.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) (glob)
   mercurial/hgweb/wsgicgi.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) (glob)
-  mercurial/hook.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/httpconnection.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
+  mercurial/hook.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
+  mercurial/httpconnection.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) (glob)
   mercurial/httppeer.py: error importing module: <SyntaxError> invalid syntax (bundle2.py, line *) (line *) (glob)
-  mercurial/keepalive.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/localrepo.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/lock.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/mail.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/manifest.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/match.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/mdiff.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/merge.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/minirst.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/namespaces.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/obsolete.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/patch.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/pathutil.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/peer.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
+  mercurial/keepalive.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/localrepo.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/lock.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/mail.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/manifest.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/match.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/mdiff.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/merge.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/minirst.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/namespaces.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/obsolete.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/patch.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/pathutil.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/peer.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
   mercurial/pure/mpatch.py: error importing module: <ImportError> cannot import name 'pycompat' (line *) (glob)
   mercurial/pure/osutil.py: error importing module: <ImportError> cannot import name 'policy' (line *) (glob)
   mercurial/pure/parsers.py: error importing module: <ImportError> No module named 'mercurial.pure.node' (line *) (glob)
-  mercurial/pushkey.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/pvec.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/registrar.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
+  mercurial/pushkey.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/pvec.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/registrar.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
   mercurial/repair.py: error importing module: <SyntaxError> invalid syntax (bundle2.py, line *) (line *) (glob)
-  mercurial/repoview.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/revlog.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/revset.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/scmutil.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
+  mercurial/repoview.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/revlog.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/revset.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/scmutil.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
   mercurial/scmwindows.py: error importing module: <ImportError> No module named '_winreg' (line *) (glob)
-  mercurial/similar.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/simplemerge.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/sshpeer.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/sshserver.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/sslutil.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/statichttprepo.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/store.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/streamclone.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/subrepo.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/tagmerge.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/tags.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/templatefilters.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/templatekw.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/templater.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/transaction.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/ui.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/unionrepo.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
-  mercurial/url.py: error importing: <TypeError> getattr(): attribute name must be string (error at util.py:*) (glob)
+  mercurial/similar.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/simplemerge.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/sshpeer.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/sshserver.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/sslutil.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/statichttprepo.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/store.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/streamclone.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/subrepo.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/tagmerge.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/tags.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/templatefilters.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/templatekw.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/templater.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/transaction.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/ui.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/unionrepo.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
+  mercurial/url.py: error importing module: <TypeError> a bytes-like object is required, not 'str' (line *) (glob)
   mercurial/verify.py: error importing: <TypeError> attribute name must be string, not 'bytes' (error at mdiff.py:*) (glob)
   mercurial/win32.py: error importing module: <ImportError> No module named 'msvcrt' (line *) (glob)
   mercurial/windows.py: error importing module: <ImportError> No module named '_winreg' (line *) (glob)