Mercurial > hg-stable
changeset 30574:bcb858396233
py3: avoid use of basestring
"In this case, result is a source variable of a list to be returned, it
shouldn't be unicode. Hence we can use bytes instead of basestring here." -Yuya
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Wed, 30 Nov 2016 23:51:11 +0530 |
| parents | bb35fe8621f5 |
| children | c4c51fd0e11d |
| files | mercurial/ui.py tests/test-check-py3-commands.t |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/ui.py Wed Nov 30 23:38:50 2016 +0530 +++ b/mercurial/ui.py Wed Nov 30 23:51:11 2016 +0530 @@ -535,7 +535,7 @@ result = self.config(section, name, untrusted=untrusted) if result is None: result = default or [] - if isinstance(result, basestring): + if isinstance(result, bytes): result = _configlist(result.lstrip(' ,\n')) if result is None: result = default or []
--- a/tests/test-check-py3-commands.t Wed Nov 30 23:38:50 2016 +0530 +++ b/tests/test-check-py3-commands.t Wed Nov 30 23:51:11 2016 +0530 @@ -9,6 +9,6 @@ > $PYTHON3 `which hg` $cmd 2>&1 2>&1 | tail -1 > done version - NameError: name 'basestring' is not defined + TypeError: Can't convert 'bytes' object to str implicitly debuginstall - NameError: name 'basestring' is not defined + TypeError: Can't convert 'bytes' object to str implicitly