Mercurial > hg
changeset 42766:e94c8f584ee2
py3: do not convert rust module/attribute names to bytes
policy.import*() functions expect system strings.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sat, 17 Aug 2019 10:25:04 +0900 |
| parents | 0770e221d24b |
| children | 624d86262e14 |
| files | mercurial/match.py mercurial/setdiscovery.py mercurial/util.py |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/match.py Sat Aug 17 15:43:41 2019 +0900 +++ b/mercurial/match.py Sat Aug 17 10:25:04 2019 +0900 @@ -25,7 +25,7 @@ stringutil, ) -rustmod = policy.importrust('filepatterns') +rustmod = policy.importrust(r'filepatterns') allpatternkinds = ('re', 'glob', 'path', 'relglob', 'relpath', 'relre', 'rootglob',
--- a/mercurial/setdiscovery.py Sat Aug 17 15:43:41 2019 +0900 +++ b/mercurial/setdiscovery.py Sat Aug 17 10:25:04 2019 +0900 @@ -270,8 +270,8 @@ sample.update(takefrom[:more]) return sample -partialdiscovery = policy.importrust('discovery', - member='PartialDiscovery', +partialdiscovery = policy.importrust(r'discovery', + member=r'PartialDiscovery', default=partialdiscovery) def findcommonheads(ui, local, remote,
--- a/mercurial/util.py Sat Aug 17 15:43:41 2019 +0900 +++ b/mercurial/util.py Sat Aug 17 10:25:04 2019 +0900 @@ -53,7 +53,7 @@ stringutil, ) -rustdirs = policy.importrust('dirstate', 'Dirs') +rustdirs = policy.importrust(r'dirstate', r'Dirs') base85 = policy.importmod(r'base85') osutil = policy.importmod(r'osutil')