| Submitter | Augie Fackler |
|---|---|
| Date | Oct. 7, 2016, 12:53 p.m. |
| Message ID | <fcd61f29b19056a85de5.1475844797@augie-macbookair2.roam.corp.google.com> |
| Download | mbox | patch |
| Permalink | /patch/16889/ |
| State | Changes Requested |
| Headers | show |
Comments
On 7 October 2016 at 14:53, Augie Fackler <raf@durin42.com> wrote: > # HG changeset patch > # User Augie Fackler <augie@google.com> > # Date 1475840895 14400 > # Fri Oct 07 07:48:15 2016 -0400 > # Node ID fcd61f29b19056a85de579a276618aaee200e701 > # Parent f3a2125968377fb1d4b9ea3f4917260d5aca3536 > i18n: mark a path component as unicode > > It's always a unicode on Python 3, and the component we're adding is > ASCII-safe so it'll still work on Python 2. Makes some small progress > on Python 3. [LGTM] stamp. > diff --git a/mercurial/i18n.py b/mercurial/i18n.py > --- a/mercurial/i18n.py > +++ b/mercurial/i18n.py > @@ -49,7 +49,7 @@ if (os.name == 'nt' > _ugettext = None > > def setdatapath(datapath): > - localedir = os.path.join(datapath, 'locale') > + localedir = os.path.join(datapath, u'locale') > t = gettextmod.translation('hg', localedir, _languages, fallback=True) > global _ugettext > try: > 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 > @@ -28,85 +28,85 @@ > 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> 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/common.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/convert/convcmd.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/convert/cvs.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/convert/cvsps.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/convert/darcs.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (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> 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/git.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/convert/gnuarch.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/convert/hg.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/convert/monotone.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/convert/p4.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/convert/subversion.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > hgext/convert/transport.py: error importing module: <ImportError> No module named 'svn.client' (line *) > - 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/eol.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/extdiff.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/factotum.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/fetch.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/fsmonitor/state.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/fsmonitor/watchmanclient.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/gpg.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/graphlog.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/hgk.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/histedit.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/journal.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/keyword.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/largefiles/basestore.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/largefiles/lfcommands.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/largefiles/lfutil.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (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> 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/overrides.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/largefiles/proto.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/largefiles/remotestore.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/largefiles/reposetup.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/largefiles/storefactory.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/largefiles/uisetup.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (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> 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:*) > + hgext/mq.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/notify.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/pager.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/patchbomb.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/purge.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/rebase.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/record.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/relink.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/schemes.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/share.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/shelve.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/strip.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/transplant.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + hgext/win32text.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + mercurial/archival.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + mercurial/bookmarks.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + mercurial/branchmap.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + mercurial/bundle2.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + mercurial/bundlerepo.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + mercurial/byterange.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + mercurial/changegroup.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + mercurial/changelog.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + mercurial/cmdutil.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + mercurial/commands.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + mercurial/commandserver.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + mercurial/config.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + mercurial/context.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + mercurial/copies.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + mercurial/crecord.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + mercurial/destutil.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + mercurial/dirstate.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + mercurial/discovery.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + mercurial/dispatch.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > mercurial/encoding.py: error importing module: <TypeError> bytes expected, not str (line *) > - 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/exchange.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + mercurial/extensions.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + mercurial/filelog.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + mercurial/filemerge.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + mercurial/fileset.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + mercurial/formatter.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + mercurial/graphmod.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + mercurial/help.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + mercurial/hg.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (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,9 +116,9 @@ > 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> 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/hook.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + mercurial/httpconnection.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > + mercurial/httppeer.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) > mercurial/i18n.py: error importing module: <TypeError> bytes expected, not str (line *) > mercurial/keepalive.py: error importing: <TypeError> int() can't convert non-string with explicit base (error at util.py:*) > mercurial/localrepo.py: error importing: <TypeError> int() can't convert non-string with explicit base (error at util.py:*) > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@mercurial-scm.org > https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Not sure about this one, I tried it earlier, data path are bytes. https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-August/086728.html On Fri, Oct 7, 2016 at 3:08 PM, Martijn Pieters <mj@zopatista.com> wrote: > On 7 October 2016 at 14:53, Augie Fackler <raf@durin42.com> wrote: >> # HG changeset patch >> # User Augie Fackler <augie@google.com> >> # Date 1475840895 14400 >> # Fri Oct 07 07:48:15 2016 -0400 >> # Node ID fcd61f29b19056a85de579a276618aaee200e701 >> # Parent f3a2125968377fb1d4b9ea3f4917260d5aca3536 >> i18n: mark a path component as unicode >> >> It's always a unicode on Python 3, and the component we're adding is >> ASCII-safe so it'll still work on Python 2. Makes some small progress >> on Python 3. > > [LGTM] stamp. > >> diff --git a/mercurial/i18n.py b/mercurial/i18n.py >> --- a/mercurial/i18n.py >> +++ b/mercurial/i18n.py >> @@ -49,7 +49,7 @@ if (os.name == 'nt' >> _ugettext = None >> >> def setdatapath(datapath): >> - localedir = os.path.join(datapath, 'locale') >> + localedir = os.path.join(datapath, u'locale') >> t = gettextmod.translation('hg', localedir, _languages, fallback=True) >> global _ugettext >> try: >> 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 >> @@ -28,85 +28,85 @@ >> 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> 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/common.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/convert/convcmd.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/convert/cvs.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/convert/cvsps.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/convert/darcs.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (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> 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/git.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/convert/gnuarch.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/convert/hg.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/convert/monotone.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/convert/p4.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/convert/subversion.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> hgext/convert/transport.py: error importing module: <ImportError> No module named 'svn.client' (line *) >> - 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/eol.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/extdiff.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/factotum.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/fetch.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/fsmonitor/state.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/fsmonitor/watchmanclient.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/gpg.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/graphlog.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/hgk.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/histedit.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/journal.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/keyword.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/largefiles/basestore.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/largefiles/lfcommands.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/largefiles/lfutil.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (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> 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/overrides.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/largefiles/proto.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/largefiles/remotestore.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/largefiles/reposetup.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/largefiles/storefactory.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/largefiles/uisetup.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (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> 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:*) >> + hgext/mq.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/notify.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/pager.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/patchbomb.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/purge.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/rebase.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/record.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/relink.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/schemes.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/share.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/shelve.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/strip.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/transplant.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + hgext/win32text.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + mercurial/archival.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + mercurial/bookmarks.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + mercurial/branchmap.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + mercurial/bundle2.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + mercurial/bundlerepo.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + mercurial/byterange.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + mercurial/changegroup.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + mercurial/changelog.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + mercurial/cmdutil.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + mercurial/commands.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + mercurial/commandserver.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + mercurial/config.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + mercurial/context.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + mercurial/copies.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + mercurial/crecord.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + mercurial/destutil.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + mercurial/dirstate.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + mercurial/discovery.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + mercurial/dispatch.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> mercurial/encoding.py: error importing module: <TypeError> bytes expected, not str (line *) >> - 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/exchange.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + mercurial/extensions.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + mercurial/filelog.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + mercurial/filemerge.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + mercurial/fileset.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + mercurial/formatter.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + mercurial/graphmod.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + mercurial/help.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + mercurial/hg.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (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,9 +116,9 @@ >> 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> 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/hook.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + mercurial/httpconnection.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> + mercurial/httppeer.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >> mercurial/i18n.py: error importing module: <TypeError> bytes expected, not str (line *) >> mercurial/keepalive.py: error importing: <TypeError> int() can't convert non-string with explicit base (error at util.py:*) >> mercurial/localrepo.py: error importing: <TypeError> int() can't convert non-string with explicit base (error at util.py:*) >> _______________________________________________ >> Mercurial-devel mailing list >> Mercurial-devel@mercurial-scm.org >> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel > > > > -- > Martijn Pieters > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@mercurial-scm.org > https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
> On Oct 7, 2016, at 15:18, Pulkit Goyal <7895pulkit@gmail.com> wrote: > > Not sure about this one, I tried it earlier, data path are bytes. > https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-August/086728.html Hm. It's always coming from __file__ or similar, which is Unicode on Python 3? I'm confused now. Yuya? > > On Fri, Oct 7, 2016 at 3:08 PM, Martijn Pieters <mj@zopatista.com> wrote: >> On 7 October 2016 at 14:53, Augie Fackler <raf@durin42.com> wrote: >>> # HG changeset patch >>> # User Augie Fackler <augie@google.com> >>> # Date 1475840895 14400 >>> # Fri Oct 07 07:48:15 2016 -0400 >>> # Node ID fcd61f29b19056a85de579a276618aaee200e701 >>> # Parent f3a2125968377fb1d4b9ea3f4917260d5aca3536 >>> i18n: mark a path component as unicode >>> >>> It's always a unicode on Python 3, and the component we're adding is >>> ASCII-safe so it'll still work on Python 2. Makes some small progress >>> on Python 3. >> >> [LGTM] stamp. >> >>> diff --git a/mercurial/i18n.py b/mercurial/i18n.py >>> --- a/mercurial/i18n.py >>> +++ b/mercurial/i18n.py >>> @@ -49,7 +49,7 @@ if (os.name == 'nt' >>> _ugettext = None >>> >>> def setdatapath(datapath): >>> - localedir = os.path.join(datapath, 'locale') >>> + localedir = os.path.join(datapath, u'locale') >>> t = gettextmod.translation('hg', localedir, _languages, fallback=True) >>> global _ugettext >>> try: >>> 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 >>> @@ -28,85 +28,85 @@ >>> 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> 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/common.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/convert/convcmd.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/convert/cvs.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/convert/cvsps.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/convert/darcs.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (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> 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/git.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/convert/gnuarch.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/convert/hg.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/convert/monotone.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/convert/p4.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/convert/subversion.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> hgext/convert/transport.py: error importing module: <ImportError> No module named 'svn.client' (line *) >>> - 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/eol.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/extdiff.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/factotum.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/fetch.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/fsmonitor/state.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/fsmonitor/watchmanclient.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/gpg.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/graphlog.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/hgk.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/histedit.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/journal.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/keyword.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/largefiles/basestore.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/largefiles/lfcommands.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/largefiles/lfutil.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (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> 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/overrides.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/largefiles/proto.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/largefiles/remotestore.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/largefiles/reposetup.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/largefiles/storefactory.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/largefiles/uisetup.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (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> 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:*) >>> + hgext/mq.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/notify.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/pager.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/patchbomb.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/purge.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/rebase.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/record.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/relink.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/schemes.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/share.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/shelve.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/strip.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/transplant.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + hgext/win32text.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + mercurial/archival.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + mercurial/bookmarks.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + mercurial/branchmap.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + mercurial/bundle2.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + mercurial/bundlerepo.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + mercurial/byterange.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + mercurial/changegroup.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + mercurial/changelog.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + mercurial/cmdutil.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + mercurial/commands.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + mercurial/commandserver.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + mercurial/config.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + mercurial/context.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + mercurial/copies.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + mercurial/crecord.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + mercurial/destutil.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + mercurial/dirstate.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + mercurial/discovery.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + mercurial/dispatch.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> mercurial/encoding.py: error importing module: <TypeError> bytes expected, not str (line *) >>> - 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/exchange.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + mercurial/extensions.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + mercurial/filelog.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + mercurial/filemerge.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + mercurial/fileset.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + mercurial/formatter.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + mercurial/graphmod.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + mercurial/help.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + mercurial/hg.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (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,9 +116,9 @@ >>> 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> 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/hook.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + mercurial/httpconnection.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> + mercurial/httppeer.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) >>> mercurial/i18n.py: error importing module: <TypeError> bytes expected, not str (line *) >>> mercurial/keepalive.py: error importing: <TypeError> int() can't convert non-string with explicit base (error at util.py:*) >>> mercurial/localrepo.py: error importing: <TypeError> int() can't convert non-string with explicit base (error at util.py:*) >>> _______________________________________________ >>> Mercurial-devel mailing list >>> Mercurial-devel@mercurial-scm.org >>> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel >> >> >> >> -- >> Martijn Pieters >> _______________________________________________ >> Mercurial-devel mailing list >> Mercurial-devel@mercurial-scm.org >> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
You may also want to look at what Python 3.6 is doing with paths. https://docs.python.org/3.6/whatsnew/3.6.html On Fri, Oct 7, 2016 at 3:18 PM, Pulkit Goyal <7895pulkit@gmail.com> wrote: > Not sure about this one, I tried it earlier, data path are bytes. > https://www.mercurial-scm.org/pipermail/mercurial-devel/ > 2016-August/086728.html > > On Fri, Oct 7, 2016 at 3:08 PM, Martijn Pieters <mj@zopatista.com> wrote: > > On 7 October 2016 at 14:53, Augie Fackler <raf@durin42.com> wrote: > >> # HG changeset patch > >> # User Augie Fackler <augie@google.com> > >> # Date 1475840895 14400 > >> # Fri Oct 07 07:48:15 2016 -0400 > >> # Node ID fcd61f29b19056a85de579a276618aaee200e701 > >> # Parent f3a2125968377fb1d4b9ea3f4917260d5aca3536 > >> i18n: mark a path component as unicode > >> > >> It's always a unicode on Python 3, and the component we're adding is > >> ASCII-safe so it'll still work on Python 2. Makes some small progress > >> on Python 3. > > > > [LGTM] stamp. > > > >> diff --git a/mercurial/i18n.py b/mercurial/i18n.py > >> --- a/mercurial/i18n.py > >> +++ b/mercurial/i18n.py > >> @@ -49,7 +49,7 @@ if (os.name == 'nt' > >> _ugettext = None > >> > >> def setdatapath(datapath): > >> - localedir = os.path.join(datapath, 'locale') > >> + localedir = os.path.join(datapath, u'locale') > >> t = gettextmod.translation('hg', localedir, _languages, > fallback=True) > >> global _ugettext > >> try: > >> 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 > >> @@ -28,85 +28,85 @@ > >> 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> 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/common.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> + hgext/convert/convcmd.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> + hgext/convert/cvs.py: error importing: <TypeError> encode() argument > 1 must be str, not bytes (error at i18n.py:*) > >> + hgext/convert/cvsps.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> + hgext/convert/darcs.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (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> 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/git.py: error importing: <TypeError> encode() argument > 1 must be str, not bytes (error at i18n.py:*) > >> + hgext/convert/gnuarch.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> + hgext/convert/hg.py: error importing: <TypeError> encode() argument > 1 must be str, not bytes (error at i18n.py:*) > >> + hgext/convert/monotone.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> + hgext/convert/p4.py: error importing: <TypeError> encode() argument > 1 must be str, not bytes (error at i18n.py:*) > >> + hgext/convert/subversion.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> hgext/convert/transport.py: error importing module: <ImportError> No > module named 'svn.client' (line *) > >> - 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/eol.py: error importing: <TypeError> encode() argument 1 must > be str, not bytes (error at i18n.py:*) > >> + hgext/extdiff.py: error importing: <TypeError> encode() argument 1 > must be str, not bytes (error at i18n.py:*) > >> + hgext/factotum.py: error importing: <TypeError> encode() argument 1 > must be str, not bytes (error at i18n.py:*) > >> + hgext/fetch.py: error importing: <TypeError> encode() argument 1 > must be str, not bytes (error at i18n.py:*) > >> + hgext/fsmonitor/state.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> + hgext/fsmonitor/watchmanclient.py: error importing: <TypeError> > encode() argument 1 must be str, not bytes (error at i18n.py:*) > >> + hgext/gpg.py: error importing: <TypeError> encode() argument 1 must > be str, not bytes (error at i18n.py:*) > >> + hgext/graphlog.py: error importing: <TypeError> encode() argument 1 > must be str, not bytes (error at i18n.py:*) > >> + hgext/hgk.py: error importing: <TypeError> encode() argument 1 must > be str, not bytes (error at i18n.py:*) > >> + hgext/histedit.py: error importing: <TypeError> encode() argument 1 > must be str, not bytes (error at i18n.py:*) > >> + hgext/journal.py: error importing: <TypeError> encode() argument 1 > must be str, not bytes (error at i18n.py:*) > >> + hgext/keyword.py: error importing: <TypeError> encode() argument 1 > must be str, not bytes (error at i18n.py:*) > >> + hgext/largefiles/basestore.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> + hgext/largefiles/lfcommands.py: error importing: <TypeError> > encode() argument 1 must be str, not bytes (error at i18n.py:*) > >> + hgext/largefiles/lfutil.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (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> 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/overrides.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> + hgext/largefiles/proto.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> + hgext/largefiles/remotestore.py: error importing: <TypeError> > encode() argument 1 must be str, not bytes (error at i18n.py:*) > >> + hgext/largefiles/reposetup.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> + hgext/largefiles/storefactory.py: error importing: <TypeError> > encode() argument 1 must be str, not bytes (error at i18n.py:*) > >> + hgext/largefiles/uisetup.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (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> 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:*) > >> + hgext/mq.py: error importing: <TypeError> encode() argument 1 must > be str, not bytes (error at i18n.py:*) > >> + hgext/notify.py: error importing: <TypeError> encode() argument 1 > must be str, not bytes (error at i18n.py:*) > >> + hgext/pager.py: error importing: <TypeError> encode() argument 1 > must be str, not bytes (error at i18n.py:*) > >> + hgext/patchbomb.py: error importing: <TypeError> encode() argument 1 > must be str, not bytes (error at i18n.py:*) > >> + hgext/purge.py: error importing: <TypeError> encode() argument 1 > must be str, not bytes (error at i18n.py:*) > >> + hgext/rebase.py: error importing: <TypeError> encode() argument 1 > must be str, not bytes (error at i18n.py:*) > >> + hgext/record.py: error importing: <TypeError> encode() argument 1 > must be str, not bytes (error at i18n.py:*) > >> + hgext/relink.py: error importing: <TypeError> encode() argument 1 > must be str, not bytes (error at i18n.py:*) > >> + hgext/schemes.py: error importing: <TypeError> encode() argument 1 > must be str, not bytes (error at i18n.py:*) > >> + hgext/share.py: error importing: <TypeError> encode() argument 1 > must be str, not bytes (error at i18n.py:*) > >> + hgext/shelve.py: error importing: <TypeError> encode() argument 1 > must be str, not bytes (error at i18n.py:*) > >> + hgext/strip.py: error importing: <TypeError> encode() argument 1 > must be str, not bytes (error at i18n.py:*) > >> + hgext/transplant.py: error importing: <TypeError> encode() argument > 1 must be str, not bytes (error at i18n.py:*) > >> + hgext/win32text.py: error importing: <TypeError> encode() argument 1 > must be str, not bytes (error at i18n.py:*) > >> + mercurial/archival.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> + mercurial/bookmarks.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> + mercurial/branchmap.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> + mercurial/bundle2.py: error importing: <TypeError> encode() argument > 1 must be str, not bytes (error at i18n.py:*) > >> + mercurial/bundlerepo.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> + mercurial/byterange.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> + mercurial/changegroup.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> + mercurial/changelog.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> + mercurial/cmdutil.py: error importing: <TypeError> encode() argument > 1 must be str, not bytes (error at i18n.py:*) > >> + mercurial/commands.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> + mercurial/commandserver.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> + mercurial/config.py: error importing: <TypeError> encode() argument > 1 must be str, not bytes (error at i18n.py:*) > >> + mercurial/context.py: error importing: <TypeError> encode() argument > 1 must be str, not bytes (error at i18n.py:*) > >> + mercurial/copies.py: error importing: <TypeError> encode() argument > 1 must be str, not bytes (error at i18n.py:*) > >> + mercurial/crecord.py: error importing: <TypeError> encode() argument > 1 must be str, not bytes (error at i18n.py:*) > >> + mercurial/destutil.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> + mercurial/dirstate.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> + mercurial/discovery.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> + mercurial/dispatch.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> mercurial/encoding.py: error importing module: <TypeError> bytes > expected, not str (line *) > >> - 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/exchange.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> + mercurial/extensions.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> + mercurial/filelog.py: error importing: <TypeError> encode() argument > 1 must be str, not bytes (error at i18n.py:*) > >> + mercurial/filemerge.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> + mercurial/fileset.py: error importing: <TypeError> encode() argument > 1 must be str, not bytes (error at i18n.py:*) > >> + mercurial/formatter.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> + mercurial/graphmod.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> + mercurial/help.py: error importing: <TypeError> encode() argument 1 > must be str, not bytes (error at i18n.py:*) > >> + mercurial/hg.py: error importing: <TypeError> encode() argument 1 > must be str, not bytes (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,9 +116,9 @@ > >> 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> 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/hook.py: error importing: <TypeError> encode() argument 1 > must be str, not bytes (error at i18n.py:*) > >> + mercurial/httpconnection.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> + mercurial/httppeer.py: error importing: <TypeError> encode() > argument 1 must be str, not bytes (error at i18n.py:*) > >> mercurial/i18n.py: error importing module: <TypeError> bytes > expected, not str (line *) > >> mercurial/keepalive.py: error importing: <TypeError> int() can't > convert non-string with explicit base (error at util.py:*) > >> mercurial/localrepo.py: error importing: <TypeError> int() can't > convert non-string with explicit base (error at util.py:*) > >> _______________________________________________ > >> Mercurial-devel mailing list > >> Mercurial-devel@mercurial-scm.org > >> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel > > > > > > > > -- > > Martijn Pieters > > _______________________________________________ > > Mercurial-devel mailing list > > Mercurial-devel@mercurial-scm.org > > https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@mercurial-scm.org > https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel >
On 7 October 2016 at 15:21, Gregory Szorc <gregory.szorc@gmail.com> wrote: > You may also want to look at what Python 3.6 is doing with paths. > https://docs.python.org/3.6/whatsnew/3.6.html > Specifically? The deprecation of bytes-*like* objects (which we don't use) or the wider acceptance of Path-like objects?
On Fri, 7 Oct 2016 15:20:32 +0200, Augie Fackler wrote: > > > On Oct 7, 2016, at 15:18, Pulkit Goyal <7895pulkit@gmail.com> wrote: > > > > Not sure about this one, I tried it earlier, data path are bytes. > > https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-August/086728.html > > Hm. It's always coming from __file__ or similar, which is Unicode on Python 3? I'm confused now. Yuya? It's bytes on Python 2. We can't concatenate bytes and unicode if bytes contains non-ascii chars.
> On Oct 7, 2016, at 15:55, Yuya Nishihara <yuya@tcha.org> wrote: > > On Fri, 7 Oct 2016 15:20:32 +0200, Augie Fackler wrote: >> >>> On Oct 7, 2016, at 15:18, Pulkit Goyal <7895pulkit@gmail.com> wrote: >>> >>> Not sure about this one, I tried it earlier, data path are bytes. >>> https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-August/086728.html >> >> Hm. It's always coming from __file__ or similar, which is Unicode on Python 3? I'm confused now. Yuya? > > It's bytes on Python 2. We can't concatenate bytes and unicode if bytes > contains non-ascii chars. Cute. We'll have to be more clever then. I'll roll a new patch sometime later today.
Patch
diff --git a/mercurial/i18n.py b/mercurial/i18n.py --- a/mercurial/i18n.py +++ b/mercurial/i18n.py @@ -49,7 +49,7 @@ if (os.name == 'nt' _ugettext = None def setdatapath(datapath): - localedir = os.path.join(datapath, 'locale') + localedir = os.path.join(datapath, u'locale') t = gettextmod.translation('hg', localedir, _languages, fallback=True) global _ugettext try: 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 @@ -28,85 +28,85 @@ 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> 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/common.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/convert/convcmd.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/convert/cvs.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/convert/cvsps.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/convert/darcs.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (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> 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/git.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/convert/gnuarch.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/convert/hg.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/convert/monotone.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/convert/p4.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/convert/subversion.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) hgext/convert/transport.py: error importing module: <ImportError> No module named 'svn.client' (line *) - 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/eol.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/extdiff.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/factotum.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/fetch.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/fsmonitor/state.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/fsmonitor/watchmanclient.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/gpg.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/graphlog.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/hgk.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/histedit.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/journal.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/keyword.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/largefiles/basestore.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/largefiles/lfcommands.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/largefiles/lfutil.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (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> 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/overrides.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/largefiles/proto.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/largefiles/remotestore.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/largefiles/reposetup.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/largefiles/storefactory.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/largefiles/uisetup.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (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> 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:*) + hgext/mq.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/notify.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/pager.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/patchbomb.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/purge.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/rebase.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/record.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/relink.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/schemes.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/share.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/shelve.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/strip.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/transplant.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + hgext/win32text.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/archival.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/bookmarks.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/branchmap.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/bundle2.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/bundlerepo.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/byterange.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/changegroup.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/changelog.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/cmdutil.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/commands.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/commandserver.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/config.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/context.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/copies.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/crecord.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/destutil.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/dirstate.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/discovery.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/dispatch.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) mercurial/encoding.py: error importing module: <TypeError> bytes expected, not str (line *) - 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/exchange.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/extensions.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/filelog.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/filemerge.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/fileset.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/formatter.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/graphmod.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/help.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/hg.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (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,9 +116,9 @@ 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> 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/hook.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/httpconnection.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) + mercurial/httppeer.py: error importing: <TypeError> encode() argument 1 must be str, not bytes (error at i18n.py:*) mercurial/i18n.py: error importing module: <TypeError> bytes expected, not str (line *) mercurial/keepalive.py: error importing: <TypeError> int() can't convert non-string with explicit base (error at util.py:*) mercurial/localrepo.py: error importing: <TypeError> int() can't convert non-string with explicit base (error at util.py:*)