Mercurial > hg

changeset 35197:bfd072c52e03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use bytes in place of basestring All strings in mercurial must be bytes so we can easily replace basestring with bytes. Differential Revision: https://phab.mercurial-scm.org/D1555
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 01 Dec 2017 16:53:55 +0530
parents 5cc14407a739
children 80bb15769c73
files hgext/convert/convcmd.py mercurial/cmdutil.py mercurial/httppeer.py
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/convert/convcmd.py	Fri Dec 01 14:13:55 2017 -0800
+++ b/hgext/convert/convcmd.py	Fri Dec 01 16:53:55 2017 +0530
@@ -450,7 +450,7 @@
         commit = self.commitcache[rev]
         full = self.opts.get('full')
         changes = self.source.getchanges(rev, full)
-        if isinstance(changes, basestring):
+        if isinstance(changes, bytes):
             if changes == SKIPREV:
                 dest = SKIPREV
             else:
--- a/mercurial/cmdutil.py	Fri Dec 01 14:13:55 2017 -0800
+++ b/mercurial/cmdutil.py	Fri Dec 01 16:53:55 2017 +0530
@@ -3722,7 +3722,7 @@
                                 else:
                                     util.rename(target, bakname)
                     if ui.verbose or not exact:
-                        if not isinstance(msg, basestring):
+                        if not isinstance(msg, bytes):
                             msg = msg(abs)
                         ui.status(msg % rel)
                 elif exact:
--- a/mercurial/httppeer.py	Fri Dec 01 14:13:55 2017 -0800
+++ b/mercurial/httppeer.py	Fri Dec 01 16:53:55 2017 +0530
@@ -222,7 +222,7 @@
             if not data:
                 data = strargs
             else:
-                if isinstance(data, basestring):
+                if isinstance(data, bytes):
                     i = io.BytesIO(data)
                     i.length = len(data)
                     data = i