[PATCH 2 of 2] py3: use unicode in is_frozen()
Augie Fackler
raf at durin42.com
Sun Oct 2 21:56:54 UTC 2016
> On Oct 2, 2016, at 10:59 AM, Pulkit Goyal <7895pulkit at gmail.com> wrote:
>
> # HG changeset patch
> # User Pulkit Goyal <7895pulkit at gmail.com>
> # Date 1475366357 -19800
> # Sun Oct 02 05:29:17 2016 +0530
> # Node ID d79b7fb7992db40c169060c52ecff1a6d48e65d4
> # Parent 78c522f4038485e66c35b6492a627b3f90380220
> py3: use unicode in is_frozen()
queued these, thanks
>
> imp.is_frozen() doesnot accepts bytes on Python 3.
> It does accept both bytes and strings on Python 2.
>
> diff -r 78c522f40384 -r d79b7fb7992d mercurial/util.py
> --- a/mercurial/util.py Sun Oct 02 03:38:14 2016 +0530
> +++ b/mercurial/util.py Sun Oct 02 05:29:17 2016 +0530
> @@ -927,7 +927,7 @@
> """
> 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 -r 78c522f40384 -r d79b7fb7992d tests/test-check-py3-compat.t
> --- a/tests/test-check-py3-compat.t Sun Oct 02 03:38:14 2016 +0530
> +++ b/tests/test-check-py3-compat.t Sun Oct 02 05:29:17 2016 +0530
> @@ -17,96 +17,96 @@
>> | 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> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/automv.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/blackbox.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/bugzilla.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/censor.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/chgserver.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/children.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/churn.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/clonebundles.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/color.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> + hgext/acl.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/automv.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/blackbox.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/bugzilla.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/censor.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/chgserver.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/children.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/churn.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/clonebundles.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/color.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.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> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/convert/convcmd.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/convert/cvs.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/convert/cvsps.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/convert/darcs.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> + hgext/convert/common.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/convert/convcmd.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/convert/cvs.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/convert/cvsps.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/convert/darcs.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.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> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/convert/gnuarch.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/convert/hg.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/convert/monotone.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/convert/p4.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/convert/subversion.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> + hgext/convert/git.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/convert/gnuarch.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/convert/hg.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/convert/monotone.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/convert/p4.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/convert/subversion.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> hgext/convert/transport.py: error importing module: <ImportError> No module named 'svn.client' (line *)
> - hgext/eol.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/extdiff.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/factotum.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/fetch.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/fsmonitor/state.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/fsmonitor/watchmanclient.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/gpg.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/graphlog.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/hgk.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/histedit.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/journal.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/keyword.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/largefiles/basestore.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/largefiles/lfcommands.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/largefiles/lfutil.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> + hgext/eol.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/extdiff.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/factotum.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/fetch.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/fsmonitor/state.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/fsmonitor/watchmanclient.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/gpg.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/graphlog.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/hgk.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/histedit.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/journal.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/keyword.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/largefiles/basestore.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/largefiles/lfcommands.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/largefiles/lfutil.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.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> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/largefiles/proto.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/largefiles/remotestore.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/largefiles/reposetup.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/largefiles/storefactory.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/largefiles/uisetup.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> + hgext/largefiles/overrides.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/largefiles/proto.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/largefiles/remotestore.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/largefiles/reposetup.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/largefiles/storefactory.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/largefiles/uisetup.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.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> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/notify.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/pager.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/patchbomb.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/purge.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/rebase.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/record.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/relink.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/schemes.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/share.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/shelve.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/strip.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/transplant.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - hgext/win32text.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/archival.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/bookmarks.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/branchmap.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/bundle2.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/bundlerepo.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/byterange.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/changegroup.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/changelog.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/cmdutil.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/commands.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/commandserver.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/config.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/context.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/copies.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/crecord.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/destutil.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/dirstate.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/discovery.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/dispatch.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> + hgext/mq.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/notify.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/pager.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/patchbomb.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/purge.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/rebase.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/record.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/relink.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/schemes.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/share.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/shelve.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/strip.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/transplant.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + hgext/win32text.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + mercurial/archival.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + mercurial/bookmarks.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + mercurial/branchmap.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + mercurial/bundle2.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + mercurial/bundlerepo.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + mercurial/byterange.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + mercurial/changegroup.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + mercurial/changelog.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + mercurial/cmdutil.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + mercurial/commands.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + mercurial/commandserver.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + mercurial/config.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + mercurial/context.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + mercurial/copies.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + mercurial/crecord.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + mercurial/destutil.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + mercurial/dirstate.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + mercurial/discovery.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + mercurial/dispatch.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> mercurial/encoding.py: error importing module: <TypeError> bytes expected, not str (line *)
> - mercurial/exchange.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/extensions.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/filelog.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/filemerge.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/fileset.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/formatter.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/graphmod.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/help.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/hg.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> + mercurial/exchange.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + mercurial/extensions.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + mercurial/filelog.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + mercurial/filemerge.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + mercurial/fileset.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + mercurial/formatter.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + mercurial/graphmod.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + mercurial/help.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + mercurial/hg.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.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 *)
> @@ -116,57 +116,57 @@
> 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> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/httpconnection.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/httppeer.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> + mercurial/hook.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + mercurial/httpconnection.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> + mercurial/httppeer.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> mercurial/i18n.py: error importing module: <TypeError> bytes expected, not str (line *)
> - mercurial/keepalive.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/localrepo.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/lock.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/mail.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/manifest.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/match.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/mdiff.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/merge.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/minirst.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/namespaces.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/obsolete.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/patch.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/pathutil.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/peer.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/profiling.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/pushkey.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/pvec.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/registrar.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/repair.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/repoview.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/revlog.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/revset.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/scmutil.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/scmwindows.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/similar.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/simplemerge.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/sshpeer.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/sshserver.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/sslutil.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/statichttprepo.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/store.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/streamclone.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/subrepo.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/tagmerge.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/tags.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/templatefilters.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/templatekw.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/templater.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/transaction.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/ui.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/unionrepo.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> - mercurial/url.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> + mercurial/keepalive.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/localrepo.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/lock.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/mail.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/manifest.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/match.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/mdiff.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/merge.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/minirst.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/namespaces.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/obsolete.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/patch.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/pathutil.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/peer.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/profiling.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/pushkey.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/pvec.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/registrar.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/repair.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/repoview.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/revlog.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/revset.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/scmutil.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/scmwindows.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/similar.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/simplemerge.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/sshpeer.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/sshserver.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/sslutil.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/statichttprepo.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/store.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/streamclone.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/subrepo.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/tagmerge.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/tags.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/templatefilters.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/templatekw.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/templater.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/transaction.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/ui.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/unionrepo.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> + mercurial/url.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> mercurial/util.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*)
> - mercurial/verify.py: error importing: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> + mercurial/verify.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.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> is_frozen() argument must be str, not bytes (error at util.py:*)
> + mercurial/wireproto.py: error importing: <TypeError> 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: <TypeError> is_frozen() argument must be str, not bytes (error at util.py:*)
> + hgext/highlight/highlight.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
> #endif
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-devel/attachments/20161002/e1283a4f/attachment.asc>
More information about the Mercurial-devel
mailing list