diff --git a/mercurial/util.py b/mercurial/util.py --- a/mercurial/util.py +++ b/mercurial/util.py @@ -927,7 +927,7 @@ def mainfrozen(): """ 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': diff --git a/tests/test-check-py3-compat.t b/tests/test-check-py3-compat.t --- a/tests/test-check-py3-compat.t +++ b/tests/test-check-py3-compat.t @@ -17,96 +17,96 @@ > | xargs $PYTHON3 contrib/check-py3-compat.py \ > | sed 's/[0-9][0-9]*)$/*)/' doc/hgmanpage.py: invalid syntax: invalid syntax (, line *) - hgext/acl.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/automv.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/blackbox.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/bugzilla.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/censor.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/chgserver.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/children.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/churn.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/clonebundles.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/color.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) + hgext/acl.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/automv.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/blackbox.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/bugzilla.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/censor.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/chgserver.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/children.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/churn.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/clonebundles.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/color.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) hgext/convert/bzr.py: error importing module: Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) - hgext/convert/common.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/convert/convcmd.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/convert/cvs.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/convert/cvsps.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/convert/darcs.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) + hgext/convert/common.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/convert/convcmd.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/convert/cvs.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/convert/cvsps.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/convert/darcs.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) hgext/convert/filemap.py: error importing module: Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) - hgext/convert/git.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/convert/gnuarch.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/convert/hg.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/convert/monotone.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/convert/p4.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/convert/subversion.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) + hgext/convert/git.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/convert/gnuarch.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/convert/hg.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/convert/monotone.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/convert/p4.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/convert/subversion.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) hgext/convert/transport.py: error importing module: No module named 'svn.client' (line *) - hgext/eol.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/extdiff.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/factotum.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/fetch.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/fsmonitor/state.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/fsmonitor/watchmanclient.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/gpg.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/graphlog.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/hgk.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/histedit.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/journal.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/keyword.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/largefiles/basestore.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/largefiles/lfcommands.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/largefiles/lfutil.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) + hgext/eol.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/extdiff.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/factotum.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/fetch.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/fsmonitor/state.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/fsmonitor/watchmanclient.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/gpg.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/graphlog.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/hgk.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/histedit.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/journal.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/keyword.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/largefiles/basestore.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/largefiles/lfcommands.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/largefiles/lfutil.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) hgext/largefiles/localstore.py: error importing module: Parent module 'hgext.largefiles' not loaded, cannot perform relative import (line *) - hgext/largefiles/overrides.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/largefiles/proto.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/largefiles/remotestore.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/largefiles/reposetup.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/largefiles/storefactory.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/largefiles/uisetup.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) + hgext/largefiles/overrides.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/largefiles/proto.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/largefiles/remotestore.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/largefiles/reposetup.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/largefiles/storefactory.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/largefiles/uisetup.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) hgext/largefiles/wirestore.py: error importing module: Parent module 'hgext.largefiles' not loaded, cannot perform relative import (line *) - hgext/mq.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/notify.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/pager.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/patchbomb.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/purge.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/rebase.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/record.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/relink.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/schemes.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/share.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/shelve.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/strip.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/transplant.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - hgext/win32text.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/archival.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/bookmarks.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/branchmap.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/bundle2.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/bundlerepo.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/byterange.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/changegroup.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/changelog.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/cmdutil.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/commands.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/commandserver.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/config.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/context.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/copies.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/crecord.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/destutil.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/dirstate.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/discovery.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/dispatch.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) + hgext/mq.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/notify.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/pager.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/patchbomb.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/purge.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/rebase.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/record.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/relink.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/schemes.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/share.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/shelve.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/strip.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/transplant.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/win32text.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/archival.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/bookmarks.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/branchmap.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/bundle2.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/bundlerepo.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/byterange.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/changegroup.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/changelog.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/cmdutil.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/commands.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/commandserver.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/config.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/context.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/copies.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/crecord.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/destutil.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/dirstate.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/discovery.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/dispatch.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) mercurial/encoding.py: error importing module: bytes expected, not str (line *) - mercurial/exchange.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/extensions.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/filelog.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/filemerge.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/fileset.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/formatter.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/graphmod.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/help.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/hg.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) + mercurial/exchange.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/extensions.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/filelog.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/filemerge.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/fileset.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/formatter.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/graphmod.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/help.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/hg.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) mercurial/hgweb/common.py: error importing module: Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) mercurial/hgweb/hgweb_mod.py: error importing module: Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) mercurial/hgweb/hgwebdir_mod.py: error importing module: Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) @@ -116,57 +116,57 @@ mercurial/hgweb/webcommands.py: error importing module: Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) mercurial/hgweb/webutil.py: error importing module: Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) mercurial/hgweb/wsgicgi.py: error importing module: Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) - mercurial/hook.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/httpconnection.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/httppeer.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) + mercurial/hook.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/httpconnection.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/httppeer.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) mercurial/i18n.py: error importing module: bytes expected, not str (line *) - mercurial/keepalive.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/localrepo.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/lock.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/mail.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/manifest.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/match.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/mdiff.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/merge.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/minirst.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/namespaces.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/obsolete.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/patch.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/pathutil.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/peer.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/profiling.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/pushkey.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/pvec.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/registrar.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/repair.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/repoview.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/revlog.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/revset.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/scmutil.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/scmwindows.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/similar.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/simplemerge.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/sshpeer.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/sshserver.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/sslutil.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/statichttprepo.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/store.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/streamclone.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/subrepo.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/tagmerge.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/tags.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/templatefilters.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/templatekw.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/templater.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/transaction.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/ui.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/unionrepo.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) - mercurial/url.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) + mercurial/keepalive.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/localrepo.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/lock.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/mail.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/manifest.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/match.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/mdiff.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/merge.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/minirst.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/namespaces.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/obsolete.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/patch.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/pathutil.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/peer.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/profiling.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/pushkey.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/pvec.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/registrar.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/repair.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/repoview.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/revlog.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/revset.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/scmutil.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/scmwindows.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/similar.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/simplemerge.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/sshpeer.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/sshserver.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/sslutil.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/statichttprepo.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/store.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/streamclone.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/subrepo.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/tagmerge.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/tags.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/templatefilters.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/templatekw.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/templater.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/transaction.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/ui.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/unionrepo.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/url.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) mercurial/util.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) - mercurial/verify.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) + mercurial/verify.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) mercurial/win32.py: error importing module: No module named 'msvcrt' (line *) mercurial/windows.py: error importing module: No module named 'msvcrt' (line *) - mercurial/wireproto.py: error importing: is_frozen() argument must be str, not bytes (error at util.py:*) + mercurial/wireproto.py: error importing: encode() argument 1 must be str, not bytes (error at i18n.py:*) #endif @@ -174,5 +174,5 @@ $ 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: is_frozen() argument must be str, not bytes (error at util.py:*) + hgext/highlight/highlight.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) #endif