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, pycompat.sysstr('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 @@ -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: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/automv.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/blackbox.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/bugzilla.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/censor.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/chgserver.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/children.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/churn.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/clonebundles.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/color.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/automv.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/blackbox.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/bugzilla.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/censor.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/chgserver.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/children.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/churn.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/clonebundles.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/color.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) hgext/convert/bzr.py: error importing module: Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) - hgext/convert/common.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/convert/convcmd.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/convert/cvs.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/convert/cvsps.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/convert/darcs.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/convert/common.py: error importing module: module 'mercurial.util' has no attribute 'pickle' (line *) + hgext/convert/convcmd.py: error importing: module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) + hgext/convert/cvs.py: error importing module: Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) + hgext/convert/cvsps.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/convert/darcs.py: error importing module: Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) hgext/convert/filemap.py: error importing module: Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) - hgext/convert/git.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/convert/gnuarch.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/convert/hg.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/convert/monotone.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/convert/p4.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/convert/subversion.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/convert/git.py: error importing module: Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) + hgext/convert/gnuarch.py: error importing module: Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) + hgext/convert/hg.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/convert/monotone.py: error importing module: Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) + hgext/convert/p4.py: error importing module: Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) + hgext/convert/subversion.py: error importing module: Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) hgext/convert/transport.py: error importing module: No module named 'svn.client' (line *) - hgext/eol.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/extdiff.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/factotum.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/fetch.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/fsmonitor/state.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/fsmonitor/watchmanclient.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/gpg.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/graphlog.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/hgk.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/histedit.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/journal.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/keyword.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/largefiles/basestore.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/largefiles/lfcommands.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/largefiles/lfutil.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/eol.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/extdiff.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/factotum.py: error importing: module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) + hgext/fetch.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/fsmonitor/watchmanclient.py: error importing module: Parent module 'hgext.fsmonitor' not loaded, cannot perform relative import (line *) + hgext/gpg.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/graphlog.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/hgk.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/histedit.py: error importing: module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) + hgext/journal.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/keyword.py: error importing: module 'mercurial.util' has no attribute 'httpserver' (error at common.py:*) + hgext/largefiles/basestore.py: error importing module: Parent module 'hgext.largefiles' not loaded, cannot perform relative import (line *) + hgext/largefiles/lfcommands.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/largefiles/lfutil.py: error importing: module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) hgext/largefiles/localstore.py: error importing module: Parent module 'hgext.largefiles' not loaded, cannot perform relative import (line *) - hgext/largefiles/overrides.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/largefiles/proto.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/largefiles/remotestore.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/largefiles/reposetup.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/largefiles/storefactory.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/largefiles/uisetup.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/largefiles/overrides.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/largefiles/proto.py: error importing: module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) + hgext/largefiles/remotestore.py: error importing: module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) + hgext/largefiles/reposetup.py: error importing: module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) + hgext/largefiles/storefactory.py: error importing: module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) + hgext/largefiles/uisetup.py: error importing: module 'mercurial.util' has no attribute 'httpserver' (error at common.py:*) hgext/largefiles/wirestore.py: error importing module: Parent module 'hgext.largefiles' not loaded, cannot perform relative import (line *) - hgext/mq.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/notify.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/pager.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/patchbomb.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/purge.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/rebase.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/record.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/relink.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/schemes.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/share.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/shelve.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/strip.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/transplant.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - hgext/win32text.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - mercurial/archival.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - mercurial/bookmarks.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - mercurial/branchmap.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - mercurial/bundle2.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - mercurial/bundlerepo.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - mercurial/byterange.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - mercurial/changegroup.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - mercurial/changelog.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - mercurial/cmdutil.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - mercurial/commands.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - mercurial/commandserver.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - mercurial/config.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - mercurial/context.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - mercurial/copies.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - mercurial/crecord.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - mercurial/destutil.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - mercurial/dirstate.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - mercurial/discovery.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - mercurial/dispatch.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + hgext/mq.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/notify.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/pager.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/patchbomb.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/purge.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/rebase.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/record.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/relink.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/schemes.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/share.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/shelve.py: error importing: module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) + hgext/strip.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + hgext/transplant.py: error importing: module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) + mercurial/archival.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + mercurial/bundle2.py: error importing: module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) + mercurial/bundlerepo.py: error importing: module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) + mercurial/byterange.py: error importing module: module 'mercurial.util' has no attribute 'urlerr' (line *) + mercurial/changelog.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + mercurial/cmdutil.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + mercurial/commands.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + mercurial/context.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + mercurial/crecord.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + mercurial/dispatch.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) mercurial/encoding.py: error importing module: bytes expected, not str (line *) - mercurial/exchange.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - mercurial/extensions.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - mercurial/filelog.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - mercurial/filemerge.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - mercurial/fileset.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - mercurial/formatter.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - mercurial/graphmod.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - mercurial/help.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - mercurial/hg.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/exchange.py: error importing: module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) + mercurial/extensions.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + mercurial/filelog.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + mercurial/filemerge.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + mercurial/fileset.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + mercurial/formatter.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + mercurial/help.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + mercurial/hg.py: error importing: module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) mercurial/hgweb/common.py: error importing module: Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) mercurial/hgweb/hgweb_mod.py: error importing module: Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) mercurial/hgweb/hgwebdir_mod.py: error importing module: Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) @@ -115,9 +102,9 @@ mercurial/hgweb/webcommands.py: error importing module: Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) mercurial/hgweb/webutil.py: error importing module: Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) mercurial/hgweb/wsgicgi.py: error importing module: Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) - mercurial/hook.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - mercurial/httpconnection.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) - mercurial/httppeer.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) + mercurial/hook.py: error importing: module 'mercurial.util' has no attribute 'stringio' (error at patch.py:*) + mercurial/httpconnection.py: error importing module: module 'mercurial.util' has no attribute 'urlerr' (line *) + mercurial/httppeer.py: error importing: module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) mercurial/i18n.py: error importing module: bytes expected, not str (line *) mercurial/keepalive.py: error importing module: module 'mercurial.util' has no attribute 'httplib' (line *) mercurial/localrepo.py: error importing: module 'mercurial.util' has no attribute 'urlerr' (error at httpconnection.py:*) @@ -151,5 +138,4 @@ $ hg files 'set:(**.py) and grep(pygments)' | sed 's|\\|/|g' \ > | xargs $PYTHON3 contrib/check-py3-compat.py \ > | sed 's/[0-9][0-9]*)$/*)/' - hgext/highlight/highlight.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) #endif