| Submitter | Augie Fackler |
|---|---|
| Date | Oct. 8, 2016, 12:20 p.m. |
| Message ID | <392dc40e200e6fdc3ee5.1475929237@augie-macbookair2.roam.corp.google.com> |
| Download | mbox | patch |
| Permalink | /patch/16917/ |
| State | Superseded |
| Headers | show |
Comments
On 8 October 2016 at 14:20, Augie Fackler <raf@durin42.com> wrote: > # HG changeset patch > # User Augie Fackler <augie@google.com> > # Date 1475918778 14400 > # Sat Oct 08 05:26:18 2016 -0400 > # Node ID 392dc40e200e6fdc3ee5172c949b81cc56163e62 > # Parent 87b8e40eb8125d5ddc848d972b117989346057dd > i18n: make the locale directory name the same string type as the datapath > > diff --git a/mercurial/i18n.py b/mercurial/i18n.py > --- a/mercurial/i18n.py > +++ b/mercurial/i18n.py > @@ -49,7 +49,11 @@ if (os.name == 'nt' > _ugettext = None > > def setdatapath(datapath): > - localedir = os.path.join(datapath, 'locale') > + if isinstance(datapath, unicode): > + locpart = u'locale' > + else: > + locpart = 'locale' > + localedir = os.path.join(datapath, locpart) > Since datapath is basically always sysstr (either __file__ or sys.executable), just use sysstr('locale') here. > 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 > @@ -16,96 +16,83 @@ > $ hg files 'set:(**.py) - grep(pygments)' | sed 's|\\|/|g' \ > > | xargs $PYTHON3 contrib/check-py3-compat.py \ > > | sed 's/[0-9][0-9]*)$/*)/' > - hgext/acl.py: error importing: <TypeError> Can't mix strings and bytes > in path components (error at i18n.py:*) > - hgext/automv.py: error importing: <TypeError> Can't mix strings and > bytes in path components (error at i18n.py:*) > - hgext/blackbox.py: error importing: <TypeError> Can't mix strings and > bytes in path components (error at i18n.py:*) > - hgext/bugzilla.py: error importing: <TypeError> Can't mix strings and > bytes in path components (error at i18n.py:*) > - hgext/censor.py: error importing: <TypeError> Can't mix strings and > bytes in path components (error at i18n.py:*) > - hgext/chgserver.py: error importing: <TypeError> Can't mix strings and > bytes in path components (error at i18n.py:*) > - hgext/children.py: error importing: <TypeError> Can't mix strings and > bytes in path components (error at i18n.py:*) > - hgext/churn.py: error importing: <TypeError> Can't mix strings and > bytes in path components (error at i18n.py:*) > - hgext/clonebundles.py: error importing: <TypeError> Can't mix strings > and bytes in path components (error at i18n.py:*) > - hgext/color.py: error importing: <TypeError> Can't mix strings and > bytes in path components (error at i18n.py:*) > + hgext/automv.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + hgext/blackbox.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + hgext/bugzilla.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + hgext/censor.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + hgext/chgserver.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + hgext/children.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + hgext/churn.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + hgext/clonebundles.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + hgext/color.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.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 module: <AttributeError> > module 'mercurial.util' has no attribute 'pickle' (line *) > + hgext/convert/convcmd.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) > + hgext/convert/cvs.py: error importing module: <SystemError> Parent > module 'hgext.convert' not loaded, cannot perform relative import (line *) > + hgext/convert/cvsps.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + hgext/convert/darcs.py: error importing module: <SystemError> Parent > module 'hgext.convert' not loaded, cannot perform relative import (line *) > 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 module: <SystemError> Parent > module 'hgext.convert' not loaded, cannot perform relative import (line *) > + hgext/convert/gnuarch.py: error importing module: <SystemError> Parent > module 'hgext.convert' not loaded, cannot perform relative import (line *) > + hgext/convert/hg.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + hgext/convert/monotone.py: error importing module: <SystemError> Parent > module 'hgext.convert' not loaded, cannot perform relative import (line *) > + hgext/convert/p4.py: error importing module: <SystemError> Parent > module 'hgext.convert' not loaded, cannot perform relative import (line *) > + hgext/convert/subversion.py: error importing module: <SystemError> > Parent module 'hgext.convert' not loaded, cannot perform relative import > (line *) > 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: <AttributeError> module 'mercurial.util' > has no attribute 'stringio' (error at patch.py:*) > + hgext/extdiff.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + hgext/factotum.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) > + hgext/fetch.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + hgext/fsmonitor/watchmanclient.py: error importing module: > <SystemError> Parent module 'hgext.fsmonitor' not loaded, cannot perform > relative import (line *) > + hgext/gpg.py: error importing: <AttributeError> module 'mercurial.util' > has no attribute 'stringio' (error at patch.py:*) > + hgext/graphlog.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + hgext/hgk.py: error importing: <AttributeError> module 'mercurial.util' > has no attribute 'stringio' (error at patch.py:*) > + hgext/histedit.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) > + hgext/journal.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + hgext/keyword.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'httpserver' (error at common.py:*) > + hgext/largefiles/basestore.py: error importing module: <SystemError> > Parent module 'hgext.largefiles' not loaded, cannot perform relative import > (line *) > + hgext/largefiles/lfcommands.py: error importing: <AttributeError> > module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + hgext/largefiles/lfutil.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.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: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + hgext/largefiles/proto.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) > + hgext/largefiles/remotestore.py: error importing: <AttributeError> > module 'mercurial.util' has no attribute 'urlerr' (error at > httpconnection.py:*) > + hgext/largefiles/reposetup.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) > + hgext/largefiles/storefactory.py: error importing: <AttributeError> > module 'mercurial.util' has no attribute 'urlerr' (error at > httpconnection.py:*) > + hgext/largefiles/uisetup.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'httpserver' (error at common.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: <AttributeError> module 'mercurial.util' > has no attribute 'stringio' (error at patch.py:*) > + hgext/notify.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + hgext/pager.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + hgext/patchbomb.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + hgext/purge.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + hgext/rebase.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + hgext/record.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + hgext/relink.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + hgext/schemes.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + hgext/share.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + hgext/shelve.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) > + hgext/strip.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + hgext/transplant.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) > + mercurial/archival.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + mercurial/bundle2.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) > + mercurial/bundlerepo.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) > + mercurial/byterange.py: error importing module: <AttributeError> module > 'mercurial.util' has no attribute 'urlerr' (line *) > + mercurial/changelog.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + mercurial/cmdutil.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + mercurial/commands.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + mercurial/context.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + mercurial/crecord.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + mercurial/dispatch.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.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: <AttributeError> module > 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) > + mercurial/extensions.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + mercurial/filelog.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + mercurial/filemerge.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + mercurial/fileset.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + mercurial/formatter.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + mercurial/help.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + mercurial/hg.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.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 *) > @@ -115,9 +102,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: <AttributeError> module > 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) > + mercurial/httpconnection.py: error importing module: <AttributeError> > module 'mercurial.util' has no attribute 'urlerr' (line *) > + mercurial/httppeer.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) > mercurial/i18n.py: error importing module: <TypeError> bytes expected, > not str (line *) > mercurial/keepalive.py: error importing module: <AttributeError> module > 'mercurial.util' has no attribute 'httplib' (line *) > mercurial/localrepo.py: error importing: <AttributeError> module > 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@mercurial-scm.org > https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel >
Patch
diff --git a/mercurial/i18n.py b/mercurial/i18n.py --- a/mercurial/i18n.py +++ b/mercurial/i18n.py @@ -49,7 +49,11 @@ if (os.name == 'nt' _ugettext = None def setdatapath(datapath): - localedir = os.path.join(datapath, 'locale') + if isinstance(datapath, unicode): + locpart = u'locale' + else: + locpart = 'locale' + localedir = os.path.join(datapath, locpart) 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 @@ -16,96 +16,83 @@ $ hg files 'set:(**.py) - grep(pygments)' | sed 's|\\|/|g' \ > | xargs $PYTHON3 contrib/check-py3-compat.py \ > | sed 's/[0-9][0-9]*)$/*)/' - hgext/acl.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/automv.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/blackbox.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/bugzilla.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/censor.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/chgserver.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/children.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/churn.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/clonebundles.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/color.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/automv.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/blackbox.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/bugzilla.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/censor.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/chgserver.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/children.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/churn.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/clonebundles.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/color.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.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 module: <AttributeError> module 'mercurial.util' has no attribute 'pickle' (line *) + hgext/convert/convcmd.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) + hgext/convert/cvs.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) + hgext/convert/cvsps.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/convert/darcs.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) 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 module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) + hgext/convert/gnuarch.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) + hgext/convert/hg.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/convert/monotone.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) + hgext/convert/p4.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) + hgext/convert/subversion.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) 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: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/extdiff.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/factotum.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) + hgext/fetch.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/fsmonitor/watchmanclient.py: error importing module: <SystemError> Parent module 'hgext.fsmonitor' not loaded, cannot perform relative import (line *) + hgext/gpg.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/graphlog.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/hgk.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/histedit.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) + hgext/journal.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/keyword.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'httpserver' (error at common.py:*) + hgext/largefiles/basestore.py: error importing module: <SystemError> Parent module 'hgext.largefiles' not loaded, cannot perform relative import (line *) + hgext/largefiles/lfcommands.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/largefiles/lfutil.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.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: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/largefiles/proto.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) + hgext/largefiles/remotestore.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) + hgext/largefiles/reposetup.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) + hgext/largefiles/storefactory.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) + hgext/largefiles/uisetup.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'httpserver' (error at common.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: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/notify.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/pager.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/patchbomb.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/purge.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/rebase.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/record.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/relink.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/schemes.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/share.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/shelve.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) + hgext/strip.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/transplant.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) + mercurial/archival.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + mercurial/bundle2.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) + mercurial/bundlerepo.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) + mercurial/byterange.py: error importing module: <AttributeError> module 'mercurial.util' has no attribute 'urlerr' (line *) + mercurial/changelog.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + mercurial/cmdutil.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + mercurial/commands.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + mercurial/context.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + mercurial/crecord.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + mercurial/dispatch.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.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: <AttributeError> module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) + mercurial/extensions.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + mercurial/filelog.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + mercurial/filemerge.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + mercurial/fileset.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + mercurial/formatter.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + mercurial/help.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + mercurial/hg.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.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 *) @@ -115,9 +102,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: <AttributeError> module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + mercurial/httpconnection.py: error importing module: <AttributeError> module 'mercurial.util' has no attribute 'urlerr' (line *) + mercurial/httppeer.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) mercurial/i18n.py: error importing module: <TypeError> bytes expected, not str (line *) mercurial/keepalive.py: error importing module: <AttributeError> module 'mercurial.util' has no attribute 'httplib' (line *) mercurial/localrepo.py: error importing: <AttributeError> module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*)