# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1506506903 -32400
# Node ID ee10eb6650361d20bd2cd546291d4625a43fb81a
# Parent  8cbcee0b923d78d93776eddc0740631931fb7f68
py3: replace str(None) with literal in convcmd.py

diff -r 8cbcee0b923d -r ee10eb665036 hgext/convert/convcmd.py
--- a/hgext/convert/convcmd.py	Wed Sep 27 19:04:32 2017 +0900
+++ b/hgext/convert/convcmd.py	Wed Sep 27 19:08:23 2017 +0900
@@ -87,7 +87,7 @@
     # At some point we used "None" literal to denote the default branch,
     # attempt to use that for backward compatibility.
     if (not branch):
-        branch = branchmap.get(str(None), branch)
+        branch = branchmap.get('None', branch)
     return branch
 
 source_converters = [
diff -r 8cbcee0b923d -r ee10eb665036 tests/test-doctest.py
--- a/tests/test-doctest.py	Wed Sep 27 19:04:32 2017 +0900
+++ b/tests/test-doctest.py	Wed Sep 27 19:08:23 2017 +0900
@@ -71,7 +71,7 @@
 testmod('mercurial.url')
 testmod('mercurial.util', py3=False)  # py3: multiple bytes/unicode issues
 testmod('mercurial.util', testtarget='platform')
-testmod('hgext.convert.convcmd', py3=False)  # py3: use of str() ?
+testmod('hgext.convert.convcmd')
 testmod('hgext.convert.cvsps')
 testmod('hgext.convert.filemap')
 testmod('hgext.convert.p4')