diff -r 8e0327dae3f4 -r a9c71d578a1c mercurial/util.py --- a/mercurial/util.py Fri Aug 12 11:30:17 2016 +0900 +++ b/mercurial/util.py Fri Aug 12 11:35:17 2016 +0900 @@ -46,11 +46,13 @@ encoding, error, i18n, - osutil, parsers, + policy, pycompat, ) +osutil = policy.importmod(r'osutil') + b85decode = base85.b85decode b85encode = base85.b85encode