Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: avoid use of basestring
authorPulkit Goyal <7895pulkit@gmail.com>
Wed, 30 Nov 2016 23:51:11 +0530
changeset 30569 bcb858396233
parent 30568 bb35fe8621f5
child 30570 c4c51fd0e11d
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
mercurial/ui.py file | annotate | diff | comparison | revisions
tests/test-check-py3-commands.t file | annotate | diff | comparison | revisions 
--- 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
mercurial