Show More
@@ -12,7 +12,10 b' import locale' | |||
|
12 | 12 | import os |
|
13 | 13 | import sys |
|
14 | 14 | |
|
15 |
from . import |
|
|
15 | from . import ( | |
|
16 | encoding, | |
|
17 | pycompat, | |
|
18 | ) | |
|
16 | 19 | |
|
17 | 20 | # modelled after templater.templatepath: |
|
18 | 21 | if getattr(sys, 'frozen', None) is not None: |
@@ -85,7 +88,8 b' def gettext(message):' | |||
|
85 | 88 | # means u.encode(sys.getdefaultencoding()).decode(enc). Since |
|
86 | 89 | # the Python encoding defaults to 'ascii', this fails if the |
|
87 | 90 | # translated string use non-ASCII characters. |
|
88 | _msgcache[message] = u.encode(encoding.encoding, "replace") | |
|
91 | encodingstr = pycompat.sysstr(encoding.encoding) | |
|
92 | _msgcache[message] = u.encode(encodingstr, "replace") | |
|
89 | 93 | except LookupError: |
|
90 | 94 | # An unknown encoding results in a LookupError. |
|
91 | 95 | _msgcache[message] = message |
@@ -120,53 +120,53 b'' | |||
|
120 | 120 | mercurial/httpconnection.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*) |
|
121 | 121 | mercurial/httppeer.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*) |
|
122 | 122 | mercurial/i18n.py: error importing module: <TypeError> bytes expected, not str (line *) |
|
123 |
mercurial/keepalive.py: error importing: <TypeError> encode() argument |
|
|
124 |
mercurial/localrepo.py: error importing: <TypeError> encode() argument |
|
|
125 |
mercurial/lock.py: error importing: <TypeError> encode() argument |
|
|
126 |
mercurial/mail.py: error importing: <TypeError> encode() argument |
|
|
127 |
mercurial/manifest.py: error importing: <TypeError> encode() argument |
|
|
128 |
mercurial/match.py: error importing: <TypeError> encode() argument |
|
|
129 |
mercurial/mdiff.py: error importing: <TypeError> encode() argument |
|
|
130 |
mercurial/merge.py: error importing: <TypeError> encode() argument |
|
|
131 |
mercurial/minirst.py: error importing: <TypeError> encode() argument |
|
|
132 |
mercurial/namespaces.py: error importing: <TypeError> encode() argument |
|
|
133 |
mercurial/obsolete.py: error importing: <TypeError> encode() argument |
|
|
134 |
mercurial/patch.py: error importing: <TypeError> encode() argument |
|
|
135 |
mercurial/pathutil.py: error importing: <TypeError> encode() argument |
|
|
136 |
mercurial/peer.py: error importing: <TypeError> encode() argument |
|
|
137 |
mercurial/profiling.py: error importing: <TypeError> encode() argument |
|
|
138 |
mercurial/pushkey.py: error importing: <TypeError> encode() argument |
|
|
139 |
mercurial/pvec.py: error importing: <TypeError> encode() argument |
|
|
140 |
mercurial/registrar.py: error importing: <TypeError> encode() argument |
|
|
141 |
mercurial/repair.py: error importing: <TypeError> encode() argument |
|
|
142 |
mercurial/repoview.py: error importing: <TypeError> encode() argument |
|
|
143 |
mercurial/revlog.py: error importing: <TypeError> encode() argument |
|
|
144 |
mercurial/revset.py: error importing: <TypeError> encode() argument |
|
|
145 |
mercurial/scmutil.py: error importing: <TypeError> encode() argument |
|
|
146 |
mercurial/scmwindows.py: error importing: <TypeError> encode() argument |
|
|
147 |
mercurial/similar.py: error importing: <TypeError> encode() argument |
|
|
148 |
mercurial/simplemerge.py: error importing: <TypeError> encode() argument |
|
|
149 |
mercurial/sshpeer.py: error importing: <TypeError> encode() argument |
|
|
150 |
mercurial/sshserver.py: error importing: <TypeError> encode() argument |
|
|
151 |
mercurial/sslutil.py: error importing: <TypeError> encode() argument |
|
|
152 |
mercurial/statichttprepo.py: error importing: <TypeError> encode() argument |
|
|
153 |
mercurial/store.py: error importing: <TypeError> encode() argument |
|
|
154 |
mercurial/streamclone.py: error importing: <TypeError> encode() argument |
|
|
155 |
mercurial/subrepo.py: error importing: <TypeError> encode() argument |
|
|
156 |
mercurial/tagmerge.py: error importing: <TypeError> encode() argument |
|
|
157 |
mercurial/tags.py: error importing: <TypeError> encode() argument |
|
|
158 |
mercurial/templatefilters.py: error importing: <TypeError> encode() argument |
|
|
159 |
mercurial/templatekw.py: error importing: <TypeError> encode() argument |
|
|
160 |
mercurial/templater.py: error importing: <TypeError> encode() argument |
|
|
161 |
mercurial/transaction.py: error importing: <TypeError> encode() argument |
|
|
162 |
mercurial/ui.py: error importing: <TypeError> encode() argument |
|
|
163 |
mercurial/unionrepo.py: error importing: <TypeError> encode() argument |
|
|
164 |
mercurial/url.py: error importing: <TypeError> encode() argument |
|
|
165 |
mercurial/util.py: error importing: <TypeError> encode() argument |
|
|
166 |
mercurial/verify.py: error importing: <TypeError> encode() argument |
|
|
123 | mercurial/keepalive.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
124 | mercurial/localrepo.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
125 | mercurial/lock.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
126 | mercurial/mail.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
127 | mercurial/manifest.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
128 | mercurial/match.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
129 | mercurial/mdiff.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
130 | mercurial/merge.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
131 | mercurial/minirst.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
132 | mercurial/namespaces.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
133 | mercurial/obsolete.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
134 | mercurial/patch.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
135 | mercurial/pathutil.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
136 | mercurial/peer.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
137 | mercurial/profiling.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
138 | mercurial/pushkey.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
139 | mercurial/pvec.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
140 | mercurial/registrar.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
141 | mercurial/repair.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
142 | mercurial/repoview.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
143 | mercurial/revlog.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
144 | mercurial/revset.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
145 | mercurial/scmutil.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
146 | mercurial/scmwindows.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
147 | mercurial/similar.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
148 | mercurial/simplemerge.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
149 | mercurial/sshpeer.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
150 | mercurial/sshserver.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
151 | mercurial/sslutil.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
152 | mercurial/statichttprepo.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
153 | mercurial/store.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
154 | mercurial/streamclone.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
155 | mercurial/subrepo.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
156 | mercurial/tagmerge.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
157 | mercurial/tags.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
158 | mercurial/templatefilters.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
159 | mercurial/templatekw.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
160 | mercurial/templater.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
161 | mercurial/transaction.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
162 | mercurial/ui.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
163 | mercurial/unionrepo.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
164 | mercurial/url.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
165 | mercurial/util.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
166 | mercurial/verify.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
167 | 167 | mercurial/win32.py: error importing module: <ImportError> No module named 'msvcrt' (line *) |
|
168 | 168 | mercurial/windows.py: error importing module: <ImportError> No module named 'msvcrt' (line *) |
|
169 |
mercurial/wireproto.py: error importing: <TypeError> encode() argument |
|
|
169 | mercurial/wireproto.py: error importing: <TypeError> encode() argument 2 must be str, not bytes (error at i18n.py:*) | |
|
170 | 170 | |
|
171 | 171 | #endif |
|
172 | 172 |
General Comments 0
You need to be logged in to leave comments.
Login now