Mercurial > hg
comparison hgext/convert/convcmd.py @ 38312:79dd61a4554f
py3: replace `unicode` with pycompat.unicode
unicode() is not available on Python 3 and throws a NameError because unicodes
are now default str() on py3.
Differential Revision: https://phab.mercurial-scm.org/D3708
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Wed, 13 Jun 2018 22:51:08 +0530 |
| parents | 73ca1c5e65f8 |
| children | 4a6d01b49d91 |
comparison
equal
deleted
inserted
replaced
| 38311:47f5454a30ed | 38312:79dd61a4554f |
|---|---|
| 53 svn_source = subversion.svn_source | 53 svn_source = subversion.svn_source |
| 54 | 54 |
| 55 orig_encoding = 'ascii' | 55 orig_encoding = 'ascii' |
| 56 | 56 |
| 57 def recode(s): | 57 def recode(s): |
| 58 if isinstance(s, unicode): | 58 if isinstance(s, pycompat.unicode): |
| 59 return s.encode(pycompat.sysstr(orig_encoding), 'replace') | 59 return s.encode(pycompat.sysstr(orig_encoding), 'replace') |
| 60 else: | 60 else: |
| 61 return s.decode('utf-8').encode( | 61 return s.decode('utf-8').encode( |
| 62 pycompat.sysstr(orig_encoding), 'replace') | 62 pycompat.sysstr(orig_encoding), 'replace') |
| 63 | 63 |